stable 2004.08.30

403 files changed, 21535 insertions, 21536 deletions

diff --git a/context/data/cont-cz-scite.properties b/context/data/cont-cz-scite.properties
index a8efd3dc6..35cba275e 100644
--- a/context/data/cont-cz-scite.properties
+++ b/context/data/cont-cz-scite.properties
@@ -30,68 +30,67 @@ keywordclass.macros.context.cz=\
     nastavtextyzahlavi startodlozit stanovcharakteristickuseznamu chem umistiseznamodkazu cernalinka \
     stopjmenozlom nastavpozadi nastavtenkelinky definujkombinovanyseznam znaceni definujzasobnikpoli \
     uzijmodul zpracujstranu zadnehorniadolniradky pole meritko nastavumistovani \
-    bydliste dopisy porovnejskupinubarev roztazene nastavsystem nadtrzeno \
-    opakovat zadnezahlaviaupati stoplokalnihoprostredi ziskejznaceni setuppaper pref \
-    vyberverzi startlokalni definujpreskok definujstartstop znaceni*obrazek zlomek \
-    cast startodstavec stopitemgroup aktualnicislonadpisu preskrtnuto nastavmarginalniblok \
-    startmarginalnilinka startplvouciobjekttext startkomponenta definujlogo nastavseznamodkazu textovalinka \
-    definujtext mezera sedabarva dodrzujverziprofilu stopzuzeni nacistsynonyma \
-    stopskryt nastavsekci znak nastavpole jdina opis \
-    nastavinterakcniobrazovku resetznaceni interakcnilista definujtabelaci stopbarva nastavotoceni \
-    starttabelator nastavcislostrany vlasovalinka poznamkapodcarou ukazzakladnifont definujseznam \
-    umistiseznamplvouciobjekty instalacejazyka nastavplvouciobjekty vizrejstrik nastavvzhled pis \
-    marginalnitext nastavupati zadnebilemisto uzijexternidokument rejstrik definujopis \
-    startzarovnavani zarovnanovpravo nastavlisty definerawfont citace bilemisto \
-    definujpopis umistiloga uplnyseznamtridit nastavtextovelinky interakcnitlacitka startlegenda \
-    oramovani polozky pod sekce startrejstrik ukazupravu \
-    startcislovaniradku reset nastavcislovani nastavspodek startsadasymbolu nastavprogramy \
-    Znaky stopcislovaniradku stoptyping program nastavupravu nastavdefinicipoznamekpodcarou \
-    vsedniden stoptextovalinka definujodkaz ukazsadusymbolu starttabulka rozpojeneznaceni \
-    stopprostredi korekcebilehomista nastavkorespondenci VSEDNIDEN symbol podpodtema \
-    vyplnovelinky uplnyseznamsynonyma konvertujcislo jdidolu nastavpopisy tlacitkomenu \
-    stopprekryv propojenyrejstrik nastavprostredizakladnihofontu definujvystup nastavkomentar nivy \
-    definujkonverzi stopcitace nastavexterniobrazy switchtorawfont startpozadi ukazramecek \
-    startitemgroup starttyping arg slovovpravo stoptabulka nacisttridit \
-    KAP startpopis startzhustene nastavdolnitexty zpracujbloky zhustene \
-    stopobraz nastavcislovaniradku podtema umistirovnici synchronizovat dodatek \
-    popisky startsynchronizace odkaz prelozit stopfakt odstavec \
-    setupforms startlokalnihoprostredi titul rezervovatplvouciobjekt definujprofil definujprostredizakladnihofontu \
-    tecky stopsadasymbolu ukazvzhled externiobraz definujprogram umistinadsebe \
-    nastavodstavce stoplokalni umistiseznamtridit uzijkodovani list SLOVA \
-    stopprojekt odsazovani startrovnice Slovo nekde zapisdorejstriku \
-    ukazvytisk vyplnenytext startjmenozlom nastavbarvu nastavsadusymbolu aktualnidatum \
-    sloupec startmarginalniblok ukazpaletu stopverze nastavvystup ukaznastaveni \
-    definujoramovani scitani startsloupce startzuzeni stopkomponenta zasobnikpoli \
-    nastavtype nastavcislovanistran nastavnadpis zadneodsazovani footnotetext nastavorez \
-    nastavsloupce nastavbloksekce zadneznaceni nastavtab setuprule synchronizacnilista \
-    odkaznastranu nastavpolozky textvariable nastavplvouciobjekt nastavurl nastavsynonyma \
-    zadnamezera definujseznamodkazu nastavetikety stopodlozit definujznaceni zachovejbloky \
-    ukazmrizku dalsioddil nastavpopisek nop trid verze \
-    zapismeziseznam podsekce zablokujinterakcnimenu typstrany definujskupinubarev uplnykombinovanyseznam \
-    nastavvycty publikace definujformatodkazu umistiplvouciobjekt nastavsynchronizacnilistu nastavrejstrik \
-    definujsekci stopradky pozice stopkomentar nastavzakladnifont definujvycet \
-    oref startverze cislonadpisu preskrtnuti uplnyseznamplvouciobjekty nastavtexttexty \
-    tex definujplvouciobjekt tema Slova umistinamrizku setupitemgroup \
-    oznacovani startkomentar settextvariable preskoc Rimskecislice znaky \
-    podtrzeno zadnytest umistirejstrik definujfont nastavvyplnoveradky schovejbloky \
-    definujpodpole definujpole definujbarvu startfakt odkaznatext vyberbloky \
-    tref stopzhustene definujvelikostpapiru definujpaletu nastavverze setupstrut \
-    startdokument oznacverzi nastavrastr nastavvyplnovelinky pozadi nastavtrideni \
-    stopplvouciobjekttext marginalnilinka ukazskupinubarev nastavusporadani nastavlegendu vradku \
-    setuptextposition umistikombinovanyseznam synonymum obrazovka zalozka nastavznaceni \
-    crlf nastavinterakcnimenu stopvycet datum stopmarginalniblok nastavodkazovani \
-    nastavpreskok starttabulky hl uzijexternisoubor nastavzuzeni kopirujpole \
-    uzijprikazy startskryt definujverzi definerule propojenerejstrik nastavcislonadpisu \
-    tenkalinka nastavjazyk nadtrzeni definujbuffer nastavradky setuptextvariable \
-    nastavnadpisy zaramovani startuprava mrizka Znak nastavcernelinky \
-    propojeneznaceni barva startprofil naokraj rozdelplvouciobjekt nastavtlacitka \
-    definujbloksekce nastavsynchronizaci stoptabulky kap mesic nastavhorejsek \
-    nastavpublikace zref stredoveky definujobrazeksymbol stoppozadi definujsablonutabulky \
-    prepninazakladnifont nastavvsechnapole cisla nastavpodtrzeni SLOVO odkaznadatum \
-    ukazpostredizakladnihofontu starttextovalinka definujinterakcnimenu definujodsazovani nastavtabelaci nastavdelitko \
-    nastavodsazovani oznaceni vl definujtrideni stoprovnice startvycet \
-    spodek startbarva nizky poznamka stopprehled nastrane \
-    definujnadpis nastavcitaci startinteraktivnimenu nastavvelikostpapiru startnezhustene zadnedalsisoubory \
-    stoppopis polozka startprotejsek stopmarginalnilinka definujzakladnifont definuj \
-    okr dodrzujverzi definujsymbol popis nastavbuffer matematika \
-    placetextvariable definujupravu vycet 
+    bydliste porovnejskupinubarev roztazene nastavsystem nadtrzeno zadnezahlaviaupati \
+    stoplokalnihoprostredi ziskejznaceni setuppaper pref vyberverzi startlokalni \
+    definujpreskok definujstartstop znaceni*obrazek zlomek cast startodstavec \
+    stopitemgroup aktualnicislonadpisu preskrtnuto nastavmarginalniblok startmarginalnilinka startplvouciobjekttext \
+    startkomponenta definujlogo nastavseznamodkazu textovalinka definujtext mezera \
+    sedabarva dodrzujverziprofilu stopzuzeni nacistsynonyma stopskryt nastavsekci \
+    znak nastavpole jdina opis nastavinterakcniobrazovku resetznaceni \
+    interakcnilista definujtabelaci stopbarva nastavotoceni starttabelator nastavcislostrany \
+    vlasovalinka poznamkapodcarou ukazzakladnifont definujseznam inouter umistiseznamplvouciobjekty \
+    instalacejazyka nastavplvouciobjekty vizrejstrik nastavvzhled pis marginalnitext \
+    nastavupati zadnebilemisto uzijexternidokument rejstrik definujopis startzarovnavani \
+    zarovnanovpravo definerawfont citace bilemisto definujpopis umistiloga \
+    uplnyseznamtridit nastavtextovelinky interakcnitlacitka startlegenda oramovani polozky \
+    pod sekce startrejstrik ukazupravu startcislovaniradku reset \
+    nastavcislovani nastavspodek startsadasymbolu nastavprogramy Znaky stopcislovaniradku \
+    stoptyping program nastavupravu nastavdefinicipoznamekpodcarou vsedniden stoptextovalinka \
+    definujodkaz ukazsadusymbolu starttabulka rozpojeneznaceni stopprostredi korekcebilehomista \
+    VSEDNIDEN symbol podpodtema vyplnovelinky uplnyseznamsynonyma konvertujcislo \
+    jdidolu nastavpopisy tlacitkomenu stopprekryv propojenyrejstrik nastavprostredizakladnihofontu \
+    definujvystup nastavkomentar nivy definujkonverzi stopcitace nastavexterniobrazy \
+    switchtorawfont startpozadi ukazramecek startitemgroup starttyping arg \
+    slovovpravo stoptabulka nacisttridit KAP startpopis startzhustene \
+    nastavdolnitexty zpracujbloky zhustene stopobraz nastavcislovaniradku podtema \
+    umistirovnici synchronizovat dodatek popisky startsynchronizace odkaz \
+    prelozit stopfakt odstavec setupforms startlokalnihoprostredi titul \
+    rezervovatplvouciobjekt definujprofil definujprostredizakladnihofontu tecky stopsadasymbolu ukazvzhled \
+    externiobraz definujprogram umistinadsebe nastavodstavce stoplokalni umistiseznamtridit \
+    uzijkodovani SLOVA stopprojekt odsazovani startrovnice Slovo \
+    ininner nekde zapisdorejstriku ukazvytisk vyplnenytext startjmenozlom \
+    nastavbarvu nastavsadusymbolu aktualnidatum sloupec startmarginalniblok ukazpaletu \
+    stopverze nastavvystup ukaznastaveni definujoramovani scitani startsloupce \
+    startzuzeni stopkomponenta zasobnikpoli nastavtype nastavcislovanistran nastavnadpis \
+    zadneodsazovani footnotetext nastavorez nastavsloupce nastavbloksekce zadneznaceni \
+    nastavtab setuprule synchronizacnilista odkaznastranu nastavpolozky textvariable \
+    bypassblocks nastavplvouciobjekt nastavurl nastavsynonyma zadnamezera definujseznamodkazu \
+    stopodlozit definujznaceni zachovejbloky ukazmrizku dalsioddil nastavpopisek \
+    nop trid verze zapismeziseznam podsekce zablokujinterakcnimenu \
+    typstrany definujskupinubarev uplnykombinovanyseznam nastavvycty publikace definujformatodkazu \
+    umistiplvouciobjekt nastavsynchronizacnilistu nastavrejstrik definujsekci stopradky pozice \
+    stopkomentar nastavzakladnifont definujvycet oref startverze cislonadpisu \
+    preskrtnuti uplnyseznamplvouciobjekty nastavtexttexty tex definujplvouciobjekt tema \
+    Slova umistinamrizku setupitemgroup oznacovani startkomentar settextvariable \
+    preskoc Rimskecislice znaky podtrzeno zadnytest umistirejstrik \
+    definujfont nastavvyplnoveradky schovejbloky definujpodpole definujpole definujbarvu \
+    startfakt odkaznatext vyberbloky tref stopzhustene definujvelikostpapiru \
+    definujpaletu nastavverze setupstrut startdokument oznacverzi nastavrastr \
+    nastavvyplnovelinky pozadi nastavtrideni stopplvouciobjekttext marginalnilinka ukazskupinubarev \
+    nastavusporadani nastavlegendu vradku setuptextposition umistikombinovanyseznam synonymum \
+    obrazovka zalozka nastavznaceni crlf stopvycet datum \
+    stopmarginalniblok nastavodkazovani nastavpreskok starttabulky hl uzijexternisoubor \
+    nastavzuzeni kopirujpole uzijprikazy startskryt definujverzi definerule \
+    propojenerejstrik nastavcislonadpisu tenkalinka nastavjazyk nadtrzeni definujbuffer \
+    nastavradky setuptextvariable forceblocks nastavnadpisy zaramovani startuprava \
+    mrizka nastavcernelinky Znak propojeneznaceni barva startprofil \
+    naokraj rozdelplvouciobjekt nastavtlacitka definujbloksekce nastavsynchronizaci stoptabulky \
+    kap mesic nastavhorejsek nastavpublikace zref stredoveky \
+    definujobrazeksymbol stoppozadi definujsablonutabulky prepninazakladnifont nastavvsechnapole cisla \
+    nastavpodtrzeni SLOVO odkaznadatum ukazpostredizakladnihofontu starttextovalinka definujinterakcnimenu \
+    definujodsazovani nastavtabelaci nastavdelitko nastavodsazovani oznaceni vl \
+    definujtrideni stoprovnice startvycet spodek startbarva nizky \
+    poznamka stopprehled nastrane definujnadpis nastavcitaci startinteraktivnimenu \
+    nastavvelikostpapiru startnezhustene zadnedalsisoubory stoppopis polozka startprotejsek \
+    stopmarginalnilinka definujzakladnifont definuj okr dodrzujverzi definujsymbol \
+    popis nastavbuffer matematika placetextvariable definujupravu vycet 
diff --git a/context/data/cont-cz.tws b/context/data/cont-cz.tws
index bf88d0ff7..3d24d11b8 100644
--- a/context/data/cont-cz.tws
+++ b/context/data/cont-cz.tws
@@ -1072,6 +1072,20 @@ val:*text::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,nizko::
+val:*text::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,nizko::
+val:*text::
+stopsetup
+
+startsetup
 com:sloupec:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:opakovat:
-typ:val/:
-val:repeat/*text::
-stopsetup
-
-startsetup
 com:nastavpopisy:
 typ:vals/vars/:
 val:*jmeno::
@@ -1332,7 +1340,8 @@ var:vzor:*text::
 var:text:*text::
 var:zarovnani:vlevo,nastred,vpravo::
 var:marginalie:standardni,ano,ne,*dimenze::
-var:misto:vlevo,vpravo,vrsek,semknuto, naokraji,vlevo,vpravo,visici::
+var:misto:vlevo,vpravo,vrsek,semknuto,command, naokraji,vlevo,vpravo,visici::
+var:headcommand:::
 var:zaveseni:prizpusobive,siroky,*cislo::
 var:pred:*prikaz::
 var:mezi:*prikaz::
@@ -1874,6 +1883,9 @@ startsetup
 com:nastavumisteniprotejsku:
 typ:var/:
 var:status:start,stop::
+var:pred:*prikaz::
+var:mezi:*prikaz::
+var:po:*prikaz::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:nastavseznam::
 stopsetup
 
 startsetup
+com:umistikombinovanyseznam:
+typ:val/vars/:
+val:*jmeno::
+ivr:nastavkombinovanyseznam::
+stopsetup
+
+startsetup
 com:definujseznam:
 typ:val/val/vars/:
 val:*jmeno::
@@ -2569,6 +2588,13 @@ val:*jmeno::
 stopsetup
 
 startsetup
+com:umistirejstrik:
+typ:val/vars/:
+val:*jmeno::
+ivr:nastavrejstrik::
+stopsetup
+
+startsetup
 com:viz<<rejstrik>>:
 typ:val/arg/idxs/:
 val:*text::
@@ -2947,6 +2973,20 @@ val:*jmeno::
 stopsetup
 
 startsetup
+com:bypassblocks:
+typ:vals/vals/:
+val:*jmeno::
+val:*jmeno::
+stopsetup
+
+startsetup
+com:forceblocks:
+typ:vals/vals/:
+val:*jmeno::
+val:*jmeno::
+stopsetup
+
+startsetup
 com:vyberbloky:
 typ:vals/vals/var/:
 val:*jmeno::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:umisti<<plvouciobjekt>>:
 typ:val/refs/arg/arg/:
-val:vlevo,vpravo,zde,vrsek,spodek, vlevo,vpravo,naokraji,marginalie, levyokraj,pravyokraj,levahrana,pravahrana, innermargin,outermargin,inneredge,outeredge, uvnitr,vnejsi,regel,vysoko,nizko,prizpusobive, stranka,naproti,vzdy,sila,vysoko,reset, radek,vyska,podlehloubky:zde:
+val:vlevo,vpravo,zde,vrsek,spodek, vlevo,vpravo,naokraji,marginalie, levyokraj,pravyokraj,levahrana,pravahrana, innermargin,outermargin,inneredge,outeredge, uvnitr,vnejsi,line,vysoko,nizko,prizpusobive, stranka,naproti,vzdy,sila,vysoko,reset, radek,vyska,podlehloubky:zde:
 val:*text::
 val:*text::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*text::
 var:ken:*text::
 var:dat:*text::
-var:z:*text::
-var:na:*text::
+var:van:*text::
+var:aan:*text::
 var:ref:*text::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*jmeno::
 stopsetup
 
 startsetup
-com:dopisy:
-typ:val/:
-val:*jmeno::
-stopsetup
-
-startsetup
 com:popisky:
 typ:val/:
 val:*jmeno::
 stopsetup
 
 startsetup
-com:nastavkorespondenci:
-typ:vals/:
-val:formeel,informeel,rekening,ls, vysoko,nastred,nizko:formeel,nizko:
-stopsetup
-
-startsetup
-com:nastavlisty:
-typ:vars/:
-var:alternativa:*cislo::
-var:text:*text::
-var:velikost:male,stredni,velke::
-var:pismeno:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...,*prikaz::
-var:cislo:*cislo,spojeno::
-stopsetup
-
-startsetup
-com:list:
-typ:val/:
-val:*text::
-stopsetup
-
-startsetup
-com:nastavetikety:
-typ:vars/:
-var:alternativa:a::
-var:n:*cislo,vse::
-var:misto:marginalie,vlevo,vpravo,nastred::
-stopsetup
-
-startsetup
 com:definujtabelaci:
 typ:val/val/val/:
 val:*jmeno::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:nastavspojeni:
 typ:vars/:
-var:pred:commando::
-var:mezi:commando::
-var:po:commando::
+var:pred:command::
+var:mezi:command::
+var:po:command::
 var:vzdalenost:*dimenze::
 var:vyska:*dimenze,prizpusobive::
 var:sirka:*dimenze,prizpusobive::
-var:misto:boven,midden,onder,links,rechts::
+var:misto:top,middle,bottom,left,right::
 var:zarovnani:ne,vlevo,vpravo,nastred,normalni::
 var:pismeno:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...*prikaz::
 var:barva:*jmeno::
@@ -3560,7 +3564,7 @@ var:keyword:*text::
 stopsetup
 
 startsetup
-com:nastavinterakcnimenu:
+com:definujinterakcnimenu:
 typ:vals/vars/:
 val:vlevo,vpravo,vrsek,spodek,*jmeno::
 var:pred:*prikaz::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:status:start,stop::
 var:alternativa:a,b,c,d,e,f,g::
 var:symbol:ano,ne::
-var:sirka:*dimenze,hoogte,prizpusobive::
-var:vyska:*dimenze,hoogte,prizpusobive::
+var:sirka:*dimenze,height,prizpusobive::
+var:vyska:*dimenze,height,prizpusobive::
 var:hloubka:*dimenze::
 var:barva:*jmeno::
 var:krok:*cislo,male,stredni,velke::
@@ -3676,7 +3680,7 @@ startsetup
 com:nastavsynchronizacnilistu:
 typ:vars/:
 var:alternativa:stranka,lokalne::
-var:sirka:*dimenze,hoogte,prizpusobive::
+var:sirka:*dimenze,height,prizpusobive::
 var:vyska:*dimenze::
 var:pismeno:normalni,tucne,sklonene,tucnesklonene,opis,kap,male...,*prikaz::
 var:barva:*jmeno::
diff --git a/context/data/cont-de-scite.properties b/context/data/cont-de-scite.properties
index 4234c9797..592cd22c1 100644
--- a/context/data/cont-de-scite.properties
+++ b/context/data/cont-de-scite.properties
@@ -5,93 +5,93 @@ keywordclass.macros.context.de=\
     definieren labeltext gefuelltezeile benutzekodierung bei stellefussnotendefinitionein \
     stopueberblick positiontext beschriftung bestimmelistencharakeristika keinzeilenobenundunten unterstrichen \
     synchronisationsbalken bruch stellekopfzeileein startbeschreibung verbergebloecke stellepufferein \
-    startzeilennumerierung amgitterausrichten stoptextlinie stellekorrespondenzein nokap holepuffer \
-    startnameumbruch wortrechts in startfarbe inzeile platziereregister \
-    stelleknopfein waehlepapieraus bemerkung stellezeilenein stopgegenueber amgitterneuausrichten \
-    keinedateienmehr stellehintergruendeein imrechten definetextposition stopzitat stellelinienbreiteein \
-    klonierefeld stellesynonymein zurbox Kaps tooltip programm \
-    benutzeverzeichnis stelleinteraktionsbildschirmein startenger kopierefeld stopabbildung Kap \
-    zeigefarbe konvertierezahl einzug startformel Wort beschriften \
-    korrigierezwischenraum inanderermarginale definieretabulator keinebloeckemehr stellegefuelltesrechteckein stelleinteraktionsbalkenein \
-    stelleanordnenein holebeschriftung stellezwischenraumein ueberstreichen stelleengerein ran \
-    stellestickerein stoppuffer stellemarginallinieein ref verknuepfregister definierestartstop \
-    vollendeauflistenvonsynonyme startspalten startprojekt keinekopfundfusszeilen stelletextobenein stellespracheein \
-    startprodukt kommentar platzierenebeneinander stellefelderin notiz stopinteraktionsmenue \
-    stellespaltenein platzierereferenzliste stoptabulator pos mittelalterlich stopausrichtung \
-    definetextvariable stopdokument unterunterthema startverschieben zeigepalette showsymbolset \
-    startverbergen startausrichtung irgendwo linksbuendig stellekopfzeilentextein unterstreichen \
-    stelleduennerumrissein siehregister kopf stelleseitennummerein startabsatz wiederholen \
-    stellekombinationein einziehen festesspatium rechtsbuendig stopsynchronisation stoplegende \
-    installieresprache heutigesdatum emptylines sym verknuepfebeschriftung stelleprofilein \
-    tab stopfarbe starttextlinie stelleabschnittein definierefeldstapel listsymbol \
-    stellemarginalblockein startzeile tippedatei definierepalette von starttippen \
-    Buchstabe stelleumrahmtein format passendfeld einezeile duennelinie \
-    ausfuellfeld stopzeilen startinteraktionsmenue wechselezumfliesstext stelletabein stopprofil \
-    definetype stelleabsaetzeein doppelseitigespapier stellebindestrichein synonym stoptabelle \
-    zeigefliesstextumgebung stopkleinerdurchschuss but stopgleitobjekttext stopgrosserdurchschuss stellegefuelltezeileein \
-    stoptippen chem definieretabellenvorlage behaltebloecke verwendebefehl feld \
-    stellepaletteein tippen platzierekombiniereliste stelletextumrissein ueberstrichen stelletippenein \
-    bookmark startgleitobjekttext startregister stellelayoutein stelletoleranzein stellefarbenein \
-    definiereinteraktionsmenue startgegenueber tief rechteck startkomponente startlegende \
-    stellegleitobjekteein nachunten vergleichefarbengruppe stelletabellenein setuppaper ueber \
-    definiereabschnittsblock schreibezwischenliste stopumbruch nichteinziehen tiho position \
-    starttabelle stopitemgroup stelleseitenuebergangein stelletipein marginallinie unterunterabsatz \
-    farbe textlinie startsynchronisation stoplokal zitieren definierepapierformat \
-    verweisdatum hoch stellereferenzlisteein definieretext buchstabe tip \
-    definiereeinzug stellenummerierungein stellespatiumein its stellezeilennumerierungein stelleumrahmtetexteein \
-    verweis stellesynchronisationein definieresortieren waehleversionaus stopverschieben startkommentar \
-    monat zeigeeinstellungen stopumgebung blatt startversion unterabsatz \
-    verwendesymbole durchgestrichen verwendeexteresdokument stelledrehenein startzitat stelleurlein \
-    platzieregleitobjekt publikation definiereschrift imlinken folgendeabschnitt definiereregister \
-    stelleformelnein stelleeinzuegein stellefusszeilentextein spalte stopabsatz definerawfont \
-    umrahmtertext kapitel platziereunterformel stelleausgabeein zeigefarbengruppe startmarginallinie \
-    definierenummerierung bearbeitebloecke keintest definierebeschreibungen stopkomponente ladensortieren \
-    ruecksetztenbeschriftung definierelogo registrierefelder stopmarginalblock ausschnitt menueknopf \
-    definiereprogramme definierefarbengruppe stellebeschriftungein platziereauflistenvonsynonyme buchstaben punkt \
-    platzierefussnoten stopnummerierung stellekopfzahlein defineoutput definieresubfeld stoplokaleumgebung \
-    startabbildung keinzwischenraum definieregleitobjekt titel stopzeile stelletextein \
-    anhang seitenreferenz symbol durchstreichen WOCHENTAG gefuelltesrechteck \
-    Woerter nummerierung stelleexterneabbildungenein folgeprofil stopversion keinebeschriftung \
-    startmarginalblock version stelleinteraktionein verknuepftregister referenz switchtorawfont \
-    stellezitierenein stophintergrund unterthema stopkommentar vollendekombiniereliste stelleregisterein \
-    startitemgroup zeigefliesstext stelleueberschriftenein stellefusszeileein arg definiereliste \
-    zentriert platziereliste KAP starttabellen definierefliesstext stellegegenueberplatzierenein \
-    schreibezurreferenzliste stopformel startzeilenkorrektur briefe startpuffer stellelabeltextein \
-    stelletextuntenein definieresynonyme definierefliesstextumgebung definiereblanko absatz startumbruch \
-    setupforms register stellebilderunterschriftein platzierelegende startgegeben stelleblankoein \
-    stellelisteein startumrahmtertext starthintergrund stoppositionieren reservierengleitobjekt stellepostenein \
-    spiegeln verwendemodul stopprojekt stellesystemein startumgebung unter \
-    textreferenz stellegleitobjektein beschreibung definiereabbsymbol roemischezahlen definierereferenz \
-    stellepublikationein feldstapel stelleblattein platziereuntereinander hintergrund verwendeexternedateien \
-    startlokaleumgebung uebersetzten stopnameumbruch stellerechteckein Buchstaben footnotetext \
-    MONAT definierefarbe zeigelayout stopzeilenkorrektur verwendeexternedatei stellepositionierenein \
-    setuprule definiereumrahmt definierebeschreibung definierezusammengestellteliste keineliste startlokalefussnoten \
-    ruecksetzten schreibezumregister textvariable verwendeURL platzierelokalefussnoten zu \
-    wochentag rechtecke startueberblick bestimmekopfnummer nop platzierebookmarks \
-    passelayoutan imumriss entknuepfebeschriftung stelleabschnittsblockein labels definieretippen \
-    stelleprogrammein definierebeschriftung definierepuffer zeigerahmen stellefeldein stellebildunterschriftein \
-    stoptabellen stopoverlay stellefarbeein stellezeilenabstandein vergleichepalette stelleblockein \
-    hauptsprache stelleausschnittein stopumrahmtertext blanko stelleueberschrifttextein tex \
-    definiereabschnitt zeigeumbruch definierelabel definiereumbruch interaktionsbalken name \
-    stelletabulatorein setupitemgroup settextvariable startnummerierung stellehintergrundein stopverbergen \
-    stelleseitennummeriernungein stopgegeben zeigeexterneabbildungen beschrifteversion benutzespezielles zeigestruts \
-    definierekonversion zusatz heutigeskopfnummer sortiere stopzeilennumerierung vollendeauflistenvongleitobjekte \
-    setupstrut startdokument verknuepfedokument stelleabsatznummerierungein kleinerdurchschuss stellerasterein \
-    starttabulator stelleinteraktionsmenueein WORT posten stellefussnotenein seite \
-    umrahmt startzeilen setuptextposition stelleumbruchein drehen folgeversion \
-    crlf folgeprofilversion datum definiereprofil zeigefelder knopf \
-    stopmarginallinie graufarbe schreibezurliste externeabbildung hl synchronisieren \
-    stellelegendeein definerule stelleinmarginalieein kopfnummer ausfuelltext vollendeauflistenvonsortieren \
-    startgrosserdurchschuss definiereoverlay platziereauflistenvonsortieren definiereabsaetze beschriftung*abbildung ziffern \
-    stellezusammengestelltelisteein startoverlay setuptextvariable definiereversion zwischenraum stelleunterstreichenein \
-    sprache stopspalten definiereueberschrift stellesymbolsetein startprofil mathematik \
-    waehlebloeckeaus tippepuffer startpositionieren zitat startsymbolset definiereblock \
-    bildschirm stopbeschreibung stellebeschreibungein thema kap definierereferenzformat \
-    stellefliesstextumgebungein inaktiviereinteraktionsmenue spatium gitter zeigegitter stelleplatziegeteiltegleitobjekt \
-    stopenger stopkombination platzierelogo startkleinerdurchschuss teil Roemischezahlen \
-    ueberschrifttext stelleversionein stopsymbolset stelleeinziehenein gestreckt haarlinie \
-    vl platziereformel duennerumriss stelleversalienein verwendeexterneabbildung stellesortierenein \
-    stellenobenein mar interaktionsknopfe verwendeexternestonstueck aufseite bearbeiteseite \
-    ladensynonyme stelleausrichtungein teilegleitobjekt zeigedruck stellekommentarein stellereferenzierenein \
-    stelleunterseitennummerein definiereumrahmtertext stelletexttexteein keinspatium inmarginalie vollenderegister \
-    fussnote stellefliesstextein startkombination placetextvariable referieren*abbildung verwendebloecke 
+    startzeilennumerierung amgitterausrichten stoptextlinie nokap holepuffer startnameumbruch \
+    wortrechts in startfarbe inzeile platziereregister stelleknopfein \
+    waehlepapieraus bemerkung stellezeilenein stopgegenueber amgitterneuausrichten keinedateienmehr \
+    stellehintergruendeein imrechten definetextposition stopzitat stellelinienbreiteein klonierefeld \
+    stellesynonymein zurbox Kaps tooltip programm benutzeverzeichnis \
+    stelleinteraktionsbildschirmein startenger kopierefeld stopabbildung Kap zeigefarbe \
+    konvertierezahl einzug startformel Wort beschriften korrigierezwischenraum \
+    inanderermarginale definieretabulator keinebloeckemehr stellegefuelltesrechteckein stelleinteraktionsbalkenein stelleanordnenein \
+    holebeschriftung stellezwischenraumein ueberstreichen stelleengerein ran stoppuffer \
+    stellemarginallinieein ref verknuepfregister definierestartstop vollendeauflistenvonsynonyme startspalten \
+    startprojekt keinekopfundfusszeilen stelletextobenein stellespracheein startprodukt kommentar \
+    platzierenebeneinander stellefelderin notiz stopinteraktionsmenue stellespaltenein platzierereferenzliste \
+    stoptabulator pos mittelalterlich stopausrichtung definetextvariable stopdokument \
+    unterunterthema startverschieben zeigepalette showsymbolset startverbergen startausrichtung \
+    irgendwo linksbuendig stellekopfzeilentextein unterstreichen stelleduennerumrissein siehregister \
+    kopf stelleseitennummerein startabsatz stellekombinationein einziehen festesspatium \
+    rechtsbuendig stopsynchronisation stoplegende installieresprache heutigesdatum emptylines \
+    sym verknuepfebeschriftung stelleprofilein tab stopfarbe starttextlinie \
+    stelleabschnittein definierefeldstapel listsymbol stellemarginalblockein startzeile tippedatei \
+    definierepalette von starttippen Buchstabe stelleumrahmtein format \
+    passendfeld einezeile duennelinie ausfuellfeld stopzeilen startinteraktionsmenue \
+    wechselezumfliesstext stelletabein stopprofil definetype stelleabsaetzeein doppelseitigespapier \
+    stellebindestrichein synonym stoptabelle zeigefliesstextumgebung stopkleinerdurchschuss but \
+    stopgleitobjekttext stopgrosserdurchschuss stellegefuelltezeileein stoptippen chem definieretabellenvorlage \
+    behaltebloecke verwendebefehl feld stellepaletteein tippen platzierekombiniereliste \
+    stelletextumrissein ueberstrichen stelletippenein bookmark startgleitobjekttext startregister \
+    stellelayoutein stelletoleranzein stellefarbenein definiereinteraktionsmenue startgegenueber tief \
+    rechteck startkomponente startlegende stellegleitobjekteein nachunten vergleichefarbengruppe \
+    stelletabellenein setuppaper ueber definiereabschnittsblock schreibezwischenliste stopumbruch \
+    nichteinziehen tiho position starttabelle stopitemgroup stelleseitenuebergangein \
+    stelletipein marginallinie unterunterabsatz farbe textlinie startsynchronisation \
+    stoplokal zitieren definierepapierformat verweisdatum hoch stellereferenzlisteein \
+    definieretext buchstabe tip definiereeinzug stellenummerierungein stellespatiumein \
+    its stellezeilennumerierungein stelleumrahmtetexteein verweis stellesynchronisationein definieresortieren \
+    waehleversionaus stopverschieben startkommentar monat zeigeeinstellungen stopumgebung \
+    startversion inouter unterabsatz verwendesymbole durchgestrichen verwendeexteresdokument \
+    stelledrehenein startzitat stelleurlein platzieregleitobjekt publikation definiereschrift \
+    imlinken folgendeabschnitt definiereregister stelleformelnein stelleeinzuegein stellefusszeilentextein \
+    spalte stopabsatz definerawfont umrahmtertext kapitel platziereunterformel \
+    stelleausgabeein zeigefarbengruppe startmarginallinie definierenummerierung bearbeitebloecke keintest \
+    definierebeschreibungen stopkomponente ladensortieren ruecksetztenbeschriftung definierelogo registrierefelder \
+    stopmarginalblock ausschnitt menueknopf definiereprogramme definierefarbengruppe stellebeschriftungein \
+    platziereauflistenvonsynonyme buchstaben punkt platzierefussnoten stopnummerierung stellekopfzahlein \
+    defineoutput definieresubfeld stoplokaleumgebung startabbildung keinzwischenraum definieregleitobjekt \
+    titel stopzeile stelletextein anhang seitenreferenz symbol \
+    durchstreichen WOCHENTAG gefuelltesrechteck Woerter nummerierung stelleexterneabbildungenein \
+    folgeprofil stopversion keinebeschriftung startmarginalblock version stelleinteraktionein \
+    verknuepftregister referenz switchtorawfont stellezitierenein stophintergrund unterthema \
+    stopkommentar vollendekombiniereliste stelleregisterein startitemgroup zeigefliesstext stelleueberschriftenein \
+    stellefusszeileein arg definiereliste zentriert platziereliste KAP \
+    starttabellen definierefliesstext stellegegenueberplatzierenein schreibezurreferenzliste stopformel startzeilenkorrektur \
+    startpuffer stellelabeltextein stelletextuntenein definieresynonyme definierefliesstextumgebung definiereblanko \
+    absatz startumbruch setupforms register stellebilderunterschriftein platzierelegende \
+    startgegeben stelleblankoein stellelisteein startumrahmtertext starthintergrund stoppositionieren \
+    reservierengleitobjekt stellepostenein spiegeln verwendemodul stopprojekt stellesystemein \
+    startumgebung unter textreferenz stellegleitobjektein beschreibung definiereabbsymbol \
+    ininner roemischezahlen definierereferenz stellepublikationein feldstapel platziereuntereinander \
+    hintergrund verwendeexternedateien startlokaleumgebung uebersetzten stopnameumbruch stellerechteckein \
+    Buchstaben footnotetext MONAT definierefarbe zeigelayout stopzeilenkorrektur \
+    verwendeexternedatei stellepositionierenein setuprule definiereumrahmt definierebeschreibung definierezusammengestellteliste \
+    keineliste startlokalefussnoten ruecksetzten schreibezumregister textvariable bypassblocks \
+    verwendeURL platzierezusammengestellteliste platzierelokalefussnoten zu wochentag rechtecke \
+    startueberblick bestimmekopfnummer nop platzierebookmarks passelayoutan imumriss \
+    entknuepfebeschriftung stelleabschnittsblockein labels definieretippen stelleprogrammein definierebeschriftung \
+    definierepuffer zeigerahmen stellefeldein stellebildunterschriftein stoptabellen stopoverlay \
+    stellefarbeein stellezeilenabstandein vergleichepalette stelleblockein hauptsprache stelleausschnittein \
+    stopumrahmtertext blanko stelleueberschrifttextein tex definiereabschnitt zeigeumbruch \
+    definierelabel definiereumbruch interaktionsbalken name stelletabulatorein setupitemgroup \
+    settextvariable startnummerierung stellehintergrundein stopverbergen stelleseitennummeriernungein stopgegeben \
+    zeigeexterneabbildungen beschrifteversion benutzespezielles zeigestruts definierekonversion zusatz \
+    heutigeskopfnummer sortiere stopzeilennumerierung vollendeauflistenvongleitobjekte setupstrut startdokument \
+    verknuepfedokument stelleabsatznummerierungein kleinerdurchschuss stellerasterein starttabulator WORT \
+    posten stellefussnotenein seite umrahmt startzeilen setuptextposition \
+    stelleumbruchein drehen folgeversion crlf folgeprofilversion datum \
+    definiereprofil zeigefelder knopf stopmarginallinie graufarbe schreibezurliste \
+    externeabbildung hl synchronisieren stellelegendeein definerule stelleinmarginalieein \
+    kopfnummer ausfuelltext vollendeauflistenvonsortieren startgrosserdurchschuss definiereoverlay platziereauflistenvonsortieren \
+    definiereabsaetze beschriftung*abbildung ziffern stellezusammengestelltelisteein startoverlay setuptextvariable \
+    definiereversion zwischenraum forceblocks stelleunterstreichenein sprache stopspalten \
+    definiereueberschrift stellesymbolsetein mathematik startprofil waehlebloeckeaus tippepuffer \
+    startpositionieren zitat startsymbolset definiereblock bildschirm stopbeschreibung \
+    stellebeschreibungein thema kap definierereferenzformat stellefliesstextumgebungein inaktiviereinteraktionsmenue \
+    spatium gitter zeigegitter stelleplatziegeteiltegleitobjekt stopenger stopkombination \
+    platzierelogo startkleinerdurchschuss teil Roemischezahlen ueberschrifttext stelleversionein \
+    stopsymbolset stelleeinziehenein gestreckt haarlinie vl platziereformel \
+    duennerumriss stelleversalienein verwendeexterneabbildung stellesortierenein stellenobenein mar \
+    interaktionsknopfe verwendeexternestonstueck aufseite bearbeiteseite ladensynonyme stelleausrichtungein \
+    teilegleitobjekt zeigedruck stellekommentarein stellereferenzierenein stelleunterseitennummerein definiereumrahmtertext \
+    stelletexttexteein keinspatium inmarginalie vollenderegister fussnote stellefliesstextein \
+    startkombination placetextvariable referieren*abbildung verwendebloecke 
diff --git a/context/data/cont-de.tws b/context/data/cont-de.tws
index 30ab7124d..d851d95a6 100644
--- a/context/data/cont-de.tws
+++ b/context/data/cont-de.tws
@@ -1072,6 +1072,20 @@ val:*Text::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,tief::
+val:*Text::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,tief::
+val:*Text::
+stopsetup
+
+startsetup
 com:spalte:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:wiederholen:
-typ:val/:
-val:repeat/*Text::
-stopsetup
-
-startsetup
 com:definierebeschreibungen:
 typ:vals/vars/:
 val:*Name::
@@ -1332,7 +1340,8 @@ var:muster:*Text::
 var:text:*Text::
 var:ausrichtung:links,mittig,rechts::
 var:marginalie:standard,ja,nein,*Dimension::
-var:platz:links,rechts,oben,kleinerabstand, imrand,imlinken,imrechten,haengend::
+var:platz:links,rechts,oben,kleinerabstand,command, imrand,imlinken,imrechten,haengend::
+var:headcommand:::
 var:haengend:passend,breit,*Nummer::
 var:vor:*Befehl::
 var:zwischen:*Befehl::
@@ -1874,6 +1883,9 @@ startsetup
 com:stellegegenueberplatzierenein:
 typ:var/:
 var:status:start,stop::
+var:vor:*Befehl::
+var:zwischen:*Befehl::
+var:nach:*Befehl::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:stellelisteein::
 stopsetup
 
 startsetup
+com:platzierezusammengestellteliste:
+typ:val/vars/:
+val:*Name::
+ivr:stellezusammengestelltelisteein::
+stopsetup
+
+startsetup
 com:definiereliste:
 typ:val/val/vars/:
 val:*Name::
@@ -2569,6 +2588,13 @@ val:*Name::
 stopsetup
 
 startsetup
+com:platziereregister:
+typ:val/vars/:
+val:*Name::
+ivr:stelleregisterein::
+stopsetup
+
+startsetup
 com:sieh<<register>>:
 typ:val/arg/idxs/:
 val:*Text::
@@ -2947,6 +2973,20 @@ val:*Name::
 stopsetup
 
 startsetup
+com:bypassblocks:
+typ:vals/vals/:
+val:*Name::
+val:*Name::
+stopsetup
+
+startsetup
+com:forceblocks:
+typ:vals/vals/:
+val:*Name::
+val:*Name::
+stopsetup
+
+startsetup
 com:waehlebloeckeaus:
 typ:vals/vals/var/:
 val:*Name::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:platziere<<gleitobjekt>>:
 typ:val/refs/arg/arg/:
-val:links,rechts,hier,oben,unten, imlinken,imrechten,imrand,marginalie, linkerrand,rechterrand,linkekante,rechterkante, innermargin,outermargin,inneredge,outeredge, innen,aussen,regel,hoch,tief,passend, seite,gegenueber,immer,zwinge,lang,zuruecksetzten, zeile,hoehe,tiefe:hier:
+val:links,rechts,hier,oben,unten, imlinken,imrechten,imrand,marginalie, linkerrand,rechterrand,linkekante,rechterkante, innermargin,outermargin,inneredge,outeredge, innen,aussen,line,hoch,tief,passend, seite,gegenueber,immer,zwinge,lang,zuruecksetzten, zeile,hoehe,tiefe:hier:
 val:*Text::
 val:*Text::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*Text::
 var:ken:*Text::
 var:dat:*Text::
-var:von:*Text::
-var:zu:*Text::
+var:van:*Text::
+var:aan:*Text::
 var:ref:*Text::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*Name::
 stopsetup
 
 startsetup
-com:briefe:
-typ:val/:
-val:*Name::
-stopsetup
-
-startsetup
 com:labels:
 typ:val/:
 val:*Name::
 stopsetup
 
 startsetup
-com:stellekorrespondenzein:
-typ:vals/:
-val:formeel,informeel,rekening,ls, hoch,mittig,tief:formeel,tief:
-stopsetup
-
-startsetup
-com:stelleblattein:
-typ:vars/:
-var:alternative:*Nummer::
-var:text:*Text::
-var:groesse:klein,mittel,gross::
-var:stil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...,*Befehl::
-var:nummer:*Nummer,keinabstand::
-stopsetup
-
-startsetup
-com:blatt:
-typ:val/:
-val:*Text::
-stopsetup
-
-startsetup
-com:stellestickerein:
-typ:vars/:
-var:alternative:a::
-var:n:*Nummer,alles::
-var:platz:marginalie,links,rechts,mittig::
-stopsetup
-
-startsetup
 com:definieretabulator:
 typ:val/val/val/:
 val:*Name::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:stellekombinationein:
 typ:vars/:
-var:vor:commando::
-var:zwischen:commando::
-var:nach:commando::
+var:vor:command::
+var:zwischen:command::
+var:nach:command::
 var:abstand:*Dimension::
 var:hoehe:*Dimension,passend::
 var:breite:*Dimension,passend::
-var:platz:boven,midden,onder,links,rechts::
+var:platz:top,middle,bottom,left,right::
 var:ausrichtung:nein,links,rechts,mittig,normal::
 var:stil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...*Befehl::
 var:farbe:*Name::
@@ -3560,7 +3564,7 @@ var:keyword:*Text::
 stopsetup
 
 startsetup
-com:stelleinteraktionsmenueein:
+com:definiereinteraktionsmenue:
 typ:vals/vars/:
 val:links,rechts,oben,unten,*Name::
 var:vor:*Befehl::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:status:start,stop::
 var:alternative:a,b,c,d,e,f,g::
 var:symbol:ja,nein::
-var:breite:*Dimension,hoogte,passend::
-var:hoehe:*Dimension,hoogte,passend::
+var:breite:*Dimension,height,passend::
+var:hoehe:*Dimension,height,passend::
 var:tiefe:*Dimension::
 var:farbe:*Name::
 var:schritt:*Nummer,klein,mittel,gross::
@@ -3676,7 +3680,7 @@ startsetup
 com:stellesynchronisationsbalkenein:
 typ:vars/:
 var:alternative:seite,lokal::
-var:breite:*Dimension,hoogte,passend::
+var:breite:*Dimension,height,passend::
 var:hoehe:*Dimension::
 var:stil:normal,fett,geneigt,fettgeneigt,tippen,kap,klein...,*Befehl::
 var:farbe:*Name::
diff --git a/context/data/cont-en-scite.properties b/context/data/cont-en-scite.properties
index 0ae810e40..2092c90f6 100644
--- a/context/data/cont-en-scite.properties
+++ b/context/data/cont-en-scite.properties
@@ -3,95 +3,94 @@ keywordclass.macros.context.en=\
     setuplegend stoplocal definepapersize interactionbar pagereference subject \
     MONTH setuprotate placerule setupbuttons title setupcombinedlist \
     stopenvironment stopnamemakeup keepblocks mirror labeltext month \
-    setupinteractionmenu 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 setupcorrespondence 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 letters underbars startfloattext setuptext footnote \
-    defineprogram button defineframed placelist definebodyfont externalfigure \
-    completelistoffloats couplepage setupheadertexts setuppapersize definestartstop processblocks \
-    its stoplinenumbering enumeration stopmarginrule setuplanguage startversion \
-    definelogo 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 definebuffer \
-    section stretched startmarginblock setupspacing coupledregister definemakeup \
-    startprofile starttabulate typefile stopcombination useexternalfigure startfact \
-    startenumeration showstruts setuptabulate fillinrules domicile placelistofsorts \
-    noindenting stopoverview footnotetext definefield markversion convertnumber \
-    setuprule blackrules subsection blank Word setupnumbering \
-    fillinfield character textvariable defineblank setupreferencelist usemodule \
+    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 domicile 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 setupstickers stopcolor name \
-    setupitemgroup fieldstack wordright settextvariable setupoutput stopfact \
-    definereferenceformat setupfootnotes startpositioning clip setupcaption startlegend \
-    followprofileversion stopdescription startalignment sheet 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 useexternalsoundtrack \
-    setuplist loadsynonyms notopandbottomlines setupblock setupsheets defineinteractionmenu \
-    thinrule setupregister hideblocks setupfillinrules setupheader startsymbolset \
-    writebetweenlist definelabel kap overbar comparepalet setuppositioning \
-    reservefloat from showbodyfont stopalignment language define \
-    useexternaldocument stopsymbolset Caps stoplines usereferences setupfloats \
-    setupbodyfontenvironment definelist synchronizationbar placelocalfootnotes vl startproject \
-    redo 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 
+    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 
diff --git a/context/data/cont-en.tws b/context/data/cont-en.tws
index 05b6edd35..4b0c5a23f 100644
--- a/context/data/cont-en.tws
+++ b/context/data/cont-en.tws
@@ -532,7 +532,7 @@ var:sc:yes,no::
 stopsetup
 
 startsetup
-com:kap:
+com:cap:
 typ:arg/:
 val:*text::
 stopsetup
@@ -1072,6 +1072,20 @@ val:*text::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,low::
+val:*text::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,low::
+val:*text::
+stopsetup
+
+startsetup
 com:column:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:redo:
-typ:val/:
-val:repeat/*text::
-stopsetup
-
-startsetup
 com:setupdescriptions:
 typ:vals/vars/:
 val:*name::
@@ -1332,7 +1340,8 @@ var:sample:*text::
 var:text:*text::
 var:align:left,middle,right::
 var:margin:standard,yes,no,*dimension::
-var:location:left,right,top,serried, inmargin,inleft,inright,hanging::
+var:location:left,right,top,serried,command, inmargin,inleft,inright,hanging::
+var:headcommand:::
 var:hang:fit,broad,*number::
 var:before:*command::
 var:inbetween:*command::
@@ -1874,6 +1883,9 @@ startsetup
 com:setupoppositeplacing:
 typ:var/:
 var:state:start,stop::
+var:before:*command::
+var:inbetween:*command::
+var:after:*command::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:setuplist::
 stopsetup
 
 startsetup
+com:placecombinedlist:
+typ:val/vars/:
+val:*name::
+ivr:setupcombinedlist::
+stopsetup
+
+startsetup
 com:definelist:
 typ:val/val/vars/:
 val:*name::
@@ -2569,6 +2588,13 @@ val:*name::
 stopsetup
 
 startsetup
+com:placeregister:
+typ:val/vars/:
+val:*name::
+ivr:setupregister::
+stopsetup
+
+startsetup
 com:see<<register>>:
 typ:val/arg/idxs/:
 val:*text::
@@ -2947,6 +2973,20 @@ val:*name::
 stopsetup
 
 startsetup
+com:bypassblocks:
+typ:vals/vals/:
+val:*name::
+val:*name::
+stopsetup
+
+startsetup
+com:forceblocks:
+typ:vals/vals/:
+val:*name::
+val:*name::
+stopsetup
+
+startsetup
 com:selectblocks:
 typ:vals/vals/var/:
 val:*name::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:place<<float>>:
 typ:val/refs/arg/arg/:
-val:left,right,here,top,bottom, inleft,inright,inmargin,margin, leftmargin,rightmargin,leftedge,rightedge, innermargin,outermargin,inneredge,outeredge, inner,outer,regel,high,low,fit, page,opposite,always,force,tall,reset, line,height,depth:here:
+val:left,right,here,top,bottom, inleft,inright,inmargin,margin, leftmargin,rightmargin,leftedge,rightedge, innermargin,outermargin,inneredge,outeredge, inner,outer,line,high,low,fit, page,opposite,always,force,tall,reset, line,height,depth:here:
 val:*text::
 val:*text::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*text::
 var:ken:*text::
 var:dat:*text::
-var:from:*text::
-var:to:*text::
+var:van:*text::
+var:aan:*text::
 var:ref:*text::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*name::
 stopsetup
 
 startsetup
-com:letters:
-typ:val/:
-val:*name::
-stopsetup
-
-startsetup
 com:labels:
 typ:val/:
 val:*name::
 stopsetup
 
 startsetup
-com:setupcorrespondence:
-typ:vals/:
-val:formeel,informeel,rekening,ls, high,middle,low:formeel,low:
-stopsetup
-
-startsetup
-com:setupsheets:
-typ:vars/:
-var:alternative:*number::
-var:text:*text::
-var:size:small,medium,big::
-var:style:normal,bold,slanted,boldslanted,type,cap,small...,*command::
-var:number:*number,joinedup::
-stopsetup
-
-startsetup
-com:sheet:
-typ:val/:
-val:*text::
-stopsetup
-
-startsetup
-com:setupstickers:
-typ:vars/:
-var:alternative:a::
-var:n:*number,all::
-var:location:margin,left,right,middle::
-stopsetup
-
-startsetup
 com:definetabulate:
 typ:val/val/val/:
 val:*name::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:setupcombinations:
 typ:vars/:
-var:before:commando::
-var:inbetween:commando::
-var:after:commando::
+var:before:command::
+var:inbetween:command::
+var:after:command::
 var:distance:*dimension::
 var:height:*dimension,fit::
 var:width:*dimension,fit::
-var:location:boven,midden,onder,links,rechts::
+var:location:top,middle,bottom,left,right::
 var:align:no,left,right,middle,normal::
 var:style:normal,bold,slanted,boldslanted,type,cap,small...*command::
 var:color:*name::
@@ -3560,7 +3564,7 @@ var:keyword:*text::
 stopsetup
 
 startsetup
-com:setupinteractionmenu:
+com:defineinteractionmenu:
 typ:vals/vars/:
 val:left,right,top,bottom,*name::
 var:before:*command::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:state:start,stop::
 var:alternative:a,b,c,d,e,f,g::
 var:symbol:yes,no::
-var:width:*dimension,hoogte,fit::
-var:height:*dimension,hoogte,fit::
+var:width:*dimension,height,fit::
+var:height:*dimension,height,fit::
 var:depth:*dimension::
 var:color:*name::
 var:step:*number,small,medium,big::
@@ -3676,7 +3680,7 @@ startsetup
 com:setupsynchronizationbar:
 typ:vars/:
 var:alternative:page,local::
-var:width:*dimension,hoogte,fit::
+var:width:*dimension,height,fit::
 var:height:*dimension::
 var:style:normal,bold,slanted,boldslanted,type,cap,small...,*command::
 var:color:*name::
diff --git a/context/data/cont-it-scite.properties b/context/data/cont-it-scite.properties
index 5f59482e1..a7cbd0270 100644
--- a/context/data/cont-it-scite.properties
+++ b/context/data/cont-it-scite.properties
@@ -1,80 +1,79 @@
 keywordclass.macros.context.it=\
-    nocap notapdp definiscielenco impostatestifondo foglio impostaoggettimobili \
-    impostacombinazioni nientelineecimafondo usablocco etichettatura spaziobianco bastablocchi \
-    impostadescrizioni reimpostamarcatura definiscienumerazione parte frazione sincronizza \
-    caricasinonimi completoelencocombinato accoppiatoregistro griglia scriviinregistro impostabloccosezione \
-    impostapdp chim domicilio testoinstestazioni impostarigovuoto impostatab \
-    ruota impostamaiuscole sopralinee vaia logcampi impostafontdeltesto \
-    impostapulsanti impostacolori marcatura typebuffer impostainmargine definiscirientro \
-    daqualcheparte definiscisottocampo lettera impostadefinizionenotepdp impostasinonimi accoppiacarta \
-    impostamakeup usafiguraesterna nientespazio definiscicampo seguiprofilo impostatesto \
-    arg elemento impostaoutput completoregistro definiscifont definiscitestoincorniciato \
-    enumerazione in definiscilinea impostatesticima definiscielencocombinato bastafile \
-    data definiscirigovuoto impostatabulato impostaurl definiscilistariferimenti impostatype \
-    type circondato marcaversione impostaspaziobianco mettisegnalibro citazione \
-    impostacolore impostaversioni tooltip impostafigureesterne impostafogli impostalegenda \
-    impostatestiincorniciati usasimboli copiacampo referring*figura mettiformula nientelineintestazionepdp \
-    completoelencodioggettimobili lineesottili spostaagriglia impostainterazione definiscimakeup vaiabox \
-    impostarigheriempimento impostamenuinterazione 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 mettielencodisinonimi mettielencodioggettimobili \
-    impostanumerazione usadocumentoesterno indestra al impostacampo campi \
-    mostracornice nienterientro definiscifontgrezzo definisciincorniciato marcatura*figura impostaclippling \
-    definiscicapoversi convertinumero impostaspaziatura prendibuffer pulsantinterazione impostaordinamento \
-    rientro mostramakeup impostamenzione versione impostaspezzamentooggettomobile testoetichetta \
-    tipopagina medievale impostafrancobolli 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 completoelencodisinonimi definisciformatoriferimento completoelencodisorts \
-    commento sottocapoverso pubblicazione vaigiu lineasottile scriviinelenco \
-    passaafontgrezzo Lettere schermo mettioggettomobile descrizione impostatestotesti \
-    usaURL emptylines nop vediregistro lettere impostariferimento \
-    impostalinea inmargine sottosottoargomento tab listsymbol definiscivariabiletesto \
-    selezionaversione rigovuoto adattalayout impostacolonne Cap seguiversioneprofilo \
-    fondo riferimentotesto numeri mettinotepdplocali correggispaziobianco adding \
-    clonacampo colonna impostablocco successivosezione impostaelementi da \
-    impostatransizionepagina impostanumerosottopagina usacartella impostarighe elementi riferimento \
-    tieniblocchi numeriromani tex iniziaregistro paroladestra impostacapoversi \
-    impostalineeriempimento definiscicolore notest sottolinea mettilistariferimenti setupitemgroup \
-    titolo accoppiadocumento elaborablocchi definiscidimensionicarta usacomandi definisciambientefontdeltesto \
-    determinacarattersticheelenco nota start mettivariabiletesto impostalistariferimenti testoincorniciato \
-    matematica impostasistema definiscitesto definisciposizionetesto impostaoggettomobile impostabarrainterazione \
-    scala definiscietichetta clip usafileesterni impostatavolozza impostaallineamento \
-    impostaprofili mettielencocombinato impostacaptions impostaforms impostaprogrammi spezzaoggettomobile \
-    mostrastruts impostarientri adattacampo riservaoggettomobile sort MESE \
-    mostrafontdeltesto testonotapdp lingua coloregrigio CAP pedap \
-    figuraesterna definiscibuffer mostragruppocolori impostanotepdp usacodifica definisciordinamento \
-    appendice sottoargomento mostratavolozza mese PAROLE intorno \
-    setuppaper etichette mettifiancoafianco impostasegnosillabazione impostaposizionetesto definiscifontdeltesto \
-    scrividentroelenco crlf sotto separamarcatura impostalineesottili datareferral \
-    rigariempimento simbolo rif definiscisinonimi ped definiscimenuinterazione \
-    posizione impostarientro inriga definisciregistro hl definiscitesta \
-    segnalibro mostrafiguresterne mettielencodisorts accoppiaregistro linguaprincipale impostalingua \
-    installalingua mostracolore mostrasetsimboli impostaenumerazioni impostacommento allineasinistra \
-    selezionablocchi registro impostaregistro impostasincronizzazione definisciiniziatermina pulsante \
-    impostaposizionamento posizionatesto capoverso impostaampiezzariga lineamargine impostatestointestazioni \
-    impostatestipdp impostaformule impostatestiintestazioni riferimentopagina impostanumerazionerighe impostainstestazione \
-    impostasezione sopralinea mettilinea seguiversione impostainterlinea definisciversion \
-    cap impostapubblicazioni mostraambientefontdeltesto definiscistackcampi pulsantemenu reimposta \
-    mettiunosullaltro definisciprogramma testoinmargine rifai lineatesto lineeriempimento \
-    capitolo stackcampi ap mostragriglia impostacorrispondenza testa \
-    definiscigruppocolori definiscidescrizione allineadestra Parola impostavariabiletesto definiscibloccosezione \
-    usamodulo Numeriromani argomento capello definiscitabulato impostatolleranza \
-    impostaelenco impostablocchimargine riflessione definiscitype sottosottocapoverso impostaparranging \
-    impostanumeropagina datadioggi sfondo nienteelenco definiscisimbolo determinanumerotesta \
-    usafileesterno definiscioggettomobile definisciblocco Caps colore definiscityping \
-    impostalayout sinonimo lineenere GIORNOSETTIMANA definiscioutput impostacima \
-    vl punti mostralyout caricasorts definiscilogo confrontagruppocolori \
-    mettisottoformula impostabuffer prendimarcatura impostalineenere impostacampi mettinotepdp \
-    sottolinee impostasetsimboli spazio barrasincronizzazione 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 \
-    giornosettimana nome impostadimensionicarta definiscisezione stop confrontatavolozza \
-    impostastrut impostateste definiscifigurasimbolo impostanumerazionepagina accoppiamarcatura mettiregistro \
-    el 
+    nocap notapdp definiscielenco impostatestifondo impostaoggettimobili impostacombinazioni \
+    nientelineecimafondo usablocco etichettatura spaziobianco bastablocchi impostadescrizioni \
+    reimpostamarcatura definiscienumerazione parte frazione sincronizza caricasinonimi \
+    completoelencocombinato accoppiatoregistro griglia scriviinregistro impostabloccosezione impostapdp \
+    chim domicilio testoinstestazioni impostarigovuoto impostatab ruota \
+    impostamaiuscole sopralinee vaia logcampi impostafontdeltesto impostapulsanti \
+    impostacolori marcatura typebuffer impostainmargine definiscirientro daqualcheparte \
+    definiscisottocampo lettera impostadefinizionenotepdp impostasinonimi accoppiacarta impostamakeup \
+    usafiguraesterna nientespazio definiscicampo seguiprofilo impostatesto arg \
+    elemento impostaoutput completoregistro definiscifont definiscitestoincorniciato enumerazione \
+    in definiscilinea impostatesticima definiscielencocombinato bastafile data \
+    definiscirigovuoto impostatabulato impostaurl definiscilistariferimenti impostatype type \
+    circondato marcaversione impostaspaziobianco mettisegnalibro citazione impostacolore \
+    impostaversioni tooltip impostafigureesterne impostalegenda impostatestiincorniciati usasimboli \
+    copiacampo referring*figura mettiformula nientelineintestazionepdp completoelencodioggettimobili lineesottili \
+    spostaagriglia impostainterazione definiscimakeup vaiabox 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 mettielencodisinonimi mettielencodioggettimobili impostanumerazione usadocumentoesterno indestra \
+    al impostacampo campi mostracornice nienterientro definiscifontgrezzo \
+    definisciincorniciato marcatura*figura impostaclippling definiscicapoversi forzablocchi convertinumero \
+    impostaspaziatura prendibuffer pulsantinterazione impostaordinamento ininner rientro \
+    mostramakeup impostamenzione versione impostaspezzamentooggettomobile testoetichetta tipopagina \
+    medievale 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 completoelencodisinonimi definisciformatoriferimento saltablocchi completoelencodisorts commento \
+    sottocapoverso pubblicazione vaigiu lineasottile scriviinelenco passaafontgrezzo \
+    Lettere schermo mettioggettomobile descrizione impostatestotesti usaURL \
+    emptylines nop vediregistro lettere impostariferimento impostalinea \
+    inmargine sottosottoargomento tab listsymbol definiscivariabiletesto selezionaversione \
+    rigovuoto adattalayout impostacolonne Cap seguiversioneprofilo fondo \
+    riferimentotesto numeri mettinotepdplocali correggispaziobianco adding clonacampo \
+    colonna impostablocco successivosezione impostaelementi da impostatransizionepagina \
+    impostanumerosottopagina usacartella impostarighe elementi riferimento tieniblocchi \
+    numeriromani tex iniziaregistro paroladestra impostacapoversi impostalineeriempimento \
+    definiscicolore notest sottolinea mettilistariferimenti setupitemgroup titolo \
+    accoppiadocumento elaborablocchi definiscidimensionicarta usacomandi definisciambientefontdeltesto determinacarattersticheelenco \
+    nota start mettivariabiletesto impostalistariferimenti testoincorniciato matematica \
+    impostasistema definiscitesto definisciposizionetesto impostaoggettomobile impostabarrainterazione scala \
+    definiscietichetta clip usafileesterni impostatavolozza impostaallineamento impostaprofili \
+    mettielencocombinato impostacaptions impostaforms impostaprogrammi spezzaoggettomobile mostrastruts \
+    impostarientri adattacampo riservaoggettomobile sort MESE mostrafontdeltesto \
+    testonotapdp lingua coloregrigio CAP pedap figuraesterna \
+    definiscibuffer mostragruppocolori impostanotepdp usacodifica definisciordinamento appendice \
+    sottoargomento mostratavolozza mese PAROLE intorno setuppaper \
+    etichette mettifiancoafianco impostasegnosillabazione impostaposizionetesto definiscifontdeltesto scrividentroelenco \
+    crlf sotto separamarcatura impostalineesottili datareferral rigariempimento \
+    simbolo rif definiscisinonimi ped definiscimenuinterazione posizione \
+    impostarientro inriga definisciregistro hl definiscitesta segnalibro \
+    mostrafiguresterne mettielencodisorts accoppiaregistro linguaprincipale impostalingua installalingua \
+    mostracolore mostrasetsimboli impostaenumerazioni impostacommento allineasinistra selezionablocchi \
+    registro impostaregistro impostasincronizzazione definisciiniziatermina pulsante impostaposizionamento \
+    posizionatesto capoverso impostaampiezzariga lineamargine impostatestointestazioni impostatestipdp \
+    impostaformule impostatestiintestazioni riferimentopagina impostanumerazionerighe impostainstestazione impostasezione \
+    sopralinea mettilinea seguiversione impostainterlinea definisciversion cap \
+    impostapubblicazioni mostraambientefontdeltesto definiscistackcampi pulsantemenu reimposta mettiunosullaltro \
+    definisciprogramma testoinmargine lineatesto lineeriempimento capitolo stackcampi \
+    ap inouter mostragriglia testa definiscigruppocolori definiscidescrizione \
+    allineadestra Parola impostavariabiletesto definiscibloccosezione usamodulo Numeriromani \
+    argomento capello definiscitabulato impostatolleranza impostaelenco impostablocchimargine \
+    riflessione definiscitype sottosottocapoverso impostaparranging impostanumeropagina datadioggi \
+    sfondo nienteelenco definiscisimbolo determinanumerotesta usafileesterno definiscioggettomobile \
+    definisciblocco Caps colore definiscityping impostalayout sinonimo \
+    lineenere GIORNOSETTIMANA definiscioutput impostacima vl punti \
+    mostralyout caricasorts definiscilogo confrontagruppocolori mettisottoformula impostabuffer \
+    prendimarcatura impostalineenere impostacampi mettinotepdp sottolinee impostasetsimboli \
+    spazio barrasincronizzazione 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 giornosettimana nome \
+    impostadimensionicarta definiscisezione stop confrontatavolozza impostastrut impostateste \
+    definiscifigurasimbolo impostanumerazionepagina accoppiamarcatura mettiregistro el 
diff --git a/context/data/cont-it.tws b/context/data/cont-it.tws
index d7b4ca0b6..d35905123 100644
--- a/context/data/cont-it.tws
+++ b/context/data/cont-it.tws
@@ -71,7 +71,7 @@ startsetup
 com:definisciambientefontdeltesto:
 typ:val/vars/:
 val:5pt,...,12pt,default::
-var:text:*dimensione::
+var:testo:*dimensione::
 var:script:*dimensione::
 var:scriptscript:*dimensione::
 var:x:*dimensione::
@@ -1072,6 +1072,20 @@ val:*testo::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,basso::
+val:*testo::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,basso::
+val:*testo::
+stopsetup
+
+startsetup
 com:colonna:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:rifai:
-typ:val/:
-val:repeat/*testo::
-stopsetup
-
-startsetup
 com:impostadescrizioni:
 typ:vals/vars/:
 val:*nome::
@@ -1332,7 +1340,8 @@ var:campione:*testo::
 var:testo:*testo::
 var:allinea:sinistra,centro,destra::
 var:margine:standard,si,no,*dimensione::
-var:luogo:sinistra,destra,cima,vicino, inmargine,insinistra,indestra,sospeso::
+var:luogo:sinistra,destra,cima,vicino,command, inmargine,insinistra,indestra,sospeso::
+var:headcommand:::
 var:sospendi:adatta,ampio,*numero::
 var:prima:*comando::
 var:tra:*comando::
@@ -1874,6 +1883,9 @@ startsetup
 com:impostaposizionamentoopposti:
 typ:var/:
 var:stato:inizia,termina::
+var:prima:*comando::
+var:tra:*comando::
+var:dopo:*comando::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:impostaelenco::
 stopsetup
 
 startsetup
+com:mettielencocombinato:
+typ:val/vars/:
+val:*nome::
+ivr:impostaelencocombinato::
+stopsetup
+
+startsetup
 com:definiscielenco:
 typ:val/val/vars/:
 val:*nome::
@@ -2569,6 +2588,13 @@ val:*nome::
 stopsetup
 
 startsetup
+com:mettiregistro:
+typ:val/vars/:
+val:*nome::
+ivr:impostaregistro::
+stopsetup
+
+startsetup
 com:vedi<<registro>>:
 typ:val/arg/idxs/:
 val:*testo::
@@ -2947,6 +2973,20 @@ val:*nome::
 stopsetup
 
 startsetup
+com:saltablocchi:
+typ:vals/vals/:
+val:*nome::
+val:*nome::
+stopsetup
+
+startsetup
+com:forzablocchi:
+typ:vals/vals/:
+val:*nome::
+val:*nome::
+stopsetup
+
+startsetup
 com:selezionablocchi:
 typ:vals/vals/var/:
 val:*nome::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:metti<<oggettomobile>>:
 typ:val/refs/arg/arg/:
-val:sinistra,destra,qui,cima,fondo, insinistra,indestra,inmargine,margine, marginesinistro,marginedestro,bordosinistro,bordodestro, margineinterno,margineesterno,bordointerno,bordoesterno, interno,esterno,regel,alto,basso,adatta, pagina,opposto,sempre,forza,alto,reimposta, riga,altezza,profondita:qui:
+val:sinistra,destra,qui,cima,fondo, insinistra,indestra,inmargine,margine, marginesinistro,marginedestro,bordosinistro,bordodestro, margineinterno,margineesterno,bordointerno,bordoesterno, interno,esterno,line,alto,basso,adatta, pagina,opposto,sempre,forza,alto,reimposta, riga,altezza,profondita:qui:
 val:*testo::
 val:*testo::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*testo::
 var:ken:*testo::
 var:dat:*testo::
-var:da:*testo::
-var:verso:*testo::
+var:van:*testo::
+var:aan:*testo::
 var:ref:*testo::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*nome::
 stopsetup
 
 startsetup
-com:lettere:
-typ:val/:
-val:*nome::
-stopsetup
-
-startsetup
 com:etichette:
 typ:val/:
 val:*nome::
 stopsetup
 
 startsetup
-com:impostacorrispondenza:
-typ:vals/:
-val:formeel,informeel,rekening,ls, alto,centro,basso:formeel,basso:
-stopsetup
-
-startsetup
-com:impostafogli:
-typ:vars/:
-var:alternativa:*numero::
-var:testo:*testo::
-var:dimensione:piccolo,medio,grande::
-var:stile:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...,*comando::
-var:numero:*numero,unito::
-stopsetup
-
-startsetup
-com:foglio:
-typ:val/:
-val:*testo::
-stopsetup
-
-startsetup
-com:impostafrancobolli:
-typ:vars/:
-var:alternativa:a::
-var:n:*numero,tutti::
-var:luogo:margine,sinistra,destra,centro::
-stopsetup
-
-startsetup
 com:definiscitabulato:
 typ:val/val/val/:
 val:*nome::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:impostacombinazioni:
 typ:vars/:
-var:prima:commando::
-var:tra:commando::
-var:dopo:commando::
+var:prima:command::
+var:tra:command::
+var:dopo:command::
 var:distanza:*dimensione::
 var:altezza:*dimensione,adatta::
 var:ampiezza:*dimensione,adatta::
-var:luogo:boven,midden,onder,links,rechts::
+var:luogo:top,middle,bottom,left,right::
 var:allinea:no,sinistra,destra,centro,normale::
 var:stile:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...*comando::
 var:colore:*nome::
@@ -3560,7 +3564,7 @@ var:parolachiave:*testo::
 stopsetup
 
 startsetup
-com:impostamenuinterazione:
+com:definiscimenuinterazione:
 typ:vals/vars/:
 val:sinistra,destra,cima,fondo,*nome::
 var:prima:*comando::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:stato:inizia,termina::
 var:alternativa:a,b,c,d,e,f,g::
 var:simbolo:si,no::
-var:ampiezza:*dimensione,hoogte,adatta::
-var:altezza:*dimensione,hoogte,adatta::
+var:ampiezza:*dimensione,height,adatta::
+var:altezza:*dimensione,height,adatta::
 var:profondita:*dimensione::
 var:colore:*nome::
 var:passo:*numero,piccolo,medio,grande::
@@ -3676,7 +3680,7 @@ startsetup
 com:impostabarrasincronizzazione:
 typ:vars/:
 var:alternativa:pagina,locale::
-var:ampiezza:*dimensione,hoogte,adatta::
+var:ampiezza:*dimensione,height,adatta::
 var:altezza:*dimensione::
 var:stile:normale,grassetto,inclinato,grassettoinclinato,type,cap,piccolo...,*comando::
 var:colore:*nome::
diff --git a/context/data/cont-nl-scite.properties b/context/data/cont-nl-scite.properties
index e5723f2b6..976151e8b 100644
--- a/context/data/cont-nl-scite.properties
+++ b/context/data/cont-nl-scite.properties
@@ -13,15 +13,15 @@ keywordclass.macros.context.nl=\
     stelkoptekstin Kap reserveerblok stelboventekstenin stelregelsin definieertabulatie \
     stelmargeblokkenin stelvoetnotenin Woord stellabeltekstin startbuffer programma \
     switchnaarkorps stelpositionerenin taal definieersymbool ran gebruikexternfiguur \
-    stelpaletin ref stelpaginanummeringin stopregels registreervelden stopnaamopmaak \
-    woordrechts onderwerp startversie startprodukt stelsheetsin deel \
+    stelpaletin inbinnen ref stelpaginanummeringin stopregels registreervelden \
+    stopnaamopmaak woordrechts onderwerp startversie startprodukt deel \
     toonkleurgroep overstreep invulveld overstrepen steltabin volgversie \
     stoptekstlijn stelkopin definieerblanko typ grijskleur startregels \
     stopregelnummeren stelhoofdin definieerkleur stelveldin volledigeregister gekoppelderegister \
     startverbergen onderstreep volledigesamengesteldelijst romeins stelspatieringin stelsynchronisatiebalkin \
-    stelonderin stelopmaakin stelpapierformaatin plaatsformule definieerkop refereer*figuur \
-    stelkleurin steltaalin definieeromlijnd steltekstvariabelein stellijnin stelinteractiebalkin \
-    stelregisterin noot steluitvoerin subparagraaf stelstickersin sym \
+    stelonderin stelopmaakin stelpapierformaatin about plaatsformule definieerkop \
+    refereer*figuur stelkleurin steltaalin definieeromlijnd steltekstvariabelein stellijnin \
+    stelinteractiebalkin stelregisterin noot steluitvoerin subparagraaf sym \
     schrijftussenlijst stelbovenin definieerkadertekst stopbuffer definieermarkering steltabulatiein \
     inregel tab blokjes stopcommentaar stelsynoniemenin stelblokjesin \
     startdocument eenregel definieertypen stelitemsin startgegeven stopcitaat \
@@ -29,69 +29,69 @@ keywordclass.macros.context.nl=\
     MAAND plaatsopgrid vergelijkkleurgroep steltekstpositiein kadertekst converteernummer \
     vastespaties definieerlijst starttabel plaatslijn stelondertekstenin startvanelkaar \
     startuitlijnen but startachtergrond versie stelformulesin gebruikmodule \
-    margetekst over toonlayout chem definieerbuffer doorlabelen \
-    suggestie gebruikblokken stelsorterenin startregelnummeren steltypenin startkantlijn \
-    opelkaar ontkoppelmarkering startinteractiemenu kantlijn blokkeerinteractiemenu positioneer \
-    definieertype bookmark startregister stelinvullijnenin inlinker toonkorps \
-    toonpalet veld stelonderstrepenin cijfers toonvelden stopgegeven \
-    gebruikgebied stelveldenin labeltekst startopmaak doordefinieren kentekstvariabeletoe \
-    steltolerantiein geenfilesmeer toonkleur stopitemgroup weekdag stopomgeving \
-    stelprofielenin definieerregister letters definieerfiguursymbool doorsprong stopbloktekst \
-    button koppelregister stoponderdeel laadsorteren bijlage interactiebuttons \
-    stelinteractieschermin sorteer volgprofiel geenspatie definieerinteractiemenu its \
-    stelkorpsin steluitlijnenin doorlabel kloonveld laadsynoniemen starttabulatie \
-    plaatsbeeldmerken lijstsymbool spiegel steldoornummerenin gebruikcommandos toonkorpsomgeving \
-    toelichting corrigeerwitruimte naam stelbuttonsin startsmaller stoppositioneren \
-    plaatssamengesteldelijst stopinteractiemenu roteer stopfiguur plaatslijstmetblokken doorspringen \
-    definerawfont stelinteractiemenuin toonprint definieerbeeldmerk herhaal stelversiesin \
-    volledigelijstmetsorteren starttypen startlegenda startoverzicht paginareferentie steltabellenin \
-    pagina gebruiksymbolen stelarrangerenin reset plaatsregister doordefinitie \
-    schrijfnaarlijst vertaal selecteerversie steldoorspringenin huidigedatum volledigelijstmetsynoniemen \
-    definieerkorpsomgeving definieeroverlay startprofiel vergelijkpalet schaal stellijstin \
-    startformule definieerprofiel schrijfnaarreferentielijst hoog plaatstekstvariabele stoptabulatie \
-    hoofdtaal titel rooster plaatslijst WEEKDAG letter \
-    stelpaginanummerin passendveld geenhoofdenvoetregels stelsamengesteldelijstin stelreferentielijstin Letter \
-    regelrechts uit stelblokin doornummering stopcombinatie naarbox \
-    subsubonderwerp definieertabelvorm startregel soortpagina plaatsreferentielijst stelmarkeringin \
-    switchtorawfont definieerprogramma invulregel startitemgroup stelachtergrondin arg \
-    stopdoordefinitie witruimte stelkoppenin stelbrievenin WOORD referentie \
-    KAP starttabellen gebruikexterngeluidsfragment stelteksttekstenin stopdoornummering definieertekstvariabele \
-    wiskunde subsubparagraaf positioneertekst stelformulierenin startnaast stoplokalevoetnoten \
-    bepaallijstkenmerken koptekst definieerstartstop stelalineasin brieven definieerreferentielijst \
-    kopnummer citaat synchroniseer stelvoettekstenin achtergrond register \
-    stopprofiel definieeropmaak WOORDEN stelprogrammasin stopoverzicht startdeelomgeving \
-    paslayoutaan gebruikexternefile haalmarkering tekstvariabele schrijfnaarregister dunnelijn \
-    stelomlijndin Woorden stelciterenin publicatie stoptypen stelblokkopjesin \
-    volgprofielversie volgendesectie startopelkaar haarlijn definieeruitvoer stopvanelkaar \
-    stelkadertekstenin geentest stopopelkaar startlokalevoetnoten omlijnd typefile \
-    startkolommen nietinspringen stelplaatsblokkensplitsenin geenmarkering definieersorteren selecteerblokken \
-    stelkoppeltekenin startcombinatie plaatsvoetnoten stopdeelomgeving usecodering stoplokaal \
-    verbergblokken startpositioneren stelsysteemin stelstrutin synchronisatiebalk hoofdstuk \
-    Letters stopversie verwerkpagina markeer inmarge nop \
-    steldoordefinierenin definieertekst startonderdeel startbloktekst stelblokkopjein stelsectiein \
-    toongrid labels stopdocument plaatsnaastelkaar stopuitstellen regellinks \
-    splitsplaatsblok definieersectieblok gebruikreferenties stoptabellen startnaamopmaak stopoverlay \
-    stopsynchronisatie copieerveld stelwitruimtein items som definieerreferentie \
-    blanko stelkantlijnin stelkorpsomgevingin tex stelachtergrondenin plaatssubformule \
-    stelnummerenin definieer stelplaatsblokin stopnaast doorstrepen stopverbergen \
-    definieerconversie gebruikexterndocument stopkleur geenwitruimte inlijnd clip \
-    startomgeving plaatslijstmetsorteren definieerveldstapel subonderwerp plaatslokalevoetnoten sheet \
-    plaatsblok plaatslijstmetsynoniemen definieersectie startlokaal stopalinea selecteerpapier \
-    gebruikURL stelcommentaarin startalinea stelitemgroepin stopuitlijnen stopformule \
-    naar stellayoutin interactiebalk crlf datum definieerveld \
-    omlaag toonkader plaatsonderelkaar laho koppelpapier hl \
-    stopopmaak stopsymboolset doorstreep stelsubpaginanummerin stopkadertekst definieersynoniemen \
-    startfiguur laag startkadertekst startoverlay stelrefererenin stelrastersin \
-    definieerblok spatie stelkleurenin definieerlijn stelclipin stelroterenin \
-    stelurlin toevoegen inanderemarge stelbufferin definieerfont geenbovenenonderregels \
-    stelregelnummerenin kap synoniem startuitstellen externfiguur stelnaastplaatsenin \
-    invultekst stelinspringenin markeer*figuur startregelcorrectie stelplaatsblokkenin stelblankoin \
-    toonexternefiguren resetmarkering stelparagraafnummerenin scherm kenmerk huidigekopnummer \
-    definieerkleurgroep doornummeren stelpaginaovergangenin stelsectieblokin plaatsbookmarks zieregister \
-    verwerkblokken vl startproject kop toonsymboolset definieerreferentieformaat \
-    tekstreferentie startsymboolset definieerversie stopproject stelexternefigurenin handhaafblokken \
-    mar stelkopnummerin voetnoot steltekstlijnenin startcommentaar definieerpalet \
-    verplaatsopgrid op legeregels definieertekstpositie toonstruts geenblokkenmeer \
-    blokje stelvoetnootdefinitiein punten stelinteractiein stelsymboolsetin toonopmaak \
-    definieersamengesteldelijst mediaeval veldstapel stellijndiktein startkleur stelpapierin \
-    stelsmallerin startmargeblok sub definieersubveld maand dunnelijnen 
+    margetekst toonlayout chem definieerbuffer doorlabelen suggestie \
+    gebruikblokken stelsorterenin startregelnummeren steltypenin startkantlijn opelkaar \
+    ontkoppelmarkering startinteractiemenu kantlijn blokkeerinteractiemenu positioneer definieertype \
+    bookmark startregister stelinvullijnenin inlinker toonkorps toonpalet \
+    veld stelonderstrepenin cijfers toonvelden stopgegeven gebruikgebied \
+    stelveldenin labeltekst startopmaak doordefinieren kentekstvariabeletoe steltolerantiein \
+    geenfilesmeer toonkleur stopitemgroup weekdag stopomgeving stelprofielenin \
+    definieerregister letters definieerfiguursymbool doorsprong stopbloktekst button \
+    koppelregister stoponderdeel laadsorteren bijlage interactiebuttons stelinteractieschermin \
+    sorteer volgprofiel geenspatie definieerinteractiemenu its stelkorpsin \
+    steluitlijnenin doorlabel kloonveld laadsynoniemen starttabulatie plaatsbeeldmerken \
+    lijstsymbool spiegel steldoornummerenin gebruikcommandos toonkorpsomgeving toelichting \
+    corrigeerwitruimte naam stelbuttonsin startsmaller stoppositioneren plaatssamengesteldelijst \
+    stopinteractiemenu roteer stopfiguur plaatslijstmetblokken doorspringen definerawfont \
+    toonprint definieerbeeldmerk stelversiesin volledigelijstmetsorteren starttypen startlegenda \
+    startoverzicht paginareferentie steltabellenin pagina gebruiksymbolen stelarrangerenin \
+    reset plaatsregister doordefinitie schrijfnaarlijst vertaal selecteerversie \
+    steldoorspringenin huidigedatum volledigelijstmetsynoniemen definieerkorpsomgeving definieeroverlay startprofiel \
+    vergelijkpalet schaal stellijstin startformule definieerprofiel schrijfnaarreferentielijst \
+    hoog plaatstekstvariabele stoptabulatie hoofdtaal titel rooster \
+    plaatslijst WEEKDAG letter stelpaginanummerin passendveld geenhoofdenvoetregels \
+    stelsamengesteldelijstin stelreferentielijstin Letter regelrechts uit stelblokin \
+    doornummering stopcombinatie naarbox subsubonderwerp definieertabelvorm startregel \
+    soortpagina plaatsreferentielijst stelmarkeringin switchtorawfont definieerprogramma invulregel \
+    startitemgroup stelachtergrondin arg stopdoordefinitie witruimte stelkoppenin \
+    WOORD referentie KAP starttabellen gebruikexterngeluidsfragment stelteksttekstenin \
+    stopdoornummering definieertekstvariabele wiskunde subsubparagraaf positioneertekst stelformulierenin \
+    startnaast stoplokalevoetnoten bepaallijstkenmerken koptekst definieerstartstop stelalineasin \
+    passeerblokken definieerreferentielijst kopnummer citaat synchroniseer stelvoettekstenin \
+    achtergrond register stopprofiel definieeropmaak WOORDEN stelprogrammasin \
+    stopoverzicht startdeelomgeving paslayoutaan gebruikexternefile haalmarkering tekstvariabele \
+    schrijfnaarregister dunnelijn stelomlijndin Woorden stelciterenin publicatie \
+    stoptypen stelblokkopjesin volgprofielversie volgendesectie startopelkaar haarlijn \
+    definieeruitvoer stopvanelkaar stelkadertekstenin geentest stopopelkaar startlokalevoetnoten \
+    omlijnd typefile startkolommen nietinspringen geenmarkering stelplaatsbloksplitsenin \
+    definieersorteren selecteerblokken stelkoppeltekenin startcombinatie plaatsvoetnoten stopdeelomgeving \
+    usecodering stoplokaal verbergblokken startpositioneren stelsysteemin stelstrutin \
+    synchronisatiebalk hoofdstuk Letters stopversie verwerkpagina markeer \
+    inmarge nop steldoordefinierenin definieertekst startonderdeel startbloktekst \
+    stelblokkopjein stelsectiein toongrid labels stopdocument plaatsnaastelkaar \
+    stopuitstellen regellinks splitsplaatsblok definieersectieblok gebruikreferenties stoptabellen \
+    startnaamopmaak stopoverlay stopsynchronisatie copieerveld stelwitruimtein items \
+    som definieerreferentie blanko stelkantlijnin stelkorpsomgevingin tex \
+    stelachtergrondenin plaatssubformule stelnummerenin definieer stelplaatsblokin stopnaast \
+    doorstrepen stopverbergen definieerconversie gebruikexterndocument stopkleur geenwitruimte \
+    inlijnd clip startomgeving plaatslijstmetsorteren definieerveldstapel subonderwerp \
+    plaatslokalevoetnoten plaatsblok plaatslijstmetsynoniemen definieersectie startlokaal stopalinea \
+    selecteerpapier gebruikURL stelcommentaarin startalinea stelitemgroepin stopuitlijnen \
+    stopformule naar forceerblokken stellayoutin interactiebalk crlf \
+    datum definieerveld omlaag toonkader plaatsonderelkaar laho \
+    koppelpapier hl stopopmaak stopsymboolset doorstreep stelsubpaginanummerin \
+    stopkadertekst definieersynoniemen startfiguur laag startkadertekst inbuiten \
+    startoverlay stelrefererenin stelrastersin definieerblok spatie stelkleurenin \
+    definieerlijn stelclipin stelroterenin stelurlin toevoegen inanderemarge \
+    stelbufferin definieerfont geenbovenenonderregels stelregelnummerenin kap synoniem \
+    startuitstellen externfiguur stelnaastplaatsenin invultekst stelinspringenin markeer*figuur \
+    startregelcorrectie stelplaatsblokkenin stelblankoin toonexternefiguren resetmarkering stelparagraafnummerenin \
+    scherm kenmerk huidigekopnummer definieerkleurgroep doornummeren stelpaginaovergangenin \
+    stelsectieblokin plaatsbookmarks zieregister verwerkblokken vl startproject \
+    kop toonsymboolset definieerreferentieformaat tekstreferentie startsymboolset definieerversie \
+    stopproject stelexternefigurenin handhaafblokken mar stelkopnummerin voetnoot \
+    steltekstlijnenin startcommentaar definieerpalet verplaatsopgrid op legeregels \
+    definieertekstpositie toonstruts geenblokkenmeer blokje stelvoetnootdefinitiein punten \
+    stelinteractiein stelsymboolsetin toonopmaak definieersamengesteldelijst mediaeval veldstapel \
+    stellijndiktein startkleur stelpapierin stelsmallerin startmargeblok sub \
+    definieersubveld maand dunnelijnen 
diff --git a/context/data/cont-nl.tws b/context/data/cont-nl.tws
index 2d2a90cc3..fab1bf37a 100644
--- a/context/data/cont-nl.tws
+++ b/context/data/cont-nl.tws
@@ -71,7 +71,7 @@ startsetup
 com:definieerkorpsomgeving:
 typ:val/vars/:
 val:5pt,...,12pt,default::
-var:text:*maat::
+var:tekst:*maat::
 var:script:*maat::
 var:scriptscript:*maat::
 var:x:*maat::
@@ -1072,6 +1072,20 @@ val:*tekst::
 stopsetup
 
 startsetup
+com:inbinnen:
+typ:val/ref/arg/:
+val:+,-,laag::
+val:*tekst::
+stopsetup
+
+startsetup
+com:inbuiten:
+typ:val/ref/arg/:
+val:+,-,laag::
+val:*tekst::
+stopsetup
+
+startsetup
 com:kolom:
 typ::
 stopsetup
@@ -1192,7 +1206,7 @@ val:*tekst::
 stopsetup
 
 startsetup
-com:over:
+com:about:
 typ:arg/ref/:
 val:*tekst::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:herhaal:
-typ:val/:
-val:repeat/*tekst::
-stopsetup
-
-startsetup
 com:steldoordefinierenin:
 typ:vals/vars/:
 val:*naam::
@@ -1332,7 +1340,8 @@ var:monster:*tekst::
 var:tekst:*tekst::
 var:uitlijnen:links,midden,rechts::
 var:marge:standaard,ja,nee,*maat::
-var:plaats:links,rechts,boven,aanelkaar, inmarge,inlinker,inrechter,hangend::
+var:plaats:links,rechts,boven,aanelkaar,command, inmarge,inlinker,inrechter,hangend::
+var:kopcommando:::
 var:hang:passend,ruim,*getal::
 var:voor:*commando::
 var:tussen:*commando::
@@ -1858,7 +1867,7 @@ ivr:stelomlijndin::
 stopsetup
 
 startsetup
-com:stelplaatsblokkensplitsenin:
+com:stelplaatsbloksplitsenin:
 typ:vars/:
 var:conversie:cijfers,letters,Letters,romeins,Romeins::
 var:regels:*getal::
@@ -1867,13 +1876,16 @@ stopsetup
 startsetup
 com:splitsplaatsblok:
 typ:vars/arg/arg/:
-ivr:stelplaatsblokkensplitsenin::
+ivr:stelplaatsbloksplitsenin::
 stopsetup
 
 startsetup
 com:stelnaastplaatsenin:
 typ:var/:
 var:status:start,stop::
+var:voor:*commando::
+var:tussen:*commando::
+var:na:*commando::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:stellijstin::
 stopsetup
 
 startsetup
+com:plaatssamengesteldelijst:
+typ:val/vars/:
+val:*naam::
+ivr:stelsamengesteldelijstin::
+stopsetup
+
+startsetup
 com:definieerlijst:
 typ:val/val/vars/:
 val:*naam::
@@ -2569,6 +2588,13 @@ val:*naam::
 stopsetup
 
 startsetup
+com:plaatsregister:
+typ:val/vars/:
+val:*naam::
+ivr:stelregisterin::
+stopsetup
+
+startsetup
 com:zie<<register>>:
 typ:val/arg/idxs/:
 val:*tekst::
@@ -2947,6 +2973,20 @@ val:*naam::
 stopsetup
 
 startsetup
+com:passeerblokken:
+typ:vals/vals/:
+val:*naam::
+val:*naam::
+stopsetup
+
+startsetup
+com:forceerblokken:
+typ:vals/vals/:
+val:*naam::
+val:*naam::
+stopsetup
+
+startsetup
 com:selecteerblokken:
 typ:vals/vals/var/:
 val:*naam::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:plaats<<blok>>:
 typ:val/refs/arg/arg/:
-val:links,rechts,hier,boven,onder, inlinker,inrechter,inmarge,marge, linkermarge,rechtermarge,linkerrand,rechterrand, binnenmarge,buitenmarge,binnenrand,buitenrand, binnen,buiten,regel,hoog,laag,passend, pagina,naast,altijd,forceer,lang,reset, regel,hoogte,diepte:hier:
+val:links,rechts,hier,boven,onder, inlinker,inrechter,inmarge,marge, linkermarge,rechtermarge,linkerrand,rechterrand, binnenmarge,buitenmarge,binnenrand,buitenrand, binnen,buiten,line,hoog,laag,passend, pagina,naast,altijd,forceer,lang,reset, regel,hoogte,diepte:hier:
 val:*tekst::
 val:*tekst::
 stopsetup
@@ -3221,48 +3261,12 @@ val:*naam::
 stopsetup
 
 startsetup
-com:brieven:
-typ:val/:
-val:*naam::
-stopsetup
-
-startsetup
 com:labels:
 typ:val/:
 val:*naam::
 stopsetup
 
 startsetup
-com:stelbrievenin:
-typ:vals/:
-val:formeel,informeel,rekening,ls, hoog,midden,laag:formeel,laag:
-stopsetup
-
-startsetup
-com:stelsheetsin:
-typ:vars/:
-var:variant:*getal::
-var:tekst:*tekst::
-var:formaat:klein,middel,groot::
-var:letter:normaal,vet,schuin,vetschuin,type,kap,klein...,*commando::
-var:nummer:*getal,aansluitend::
-stopsetup
-
-startsetup
-com:sheet:
-typ:val/:
-val:*tekst::
-stopsetup
-
-startsetup
-com:stelstickersin:
-typ:vars/:
-var:variant:a::
-var:n:*getal,alles::
-var:plaats:marge,links,rechts,midden::
-stopsetup
-
-startsetup
 com:definieertabulatie:
 typ:val/val/val/:
 val:*naam::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:stelcombinatiesin:
 typ:vars/:
-var:voor:commando::
-var:tussen:commando::
-var:na:commando::
+var:voor:command::
+var:tussen:command::
+var:na:command::
 var:afstand:*maat::
 var:hoogte:*maat,passend::
 var:breedte:*maat,passend::
-var:plaats:boven,midden,onder,links,rechts::
+var:plaats:top,middle,bottom,left,right::
 var:uitlijnen:nee,links,rechts,midden,normaal::
 var:letter:normaal,vet,schuin,vetschuin,type,kap,klein...*commando::
 var:kleur:*naam::
@@ -3560,7 +3564,7 @@ var:trefwoord:*tekst::
 stopsetup
 
 startsetup
-com:stelinteractiemenuin:
+com:definieerinteractiemenu:
 typ:vals/vars/:
 val:links,rechts,boven,onder,*naam::
 var:voor:*commando::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:status:start,stop::
 var:variant:a,b,c,d,e,f,g::
 var:symbool:ja,nee::
-var:breedte:*maat,hoogte,passend::
-var:hoogte:*maat,hoogte,passend::
+var:breedte:*maat,height,passend::
+var:hoogte:*maat,height,passend::
 var:diepte:*maat::
 var:kleur:*naam::
 var:stap:*getal,klein,middel,groot::
@@ -3676,7 +3680,7 @@ startsetup
 com:stelsynchronisatiebalkin:
 typ:vars/:
 var:variant:pagina,lokaal::
-var:breedte:*maat,hoogte,passend::
+var:breedte:*maat,height,passend::
 var:hoogte:*maat::
 var:letter:normaal,vet,schuin,vetschuin,type,kap,klein...,*commando::
 var:kleur:*naam::
diff --git a/context/data/cont-ro-scite.properties b/context/data/cont-ro-scite.properties
index d5992a057..28c783e6c 100644
--- a/context/data/cont-ro-scite.properties
+++ b/context/data/cont-ro-scite.properties
@@ -1,43 +1,43 @@
 keywordclass.macros.context.ro=\
     seteazasortare seteazaurl stoptabel plaseazapegrid afiseazasetari stoplegenda \
-    definestefont punelistadesinonime seteazameniuinteractiune stoplocal faraaliniat definesteenumerare \
-    seteazafloats seteazatextejos punevariabilatext stopnotesubsollocale folosestespeciale textmarginal \
-    faraliniisussijos zidinsaptamana definestemediulfonttext stopmeniuinteractiune seteazatabulatori definestelistacombinata \
-    punedeasuprafiecareia startcomentariu minicitat punerigla puneformula nokap \
-    seteazatitluri startfigura urmeazaversiuneprofil in paginadubla gatablocuri \
-    scrieinlista startnotesubsollocale numereromane seteazadefinireanotasubsol type stopenumerare \
-    buton seteazaecraninteractiune stopblocmarginal potrivestecamp Kaps cuplatregistru \
-    tooltip limba determinacaracteristicilelistei CUVANT referring*figura startcomponenta \
-    Cuvant punelistadeobiectemobile definestetextinconjurat grid stopversiune Kap \
-    aliniatcentru startoverview startimpachetat supralinie seteazafonttext seteazainconjurat \
-    Cuvinte startbuffer definesteblanc trecilafonttext seteazalegenda startlocal \
-    ran afiseazapaleta variabilatext incarcasinonime ref seteazaspatiuinterliniar \
-    referintatext selecteazablocuri marginal reflexie seteazapublicatii seteazacorespondenta \
-    completlistacombinata butoaneinteractiune seteazarotare seteazabarainteractiune startlinie culoaregri \
-    startriglatext undeva typ definestedimensiunehartie enumerare setareoutput \
-    remarca decupleazamarcaje barainteractiune instalarelimba seteazapaleta LUNA \
-    reseteazamarcaje seteazastrut CUVINTE stoptabulate definesteculoare despre \
-    subsubsectiune setarebarasincronizare simbol definesteversiune seteazanumerotarelinii marcaje \
-    stopcitat punelistacombinata afiseazastruts seteazasectiune seteazablocsectiune stopproiect \
-    referinta selecteazaversiune puncte nutesta emptylines seteazatext \
-    firdepar stopbuffer definesteinconjurare definestelistareferinte tab sublinii \
-    listsymbol dezactiveazameniuinteractiune seteazaaspect startdocument faralista notasubsol \
-    definestetabulatori seteazabutoane definestesortare seteazaliniesilabe startaliniere adubuffer \
-    capitol seteazanumerotareparagrafe folosestebloc stopriglatext seteazadescriere seteazacamp \
-    seteazasus startprodus seteazalista stopprofil stoptabele definetype \
-    starttabel startsetsimboluri stopmakeup lapagina but startobiectmobiltext \
-    seteazaaranjareapag injos definesteoverlay chem scala subsubiect \
-    startmediu la seteazaantet definestereferinte liniemargine startmakeup \
-    etichete determinanumartitlu marcheazaversiune definestegrupculori seteazajos startsincronizare \
-    citat setarelimba seteazatranzitiepagina fractie domiciliu definesteprogram \
-    seteazaliniimargine stoplinie camp dute seteazatabele paragraf \
-    puneregistru setuppaper seteazaculoare numartitlucurent stopliniemargine cupleazamarcaje \
-    seteazacombinari seteazaliniesubtire definestebloc framed seteazaversiuni definesterigla \
-    definestesablontabel startproiect stopitemgroup etichetare stopfapt folosestereferinte \
-    seteazasubsol seteazalegendele datareferit mutapegrid aliniat spatiu \
-    seteazafundal stopsincronizare definestesinonim completlistadesortari seteazatyping definestebuffer \
-    seteazatexteticheta afiseazafonttext afiseazaculoare folosestedirector jos impartefloat \
-    definesteconversie titlu punelista seteazaspatiu punelogouri urmeazaprofil \
+    definestefont punelistadesinonime stoplocal faraaliniat definesteenumerare seteazafloats \
+    seteazatextejos punevariabilatext stopnotesubsollocale folosestespeciale textmarginal faraliniisussijos \
+    zidinsaptamana definestemediulfonttext stopmeniuinteractiune seteazatabulatori definestelistacombinata punedeasuprafiecareia \
+    startcomentariu minicitat punerigla puneformula nokap seteazatitluri \
+    startfigura urmeazaversiuneprofil in paginadubla gatablocuri scrieinlista \
+    startnotesubsollocale numereromane seteazadefinireanotasubsol type stopenumerare buton \
+    seteazaecraninteractiune stopblocmarginal potrivestecamp Kaps cuplatregistru tooltip \
+    limba determinacaracteristicilelistei CUVANT referring*figura startcomponenta Cuvant \
+    punelistadeobiectemobile definestetextinconjurat grid stopversiune Kap aliniatcentru \
+    startoverview startimpachetat supralinie seteazafonttext seteazainconjurat Cuvinte \
+    startbuffer definesteblanc trecilafonttext seteazalegenda startlocal ran \
+    afiseazapaleta variabilatext incarcasinonime ref seteazaspatiuinterliniar referintatext \
+    selecteazablocuri marginal reflexie seteazapublicatii completlistacombinata butoaneinteractiune \
+    seteazarotare seteazabarainteractiune startlinie culoaregri startriglatext undeva \
+    typ definestedimensiunehartie enumerare setareoutput remarca decupleazamarcaje \
+    barainteractiune instalarelimba seteazapaleta LUNA reseteazamarcaje seteazastrut \
+    CUVINTE stoptabulate definesteculoare despre subsubsectiune setarebarasincronizare \
+    simbol definesteversiune seteazanumerotarelinii marcaje stopcitat punelistacombinata \
+    afiseazastruts seteazasectiune seteazablocsectiune stopproiect referinta selecteazaversiune \
+    puncte nutesta emptylines seteazatext firdepar stopbuffer \
+    definesteinconjurare definestelistareferinte tab sublinii listsymbol dezactiveazameniuinteractiune \
+    seteazaaspect startdocument faralista notasubsol definestetabulatori seteazabutoane \
+    saripesteblocuri definestesortare seteazaliniesilabe startaliniere adubuffer capitol \
+    seteazanumerotareparagrafe folosestebloc stopriglatext seteazadescriere seteazacamp seteazasus \
+    startprodus seteazalista stopprofil stoptabele definetype starttabel \
+    startsetsimboluri stopmakeup lapagina but startobiectmobiltext seteazaaranjareapag \
+    injos definesteoverlay chem scala subsubiect startmediu \
+    la seteazaantet definestereferinte liniemargine startmakeup etichete \
+    determinanumartitlu marcheazaversiune definestegrupculori seteazajos startsincronizare citat \
+    setarelimba seteazatranzitiepagina fractie domiciliu definesteprogram seteazaliniimargine \
+    stoplinie camp dute seteazatabele paragraf puneregistru \
+    setuppaper seteazaculoare numartitlucurent stopliniemargine cupleazamarcaje seteazacombinari \
+    seteazaliniesubtire definestebloc framed seteazaversiuni definesterigla definestesablontabel \
+    startproiect stopitemgroup etichetare stopfapt folosestereferinte seteazasubsol \
+    seteazalegendele datareferit mutapegrid aliniat spatiu seteazafundal \
+    stopsincronizare definestesinonim completlistadesortari seteazatyping definestebuffer seteazatexteticheta \
+    afiseazafonttext afiseazaculoare folosestedirector jos definesteconversie impartefloat \
+    titlu punelista seteazaspatiu inouter punelogouri urmeazaprofil \
     seteazanumerotarepagina inframed seteazadimensiunihartie starttabele folosestefisiereexterne traduce \
     completlistadeobiectemobile startlinii afiseazafiguriexterne scrieintreliste spatiualb startopozit \
     numere seteazaliniiumplere ascundeblocuri punelistareferinte afiseazacampuri setarepozitie \
@@ -59,12 +59,12 @@ keywordclass.macros.context.ro=\
     faraliniiantetsisubsol startliniemargine linieumplere seteazagrosimelinie definestefonttext stopascundere \
     definesteblocsectiune defineste texttitlu liniinegre apendix startenumerare \
     seteazamarcaje element publicatie setaresincronizare definestesimbol afiseazagrupculoare \
-    litera seteazaaliniat stopparagraf stopculoare seteazacomentariu definesteformatreferinte \
-    numartitlu starttabulate typefile definestestartstop definestepaleta definesteparagraf \
-    scrieinlistareferinte seteazanumarpagina rezervatobiectmobil seteazanumerotare afiseazatiparire stoppozitionare \
-    seteazabuffer definestefloat rigleumplere sim definesteantet startpozitionare \
-    medieval stopoverview footnotetext stopneimpachetat definestestivacampuri urmatorulsectiune \
-    veziregistru logcampuri inlinie seteazastickers startdescriere seteazamediulfonttext \
+    litera ininner seteazaaliniat stopparagraf stopculoare seteazacomentariu \
+    definesteformatreferinte numartitlu starttabulate typefile definestestartstop definestepaleta \
+    definesteparagraf scrieinlistareferinte seteazanumarpagina rezervatobiectmobil seteazanumerotare afiseazatiparire \
+    stoppozitionare seteazabuffer definestefloat rigleumplere sim definesteantet \
+    startpozitionare medieval stopoverview footnotetext stopneimpachetat definestestivacampuri \
+    urmatorulsectiune veziregistru logcampuri inlinie startdescriere seteazamediulfonttext \
     sublinie barasincronizare nume stopsetsimboluri punefatainfata seteazasublinie \
     definesteeticheta jossus nop stopmediu definestealiat definestetyping \
     startcorectielinie definestetexteinconjurate seteazatextesubsol liniesubtire stopdocument stoplinii \
@@ -74,24 +74,24 @@ keywordclass.macros.context.ro=\
     cuvantdreapta stopdescriere pastreazablocuri datacurenta seteazalistareferinte setupitemgroup \
     seteazacoloane startnumerotarelinii nota stopnumemakeup faramarcaje matematica \
     convertestenumar selecteazahartie referit clip impachetat inalt \
-    folosestefisierextern startblocmarginal seteazaclipping seteazatoleranta sheet startfapt \
-    stopopozit seteazaregistru adauga definestedescriere startcombinare punelegenda \
-    afiseazagrid startparagraf startformula butonmeniu registru stoppostponing \
-    cupleazadocument campumplere seteazalinii crlf stopingust startpostponing \
-    afiseazasetsimboluri folosestecodificarea plaseazasemnecarte seteazanotasubsol indentare versiune \
-    hl completlistadesinonime seteazasheets dutebox definesteoutput inaltamargine \
-    seteazatitlu stopaliniere folosestefiguraexterna seteazasinonime completregistru afiseazaaspect \
-    texteticheta incarcasortari seteazatab definestelogo startoverlay stopcorectielinie \
-    subiect seteazaprofile subsectiune definestelista coloana definesteprofil \
-    referintapagina puneobiectmobil seteazablocurimarginale luna seteazarigletext seteazatexttitlu \
-    startingust startprofil proceseazapagina seteazaliniinegre pozitietext seteazaformulare \
-    seteazacampuri startneimpachetat startculoare kap stopimpachetat adumarcaje \
-    seteazasimbol definestesimbolfigura seteazabloc sinonim barasus refa \
-    seteazaculori hartiedubla seteazatype aliniatdreapta faraspatiu seteazafiguriexterne \
-    definestemakeup seteazaenumerare seteazapozitietext spatiifixate vl stopprodus \
-    scrieinregistru seteazainteractiunea stopcomponenta pozitie stopfigura seteazatextesus \
-    definestesectiune definesteregistru folosesteURL seteazavariabilatext mar stopmediulocal \
-    culoare figuraexterna seteazanumarsubpagina proceseazabloc din seteazatextetext \
-    seteazamarginal seteazaprograme folosestemodul liniisubtiri aliniatstanga comparagrupculoare \
-    seteazalistacombinata startnumemakeup definestecamp startmediulocal afiseazamakeup seteazaformule \
-    sub urmeazaversiune definestetext 
+    folosestefisierextern startblocmarginal seteazaclipping seteazatoleranta startfapt stopopozit \
+    seteazaregistru adauga definestedescriere startcombinare punelegenda afiseazagrid \
+    startparagraf startformula butonmeniu registru stoppostponing cupleazadocument \
+    campumplere seteazalinii crlf stopingust startpostponing afiseazasetsimboluri \
+    folosestecodificarea plaseazasemnecarte seteazanotasubsol indentare versiune hl \
+    completlistadesinonime dutebox definesteoutput inaltamargine seteazatitlu stopaliniere \
+    folosestefiguraexterna seteazasinonime completregistru afiseazaaspect texteticheta incarcasortari \
+    seteazatab definestelogo startoverlay stopcorectielinie subiect seteazaprofile \
+    subsectiune definestelista coloana definesteprofil referintapagina puneobiectmobil \
+    seteazablocurimarginale luna seteazarigletext seteazatexttitlu startingust startprofil \
+    proceseazapagina seteazaliniinegre pozitietext seteazaformulare seteazacampuri startneimpachetat \
+    startculoare kap stopimpachetat adumarcaje seteazasimbol definestesimbolfigura \
+    seteazabloc sinonim barasus seteazaculori hartiedubla seteazatype \
+    aliniatdreapta faraspatiu seteazafiguriexterne definestemakeup seteazaenumerare seteazapozitietext \
+    spatiifixate vl stopprodus scrieinregistru seteazainteractiunea stopcomponenta \
+    pozitie stopfigura seteazatextesus forteazablocuri definestesectiune definesteregistru \
+    folosesteURL seteazavariabilatext mar stopmediulocal culoare figuraexterna \
+    seteazanumarsubpagina proceseazabloc din seteazatextetext seteazamarginal seteazaprograme \
+    folosestemodul liniisubtiri aliniatstanga comparagrupculoare seteazalistacombinata startnumemakeup \
+    definestecamp startmediulocal afiseazamakeup seteazaformule sub urmeazaversiune \
+    definestetext 
diff --git a/context/data/cont-ro.tws b/context/data/cont-ro.tws
index bd82534c3..6ff6e4020 100644
--- a/context/data/cont-ro.tws
+++ b/context/data/cont-ro.tws
@@ -1072,6 +1072,20 @@ val:*text::
 stopsetup
 
 startsetup
+com:ininner:
+typ:val/ref/arg/:
+val:+,-,jos::
+val:*text::
+stopsetup
+
+startsetup
+com:inouter:
+typ:val/ref/arg/:
+val:+,-,jos::
+val:*text::
+stopsetup
+
+startsetup
 com:coloana:
 typ::
 stopsetup
@@ -1314,12 +1328,6 @@ typ::
 stopsetup
 
 startsetup
-com:refa:
-typ:val/:
-val:repeat/*text::
-stopsetup
-
-startsetup
 com:seteazadescriere:
 typ:vals/vars/:
 val:*nume::
@@ -1332,7 +1340,8 @@ var:exemplu:*text::
 var:text:*text::
 var:aliniere:stanga,centru,dreapta::
 var:margine:standard,da,nu,*dimensiune::
-var:locatie:stanga,dreapta,sus,serried, inmargine,instanga,indreapta,suspendat::
+var:locatie:stanga,dreapta,sus,serried,command, inmargine,instanga,indreapta,suspendat::
+var:headcommand:::
 var:suspenda:ajustat,broad,*numar::
 var:inainte:*comanda::
 var:intre:*comanda::
@@ -1874,6 +1883,9 @@ startsetup
 com:seteazaplasareaopozita:
 typ:var/:
 var:stare:start,stop::
+var:inainte:*comanda::
+var:intre:*comanda::
+var:dupa:*comanda::
 stopsetup
 
 startsetup
@@ -2022,6 +2034,13 @@ ivr:seteazalista::
 stopsetup
 
 startsetup
+com:punelistacombinata:
+typ:val/vars/:
+val:*nume::
+ivr:seteazalistacombinata::
+stopsetup
+
+startsetup
 com:definestelista:
 typ:val/val/vars/:
 val:*nume::
@@ -2569,6 +2588,13 @@ val:*nume::
 stopsetup
 
 startsetup
+com:puneregistru:
+typ:val/vars/:
+val:*nume::
+ivr:seteazaregistru::
+stopsetup
+
+startsetup
 com:vezi<<registru>>:
 typ:val/arg/idxs/:
 val:*text::
@@ -2947,6 +2973,20 @@ val:*nume::
 stopsetup
 
 startsetup
+com:saripesteblocuri:
+typ:vals/vals/:
+val:*nume::
+val:*nume::
+stopsetup
+
+startsetup
+com:forteazablocuri:
+typ:vals/vals/:
+val:*nume::
+val:*nume::
+stopsetup
+
+startsetup
 com:selecteazablocuri:
 typ:vals/vals/var/:
 val:*nume::
@@ -2994,7 +3034,7 @@ stopsetup
 startsetup
 com:pune<<obiectmobil>>:
 typ:val/refs/arg/arg/:
-val:stanga,dreapta,aici,sus,subsol, instanga,indreapta,inmargine,margine, marginestanga,marginedreapta,bordurastanga,borduradreapta, innermargin,outermargin,inneredge,outeredge, intern,extern,regel,inalt,jos,ajustat, pagina,opus,totdeauna,fortat,inalt,reset, linie,inaltime,adancime:aici:
+val:stanga,dreapta,aici,sus,subsol, instanga,indreapta,inmargine,margine, marginestanga,marginedreapta,bordurastanga,borduradreapta, innermargin,outermargin,inneredge,outeredge, intern,extern,line,inalt,jos,ajustat, pagina,opus,totdeauna,fortat,inalt,reset, linie,inaltime,adancime:aici:
 val:*text::
 val:*text::
 stopsetup
@@ -3058,8 +3098,8 @@ typ:vars/:
 var:bet:*text::
 var:ken:*text::
 var:dat:*text::
-var:dela:*text::
-var:catre:*text::
+var:van:*text::
+var:aan:*text::
 var:ref:*text::
 stopsetup
 
@@ -3221,48 +3261,12 @@ val:*nume::
 stopsetup
 
 startsetup
-com:litere:
-typ:val/:
-val:*nume::
-stopsetup
-
-startsetup
 com:etichete:
 typ:val/:
 val:*nume::
 stopsetup
 
 startsetup
-com:seteazacorespondenta:
-typ:vals/:
-val:formeel,informeel,rekening,ls, inalt,centru,jos:formeel,jos:
-stopsetup
-
-startsetup
-com:seteazasheets:
-typ:vars/:
-var:alternativ:*numar::
-var:text:*text::
-var:dimensiune:mic,mediu,mare::
-var:stil:normal,aldin,inclinat,aldininclinat,type,cap,mic...,*comanda::
-var:numar:*numar,unit::
-stopsetup
-
-startsetup
-com:sheet:
-typ:val/:
-val:*text::
-stopsetup
-
-startsetup
-com:seteazastickers:
-typ:vars/:
-var:alternativ:a::
-var:n:*numar,tot::
-var:locatie:margine,stanga,dreapta,centru::
-stopsetup
-
-startsetup
 com:definestetabulatori:
 typ:val/val/val/:
 val:*nume::
@@ -3461,13 +3465,13 @@ stopsetup
 startsetup
 com:seteazacombinari:
 typ:vars/:
-var:inainte:commando::
-var:intre:commando::
-var:dupa:commando::
+var:inainte:command::
+var:intre:command::
+var:dupa:command::
 var:distanta:*dimensiune::
 var:inaltime:*dimensiune,ajustat::
 var:latime:*dimensiune,ajustat::
-var:locatie:boven,midden,onder,links,rechts::
+var:locatie:top,middle,bottom,left,right::
 var:aliniere:nu,stanga,dreapta,centru,normal::
 var:stil:normal,aldin,inclinat,aldininclinat,type,cap,mic...*comanda::
 var:culoare:*nume::
@@ -3560,7 +3564,7 @@ var:keyword:*text::
 stopsetup
 
 startsetup
-com:seteazameniuinteractiune:
+com:definestemeniuinteractiune:
 typ:vals/vars/:
 val:stanga,dreapta,sus,subsol,*nume::
 var:inainte:*comanda::
@@ -3654,8 +3658,8 @@ typ:vars/:
 var:stare:start,stop::
 var:alternativ:a,b,c,d,e,f,g::
 var:simbol:da,nu::
-var:latime:*dimensiune,hoogte,ajustat::
-var:inaltime:*dimensiune,hoogte,ajustat::
+var:latime:*dimensiune,height,ajustat::
+var:inaltime:*dimensiune,height,ajustat::
 var:inaltime:*dimensiune::
 var:culoare:*nume::
 var:pas:*numar,mic,mediu,mare::
@@ -3676,7 +3680,7 @@ startsetup
 com:setarebarasincronizare:
 typ:vars/:
 var:alternativ:pagina,local::
-var:latime:*dimensiune,hoogte,ajustat::
+var:latime:*dimensiune,height,ajustat::
 var:inaltime:*dimensiune::
 var:stil:normal,aldin,inclinat,aldininclinat,type,cap,mic...,*comanda::
 var:culoare:*nume::
diff --git a/context/data/context.properties b/context/data/context.properties
index 9d25a14c1..84a526d98 100644
--- a/context/data/context.properties
+++ b/context/data/context.properties
@@ -76,6 +76,8 @@ name.context.showcase=texmfstart --file=showcase.pdf --program=context
 name.example.xmlcheck=tidy -xml -errors
 name.example.examplez=texmfstart examplez.rb
 
+name.metafun.mptopdf=texmfstart mptopdf.pl
+
 #   name.context.exampler=cmd /c start /min "Local Example Service" texmfstart exampler.rb --continue
 #   name.context.exampler=texmfstart exampler.rb --continue > /tmp/exampler.log &
 
@@ -113,7 +115,8 @@ command.compile.*.fo=$(name.example.xmlcheck) $(FileNameExt)
 #command.compile.subsystem.$(file.patterns.example)=1
 
 command.build.$(file.patterns.context)=$(name.context.texexec) --pdf $(FileNameExt)
-command.build.$(file.patterns.metafun)=$(name.context.texexec) --pdf --mptex $(FileNameExt)
+# command.build.$(file.patterns.metafun)=$(name.context.texexec) --pdf --mptex $(FileNameExt)
+command.build.$(file.patterns.metafun)=$(name.metafun.mptopdf) $(FileNameExt)
 command.build.$(file.patterns.example)=$(name.context.texexec) --pdf --xml   $(FileNameExt)
 command.build.*.fo=$(name.context.texexec) --pdf --autopdf --xml --use=foxet $(FileNameExt)
 
@@ -380,13 +383,18 @@ if PLAT_WIN
 clear.before.execute=1
 wrap.output=0
 
+eol.mode=CRLF
+ensure.final.line.end=1
+ensure.consistent,line.ends=1
+
 # Editor: file type
 
 default.file.ext=.tex
 
 # Editor: auto completion
 
-autocompleteword.automatic=1
autocomplete.choose.single=0
api.*.tex=t:\sources\cont-en-scite.api

+autocompleteword.automatic=1
autocomplete.choose.single=0

+api.*.tex=t:\sources\cont-en-scite.api

 # Logging
 
 style.errorlist.32=$(font.errorfont)
@@ -426,4 +434,4 @@ style.errorlist.15=$(color.fore.red)
 # Intel Fortran Compiler error
 style.errorlist.16=$(color.fore.red)
 
-# Context: end of file
\ No newline at end of file
+# Context: end of file
diff --git a/metapost/context/base/mp-spec.mp b/metapost/context/base/mp-spec.mp
index ceff7fe90..bef6cd2fa 100644
--- a/metapost/context/base/mp-spec.mp
+++ b/metapost/context/base/mp-spec.mp
@@ -614,9 +614,12 @@ vardef transparent(expr n, t, c) =
        elseif is_spot : spotcolorpattern[bluepart cc]
        else           : dddecimal cc fi ;
   % check if this one is already used
-%   ss := "tr_" & s ;
-%   ss := cleanstring(ss) ;
   ss := cleanstring("tr_" & s) ;
+  % we now have rather unique names, i.e. a color spec of .234 becomes
+  % tr..._234.... and metapost gives a number overflow (parse error)
+  % for variables like tr_12345678 which may result from many decimal
+  % positions (imo mp bug)
+  ss := asciistring(ss) ;
   % efficiency hack
   if expandafter unknown scantokens(ss) :
     ok := false ; % not yet defined
@@ -701,4 +704,4 @@ enddef ;
 
 % spotcolor is already scaled
 
-endinput ;
\ No newline at end of file
+endinput ;
diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index 2609e130f..1f299807a 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -2130,21 +2130,34 @@ enddef ;
 % obscure macros: create var from string and replace - and :
 % (needed for process color id's)
 
-string _clean_ascii[] ;
+string _clean_ascii_[] ;
 
 def register_dirty_chars(expr str) =
     for i = 0 upto length(str)-1 :
-        _clean_ascii[ASCII substring(i,i+1) of str] := "_" ;
+        _clean_ascii_[ASCII substring(i,i+1) of str] := "_" ;
     endfor ;
 enddef ;
 
-register_dirty_chars("+-*/:;.,") ;
+register_dirty_chars("+-*/:;., ") ;
 
 vardef cleanstring (expr s) =
-  save ss ; string ss, si ; ss = "" ;
+  save ss ; string ss, si ; ss = "" ; save i ;
   for i=0 upto length(s) :
     si := substring(i,i+1) of s ;
-    ss := ss & if known _clean_ascii[ASCII si] : _clean_ascii[ASCII si] else : si fi ;
+    ss := ss & if known _clean_ascii_[ASCII si] : _clean_ascii_[ASCII si] else : si fi ;
+  endfor ;
+  ss
+enddef ;
+
+vardef asciistring (expr s) =
+  save ss ; string ss, si ; ss = "" ; save i ;
+  for i=0 upto length(s) :
+    si := substring(i,i+1) of s ;
+    if (ASCII si >= ASCII "0") and (ASCII si <= ASCII "9") :
+        ss := ss & char(scantokens(si) + ASCII "A") ;
+    else :
+        ss := ss & si ;
+    fi ;
   endfor ;
   ss
 enddef ;
@@ -2244,4 +2257,4 @@ enddef ;
 
 % done
 
-endinput ;
\ No newline at end of file
+endinput ;
diff --git a/scripts/context/perl/cont_set.pm b/scripts/context/perl/cont_set.pm
index 9c6d2cbcd..c14cc679c 100644
--- a/scripts/context/perl/cont_set.pm
+++ b/scripts/context/perl/cont_set.pm
@@ -1,7 +1,7 @@
 #D \module
 #D   [       file=cont\_set.pm,
 #D        version=1999.04.01,
-#D          title=General modules, 
+#D          title=General modules,
 #D       subtitle=showing \CONTEXT\ commands,
 #D         author=Hans Hagen,
 #D           date=\currentdate,
@@ -9,187 +9,187 @@
 #D    suggestions={Tobias Burnus \& Taco Hoekater}]
 #C
 #C This module is part of the \CONTEXT\ macro||package and is
-#C therefore copyrighted by \PRAGMA. See licen-en.pdf for 
-#C details. 
+#C therefore copyrighted by \PRAGMA. See licen-en.pdf for
+#C details.
 
-# todo: tacos speed patch 
+# todo: tacos speed patch
 
-#D As always: thanks to Taco and Tobias for testing this 
-#D module and providing suggestions and code snippets as 
-#D well as haunting bugs.  
+#D As always: thanks to Taco and Tobias for testing this
+#D module and providing suggestions and code snippets as
+#D well as haunting bugs.
 
-package cont_set ; 
+package cont_set ;
 
 #D This module (package) deals with providing help information
 #D about the \CONTEXT\ commands. The data needed is derived
 #D from the setup files by \CONTEXT\ itself. The data is
-#D stored in files with suffix \type {tws} (tex work setup). 
-#D This module introduces some subroutines: 
-#D 
+#D stored in files with suffix \type {tws} (tex work setup).
+#D This module introduces some subroutines:
+#D
 #D \starttabulatie[|Tl|p|]
-#D \NC \type {set\_setup\_interface}   \NC sets the primary interface 
-#D                                     to search in \NC \NR 
-#D \NC \type {set\_setup\_title}       \NC sets the title of the main 
-#D                                     window title \NC \NR 
-#D \NC \type {setups\_found}           \NC locate the \type {tws} files 
-#D                                     using the \type {kpsewhich} 
-#D                                     program \NC \NR   
-#D \NC \type {show\_setups}            \NC allocate the radio buttons 
-#D                                     that can be used to select a 
-#D                                     command set \NC \NR 
-#D \NC \type {load\_setup(filename)}   \NC load the names \type {tws} 
-#D                                     file \NC \NR   
-#D \NC \type {load\_setups}            \NC all found command files can 
-#D                                     be loaded at once \NC \NR   
-#D \NC \type {setup\_found(filename)}  \NC this routine returns~1 when    
-#D                                     the file is loaded \NC \NR 
-#D \NC \type {update\_setup}           \NC when we browse the list with 
-#D                                     commands, this routine takes care 
-#D                                     of updating the text area \NC \NR 
-#D \NC \type {change\_setup}           \NC we can manually set the 
-#D                                     command set we want to browse, 
-#D                                     and this routine takes care of 
-#D                                     this \NC \NR 
-#D \NC \type {show\_setup(command)}    \NC context sensitive help can be 
+#D \NC \type {set\_setup\_interface}   \NC sets the primary interface
+#D                                     to search in \NC \NR
+#D \NC \type {set\_setup\_title}       \NC sets the title of the main
+#D                                     window title \NC \NR
+#D \NC \type {setups\_found}           \NC locate the \type {tws} files
+#D                                     using the \type {kpsewhich}
+#D                                     program \NC \NR
+#D \NC \type {show\_setups}            \NC allocate the radio buttons
+#D                                     that can be used to select a
+#D                                     command set \NC \NR
+#D \NC \type {load\_setup(filename)}   \NC load the names \type {tws}
+#D                                     file \NC \NR
+#D \NC \type {load\_setups}            \NC all found command files can
+#D                                     be loaded at once \NC \NR
+#D \NC \type {setup\_found(filename)}  \NC this routine returns~1 when
+#D                                     the file is loaded \NC \NR
+#D \NC \type {update\_setup}           \NC when we browse the list with
+#D                                     commands, this routine takes care
+#D                                     of updating the text area \NC \NR
+#D \NC \type {change\_setup}           \NC we can manually set the
+#D                                     command set we want to browse,
+#D                                     and this routine takes care of
+#D                                     this \NC \NR
+#D \NC \type {show\_setup(command)}    \NC context sensitive help can be
 #D                                     provided by calling this sub \NC \NR
 #D \stoptabulatie
-#D 
-#D First we load some packages and set some constants. 
+#D
+#D First we load some packages and set some constants.
 
 use Tk ;
 use Tk::ROText ;
-use Config ; 
+use Config ;
 
 use strict;
 
 use subs qw/ update_setup / ;
 
 my $dosish       = ($Config{'osname'} =~ /dos|win/i) ;
-my $default_size = $dosish ? 9 : 12 ; 
+my $default_size = $dosish ? 9 : 12 ;
 
 my $textfont     = "Courier   $default_size       " ;
 my $userfont     = "Courier   $default_size italic" ;
 my $buttonfont   = "Helvetica $default_size bold  " ;
 
-unless ($dosish) 
+unless ($dosish)
   { $textfont   = "-adobe-courier-bold-r-normal--$default_size-120-75-75-m-70-iso8859-1" ;
     $userfont   = "-adobe-courier-bold-o-normal--$default_size-120-75-75-m-70-iso8859-1" ;
     $buttonfont = "-adobe-helvetica-bold-r-normal--$default_size-120-75-75-p-69-iso8859-1" }
- 
-my $s_vertical   = 30 ; 
-my $s_horizontal = 72 ; 
-my $c_horizontal = 24 ; 
 
-#D The main window is not resizable, but the text area and 
-#D command list will have scrollbars. 
+my $s_vertical   = 30 ;
+my $s_horizontal = 72 ;
+my $c_horizontal = 24 ;
+
+#D The main window is not resizable, but the text area and
+#D command list will have scrollbars.
 
-my %lw ; # stack of lists 
+my %lw ; # stack of lists
 
 my $mw = MainWindow -> new ( -title => 'ConTeXt commands' ) ;
 
-$mw -> withdraw() ; $mw -> resizable ('y', 'y') ; 
+$mw -> withdraw() ; $mw -> resizable ('y', 'y') ;
 
-sub SetupWindow { return $mw } ; 
+sub SetupWindow { return $mw } ;
 
-my $bw = $mw -> Frame () ; # buttons 
-my $tw = $mw -> Frame () ; # sw + fw 
-my $fw = $tw -> Frame () ; # string + list 
+my $bw = $mw -> Frame () ; # buttons
+my $tw = $mw -> Frame () ; # sw + fw
+my $fw = $tw -> Frame () ; # string + list
 
-my $request  = $fw -> Entry (       -font => $textfont , 
+my $request  = $fw -> Entry (       -font => $textfont ,
                               -background => 'ivory1' ,
-                                   -width => $c_horizontal ) ; 
+                                   -width => $c_horizontal ) ;
 
 my $cw       = $fw -> Scrolled (             'Listbox'     ,
                               -scrollbars => 'e'           ,
                                     -font => $textfont     ,
-                                   -width => $c_horizontal ,  
+                                   -width => $c_horizontal ,
                         -selectbackground => 'gray'        ,
                               -background => 'ivory1'      ,
                               -selectmode => 'browse'      ) ;
 
 $cw      -> pack ( -side => 'bottom' , -fill => 'both' , -expand => 1 ) ;
-$request -> pack ( -side => 'top'    , -fill => 'x' ) ; 
+$request -> pack ( -side => 'top'    , -fill => 'x' ) ;
 
 my $sw = $tw -> Scrolled (                'ROText'      ,
                            -scrollbars => 'se'          ,
-                               -height => $s_vertical   ,  
-                                -width => $s_horizontal ,  
+                               -height => $s_vertical   ,
+                                -width => $s_horizontal ,
                                  -wrap => 'none'        ,
                            -background => 'ivory1'      ,
                                  -font => $textfont     ) ;
 
 
-#D And the whole bunch of widgets are packed in the main 
-#D window. 
+#D And the whole bunch of widgets are packed in the main
+#D window.
 
-sub pack_them_all 
+sub pack_them_all
   { $sw -> pack ( -side => 'left'  , -fill => 'both' , -expand => 1 ) ;
-    $fw -> pack ( -side => 'right' , -fill => 'y'    , -expand => 0 ) ; 
+    $fw -> pack ( -side => 'right' , -fill => 'y'    , -expand => 0 ) ;
     $bw -> pack ( -side => 'top'   , -fill => 'x'    , -anchor => 'w'  , -expand => 1 ) ;
     $tw -> pack ( -side => 'bottom', -fill => 'both' , -expand => 1 ) }
 
-sub unpack_them_all 
+sub unpack_them_all
   { }
 
-pack_them_all ; 
+pack_them_all ;
 
 #D We scan for available setup files, with suffix \type {tws}.
 #D These should be somewhere on the system, grouped in one
 #D directory. At least the english file \type {cont-en.tws}
-#D should be found. 
+#D should be found.
 
-my $tws_path        = '' ; 
-my @setup_files     = ('cont-en.tws') ; 
-my $setup_file      = $setup_files[0] ; 
-my $setup_interface = 'en' ; 
+my $tws_path        = '' ;
+my @setup_files     = ('cont-en.tws') ;
+my $setup_file      = $setup_files[0] ;
+my $setup_interface = 'en' ;
 my $old_setup_file  = '' ;
 
-sub set_setup_interface 
-  { $setup_interface = shift } 
+sub set_setup_interface
+  { $setup_interface = shift }
 
-sub set_setup_title 
+sub set_setup_title
   { $mw -> configure ( -title => shift ) }
 
-sub setups_found  
-  { $tws_path = `kpsewhich --format="other text files" --progname=context cont-en.tws` ; 
-    $tws_path =~ s/cont-en\.tws.*// ; 
-    chop $tws_path ; 
-    @setup_files = glob ("$tws_path*.tws") ; 
-    if (@setup_files) 
-      { foreach (@setup_files) { s/\.tws// ; s/.*\/// } 
+sub setups_found
+  { $tws_path = `kpsewhich --format="other text files" --progname=context cont-en.tws` ;
+    $tws_path =~ s/cont-en\.tws.*// ;
+    chop $tws_path ;
+    @setup_files = glob ("$tws_path*.tws") ;
+    if (@setup_files)
+      { foreach (@setup_files) { s/\.tws// ; s/.*\/// }
         $setup_file = $setup_files[0] ;
-        return 1 } 
-    else 
-      { return 0 } } 
+        return 1 }
+    else
+      { return 0 } }
 
-#D A hide button 
+#D A hide button
 
 sub show_hide_button
   { my $hb = $bw -> Button (     -text => "hide" ,
-                                 -font => $buttonfont    , 
-                               command => \&hide_widget  ) ;
-    $hb -> pack ( -padx => '2p', 
-                  -pady => '2p', 
-                  -side => 'right' ) } 
+                                  -font => $buttonfont    ,
+                               -command => \&hide_widget  ) ;
+    $hb -> pack ( -padx => '2p',
+                  -pady => '2p',
+                  -side => 'right' ) }
 
-sub hide_widget 
-  { $mw -> withdraw() } 
+sub hide_widget
+  { $mw -> withdraw() }
 
-#D The setup files can be shown and chosen. 
+#D The setup files can be shown and chosen.
 
-sub show_setups 
-  { unpack_them_all ; 
+sub show_setups
+  { unpack_them_all ;
     foreach (@setup_files)
-      { $lw{$_} = $bw -> Radiobutton (     -text => lc $_          , 
-                                          -value => $_             , 
-                                           -font => $buttonfont    , 
+      { $lw{$_} = $bw -> Radiobutton (     -text => lc $_          ,
+                                          -value => $_             ,
+                                           -font => $buttonfont    ,
                                     -selectcolor => 'ivory1'       ,
-                                    -indicatoron => 0              , 
+                                    -indicatoron => 0              ,
                                          command => \&change_setup ,
                                        -variable => \$setup_file   ) ;
-        $lw{$_} -> pack ( -padx => '2p', 
-                          -pady => '2p', 
-                          -side => 'left' ) } 
+        $lw{$_} -> pack ( -padx => '2p',
+                          -pady => '2p',
+                          -side => 'left' ) }
     pack_them_all }
 
 $cw -> bind ('<B1-Motion>', \&update_setup ) ;
@@ -207,36 +207,36 @@ $sw -> tag ('configure', 'par'      ,   -lmargin1 => '4m'      ,
                                         -lmargin2 => '6m'      ) ;
 
 my %setups ;
-my %commands ;   
-my %loadedsetups ; 
-my %positions ; 
-my %crosslinks ; 
+my %commands ;
+my %loadedsetups ;
+my %positions ;
+my %crosslinks ;
 
-my $current_setup  = '' ; 
+my $current_setup  = '' ;
 
 #D Setups are organized in files called \type {*.tws} and
 #D alike. Several files can be loaded simultaneously. When
 #D loading, we grab whole paragraphs. The variables and values
 #D belonging to a command, are stored in the hash table \type
 #D {setups}, one per language. The command templates are
-#D stored in \type {commands}. 
-#D 
+#D stored in \type {commands}.
+#D
 #D A \type {tws} file is generated by \CONTEXT\ from the setup
 #D definition files. Only \CONTEXT\ knows the current meaning
 #D of commands and keywords. The files are generating by
-#D simply saying something like: 
-#D 
+#D simply saying something like:
+#D
+#D \starttypen
+#D texexec  --interface=en  setupd
+#D texexec  --interface=de  setupd
+#D texexec  --interface=nl  setupd
+#D texexec  --interface=cz  setupd
+#D texexec  --interface=it  setupd
+#D \stoptypen
+#D
+#D This results in files formatted as:
+#D
 #D \starttypen
-#D texexec  --interface=en  setupd  
-#D texexec  --interface=de  setupd  
-#D texexec  --interface=nl  setupd  
-#D texexec  --interface=cz  setupd  
-#D texexec  --interface=it  setupd  
-#D \stoptypen 
-#D 
-#D This results in files formatted as: 
-#D 
-#D \starttypen 
 #D startsetup
 #D com:setupcolors
 #D typ:vars/
@@ -249,22 +249,22 @@ my $current_setup  = '' ;
 #D \stoptypen
 #D
 #D This format can be stored rather efficient and parsed rather
-#D fast. What more do we need.  
+#D fast. What more do we need.
 
-sub load_setup 
-  { my $filename = shift ; 
+sub load_setup
+  { my $filename = shift ;
     unless (keys %{$commands{$filename}})
       { local $/ = 'stopsetup' ; # in plaats van '' ivm unix ; (taco)
-        $current_setup = '' ; 
+        $current_setup = '' ;
         if (open(SETUP, "$tws_path$filename.tws" ))
-          { my $position = 0 ; 
+          { my $position = 0 ;
             while (<SETUP>)
               { chomp  ;
                 s/startsetup//mso ;
-                s/stopsetup//mso ; # redundant geworden 
+                s/stopsetup//mso ; # redundant geworden
                 s/\r\n //gms ;     # in plaats van s/ //gms ; (taco)
                 s/com\:(.*?)\:\s(.*)//mso ;
-                my $string = $1 ; 
+                my $string = $1 ;
                 my $command = $1 ;
                 my $setup = $2 ;
                 ++$position ;
@@ -280,20 +280,20 @@ sub load_setup
     $cw -> selectionSet ('0.0', '0.0') ;
     $cw -> activate ('0.0') ;
     $setup_file = $filename ;
-    update_setup } 
+    update_setup }
 
-sub load_setups 
+sub load_setups
   { foreach my $setup (@setup_files) { load_setup ($setup) } ;
     $mw -> deiconify() }
 
-#D The core of this module deals with transforming the 
-#D definitions like shown earlier. Details on the format 
-#D can be found in the file \type {setupd.tex}. We use the 
-#D \type {Tk::Text} automatic hanging identation features. 
-#D The next subs are examples of the kind you write once 
+#D The core of this module deals with transforming the
+#D definitions like shown earlier. Details on the format
+#D can be found in the file \type {setupd.tex}. We use the
+#D \type {Tk::Text} automatic hanging identation features.
+#D The next subs are examples of the kind you write once
 #D and never look at again.
 
-my @arguments      = () ;  
+my @arguments      = () ;
 my $nested_setup   = 0  ;
 my $continue_setup = 0  ;
 my $argument       = 0  ;
@@ -344,23 +344,23 @@ sub show_command
         $stopsuffix = $2 } }
 
 sub show_left_argument
-  { local $_ = shift ; 
+  { local $_ = shift ;
     my @thearg = split (/\//, $arg{$arguments[$_]}) ;
     $sw -> insert ('end', $thearg[1], ['par',$thearg[0]] ) }
 
 sub show_middle_argument
-  { local $_ = shift ; 
+  { local $_ = shift ;
     my @thearg = split (/\//, $arg{$arguments[$_]}) ;
     if ($thearg[1])
-      { $sw -> insert ('end', $thearg[2], 'par' ) } 
+      { $sw -> insert ('end', $thearg[2], 'par' ) }
     else
       { $sw -> insert ('end', $thearg[2], ['par',$thearg[0]] ) } }
 
 sub show_right_argument
-  { local $_ = shift ; 
+  { local $_ = shift ;
     my @thearg = split (/\//, $arg{$arguments[$_]}) ;
     $sw -> insert ('end', $thearg[3], ['par',$thearg[0]] ) ;
-    ++$argument }  
+    ++$argument }
 
 sub show_reference
   { if (($nested_setup<=1)&&(defined($arguments[$argument])))
@@ -371,7 +371,7 @@ sub show_reference
             show_right_argument ($argument) } } }
 
 sub show_stop_command
-  { my $before_stop = shift ; 
+  { my $before_stop = shift ;
     if ($stopcommand)
       { if ($stopsuffix)
           { $sw -> insert ('end', '\\stop', 'command' ) ;
@@ -380,23 +380,23 @@ sub show_stop_command
           { $sw -> insert ('end', $stopcommand, 'command' ) } } }
 
 sub show_whatever_left
-  { while ($argument<@arguments) 
+  { while ($argument<@arguments)
       { $sw -> insert ('end', "\n" ) ;
         show_left_argument ($argument) ;
         show_middle_argument ($argument) ;
-        show_right_argument ($argument) ; 
-        ++$argument } 
+        show_right_argument ($argument) ;
+        ++$argument }
     if ($stopcommand)
       { $sw -> insert ('end', "\n...\n...\n...\n", 'par') ;
         show_stop_command } }
 
-sub do_update_setup                # type: 0=all 1=vars 2=vals 
-  { my ($command, $type) = @_ ; 
+sub do_update_setup                # type: 0=all 1=vars 2=vals
+  { my ($command, $type) = @_ ;
     my $setup = $setups{$setup_file}{$command} ;
-    my $default = '' ; 
-    my $key = '' ; 
-    my $meaning = '' ; 
-    my @values = () ; 
+    my $default = '' ;
+    my $key = '' ;
+    my $meaning = '' ;
+    my @values = () ;
     local $_ ;
     ++$nested_setup ;
     while ($setup=~/(typ|var|val|ivr|ivl)\:(.*?)\:\s/mgo)
@@ -405,9 +405,9 @@ sub do_update_setup                # type: 0=all 1=vars 2=vals
         if    (($key=~/var/o)&&($type!=2))
           { $_ = $meaning ; s/(.*?)\:(.*?)\:(.*)//o ;
             if (($nested_setup>1)&&(!$2)) { next }
-            $key = $1 ; 
+            $key = $1 ;
             if ($3) { $default = $3 } else { $default = '' }
-            $_= $2 ; s/\s//go ; @values = split (/,/,$_) ; 
+            $_= $2 ; s/\s//go ; @values = split (/,/,$_) ;
             if ($continue_setup)
               { $sw -> insert ('end', ",\n ", 'par') }
             else
@@ -419,8 +419,8 @@ sub do_update_setup                # type: 0=all 1=vars 2=vals
            #while (1)
             while (@values)
               { my $value = shift @values ;
-                if ($value =~ /^\*/o) 
-                  { $value =~ s/^\*//o ; 
+                if ($value =~ /^\*/o)
+                  { $value =~ s/^\*//o ;
                     $sw -> insert ('end', lc $value, ['variable','par'] ) }
                 elsif ($value eq $default)
                   { $sw -> insert ('end', $value, ['default','par'] ) }
@@ -442,10 +442,10 @@ sub do_update_setup                # type: 0=all 1=vars 2=vals
             show_left_argument($argument) ;
            #while (1)
             while (@values)
-              { unless (@values) { last } 
+              { unless (@values) { last }
                 my $value = shift (@values) ;
                 if ($value =~ /^\*/o)
-                  { $value =~ s/^\*//o ; 
+                  { $value =~ s/^\*//o ;
                     $sw -> insert ('end', lc $value, ['variable','par'] ) }
                 elsif ($value eq $default)
                   { $sw -> insert ('end', $value, ['default','par'] ) }
@@ -467,13 +467,13 @@ sub do_update_setup                # type: 0=all 1=vars 2=vals
                    $arguments =~ s/stp//go }
                @arguments = split (/\//,$arguments) ;
                if (@arguments)
-                 { for (my $i=0;$i<@arguments;$i++)  
+                 { for (my $i=0;$i<@arguments;$i++)
                     { show_left_argument ($i) ;
                       show_middle_argument ($i) ;
                       show_right_argument ($i) }
-                   if ($stopcommand) 
+                   if ($stopcommand)
                      { $sw -> insert ('end', ' ... ') ;
-                       show_stop_command } 
+                       show_stop_command }
                    $sw -> insert ('end', "\n\n") ;
                    show_command ($command) }
                $argument = 0 ;
@@ -486,23 +486,23 @@ sub do_update_setup                # type: 0=all 1=vars 2=vals
             do_update_setup ($1,2) }
         show_reference }
    --$nested_setup ;
-   if (($continue_setup)&&(!$nested_setup)) 
+   if (($continue_setup)&&(!$nested_setup))
      { show_right_argument ;
        show_whatever_left } }
 
 #D Now the real work is done, we only have to define a few
-#D housekeeping routines. The next sub adapts the text area 
-#D to the current selected command and normally is bound to 
-#D the list browsing commands. 
+#D housekeeping routines. The next sub adapts the text area
+#D to the current selected command and normally is bound to
+#D the list browsing commands.
 
-sub update_setup 
+sub update_setup
  { $old_setup_file = $setup_file ;
    if (keys %{$commands{$setup_file}})
-     { my $key ; 
+     { my $key ;
        unless ($cw->curselection)
-         { $cw -> selectionSet('0.0','0.0') }  
+         { $cw -> selectionSet('0.0','0.0') }
        $key = $cw -> get($cw->curselection) ;
-       if ($current_setup ne $key) 
+       if ($current_setup ne $key)
          { $current_setup = $key ;
            $sw -> delete ('1.0', 'end' ) ;
            $nested_setup = 0 ;
@@ -510,58 +510,58 @@ sub update_setup
            $stopcommand = '' ;
            $stopsuffix = '' ;
            do_update_setup ($key,0) ;
-           $mw -> raise ; 
+           $mw -> raise ;
            $mw -> focus } } }
 
 #D In editors we want to provide context sensitive help
 #D information. The next sub first tries to locate the
 #D commands asked for in the setup data currently selected,
-#D and when not found takes a look at all the loaded files. 
-    
-sub show_setup 
+#D and when not found takes a look at all the loaded files.
+
+sub show_setup
   { my $asked_for = shift ;
-    unless ($asked_for) { return } 
-    my $found = 0 ;  
-    $asked_for =~ s/^\\// ;    
-    if ($setup_interface) 
-      { $found = 0 ; 
-        foreach my $name (@setup_files) 
-          { if (($name=~/\-$setup_interface/)&&(exists($commands{$name}{$asked_for}))) 
-              { $found = 1 ; 
-                $setup_file = $name ; 
-                last } } }  
-    if (!($found)&&(exists($commands{$setup_file}{$asked_for}))) 
-      { $found = 1 } 
-    else 
-      { $found = 0 ; 
-        foreach my $name (@setup_files) 
-          { if (exists($commands{$name}{$asked_for})) 
-              { $found = 1 ; 
-                $setup_file = $name ; 
-                last } } }  
-    if ($found) 
+    unless ($asked_for) { return }
+    my $found = 0 ;
+    $asked_for =~ s/^\\// ;
+    if ($setup_interface)
+      { $found = 0 ;
+        foreach my $name (@setup_files)
+          { if (($name=~/\-$setup_interface/)&&(exists($commands{$name}{$asked_for})))
+              { $found = 1 ;
+                $setup_file = $name ;
+                last } } }
+    if (!($found)&&(exists($commands{$setup_file}{$asked_for})))
+      { $found = 1 }
+    else
+      { $found = 0 ;
+        foreach my $name (@setup_files)
+          { if (exists($commands{$name}{$asked_for}))
+              { $found = 1 ;
+                $setup_file = $name ;
+                last } } }
+    if ($found)
       { my @list = sort {lc $a cmp lc $b} keys %{$commands{$setup_file}} ;
         $cw -> delete ('0.0', 'end') ;
         $cw -> insert ('end', @list) ;
-        $found = 0 ; 
-        foreach (@list) { if ($_ eq $asked_for) { last } ++$found }   
-        my $index = "$found.0" ; 
+        $found = 0 ;
+        foreach (@list) { if ($_ eq $asked_for) { last } ++$found }
+        my $index = "$found.0" ;
         $cw -> selectionSet ($index, $index) ;
         $cw -> activate ($index) ;
         $cw -> see ($index) ;
         update_setup ;
-        $mw -> raise ; 
-        $mw -> focus } } 
+        $mw -> raise ;
+        $mw -> focus } }
 
 #D Whenever a new set of commands is selected (by means of the
 #D buttons on top the screen) the list and text are to be
-#D updated. 
+#D updated.
 
-sub change_setup 
-  { my $command = '' ; 
+sub change_setup
+  { my $command = '' ;
     if ($old_setup_file)
       { unless ($cw->curselection)
-         { $cw -> selectionSet('0.0','0.0') }  
+         { $cw -> selectionSet('0.0','0.0') }
         $command = $cw -> get($cw->curselection) ;
         my $position = $positions{$old_setup_file}{$command} ;
         $command = $crosslinks{$setup_file}[$position] }
@@ -569,102 +569,102 @@ sub change_setup
     my @list = sort {lc $a cmp lc $b} keys %{$commands{$setup_file}} ;
     $cw -> delete ('0.0', 'end') ;
     $cw -> insert ('end', @list) ;
-    if ($command) 
-      { show_setup($command) } 
-    else 
-      { $cw -> selectionClear ('0.0','end') ; 
+    if ($command)
+      { show_setup($command) }
+    else
+      { $cw -> selectionClear ('0.0','end') ;
         $cw -> selectionSet ('0.0', '0.0') ;
         $cw -> see ('0.0') ;
         $cw -> activate ('0.0') }
     update_setup ;
-    $mw -> raise ; 
+    $mw -> raise ;
     $mw -> focus }
 
 #D Sometimes we want to make sure the dat is loaded indeed:
 
 sub setup_found
-  { my $filename = shift ; 
-    if (-e "$tws_path$filename.tws") 
-      { $setup_file = $filename ; 
-        return 1 } 
-    else 
+  { my $filename = shift ;
+    if (-e "$tws_path$filename.tws")
+      { $setup_file = $filename ;
+        return 1 }
+    else
       { return 0 } }
 
-#D The next feature is dedicated to Tobias, who suggested 
-#D it, and Taco, who saw it as yet another proof of the 
-#D speed of \PERL. It's also dedicated to Ton, who needs it 
-#D for translating the big manual. 
+#D The next feature is dedicated to Tobias, who suggested
+#D it, and Taco, who saw it as yet another proof of the
+#D speed of \PERL. It's also dedicated to Ton, who needs it
+#D for translating the big manual.
 
-sub handle_request 
+sub handle_request
   { my $index = $cw -> index('end') ;
-    unless ($index) { return } 
-    my $req = $request -> get ;  
-    unless ($req) { return } 
-    $req =~ s/\\//o ; 
-    $req =~ s/\s//go ; 
-    $request -> delete('0','end') ; 
-    $request -> insert('0',$req) ; 
-    unless ($req) { return } 
-    my ($l,$c) = split (/\./,$index) ; 
+    unless ($index) { return }
+    my $req = $request -> get ;
+    unless ($req) { return }
+    $req =~ s/\\//o ;
+    $req =~ s/\s//go ;
+    $request -> delete('0','end') ;
+    $request -> insert('0',$req) ;
+    unless ($req) { return }
+    my ($l,$c) = split (/\./,$index) ;
     for (my $i=0;$i<=$l;$i++)
-      { $index = "$i.0" ; 
-        my $str = $cw -> get ($index, $index) ; 
-        if ($str =~ /^$req/) 
-          { $cw -> selectionClear ('0.0','end') ; 
-            $cw -> selectionSet ($index, $index) ; 
+      { $index = "$i.0" ;
+        my $str = $cw -> get ($index, $index) ;
+        if ($str =~ /^$req/)
+          { $cw -> selectionClear ('0.0','end') ;
+            $cw -> selectionSet ($index, $index) ;
             $cw -> activate ($index) ;
             $cw -> see ($index) ;
-            update_setup ; 
-            $mw -> raise ; 
+            update_setup ;
+            $mw -> raise ;
             $mw -> focus ;
-            return } } } 
+            return } } }
 
 $request -> bind ('<Return>', sub { handle_request } ) ;
 
-sub insert_request 
+sub insert_request
   { my ($self, $chr) = @_ ;
-    if ($self ne $request) 
+    if ($self ne $request)
       { $request -> insert ('end', $chr) }
-    handle_request } 
+    handle_request }
 
 foreach my $chr ('a'..'z','A'..'Z')
-  { $mw -> bind ( "<KeyPress-$chr>", sub { insert_request(shift, $chr) } ) } 
+  { $mw -> bind ( "<KeyPress-$chr>", sub { insert_request(shift, $chr) } ) }
 
 $mw -> bind ( "<backslash>", sub { insert_request(shift, "\\") } ) ;
 
 sub delete_request
   { my $self = shift ;
-    if ($self ne $request) 
-      { my $to = $request -> index ('end') ; 
+    if ($self ne $request)
+      { my $to = $request -> index ('end') ;
         my $from = $to - 1 ;
         if ($from<0) { $from = 0 }
         $request -> delete ($from,$to) }
-    handle_request } 
+    handle_request }
 
 $mw -> bind ( "<BackSpace>", sub { delete_request } ) ;
 
-sub new_request 
+sub new_request
   { $request -> delete (0,'end') ;
     handle_request }
 
 $mw -> bind ( "<space>", sub { new_request } ) ;
 
-#D Just in case: 
+#D Just in case:
 
-sub raise_setup 
+sub raise_setup
   { $mw -> raise }
 
-sub dont_exit   
-  { $mw -> protocol( 'WM_DELETE_WINDOW' => sub { } ) }  
+sub dont_exit
+  { $mw -> protocol( 'WM_DELETE_WINDOW' => sub { } ) }
 
-#D An example use is: 
+#D An example use is:
 #D
-#D \starttypen 
-#D load_setup ("cont-$nl") ; 
-#D show_setup ('omlijnd') ;  
+#D \starttypen
+#D load_setup ("cont-$nl") ;
+#D show_setup ('omlijnd') ;
 #D MainLoop () ;
-#D \stoptypen 
+#D \stoptypen
 #D
-#D Now everything is done, we return 1: 
+#D Now everything is done, we return 1:
 
 1 ;
diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl
index 00e336ea5..01355b6a6 100644
--- a/scripts/context/perl/texexec.pl
+++ b/scripts/context/perl/texexec.pl
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' && eval 'exec perl -w -
 
 #D \module
 #D   [       file=texexec.pl,
-#D        version=2003.09.16,
+#D        version=2004.08.29,
 #D          title=running \ConTeXt,
 #D       subtitle=\TEXEXEC,
 #D         author=Hans Hagen,
@@ -33,6 +33,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' && eval 'exec perl -w -
 #D everything. Well, the result is a messy script like this ... Sorry.
 
 use strict ;
+use warnings ;
 
 # todo: second run of checksum of mp file with --nomprun changes
 # todo: warning if no args
@@ -117,6 +118,7 @@ my $FinalMode        = 0;
 my $Format           = '';
 my $MpDoFormat       = '';
 my $HelpAsked        = 0;
+my $Version          = 0;
 my $MainBodyFont     = 'standard';
 my $MainLanguage     = 'standard';
 my $MainResponse     = 'standard';
@@ -184,7 +186,7 @@ my $Random           = 0;
 my $Filters          = '';
 my $NoMapFiles       = 0 ;
 my $Foxet            = 0 ;
-my $UseEnginePath    = 0 ;
+my $TheEnginePath    = 0 ;
 
 my $StartLine        = 0 ;
 my $StartColumn      = 0 ;
@@ -211,6 +213,7 @@ my $MakeMpy = '';
     "format=s"       => \$Format,
     "mpformat=s"     => \$MpDoFormat,
     "help"           => \$HelpAsked,
+    "version"        => \$Version,
     "interface=s"    => \$ConTeXtInterface,
     "language=s"     => \$MainLanguage,
     "bodyfont=s"     => \$MainBodyFont,
@@ -286,7 +289,7 @@ my $MakeMpy = '';
     "globalfile"     => \$GlobalFile,
     "nomapfiles"     => \$NoMapFiles,
     "foxet"          => \$Foxet,
-    "engine"         => \$UseEnginePath,
+    "engine"         => \$TheEnginePath,
     #### exxperiment
     "startline=s"    => \$StartLine,
     "startcolumn=s"  => \$StartColumn,
@@ -349,7 +352,7 @@ if ( ( $LogFile ne '' ) && ( $LogFile =~ /\w+\.log$/io ) ) {
     *STDERR = *LOGFILE;
 }
 
-my $Program = " TeXExec 4.4 - ConTeXt / PRAGMA ADE 1997-2004";
+my $Program = " TeXExec 5.0 - ConTeXt / PRAGMA ADE 1997-2004";
 
 print "\n$Program\n\n";
 
@@ -671,10 +674,10 @@ my $TeXScriptsPath    = IniValue( 'TeXScriptsPath',    '' );
 my $TeXHashExecutable = IniValue( 'TeXHashExecutable', '' );
 my $TeXExecutable     = IniValue( 'TeXExecutable',     'tex' );
 my $TeXVirginFlag     = IniValue( 'TeXVirginFlag',     '-ini' );
-my $TeXBatchFlag      = IniValue( 'TeXBatchFlag',      '-int=batchmode' );
-my $TeXNonStopFlag    = IniValue( 'TeXNonStopFlag',    '-int=nonstopmode' );
-my $MpBatchFlag       = IniValue( 'MpBatchFlag',       '-int=batchmode' );
-my $MpNonStopFlag     = IniValue( 'MpNonStopFlag',     '-int=nonstopmode' );
+my $TeXBatchFlag      = IniValue( 'TeXBatchFlag',      '-interaction=batchmode' );
+my $TeXNonStopFlag    = IniValue( 'TeXNonStopFlag',    '-interaction=nonstopmode' );
+my $MpBatchFlag       = IniValue( 'MpBatchFlag',       '-interaction=batchmode' );
+my $MpNonStopFlag     = IniValue( 'MpNonStopFlag',     '-interaction=nonstopmode' );
 my $TeXPassString     = IniValue( 'TeXPassString',     '' );
 my $TeXFormatFlag     = IniValue( 'TeXFormatFlag',     '' );
 my $MpFormatFlag      = IniValue( 'MpFormatFlag',      '' );
@@ -682,8 +685,7 @@ my $MpVirginFlag      = IniValue( 'MpVirginFlag',      '-ini' );
 my $MpPassString      = IniValue( 'MpPassString',      '' );
 my $MpFormat          = IniValue( 'MpFormat',          $MetaFun );
 my $MpFormatPath      = IniValue( 'MpFormatPath',      $TeXFormatPath );
-
-my $UseEnginePath     = IniValue( 'UseEnginePath',     $UseEnginePath);
+my $UseEnginePath     = IniValue( 'UseEnginePath',     $TheEnginePath);
 
 my $FmtLanguage = IniValue( 'FmtLanguage', '' );
 my $FmtBodyFont = IniValue( 'FmtBodyFont', '' );
@@ -1042,7 +1044,7 @@ sub CheckOutputFormat {
         if ( !$Ok ) {
             print $Help{'output'};
         } elsif ($FullFormat) {
-            print OPT "\\setupoutput[$FullFormat]\n";
+            # print OPT "\\setupoutput[$FullFormat]\n";
         }
     }
     unless ($FullFormat) { $FullFormat = $OutputFormat }
@@ -1077,16 +1079,16 @@ sub MakeOptionFile {
     }
     if ($EnterBatchMode)   { print OPT "\\batchmode\n" }
     if ($EnterNonStopMode) { print OPT "\\nonstopmode\n" }
-    if ($UseColor)         { print OPT "\\setupcolors[\\c!status=\\v!start]\n" }
+    if ($UseColor)         { print OPT "\\setupcolors[\\c!state=\\v!start]\n" }
     if ( $NoMPMode || $NoMPRun || $AutoMPRun ) {
         print OPT "\\runMPgraphicsfalse\n";
     }
     if ( ($FastMode) && ( !$FastDisabled ) ) { print OPT "\\fastmode\n" }
     if ($SilentMode) { print OPT "\\silentmode\n" }
     if ( $Separation ne "" ) {
-        print OPT "\\setupcolors[\\c!splitsen=$Separation]\n";
+        print OPT "\\setupcolors[\\c!split=$Separation]\n";
     }
-    if ($SetupPath) { print OPT "\\setupsystem[\\c!gebied=\{$SetupPath\}]\n" }
+    if ($SetupPath) { print OPT "\\setupsystem[\\c!directory=\{$SetupPath\}]\n" }
     print OPT "\\setupsystem[\\c!n=$KindOfRun]\n";
     $_ = $PaperFormat;
     #unless (($PdfArrange)||($PdfSelect)||($PdfCombine)||($PdfCopy))
@@ -1106,41 +1108,41 @@ sub MakeOptionFile {
     {
         print "    background graphic : $Background\n";
         print OPT "\\defineoverlay[whatever][{\\externalfigure[$Background][\\c!factor=\\v!max]}]\n";
-        print OPT "\\setupbackgrounds[\\v!pagina][\\c!achtergrond=whatever]\n";
+        print OPT "\\setupbackgrounds[\\v!page][\\c!background=whatever]\n";
     }
     if ($CenterPage) {
         print OPT
-          "\\setuplayout[\\c!plaats=\\v!midden,\\c!markering=\\v!aan]\n";
+          "\\setuplayout[\\c!location=\\v!middle,\\c!marking=\\v!on]\n";
     }
     if ($NoMapFiles) {
         print OPT "\\disablemapfiles\n";
     }
-    if ($NoArrange) { print OPT "\\setuparranging[\\v!blokkeer]\n" }
+    if ($NoArrange) { print OPT "\\setuparranging[\\v!disable]\n" }
     elsif ( $Arrange || $PdfArrange ) {
         $FinalRunNeeded = 1;
         if ($FinalRun) {
             my $DupStr;
             if ($NoDuplex) { $DupStr = "" }
-            else { $DupStr = ",\\v!dubbelzijdig" }
+            else { $DupStr = ",\\v!doublesided" }
             if ( $PrintFormat eq '' ) {
-                print OPT "\\setuparranging[\\v!normaal]\n";
+                print OPT "\\setuparranging[\\v!normal]\n";
             } elsif ( $PrintFormat =~ /.*up/goi ) {
-                print OPT "\\setuparranging[2UP,\\v!geroteerd$DupStr]\n";
+                print OPT "\\setuparranging[2UP,\\v!rotated$DupStr]\n";
             } elsif ( $PrintFormat =~ /.*down/goi ) {
-                print OPT "\\setuparranging[2DOWN,\\v!geroteerd$DupStr]\n";
+                print OPT "\\setuparranging[2DOWN,\\v!rotated$DupStr]\n";
             } elsif ( $PrintFormat =~ /.*side/goi ) {
-                print OPT "\\setuparranging[2SIDE,\\v!geroteerd$DupStr]\n";
+                print OPT "\\setuparranging[2SIDE,\\v!rotated$DupStr]\n";
             } else {
                 print OPT "\\setuparranging[$PrintFormat]\n";
             }
         } else {
-            print OPT "\\setuparranging[\\v!blokkeer]\n";
+            print OPT "\\setuparranging[\\v!disable]\n";
         }
     }
     if ($Arguments) { print OPT "\\setupenv[$Arguments]\n" }
     if ($Input)     { print OPT "\\setupsystem[inputfile=$Input]\n" }
     else { print OPT "\\setupsystem[inputfile=$JobName.$JobSuffix]\n" }
-    if ($Random) { print OPT "\\setupsystem[\\c!willekeur=$RandomSeed]\n" }
+    if ($Random) { print OPT "\\setupsystem[\\c!random=$RandomSeed]\n" }
     if ($Mode)   { print OPT "\\enablemode[$Mode]\n" }
     if ($Pages)  {
         if ( lc $Pages eq "odd" ) {
@@ -1203,7 +1205,7 @@ sub MakeUserFile {
         if ( $MainLanguage ne 'standard' ) {
             @MainLanguages = split( /\,/, $MainLanguage );
             foreach (@MainLanguages) {
-                print USR "\\installlanguage[\\s!$_][\\c!status=\\v!start]\n";
+                print USR "\\installlanguage[\\s!$_][\\c!state=\\v!start]\n";
             }
             $MainLanguage = $MainLanguages[0];
             print USR "\\setupcurrentlanguage[\\s!$MainLanguage]\n";
@@ -1342,9 +1344,65 @@ if ( $ConTeXtInterfaces{$ConTeXtInterface} ) {
 
 my $Problems = my $Ok = 0;
 
-sub RunTeX {
-    my ( $JobName, $JobSuffix ) = @_;
-    my $StartTime = time;
+#~ sub RunTeX {
+    #~ my ( $JobName, $JobSuffix ) = @_;
+    #~ my $StartTime = time;
+    #~ my $cmd;
+    #~ my $TeXProgNameFlag = '';
+    #~ if ( !$dosish )    # we assume tetex on linux
+    #~ {
+        #~ $TeXProgramPath = '';
+        #~ $TeXFormatPath  = '';
+        #~ if (   !$TeXProgNameFlag
+            #~ && ( $Format =~ /^cont/ )
+            #~ && ( $TeXPassString !~ /progname/io ) )
+        #~ {
+            #~ $TeXProgNameFlag = "-progname=context";
+        #~ }
+    #~ }
+    #~ $own_quote = ($TeXProgramPath =~ m/^[^\"].* / ? "\"" : "") ;
+    #~ $cmd = join( ' ',
+        #~ "$own_quote$TeXProgramPath$TeXExecutable$own_quote",
+        #~ $TeXProgNameFlag, $TeXPassString, $PassOn, "" );
+    #~ if ($EnterBatchMode)   { $cmd .= "$TeXBatchFlag " }
+    #~ if ($EnterNonStopMode) { $cmd .= "$TeXNonStopFlag " }
+    #~ if ( $TeXTranslation ne '' ) { $cmd .= "-translate-file=$TeXTranslation " }
+    #~ $cmd .= "$TeXFormatFlag$TeXFormatPath$Format $JobName.$JobSuffix";
+    #~ if ($Verbose)        { print "\n$cmd\n\n" }
+    #~ if ($EnterBatchMode) {
+        #~ $Problems = system("$cmd");
+    #~ } else {
+        #~ $Problems = system("$cmd");
+    #~ }
+    #~ # generate formats if needed and retry
+    #~ #
+    #~ # well, this used to work ok, until a engines started to use the same suffix
+    #~ # and no robust check was possible any more
+    #~ #
+    #~ # if ($Problems) {
+    #~ #     my $efmt = `$kpsewhich cont-en.efmt` ;
+    #~ #     chomp $efmt ;
+    #~ #     if ($efmt eq "") {
+    #~ #         print "\n";
+    #~ #         print "      emergency action : generate all formats\n";
+    #~ #         system("texexec --make --alone --all") ;
+    #~ #         print "\n";
+    #~ #         print "      emergency action : retry processing file\n";
+    #~ #         if ($EnterBatchMode) {
+    #~ #             $Problems = system("$cmd");
+    #~ #         } else {
+    #~ #             $Problems = system("$cmd");
+    #~ #         }
+    #~ #     }
+    #~ # }
+    #~ my $StopTime = time - $StartTime;
+    #~ print "\n           return code : $Problems";
+    #~ print "\n              run time : $StopTime seconds\n";
+    #~ return $Problems;
+#~ }
+
+sub PrepRunTeX {
+    my ( $JobName, $JobSuffix, $PipeString ) = @_;
     my $cmd;
     my $TeXProgNameFlag = '';
     if ( !$dosish )    # we assume tetex on linux
@@ -1365,8 +1423,15 @@ sub RunTeX {
     if ($EnterBatchMode)   { $cmd .= "$TeXBatchFlag " }
     if ($EnterNonStopMode) { $cmd .= "$TeXNonStopFlag " }
     if ( $TeXTranslation ne '' ) { $cmd .= "-translate-file=$TeXTranslation " }
-    $cmd .= "$TeXFormatFlag$TeXFormatPath$Format $JobName.$JobSuffix";
+    $cmd .= "$TeXFormatFlag$TeXFormatPath$Format $JobName.$JobSuffix $PipeString";
     if ($Verbose)        { print "\n$cmd\n\n" }
+	return $cmd;
+}
+
+sub RunTeX {
+    my ( $JobName, $JobSuffix ) = @_;
+    my $StartTime = time;
+    my $cmd = PrepRunTeX($JobName, $JobSuffix, '');
     if ($EnterBatchMode) {
         $Problems = system("$cmd");
     } else {
@@ -1393,6 +1458,7 @@ sub RunTeX {
     #         }
     #     }
     # }
+
     my $StopTime = time - $StartTime;
     print "\n           return code : $Problems";
     print "\n              run time : $StopTime seconds\n";
@@ -1780,15 +1846,19 @@ my $CombineFile = "texexec";
 
 sub RunModule {
     my @FileNames = sort @_;
-    unless ( -e $FileNames[0] ) {
-        my $Name = $FileNames[0];
-        @FileNames = ( "$Name.tex", "$Name.mp", "$Name.pl", "$Name.pm" );
-    }
-    foreach my $FileName (@FileNames) {
-        next unless -e $FileName;
-        my ( $Name, $Suffix ) = split( /\./, $FileName );
-        next unless $Suffix =~ /(tex|mp|pl|pm)/io;
-        DoRunModule( $Name, $Suffix );
+    if ($FileNames[0]) {
+        unless ( -e $FileNames[0] ) {
+            my $Name = $FileNames[0];
+            @FileNames = ( "$Name.tex", "$Name.mp", "$Name.pl", "$Name.pm" );
+        }
+        foreach my $FileName (@FileNames) {
+            next unless -e $FileName;
+            my ( $Name, $Suffix ) = split( /\./, $FileName );
+            next unless $Suffix =~ /(tex|mp|pl|pm)/io;
+            DoRunModule( $Name, $Suffix );
+        }
+    } else {
+        print "                module : no modules found\n\n";
     }
 }
 
@@ -1804,14 +1874,17 @@ sub DoRunModule {
     open( TED, "$FileName.ted" );
     my $firstline = <TED>;
     close(TED);
-    if ( $firstline =~ /interface=en/ ) { print MOD $firstline }
-    else { print MOD "% interface=nl\n" }
+    if ( $firstline =~ /interface=/ ) {
+        print MOD $firstline ;
+    } else {
+        print MOD "% interface=en\n" ;
+    }
     # so far
     print MOD "\\usemodule[abr-01,mod-01]\n";
     print MOD "\\def\\ModuleNumber{1}\n";
-    print MOD "\\starttekst\n";
+    print MOD "\\starttext\n";
     print MOD "\\readlocfile{$FileName.ted}{}{}\n";
-    print MOD "\\stoptekst\n";
+    print MOD "\\stoptext\n";
     close(MOD);
     RunConTeXtFile( $ModuleFile, "tex" );
 
@@ -2354,7 +2427,7 @@ sub checkMPgraphics {    # also see makempy
 
 sub checkMPlabels {
     my $MpName = shift;
-    return 0 unless ( -s "$MpName.mpt" > 10 );
+    return 0 unless ((-f "$MpName.mpt") && ((-s "$MpName.mpt")>10) );
     return 0 unless open( MP, "$MpName.mpt" );
     my $n = 0;
     my $t = "" ;
@@ -2422,7 +2495,11 @@ sub doRunMP {    ###########
                 # i hate this indirect (sub regexp) mess
                 s/beginfig\s*\((\d+)\)\s*\;(.*?)endfig\s*\;/doMergeMP($1,$2)/gems ;
             }
-            unless (/beginfig\s*\(\s*0\s*\)/gmois) { print MP $mpbetex{0} }
+            unless (/beginfig\s*\(\s*0\s*\)/gmois) {
+                if (defined($mpbetex{0})) { # test added, warning
+                    print MP $mpbetex{0} ;
+                }
+            }
             print MP $_;
             print MP "\n" . "end" . "\n";
             close(MP);
@@ -2471,6 +2548,7 @@ sub doRunMP {    ###########
                 print " error in metapost run : $MpName.mp:$1\n";
             }
         }
+        close(MPL) ;
         unlink "mptrace.tmp";
         rename( $MpFile, "mptrace.tmp" );
         if ( -e $MpKep ) {
@@ -2596,10 +2674,92 @@ if ( $SetFile ne "" ) { load_set_file( $SetFile, $Verbose ) }
 sub check_texmf_root { }
 sub check_texmf_tree { }
 
+#~ sub AnalyzeVersion
+  #~ { my ($texengine,$type);
+	#~ open (LOG, "<texvers.log") ;
+    #~ while (<LOG>)
+	  #~ { /^\s*This is (.*pdf(|e)TeX.*?) \(format.*$/o and $texengine = $1 ;
+	    #~ /^\s*ConTeXt  (.*int: ([a-z]+).*?)\s*$/o and  $type   = $1; }
+	#~ $type =~ s/  int: ([a-z]+)//;
+	#~ $texengine =~ s/ Version//;
+    #~ close (LOG);
+    #~ return ($texengine,$type) }
+
+#~ sub AnalyzeVersion
+  #~ { my $str = join("\n", @_) ;
+    #~ my ($texengine,$type);
+    #~ if ($str =~ /^\s*This is (.*pdf(|e)TeX.*?) \(format.*$/mos) {
+        #~ $texengine = $1 ;
+    #~ }
+    #~ if ($str =~ /^\s*ConTeXt  (.*int: ([a-z]+).*?)\s*$/mos) {
+        #~ $type   = $1 ;
+    #~ }
+	#~ $type =~ s/  int: ([a-z]+)//;
+	#~ $texengine =~ s/ Version//;
+    #~ return ($texengine,$type) }
+
+
+sub AnalyzeVersion
+  { my $str = join("\n", @_) ;
+    my ($texengine,$type) = ('unknown', 'unknown');
+    open (LOG, "<texvers.log") ;
+    while (<LOG>)
+	   { /^\s*This is (.*pdf(|e)TeX.*?)$/o and $texengine = $1 ;
+	    /^\s*ConTeXt  (.*int: ([a-z]+).*?)\s*$/o and  $type   = $1; }
+	 $type =~ s/  int: ([a-z]+)//;
+	 $texengine =~ s/ Version//;
+	 $texengine =~ s/ \(format.*$//;
+     close (LOG);
+    return ($texengine,$type) }
+
+sub show_version_info {
+  my ($texengine,$type);
+  open (TEX,">texvers.tex") ;
+  print TEX "\\bye " ;
+  close (TEX) ;
+  my $texutil = `$TeXUtil --help`;
+  $texutil =~ s/.*(TeXUtil[^\n]+)\n.*?$/$1/s;
+  print "               texexec :$Program\n" ;
+  print "               texutil : $texutil" ;
+  my $contexttext =  `$kpsewhich context.tex`;
+  my $contextversion = "<not found>";
+  if ($contexttext) {
+	chop $contexttext;
+	{ local $/;
+	  open (IN,"<$contexttext");
+	  $contextversion = <IN>;
+	  close IN;
+	}
+	$contextversion =~ s/.*contextversion\{([0-9.]+)\}.*/$1/s;
+  }
+  $EnterBatchMode = 1;
+  $Format = 'cont-en';
+  my $cmd = PrepRunTeX("texvers","tex",'') ;
+  #~ my $ok = system("$cmd");
+  ($texengine,$type) = AnalyzeVersion(`$cmd`) ;
+  print "                   tex : $texengine\n" ;
+  print "               context : ver: $contextversion\n" ;
+  print "               cont-en : $type\n" ;
+  foreach my $a (qw(cz de it nl ro uk)) {
+	my $test = `$kpsewhich -format='fmt' cont-$a`;
+	if (defined $test && $test) {
+	  $Format = 'cont-' . $a;
+	  $cmd = PrepRunTeX("texvers","tex",'');
+	  #~ my $ok = system("$cmd");
+	  ($texengine,$type) = AnalyzeVersion(`$cmd`) ;
+	  print "               cont-$a : $type\n" ;
+	}
+  }
+  unlink <texvers.*>;
+}
+
 # the main thing
 
-if    ($HelpAsked)      { show_help_info }
-elsif ($TypesetListing) {
+if ($HelpAsked) {
+    show_help_info
+} elsif ($Version) {
+    show_version_info
+} elsif ($TypesetListing) {
     check_texmf_root;
     check_texmf_tree;
     RunListing(@ARGV);
@@ -2618,8 +2778,12 @@ elsif ($TypesetListing) {
 } elsif ($MakeFormats) {
     check_texmf_root;
     check_texmf_tree;
-    if ( $MpDoFormat ne '' ) { RunMpFormat($MpDoFormat) }
-    else { RunFormats }
+    if ( $MpDoFormat ne '' ) {
+        RunMpFormat($MpDoFormat) ;
+    }
+    else {
+        RunFormats ;
+    }
 } elsif (@ARGV) {
     check_texmf_root;
     check_texmf_tree;
@@ -2817,4 +2981,6 @@ alone bypass utilities (e.g. fmtutil for non-standard fmt's)
 -----------
 texutil force TeXUtil run
 -----------
-setfile load environment (batch) file
\ No newline at end of file
+version display various version information
+-----------
+setfile load environment (batch) file
diff --git a/scripts/context/perl/texutil.pl b/scripts/context/perl/texutil.pl
index 06bccb82f..e7f13ee3e 100644
--- a/scripts/context/perl/texutil.pl
+++ b/scripts/context/perl/texutil.pl
@@ -40,7 +40,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $
 #D binary version, like scanning illustrations other than \EPS.
 #D I would suggest to keep an eye on the version number:
 
-$Program = "TeXUtil 8.2 - ConTeXt / PRAGMA ADE 1992-2004" ;
+$Program = "TeXUtil 9.0 - ConTeXt / PRAGMA ADE 1992-2004" ;
 
 #D By the way, this is my first \PERL\ script, which means
 #D that it will be improved as soon as I find new and/or more
diff --git a/scripts/context/ruby/textools.rb b/scripts/context/ruby/textools.rb
index fec093cf3..1c7e4c926 100644
--- a/scripts/context/ruby/textools.rb
+++ b/scripts/context/ruby/textools.rb
@@ -109,15 +109,22 @@ class Commands
 
     def findfile
 
-        report('locating file in texmf tree (> used by kpse)')
+        report('locating file in texmf tree')
+
+        # ! not in tree
+        # ? fuzzy
+        # . in tree
+        # > in tree and used
 
         if filename = @commandline.argument('first') then
             if filename && ! filename.empty? then
                 report
-                used = kpsefile(filename)
+                used = kpsefile(filename) || pathfile(filename)
                 if paths = texmfroots then
+                    found = false
                     paths.each do |p|
                         if files = texmffiles(p,filename) then
+                            found = true
                             files.each do |f|
                                 # unreadable: report("#{if f == used then '>' else '.' end} #{f}")
                                 if f == used then
@@ -128,6 +135,7 @@ class Commands
                             end
                         end
                     end
+                    report("! #{used}") unless found
                 elsif used then
                     report("? #{used}")
                 else
@@ -397,7 +405,29 @@ class Commands
         return nil
     end
 
+    def pathfile(filename)
+        used = nil
+        begin
+            if ! filename || filename.empty? then
+                return nil
+            else
+                ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+                    if FileTest.file?(File.join(path,filename)) then
+                        used = File.join(path,filename)
+                        break
+                    end
+                end
+            end
+        rescue
+            used = nil
+        else
+            used = nil if used && used.empty?
+        end
+        return used
+    end
+
     def kpsefile(filename)
+        used = nil
         begin
             if ! filename || filename.empty? then
                 return nil
@@ -554,4 +584,4 @@ commandline.registerflag('force')
 
 commandline.expand
 
-Commands.new(commandline,logger,banner).send(commandline.action || 'help')
\ No newline at end of file
+Commands.new(commandline,logger,banner).send(commandline.action || 'help')
diff --git a/tex/context/base/colo-ema.tex b/tex/context/base/colo-ema.tex
index e5e90b235..605cd44c5 100644
--- a/tex/context/base/colo-ema.tex
+++ b/tex/context/base/colo-ema.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-ema,
+%D   [       filefile=colo-ema,
 %D        version=2003.03.20,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=Emacs Colors,
diff --git a/tex/context/base/colo-ext.tex b/tex/context/base/colo-ext.tex
index d93506a24..c81f03781 100644
--- a/tex/context/base/colo-ext.tex
+++ b/tex/context/base/colo-ext.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-ext, % mostof thsi code used to be in colo-ini.tex
+%D   [       filefile=colo-ext, % mostof thsi code used to be in colo-ini.tex
 %D        version=1997.04.01,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=Extras,
@@ -23,9 +23,9 @@
 %D recalculating all those colors, we use a quick and dirty
 %D approach:
 %D
-%D \starttypen
+%D \starttyping
 %D \negativecolorbox0
-%D \stoptypen
+%D \stoptyping
 %D
 %D will negate the colors in box zero.
 
@@ -47,10 +47,10 @@
 %D handling. Here we deal with a per-document setting.
 
 \setupcolors
-  [\c!overprint=\v!nee]
+  [\c!overprint=\v!no]
 
 \def\starttextoverprint
-  {\doifelse\@@cloverprint\v!ja
+  {\doifelse\@@cloverprint\v!yes
      {\let\stoptextoverprint\dostopoverprint\dostartoverprint}
      {\let\stoptextoverprint\donothing}}
 
@@ -59,4 +59,4 @@
 \appendtoks \starttextoverprint \to \everystarttextproperties
 \appendtoks \stoptextoverprint  \to \everystoptextproperties
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/colo-hex.tex b/tex/context/base/colo-hex.tex
index 25f4d22e0..2eddcf19b 100644
--- a/tex/context/base/colo-hex.tex
+++ b/tex/context/base/colo-hex.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-hex,
+%D   [       filefile=colo-hex,
 %D        version=2004.06.23,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=Hex Colors,
@@ -93,4 +93,4 @@
      {\setxvalue{\??cr#5}{\hexcolorpattern{#6}}}
      {\dodododefinecolor#1#2#3#4[#5][#6]}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex
index e0f476a49..662439185 100644
--- a/tex/context/base/colo-ini.tex
+++ b/tex/context/base/colo-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-ini,
+%D   [       filefile=colo-ini,
 %D        version=1997.04.01,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=Initialization,
@@ -186,25 +186,25 @@
 %D \macros
 %D   {definecolor}
 %D
-%D We will enable users to specify colors in \kap{RGB} and
-%D \kap{CMYK} color spaces or gray scales using
+%D We will enable users to specify colors in \cap{RGB} and
+%D \cap{CMYK} color spaces or gray scales using
 %D
 %D \showsetup{\y!definecolor}
 %D
 %D For example:
 %D
-%D \starttypen
+%D \starttyping
 %D \definecolor [SomeKindOfRed] [r=.8,g=.05,b=.05]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such color specifications are saved in a macro in the
 %D following way:
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue{\??cr name}{R:r:g:b}
 %D \setvalue{\??cr name}{C:c:m:y:k}
 %D \setvalue{\??cr name}{S:s}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Gray scales are specified with the \type{s} parameter,
 %D where the \type {s} is derived from {\em screen}.
@@ -216,11 +216,11 @@
 %D (probably by symbolic methods. So, currently the data is
 %D stored as follows:
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue{\??cr name}{R:r:g:b:a:t}
 %D \setvalue{\??cr name}{C:c:m:y:k:a:t}
 %D \setvalue{\??cr name}{S:s:a:t}
-%D \stoptypen
+%D \stoptyping
 
 % beware: comparisons asked/current on name, not value
 
@@ -505,12 +505,12 @@
 %D only for the purpose of showing them with \type {\showcolor}.
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D This color shows up as \color [SomeKindOfRed] {some kind
 %D of red}.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupcolors[state=start]
 %D
 %D \definecolor[mygreen][green]
@@ -524,16 +524,16 @@
 %D \definecolor[green][g=.5]
 %D
 %D \startcolor[mygreen]test\stopcolor
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {setupcolor}
 %D
 %D Color definitions can be grouped in files with the name:
 %D
-%D \starttypen
+%D \starttyping
 %D \f!colorprefix-identifier.tex
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\f!colorprefix} is \unprotect {\tttf \f!colorprefix}.
 %D Loading such a file is done by \protect
@@ -543,9 +543,9 @@
 %D Some default colors are specified in \type{colo-rgb.tex},
 %D which is loaded into the format by:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupcolor[rgb]
-%D \stoptypen
+%D \stoptyping
 
 \let\colorstyle\empty
 
@@ -565,24 +565,24 @@
 
 \let\usecolors\setupcolor
 
-%D When typesetting for paper, we prefer using the \kap{CMYK}
-%D color space, but for on||screen viewing we prefer \kap{RGB}
+%D When typesetting for paper, we prefer using the \cap{CMYK}
+%D color space, but for on||screen viewing we prefer \cap{RGB}
 %D (the previous implementation supported only this scheme).
 %D Independant of such specifications, we support some automatic
 %D conversions:
 %D
-%D \startopsomming[opelkaar]
-%D \som  convert all colors to \kap{RGB}
-%D \som  convert all colors to \kap{CMYK}
-%D \som  convert all colors to gray scales
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item  convert all colors to \cap{RGB}
+%D \item  convert all colors to \cap{CMYK}
+%D \item  convert all colors to gray scales
+%D \stopitemize
 %D
 %D We also support optimization of colors to gray scales.
 %D
-%D \startopsomming[verder]
-%D \som  reduce gray colors to gray scales
-%D \som  reduce \kap{CMY} components to \kap{K}
-%D \stopopsomming
+%D \startitemize[continue]
+%D \item  reduce gray colors to gray scales
+%D \item  reduce \cap{CMY} components to \cap{K}
+%D \stopitemize
 %D
 %D These options are communicated by means of:
 
@@ -593,8 +593,8 @@
 \newif\ifGRAYprefered
 \newif\ifreduceCMYK
 
-%D The last boolean controls reduction of \kap{CMYK} to
-%D \kap{CMY} colors. When set to true, the black component
+%D The last boolean controls reduction of \cap{CMYK} to
+%D \cap{CMY} colors. When set to true, the black component
 %D is added to the other ones.
 %D
 %D Prefering gray is not the same as converting to gray.
@@ -625,7 +625,7 @@
 %D author of this module) it makes sense to optimize switching
 %D to the max.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\startcolormode#1%
 %D   {\ifincolor\ifpermitcolormode
 %D      \doifcolorelse{#1}
@@ -633,7 +633,7 @@
 %D         \expandafter\dostartcolormode\currentcolorspecs\od}
 %D        {\nostartcolormode}%
 %D    \fi\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D So, the more readable alternatives like the one above are
 %D gone now.
@@ -1253,20 +1253,20 @@
 %D (actually, the first application was in foreground
 %D colors).
 %D
-%D \starttypen
+%D \starttyping
 %D \starttextcolor[red]
 %D   \dorecurse{10}{\input tufte \color[green]{oeps} \par}
 %D \stoptextcolor
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is more efficient than the alternative:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbackgrounds[text][foregroundcolor=red]
 %D \startregistercolor[red]
 %D   \dorecurse{10}{\input tufte \color[green]{oeps} \par}
 %D \stopregistercolor
-%D \stoptypen
+%D \stoptyping
 
 \let\maintextcolor\empty \def\defaulttextcolor{black}
 
@@ -1318,10 +1318,10 @@
   % global ?
 
   \def\initializemaintextcolor
-    {\doifelsenothing\@@cltekstkleur
+    {\doifelsenothing\@@cltextcolor
        {\let\maintextcolor\empty}
        {\let\maintextcolor\@@themaintextcolor
-        \definecolor[\@@themaintextcolor][\@@cltekstkleur]%
+        \definecolor[\@@themaintextcolor][\@@cltextcolor]%
         \doinitializemaintextcolor}}
 
   \def\doinitializemaintextcolor
@@ -1359,41 +1359,41 @@
 %D Consistent use of these scratch variables saves us
 %D unneccessary hash entries.
 %D
-%D \starttypen
+%D \starttyping
 %D \@@cl@@r \@@cl@@g \@@cl@@b
 %D \@@cl@@c \@@cl@@m \@@cl@@y \@@cl@@k
 %D \@@cl@@s
-%D \stoptypen
+%D \stoptyping
 %D
 %D We implement several conversion routines.
 %D
-%D \starttypen
+%D \starttyping
 %D \convertRGBtoCMYK  {r} {g} {b}
 %D \convertRGBtoGRAY  {r} {g} {b}
 %D \convertCMYKtoRGB  {c} {m} {y} {k}
 %D \convertCMYKtoGRAY {c} {m} {y} {k}
 %D \convertCMYKtoCMY  {c} {m} {y} {k}
-%D \stoptypen
+%D \stoptyping
 %D
-%D The relation between \kap{Gray}, \kap{RGB} and \kap{CMYK}
+%D The relation between \cap{Gray}, \cap{RGB} and \cap{CMYK}
 %D is:
 %D
-%D \plaatsformule[-]
-%D   \startformule
+%D \placeformula[-]
+%D   \startformula
 %D   G = .30r + .59g + .11b
 %D     = 1.0 - \min(1.0,\ .30c + .59m + .11y + k)
-%D   \stopformule
+%D   \stopformula
 %D
-%D When converting from \kap{CMYK} to \kap{RGB} we use the
+%D When converting from \cap{CMYK} to \cap{RGB} we use the
 %D formula:
 %D
-%D \plaatsformule[-]
-%D   \startformule
+%D \placeformula[-]
+%D   \startformula
 %D   \eqalign
 %D     {r &= 1.0 - \min(1.0,\ c+k) \cr
 %D      g &= 1.0 - \min(1.0,\ m+k) \cr
 %D      b &= 1.0 - \min(1.0,\ y+k)}
-%D   \stopformule
+%D   \stopformula
 %D
 %D In the conversion routine the color components are calculated
 %D in three digits precision.
@@ -1508,8 +1508,8 @@
    \let\currentspotcolor\empty
    \filterspotcolorfalse}
 
-\def\colorsplitsuffix{\ifcase\currentcolorchannel\else-\@@clsplitsen\fi}
-\def\colorsplitprefix{\ifcase\currentcolorchannel\else\@@clsplitsen-\fi}
+\def\colorsplitsuffix{\ifcase\currentcolorchannel\else-\@@clsplit\fi}
+\def\colorsplitprefix{\ifcase\currentcolorchannel\else\@@clsplit-\fi}
 
 \ifx\resetsystemmode\undefined
   \let\setsystemmode  \gobbleoneargument
@@ -1517,10 +1517,10 @@
 \fi
 
 \def\setcolorsplitting
-  {\resetsystemmode{\v!kleur\colorsplitsuffix}%
+  {\resetsystemmode{\v!color\colorsplitsuffix}%
    \resetcolorsplitting
    \processaction
-     [\@@clsplitsen]
+     [\@@clsplit]
      [         c=>\chardef\currentcolorchannel1,%
                m=>\chardef\currentcolorchannel2,%
                y=>\chardef\currentcolorchannel3,%
@@ -1529,48 +1529,48 @@
                g=>\chardef\currentcolorchannel6,%
                b=>\chardef\currentcolorchannel7,%
                s=>\chardef\currentcolorchannel8,%
-          \v!nee=>,%      \currentcolorchannel0,% all colors
+          \v!no=>,%      \currentcolorchannel0,% all colors
       \s!default=>,%      \currentcolorchannel0,% all colors
       \s!unknown=>\filterspotcolortrue
                   \edef\currentspotcolor{\commalistelement}]%
-   \setsystemmode{\v!kleur\colorsplitsuffix}%
-   \iffilterspotcolor \let\@@clrgb\v!nee \fi}
+   \setsystemmode{\v!color\colorsplitsuffix}%
+   \iffilterspotcolor \let\@@clrgb\v!no \fi}
 
 \def\dosetupcolors[#1]%
   {\getparameters[\??cl][#1]%
-   \doifelse\@@clspot\v!ja
+   \doifelse\@@clspot\v!yes
      \SPOTsupportedtrue
      \SPOTsupportedfalse
-   \doifelsenothing\@@clsplitsen
+   \doifelsenothing\@@clsplit
      \resetcolorsplitting
      \setcolorsplitting
-   \doifelse\@@clreductie\v!ja
+   \doifelse\@@clreduction\v!yes
      \reduceCMYKtrue
      \reduceCMYKfalse
-   \doifelse\@@clexpansie\v!ja
+   \doifelse\@@clexpansion\v!yes
      \freezecolorstrue
      \freezecolorsfalse
-   \doifelse\@@clcriterium\v!alles
+   \doifelse\@@clcriterium\v!all
      \hidesplitcolortrue
      \hidesplitcolorfalse
-   \doifelse\@@clrgb\v!nee
+   \doifelse\@@clrgb\v!no
      {\ifRGBsupported     \showmessage\m!colors {9}\v!rgb\RGBsupportedfalse\fi}
      {\ifRGBsupported\else\showmessage\m!colors{10}\v!rgb\RGBsupportedtrue \fi}%
-   \doifelse\@@clcmyk\v!nee
+   \doifelse\@@clcmyk\v!no
      {\ifCMYKsupported     \showmessage\m!colors {9}\v!cmyk\CMYKsupportedfalse\fi}
      {\ifCMYKsupported\else\showmessage\m!colors{10}\v!cmyk\CMYKsupportedtrue \fi}%
    % todo : mpspot
-   \doifelse\@@clmpcmyk\v!nee
+   \doifelse\@@clmpcmyk\v!no
      {\ifMPcmykcolors     \showmessage\m!colors {9}{\v!mp\v!cmyk}\MPcmykcolorsfalse\fi}
      {\ifMPcmykcolors\else\showmessage\m!colors{10}{\v!mp\v!cmyk}\MPcmykcolorstrue \fi}%
-   \doifelse\@@clmpspot\v!nee
+   \doifelse\@@clmpspot\v!no
      {\ifMPspotcolors     \showmessage\m!colors {9}{\v!mp\v!spot}\MPspotcolorsfalse\fi}
      {\ifMPspotcolors\else\showmessage\m!colors{10}{\v!mp\v!spot}\MPspotcolorstrue \fi}%
    \preferGRAYfalse
    \processaction
-     [\@@clconversie]
-     [    \v!ja=>\preferGRAYtrue,
-      \v!altijd=>\preferGRAYtrue\RGBsupportedfalse\CMYKsupportedfalse]%
+     [\@@clconversion]
+     [    \v!yes=>\preferGRAYtrue,
+      \v!always=>\preferGRAYtrue\RGBsupportedfalse\CMYKsupportedfalse]%
    \ifRGBsupported
      \converttoGRAYfalse
      \forcegrayMPcolorsfalse
@@ -1589,14 +1589,14 @@
      \reduceMPcolorsfalse
    \fi\fi
    \processaction
-     [\@@clstatus]
-     [\v!globaal=>\ifincolor\else\showmessage\m!colors1\colorstyle\fi
+     [\@@clstate]
+     [\v!global=>\ifincolor\else\showmessage\m!colors1\colorstyle\fi
                   \incolortrue\localcolorfalse,
-       \v!lokaal=>\ifincolor\else\showmessage\m!colors2\colorstyle\fi
+       \v!local=>\ifincolor\else\showmessage\m!colors2\colorstyle\fi
                   \incolortrue\localcolortrue,
         \v!start=>\ifincolor\else\showmessage\m!colors1\colorstyle\fi
                   \incolortrue\localcolorfalse
-                  \let\@@clstatus\v!globaal,
+                  \let\@@clstate\v!global,
          \v!stop=>\incolorfalse\localcolorfalse
                   \forcegrayMPcolorstrue]%
    \initializemaintextcolor}
@@ -1794,14 +1794,14 @@
 %D This color mechanism takes care of nested colors, like in:
 %D
 %D \startbuffer
-%D \kleur[groen]{groen \kleur[groen]{groen \kleur[rood]{rood}} groen}
-%D \kleur[groen]{groen \kleur[]{groen \kleur[rood]{rood}} groen}
-%D \kleur[groen]{groen \kleur[rood]{rood \kleur[rood]{rood}} groen}
-%D \kleur[groen]{groen \kleur[groen]{groen \kleur[]{groen}} groen}
-%D \kleur[groen]{groen \kleur[rood]{rood} groen}
-%D \kleur[groen]{groen \kleur[]{groen} groen}
-%D \kleur[]{zwart \kleur[rood]{rood} zwart}
-%D \kleur[]{zwart}
+%D \color[green]{groen \color[green]{groen \color[red]{rood}} groen}
+%D \color[green]{groen \color[]{groen \color[red]{rood}} groen}
+%D \color[green]{groen \color[red]{rood \color[red]{rood}} groen}
+%D \color[green]{groen \color[green]{groen \color[]{groen}} groen}
+%D \color[green]{groen \color[red]{rood} groen}
+%D \color[green]{groen \color[]{groen} groen}
+%D \color[]{zwart \color[red]{rood} zwart}
+%D \color[]{zwart}
 %D \stopbuffer
 %D
 %D \typebuffer
@@ -1809,9 +1809,9 @@
 %D or
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D Crossing page boundaries is of course also handled.
@@ -1819,26 +1819,26 @@
 %D efficient as possible.
 %D
 %D \startbuffer
-%D \startkleur[groen]
-%D   [groen] \input tufte [groen] \par
-%D   \startkleur[]
-%D     [groen] \input knuth [groen] \par
-%D     \startkleur[rood]
-%D       [rood] \input tufte [rood] \par
-%D       \startkleur[geel]
-%D         [geel] \input knuth [geel] \par
-%D       \stopkleur
-%D       [rood] \input tufte [rood] \par
-%D     \stopkleur
-%D     [groen] \input knuth [groen] \par
-%D   \stopkleur
-%D   [groen] \input tufte [groen] \par
-%D \stopkleur
+%D \startcolor[green]
+%D   [green] \input tufte [green] \par
+%D   \startcolor[]
+%D     [green] \input knuth [green] \par
+%D     \startcolor[red]
+%D       [red] \input tufte [red] \par
+%D       \startcolor[yellow]
+%D         [yellow] \input knuth [yellow] \par
+%D       \stopcolor
+%D       [red] \input tufte [red] \par
+%D     \stopcolor
+%D     [green] \input knuth [green] \par
+%D   \stopcolor
+%D   [green] \input tufte [green] \par
+%D \stopcolor
 %D \stopbuffer
 %D
-%D \startopelkaar
-%D \haalbuffer
-%D \stopopelkaar
+%D \startpacked
+%D \getbuffer
+%D \stoppacked
 %D
 %D These quotes are typeset by saying:
 %D
@@ -1971,7 +1971,7 @@
 %D \showsetup{\y!color}
 %D \showsetup{\y!graycolor}
 %D
-%D Which can be used straightforward: \color[groen]{green as gras}.
+%D Which can be used straightforward: \color[green]{green as gras}.
 %D We want color support to be similar to font support and
 %D therefore implement \type{\color} as:
 
@@ -2003,10 +2003,10 @@
 
 %D This implementation enables use of defined colors like:
 %D
-%D \starttypen
+%D \starttyping
 %D Look at the {\brightgreen bright} side of life and get
 %D yourself no \red{red} head!
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {colorvalue, grayvalue}
@@ -2024,7 +2024,7 @@
 %D show us:
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D We can speed the following macros a bit up, but this
@@ -2106,7 +2106,7 @@
 
 \def\localstartraster[#1]%
   {\doifelsenothing{#1}
-     {\dostartgraymode\@@rsraster}
+     {\dostartgraymode\@@rsscreen}
      {\dostartgraymode{#1}}}
 
 \def\localstopraster
@@ -2117,7 +2117,7 @@
 
 %D In this documentation we will not go into too much details
 %D on palets. Curious users can find more information on this
-%D topic in \uit[use of color].
+%D topic in \from[use of color].
 %D
 %D At the moment we implemented color in \CONTEXT\ color
 %D printing was not yet on the desktop. In spite of this lack our
@@ -2139,11 +2139,11 @@
 %D have colorful names, but best is to use names that specify
 %D their use, like {\em important} or {\em danger}. As a sort
 %D of example \CONTEXT\ has some palets predefined,
-%D like:\voetnoot{At the time I wrote the palet support, I was
+%D like:\footnote{At the time I wrote the palet support, I was
 %D reading 'A hort history of time' of S.~Hawkins, so that's
 %D why we stuck to quarks.}
 %D
-%D \starttypen
+%D \starttyping
 %D \definepalet
 %D   [alfa]
 %D   [     top=rood:7,
@@ -2152,7 +2152,7 @@
 %D        down=cyaan:4,
 %D     strange=magenta:3,
 %D       charm=geel:2]
-%D \stoptypen
+%D \stoptyping
 %D
 %D It's formal definition is:
 %D
@@ -2161,21 +2161,21 @@
 %D Visualized, such a palet looks like:
 %D
 %D \startbuffer[palet]
-%D \showpalet [alfa] [horizontaal,naam,nummer,waarde]
+%D \showpalet [alfa] [horizontal,name,number,value]
 %D \stopbuffer
 %D
-%D \startregelcorrectie
-%D \haalbuffer[palet]
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer[palet]
+%D \stoplinecorrection
 %D
 %D This bar shows both the color and gray alternatives of the
 %D palet components (not visible in black and white print).
 %D
 %D When needed, one can copy a palet by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \definepalet [TEXcolorpretty] [colorpretty]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This saves us some typing in for instance the modules that
 %D deal with pretty verbatim typesetting.
@@ -2254,9 +2254,9 @@
 %D The naming of the colors in this palet suggests some
 %D ordening, which in turn is suported by color grouping.
 %D
-%D \starttypen
+%D \starttyping
 %D \definecolorgroup
-%D   [rood]
+%D   [red]
 %D   [1.00:0.90:0.90,
 %D    1.00:0.80:0.80,
 %D    1.00:0.70:0.70,
@@ -2265,7 +2265,7 @@
 %D    1.00:0.25:0.25,
 %D    1.00:0.15:0.15,
 %D    0.90:0.00:0.00]
-%D \stoptypen
+%D \stoptyping
 %D
 %D In such a color group colors are numbered from~$1$ to~$n$.
 %D
@@ -2284,7 +2284,7 @@
        [#2]
        [    \v!cmyk=>\edef\currentcolorspace{C},
              \v!rgb=>\edef\currentcolorspace{R},
-           \v!grijs=>\edef\currentcolorspace{S},
+           \v!gray=>\edef\currentcolorspace{S},
             \v!spot=>\edef\currentcolorspace{P},
                \v!s=>\edef\currentcolorspace{S},
          \s!unknown=>\edef\currentcolorspace{R}]%
@@ -2309,16 +2309,16 @@
 %D We can show the group by:
 %D
 %D \startbuffer
-%D \showcolorgroup [blauw] [horizontaal,naam,nummer,waarde]
+%D \showcolorgroup [blue] [horizontal,name,number,value]
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
 %D or in color:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D which uses:
 %D
@@ -2327,20 +2327,20 @@
 \fetchruntimecommand \showcolorgroup {\f!colorprefix\s!run}
 
 %D There are ten predefined color groups, like
-%D \color[groen]{\em groen}, \color[rood]{\em rood},
-%D \color[blauw]{\em blauw}, \color[cyaan]{\em cyaan},
-%D \color[magenta]{\em magenta} and \color[geel]{\em geel}.
+%D \color[green]{\em groen}, \color[red]{\em rood},
+%D \color[blue]{\em blauw}, \color[cyan]{\em cyaan},
+%D \color[magenta]{\em magenta} and \color[yellow]{\em geel}.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox to \hsize
 %D   {\hss
-%D    \showcolorgroup [rood]    [vertikaal,naam,nummer]\hss
-%D    \showcolorgroup [groen]   [vertikaal,naam]\hss
-%D    \showcolorgroup [blauw]   [vertikaal,naam]\hss
-%D    \showcolorgroup [cyaan]   [vertikaal,naam]\hss
-%D    \showcolorgroup [magenta] [vertikaal,naam]\hss
-%D    \showcolorgroup [geel]    [vertikaal,naam]\hss}
-%D \stopregelcorrectie
+%D    \showcolorgroup [red]    [vertical,name,number]\hss
+%D    \showcolorgroup [green]   [vertical,name]\hss
+%D    \showcolorgroup [blue]   [vertical,name]\hss
+%D    \showcolorgroup [cyan]   [vertical,name]\hss
+%D    \showcolorgroup [magenta] [vertical,name]\hss
+%D    \showcolorgroup [yellow]    [vertical,name]\hss}
+%D \stoplinecorrection
 %D
 %D These groups are used to define palets {\em alfa} upto {\em
 %D zeta}. As long as we don't use colors from the same row, we
@@ -2348,17 +2348,17 @@
 %D one gains access to its members {\em top} to {\em charm} (of
 %D course one should use more suitable names than these).
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox to \hsize
-%D   {\showpalet [alfa]    [vertikaal,naam,nummer]\hss
-%D    \showpalet [beta]    [vertikaal,naam]\hss
-%D    \showpalet [gamma]   [vertikaal,naam]\hss
-%D    \showpalet [delta]   [vertikaal,naam]\hss
-%D    \showpalet [epsilon] [vertikaal,naam]\hss
-%D    \showpalet [zeta]    [vertikaal,naam]}
-%D \stopregelcorrectie
-%D
-%D By using the keyword \type{\v!waarde} the individual color
+%D   {\showpalet [alfa]    [vertical,name,number]\hss
+%D    \showpalet [beta]    [vertical,name]\hss
+%D    \showpalet [gamma]   [vertical,name]\hss
+%D    \showpalet [delta]   [vertical,name]\hss
+%D    \showpalet [epsilon] [vertical,name]\hss
+%D    \showpalet [zeta]    [vertical,name]}
+%D \stoplinecorrection
+%D
+%D By using the keyword \type {value} the individual color
 %D components are shown too. When printed in color, these
 %D showcases show both the colors and the gray value.
 
@@ -2375,9 +2375,9 @@
 %D
 %D shows the palet colors against a background:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D The formal definition is:
 %D
@@ -2391,16 +2391,16 @@
 %D The similar command:
 %D
 %D \startbuffer
-%D \comparecolorgroup [blauw]
+%D \comparecolorgroup [blue]
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
 %D shows color groups:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D this commands are defined as:
 %D
@@ -2414,9 +2414,9 @@
 %D But let's not forget that we also have the more traditional
 %D non||related colors. These show up after:
 %D
-%D \starttypen
+%D \starttyping
 %D \showcolor [name]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Where \type{name} for instance can be \type{rgb}.
 %D
@@ -2433,13 +2433,13 @@
 %D A very special macro is \type{\MPcolor}. This one can be
 %D used to pass a \CONTEXT\ color to \METAPOST.
 %D
-%D \starttypen
+%D \starttyping
 %D \MPcolor{my own red}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro returns a \METAPOST\ triplet \type{(R,G,B)}.
 %D Unless \CMYK\ color support is turned on with \type
-%D {MPcmyk}, only \kap{RGB} colors and gray scales are
+%D {MPcmyk}, only \cap{RGB} colors and gray scales are
 %D supported.
 
 \newif\ifMPcmykcolors % \MPcmykcolorsfalse
@@ -2480,14 +2480,14 @@
 %D Before we had transparency available, the following
 %D conversion macro was available:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doMPcolor#1:#2:#3:#4:#5:#6:#7:#8\end
 %D   {\if     #1R(#2,#3,#4)%
 %D    \else\if#1C\ifMPcmykcolors cmyk(#2,#3,#4,#5)\else(1-#2-#5,1-#3-#5,1-#4-#5)\fi
 %D    \else\if#1S(#2,#2,#2)%
 %D    \else      (0,0,0)%
 %D    \fi\fi\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In order to be useful, this macro is to be fully
 %D expandabele.
@@ -2611,21 +2611,21 @@
 \appendtoks \localcolortrue \to \everyshapebox
 
 %D We default to the colors defined in \module{colo-rgb} and
-%D support both \kap{RGB} and \kap{CMYK} output.
+%D support both \cap{RGB} and \cap{CMYK} output.
 
 \setupcolors
-  [\c!status=\v!stop,
-   \c!conversie=\v!ja,
-   \c!reductie=\v!nee,
-   \c!rgb=\v!ja,
-   \c!cmyk=\v!ja,
-   \c!spot=\v!ja,
+  [\c!state=\v!stop,
+   \c!conversion=\v!yes,
+   \c!reduction=\v!no,
+   \c!rgb=\v!yes,
+   \c!cmyk=\v!yes,
+   \c!spot=\v!yes,
    \c!mp\c!cmyk=\@@clcmyk,
    \c!mp\c!spot=\@@clspot,
-   \c!expansie=\v!nee,
-   \c!tekstkleur=,
-   \c!splitsen=\v!nee,
-   \c!criterium=\v!alles]
+   \c!expansion=\v!no,
+   \c!textcolor=,
+   \c!split=\v!no,
+   \c!criterium=\v!all]
 
 \setupcolor
   [\v!rgb]
@@ -2662,7 +2662,7 @@
   {\doifseparatingcolorselse
      {\doifelsenothing{#1}
         \secondoftwoarguments
-        {\doifelse{#1}\@@clsplitsen
+        {\doifelse{#1}\@@clsplit
            \firstoftwoarguments
            \secondoftwoarguments}}
      \secondoftwoarguments}
@@ -2679,10 +2679,10 @@
 % \def\colorsplitsuffix{\ifcase\currentcolorchannel\else-\@@clsplitsen\fi}
 % \def\colorsplitprefix{\ifcase\currentcolorchannel\else\@@clsplitsen-\fi}
 
-\def\colorchannelprefix{\doifseparatingcolorselse\@@clsplitsen\empty-}
-\def\colorchannelsuffix{-\doifseparatingcolorselse\@@clsplitsen\empty}
+\def\colorchannelprefix{\doifseparatingcolorselse\@@clsplit\empty-}
+\def\colorchannelsuffix{-\doifseparatingcolorselse\@@clsplit\empty}
 
 %D As we can see, color support is turned off by default.
 %D Reduction of gray colors to gray scales is turned on.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/colo-pra.tex b/tex/context/base/colo-pra.tex
index 228df546a..8d0abb17b 100644
--- a/tex/context/base/colo-pra.tex
+++ b/tex/context/base/colo-pra.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-pra,
+%D   [       filefile=colo-pra,
 %D        version=1997.01.03,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=PRAGMA,
diff --git a/tex/context/base/colo-rgb.tex b/tex/context/base/colo-rgb.tex
index 7554ed344..5429b2c46 100644
--- a/tex/context/base/colo-rgb.tex
+++ b/tex/context/base/colo-rgb.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-rgb,
+%D   [       filefile=colo-rgb,
 %D        version=1995.01.01,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=RGB,
@@ -18,8 +18,8 @@
 %D interface dependant colors. We use the color inheritance
 %D mechanisms to implement the interface dependant ones.
 
-%D First we define some simple primary \kap{RGB} and \kap{CMYK} 
-%D colors. All colors are defined in \kap{RGB} color space.
+%D First we define some simple primary \cap{RGB} and \cap{CMYK} 
+%D colors. All colors are defined in \cap{RGB} color space.
 
 \definecolor [red]           [r=1,   g=0,   b=0]
 \definecolor [green]         [r=0,   g=1,   b=0]
diff --git a/tex/context/base/colo-run.tex b/tex/context/base/colo-run.tex
index 8cd9f62dd..386b67108 100644
--- a/tex/context/base/colo-run.tex
+++ b/tex/context/base/colo-run.tex
@@ -1,3 +1,16 @@
+%D \module
+%D   [       filefile=colo-run,
+%D        version=1997.04.01,
+%D          title=\CONTEXT\ Color Macros,
+%D       subtitle=Runtime loaded commands,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
 \unprotect
 
 \gdef\showpalet
@@ -5,7 +18,7 @@
 
 \gdef\doshowpalet[#1][#2]%
   {\doifdefined{\??pa#1}
-     {\doifinsetelse\v!vertikaal{#2}
+     {\doifinsetelse\v!vertical{#2}
         {\showverticalpalet[#1][#2]}
         {\showhorizontalpalet[#1][#2]}}}
 
@@ -17,12 +30,12 @@
         {\vrule\!!width3em\!!height\strutht\!!depth\strutdp}
       \tabskip\zeropoint
       \def\doshowpalet##1%
-        {\doifinsetelse\v!nummer{#2}{##1\hskip.5em}{}&
+        {\doifinsetelse\v!number{#2}{##1\hskip.5em}{}&
          \color[##1]{\rule}\graycolor[##1]{\rule}&
-         \doifinset\v!waarde{#2}{\hskip.5em\colorvalue{##1}}\crcr}
+         \doifinset\v!value{#2}{\hskip.5em\colorvalue{##1}}\crcr}
       \halign
         {\hss##&\hss##\hss&##\cr
-         &\doifinset{\v!naam}{#2}{\strut#1}&\cr%
+         &\doifinset{\v!name}{#2}{\strut#1}&\cr%
          \processpalet[#1]\doshowpalet\crcr}}}
 
 \gdef\showhorizontalpalet[#1][#2]%
@@ -31,7 +44,7 @@
       \setuppalet[#1]
       \tabskip\zeropoint
       \!!widtha\zeropoint
-      \doifinset\v!nummer{#2}
+      \doifinset\v!number{#2}
         {\def\doshowpalet##1%
            {\setbox0\hbox{##1}%
             \ifdim\!!widtha<\wd0\!!widtha\wd0\fi}%
@@ -42,17 +55,17 @@
       \fi
       \halign
         {##&&\hbox to \!!widtha{\hss##\hss}\cr
-         \doifinset\v!nummer{#2}
+         \doifinset\v!number{#2}
            {\def\doshowpalet##1{&\strut##1}%
             \processpalet[#1]\doshowpalet}\cr
-         \doifinset\v!naam{#2}{#1\hskip.5em}%
+         \doifinset\v!name{#2}{#1\hskip.5em}%
          \def\doshowpalet##1%
            {&\color[##1]{\vrule\!!width\!!widtha\!!height\strutht\!!depth\zeropoint}}%
          \processpalet[#1]\doshowpalet\crcr
          \def\doshowpalet##1%
            {&\graycolor[##1]{\vrule\!!width\!!widtha\!!height\zeropoint\!!depth\strutdp}}%
          \processpalet[#1]\doshowpalet\crcr
-         \doifinset\v!waarde{#2}
+         \doifinset\v!value{#2}
            {\def\doshowpalet##1%
              {&\vbox
                 {\hsize\!!widtha
@@ -72,7 +85,7 @@
 
 \gdef\doshowcolorgroup[#1][#2]%
   {\doifdefined{\??cr#1:1}
-     {\doifinsetelse\v!vertikaal{#2}
+     {\doifinsetelse\v!vertical{#2}
         {\showverticalcolorgroup[#1][#2]}
         {\showhorizontalcolorgroup[#1][#2]}}}
 
@@ -87,17 +100,17 @@
       \def\dodoshowgroup##1%
         {\halign
            {\hss####\hss\cr
-            \doifinset\v!nummer{#2}{\strut##1}\cr
+            \doifinset\v!number{#2}{\strut##1}\cr
             \color[#1:##1]{\vrule\!!width4em\!!height\strutht\!!depth\zeropoint}\cr
             \graycolor[#1:##1]{\vrule\!!width4em\!!height\zeropoint\!!depth\strutdp}\cr
-            \doifinset\v!waarde{#2}{\colorvalue{#1:##1}\strut}\crcr}}
+            \doifinset\v!value{#2}{\colorvalue{#1:##1}\strut}\crcr}}
       \def\doshowgroup##1%
         {\doifdefined{\??cr#1:##1}
            {\vbox{\dodoshowgroup{##1}}}}
       \hbox
-        {\doifinset\v!naam{#2}
+        {\doifinset\v!name{#2}
            {\strut
-            \doifinsetelse\v!waarde{#2}
+            \doifinsetelse\v!value{#2}
               {\raise3\lineheight\hbox{#1\hskip.5em}}
               {#1}%
             \hskip.5em}%
@@ -113,12 +126,12 @@
         {\vrule\!!width2.5em\!!height\strutht\!!depth\strutdp}
       \def\doshowgroup##1%
         {\doifdefined{\??cr#1:##1}
-           {\doifinset\v!nummer{#2}{##1\hskip.5em}&
+           {\doifinset\v!number{#2}{##1\hskip.5em}&
             \color[#1:##1]{\rule}\graycolor[#1:##1]{\rule}&
-            \doifinset\v!waarde{#2}{\hskip.5em\colorvalue{#1:##1}}\crcr}}
+            \doifinset\v!value{#2}{\hskip.5em\colorvalue{#1:##1}}\crcr}}
       \halign
         {\hss##&\hss##\hss&##\hss\cr
-         &\doifinset\v!naam{#2}{\strut#1}&\crcr
+         &\doifinset\v!name{#2}{\strut#1}&\crcr
          \doshowgroup1\doshowgroup2\doshowgroup3\doshowgroup4%
          \doshowgroup5\doshowgroup6\doshowgroup7\doshowgroup8}}}
 
@@ -132,7 +145,7 @@
        \let\colorstyle\empty
        \setupcolor[#1]%
      \fi
-     \setupwhitespace[\v!geen]
+     \setupwhitespace[\v!none]
      \def\rule
        {\vrule\!!width4em\!!height\strutht\!!depth\strutdp}
      \def\docommand##1%
diff --git a/tex/context/base/colo-xwi.tex b/tex/context/base/colo-xwi.tex
index 81e09d871..534c334eb 100644
--- a/tex/context/base/colo-xwi.tex
+++ b/tex/context/base/colo-xwi.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=colo-xwi,
+%D   [       filefile=colo-xwi,
 %D        version=1995.01.01,
 %D          title=\CONTEXT\ Color Macros,
 %D       subtitle=X Windows,
diff --git a/tex/context/base/cont-cz.tex b/tex/context/base/cont-cz.tex
index 84c0a5ca2..87f95a164 100644
--- a/tex/context/base/cont-cz.tex
+++ b/tex/context/base/cont-cz.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-cz,
+%D   [       filefile=cont-cz,
 %D        version=1998.12.02,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ Czech Format Generation, 
@@ -21,10 +21,10 @@
 
 \loaduserspecifications 
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!sk] [\c!status=\v!start]
-\installlanguage [\s!cz] [\c!status=\v!start]
+\installlanguage [\s!en] [\c!state=\v!start] 
+\installlanguage [\s!de] [\c!state=\v!start] 
+\installlanguage [\s!sk] [\c!state=\v!start]
+\installlanguage [\s!cz] [\c!state=\v!start]
 
 \setupbodyfont [csr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-de.tex b/tex/context/base/cont-de.tex
index 314122ab9..868f580f7 100644
--- a/tex/context/base/cont-de.tex
+++ b/tex/context/base/cont-de.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-de,
+%D   [       filefile=cont-de,
 %D        version=1997.08.19,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ German Format Generation, 
@@ -21,15 +21,15 @@
 
 \loaduserspecifications
 
-\installlanguage [\s!en]  [\c!status=\v!start] 
-\installlanguage [\s!uk]  [\c!status=\v!start] 
-\installlanguage [\s!de]  [\c!status=\v!start] 
-\installlanguage [\s!fr]  [\c!status=\v!start] 
-\installlanguage [\s!es]  [\c!status=\v!start] 
-\installlanguage [\s!nl]  [\c!status=\v!start] 
-\installlanguage [\s!it]  [\c!status=\v!start] 
+\installlanguage [\s!en]  [\c!state=\v!start] 
+\installlanguage [\s!uk]  [\c!state=\v!start] 
+\installlanguage [\s!de]  [\c!state=\v!start] 
+\installlanguage [\s!fr]  [\c!state=\v!start] 
+\installlanguage [\s!es]  [\c!state=\v!start] 
+\installlanguage [\s!nl]  [\c!state=\v!start] 
+\installlanguage [\s!it]  [\c!state=\v!start] 
 
-\installlanguage [deo]    [\c!status=\v!start] 
+\installlanguage [deo]    [\c!state=\v!start] 
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-en.tex b/tex/context/base/cont-en.tex
index b84470695..01fc47be9 100644
--- a/tex/context/base/cont-en.tex
+++ b/tex/context/base/cont-en.tex
@@ -1,19 +1,19 @@
 %D \module
-%D   [       file=cont-en,
+%D   [       filefile=cont-en,
 %D        version=1997.08.19,
 %D          title=\CONTEXT,
-%D       subtitle=\CONTEXT\ English Format Generation, 
+%D       subtitle=\CONTEXT\ English Format Generation,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-\catcode`\{=1 \catcode`\}=2 \def\defaultinterface{english} 
+\catcode`\{=1 \catcode`\}=2 \def\defaultinterface{english}
 
-\input context.tex 
+\input context.tex
 
 \unprotect
 
@@ -21,13 +21,13 @@
 
 \loaduserspecifications
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!uk] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!fr] [\c!status=\v!start] 
-\installlanguage [\s!es] [\c!status=\v!start] 
-\installlanguage [\s!it] [\c!status=\v!start] 
-\installlanguage [\s!nl] [\c!status=\v!start] 
+\installlanguage [\s!en] [\c!state=\v!start]
+\installlanguage [\s!uk] [\c!state=\v!start]
+\installlanguage [\s!de] [\c!state=\v!start]
+\installlanguage [\s!fr] [\c!state=\v!start]
+\installlanguage [\s!es] [\c!state=\v!start]
+\installlanguage [\s!it] [\c!state=\v!start]
+\installlanguage [\s!nl] [\c!state=\v!start]
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-err.tex b/tex/context/base/cont-err.tex
index f4c503da8..5a35a21c2 100644
--- a/tex/context/base/cont-err.tex
+++ b/tex/context/base/cont-err.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-err,
+%D   [       filefile=cont-err,
 %D        version=2003.08.12,
 %D          title=\CONTEXT\ System Files, 
 %D       subtitle=Just A warning, 
diff --git a/tex/context/base/cont-fil.tex b/tex/context/base/cont-fil.tex
index fa4d567b9..01bf6ceaf 100644
--- a/tex/context/base/cont-fil.tex
+++ b/tex/context/base/cont-fil.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-fil,
+%D   [       filefile=cont-fil,
 %D        version=1997.11.15,
 %D          title=\CONTEXT\ Miscellaneous Macros,
 %D       subtitle=File Synonyms,
@@ -90,4 +90,6 @@
 \definefilesynonym [chi-simplified]  [chi-01]
 \definefilesynonym [chi-traditional] [chi-02]
 
+\definefilesynonym [greek]           [grk-00]
+
 \endinput
diff --git a/tex/context/base/cont-it.tex b/tex/context/base/cont-it.tex
index 4957f966e..c45a0c8a9 100644
--- a/tex/context/base/cont-it.tex
+++ b/tex/context/base/cont-it.tex
@@ -1,19 +1,19 @@
 %D \module
-%D   [       file=cont-it,
+%D   [       filefile=cont-it,
 %D        version=1997.08.19,
 %D          title=\CONTEXT,
-%D       subtitle=\CONTEXT\ Italian Format Generation, 
+%D       subtitle=\CONTEXT\ Italian Format Generation,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-\catcode`\{=1 \catcode`\}=2 \def\defaultinterface{italian} 
+\catcode`\{=1 \catcode`\}=2 \def\defaultinterface{italian}
 
-\input context.tex 
+\input context.tex
 
 \unprotect
 
@@ -21,13 +21,13 @@
 
 \loaduserspecifications
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!uk] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!fr] [\c!status=\v!start] 
-\installlanguage [\s!es] [\c!status=\v!start] 
-\installlanguage [\s!it] [\c!status=\v!start] 
-%\installlanguage [\s!nl] [\c!status=\v!start] 
+\installlanguage [\s!en] [\c!state=\v!start]
+\installlanguage [\s!uk] [\c!state=\v!start]
+\installlanguage [\s!de] [\c!state=\v!start]
+\installlanguage [\s!fr] [\c!state=\v!start]
+\installlanguage [\s!es] [\c!state=\v!start]
+\installlanguage [\s!it] [\c!state=\v!start]
+%installlanguage [\s!nl] [\c!state=\v!start]
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex
index 488e0a735..4f21fa43a 100644
--- a/tex/context/base/cont-log.tex
+++ b/tex/context/base/cont-log.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-log,
+%D   [       filefile=cont-log,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Miscellaneous Macros,
 %D       subtitle=\TEX\ Logos,
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 055b12317..531b4baff 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-new,
+%D   [       filefile=cont-new,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Miscellaneous Macros,
 %D       subtitle=New Macros,
@@ -19,8 +19,74 @@
 
 \unprotect
 
+% \tracingall
+
 \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex!}
 
+\def\outermarginwidth   {\rightorleftpageaction\rightmarginwidth   \leftmarginwidth }
+\def\innermarginwidth   {\rightorleftpageaction\leftmarginwidth    \rightmarginwidth}
+\def\outermargindistance{\rightorleftpageaction\rightmargindistance\leftmargindistance }
+\def\innermargindistance{\rightorleftpageaction\leftmargindistance \rightmargindistance}
+
+\def\outeredgewidth     {\rightorleftpageaction\rightedgewidth   \leftedgewidth }
+\def\inneredgewidth     {\rightorleftpageaction\leftedgewidth    \rightedgewidth}
+\def\outeredgedistance  {\rightorleftpageaction\rightedgedistance\leftedgedistance }
+\def\inneredgedistance  {\rightorleftpageaction\leftedgedistance \rightedgedistance}
+
+\def\outerspacewidth    {\rightorleftpageaction\cutspace\backspace }
+\def\innerspacewidth    {\rightorleftpageaction\backspace \cutspace}
+
+\appendtoks
+  \scratchdimen\leftmarginwidth  \advance\scratchdimen\leftmargindistance  \xdef\leftmargintotal {\the\scratchdimen}%
+  \scratchdimen\rightmarginwidth \advance\scratchdimen\rightmargindistance \xdef\rightmargintotal{\the\scratchdimen}%
+  \scratchdimen\leftedgewidth    \advance\scratchdimen\leftedgedistance    \xdef\leftedgetotal   {\the\scratchdimen}%
+  \scratchdimen\rightedgewidth   \advance\scratchdimen\rightedgedistance   \xdef\rightedgetotal  {\the\scratchdimen}%
+  \scratchdimen\leftmarginwidth  \advance\scratchdimen\leftedgetotal       \xdef\leftsidetotal   {\the\scratchdimen}%
+  \scratchdimen\rightmarginwidth \advance\scratchdimen\rightedgetotal      \xdef\rightsidetotal  {\the\scratchdimen}%
+  \scratchdimen\leftmargintotal  \advance\scratchdimen\leftedgetotal       \xdef\leftcombitotal  {\the\scratchdimen}%
+  \scratchdimen\rightmargintotal \advance\scratchdimen\rightedgetotal      \xdef\rightcombitotal {\the\scratchdimen}%
+  %
+  \scratchdimen\innermarginwidth \advance\scratchdimen\innermargindistance \xdef\innermargintotal{\the\scratchdimen}%
+  \scratchdimen\outermarginwidth \advance\scratchdimen\outermargindistance \xdef\outermargintotal{\the\scratchdimen}%
+  \scratchdimen\inneredgewidth   \advance\scratchdimen\inneredgedistance   \xdef\inneredgetotal  {\the\scratchdimen}%
+  \scratchdimen\outeredgewidth   \advance\scratchdimen\outeredgedistance   \xdef\outeredgetotal  {\the\scratchdimen}%
+  \scratchdimen\innermargintotal \advance\scratchdimen\inneredgetotal      \xdef\innercombitotal {\the\scratchdimen}%
+  \scratchdimen\outermargintotal \advance\scratchdimen\outeredgetotal      \xdef\outercombitotal {\the\scratchdimen}%
+  \scratchdimen\innermarginwidth \advance\scratchdimen\inneredgetotal      \xdef\innersidetotal  {\the\scratchdimen}%
+  \scratchdimen\outermarginwidth \advance\scratchdimen\outeredgetotal      \xdef\outersidetotal  {\the\scratchdimen}%
+\to \extralayoutcalculations
+
+\appendtoks
+  \swapmacros\leftmargintotal \rightmargintotal
+  \swapmacros\leftedgetotal   \rightedgetotal
+  \swapmacros\leftsidetotal   \rightsidetotal
+  \swapmacros\leftcombitotal  \rightcombitotal
+  \swapmacros\innermargintotal\outermargintotal
+  \swapmacros\inneredgetotal  \outeredgetotal
+  \swapmacros\innercombitotal \outercombitotal
+  \swapmacros\innersidetotal  \outersidetotal
+\to \everyswapmargins
+
+% for taco: you may need to patch modules that have low level dutch
+
+\ifx\definieernummer\undefined \let\definieernummer\definenumber    \fi
+\ifx\verhoognummer  \undefined \let\verhoognummer  \incrementnumber \fi
+\ifx\verlaagnummer  \undefined \let\verhoognummer  \decrementnumber \fi
+\ifx\stelnummerin   \undefined \let\stelnummerin   \setupnumber     \fi
+
+% this will be activated when
+
+% \newinsert\thispageinsert % <- installinsertion
+
+% \def\flushatthispage
+%   {\bgroup
+%    \dowithnextbox{\insert\thispageinsert{\box\nextbox}\egroup}%
+%    \hbox}
+
+% \appendtoks
+%     \ifvoid\thispageinsert\else\hbox{\smashedbox\thispageinsert}\fi
+% \to \everyshipout
+
 % \definemarkedpage[nobackgrounds]
 % \markpage[nobackgrounds]
 % \doifmarkedpageelse{nobackgrounds}
@@ -33,7 +99,7 @@
 \newcounter\nofmarkedpages
 
 \def\definemarkedpage[#1]%
-  {\definetwopasslist{\v!pagina:#1}}
+  {\definetwopasslist{\v!page:#1}}
 
 \def\markpage[#1]% looks very much like domarginreference and doparagraphreference
   {\iftrialtypesetting\else
@@ -41,14 +107,14 @@
      \edef\writeparref%
        {\writeutilitycommand%
           {\twopassentry%
-             {\v!pagina:#1}%
+             {\v!page:#1}%
              {\nofmarkedpages}%
              {\noexpand\realfolio}}}%
      \writeparref
    \fi}
 
 \def\doifmarkedpageelse#1%
-  {\gettwopassdatalist{\v!pagina:#1}%
+  {\gettwopassdatalist{\v!page:#1}%
    \expanded{\doifinsetelse{\realfolio}{\twopassdatalist}}}
 
 % Just a simple and fast hanger, for usage in macros.
@@ -57,12 +123,12 @@
   {\dodoubleempty\getparameters[\??ha]}
 
 \setuphanging
-  [\c!afstand=.5em]
+  [\c!distance=.5em]
 
 \def\starthanging
   {\noindent\bgroup
    \dowithnextbox
-     {\setbox\nextbox\hbox{\flushnextbox\hskip\@@haafstand}%
+     {\setbox\nextbox\hbox{\flushnextbox\hskip\@@hadistance}%
       \hangindent\nextboxwd
       \hangafter\plusone
       \flushnextbox\ignorespaces}
@@ -80,15 +146,6 @@
 
 % \getmulticolumnlines -> now in cont-loc, to be tested and really needed
 
-\def\naturaltextext#1\relax
-  {\bgroup
-   \prettynaturalfont
-   \def\ascii{#1}%
-   \setnormalcatcodes
-   \restorecatcodes
-   \scantokens\expandafter{\ascii}\ifhmode\unskip\fi
-   \egroup}
-
 \long\def\startprocesscommalist[#1]#2\stopprocesscommalist
   {\long\def\currentcommalistcommand##1{\def\currentcommalistitem{##1}#2}%
    \processcommalist[#1]\currentcommalistcommand}
@@ -102,7 +159,7 @@
   {\def\currentcol{0}\increment\maximumrow
    \let\currentcolpos\currentcol
    \let\eTR\relax
-   \setupTABLE[\v!rij][\maximumrow][#1]}
+   \setupTABLE[\v!row][\maximumrow][#1]}
 
 \long\def\parseTD[#1][#2]#3\eTD % [#2] is dummy that kills spaces
   {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,\c!n=\currentcol,#1]%
@@ -432,10 +489,10 @@
    \unexpanded\def\dosetlocationbox[##1]##2[##3]%
      {\getparameters[##1][##3]%
       \definecolor[rollover][rollover:##2]%
-      \doifelse{##2}{n}{\doifelsevalue{##1\c!variant}\v!verborgen\phantom\hbox}\hbox
+      \doifelse{##2}{n}{\doifelsevalue{##1\c!alternative}\v!hidden\phantom\hbox}\hbox
         {\localframed[##1]
-           [\c!kaderkleur=rollover,\c!achtergrondkleur=rollover,\c!kleur=rollover]%
-           {\dolocationattributes{##1}\c!letter\c!kleur{#3}}}}%
+           [\c!framecolor=rollover,\c!backgroundcolor=rollover,\c!color=rollover]%
+           {\dolocationattributes{##1}\c!style\c!color{#3}}}}%
    \iffirstargument
      \ifsecondargument
        \def\setlocationbox##1{\dosetlocationbox[\??am#1]{##1}[#2]}%
@@ -453,9 +510,9 @@
    \definesymbol[rsym:\nofrollovers:d][\setlocationbox d]%
    \setupfield
      [rollbutton]
-     [\c!kader=\v!uit,
+     [\c!frame=\v!off,
       \c!offset=\v!overlay,
-      \c!klikuit={#4}]%
+      \c!clickout={#4}]%
    \definefield
      [roll:\nofrollbuttons][push][rollbutton]
      [rsym:\nofrollovers:n,%
@@ -501,10 +558,10 @@
    \nextsystemfield
    \setupfield
      [overlayrollbutton]
-     [\c!kader=\v!uit,\c!offset=\v!overlay,\c!gebiedin={#1},\c!gebieduit={#2}]%
+     [\c!frame=\v!off,\c!offset=\v!overlay,\c!regionin={#1},\c!regionout={#2}]%
    \definesymbol
      [\currentsystemfield]
-     [{\framed[\c!kader=\v!uit,\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]{}}]%
+     [{\framed[\c!frame=\v!off,\c!width=\overlaywidth,\c!height=\overlayheight]{}}]%
    \definefield
      [\currentsystemfield][push][overlayrollbutton][\currentsystemfield][\currentsystemfield]%
    \fitfield[\currentsystemfield]%
@@ -661,7 +718,7 @@
    \fi \fi
    \advance\boislevel\minusone}
 
-\defineblankmethod [\v!synchroniseer] {\verticalstrut\vskip-2\lineheight\verticalstrut}
+\defineblankmethod [\v!synchronize] {\verticalstrut\vskip-2\lineheight\verticalstrut}
 
 % \vtop{\blank[synchronize]\blank[line]test}
 
@@ -861,8 +918,8 @@
   {\presetlocalframed[\??rw#1]%
    \getparameters%
      [\??rw#1]%
-     [\c!openpaginaactie=,\c!sluitpaginaactie=,%
-      \c!breedte=\renderingwidth,\c!hoogte=\renderingheight,%
+     [\c!openpageaction=,\c!closepageaction=,%
+      \c!width=\renderingwidth,\c!height=\renderingheight,%
       #2]}
 
 \def\setuprenderingwindow
@@ -888,13 +945,13 @@
      \edef\renderingwidth{\objectwidth}%
    \fi
    % create fall back if needed
-   \doifdefinedelse{\??rw#1\c!breedte}
+   \doifdefinedelse{\??rw#1\c!width}
      {\def\currentrenderingwindow{#1}}
      {\let\currentrenderingwindow\s!default
       \definerenderingwindow[\currentrenderingwindow]}%
    \checkrendering\currentrendering
-   \handlereferenceactions{\getvalue{\??rw\currentrenderingwindow\c!openpaginaactie }}\dosetuprenderingopenpageaction
-   \handlereferenceactions{\getvalue{\??rw\currentrenderingwindow\c!sluitpaginaactie}}\dosetuprenderingclosepageaction
+   \handlereferenceactions{\getvalue{\??rw\currentrenderingwindow\c!openpageaction }}\dosetuprenderingopenpageaction
+   \handlereferenceactions{\getvalue{\??rw\currentrenderingwindow\c!closepageaction}}\dosetuprenderingclosepageaction
    \localframed
      [\??rw\currentrenderingwindow][\c!offset=\v!overlay]%
      {\expanded{\doinsertrenderingwindow
@@ -1068,9 +1125,9 @@
    \nextsystemfield
    \setupfield
      [pushbutton]
-     [\c!kader=\v!overlay,
+     [\c!frame=\v!overlay,
       \c!offset=\v!overlay,
-      \c!klikuit=#3,#2]%
+      \c!clickout=#3,#2]%
    \definefield
      [\currentsystemfield]
      [push]
@@ -1104,7 +1161,7 @@
 \def\tabulaterule % to be redone, not correct
   {\dotabulaterule
      {\hrule\!!height.5\scratchdimen\!!depth.5\scratchdimen\relax
-      \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
+      \doifvalue{\??tt\currenttabulate\c!distance}\v!grid
         {\kern-\scratchdimen}}} % experimental tm-prikkels
 
 % todo: \setupinterlinespace[\c!regel=\v!vast] => ==\the\baselineskip
@@ -1140,8 +1197,8 @@
    \vskip-\lineheight
    \nointerlineskip
    % top of text
-   \scratchdimen\MPy{\v!tekst:\MPp\gridsynctag}%
-   \advance\scratchdimen\MPh{\v!tekst:\MPp\gridsynctag}%
+   \scratchdimen\MPy{\v!text:\MPp\gridsynctag}%
+   \advance\scratchdimen\MPh{\v!text:\MPp\gridsynctag}%
    % move to first baseline
    \advance\scratchdimen-\topskip
    % subtract wrong baseline
@@ -1177,15 +1234,15 @@
       \processaction
         [#2]
         [% first test true, rest depends
-         \v!volgende=>\setgvalue{\??ie#1}{\setgvalue{\??ie#1}{#3}\firstoftwoarguments},
+         \v!next=>\setgvalue{\??ie#1}{\setgvalue{\??ie#1}{#3}\firstoftwoarguments},
          % rest true if first true
-         % \v!eerste=>\setgvalue{\??ie#1}{#3{\letgvalue{\??ie#1}%
+         % \v!first=>\setgvalue{\??ie#1}{#3{\letgvalue{\??ie#1}%
          %              \firstoftwoarguments\firstoftwoarguments}%
          %              \secondoftwoarguments},
          % always true
-               \v!ja=>\letgvalue{\??ie#1}\firstoftwoarguments,
+               \v!yes=>\letgvalue{\??ie#1}\firstoftwoarguments,
          % always false
-              \v!nee=>\letgvalue{\??ie#1}\secondoftwoarguments]%
+              \v!no=>\letgvalue{\??ie#1}\secondoftwoarguments]%
    \fi}
 
 \def\doperformtest#1%
@@ -1242,10 +1299,10 @@
    {\csname#1\endcsname}}
 
 \def\@@sectiekoppeling#1%
-  {\expandifnonempty{\??ko#1\c!koppeling}{#1}}
+  {\expandifnonempty{\??ko#1\c!coupling}{#1}}
 
 \def\@@sectiesectie#1%
-  {\expandifnonempty{\??ko#1\c!sectie}{\@@sectiekoppeling{#1}}}
+  {\expandifnonempty{\??ko#1\c!section}{\@@sectiekoppeling{#1}}}
 
 \def\sectioncountervalue#1%
   {\@@sectionvalue{\@@sectiesectie{#1}}}
@@ -1267,8 +1324,8 @@
      \strut\penalty-9999 % \break fails on case (3)
    \fi}
 
-\def\startdisplay{\displaybreak\ignorespaces\startopelkaar}
-\def\stopdisplay {\stopopelkaar\displaybreak\ignorespaces}
+\def\startdisplay{\displaybreak\ignorespaces\startpacked}
+\def\stopdisplay {\stoppacked\displaybreak\ignorespaces}
 
 \def\tightvbox
   {\dowithnextbox{\nextboxdp\zeropoint\flushnextbox}\vbox}
@@ -1366,7 +1423,7 @@
 
 \def\dostartgridcorrection[#1]%
   {\ifgridsnapping
-     \iffirstargument\doifsomething{#1}{\verplaatsopgrid[#1]}\fi
+     \iffirstargument\doifsomething{#1}{\moveongrid[#1]}\fi
      \snaptogrid\vbox\bgroup
    \else
      \startbaselinecorrection
@@ -1390,10 +1447,10 @@
    \noindent\bgroup
    \setlocalhsize
    \hbox to \localhsize\bgroup
-     \doifnot{#1}\v!links\hss
+     \doifnot{#1}\v!left\hss
      \def\stopplaatsen
        {\unskip\unskip\unskip
-        \doifnot{#1}\v!rechts\hss
+        \doifnot{#1}\v!right\hss
         \egroup
         \egroup
         \endgraf}%
@@ -1419,7 +1476,7 @@
 \def\dosetrastercolor#1%
   {\edef\@@cl@@s{#1}%
    \ifx\@@cl@@s\empty
-     \let\@@cl@@s\@@rsraster
+     \let\@@cl@@s\@@rsscreen
    \fi
    \setevalue{\??cr\??rs}{\colorSpattern}}
 
@@ -1456,7 +1513,7 @@
 
 \def\startcolumnmakeup % don't change
   {\bgroup
-   \getrawnoflines\teksthoogte % teksthoogte kan topskip hebben, dus raw
+   \getrawnoflines\textheight % teksthoogte kan topskip hebben, dus raw
    \scratchdimen\noflines\lineheight
    \advance\scratchdimen-\lineheight
    \advance\scratchdimen\topskip
@@ -1467,7 +1524,7 @@
 \def\stopcolumnmakeup
   {\egroup
    \dp\scratchbox\zeropoint
-   \wd\scratchbox\tekstbreedte
+   \wd\scratchbox\textwidth
    \box\scratchbox
    \egroup
    \synchronizehsize}
@@ -1484,90 +1541,6 @@
 
 \let\figuredescription\empty
 
-% beware, changing this will break some code (like pos/backgrounds)
-
-\newtoks\everyfirstparagraphintro
-\newtoks\everynextparagraphintro
-\newtoks\@@everyparagraphtoks
-
-\chardef\everyparagraphintro\zerocount
-
-\def\setupparagraphintro
-  {\dodoubleempty\dosetupparagraphintro}
-
-\def\dosetupparagraphintro[#1][#2]%
-  {\processallactionsinset
-     [#1]
-     [   \v!reset=>\global\chardef\everyparagraphintro\zerocount
-                   \global\everyfirstparagraphintro\emptytoks
-                   \global\everynextparagraphintro \emptytoks,
-        \v!eerste=>\global\chardef\everyparagraphintro\plusone
-                   \doglobal\appendtoks#2\to\everyfirstparagraphintro,
-      \v!volgende=>\ifcase\everyparagraphintro\global\chardef\everyparagraphintro\plusone\fi
-                   \doglobal\appendtoks#2\to\everynextparagraphintro,
-           \v!elk=>\ifcase\everyparagraphintro\global\chardef\everyparagraphintro\plustwo\fi
-                   \doglobal\appendtoks#2\to\everyfirstparagraphintro
-                   \doglobal\appendtoks#2\to\everynextparagraphintro]}
-
-% \def\doinsertparagraphintro
-%   {\ifcase\everyparagraphintro\relax
-%      % no data
-%      \@@everyparagraphtoks\emptytoks
-%    \or
-%      % first data
-%      \global\chardef\everyparagraphintro\plustwo
-%      \@@everyparagraphtoks\everyfirstparagraphintro
-%      \global\everyfirstparagraphintro\emptytoks
-%    \or
-%      % next data
-%      \@@everyparagraphtoks\everynextparagraphintro
-%    \fi
-%    \the\@@everyparagraphtoks}
-
-\def\doinsertparagraphintro
-  {\begingroup
-   \everypar\emptytoks
-   \ifcase\everyparagraphintro\relax
-     % no data
-     \@@everyparagraphtoks\emptytoks
-   \or
-     % first data
-     \global\chardef\everyparagraphintro\plustwo
-     \@@everyparagraphtoks\everyfirstparagraphintro
-     \global\everyfirstparagraphintro\emptytoks
-   \or
-     % next data
-     \@@everyparagraphtoks\everynextparagraphintro
-   \fi
-   \the\@@everyparagraphtoks
-   \endgroup}
-
-\def\insertparagraphintro
-  {\ifcase\everyparagraphintro\else\@EA\doinsertparagraphintro\fi}
-
-\appendtoksonce\insertparagraphintro\to\everypar
-
-%D \starttypen
-%D \setupparagraphintro[first][\hbox to 3.5em{\tt FIRST \hss}]
-%D \setupparagraphintro[first][\hbox to 3.5em{\tt TSRIF \hss}]
-%D \setupparagraphintro[next] [\hbox to 3.5em{\tt NEXT  \hss}]
-%D \setupparagraphintro[next] [\hbox to 3.5em{\tt TXEN  \hss}]
-%D \setupparagraphintro[each] [\hbox to 3.0em{\tt EACH  \hss}]
-%D \setupparagraphintro[each] [\hbox to 3.0em{\tt HCEA  \hss}]
-%D
-%D some paragraph \par
-%D some paragraph \par
-%D some paragraph \par
-%D
-%D \definelabel[parnumber]
-%D
-%D \setupparagraphintro[reset,each][\inleft{\slxx\parnumber}]
-%D
-%D some paragraph \par
-%D some paragraph \par
-%D some paragraph \par
-%D \stoptypen
-
 % wrong names
 
 \newif\ifpagechanged \let\lastchangedpage\empty
@@ -1595,7 +1568,7 @@
 
 \def\startfixed{\dosingleempty\dostartfixed}
 
-\long\def\dostartfixed[#1]%
+\def\dostartfixed[#1]%
   {\expanded{\dowithnextbox{\noexpand\dodofixed{\ifhmode0\else1\fi}{#1}}}%
    \vbox\bgroup
    \setlocalhsize}
@@ -1607,15 +1580,15 @@
   {\ifcase#1\relax
      \processaction
        [#2]
-       [   \v!hoog=>\bbox   {\flushnextbox},
-           \v!laag=>\tbox   {\flushnextbox},
-         \v!midden=>\vcenter{\flushnextbox},
-           \v!laho=>\vcenter{\flushnextbox},
+       [   \v!high=>\bbox   {\flushnextbox},
+           \v!low=>\tbox   {\flushnextbox},
+         \v!middle=>\vcenter{\flushnextbox},
+           \v!lohi=>\vcenter{\flushnextbox},
         \s!unknown=>\tbox   {\flushnextbox},
         \s!default=>\tbox   {\flushnextbox}]%
    \else
      \startbaselinecorrection
-     \noindent\flushnextbox
+       \noindent\flushnextbox
      \stopbaselinecorrection
    \fi}
 
@@ -1649,31 +1622,6 @@
 %
 % \stopitemize
 
-% \def\docalculatefigurenorm#1#2%
-%   {\dodocalculatefigurenorm{#1}[#2\empty\empty]}
-%
-% \def\dodocalculatefigurenorm#1[#2#3#4]#5#6#7%
-%   {\ExpandFirstAfter\processaction
-%       [#2#3#4]
-%       [     \v!max=>\global#1=#6\relax,
-%           \v!kolom=>\global#1=#6\relax,
-%           \v!tekst=>\global#1=#6\relax,
-%         \v!passend=>\global#1=#7\relax,
-%            \v!ruim=>\global#1=#7\relax
-%                     \global\advance #1 -4\@@exkorps\relax,
-%        #2*\v!kolom=>\global#1=#6\relax
-%                     \ifbinnenkolommen
-%                       \global\advance#1 \intercolumnwidth
-%                       \global\multiply#1 #2\relax
-%                       \global\advance#1 -\intercolumnwidth
-%                     \fi,
-%        #2*\v!tekst=>\global#1=\zetbreedte
-%                     \global\advance#1 \papierbreedte,
-%         \s!default=>\doifsomething{#5}{\global#1=#5\relax},
-%         \s!unknown=>\global#1=\@@exkorps\relax
-%                     \global\divide#1 \!!ten\relax
-%                     \global\multiply#1 #2#3#4\relax]}
-
 % still needed for uguide
 
 \let\placefloatlabel          \placefloatcaption
@@ -1771,7 +1719,7 @@
 \setupcolumnspan
   [\c!n=2,
    \c!offset=\v!overlay,
-   \c!kader=\v!uit]
+   \c!frame=\v!off]
 
 \newbox\columnspanbox \let\postprocesscolumnspanbox\gobbleoneargument
 
@@ -1779,14 +1727,14 @@
   {\bgroup
    \setupcolumnspan[#1]%
    \forgetall
-   \ifbinnenkolommen
+   \ifinsidecolumns
      \advance\hsize \intercolumnwidth
      \hsize\@@ksn\hsize
      \advance\hsize -\intercolumnwidth
    \fi
    \dowithnextbox
      {\setbox\columnspanbox\flushnextbox
-      \ifbinnenkolommen\wd\columnspanbox\hsize\fi
+      \ifinsidecolumns\wd\columnspanbox\hsize\fi
       \postprocesscolumnspanbox\columnspanbox
       \scratchdimen\ht\columnspanbox
       \setbox\columnspanbox\hbox % depth to be checked, probably option!
@@ -1794,7 +1742,7 @@
       \ht\columnspanbox\scratchdimen
       \dp\columnspanbox\strutdp
       \wd\columnspanbox\hsize
-      \ifbinnenkolommen
+      \ifinsidecolumns
         \ifnum\@@ksn>1
           \setvsize
           \dohandleallcolumns
@@ -1838,18 +1786,21 @@
 %D Far from complete.
 
 \def\startgeheel
-  {\startregelcorrectie
+  {\startlinecorrection
    \insidefloattrue}
 
 \def\stopgeheel
-  {\stopregelcorrectie}
+  {\stoplinecorrection}
 
 %D No more news.
 
 \protect
 
-%D A few local optimizations and new features, if defined:
+%D Next we load a few local optimizations and new features. They
+%D live on on my machine and are not distributed, but they may end
+%D up in the distributed files.
 
-\readfile {cont-loc} {} {}
+\readfile {cont-loc} {} {} % local improvements, patches, new features
+\readfile {cont-exp} {} {} % experimental features (e.g. local speed-ups)
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/cont-nl.tex b/tex/context/base/cont-nl.tex
index 259ce0b1b..a4aaf6a35 100644
--- a/tex/context/base/cont-nl.tex
+++ b/tex/context/base/cont-nl.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-nl,
+%D   [       filefile=cont-nl,
 %D        version=1997.08.19,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ Dutch Format Generation, 
@@ -21,13 +21,13 @@
 
 \loaduserspecifications
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!uk] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!fr] [\c!status=\v!start] 
-\installlanguage [\s!es] [\c!status=\v!start] 
-\installlanguage [\s!nl] [\c!status=\v!start] 
-\installlanguage [\s!it] [\c!status=\v!start] 
+\installlanguage [\s!en] [\c!state=\v!start] 
+\installlanguage [\s!uk] [\c!state=\v!start] 
+\installlanguage [\s!de] [\c!state=\v!start] 
+\installlanguage [\s!fr] [\c!state=\v!start] 
+\installlanguage [\s!es] [\c!state=\v!start] 
+\installlanguage [\s!nl] [\c!state=\v!start] 
+\installlanguage [\s!it] [\c!state=\v!start] 
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-old.tex b/tex/context/base/cont-old.tex
index 4e364fbff..06a264c6f 100644
--- a/tex/context/base/cont-old.tex
+++ b/tex/context/base/cont-old.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-old,
+%D   [       filefile=cont-old,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Miscellaneous Macros,
 %D       subtitle=Old Macros,
@@ -8,17 +8,15 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Context Old Macros}
 
 \unprotect
 
 \def\dosubstitutecommand#1#2%
-  {\writestatus
-     {pas op}
-     {\string#1\normalspace is nu \string#2}%
+  {\writestatus\m!systems{\string#1\normalspace -> \string#2}%
    \gdef#1{#2}%
    #2}
 
@@ -34,16 +32,16 @@
 %substitutecommand \stelmargesin            \stellayoutin
 %substitutecommand \steloffsetin            \stellayoutin
 
-              %def \randbreedte             {\rechterrandbreedte}
+              %def \edgewidth             {\rightedgewidth}
 
 %substitutecommand \steldoordefinitiein     \steldoordefinierenin
 %substitutecommand \steldoornummerin        \steldoornummerenin
 %substitutecommand \steldoorsprongin        \steldoorspringenin
 
-\substitutecommand \volgendehoofdstuk       {\stelkopnummerin[hoofdstuk][+1]}
-\substitutecommand \volgendeparagraaf       {\stelkopnummerin[paragraaf][+1]}
-\substitutecommand \volgendesubparagraaf    {\stelkopnummerin[subparagraaf][+1]}
-\substitutecommand \volgendesubsubparagraaf {\stelkopnummerin[subsubparagraaf][+1]}
+\substitutecommand \volgendehoofdstuk       {\setupheadnumber[hoofdstuk][+1]}
+\substitutecommand \volgendeparagraaf       {\setupheadnumber[paragraaf][+1]}
+\substitutecommand \volgendesubparagraaf    {\setupheadnumber[subparagraaf][+1]}
+\substitutecommand \volgendesubsubparagraaf {\setupheadnumber[subsubparagraaf][+1]}
 
 \substitutecommand \volledigeinhoudsopgave  \volledigeinhoud
 \substitutecommand \plaatsinhoudsopgave     \plaatsinhoud
@@ -52,9 +50,9 @@
 \substitutecommand \streep                  \onderstreep
 \substitutecommand \strepen                 \onderstrepen
 
-\substitutecommand \pragmakenmerk           \kenmerk
+\substitutecommand \pragmakenmerk           \referral
 
-\substitutecommand \definieersynoniem       \definieersynoniemen       
+\substitutecommand \definieersynoniem       \definesynonyms
 
 %substitutecommand \stelvoetnootin          \stelvoetnotenin
 
@@ -62,9 +60,9 @@
 
 %substitutecommand \diepevoetnoot           \voetnoot
 
-% english: 
+% english:
 
-%substitutecommand \setupformulas           \setupformulae 
+%substitutecommand \setupformulas           \setupformulae
 
 %substitutecommand \useexternalfigures      \setupexternalfigures
 
@@ -85,6 +83,4 @@
 
 \substitutecommand \showencoding            {\showaccents\showcharacters}
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/cont-ro.tex b/tex/context/base/cont-ro.tex
index 48f8c6164..e38b7b0a6 100644
--- a/tex/context/base/cont-ro.tex
+++ b/tex/context/base/cont-ro.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-ro,
+%D   [       filefile=cont-ro,
 %D        version=2000.01.09,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ Romanian Format Generation, 
@@ -21,9 +21,9 @@
 
 \loaduserspecifications 
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!ro] [\c!status=\v!start]
+\installlanguage [\s!en] [\c!state=\v!start] 
+\installlanguage [\s!de] [\c!state=\v!start] 
+\installlanguage [\s!ro] [\c!state=\v!start]
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-uk.tex b/tex/context/base/cont-uk.tex
index dbfb0263a..e361a5ce8 100644
--- a/tex/context/base/cont-uk.tex
+++ b/tex/context/base/cont-uk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-uk,
+%D   [       filefile=cont-uk,
 %D        version=1997.08.19,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ English Format Generation, 
@@ -21,13 +21,13 @@
 
 \loaduserspecifications
 
-\installlanguage [\s!en] [\c!status=\v!start] 
-\installlanguage [\s!uk] [\c!status=\v!start] 
-\installlanguage [\s!de] [\c!status=\v!start] 
-\installlanguage [\s!fr] [\c!status=\v!start] 
-\installlanguage [\s!es] [\c!status=\v!start] 
-\installlanguage [\s!nl] [\c!status=\v!start] 
-\installlanguage [\s!it] [\c!status=\v!start] 
+\installlanguage [\s!en] [\c!state=\v!start] 
+\installlanguage [\s!uk] [\c!state=\v!start] 
+\installlanguage [\s!de] [\c!state=\v!start] 
+\installlanguage [\s!fr] [\c!state=\v!start] 
+\installlanguage [\s!es] [\c!state=\v!start] 
+\installlanguage [\s!nl] [\c!state=\v!start] 
+\installlanguage [\s!it] [\c!state=\v!start] 
 
 \setupbodyfont [cmr,ams,rm,12pt]
 
diff --git a/tex/context/base/cont-usr.ori b/tex/context/base/cont-usr.ori
index 6c6c2f121..0e0f59881 100644
--- a/tex/context/base/cont-usr.ori
+++ b/tex/context/base/cont-usr.ori
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-usr,
+%D   [       filefile=cont-usr,
 %D        version=1997.10.05,
 %D          title=\CONTEXT\ User Format Specifications,
 %D       subtitle=System Specific Setups,
@@ -26,11 +26,8 @@
 %D Thomas Esser's \TETEX\ distribution.) This list will be
 %D adapted to the actual situation.
 
-%definefilesynonym [lang-cz.pat]  [czhyph.tex]   % is bound to latex (tl 8+)
-\definefilesynonym [lang-cz.pat]  [czhyphen.tex]
 \definefilesynonym [lang-da.pat]  [dkhyph.tex]
 \definefilesynonym [lang-de.pat]  [dehyphn.tex]
-\definefilesynonym [lang-en.pat]  [ushyph1.tex]
 \definefilesynonym [lang-es.pat]  [eshyph.tex]
 \definefilesynonym [lang-fi.pat]  [fihyph.tex]
 \definefilesynonym [lang-fr.pat]  [frhyph.tex]
@@ -38,29 +35,30 @@
 \definefilesynonym [lang-hu.pat]  [huhyph.tex]
 \definefilesynonym [lang-it.pat]  [ithyph.tex]
 \definefilesynonym [lang-la.pat]  [lahyph7.tex]
-\definefilesynonym [lang-nl.pat]  [nehyph.tex]
 \definefilesynonym [lang-no.pat]  [nohyph.tex]
 \definefilesynonym [lang-pl.pat]  [plhyph.tex]
 \definefilesynonym [lang-pt.pat]  [pthyph.tex]
 \definefilesynonym [lang-ro.pat]  [rohyph.tex]
-\definefilesynonym [lang-ru.pat]  [ruenhyph.tex]
-%definefilesynonym [lang-sk.pat]  [skhyph.tex] % is bound to latex (tl 8+)
-\definefilesynonym [lang-sk.pat]  [skhyphen.tex]
-\definefilesynonym [lang-sv.pat]  [sehyph.tex]
-\definefilesynonym [lang-tr.pat]  [trhyph.tex]
-\definefilesynonym [lang-ua.pat]  [ukrenhyp.tex]
-\definefilesynonym [lang-uk.pat]  [ukhyphen.tex]
-\definefilesynonym [lang-us.pat]  [ushyph.tex]
+\definefilesynonym [lang-ru.pat]  [ruenhyph.tex] % sic: ruen
+\definefilesynonym [lang-sl.pat]  [sihyph.tex]   % sic: sl/si
+\definefilesynonym [lang-sv.pat]  [svhyph.tex]   % was [sehyph.tex]
+\definefilesynonym [lang-tr.pat]  [tkhyph.tex]   % was [trhyph.tex]
+\definefilesynonym [lang-ua.pat]  [ukrenhyp.tex] % sic ukren
+\definefilesynonym [lang-uk.pat]  [ukhyph.tex]
 
-%D Ah, something changed in 2003 with respect to ushyph.tex, so let's
-%D fall back when needed. I first noticed this during a workshop at  the
-%D practical tex conference 2004 in sf. Yet another proof of a mess in
-%D filenames.
+\definefilesynonym [lang-nl.pat]  [nlhyphen.tex] % symbolic name, see below
+\definefilesynonym [lang-af.pat]  [nlhyphen.tex] % symbolic name, see below
+
+\definefilesynonym [lang-en.pat]  [ushyphen.tex] % symbolic name, see below
+\definefilesynonym [lang-us.pat]  [ushyphen.tex] % symbolic name, see below
 
- \doiffileelse{ushyph.tex}  {\definefilesynonym[lang-us.pat][ushyph.tex]}
-{\doiffileelse{ushyph1.tex} {\definefilesynonym[lang-us.pat][ushyph1.tex]}
-{\doiffileelse{ushyph2.tex} {\definefilesynonym[lang-us.pat][ushyph2.tex]}
-                            {\definefilesynonym[lang-us.pat][ukhyph.tex]}}}
+\definefilesynonym [lang-cz.pat]  [czhyphen.tex] % in a different part of the tree, sigh
+\definefilesynonym [lang-sk.pat]  [skhyphen.tex] % in a different part of the tree, sigh
+
+%definefilesynonym [lang-cz.hyp]  [czhyphen.ex]  % in a different part of the tree, sigh
+%definefilesynonym [lang-sk.hyp]  [skhyphen.ex]  % in a different part of the tree, sigh
+
+\definefilesynonym [lang-deo.pat] [dehypht.tex]  % old german patterns
 
 %D When the dutch spelling changed, new patterns were
 %D constructed. For long these were named \type {dutch96.pat}.
@@ -70,56 +68,71 @@
 %D files as well as their coding is one of the dark areas of
 %D \TEX\ distributions.
 
- \doiffileelse{nehyph96.tex}   {\definefilesynonym[lang-nl.pat][nehyph96.tex]}
-{\doiffileelse{dutch96.pat}    {\definefilesynonym[lang-nl.pat][dutch96.pat]}
-                               {\definefilesynonym[lang-nl.pat][nehyph.tex]}}
+ \doiffileelse{nehyph96.tex} {\definefilesynonym[nlhyphen.tex][nehyph96.tex]}
+{\doiffileelse{dutch96.pat}  {\definefilesynonym[nlhyphen.tex][dutch96.pat]}
+                             {\definefilesynonym[nlhyphen.tex][nehyph.tex]}}
+
+%D Ah, something changed in 2003 with respect to ushyph.tex, so let's
+%D fall back when needed. I first noticed this during a workshop at  the
+%D practical tex conference 2004 in sf. Yet another proof of a mess in
+%D filenames. So, we now use \type {ushyphen} as name and do some
+%D searching.
+
+ \doiffileelse{ushyph.tex}  {\definefilesynonym[ushyphen.tex][ushyph.tex]}
+{\doiffileelse{ushyph1.tex} {\definefilesynonym[ushyphen.tex][ushyph1.tex]}
+{\doiffileelse{ushyph2.tex} {\definefilesynonym[ushyphen.tex][ushyph2.tex]}
+                            {\definefilesynonym[ushyphen.tex][ukhyph.tex]}}}
 
-%D Pattern files are (can be) encoded! And, alas, not all
-%D pattern files are self contained, which is why (for the
-%D moment) we specify encodings here.
+%D In order to get 8 bit characters hyphenated, we need to load
+%D patterns under the right circumstances. In some countries, more
+%D than one font encoding is in use. I can add more defaults here
+%D if users let me know what encoding they use.
+
+\installlanguage [\s!nl] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!fr] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!de] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!it] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
 
-\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 \installlanguage [\s!hr] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-%installlanguage [\s!pl] [\s!mapping=pl0,\s!encoding=pl0]
 \installlanguage [\s!pl] [\s!mapping={pl0,ec},\s!encoding={pl0,ec}]
+\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 \installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-
-%D Sometimes these are not wanted:
-
-%\definefilesynonym [lang-deo.pat] [dehypht.tex]  % old patterns
-%\definefilesynonym [lang-nlx.pat] [dutch96.pat]  % new patterns
+\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 
 %D Additional languages can be defined here. Beware of
 %D encoding incompatibilities. Please take a look at the
 %D \type {cont-en.tex}, \type {cont-nl.tex}, enz.\ files
-%D first. Normally you don't have to change a byte.
-
-% \installlanguage [\s!af] [\c!status=\v!start] % afrikaans
-% \installlanguage [\s!cz] [\c!status=\v!start] % czech
-% \installlanguage [\s!da] [\c!status=\v!start] % danish
-% \installlanguage [\s!de] [\c!status=\v!start] % german
-% \installlanguage [\s!en] [\c!status=\v!start] % english us
-% \installlanguage [\s!es] [\c!status=\v!start] % spanish
-% \installlanguage [\s!fi] [\c!status=\v!start] % finnish
-% \installlanguage [\s!fr] [\c!status=\v!start] % french
-% \installlanguage [\s!hr] [\c!status=\v!start] % croatian
-% \installlanguage [\s!hu] [\c!status=\v!start] % hungarian
-% \installlanguage [\s!it] [\c!status=\v!start] % italian
-% \installlanguage [\s!la] [\c!status=\v!start] % latin
-% \installlanguage [\s!nl] [\c!status=\v!start] % dutch
-% \installlanguage [\s!no] [\c!status=\v!start] % norwegian
-% \installlanguage [\s!pl] [\c!status=\v!start] % polish
-% \installlanguage [\s!pt] [\c!status=\v!start] % portuguese
-% \installlanguage [\s!ro] [\c!status=\v!start] % romanian
-% \installlanguage [\s!ru] [\c!status=\v!start] % russian
-% \installlanguage [\s!sk] [\c!status=\v!start] % slovak
-% \installlanguage [\s!sv] [\c!status=\v!start] % swedish
-% \installlanguage [\s!tr] [\c!status=\v!start] % turkish
-% \installlanguage [\s!ua] [\c!status=\v!start] % ukrainian
-% \installlanguage [\s!uk] [\c!status=\v!start] % english uk
-
-% \installlanguage [deo]   [\c!status=\v!start] % old german
-% \installlanguage [nlx]   [\c!status=\v!start] % dutch 8 bit
+%D first. Normally you don't have to change a byte. If you
+%D want to play safe, use \typ {texexec --make --alone
+%D --all}.
+
+% \installlanguage [\s!af] [\c!state=\v!start] % afrikaans
+% \installlanguage [\s!cz] [\c!state=\v!start] % czech
+% \installlanguage [\s!da] [\c!state=\v!start] % danish
+% \installlanguage [\s!de] [\c!state=\v!start] % german
+% \installlanguage [\s!en] [\c!state=\v!start] % english us
+% \installlanguage [\s!es] [\c!state=\v!start] % spanish
+% \installlanguage [\s!fi] [\c!state=\v!start] % finnish
+% \installlanguage [\s!fr] [\c!state=\v!start] % french
+% \installlanguage [\s!hr] [\c!state=\v!start] % croatian
+% \installlanguage [\s!hu] [\c!state=\v!start] % hungarian
+% \installlanguage [\s!it] [\c!state=\v!start] % italian
+% \installlanguage [\s!la] [\c!state=\v!start] % latin
+% \installlanguage [\s!nl] [\c!state=\v!start] % dutch
+% \installlanguage [\s!no] [\c!state=\v!start] % norwegian
+% \installlanguage [\s!pl] [\c!state=\v!start] % polish
+% \installlanguage [\s!pt] [\c!state=\v!start] % portuguese
+% \installlanguage [\s!ro] [\c!state=\v!start] % romanian
+% \installlanguage [\s!ru] [\c!state=\v!start] % russian
+% \installlanguage [\s!sk] [\c!state=\v!start] % slovak
+% \installlanguage [\s!sl] [\c!state=\v!start] % slovenian
+% \installlanguage [\s!sv] [\c!state=\v!start] % swedish
+% \installlanguage [\s!tr] [\c!state=\v!start] % turkish
+% \installlanguage [\s!ua] [\c!state=\v!start] % ukrainian
+% \installlanguage [\s!uk] [\c!state=\v!start] % english uk
+% \installlanguage [\s!vn] [\c!state=\v!start] % vietnamese
+
+% \installlanguage [deo]   [\c!state=\v!start] % old german
 
 %D The next lines can be used for setting the language to be
 %D used at startup time.
@@ -143,6 +156,7 @@
 % \setupcurrentlanguage[\s!ro]
 % \setupcurrentlanguage[\s!ru]
 % \setupcurrentlanguage[\s!sk]
+% \setupcurrentlanguage[\s!sl]
 % \setupcurrentlanguage[\s!sv]
 % \setupcurrentlanguage[\s!tr]
 % \setupcurrentlanguage[\s!ua]
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index ee9d715c4..5a1b62b81 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=context,
+%D   [       filefile=context,
 %D        version=1995.10.10,
 %D          title=\CONTEXT,
 %D       subtitle=\CONTEXT\ Format Generation,
@@ -12,36 +12,81 @@
 %C details.
 
 % dec 07 2001 : cont-en.efmt : 4,035,912
+% aug 07 2004 : cont-en.efmt : 4,928,967 (5 more patterns)
+
+% todo 1: each module english commands
+% todo 2: replace lowlevel *!* by english variants
+% todo 3: make files more independent
+% todo 4: cleanup specials + adapt interface
+% todo 5: remove/replace old stuff (by new stuff, like couplepaper)
+% todo 6: create even more hooks (so that users can overload)
+% todo 7: conditionals
+% todo 8: redesign tui/tuo
 
 \catcode`\{=1 \catcode`\}=2
 
-\def\contextversion{2004.8.18}
+%D From the next string (which is set by the script that assembles the
+%D distribution) later on we will calculate a number that can be used
+%D by use modules to identify the feature level. Starting with version
+%D 2004.8.30 the low level interface is english. Watch out and adapt
+%D your styles an modules.
+
+\def\contextversion{2004.8.30}
 
 %D Welcome to the main module. When this module is ran through
-%D \type{initex} or \type{tex -i} or \type{whatevertex} using
+%D \type{initex} or \type {tex -i} or \type {whatevertex} using
 %D \type{whatever switch}, the \CONTEXT\ format file is
 %D generated. During this process the user is asked for an
 %D interface language. Supplying \type{dutch} will generate a
-%D dutch version of \CONTEXT, supplying \type{english} will of
+%D dutch version of \CONTEXT, supplying \type {english} will of
 %D course end op in a english version.
 %D
+%D Another option is to use \TEXEXEC:
+%D
+%D \starttyping
+%D texexec --make [--alone] [--engine] [--all]
+%D texexec --make [--alone] [--engine] en nl ... metafun mptopdf
+%D \stoptyping
+%D
+%D More information can be found in the \TEXEXEC\ manual.
+
+%D When you write modules (or extensions) you should avoid
+%D conflicts with existing macro names and mechanisms. If you are
+%D coming from another macro package, don't assume that macros
+%D with the same name are doing the same! \CONTEXT\ was written
+%D from scratch and therefore similarities are often a coincidence
+%D (to some extent one always ends up with the same names for
+%D similar concepts). The underlying models for elementary subsystems
+%D that deal with encodings, languages and fonts probably differ.
+%D
+%D Time has learned that users coming from \LATEX\ should not fall
+%D into thinking that macros like \type {\protect} represent the
+%D same functionality in both systems; actually, due to the way
+%D \CONTEXT\ is set up, some of those macros do complete different
+%D things. Macro packages evolve independent of each other, which
+%D means that code written for one system will not work in another
+%D system, unless it's real generic code.
+%D
+%D An API will become available soon (keep an eye on the ConTeXt
+%D Wiki www.contextgarden.org) and or listen in to the context
+%D mailing list (ntg-context@ntg.nl). Much additional information
+%D can be found at the PRAGMA website (www.pragma-ade.com).
+
 %D First we load the system modules. These implement a lot of
 %D manipulation macros. The first one loads \PLAIN\ \TEX, as
 %D minimal as possible.
 
-%input syst-tex.tex
-
-\input syst-pln.tex % stripped plain
-\input syst-prm.tex % saved primitives (will be extended)
+\input syst-pln.tex % english / stripped plain
+\input syst-prm.tex % english / saved primitives (will be extended)
 
-\input syst-etx.tex % etex
-\input syst-omg.tex % omega
-\input syst-gen.tex
-\input syst-ext.tex
-\input syst-new.tex
-\input syst-con.tex
+\input syst-etx.tex % english / etex
+\input syst-omg.tex % english / omega-aleph
+\input syst-gen.tex % english
+\input syst-ext.tex % english
+\input syst-new.tex % english
+\input syst-con.tex % english
 
-\input math-pln.tex % basic plain math
+\input math-pln.tex % english / basic plain math
 
 %D To enable selective loading, we say:
 
@@ -50,50 +95,50 @@
 %D In order to conveniently load files, we need a few
 %D support modules.
 
-\input supp-ini.tex
-\input supp-fil.tex
+\input supp-ini.tex % english
+\input supp-fil.tex % english
 
 %D After this we're ready for the multi||lingual interface
 %D modules.
 
-\input mult-ini.tex
-\input mult-sys.tex
-\input mult-con.tex
-\input mult-com.tex
+\input mult-ini.tex % english
+\input mult-sys.tex % english
+\input mult-con.tex % english
+\input mult-com.tex % english
 
 %D We also use some third party macros. These are loaded by
 %D saying:
 
-\input thrd-ran.tex % based on: David Carlisle
-\input thrd-trg.tex % based on: Donald Arseneau
+\input thrd-ran.tex % english / based on: Donald Arseneau
+\input thrd-trg.tex % english / based on: David Carlisle
 
 %D Now we're ready for some general support modules. These
 %D modules implement some basic typesetting functionality.
 
-\input supp-box.tex
-\input supp-mrk.tex
-\input supp-vis.tex
-\input supp-fun.tex
-\input supp-eps.tex
-\input supp-pdf.tex
-\input supp-spe.tex
-\input supp-mps.tex
-\input supp-mpe.tex
-\input supp-tpi.tex
-\input supp-mat.tex
-\input supp-ran.tex
-\input supp-ali.tex
+\input supp-box.tex % english
+\input supp-mrk.tex % english
+\input supp-vis.tex % english
+\input supp-fun.tex % english
+\input supp-eps.tex % english
+\input supp-pdf.tex % english
+\input supp-spe.tex % english
+\input supp-mps.tex % english
+\input supp-mpe.tex % english
+\input supp-tpi.tex % english
+\input supp-mat.tex % english
+\input supp-ran.tex % english
+\input supp-ali.tex % english
 
 %D The next module deals with language specific typographic
 %D extensions.
 
-\input typo-ini.tex
+\input typo-ini.tex % english / I must not forget about this module
 
 %D Verbatim typesetting is implemented in a separate class of
 %D modules. The pretty typesetting modules are loaded at run
 %D time.
 
-\input verb-ini.tex  % replaces supp-ver
+\input verb-ini.tex % english / replaces supp-ver
 
 %D The following modules are not sequentially dependent,
 %D i.e. they have ugly dependencies, which will be cleaned
@@ -103,69 +148,70 @@
 %D bit more advanced file handling as well as some general
 %D variables, and features, so next we load:
 
-\input core-var.tex
-\input core-ins.tex
-\input core-fil.tex
-\input core-con.tex
+\input core-var.tex % english
+\input core-ins.tex % english
+\input core-fil.tex % english
+\input core-con.tex % english
 
 %D We already need some synonyms (patterns). At runtime this
 %D file will be reloaded.
 
-\input cont-fil.tex
+\input cont-fil.tex % english
 
 %D \CONTEXT\ does not implement its own table handling. We
 %D just go for the best there is and load \TABLE. Just to be
 %D sure we do it here, before we redefine \type{|}.
 
-\input thrd-tab.tex % based on: Michael Wichura
+\input thrd-tab.tex % english / based on: Michael Wichura / will be reimplemented
 
 %D Here comes the last support modules. They take care of
 %D some language specific things.
 
-\input supp-lan.tex
-\input supp-num.tex
+\input supp-lan.tex % english
+\input supp-num.tex % english
 
 %D The next few modules do what their names state. They
 %D load additional definition modules when needed.
 
-\input enco-ini.tex
-\input filt-ini.tex
-\input hand-ini.tex
-\input regi-ini.tex
-\input lang-ini.tex
-\input unic-ini.tex
+\input enco-ini.tex % english
+\input filt-ini.tex % english
+\input hand-ini.tex % english
+\input regi-ini.tex % english
+\input lang-ini.tex % english
+\input unic-ini.tex % english
 
-\input colo-ini.tex
-\input colo-ext.tex
+\input colo-ini.tex % english
+\input colo-ext.tex % english
 
-\input spec-mis.tex
-\input spec-ini.tex
-\input spec-def.tex
-\input spec-var.tex
+\input spec-mis.tex % english
+\input spec-ini.tex % english
+\input spec-def.tex % english
+\input spec-var.tex % english
 
 %D For the moment we load a lot of languages. In the future
 %D we'll have to be more space conservative.
 
-\input lang-spe.tex
-\input lang-lab.tex
+\input lang-spe.tex % english
+\input lang-lab.tex % english
 
-\input lang-alt.tex
-\input lang-ana.tex
-\input lang-art.tex
-\input lang-bal.tex
-\input lang-cel.tex
-\input lang-ger.tex
-\input lang-grk.tex
-\input lang-ind.tex
-\input lang-ita.tex
-\input lang-sla.tex
-\input lang-ura.tex
+\input lang-ger.tex % english
+\input lang-ita.tex % english
+\input lang-sla.tex % english
 
-\input lang-vn.tex    % vietnamese, will be grouped
+\input lang-alt.tex % english
+\input lang-ana.tex % english
+\input lang-art.tex % english
+\input lang-bal.tex % english
+\input lang-cel.tex % english
+\input lang-grk.tex % english
+\input lang-ind.tex % english
+\input lang-ura.tex % english
+
+\input lang-vn.tex  % english / vietnamese, maybe this belongs in lang-ita
 
 %D All kind of symbols are handled in:
 
-\input symb-ini.tex
+\input symb-ini.tex % english
 
 %D Next we load some core macro's. These implement the
 %D macros' that are seen by the users. The order of loading
@@ -181,26 +227,23 @@
 \input core-ver.tex
 \input core-vis.tex
 %input core-con.tex
-\input core-rul.tex
+\input core-rul.tex % english
 \input core-tab.tex
 \input core-nav.tex
 \input core-ref.tex
-\input core-obj.tex
+\input core-obj.tex % english
 \input core-buf.tex
 \input core-lst.tex
-\input core-num.tex
+\input core-num.tex % english
 \input core-itm.tex
 \input core-des.tex
-\input core-mat.tex
+\input core-mat.tex % english
 \input core-syn.tex
-%input core-mul.tex % moved
 \input core-spa.tex
 \input core-sys.tex
 
-% experimental otr
-
 \input page-ini.tex
-\input page-not.tex
+\input page-not.tex % english
 \input page-one.tex
 \input page-lay.tex
 \input page-log.tex
@@ -209,15 +252,15 @@
 \input page-flt.tex
 \input page-mul.tex
 \input page-set.tex
-\input page-lyr.tex
+\input page-lyr.tex % english
 \input page-mak.tex
-\input page-num.tex
+\input page-num.tex % english
 \input page-lin.tex
-\input page-mar.tex
-\input page-bck.tex
-\input page-app.tex
-\input page-flw.tex % flows - experimental
-\input page-spr.tex % spreads - experimental
+\input page-mar.tex % english
+\input page-bck.tex % english
+\input page-app.tex % english / unfinished
+\input page-flw.tex % english / experimental: flows
+\input page-spr.tex % english / experimental: spreads
 
 \input core-job.tex
 
@@ -233,25 +276,25 @@
 %D Like languages, fonts, encodings and symbols, \METAPOST\
 %D support is also organized in its own class of modules.
 
-\input meta-ini.tex
-\input meta-pag.tex
-\input meta-fig.tex
+\input meta-ini.tex % english
+\input meta-pag.tex % english
+\input meta-fig.tex % english
 
 %D On which the next one depends:
 
-\input core-pos.tex
-\input core-snc.tex
+\input core-pos.tex % english
+\input core-snc.tex % english
 
 %D A few more languages, that have specifics using core
 %D functionality:
 
-\input lang-chi.tex
+\input lang-chi.tex % english
 
 %D How about fill||in fields and related stuff?
 
-\input java-ini.tex
-\input core-fld.tex
-\input core-hlp.tex
+\input java-ini.tex % english / needs a cleanup
+\input core-fld.tex % english / needs a cleanup
+\input core-hlp.tex % english / will become a m-module
 
 %D Registers can depend on fields, so we load that now.
 
@@ -262,63 +305,64 @@
 %D content. Here we also redefine \type{\it} as {\it italic}
 %D instead of italian.
 
-\input font-ini.tex
-\input font-uni.tex
-\input font-bfm.tex
+\input font-ini.tex % english
+\input font-uni.tex % english
+\input font-bfm.tex % english
 
-\input type-ini.tex
+\input type-ini.tex % english
 
-\input prop-ini.tex
-\input prop-lay.tex % needs core-ref.tex
-\input prop-mis.tex
+\input prop-ini.tex % english
+\input prop-lay.tex % english / needs core-ref.tex
+\input prop-mis.tex % english
 
-\input math-ini.tex % after enco-ini.tex
+\input math-ini.tex % english / needs enco-ini.tex
 
 %D Now we're ready for more core modules.
 
-\input core-fnt.tex
-\input core-not.tex
-\input core-lnt.tex
+\input core-fnt.tex % english / todo: document setupinitial !
+\input core-not.tex % english
+\input core-lnt.tex % english / to be documented (with idris)
 
 \input core-mis.tex
 
-\input core-fig.tex % after page body
-\input core-par.tex
+\input core-fig.tex % english / after page body
+\input core-par.tex % english / maybe this should become a m-module
 
-\input core-box.tex
+\input core-box.tex % english
 
 %D Language specific spacing.
 
-\input lang-spa.tex
+\input lang-spa.tex % english
 
 %D Only the basic XML parser and remapper are part of the core.
 %D These macrosa re loaded last since they overload and|/|or
 %D extend previously defined ones.
 
-\input xtag-ini.tex
-\input xtag-ext.tex
-\input xtag-map.tex
-\input xtag-exp.tex
-\input xtag-pre.tex
-\input xtag-xsd.tex
-\input xtag-rng.tex
-%input xtag-ent.tex
+\input xtag-ini.tex % english
+\input xtag-ext.tex % english
+\input xtag-prs.tex % english
+\input xtag-map.tex % english
+\input xtag-exp.tex % english
+\input xtag-pre.tex % english
+\input xtag-xsd.tex % english
+\input xtag-rng.tex % english
+%input xtag-ent.tex % english
 
 %D How about this:
 
-\input meta-xml.tex
+\input meta-xml.tex % english / to be documented
 
 % %D The next two modules implement some additional
 % %D functionality concerning classes of documents and output.
 % %D These modules probably will be replaced some day.
 %
-% \input docs-ini.tex
-% \input list-ini.tex
+% \input docs-ini.tex % obsolete
+% \input list-ini.tex % obsolete
 
 %D \TEX\ related logo's are always typeset in a special way.
 %D Here they come:
 
-\input cont-log.tex
+\input cont-log.tex % english
 
 %D Defaults go here (more will be moved to this module
 %D later):
@@ -328,12 +372,12 @@
 
 %D At run time, a few more files are loaded, like:
 %D
-%D \startopsomming[opelkaar]
-%D \som \type{cont-sys}: local (system dependant) defaults
-%D \som \type{cont-old}: substitutes for old (obsolete) macros
-%D \som \type{cont-new}: new macro implementations (for testing)
-%D \som \type{cont-fil}: filename and module synonyms
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item \type{cont-sys}: local (system dependant) defaults
+%D \item \type{cont-old}: substitutes for old (obsolete) macros
+%D \item \type{cont-new}: new macro implementations (for testing)
+%D \item \type{cont-fil}: filename and module synonyms
+%D \stopitemize
 
 %D Just to keep the user busy for a while, we say:
 
@@ -445,11 +489,11 @@
 
 \unprotect
 
-\installlanguage [\s!en] [\c!status=\v!start]
+\installlanguage [\s!en] [\c!state=\v!start]
 
 \startinterface english
 
-  \installlanguage [\s!uk] [\c!status=\v!start]
+  \installlanguage [\s!uk] [\c!state=\v!start]
 
 \stopinterface
 
@@ -458,7 +502,7 @@
 
 \startinterface german
 
-  \installlanguage [\s!de] [\c!status=\v!start]
+  \installlanguage [\s!de] [\c!state=\v!start]
 
   \appendtoks \language     [\s!de] \to \everyjob
   \appendtoks \mainlanguage [\s!de] \to \everyjob
@@ -467,7 +511,7 @@
 
 \startinterface dutch
 
-  \installlanguage [\s!nl] [\c!status=\v!start]
+  \installlanguage [\s!nl] [\c!state=\v!start]
 
   \appendtoks \language     [\s!nl] \to \everyjob
   \appendtoks \mainlanguage [\s!nl] \to \everyjob
@@ -476,7 +520,7 @@
 
 \startinterface czech
 
-  \installlanguage [\s!cz] [\c!status=\v!start]
+  \installlanguage [\s!cz] [\c!state=\v!start]
 
   \appendtoks \language     [\s!cz] \to \everyjob
   \appendtoks \mainlanguage [\s!cz] \to \everyjob
@@ -485,7 +529,7 @@
 
 \startinterface italian
 
-  \installlanguage [\s!it] [\c!status=\v!start]
+  \installlanguage [\s!it] [\c!state=\v!start]
 
   \appendtoks \language     [\s!it] \to \everyjob
   \appendtoks \mainlanguage [\s!it] \to \everyjob
@@ -494,7 +538,7 @@
 
 \startinterface romanian
 
-  \installlanguage [\s!ro] [\c!status=\v!start]
+  \installlanguage [\s!ro] [\c!state=\v!start]
 
   \appendtoks \language     [\s!ro] \to \everyjob
   \appendtoks \mainlanguage [\s!ro] \to \everyjob
@@ -519,4 +563,4 @@
 
 \errorstopmode \dump
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/core-box.tex b/tex/context/base/core-box.tex
index f9d30c43e..2c09424a0 100644
--- a/tex/context/base/core-box.tex
+++ b/tex/context/base/core-box.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-box,
+%D   [       filefile=core-box,
 %D        version=2002.04.12,
 %D          title=\CONTEXT\ Box Macros,
 %D       subtitle=New Macros,
@@ -28,15 +28,15 @@
 % on the content, which in itsel fis ok, but can lead to loops
 % due to rounding errors (happened in demo-obv)
 
-\definelayer[\v!tekst-2][\c!positie=\v!ja,\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]
-\definelayer[\v!tekst-1][\c!positie=\v!ja,\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]
-\definelayer[\v!tekst+1][\c!positie=\v!ja,\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]
-\definelayer[\v!tekst+2][\c!positie=\v!ja,\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]
+\definelayer[\v!text-2][\c!position=\v!yes,\c!width=\overlaywidth,\c!height=\overlayheight]
+\definelayer[\v!text-1][\c!position=\v!yes,\c!width=\overlaywidth,\c!height=\overlayheight]
+\definelayer[\v!text+1][\c!position=\v!yes,\c!width=\overlaywidth,\c!height=\overlayheight]
+\definelayer[\v!text+2][\c!position=\v!yes,\c!width=\overlaywidth,\c!height=\overlayheight]
 
 \def\internaltextoverlay#1% will become more generic and installable
   {\startoverlay          % i.e. probably an overlay by itself
-     {\positionoverlay{\v!tekst#1}} % see later
-     {\composedlayer  {\v!tekst#1}}
+     {\positionoverlay{\v!text#1}} % see later
+     {\composedlayer  {\v!text#1}}
    \stopoverlay}
 
 %\def\internaltextoverlay#1%
@@ -45,10 +45,10 @@
 
 % todo: share info, so that tuo will be smaller
 
-\defineoverlay[\v!tekst-2][\internaltextoverlay{-2}]
-\defineoverlay[\v!tekst-1][\internaltextoverlay{-1}]
-\defineoverlay[\v!tekst+1][\internaltextoverlay{+1}]
-\defineoverlay[\v!tekst+2][\internaltextoverlay{+2}]
+\defineoverlay[\v!text-2][\internaltextoverlay{-2}]
+\defineoverlay[\v!text-1][\internaltextoverlay{-1}]
+\defineoverlay[\v!text+1][\internaltextoverlay{+1}]
+\defineoverlay[\v!text+2][\internaltextoverlay{+2}]
 
 % to be documented
 
@@ -86,16 +86,16 @@
       \dp\scratchbox\nextboxdp
       \setlayer
         [anchor]
-        [\c!breedte=\wd\scratchbox,
-         \c!hoogte=\ht\scratchbox,
+        [\c!width=\wd\scratchbox,
+         \c!height=\ht\scratchbox,
          \c!offset=\!!zeropoint,
          #2,#3]
         {\setlayer[#1]{\flushnextbox}}%
       \framed
         [#2,
-         \c!achtergrond=anchor,
+         \c!background=anchor,
          \c!offset=\v!overlay,
-         \c!kader=\v!uit,
+         \c!frame=\v!off,
          #3]
         {\box\scratchbox}%
      \egroup}%
@@ -131,11 +131,11 @@
    \resetcollector[#1]%
    \setupcollector
      [#1]
-     [\c!status=\v!start,
+     [\c!state=\v!start,
       \c!x=\!!zeropoint,\c!y=\!!zeropoint,
-      \c!offset=\!!zeropoint,\c!rotatie=, % geen 0 !
+      \c!offset=\!!zeropoint,\c!rotation=, % geen 0 !
       \c!hoffset=\!!zeropoint,\c!voffset=\!!zeropoint,
-      \c!plaats=rb,\c!hoek=,#2]}
+      \c!location=rb,\c!corner=,#2]}
 
 \def\setupcollector
   {\dodoubleargument\dosetupcollector}
@@ -168,36 +168,36 @@
    \getparameters[\??cb#1][#2]%
    \@@layerxsiz\wd\collectorbox
    \@@layerysiz\ht\collectorbox
-   \doifvaluesomething{\??cb#1\c!rotatie}
+   \doifvaluesomething{\??cb#1\c!rotation}
      {\setbox\nextbox\hbox
         {\rotate
-           [\c!plaats=\v!hoog,
-            \c!rotatie=\collectorparameter\c!rotatie]
+           [\c!location=\v!high,
+            \c!rotation=\collectorparameter\c!rotation]
            {\flushnextbox}}}%
    \advance\@@layerysiz\dp\collectorbox
    \@@layerxpos\collectorparameter\c!x
    \advance\@@layerxpos\collectorparameter\c!hoffset
    \@@layerypos\collectorparameter\c!y
    \advance\@@layerypos\collectorparameter\c!voffset
-   \doifelse\v!midden{\collectorparameter\c!hoek}
+   \doifelse\v!middle{\collectorparameter\c!corner}
      {\ifdim\@@layerxsiz>\zeropoint
         \advance\@@layerxpos.5\@@layerxsiz
       \fi
       \ifdim\@@layerysiz>\zeropoint
         \advance\@@layerypos.5\@@layerysiz
       \fi}%
-     {\ExpandBothAfter\doifinset\v!onder{\collectorparameter\c!hoek}
+     {\ExpandBothAfter\doifinset\v!bottom{\collectorparameter\c!corner}
         {\ifdim\@@layerysiz>\zeropoint
            \advance\@@layerypos-\@@layerysiz
            \@@layerypos-\@@layerypos
          \fi}%
-      \ExpandBothAfter\doifinset\v!rechts{\collectorparameter\c!hoek}
+      \ExpandBothAfter\doifinset\v!right{\collectorparameter\c!corner}
         {\ifdim\@@layerxsiz>\zeropoint
            \advance\@@layerxpos-\@@layerxsiz
            \@@layerxpos-\@@layerxpos
          \fi}}%
    \setbox\nextbox\hbox
-     {\alignedbox[\collectorparameter\c!plaats]\vbox{\flushnextbox}}%
+     {\alignedbox[\collectorparameter\c!location]\vbox{\flushnextbox}}%
    \boxmaxdepth\zeropoint % really needed, nice example
    \global\advance\boxhdisplacement\@@layerxpos
    \ifdim\boxhdisplacement<\zeropoint
@@ -239,10 +239,10 @@
   {\ifundefined{\@@collectorbox#1}%
      \writestatus{collector}{unknown collector #1}%
    \else
-     \doifnotvalue{\??cb#1\c!status}\v!stop
+     \doifnotvalue{\??cb#1\c!state}\v!stop
        {\vbox
           {\hbox
-             {\doifelsevalue{\??cb#1\c!status}\v!herhaal
+             {\doifelsevalue{\??cb#1\c!state}\v!repeat
                 {\let\next\copy}{\let\next\box}%
               \raise\dp\csname\@@collectorbox#1\endcsname
               \next\csname\@@collectorbox#1\endcsname}}}%
@@ -297,10 +297,10 @@
       \setcollector
         [caption][#1]
         {\getparameters[\??du][#2]%
-         \dosetfontattribute\??du\c!letter\setupinterlinespace
+         \dosetfontattribute\??du\c!style\setupinterlinespace
          \framed % watch the special setting of kader/overlay
-           [\c!kader=\v!overlay,#2]
-           {\doattributes\??du\c!letter\c!kleur{#3}}}%
+           [\c!frame=\v!overlay,#2]
+           {\doattributes\??du\c!style\c!color{#3}}}%
       \composedcollector{caption}%
       \egroup}%
      \hbox}
@@ -337,22 +337,22 @@
       \bgroup % preserve \nextbox
       \setuplayer
         [caption]
-        [\c!breedte=\!!widtha,\c!hoogte=\!!heighta]%
+        [\c!width=\!!widtha,\c!height=\!!heighta]%
       \setlayer
         [caption]
         [#1]
         {\getparameters[\??du][#2]%
-         \dosetfontattribute\??du\c!letter\setupinterlinespace
+         \dosetfontattribute\??du\c!style\setupinterlinespace
          \framed
-           [\c!kader=\v!overlay,,#2]
-           {\doattributes\??du\c!letter\c!kleur{#3}}}%
+           [\c!frame=\v!overlay,,#2]
+           {\doattributes\??du\c!style\c!color{#3}}}%
       \egroup
       \framed
         [\c!offset=\v!overlay,
-         \c!kader=\v!uit,
-         \c!achtergrond={\v!voorgrond,caption},
-         \c!breedte=\!!widtha,
-         \c!hoogte=\!!heighta]
+         \c!frame=\v!off,
+         \c!background={\v!foreground,caption},
+         \c!width=\!!widtha,
+         \c!height=\!!heighta]
         {\flushnextbox}%
       \egroup}%
      \hbox}
@@ -381,7 +381,7 @@
 \def\doornamenttext[#1][#2]%
   {\bgroup
    \doifassignmentelse{#1}
-     {\getparameters[\s!dummy][\c!variant=\v!a,#1]%
+     {\getparameters[\s!dummy][\c!alternative=\v!a,#1]%
       \doifelse\dummyvariant\v!a
         {\egroup\collectedtext}%
         {\egroup\layeredtext  }%
@@ -434,12 +434,12 @@
   {\dodoubleempty\getparameters[\??bg]}
 
 \setupbleeding
-  [\c!plaats=l,
-   \c!rek=\v!ja,
-   \c!breedte=3cm,
-   \c!hoogte=3cm,
+  [\c!location=l,
+   \c!stretch=\v!yes,
+   \c!width=3cm,
+   \c!height=3cm,
    \c!offset=2mm,
-   \c!pagina=\v!nee,
+   \c!page=\v!no,
    \c!voffset=\@@bgoffset,
    \c!hoffset=\@@bgoffset]
 
@@ -462,7 +462,7 @@
    \!!donedfalse % bottom
    % replace this part ! todo: default location
    \processaction
-     [\@@bgplaats]
+     [\@@bglocation]
      [ t=>\!!donectrue\let\@@bghoffset\!!zeropoint,
        b=>\!!donedtrue\let\@@bghoffset\!!zeropoint,
        l=>\!!doneatrue\let\@@bgvoffset\!!zeropoint,
@@ -475,22 +475,22 @@
       lt=>\!!doneatrue\!!donectrue,
       tr=>\!!donebtrue\!!donectrue,
       rt=>\!!donebtrue\!!donectrue]%
-   \doifelse\@@bgrek\v!ja\donetrue\donefalse
-   \scratchdimen\@@bgbreedte
+   \doifelse\@@bgstretch\v!yes\donetrue\donefalse
+   \scratchdimen\@@bgwidth
    \ifdone
      \if!!donea
        \advance\scratchdimen\MPx{\??bg:\nofbleeds}%
      \else\if!!doneb
-       \scratchdimen\papierbreedte
+       \scratchdimen\paperwidth
        \advance\scratchdimen-\MPx{\??bg:\nofbleeds}%
      \fi\fi
    \fi
    \advance\scratchdimen\@@bghoffset
    \xdef\bleedwidth{\the\scratchdimen}%
-   \scratchdimen\@@bghoogte
+   \scratchdimen\@@bgheight
    \ifdone
      \if!!donec
-       \scratchdimen\papierhoogte
+       \scratchdimen\paperheight
        \advance\scratchdimen-\MPy{\??bg:\nofbleeds}%
      \else\if!!doned
        \advance\scratchdimen\MPy{\??bg:\nofbleeds}%
@@ -501,16 +501,16 @@
    \hsize\bleedwidth
    \vsize\bleedheight
    \setbox\scratchbox\hbox{#2}%
-   \doif\@@bgpagina\v!ja
+   \doif\@@bgpage\v!yes
      {\setbox\scratchbox\topskippedbox{\box\scratchbox}}%
-   \setbox\scratchbox\hbox to \@@bgbreedte
+   \setbox\scratchbox\hbox to \@@bgwidth
      {\if!!donea\hss\fi\box\scratchbox\if!!doneb\hss\fi}%
    \if!!doned
      \setbox\scratchbox\hbox
-       {\lower\bleedheight\hbox{\raise\@@bghoogte\box\scratchbox}}%
+       {\lower\bleedheight\hbox{\raise\@@bgheight\box\scratchbox}}%
    \fi
-   \wd\scratchbox\@@bgbreedte
-   \ht\scratchbox\@@bghoogte
+   \wd\scratchbox\@@bgwidth
+   \ht\scratchbox\@@bgheight
    \dp\scratchbox\zeropoint
    \ifdone
      \hpos{\??bg:\nofbleeds}{\box\scratchbox}%
@@ -519,9 +519,9 @@
    \fi
    \egroup}
 
-\setupbleeding[\c!rek=\v!ja]
+\setupbleeding[\c!stretch=\v!yes]
 
-\defineexternalfigure[bleed][\c!breedte=\bleedwidth,\c!hoogte=\bleedheight]
+\defineexternalfigure[bleed][\c!width=\bleedwidth,\c!height=\bleedheight]
 
 % \placefigure[left]{none}
 %   {\bleed[width=5cm,height=3cm,location=lt]{\externalfigure[koe][bleed]}}
@@ -576,10 +576,10 @@
   {\dowithnextbox
      {\setlayer
         [#1]
-        [\c!breedte=\nextboxwd,\c!hoogte=\nextboxht,
+        [\c!width=\nextboxwd,\c!height=\nextboxht,
          \c!offset=\!!zeropoint,#2]
         {\flushnextbox}}%
-   \hbox\framed[\c!plaats=\v!normaal,#2]}
+   \hbox\framed[\c!location=\v!normal,#2]}
 
 \def\setlayertext
   {\dotripleempty\dosetlayertext}
@@ -588,17 +588,17 @@
   {\bgroup
    \getparameters
      [\??lx]
-     [\c!uitlijnen=,
-      \c!breedte=\hsize,
-      \c!kleur=,
-      \c!letter=,
+     [\c!align=,
+      \c!width=\hsize,
+      \c!color=,
+      \c!style=,
       #3]%
    \dowithnextboxcontent
      {\forgetall
-      \hsize\@@lxbreedte
-      \expanded{\setupalign[\@@lxuitlijnen]}%
-      \dosetfontattribute\??lx\c!letter}
-     {\setlayer[#1][#2]{\strut\color[\@@lxkleur]{\flushnextbox}}%
+      \hsize\@@lxwidth
+      \expanded{\setupalign[\@@lxalign]}%
+      \dosetfontattribute\??lx\c!style}
+     {\setlayer[#1][#2]{\strut\color[\@@lxcolor]{\flushnextbox}}%
       \egroup}%
    \vtop}
 
@@ -625,40 +625,40 @@
 % \setlayer[pagefigures][preset=rightbottom]
 
 \definelayerpreset
-  [\v!links\v!boven]
-  [\c!hoek={\v!links,\v!boven},\c!plaats={\v!rechts,\v!onder}]
+  [\v!left\v!top]
+  [\c!corner={\v!left,\v!top},\c!location={\v!right,\v!bottom}]
 
 \definelayerpreset
-  [\v!rechts\v!boven]
-  [\c!hoek={\v!rechts,\v!boven},\c!plaats={\v!links,\v!onder}]
+  [\v!right\v!top]
+  [\c!corner={\v!right,\v!top},\c!location={\v!left,\v!bottom}]
 
 \definelayerpreset
-  [\v!links\v!onder]
-  [\c!hoek={\v!links,\v!onder},\c!plaats={\v!rechts,\v!boven}]
+  [\v!left\v!bottom]
+  [\c!corner={\v!left,\v!bottom},\c!location={\v!right,\v!top}]
 
 \definelayerpreset
-  [\v!rechts\v!onder]
-  [\c!hoek={\v!rechts,\v!onder},\c!plaats={\v!links,\v!boven}]
+  [\v!right\v!bottom]
+  [\c!corner={\v!right,\v!bottom},\c!location={\v!left,\v!top}]
 
 \definelayerpreset
-  [\v!midden]
-  [\c!hoek=\v!midden,\c!plaats=\v!midden]
+  [\v!middle]
+  [\c!corner=\v!middle,\c!location=\v!middle]
 
 \definelayerpreset
-  [\v!midden\v!boven]
-  [\c!plaats=\v!onder,\c!hoffset=.5\layerwidth]
+  [\v!middle\v!top]
+  [\c!location=\v!bottom,\c!hoffset=.5\layerwidth]
 
 \definelayerpreset
-  [\v!midden\v!onder]
-  [\c!plaats=\v!boven,\c!hoffset=.5\layerwidth,\c!voffset=\layerheight]
+  [\v!middle\v!bottom]
+  [\c!location=\v!top,\c!hoffset=.5\layerwidth,\c!voffset=\layerheight]
 
 \definelayerpreset
-  [\v!midden\v!links]
-  [\c!plaats=\v!rechts,\c!voffset=.5\layerwidth]
+  [\v!middle\v!left]
+  [\c!location=\v!right,\c!voffset=.5\layerwidth]
 
 \definelayerpreset
-  [\v!midden\v!rechts]
-  [\c!plaats=\v!links,\c!hoffset=\layerwidth,\c!voffset=.5\layerheight]
+  [\v!middle\v!right]
+  [\c!location=\v!left,\c!hoffset=\layerwidth,\c!voffset=.5\layerheight]
   
 \def\alignedbox
   {\dodoubleempty\doalignedbox[]}
@@ -688,21 +688,21 @@
       \egroup}#1}
 
 \setvalue{\??ab\??ab         }{\middlebox}
-\setvalue{\??ab\??ab\v!midden}{\middlebox}
-\setvalue{\??ab\??ab\v!links }{\leftbox  }
-\setvalue{\??ab\??ab\v!rechts}{\rightbox }
-\setvalue{\??ab\??ab\v!onder }{\bottombox}
-\setvalue{\??ab\??ab\v!boven }{\topbox   }
-
-\setvalue{\??ab\??ab\v!midden\v!midden}{\middlebox}
-\setvalue{\??ab\??ab\v!links \v!boven }{\lefttopbox}
-\setvalue{\??ab\??ab\v!links \v!onder }{\leftbottombox}
-\setvalue{\??ab\??ab\v!rechts\v!boven }{\righttopbox}
-\setvalue{\??ab\??ab\v!rechts\v!onder }{\rightbottombox}
-\setvalue{\??ab\??ab\v!boven \v!links }{\topleftbox}
-\setvalue{\??ab\??ab\v!onder \v!links }{\bottomleftbox}
-\setvalue{\??ab\??ab\v!boven \v!rechts}{\toprightbox}
-\setvalue{\??ab\??ab\v!onder \v!rechts}{\bottomrightbox}
+\setvalue{\??ab\??ab\v!middle}{\middlebox}
+\setvalue{\??ab\??ab\v!left }{\leftbox  }
+\setvalue{\??ab\??ab\v!right}{\rightbox }
+\setvalue{\??ab\??ab\v!bottom }{\bottombox}
+\setvalue{\??ab\??ab\v!top }{\topbox   }
+
+\setvalue{\??ab\??ab\v!middle\v!middle}{\middlebox}
+\setvalue{\??ab\??ab\v!left \v!top }{\lefttopbox}
+\setvalue{\??ab\??ab\v!left \v!bottom }{\leftbottombox}
+\setvalue{\??ab\??ab\v!right\v!top }{\righttopbox}
+\setvalue{\??ab\??ab\v!right\v!bottom }{\rightbottombox}
+\setvalue{\??ab\??ab\v!top \v!left }{\topleftbox}
+\setvalue{\??ab\??ab\v!bottom \v!left }{\bottomleftbox}
+\setvalue{\??ab\??ab\v!top \v!right}{\toprightbox}
+\setvalue{\??ab\??ab\v!bottom \v!right}{\bottomrightbox}
 
 \setvalue{\??ab\??ab  c}{\middlebox}
 \setvalue{\??ab\??ab  l}{\leftbox}
@@ -729,10 +729,10 @@
 \setvalue{\??ab\??ab gc}{\baselinemiddlebox}
 \setvalue{\??ab\??ab gr}{\baselinerightbox}
 
-\setvalue{\??ab\??ab \v!regel         }{\baselinemiddlebox} % \v!grid is taken
-\setvalue{\??ab\??ab \v!regel\v!links }{\baselineleftbox}
-\setvalue{\??ab\??ab \v!regel\v!midden}{\baselinemiddlebox}
-\setvalue{\??ab\??ab \v!regel\v!rechts}{\baselinerightbox}
+\setvalue{\??ab\??ab \v!line         }{\baselinemiddlebox} % \v!grid is taken
+\setvalue{\??ab\??ab \v!line\v!left }{\baselineleftbox}
+\setvalue{\??ab\??ab \v!line\v!middle}{\baselinemiddlebox}
+\setvalue{\??ab\??ab \v!line\v!right}{\baselinerightbox}
 
 \def\offsetbox
   {\dodoubleempty\dooffsetbox[]}
@@ -746,70 +746,70 @@
      {\getparameters[\??ox]
         [\c!x=\zeropoint,
          \c!y=\zeropoint,
-         \c!breedte=\nextboxwd,
-         \c!hoogte=\nextboxht,
-         \c!diepte=\nextboxdp,
-         \c!plaats=,
-         \c!linkeroffset=\zeropoint,
-         \c!rechteroffset=\zeropoint,
-         \c!bovenoffset=\zeropoint,
-         \c!onderoffset=\zeropoint,
-         \c!methode=,
+         \c!width=\nextboxwd,
+         \c!height=\nextboxht,
+         \c!depth=\nextboxdp,
+         \c!location=,
+         \c!leftoffset=\zeropoint,
+         \c!rightoffset=\zeropoint,
+         \c!topoffset=\zeropoint,
+         \c!bottomoffset=\zeropoint,
+         \c!method=,
          #2]%
       \donefalse
-      \ifdim\@@oxlinkeroffset =\zeropoint\else\donetrue\fi
-      \ifdim\@@oxrechteroffset=\zeropoint\else\donetrue\fi
-      \ifdim\@@oxbovenoffset  =\zeropoint\else\donetrue\fi
-      \ifdim\@@oxonderoffset  =\zeropoint\else\donetrue\fi
+      \ifdim\@@oxleftoffset =\zeropoint\else\donetrue\fi
+      \ifdim\@@oxrightoffset=\zeropoint\else\donetrue\fi
+      \ifdim\@@oxtopoffset  =\zeropoint\else\donetrue\fi
+      \ifdim\@@oxbottomoffset  =\zeropoint\else\donetrue\fi
       \ifdone
-        \doif\@@oxmethode\v!vast % new
-          {\ifdim\@@oxlinkeroffset=\zeropoint
-             \ifdim\@@oxrechteroffset=\zeropoint \else
-               \scratchdimen-\@@oxrechteroffset
+        \doif\@@oxmethod\v!fixed % new
+          {\ifdim\@@oxleftoffset=\zeropoint
+             \ifdim\@@oxrightoffset=\zeropoint \else
+               \scratchdimen-\@@oxrightoffset
                \edef\@@oxx{\the\scratchdimen}%
-               \let\@@oxrechteroffset\zeropoint
+               \let\@@oxrightoffset\zeropoint
              \fi
            \else
-             \let\@@oxx\@@oxlinkeroffset
-             \let\@@oxlinkeroffset\zeropoint
+             \let\@@oxx\@@oxleftoffset
+             \let\@@oxleftoffset\zeropoint
            \fi
-           \ifdim\@@oxbovenoffset=\zeropoint
-             \ifdim\@@oxonderoffset=\zeropoint \else
-               \scratchdimen-\@@oxonderoffset
+           \ifdim\@@oxtopoffset=\zeropoint
+             \ifdim\@@oxbottomoffset=\zeropoint \else
+               \scratchdimen-\@@oxbottomoffset
                \edef\@@oxy{\the\scratchdimen}%
-               \let\@@oxonderoffset\zeropoint
+               \let\@@oxbottomoffset\zeropoint
              \fi
            \else
-             \let\@@oxy\@@oxbovenoffset
-             \let\@@oxbovenoffset\zeropoint
+             \let\@@oxy\@@oxtopoffset
+             \let\@@oxtopoffset\zeropoint
            \fi
            \donefalse}%
       \fi
       \ifdone
         \setbox\nextbox\vbox
           {\forgetall\offinterlineskip
-           \vskip\@@oxbovenoffset
+           \vskip\@@oxtopoffset
            \hbox
-             {\hskip\@@oxlinkeroffset
+             {\hskip\@@oxleftoffset
               \flushnextbox
-              \hskip\@@oxrechteroffset}%
-           \vskip\@@oxonderoffset}%
+              \hskip\@@oxrightoffset}%
+           \vskip\@@oxbottomoffset}%
         \scratchdimen\nextboxht
         \advance\scratchdimen\nextboxdp
         \nextboxht\scratchdimen
         \nextboxdp\zeropoint
       \fi
-      \freezedimenmacro\@@oxbreedte
-      \freezedimenmacro\@@oxhoogte
-      \freezedimenmacro\@@oxdiepte
+      \freezedimenmacro\@@oxwidth
+      \freezedimenmacro\@@oxheight
+      \freezedimenmacro\@@oxdepth
       \setbox\nextbox\hbox
         {\hskip\@@oxx\lower\@@oxy\hbox
-           {\doifelsenothing\@@oxplaats
+           {\doifelsenothing\@@oxlocation
               {\flushnextbox}
-              {\alignedbox[\@@oxplaats]\hbox{\flushnextbox}}}}%
-      \nextboxwd\@@oxbreedte
-      \nextboxht\@@oxhoogte
-      \nextboxdp\@@oxdiepte
+              {\alignedbox[\@@oxlocation]\hbox{\flushnextbox}}}}%
+      \nextboxwd\@@oxwidth
+      \nextboxht\@@oxheight
+      \nextboxdp\@@oxdepth
       \flushnextbox
       \egroup}#1}
 
@@ -890,14 +890,46 @@
   {\hbox\bgroup
    \getparameters
      [\??ol]
-     [\c!breedte=\zeropoint,%
-      \c!hoogte=\zeropoint,%
-      \c!diepte=\zeropoint,#1]%
+     [\c!width=\zeropoint,%
+      \c!height=\zeropoint,%
+      \c!depth=\zeropoint,#1]%
    \setbox\scratchbox\null
-   \wd\scratchbox\@@olbreedte
-   \ht\scratchbox\@@olhoogte
-   \dp\scratchbox\@@oldiepte
+   \wd\scratchbox\@@olwidth
+   \ht\scratchbox\@@olheight
+   \dp\scratchbox\@@oldepth
    \box\scratchbox
    \egroup}
 
+%  \backgroundimage{\hsize}{\vsize}{1}{\externalfigure[cow][\c!breedte=3cm]}
+
+\def\backgroundimage#1#2#3% repeat hsize vsize
+  {\bgroup
+   \dowithnextbox
+     {\ifcase#1\relax
+        % just one
+      \else
+        \scratchdimen#2\divide\scratchdimen\nextboxwd\count0\scratchdimen\advance\count0\plusone
+        \scratchdimen#3\divide\scratchdimen\nextboxht\count2\scratchdimen\advance\count2\plusone
+        % to be considered, probably methods
+        \ifcase#1\or % x and y
+          \setbox\nextbox\hbox{\dorecurse{\count0}{\copy\nextbox}}%
+          \setbox\nextbox\vbox{\dorecurse{\count2}{\copy\nextbox\endgraf}}%
+        \or % x
+          \setbox\nextbox\hbox{\dorecurse{\count0}{\copy\nextbox}}%
+        \or % y
+          \setbox\nextbox\vbox{\dorecurse{\count2}{\copy\nextbox\endgraf}}%
+        \fi
+      \fi
+      \ifdim\nextboxwd>#2\relax
+        \setbox\nextbox\hbox to #2{\hss\flushnextbox\hss}%
+        \setbox\scratchbox\hbox{\expanded{\clip[\c!width=#2,\c!height=\the\nextboxht]{\box\scratchbox}}}%
+      \fi
+      \ifdim\nextboxht>#3\relax
+        \setbox\nextbox\vbox to #3{\vss\flushnextbox\vss}%
+        \setbox\nextbox\hbox{\expanded{\clip[\c!width=\the\nextboxwd,\c!height=#3]{\flushnextbox}}}%
+      \fi
+      \flushnextbox
+      \egroup}%
+   \hbox}
+
 \protect \endinput
diff --git a/tex/context/base/core-buf.tex b/tex/context/base/core-buf.tex
index 9a998a201..51e1cd27c 100644
--- a/tex/context/base/core-buf.tex
+++ b/tex/context/base/core-buf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-buf,
+%D   [       filefile=core-buf,
 %D        version=2000.01.05,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Buffers and Blockmoves,
@@ -188,7 +188,7 @@
 
 \def\dostartbuffer
   {\bgroup
-   \obeylines % nodig, anders gaat 't fout als direct \starttabel (bv)
+   \obeylines % nodig, anders gaat 't fout als direct \starttable (bv)
    \doquadrupleempty\dodostartbuffer}
 
 \def\dodostartbuffer[#1][#2][#3][#4]% upward compatible
@@ -201,9 +201,9 @@
 
 \def\dododostartbuffer[#1][#2][#3][#4]%
   {%\showmessage\m!systems{15}{#2}%
-   \doifelsevalue{\??bu#1\c!alinea}\v!ja
+   \doifelsevalue{\??bu#1\c!paragraph}\v!yes
      {\segmentatebuffertrue}
-     {\doifnumberelse{\getvalue{\??bu#1\c!alinea}}\segmentatebuffertrue\segmentatebufferfalse}%
+     {\doifnumberelse{\getvalue{\??bu#1\c!paragraph}}\segmentatebuffertrue\segmentatebufferfalse}%
    \doifelsenothing{#4}
      {\letbeundefined{\e!stop\v!buffer}% % \let\stopbuffer=\relax   % \undefined
       \@EA\@EA\@EA\convertargument\@EA\e!start\v!buffer\to\beginofblock % else a space
@@ -246,10 +246,10 @@
 
 \def\dodobuffer#1#2%
   {\beginrestorecatcodes
-   \ifundefined{\??bu#2\c!nummer}%
+   \ifundefined{\??bu#2\c!number}%
      \edef\bufferfilename{\TEXbufferfile{#2}}%
    \else
-     \edef\bufferfilename{\TEXbufferfile{def-\getvalue{\??bu#2\c!nummer}}}%
+     \edef\bufferfilename{\TEXbufferfile{def-\getvalue{\??bu#2\c!number}}}%
    \fi
    #1\bufferfilename\donothing\donothing
    \endrestorecatcodes}
@@ -270,12 +270,12 @@
    \fi}
 
 \def\dodoprocessTEXbuffer[#1][#2]%
-  {\getvalue{\??bu#1\c!voor}%
+  {\getvalue{\??bu#1\c!before}%
    \dobuffer{16}[#2]\readjobfile
-   \getvalue{\??bu#1\c!na}}
+   \getvalue{\??bu#1\c!after}}
 
 \let\getbuffer \processTEXbuffer % handy
-\let\haalbuffer\processTEXbuffer % will move to mult-com.tex
+\let\getbuffer\processTEXbuffer % will move to mult-com.tex
 
 \def\typebuffer
   {\dodoubleempty\dotypebuffer}
@@ -287,31 +287,31 @@
      \dobuffer{17}[#2]\typefile
    \fi}
 
-\def\stelbufferin
-  {\dodoubleempty\dostelbufferin}
+\def\setupbuffer
+  {\dodoubleempty\dosetupbuffer}
 
-\def\dostelbufferin[#1][#2]%
+\def\dosetupbuffer[#1][#2]%
   {\ifsecondargument
      \getparameters[\??bu#1][#2]%
    \else
      \getparameters[\??bu][#1]%
    \fi}
 
-\def\dodefinieerbuffer[#1]%
+\def\dodefinebuffer[#1]%
   {\iffirstargument % else problems
      \doglobal\increment\nofdefinedbuffers
-     \letvalue{\??bu#1\c!nummer}\nofdefinedbuffers
-     \letvalue{\??bu#1\c!alinea}\v!nee
+     \letvalue{\??bu#1\c!number}\nofdefinedbuffers
+     \letvalue{\??bu#1\c!paragraph}\v!no
      \setevalue{\e!start#1}%
        {\noexpand\dostartbuffer[#1][def-\nofdefinedbuffers][\e!start#1][\e!stop#1]}%
-     \setevalue{\e!haal#1}%
+     \setevalue{\e!get#1}%
        {\noexpand\dodoprocessTEXbuffer[#1][def-\nofdefinedbuffers]}%
      \setevalue{\e!type#1}%
        {\noexpand\dodotypebuffer[#1][def-\nofdefinedbuffers]}%
    \fi}
 
-\def\definieerbuffer
-  {\dosingleargument\dodefinieerbuffer}
+\def\definebuffer
+  {\dosingleargument\dodefinebuffer}
 
 % yet another undocumented feature, but who cares:
 
@@ -354,8 +354,8 @@
   {\dodoubleempty\dogetbufferparagraphs}
 
 \def\dosetbufferoffset#1%
-  {\doifnumberelse{\getvalue{\??bu#1\c!alinea}}
-     {\currentbufferparagraph-\getvalue{\??bu#1\c!alinea}}
+  {\doifnumberelse{\getvalue{\??bu#1\c!paragraph}}
+     {\currentbufferparagraph-\getvalue{\??bu#1\c!paragraph}}
      {\currentbufferparagraph \zerocount}%
    \relax}
 
@@ -363,7 +363,7 @@
   {\iffirstargument
      \ifsecondargument
        \dosetbufferoffset{#1}%
-       \doifelse{#2}\v!alles
+       \doifelse{#2}\v!all
          {\def\startbufferparagraph{\normalbufferparagraph{#1}}}
          {\def\startbufferparagraph{\filterbufferparagraph{#1}{#2}}}%
        \def\stopbufferparagraph{\dostopbufferparagraph{#1}}%
@@ -386,10 +386,10 @@
   {\dobuffer{16}[#1]\readjobfile}
 
 \def\dostopbufferparagraph#1%
-  {\getvalue{\??bu#1\c!na}\par}
+  {\getvalue{\??bu#1\c!after}\par}
 
 \def\dostartbufferparagraph#1%
-  {\par\getvalue{\??bu#1\c!voor}}
+  {\par\getvalue{\??bu#1\c!before}}
 
 \def\normalbufferparagraph
   {\advance\currentbufferparagraph \plusone
@@ -451,7 +451,7 @@
   {\expanded{\setvalue{\??se\s!old#2}{\@@filterheadpart[#1]}}%
    \doifnot{#2}\lastsection
      {\expanded{\dodosetblockcounters[\@@filtertailpart[#1]]}%
-        {\getvalue{\??se#2\c!na}}}} % ????
+        {\getvalue{\??se#2\c!after}}}} % ????
 
 \def\dosetblockcounters[#1]%
   {\ifblockpermitted
@@ -563,7 +563,7 @@
      \global\copyingblocksfalse
    \fi}
 
-\def\geenblokkenmeer
+\def\nomoreblocks
   {\stopcopyingblocks}
 
 \def\copyblockfile
@@ -693,8 +693,8 @@
 \def\saveblock#1#2%
   {\checkcopyingblocks
    \obeylines
-   \@EA\@EA\@EA\convertargument\@EA\string\csname\e!eindvan#1\endcsname\to\endofblockA
-   %testen:  \expanded{\convertargument\string\csname\e!eindvan#1\endcsname\to\endofblockA}%
+   \@EA\@EA\@EA\convertargument\@EA\string\csname\e!end#1\endcsname\to\endofblockA
+   %testen:  \expanded{\convertargument\string\csname\e!end#1\endcsname\to\endofblockA}%
    \@EA\convertargument\string\eindvanblok[#1]\to\endofblockB % MULTI LINGUAL MAKEN
    \def\openblock
      {\dobeforeblock{#1}{#2}%
@@ -726,25 +726,25 @@
    \readjobfile\blockfilename\donothing\donothing
    \setblocklevel-}%
 
-\def\dodefinieerblok[#1]%
+\def\dodefineblock[#1]%
   {\passeerblok[#1]%
-   \handhaafblokken[#1]%
-   \stelblokin
+   \keepblocks[#1]%
+   \setupblock
      [#1]
-     [\c!voor=\blanko,
-      \c!na=\blanko,
-      \c!binnen=,
-      \c!letter=,
+     [\c!before=\blank,
+      \c!after=\blank,
+      \c!inner=,
+      \c!style=,
       \c!file=\jobname]}
 
-\def\definieerblok
-  {\dosingleargumentwithset\dodefinieerblok}
+\def\defineblock
+  {\dosingleargumentwithset\dodefineblock}
 
-\def\dostelblokin[#1][#2]%
+\def\dosetupblock[#1][#2]%
   {\getparameters[\??tb#1][#2]}
 
-\def\stelblokin
-  {\dodoubleargumentwithset\dostelblokin}
+\def\setupblock
+  {\dodoubleargumentwithset\dosetupblock}
 
 \def\passeerblok[#1]%
   {\setvalue{\s!thisisblock#1}##1[##2]%
@@ -801,28 +801,28 @@
    \fi
    \next}
 
-\def\doverbergblokken[#1][#2]%
+\def\dohideblocks[#1][#2]%
   {\def\docommando##1%
-     {\setvalue{\e!beginvan##1}%
+     {\setvalue{\e!begin##1}%
         {\bgroup\obeylines\dotripleempty\doverbergblok[##1][#2]}}%
    \processcommalist[#1]\docommando}
 
-\def\verbergblokken
-  {\dodoubleempty\doverbergblokken}
+\def\hideblocks
+  {\dodoubleempty\dohideblocks}
 
 \def\doexecuteloadedblock#1#2%
   {\blockpermittedtrue % ?
-   \bgroup % before \c!voor (think of: \c!voor=\startitemize)
+   \bgroup % before \c!before (think of: \c!before=\startitemize)
    \dosetupblockparameters[#1][#2]% voor 'voor'?
-   \getvalue{\??tb#1\c!voor}%
-   \dostartattributes{\??tb#1}\c!letter\c!kleur\empty
+   \getvalue{\??tb#1\c!before}%
+   \dostartattributes{\??tb#1}\c!style\c!color\empty
    \visibletrue
    \catcode`\^^M=\@@endofline\relax
-   \getvalue{\??tb#1\c!binnen}%
+   \getvalue{\??tb#1\c!inner}%
    \loadoneblock
    \par
    \dostopattributes
-   \getvalue{\??tb#1\c!na}%
+   \getvalue{\??tb#1\c!after}%
    \egroup}
 
 \def\dohandhaafblok[#1][#2][#3]%
@@ -837,7 +837,7 @@
      {\doifcommonelse{#2}{#3}
         {\global\blockpermittedtrue
          \edef\bloktitel{#1:#2}}
-        {\doifinsetelse\v!alles{#2}
+        {\doifinsetelse\v!all{#2}
            {\doifelsenothing{#3}
               {\global\blockpermittedtrue
                \edef\bloktitel{#1}}
@@ -859,14 +859,14 @@
    \fi
    \saveblock{#1}{#3#4}}
 
-\def\dohandhaafblokken[#1][#2]%
+\def\dokeepblocks[#1][#2]%
   {\def\docommando##1%
-     {\setvalue{\e!beginvan##1}%
+     {\setvalue{\e!begin##1}%
         {\bgroup\obeylines\dotripleempty\dohandhaafblok[##1][#2]}}%
    \processcommalist[#1]\docommando}
 
-\def\handhaafblokken
-  {\dodoubleempty\dohandhaafblokken}
+\def\keepblocks
+  {\dodoubleempty\dokeepblocks}
 
 \newconditional\processblockstatus
 \newconditional\dummyblockstatus
@@ -916,7 +916,7 @@
        \setvalue{\s!thiswasblock#1}%
          {\par
           \dostopattributes
-          \getvalue{\??tb#1\c!na}%
+          \getvalue{\??tb#1\c!after}%
           \egroup
           \setblocklevel-}%
        \def\next
@@ -924,10 +924,10 @@
           \ifconditional\blockassignmentstatus
             \dosetupblockparameters[#1][#3]%
           \fi
-          \getvalue{\??tb#1\c!voor}%
-          \dostartattributes{\??tb#1}\c!letter\c!kleur\empty
+          \getvalue{\??tb#1\c!before}%
+          \dostartattributes{\??tb#1}\c!style\c!color\empty
           \visibletrue
-          \getvalue{\??tb#1\c!binnen}}%
+          \getvalue{\??tb#1\c!inner}}%
      \fi
    \else
      \def\next
@@ -940,7 +940,7 @@
   {\setvalue{\s!thisisblock#1}##1[##2]%
      {\dodogebruikblok{#1}{##1}{##2}{#2}}}
 
-\def\dodogebruikblokken[#1][#2]%
+\def\dodouseblocks[#1][#2]%
   {\def\docommando##1%
      {\dogebruikblok[##1][#2]}%
    \processcommalist[#1]\docommando
@@ -949,40 +949,40 @@
      {\loadallblocks{\getvalue{\??tb\commalistelement\c!file}}}%
    \endgroup}
 
-\def\dogebruikblokken
+\def\douseblocks
   {\begingroup
-   \doassign[\??bs][\c!criterium=\v!alles]%
-   \dodoubleempty\dodogebruikblokken}
+   \doassign[\??bs][\c!criterium=\v!all]%
+   \dodoubleempty\dodouseblocks}
 
-\def\gebruikblokken
-  {\setfalse\processblockstatus\dogebruikblokken}
+\def\useblocks
+  {\setfalse\processblockstatus\douseblocks}
 
-\def\verwerkblokken
-  {\settrue \processblockstatus\dogebruikblokken}
+\def\processblocks
+  {\settrue \processblockstatus\douseblocks}
 
-\def\doselecteerblokken[#1][#2][#3]%
+\def\doselectblocks[#1][#2][#3]%
   {\doifelsenothing{#3}
      {\getparameters[\??bs][#2]%
-      \dogebruikblokken[#1][]}
+      \douseblocks[#1][]}
      {\getparameters[\??bs][#3]%
-      \dogebruikblokken[#1][#2]}}%
+      \douseblocks[#1][#2]}}%
 
-\def\selecteerblokken
+\def\selectblocks
   {\begingroup
-   \doassign[\??bs][\c!criterium=\v!alles]%
-   \dotripleempty\doselecteerblokken}
+   \doassign[\??bs][\c!criterium=\v!all]%
+   \dotripleempty\doselectblocks}
 
 \def\beginvanblok[#1]%  % er wordt ook gechecked op \eindvanblok[..]
-  {\getvalue{\e!beginvan#1}}
+  {\getvalue{\e!begin#1}}
 
 \def\forceerblokken[#1]%
   {\def\docommando##1%
-     {\setvalue{\e!beginvan##1}%
+     {\setvalue{\e!begin##1}%
         {\setblocklevel+\bgroup
          \dodoubleempty\doforceerblok[##1]}%
-      \setvalue{\e!eindvan##1}%
+      \setvalue{\e!end##1}%
         {\dostopattributes
-         \getvalue{\??tb##1\c!na}%
+         \getvalue{\??tb##1\c!after}%
          \egroup\setblocklevel-}}%
    \processcommalist[#1]\docommando}
 
@@ -993,17 +993,17 @@
    \ifconditional\blockassignmentstatus
      \dosetupblockparameters[#1][#2]%
    \fi
-   \getvalue{\??tb#1\c!voor}%
-   \dostartattributes{\??tb#1}\c!letter\c!kleur\empty
-   \getvalue{\??tb#1\c!binnen}}
+   \getvalue{\??tb#1\c!before}%
+   \dostartattributes{\??tb#1}\c!style\c!color\empty
+   \getvalue{\??tb#1\c!inner}}
 
-\def\passeerblokken[#1]%
+\def\bypassblocks[#1]%
   {\def\docommando##1%
-     {\setvalue{\e!beginvan##1}%
+     {\setvalue{\e!begin##1}%
         {\setblocklevel+\bgroup
          \obeylines % here, since we look ahead
          \dodoubleempty\dopasseerblok[##1]}%}%
-      \setvalue{\e!eindvan##1}%
+      \setvalue{\e!end##1}%
         {}}%
    \processcommalist[#1]\docommando}
 
@@ -1012,20 +1012,20 @@
      {\egroup\setblocklevel-}%
    \checkcopyingblocks
    \obeylines
-   \@EA\@EA\@EA\convertargument\@EA\string\csname\e!eindvan#1\endcsname\to\endofblockA
+   \@EA\@EA\@EA\convertargument\@EA\string\csname\e!end#1\endcsname\to\endofblockA
    \@EA\convertargument\string\eindvanblok[#1]\to\endofblockB % MULTI LINGUAL MAKEN
    \setupcopyblock
    \skipblocklineAB}
 
 % the buffer mechanism handles nesting, add some switch
 
-\setvalue{\e!start\v!verbergen}%
+\setvalue{\e!start\v!hiding}%
   {\dostartbuffer[buf-\nofpostponedblocks]
-     [\e!start\v!verbergen][\e!stop\v!verbergen]}
+     [\e!start\v!hiding][\e!stop\v!hiding]}
 
-\stelbufferin
-  [\c!alinea=\v!nee,
-   \c!voor=,
-   \c!na=]
+\setupbuffer
+  [\c!paragraph=\v!no,
+   \c!before=,
+   \c!after=]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex
index f034a3112..25003d61c 100644
--- a/tex/context/base/core-con.tex
+++ b/tex/context/base/core-con.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-con,
+%D   [       filefile=core-con,
 %D        version=1997.26.08,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Conversion Macros,
@@ -63,10 +63,10 @@
 
 %D For some years we had \unknown
 %D
-%D \starttypen
+%D \starttyping
 %D \def\Romannumerals#1%
 %D   {\uppercase\expandafter{\romannumeral#1}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \unknown but we need to be fully expandable in order to get
 %D the utility output file right, so now we have the following
@@ -99,9 +99,9 @@
 %D be done with numbers less or equal to~26. At the cost of
 %D much more macros a faster conversion is possible, using:
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue{char1}{a} \def\character#1{\getvalue{char#1}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But we prefer a simpel \type{\case}.
 %D
@@ -229,9 +229,9 @@
 %D mechanism. This way users can easily redefine a label from
 %D for instance german into austrian.
 %D
-%D \starttypen
+%D \starttyping
 %D \setuplabeltext [de] [january=J\"anner]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Anyhow, the conversion looks like:
 
@@ -260,11 +260,11 @@
 %D days, taking leapyears into account. For those who are
 %D curious:
 %D
-%D \startopsomming[opelkaar]
-%D \som  years that can be divided by 4 are leapyears
-%D \som  exept years that can be divided by 100
-%D \som  unless years can be divided by 400
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item  years that can be divided by 4 are leapyears
+%D \item  exept years that can be divided by 100
+%D \item  unless years can be divided by 400
+%D \stopitemize
 %D
 %D This makes the year 1900 into a normal year and 1996 and
 %D 2000 into leap years, right? Well, converting to string
@@ -338,9 +338,9 @@
 %D gives
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D The macro \type {\getdayoftheweek} can be used to calculate
@@ -366,10 +366,10 @@
 %D
 %D {\em not yet implemented:}
 %D
-%D \starttypen
+%D \starttyping
 %D \def\weekoftheday#1#2#3%
 %D  {}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {doifleapyearelse,
@@ -378,15 +378,15 @@
 %D Sometimes we need to know if we're dealing with a
 %D leapyear, so here is a testmacro:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifleapyearelse{year}{yes}{no}
-%D \stoptypen
+%D \stoptyping
 %D
 %D An example of its use can be seen in the macro
 %D
-%D \starttypen
+%D \starttyping
 %D \getdayspermonth{year}{month}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The number of days is available in the macro \type
 %D {\numberofdays}.
@@ -431,14 +431,14 @@
 %D instance:
 %D
 %D \startbuffer
-%D \currentdate[weekdag,dag,maand,jaar] % still dutch example
-%D \currentdate[WEEKDAG,dag,MAAND,jaar] % still dutch example
+%D \currentdate[weekday,day,month,year] % still dutch example
+%D \currentdate[WEEKDAY,day,MONTH,year] % still dutch example
 %D \stopbuffer
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D depending of course on the keywords. Here we gave:
@@ -453,7 +453,7 @@
 %D
 %D \typebuffer
 %D
-%D or typeset: \haalbuffer.
+%D or typeset: \getbuffer.
 %D
 %D When no argument is passed, the current date is given as
 %D specified per language (using \type{\installlanguage}).
@@ -462,7 +462,7 @@
 %D
 %D \startbuffer
 %D \date
-%D \date[d=12,m=12,y=1998][weekdag]
+%D \date[d=12,m=12,y=1998][weekday]
 %D \date[d=12,m=12,y=1998]
 %D \stopbuffer
 %D
@@ -474,9 +474,9 @@
 %D The date is specified by one character keys. When no date
 %D is given, we get the current date.
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 
 \def\kenmerkdatumpatroon{j,mm,dd} % jj,mm,dd changed at januari 1-1-2000
 
@@ -562,28 +562,28 @@
    \lowercase{\edef\!!stringa{#1}}% permits usage in \kap
    \@EA\processallactionsinset\@EA
      [\!!stringa]
-     [    \v!dag=>\betweendates\the\normalday,
-        %\v!dag+=>\betweendates\ordinaldaynumber\normalday,
-         \v!dag+=>\betweendates\convertnumber{\v!dag+}\normalday,
-        \v!maand=>\betweendates\month\normalmonth,
-         \v!jaar=>\betweendates\the\normalyear,
-       \v!spatie=>\unskip\ \hskip\datesignal,% optimization -)
+     [    \v!day=>\betweendates\the\normalday,
+        %\v!day+=>\betweendates\ordinaldaynumber\normalday,
+         \v!day+=>\betweendates\convertnumber{\v!day+}\normalday,
+        \v!month=>\betweendates\month\normalmonth,
+         \v!year=>\betweendates\the\normalyear,
+       \v!space=>\unskip\ \hskip\datesignal,% optimization -)
               \ =>\unskip\ \hskip\datesignal,% optimization -)
-               d=>\convertnumber\v!dag\normalday,
+               d=>\convertnumber\v!day\normalday,
              %d+=>\ordinaldaynumber\normalday,
-              d+=>\convertnumber{\v!dag+}\normalday,
-               m=>\convertnumber\v!maand\normalmonth,
-               j=>\convertnumber\v!jaar\normalyear,
-               y=>\convertnumber\v!jaar\normalyear,
+              d+=>\convertnumber{\v!day+}\normalday,
+               m=>\convertnumber\v!month\normalmonth,
+               j=>\convertnumber\v!year\normalyear,
+               y=>\convertnumber\v!year\normalyear,
                w=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear,
               dd=>\ifnum\normalday  >9 \else0\fi\the\normalday,
             %dd+=>\ordinaldaynumber{\ifnum\normalday >9 \else0\fi\the\normalday},
-             dd+=>\convertnumber{\v!dag+}{\ifnum\normalday >9 \else0\fi\the\normalday},
+             dd+=>\convertnumber{\v!day+}{\ifnum\normalday >9 \else0\fi\the\normalday},
               mm=>\ifnum\normalmonth>9 \else0\fi\the\normalmonth,
               jj=>\expandafter\gobbletwoarguments\the\normalyear,
               yy=>\expandafter\gobbletwoarguments\the\normalyear,
-      \v!weekdag=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear,
-      \v!kenmerk=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]},
+      \v!weekday=>\betweendates\dayoftheweek\normalday\normalmonth\normalyear,
+      \v!referral=>\expanded{\complexcurrentdate[\kenmerkdatumpatroon]},
       \s!unknown=>\unskip
                   \commalistelement
                   \hskip\datesignal
@@ -650,10 +650,10 @@
 %D Because we're dealing with dates, we also introduce a few
 %D day loops:
 %D
-%D \starttypen
+%D \starttyping
 %D \processmonth{year}{month}{command}
 %D \processyear{year}{command}{before}{after}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The counters \type {\normalyear}, \type {\normalmonth} and
 %D \type{\normalday} can be used for for date manipulations.
@@ -691,16 +691,16 @@
 %D a set of conversion symbols. Both need a bit different
 %D treatment.
 %D
-%D \starttypen
+%D \starttyping
 %D \defineconversion [roman] [\romannumerals]
 %D \defineconversion [set 1] [$\star$,$\bullet$,$\ast$]
-%D \stoptypen
+%D \stoptyping
 %D
 %D You can define a language dependent conversion with:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineconversion [en] [whatever] [\something]
-%D \stoptypen
+%D \stoptyping
 
 % \def\dodefineconversion[#1][#2]%
 %   {\ConvertConstantAfter\doifinstringelse{,}{#2}
@@ -842,26 +842,26 @@
 \defineconversion [O]  [\oldstylenumerals]
 \defineconversion [or] [\oldstyleromannumerals]
 
-\defineconversion [\v!letter]    [\character]
+\defineconversion [\v!character]    [\character]
 \defineconversion [\v!Letter]    [\Character]
 
-\defineconversion [\v!letters]   [\characters]
+\defineconversion [\v!characters]   [\characters]
 \defineconversion [\v!Letters]   [\Characters]
 
-\defineconversion [\v!cijfers]   [\numbers]
+\defineconversion [\v!numbers]   [\numbers]
 \defineconversion [\v!Cijfers]   [\Numbers]
 \defineconversion [\v!mediaeval] [\mediaeval]
 
-\defineconversion [\v!romeins]   [\romannumerals]
+\defineconversion [\v!romannumerals]   [\romannumerals]
 \defineconversion [\v!Romeins]   [\Romannumerals]
 
-\defineconversion [\v!grieks]    [\greeknumerals]
+\defineconversion [\v!greek]    [\greeknumerals]
 \defineconversion [\v!Grieks]    [\Greeknumerals]
 
 % Some bonus ones:
 
-\defineconversion [\v!leeg]      [\gobbleoneargument]
-\defineconversion [\v!geen]      [\numbers]
+\defineconversion [\v!empty]      [\gobbleoneargument]
+\defineconversion [\v!none]      [\numbers]
 
 \defineconversion
   [set 0]
@@ -919,4 +919,4 @@
    \mathematics{\ast\ast},
    \mathematics{\ast\ast\ast}]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-dat.tex b/tex/context/base/core-dat.tex
index 2389aa616..c7522fd0f 100644
--- a/tex/context/base/core-dat.tex
+++ b/tex/context/base/core-dat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-dat,                 % was core-02a,
+%D   [       filefile=core-dat,                 % was core-02a,
 %D        version=1999.08.10,               % 1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Database Support,         % 2A 
@@ -83,55 +83,55 @@
 %D A database file |<|in most cases such a base is generated 
 %D from another one|>| is structured as follows: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \startrecord{tag}
 %D   \memberofgroup{grouplist}
 %D   \setrecordentry{name}{...}
 %D   ....
 %D \stoprecord
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The interface to such a database is defined as follows: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \definerecord[class][settings]
 %D \setuprecord[class][settings]
 %D \definerecordentry[class][name]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D and processed by 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \processrecords[file list][tag and/or group list]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The actual processing is done by a macro assigned to \type 
 %D {command}: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \setuprecord[class][command=\DoWithRecord]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D Given that one can ask for a field with 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \getrecordentry{name}
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D such a command can look like: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \def\DoWithRecord#1%
 %D   {\startpacked
 %D    \let\\=\quad
 %D    name:  \getrecordentry{name}~\getrecordentry{family name}\par
 %D    address: \getrecordentry{postal address}\par
 %D    \stoppacked}
-%D \stoptypen  
+%D \stoptyping  
 %D 
 %D The argument passed is the tag. The database can look like:
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \startrecord{hagenj}
 %D   \memberofgroup{a,b}
 %D   \setrecordentry{naam}{Hans}
@@ -145,27 +145,27 @@
 %D   \setrecordentry{family name}{Otten}
 %D   \setrecordentry{postal address}{A.F. Otten\\Prinsengracht 17\\Hasselt NL}
 %D \stoprecord
-%D \stoptypen  
+%D \stoptyping  
 %D 
 %D The definition of this database looks like: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \definerecord[address][command=\DoWithRecord]
 %D 
 %D \definerecordentry[address][name]
 %D \definerecordentry[address][family name]
 %D \definerecordentry[address][postal address]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The actual processing is now done by (for instance): 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \processrecords[datafile][hagenj]
 %D \processrecords[datafile][hagenj,offenaf]
 %D \processrecords[datafile][all]
 %D \processrecords[datafile][a]
 %D \processrecords[datafile][b]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D Of course one can reassign the command used to handle the
 %D records in between. 
@@ -185,7 +185,7 @@
   {\getparameters
      [\??db#1]
      [\c!velden=,
-      \c!commando=\gobbleoneargument,
+      \c!command=\gobbleoneargument,
       #2]}
 
 \def\setuprecord
@@ -225,13 +225,13 @@
    \processcommacommand[\getvalue{\??db#1\c!velden}]\docommando
    \let\setrecordentry\skiprecord
    \the\resetrecordlist
-   \doifelse{#2}\v!alles   % 't Is nu eenmaal alles 
+   \doifelse{#2}\v!all   % 't Is nu eenmaal alles 
      \recordoktrue
      {\doifelsenothing{#2} % of niets 
         \recordoktrue
         \recordokfalse}%   % zullen we maar zeggen. 
    \ifrecordok
-     \let\askedrecords\v!alles
+     \let\askedrecords\v!all
    \else
      \makerawcommalist[#2]\askedrecords
    \fi
@@ -264,7 +264,7 @@
      {\relax
       \egroup
      %\the\everyrecord
-      \getvalue{\??db#1\c!commando}{##1}}%
+      \getvalue{\??db#1\c!command}{##1}}%
    \showmessage\m!databases1\askedrecords
    \def\doprocessrecords##1%
      {\readjobfile{##1}
diff --git a/tex/context/base/core-def.tex b/tex/context/base/core-def.tex
index 5cce2f2fc..690625423 100644
--- a/tex/context/base/core-def.tex
+++ b/tex/context/base/core-def.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-def,
+%D   [       filefile=core-def,
 %D        version=2002.05.07,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Defaults,
@@ -27,8 +27,8 @@
 
 \usesymbols[nav] \setupsymbolset[navigation 1]
 
-\setupinteraction[\c!symboolset=navigation 1]
+\setupinteraction[\c!symbolset=navigation 1]
 
 %D In \type {core-nav}, we choose this set as well.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-des.tex b/tex/context/base/core-des.tex
index f33b11de1..edd7d3af4 100644
--- a/tex/context/base/core-des.tex
+++ b/tex/context/base/core-des.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-des,
+%D   [       filefile=core-des,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Descriptions,
@@ -30,14 +30,14 @@
 % \doornummeren en \doordefinieren. Deze constructie is nodig
 % omdat doornummeren geen argument heeft en omdat subnummers
 % niet worden genest binnen het hogere niveau. Het commando
-% \??dd#1\s!do\c!status moet in dat geval \v!start zijn.
+% \??dd#1\s!do\c!state moet in dat geval \v!start zijn.
 %
 % herimplementeren met \nextbox en \unhbox\unvbox
 
 \newbox\@@definitiebox
 
 \def\@@definitiewoord#1%
-  {\getvalue{\??dd#1\s!do\c!commando}{#1}}
+  {\getvalue{\??dd#1\s!do\c!command}{#1}}
 
 % \def\normal@@definitiewoord#1[#2]#3#4%
 %   {\doattributes
@@ -48,20 +48,20 @@
 
 \def\normal@@definitiewoord#1[#2]#3#4%
   {\doattributes
-     {\??dd#1}\c!kopletter\c!kopkleur
-     {\getvalue{\??dd#1\c!commando}{#4}}% NAAR BUITENSTE NIVEAU !
+     {\??dd#1}\c!headstyle\c!headcolor
+     {\getvalue{\??dd#1\c!command}{#4}}% NAAR BUITENSTE NIVEAU !
    \rawreference\s!def{#2}{#3}} % brrr moet in #4
 
-\setvalue{@@definitie\v!links}#1%
+\setvalue{@@definitie\v!left}#1%
   {\@@definitiehang{#1}\@@definitielinkspure\@@definitielinkshang}
 
-\setvalue{@@definitie\v!rechts}#1%
+\setvalue{@@definitie\v!right}#1%
   {\@@definitiehang{#1}\@@definitierechtspure\@@definitierechtshang}
 
 \def\@@definitiehang#1#2#3%
   {\processaction
      [\getvalue{\??dd#1\c!hang}]
-     [   \v!geen=>\let\next#2,%
+     [   \v!none=>\let\next#2,%
                0=>\let\next#2,%
       \s!unknown=>\let\next#3,%
       \s!default=>\let\next#2]%
@@ -99,18 +99,18 @@
 
 \def\@@makedefinitiepurebox#1#2%
   {\setbox\@@definitiebox\vtop
-     {\mindermeldingen
+     {\dontcomplain
       \hsize\!!widtha
       \leftskip\zeropoint
       \rightskip\zeropoint
-      #2\setupalign[\getvalue{\??dd#1\c!uitlijnen}]%
+      #2\setupalign[\getvalue{\??dd#1\c!align}]%
       \ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
    \ht\@@definitiebox\strutht
    \dp\@@definitiebox\strutdp}
 
 \def\@@definitielinkshang#1[#2]#3%
   {\@@dostartdefinitie{#1}[#2]{#3}%
-   \mindermeldingen
+   \dontcomplain
    \advance\!!widtha \!!widthb
    \hangindent\!!widtha
    \@@makedefinitiehangbox{#1}\raggedright{\advance\rightskip \!!widthb}%
@@ -122,13 +122,13 @@
 
 \def\@@definitierechtshang#1[#2]#3%
   {\@@dostartdefinitie{#1}[#2]{#3}%
-   \mindermeldingen
+   \dontcomplain
    \advance\!!widtha \!!widthb
    \hangindent-\!!widtha
    \@@makedefinitiehangbox{#1}\raggedleft{\advance\leftskip \!!widthb}%
    \noindent\ignorespaces
    \rlap
-     {\mindermeldingen
+     {\dontcomplain
       \dontshowcomposition
       \dimen0=\hsize
       \advance\dimen0 -\leftskip
@@ -140,49 +140,49 @@
 \def\@@makedefinitiehangbox#1#2#3%
   {\setbox\@@definitiebox\vtop % \vbox gaat fout in hang
      {\forgetall
-      \mindermeldingen
+      \dontcomplain
       \hsize\!!widtha
-      #2\setupalign[\getvalue{\??dd#1\c!uitlijnen}]#3%
+      #2\setupalign[\getvalue{\??dd#1\c!align}]#3%
       \ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
    \ht\@@definitiebox\strutht
    \dp\@@definitiebox\strutdp
-   \doifinsetelse{\getvalue{\??dd#1\c!hang}}{\v!passend,\v!ruim}
+   \doifinsetelse{\getvalue{\??dd#1\c!hang}}{\v!fit,\v!broad}
      {\dimen0=\ht\@@definitiebox
       \advance\dimen0 \dp\@@definitiebox
-      \doifvalue{\??dd#1\c!hang}\v!ruim
+      \doifvalue{\??dd#1\c!hang}\v!broad
         {\advance\dimen0 .5\strutht}%
       \getnoflines{\dimen0}%
       \hangafter-\noflines}
      {\hangafter-\getvalue{\??dd#1\c!hang}}}%
 
-\setvalue{@@definitie\v!boven}#1[#2]#3%
-  {%\pagina[\v!voorkeur]%       % Weg ermee!
+\setvalue{@@definitie\v!top}#1[#2]#3%
+  {%\page[\v!preference]%       % Weg ermee!
    %\dosomebreak{\goodbreak}%   % Dit is beter en nodig!
    \dohandelpaginaafX1          % En dit moet het maar worden.
    \@@dostartdefinitie{#1}[#2]{\let\\=\space#3}%
    \noindent\ignorespaces
    \copy\@@definitiebox\par
    \nobreak
-   \getvalue{\??dd#1\c!tussen}%
+   \getvalue{\??dd#1\c!inbetween}%
    \nobreak
    \@@dodefinitie{#1}}
 
 % \setvalue{@@definitie\v!inmarge}#1[#2]#3%
 %   {\@@dostartdefinitie{#1}[#2]{#3}%
 %    \noindent\ignorespaces
-%    \inmarge{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
+%    \inmargin{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
 %    \@@dodefinitie{#1}}
 %
 % \setvalue{@@definitie\v!inlinker}#1[#2]#3%
 %   {\@@dostartdefinitie{#1}[#2]{#3}%
 %    \noindent\ignorespaces
-%    \inlinker{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
+%    \inleft{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
 %    \@@dodefinitie{#1}}
 %
 % \setvalue{@@definitie\v!inrechter}#1[#2]#3%
 %   {\@@dostartdefinitie{#1}[#2]{#3}%
 %    \noindent\ignorespaces
-%    \inrechter{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
+%    \inright{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
 %    \@@dodefinitie{#1}}
 
 \def\do@@definitie#1#2[#3]#4%
@@ -191,30 +191,30 @@
    #1{\ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox}%
    \@@dodefinitie{#2}}
 
-\setvalue{@@definitie\v!inmarge     }{\do@@definitie\inmarge  }
-\setvalue{@@definitie\v!inlinker    }{\do@@definitie\inlinker }
-\setvalue{@@definitie\v!inrechter   }{\do@@definitie\inrechter}
-\setvalue{@@definitie\v!marge       }{\do@@definitie\inmarge  }
-\setvalue{@@definitie\v!linkermarge }{\do@@definitie\inlinker }
-\setvalue{@@definitie\v!rechtermarge}{\do@@definitie\inrechter}
-\setvalue{@@definitie\v!binnenmarge }{\do@@definitie\inbinnen }
-\setvalue{@@definitie\v!buitenmarge }{\do@@definitie\inbuiten }
+\setvalue{@@definitie\v!inmargin     }{\do@@definitie\inmargin}
+\setvalue{@@definitie\v!inleft    }{\do@@definitie\inleft  }
+\setvalue{@@definitie\v!inright   }{\do@@definitie\inright }
+\setvalue{@@definitie\v!margin       }{\do@@definitie\inmargin}
+\setvalue{@@definitie\v!leftmargin }{\do@@definitie\inleft  }
+\setvalue{@@definitie\v!rightmargin}{\do@@definitie\inright }
+\setvalue{@@definitie\v!innermargin }{\do@@definitie\ininner}
+\setvalue{@@definitie\v!outermargin }{\do@@definitie\inouter}
 
-\def\@@definitieaanelkaarpassend#1[#2]#3%
+\setvalue{@@definitie\v!serried\v!fit}#1[#2]#3%
   {\@@dostartdefinitie{#1}[#2]{#3}%
    \noindent\ignorespaces
    \ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox
    \hskip\!!widthb % toegevoegd
    \@@dodefinitie{#1}}
 
-\def\@@definitieaanelkaarruim#1[#2]#3%
+\setvalue{@@definitie\v!serried\v!broad}#1[#2]#3%
   {\@@dostartdefinitie{#1}[#2]{#3}%
    \noindent\ignorespaces
    \ifhbox\@@definitiebox\unhcopy\else\copy\fi\@@definitiebox
    \hskip\!!widthb \!!plus .5\!!widthb \!!minus .25\!!widthb
    \@@dodefinitie{#1}}
 
-\def\@@definitieaanelkaarbreed#1[#2]#3%
+\setvalue{@@definitie\v!serried\v!wide}#1[#2]#3%
   {\@@dostartdefinitie{#1}[#2]{#3}%
    \noindent\ignorespaces
    \hbox to \!!widtha
@@ -223,17 +223,17 @@
    \ignorespaces
    \@@dodefinitie{#1}}
 
-\setvalue{@@definitie\v!aanelkaar}#1[#2]#3%
+\setvalue{@@definitie\v!serried}#1[#2]#3%
   {\processaction
-      [\getvalue{\??dd#1\c!breedte}]
-      [\v!passend=>\let\next\@@definitieaanelkaarpassend,
-          \v!ruim=>\let\next\@@definitieaanelkaarruim,
-       \s!unknown=>\let\next\@@definitieaanelkaarbreed,
-       \s!default=>\let\next\@@definitieaanelkaarruim]%
-   \next{#1}[#2]{#3}}
-
-\setvalue{@@definitie\v!hangend}#1[#2]#3%
-  {\@@dostartdefinitie{#1}[#2]{#3}% % adds \c!marge to \leftskip
+      [\getvalue{\??dd#1\c!width}]
+      [\v!fit=>\let\next\v!fit,
+          \v!broad=>\let\next\v!broad,
+       \s!unknown=>\let\next\v!wide,
+       \s!default=>\let\next\v!broad]%
+   \getvalue{@@definitie\v!serried\next}{#1}[#2]{#3}}
+
+\setvalue{@@definitie\v!hanging}#1[#2]#3%
+  {\@@dostartdefinitie{#1}[#2]{#3}% % adds \c!margin to \leftskip
    \noindent\ignorespaces
    \advance\leftskip -\leftskipadaption \relax
    \ifdim\leftskipadaption=\zeropoint
@@ -257,6 +257,15 @@
    \ignorespaces
    \@@dodefinitie{#1}}
 
+%D A bonus definition
+%D
+%D \starttyping
+%D \setupfootnotedefinition[location=command,headcommand=\llap]
+%D \stoptyping
+
+\setvalue{@@definitie\v!command}#1%
+  {\do@@definitie{\executeifdefined{\??dd#1\c!headcommand}\framed}{#1}}
+
 %D A new key 'titeluitlijnen' in definitions.
 
 \chardef\insidedefinition=0
@@ -265,50 +274,50 @@
 \let\@@rightdefinitieskip\!!zeropoint
 
 \def\@@dostartdefinitie#1[#2]#3%
-  {\getvalue{\??dd#1\c!voor}%
+  {\getvalue{\??dd#1\c!before}%
    \begingroup
-   \doadaptleftskip{\getvalue{\??dd#1\c!marge}}%
+   \doadaptleftskip{\getvalue{\??dd#1\c!margin}}%
    \showcomposition
-   \!!widthb\getvalue{\??dd#1\c!afstand}\relax
+   \!!widthb\getvalue{\??dd#1\c!distance}\relax
    \ifdim\!!widthb=\zeropoint\relax
-     \doifvalue{\??dd#1\c!breedte}\v!ruim{\!!widthb=1em}%
+     \doifvalue{\??dd#1\c!width}\v!broad{\!!widthb=1em}%
    \fi
    % temp hack, we need to avoid this kind of preprocessing
    \setbox\@@definitiebox\hbox % preroll
      {\forgetall
       \trialtypesettingtrue
-      \mindermeldingen
-      \def\\{\crcr}%
+      \dontcomplain
+      \def\\{\crlf}%
       \@@definitiewoord{#1}[#2]{#3}%
-        {\begstrut\getvalue{\??dd#1\c!tekst}\ignorespaces#3\endstrut}}%
+        {\begstrut\getvalue{\??dd#1\c!text}\ignorespaces#3\endstrut}}%
    % so far
    \assignwidth
      {\!!widtha}%
-     {\getvalue{\??dd#1\c!breedte}}%
-     {\doifelsevaluenothing{\??dd#1\c!monster}%
+     {\getvalue{\??dd#1\c!width}}%
+     {\doifelsevaluenothing{\??dd#1\c!sample}%
         {% preroll can move here (test first)
          \ifhbox\@@definitiebox\unhcopy\else\copy\fi \@@definitiebox}%
         {\@@definitiewoord{#1}[#2]{#3}%
-           {\getvalue{\??dd#1\c!tekst}\getvalue{\??dd#1\c!monster}}}}
+           {\getvalue{\??dd#1\c!text}\getvalue{\??dd#1\c!sample}}}}
      {\!!widthb}%
    \setbox\@@definitiebox\hbox
      {\forgetall
-      \mindermeldingen
+      \dontcomplain
       \let\\\endgraf
-      \doifelsevalue{\??dd#1\c!plaats}\v!aanelkaar
+      \doifelsevalue{\??dd#1\c!location}\v!serried
         {\@@definitiewoord{#1}[#2]{#3}%
-           {\begstrut\getvalue{\??dd#1\c!tekst}#3\endstrut}}
+           {\begstrut\getvalue{\??dd#1\c!text}#3\endstrut}}
         {\@@definitiewoord{#1}[#2]{#3}%
            {\vtop{\hsize\!!widtha\advance\hsize-\!!widthb
-            \begstrut\getvalue{\??dd#1\c!tekst}\ignorespaces#3\endstrut}}}}%
-   \doifelsevalue{\??dd#1\c!titeluitlijnen}\v!nee
+            \begstrut\getvalue{\??dd#1\c!text}\ignorespaces#3\endstrut}}}}%
+   \doifelsevalue{\??dd#1\c!aligntitle}\v!no
      {\edef\@@leftdefinitieskip {\the\leftskip }%
       \edef\@@rightdefinitieskip{\the\rightskip}}
      {\ifcase\insidedefinition
         \edef\@@leftdefinitieskip {\the\leftskip }%
         \edef\@@rightdefinitieskip{\the\rightskip}%
       \fi}%
-   \expanded{\inspringen[\getvalue{\??dd#1\c!inspringen}]}%
+   \expanded{\indenting[\getvalue{\??dd#1\c!indenting}]}%
    \ifcase\insidedefinition % better a system mode
      \chardef\insidedefinition\plusone
    \or
@@ -319,12 +328,12 @@
   {\par % maybe better after \dostopattributes
    \dostopattributes
    \endgroup
-   \getvalue{\??dd#1\c!na}%
+   \getvalue{\??dd#1\c!after}%
    \egroup % temporary hack
    \dochecknextindentation{\??dd#1}}
 
 \def\@@dodefinitie#1%
-  {\dostartattributes{\??dd#1}\c!letter\c!kleur\empty
+  {\dostartattributes{\??dd#1}\c!style\c!color\empty
    \ignorespaces}
 
 % \def\@@somedefinitie#1[#2]#3%
@@ -345,34 +354,34 @@
    \BeforePar{\executedoordefinitie{#1}[#2]{#3}}%
    \GotoPar}
 
-\def\dodosteldoordefinierenin[#1][#2]%
+\def\dodosetupdescriptions[#1][#2]%
   {\getparameters[\??dd#1][#2]}
 
-\def\dosteldoordefinierenin[#1][#2]% % beter: \iffirstargument
+\def\dosetupdescriptions[#1][#2]% % beter: \iffirstargument
   {\ConvertToConstant\doifelse{#2}{}
-     {\dodosteldoordefinierenin[][#1]}
-     {\dodoubleargumentwithset\dodosteldoordefinierenin[#1][#2]}}
+     {\dodosetupdescriptions[][#1]}
+     {\dodoubleargumentwithset\dodosetupdescriptions[#1][#2]}}
 
-\def\steldoordefinierenin%
-  {\dodoubleempty\dosteldoordefinierenin}
+\def\setupdescriptions%
+  {\dodoubleempty\dosetupdescriptions}
 
 \def\executedoordefinitie#1[#2]%
-  {\ExpandAfter\doifundefined{@@definitie\getvalue{\??dd#1\c!plaats}}
-     {\setvalue{\??dd#1\c!plaats}{\v!links}}%
-   \getvalue{@@definitie\getvalue{\??dd#1\c!plaats}}{#1}[#2]}
+  {\ExpandAfter\doifundefined{@@definitie\getvalue{\??dd#1\c!location}}
+     {\setvalue{\??dd#1\c!location}{\v!left}}%
+   \getvalue{@@definitie\getvalue{\??dd#1\c!location}}{#1}[#2]}
 
-\def\dodoordefinieren[#1][#2]%
+\def\dodefinedescription[#1][#2]%
   {\copyparameters[\??dd#1][\??dd]
-     [\c!plaats,\c!kopletter,\c!letter,\c!kleur,\c!kopkleur,
-      \c!breedte,\c!hang,\c!monster,\c!voor,\c!tussen,\c!na,\c!marge,
-      \c!inspringen,\c!springvolgendein,\c!uitlijnen,
-      \c!tekst,\c!afstand,\c!commando]%
+     [\c!location,\c!headstyle,\c!style,\c!color,\c!headcolor,
+      \c!width,\c!hang,\c!sample,\c!before,\c!inbetween,\c!after,\c!margin,
+      \c!indenting,\c!indentnext,\c!align,
+      \c!text,\c!distance,\c!command]%
    \getparameters[\??dd#1]
-     [\s!do\c!status=\v!stop,
-      \s!do\c!commando=\normal@@definitiewoord,
+     [\s!do\c!state=\v!stop,
+      \s!do\c!command=\normal@@definitiewoord,
       #2]%
-   \doifvalue{\??dd#1\c!plaats}\v!boven
-     {\doassign[\??dd#1][\c!tussen={\blanko}]}%
+   \doifvalue{\??dd#1\c!location}\v!top
+     {\doassign[\??dd#1][\c!inbetween={\blank}]}%
    \setvalue{#1}%
      {\dodoubleempty\@@definitie[#1]}%
    \setvalue{\e!start#1}%
@@ -381,20 +390,20 @@
      {\@@stopdefinitie{#1}}}%
 
 \def\@@startdefinitie[#1][#2]%
-  {\doifelsevalue{\??dd#1\s!do\c!status}\v!start
+  {\doifelsevalue{\??dd#1\s!do\c!state}\v!start
      {\@@startsomedefinitie{#1}[#2]{}}
      {\dowithwargument{\@@startsomedefinitie{#1}[#2]}}}
 
 \def\@@definitie[#1][#2]%
-  {\doifelsevalue{\??dd#1\s!do\c!status}\v!start
+  {\doifelsevalue{\??dd#1\s!do\c!state}\v!start
      {\@@somedefinitie{#1}[#2]{}}
      {\dowithwargument{\@@somedefinitie{#1}[#2]}}}
 
-\def\doordefinieren%
-  {\dodoubleemptywithset\dodoordefinieren}
+\def\definedescription%
+  {\dodoubleemptywithset\dodefinedescription}
 
 \def\showdnpuretext#1%
-  {\strut\getvalue{\??dd#1\c!tekst}} % geen spatie
+  {\strut\getvalue{\??dd#1\c!text}} % geen spatie
 
 % \def\showdntext#1%
 %   {\doifelsevaluenothing{\??dd#1\c!tekst}
@@ -402,160 +411,102 @@
 %      {\strut\getvalue{\??dd#1\c!tekst}\fixedspace}}
 
 \def\showdntext#1%
-  {\doifelsevaluenothing{\??dd#1\c!tekst}
+  {\doifelsevaluenothing{\??dd#1\c!text}
      {\ignorespaces}
      {\strut
-      \getvalue{\??dd#1\c!tekst}%
+      \getvalue{\??dd#1\c!text}%
       \removeunwantedspaces\fixedspace}}
 
 % \def\showdnnummer#1%
 %   {\voorafgaandenummer
-%    \nummer[\getvalue{\??dd#1\??dd\c!nummer}]}
+%    \convertednumber[\getvalue{\??dd#1\??dd\c!nummer}]}
 
 \def\showdnnummer#1%
   {%\preparethenumber{\??dd#1}\voorafgaandenummer\preparednumber
    \preparednumber
-   \nummer[\getvalue{\??dd#1\??dd\c!nummer}]}
+   \convertednumber[\getvalue{\??dd#1\??dd\c!number}]}
 
 \def\showdnsubnummer#1%
   {\showdnnummer{#1}%
-   \getvalue{\??dd#1\c!scheider}%
-   \nummer[\v!sub\getvalue{\??dd#1\??dd\c!nummer}]}
+   \getvalue{\??dd#1\c!separator}%
+   \convertednumber[\v!sub\getvalue{\??dd#1\??dd\c!number}]}
 
 \def\showdnsubsubnummer#1%
   {\showdnsubnummer{#1}%
-   \getvalue{\??dd#1\c!scheider}%
-   \nummer[\v!sub\v!sub\getvalue{\??dd#1\??dd\c!nummer}]}
+   \getvalue{\??dd#1\c!separator}%
+   \convertednumber[\v!sub\v!sub\getvalue{\??dd#1\??dd\c!number}]}
 
 \def\showdnsubsubsubnummer#1%
   {\showdnsubsubnummer{#1}%
-   \getvalue{\??dd#1\c!scheider}%
-   \nummer[\v!sub\v!sub\v!sub\getvalue{\??dd#1\??dd\c!nummer}]}
+   \getvalue{\??dd#1\c!separator}%
+   \convertednumber[\v!sub\v!sub\v!sub\getvalue{\??dd#1\??dd\c!number}]}
 
 \def\domakednnummer#1#2#3%
-  {\getvalue{\??dd#2#1\c!links}%
+  {\getvalue{\??dd#2#1\c!left}%
    \strut#3{#1}%
-   \getvalue{\??dd#2#1\c!afsluiter}%
-   \getvalue{\??dd#2#1\c!rechts}}
+   \getvalue{\??dd#2#1\c!stopper}%
+   \getvalue{\??dd#2#1\c!right}}
 
 % #1=name  #2=level #3=\show  #4[#5]#6#7=#1[#2]#3#4 van definitie
 
-% \def\special@@definitiewoord#1#2#3#4[#5]#6#7%
-%   {\strut
-%    \doifelsevalue{\??dd#1\c!nummer}\v!nee
-%      \!!doneafalse
-%      {\doifelse{#5}{-}
-%         \!!doneafalse
-%         \!!doneatrue}%
-%    \chardef\definitiekoppeling\zerocount
-%    \iflocation
-%      \doifvaluesomething{\??dd#1\c!koppeling}
-%        {\processaction % genereert > of <
-%           [\getvalue{\??dd#1\c!koppelwijze}]
-%           [ \v!lokaal=>\chardef\definitiekoppeling1, % old: default
-%            \v!globaal=>\chardef\definitiekoppeling2]}% new: global crosslinking
-%    \fi
-%    \stelnummerin % the number is called indirectly
-%      [\getvalue{\??dd#1\??dd\c!nummer}]
-%      [\c!sectienummer=\getvalue{\??dd#1\c!sectienummer}]%
-%    \if!!donea
-%      \getvalue{\e!volgende#2#1}%
-%      \iflocation
-%        \bgroup
-%        \letvalue{\??dd#1\c!sectienummer}\v!ja
-%        \protectconversion
-%        \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!nummer}]%
-%        \preparethenumber{\??dd#1}\voorafgaandenummer\preparednumber
-%        \ifcase\definitiekoppeling \or
-%          \xdef\internaldoornummer{#3{#1}}%
-%          \rawreference\s!num{#1:\internaldoornummer}{}%
-%        \or
-%          \xdef\internaldoornummer{\countervalue{\??dd\c!koppeling#1}}%
-%          \rawreference\s!num{#1:\internaldoornummer}{}%
-%        \fi
-%        \egroup
-%      \fi
-%      \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!nummer}]%
-%      \preparethenumber{\??dd#1}\voorafgaandenummer\preparednumber
-%      \hbox
-%        {\let\normalkap\relax % sorry, uppercase causes troubles
-%         \doattributes        % \nocase primitive needed
-%           {\??dd#2#1}\c!kopletter\c!kopkleur
-%           {\getvalue{\??dd#1\c!commando}% hook for taco
-%              {\showdntext{#2#1}%
-%               \domakednnummer{#1}{#2}{#3}}}%
-%         \iflocation\ifcase\definitiekoppeling \else
-%           \edef\localconnection{\getvalue{\??dd#1\c!koppeling}:\internaldoornummer}%
-%           \doifreferencefoundelse\localconnection
-% %             {\in[\localconnection]}{}% genereert > of <
-%         \fi\fi}%
-%      \doifnot{#5}{-}{\rawreference\s!num{#5}{#3{#1}}}%
-%    \else % Why was this strange expansion needed?
-%      \hbox
-%        {\edef\!!stringa{\showdnpuretext{#2#1}}% nog eens testen binnen \expanded
-%         \expanded{\doattributes{\??dd#1}\noexpand\c!kopletter\noexpand\c!kopkleur
-%           {\noexpand\getvalue{\??dd#1\c!commando}{\!!stringa}}}%
-%         \doifnot{#5}{-}{\rawreference\s!num{#5}{}}}%
-%    \fi}
-
 \def\special@@definitiewoord#1#2#3#4[#5]#6#7%
   {\strut
-   \doifelsevalue{\??dd#1\c!nummer}\v!nee
+   \doifelsevalue{\??dd#1\c!number}\v!no
      \!!doneafalse{\doifelse{#5}{-}\!!doneafalse\!!doneatrue}%
    \chardef\definitiekoppeling\zerocount
    \iflocation
-     \doifvaluesomething{\??dd#1\c!koppeling}
+     \doifvaluesomething{\??dd#1\c!coupling}
        {\processaction % genereert > of <
-          [\getvalue{\??dd#1\c!koppelwijze}]
-          [ \v!lokaal=>\chardef\definitiekoppeling1, % old: default
-           \v!globaal=>\chardef\definitiekoppeling2]}% new: global crosslinking
+          [\getvalue{\??dd#1\c!couplingway}]
+          [ \v!local=>\chardef\definitiekoppeling1, % old: default
+           \v!global=>\chardef\definitiekoppeling2]}% new: global crosslinking
    \fi
-   \stelnummerin % the number is called indirectly
-     [\getvalue{\??dd#1\??dd\c!nummer}]
-     [\c!sectienummer=\getvalue{\??dd#1\c!sectienummer}]%
+   \setupnumber % the number is called indirectly
+     [\getvalue{\??dd#1\??dd\c!number}]
+     [\c!sectionnumber=\getvalue{\??dd#1\c!sectionnumber}]%
    \if!!donea
 \iftrialtypesetting\startlocal\fi
-     \getvalue{\e!volgende#2#1}% tricky but we need the preroll
+     \getvalue{\e!next#2#1}% tricky but we need the preroll
 \iftrialtypesetting\stoplocal\fi
-     % \getvalue{\e!volgende#2#1}%
+     % \getvalue{\e!next#2#1}%
      \iflocation
        \bgroup
-       \letvalue{\??dd#1\c!sectienummer}\v!ja
+       \letvalue{\??dd#1\c!sectionnumber}\v!yes
        \protectconversion
-       \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!nummer}]%
+       \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!number}]%
        \preparethenumber{\??dd#1}\voorafgaandenummer\preparednumber
        \ifcase\definitiekoppeling \or
          \xdef\internaldoornummer{#3{#1}}%
          \rawreference\s!num{#1:\internaldoornummer}{}%
        \or
-         \xdef\internaldoornummer{\countervalue{\??dd\c!koppeling#1}}%
+         \xdef\internaldoornummer{\countervalue{\??dd\c!coupling#1}}%
          \rawreference\s!num{#1:\internaldoornummer}{}%
        \fi
        \egroup
      \fi
-     \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!nummer}]%
+     \maakvoorafgaandenummer[\getvalue{\??dd#1\??dd\c!number}]%
      \preparethenumber{\??dd#1}\voorafgaandenummer\preparednumber
-     \let\normalkap\relax % sorry, uppercase causes troubles
+     \disablepseudocaps      % sorry, uppercase causes troubles
      \doattributes        % \nocase primitive needed
-       {\??dd#1}\c!kopletter\c!kopkleur
-       {\getvalue{\??dd#1\c!commando}% hook for taco
+       {\??dd#1}\c!headstyle\c!headcolor
+       {\getvalue{\??dd#1\c!command}% hook for taco
           {\showdntext{#2#1}%
            \domakednnummer{#1}{#2}{#3}}}%
      \iflocation\ifcase\definitiekoppeling \else
-       \edef\localconnection{\getvalue{\??dd#1\c!koppeling}:\internaldoornummer}%
+       \edef\localconnection{\getvalue{\??dd#1\c!coupling}:\internaldoornummer}%
        \doifreferencefoundelse\localconnection
          {\in[\localconnection]}\donothing % genereert > of <
      \fi\fi
      \doifnot{#5}{-}{\rawreference\s!num{#5}{#3{#1}}}%
    \else % Why was this strange expansion needed?
      \edef\!!stringa{\showdnpuretext{#2#1}}% nog eens testen binnen \expanded
-     \expanded{\doattributes{\??dd#1}\noexpand\c!kopletter\noexpand\c!kopkleur
-       {\noexpand\getvalue{\??dd#1\c!commando}{\!!stringa}}}%
+     \expanded{\doattributes{\??dd#1}\noexpand\c!headstyle\noexpand\c!headcolor
+       {\noexpand\getvalue{\??dd#1\c!command}{\!!stringa}}}%
      \doifnot{#5}{-}{\rawreference\s!num{#5}{}}%
    \fi}
 
 \def\@@ddsetsubsubsubnummer#1%
-  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!nummer}}%
+  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!number}}%
    \setnumber[\v!sub\v!sub\v!sub\doornummer]}
 
 \def\@@ddsetsubsubnummer#1%
@@ -571,7 +522,7 @@
    \setnumber[\doornummer]}
 
 \def\@@ddresetsubsubsubnummer#1%
-  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!nummer}}%
+  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!number}}%
    \resetnumber[\v!sub\v!sub\v!sub\doornummer]}
 
 \def\@@ddresetsubsubnummer#1%
@@ -582,181 +533,178 @@
   {\@@ddresetsubsubnummer{#1}%
    \resetnumber[\v!sub\doornummer]}
 
-\def\@@ddresetnummer#1%
+\def\@@ddresetnumber#1%
   {\@@ddresetsubnummer{#1}%
    \resetnumber[\doornummer]}
 
 \def\@@ddvolgendesubsubsubnummer#1[#2]%
-  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!nummer}}%
-   \verhoognummer[\v!sub\v!sub\v!sub\doornummer]%
+  {\edef\doornummer{\getvalue{\??dd#1\??dd\c!number}}%
+   \incrementnumber[\v!sub\v!sub\v!sub\doornummer]%
    \rawreference\s!num{#2}{\showdnsubsubsubnummer{\doornummer}}}%
 
 \def\@@ddvolgendesubsubnummer#1[#2]%
   {\@@ddresetsubsubsubnummer{#1}%
-   \verhoognummer[\v!sub\v!sub\doornummer]%
+   \incrementnumber[\v!sub\v!sub\doornummer]%
    \rawreference\s!num{#2}{\showdnsubsubnummer{\doornummer}}}
 
 \def\@@ddvolgendesubnummer#1[#2]%
   {\@@ddresetsubsubnummer{#1}%
-   \verhoognummer[\v!sub\doornummer]%
+   \incrementnumber[\v!sub\doornummer]%
    \rawreference\s!num{#2}{\showdnsubnummer{\doornummer}}}
 
 \def\@@ddvolgendenummer#1[#2]%
   {\@@ddresetsubnummer{#1}%
-   \verhoognummer[\doornummer]%
+   \incrementnumber[\doornummer]%
    \rawreference\s!num{#2}{\showdnnummer{\doornummer}}}
 
-\def\dodosteldoornummerenin[#1][#2]%
+\def\dodosetupenumerations[#1][#2]%
   {\getparameters[\??dd#1][#2]%
    \doifdefined{\??dd#1\c!start}
-     {\stelnummerin[#1][\c!start=\getvalue{\??dd#1\c!start}]}%
-   \stelnummerin[#1][\c!conversie=\getvalue{\??dd#1\c!conversie}]}
+     {\setupnumber[#1][\c!start=\getvalue{\??dd#1\c!start}]}%
+   \setupnumber[#1][\c!conversion=\getvalue{\??dd#1\c!conversion}]}
 
-\def\dosteldoornummerenin[#1][#2]%
+\def\dosetupenumerations[#1][#2]%
   {\ConvertToConstant\doifelse{#2}{}
      {\getparameters[\??dn][#1]}
-     {\dodoubleargumentwithset\dodosteldoornummerenin[#1][#2]}}
+     {\dodoubleargumentwithset\dodosetupenumerations[#1][#2]}}
 
-\def\steldoornummerenin%
-  {\dodoubleempty\dosteldoornummerenin}
+\def\setupenumerations%
+  {\dodoubleempty\dosetupenumerations}
 
-\def\dododoornummeren#1#2#3[#4][#5]#6%
-  {\makecounter{\??dd\c!koppeling#1}% new: global cross linking
-   \dodoordefinieren[#3#1]%
-     [\s!do\c!status=\v!start,
-      \s!do\c!commando=\special@@definitiewoord{#1}{#3}{#6}]%
+\def\dododefineenumeration#1#2#3[#4][#5]#6%
+  {\makecounter{\??dd\c!coupling#1}% new: global cross linking
+   \dodefinedescription[#3#1]%
+     [\s!do\c!state=\v!start,
+      \s!do\c!command=\special@@definitiewoord{#1}{#3}{#6}]%
    \copyparameters[\??dd#3#1][\??dn]
-     [\c!plaats,\c!kopletter,\c!letter,\c!kleur,\c!kopkleur,
-      \c!breedte,\c!nummer,\c!afstand,\c!commando,
-      \c!monster,\c!hang,\c!uitlijnen,\c!voor,\c!tussen,\c!na,
-      \c!niveaus,\c!wijze,\c!blokwijze,\c!scheider,\c!marge,
-      \c!inspringen,\c!springvolgendein,\c!afsluiter,\c!sectienummer,
-      \c!nummer]%
+     [\c!location,\c!headstyle,\c!style,\c!color,\c!headcolor,
+      \c!width,\c!number,\c!distance,\c!command,
+      \c!sample,\c!hang,\c!align,\c!before,\c!inbetween,\c!after,
+      \c!levels,\c!way,\c!blockway,\c!separator,\c!margin,
+      \c!indenting,\c!indentnext,\c!stopper,\c!sectionnumber,
+      \c!number]%
    \doifassignmentelse{#4}
      {\getparameters[\??dd#3#1]%
-        [\c!tekst=#1,\??dd\c!nummer=#1,\c!conversie=,
-         \c!links=,\c!rechts=,\c!koppeling=,\c!koppelwijze=\v!lokaal,#4]}%
+        [\c!text=#1,\??dd\c!number=#1,\c!conversion=,
+         \c!left=,\c!right=,\c!coupling=,\c!couplingway=\v!local,#4]}%
      {\doifelsenothing{#4}
         {\getparameters[\??dd#3#1]%
-           [\c!tekst=#1,\??dd\c!nummer=#1,\c!conversie=,
-            \c!afsluiter=,
-            \c!links=,\c!rechts=,\c!koppeling=,\c!koppelwijze=,#4]}%
+           [\c!text=#1,\??dd\c!number=#1,\c!conversion=,
+            \c!stopper=,
+            \c!left=,\c!right=,\c!coupling=,\c!couplingway=,#4]}%
         {\copyparameters[\??dd#3#1][\??dd#3#4]
-           [\c!plaats,\c!kopletter,\c!letter,\c!kleur,\c!kopkleur,
-            \c!breedte,\c!nummer,\c!afstand,\c!commando,\c!marge,
-            \c!monster,\c!hang,\c!uitlijnen,\c!voor,\c!tussen,\c!na,
-            \c!afsluiter,\c!inspringen,\c!springvolgendein,\c!links,\c!rechts,
-            \c!koppeling,\c!koppelwijze]%
+           [\c!location,\c!headstyle,\c!style,\c!color,\c!headcolor,
+            \c!width,\c!number,\c!distance,\c!command,\c!margin,
+            \c!sample,\c!hang,\c!align,\c!before,\c!inbetween,\c!after,
+            \c!stopper,\c!indenting,\c!indentnext,\c!left,\c!right,
+            \c!coupling,\c!couplingway]%
          \getparameters[\??dd#3#1]
-           [\c!tekst=#1,\??dd\c!nummer=#4,\c!conversie=,#5]}}%
-   \ExpandBothAfter\doif{\getvalue{\??dd#3#1\??dd\c!nummer}}{#1}
-     {\definieernummer
+           [\c!text=#1,\??dd\c!number=#4,\c!conversion=,#5]}}%
+   \ExpandBothAfter\doif{\getvalue{\??dd#3#1\??dd\c!number}}{#1}
+     {\definenumber
         [#3#1]
-        [\c!wijze=\getvalue{\??dd#1\c!wijze},
-         \c!blokwijze=\getvalue{\??dd#1\c!blokwijze},
-         \c!sectienummer=\getvalue{\??dd#1\c!sectienummer}]%
-      \doifvalue{\??dd#1\c!niveaus}{#2}%                           % for
-        {\doifsomething{\getvalue{\??dd#1\c!conversie}}%           % old
-           {\stelnummerin[#3#1]                                    % times
-              [\c!conversie=\getvalue{\??dd#1\c!conversie}]}}}%    % sake
+        [\c!way=\getvalue{\??dd#1\c!way},
+         \c!blockway=\getvalue{\??dd#1\c!blockway},
+         \c!sectionnumber=\getvalue{\??dd#1\c!sectionnumber}]%
+      \doifvalue{\??dd#1\c!levels}{#2}%                           % for
+        {\doifsomething{\getvalue{\??dd#1\c!conversion}}%           % old
+           {\setupnumber[#3#1]                                    % times
+              [\c!conversion=\getvalue{\??dd#1\c!conversion}]}}}%    % sake
    \setvalue{\s!set#3#1}%
      {\dosetdoornummer[#1][#3]}%
    \setvalue{\s!reset#3#1}%
      {\doresetdoornummer[#1][#3]}%
-   \setvalue{\e!volgende#3#1}%
+   \setvalue{\e!next#3#1}%
      {\dotripleempty\dovolgendedoornummer[#1][#3]}}
 
 \def\dovolgendedoornummer[#1][#2]%
-  {\pluscounter{\??dd\c!koppeling#1}% new: global crosslinking
-   \getvalue{\??dd\c!volgende#2\c!nummer}{#1}}%
+  {\pluscounter{\??dd\c!coupling#1}% new: global crosslinking
+   \getvalue{\??dd\c!next#2\c!number}{#1}}%
 
 \def\doresetdoornummer[#1][#2]%
-  {\getvalue{\??dd\s!reset#2\c!nummer}{#1}}%
+  {\getvalue{\??dd\s!reset#2\c!number}{#1}}%
 
 \def\dosetdoornummer[#1][#2]%
-  {\getvalue{\??dd\s!set#2\c!nummer}{#1}}%
+  {\getvalue{\??dd\s!set#2\c!number}{#1}}%
 
-\def\dodoornummeren[#1][#2][#3]%
-  {\dododoornummeren{#1}{1}{}[#2][#3]\showdnnummer
-   \dododoornummeren{#1}{2}{\v!sub}[#2][#3]\showdnsubnummer
-   \dododoornummeren{#1}{3}{\v!sub\v!sub}[#2][#3]\showdnsubsubnummer
-   \dododoornummeren{#1}{4}{\v!sub\v!sub\v!sub}[#2][#3]\showdnsubsubsubnummer}
+\def\dodefineenumeration[#1][#2][#3]%
+  {\dododefineenumeration{#1}{1}{}[#2][#3]\showdnnummer
+   \dododefineenumeration{#1}{2}{\v!sub}[#2][#3]\showdnsubnummer
+   \dododefineenumeration{#1}{3}{\v!sub\v!sub}[#2][#3]\showdnsubsubnummer
+   \dododefineenumeration{#1}{4}{\v!sub\v!sub\v!sub}[#2][#3]\showdnsubsubsubnummer}
 
-\def\doornummeren%
-  {\dotripleemptywithset\dodoornummeren}
+\def\defineenumeration%
+  {\dotripleemptywithset\dodefineenumeration}
 
 %  Het default-mechanisme kan mooier: leegtest, enz.
 %
 %  Werkprocedure buiten definitie
 
-\def\dodosteldoorspringenin[#1][#2]%
+\def\dodosetupindentations[#1][#2]%
   {\getparameters[\??ds#1][#2]}
 
-\def\dosteldoorspringenin[#1][#2]%
+\def\dosetupindentations[#1][#2]%
   {\ConvertToConstant\doifelse{#2}{}
-     {\dodosteldoorspringenin[][#1]}
-     {\dodoubleargumentwithset\dodosteldoorspringenin[#1][#2]}}
+     {\dodosetupindentations[][#1]}
+     {\dodoubleargumentwithset\dodosetupindentations[#1][#2]}}
 
-\def\steldoorspringenin
-  {\dodoubleempty\dosteldoorspringenin}
+\def\setupindentations
+  {\dodoubleempty\dosetupindentations}
 
 \def\startdoorspringen
-  {\witruimte
-   \@@dsvoor
-   \dosomebreak{\goodbreak}% \pagina[\v!voorkeur]
+  {\whitespace
+   \@@dsbefore
+   \dosomebreak{\goodbreak}% \page[\v!preference]
    \begingroup
    \parskip\zeropoint\relax}
 
 \def\stopdoorspringen
   {\endgroup
-   \@@dsna}
+   \@@dsafter}
 
-\def\dododoorspringen#1#2#3%
+\def\dododefineindenting#1#2#3%
   {\par
-   \getvalue{\??ds#1\c!voor}%
+   \getvalue{\??ds#1\c!before}%
    \begingroup
-   \doifvaluenothing{\??ds#1\c!monster}
-     {\setvalue{\??ds#1\c!monster}%
-        {\getvalue{\??ds#1\c!tekst}}}%
+   \doifvaluenothing{\??ds#1\c!sample}
+     {\setvalue{\??ds#1\c!sample}%
+        {\getvalue{\??ds#1\c!text}}}%
    \assignwidth
      {\!!widtha}
-     {\getvalue{\??ds#1\c!breedte}}
+     {\getvalue{\??ds#1\c!width}}
      {\doattributes
-        {\??ds#1}\c!kopletter\c!kopkleur
-        {\getvalue{\??ds#1\c!monster}\getvalue{\??ds#1\c!scheider}}}
-     {\getvalue{\??ds#1\c!afstand}}%
-   \advance\!!widtha \getvalue{\??ds#1\c!afstand}%
+        {\??ds#1}\c!headstyle\c!headcolor
+        {\getvalue{\??ds#1\c!sample}\getvalue{\??ds#1\c!separator}}}
+     {\getvalue{\??ds#1\c!distance}}%
+   \advance\!!widtha \getvalue{\??ds#1\c!distance}%
    \setbox2\hbox to \!!widtha
      {\doattributes
-        {\??ds#1}\c!kopletter\c!kopkleur
+        {\??ds#1}\c!headstyle\c!headcolor
         {\strut
-         \getvalue{\??ds#1\c!tekst}%
+         \getvalue{\??ds#1\c!text}%
          \hss
-         \getvalue{\??ds#1\c!scheider}%
-         \hskip\getvalue{\??ds#1\c!afstand}}}%
+         \getvalue{\??ds#1\c!separator}%
+         \hskip\getvalue{\??ds#1\c!distance}}}%
    \parindent\zeropoint
    \hskip#2\!!widtha\indent\box2%
    \hangindent#3\!!widtha
-   \doattributes{\??ds#1}\c!letter\c!kleur\empty
+   \doattributes{\??ds#1}\c!style\c!color\empty
    \AfterPar% must be redone
      {\endgroup
-      \getvalue{\??ds#1\c!na}}%
+      \getvalue{\??ds#1\c!after}}%
    \GetPar}
 
-\def\dodoorspringen[#1][#2]%
+\def\dodefineindenting[#1][#2]%
   {\copyparameters[\??ds#1][\??ds]
-      [\c!tekst,\c!scheider,\c!breedte,\c!letter,\c!kleur,
-       \c!kopletter,\c!monster,\c!voor,\c!na,\c!afstand]%
+      [\c!text,\c!separator,\c!width,\c!style,\c!color,
+       \c!headstyle,\c!sample,\c!before,\c!after,\c!distance]%
    \getparameters[\??ds#1][#2]%
-   \setvalue{#1}%
-     {\dododoorspringen{#1}{0}{1}}%
-   \setvalue{\v!sub#1}%
-     {\dododoorspringen{#1}{1}{2}}%
-   \setvalue{\v!sub\v!sub#1}%
-     {\dododoorspringen{#1}{2}{3}}}
-
-\def\doorspringen%
-  {\dodoubleargumentwithset\dodoorspringen}
+   \setvalue            {#1}{\dododefineindenting{#1}{0}{1}}%
+   \setvalue      {\v!sub#1}{\dododefineindenting{#1}{1}{2}}%
+   \setvalue{\v!sub\v!sub#1}{\dododefineindenting{#1}{2}{3}}}
+
+\def\defineindenting%
+  {\dodoubleargumentwithset\dodefineindenting}
 
 % \def\dodoorlabel[#1][#2]%
 %   {\getvalue{\s!number#1\c!voor}%
@@ -769,113 +717,113 @@
 %    \getvalue{\s!number#1\c!na}}%
 %
 % \def\dovolgendedoorlabel[#1][#2]%
-%   {\volgendenummer[#1][\s!lab][#2]}
+%   {\nextnumber[#1][\s!lab][#2]}
 %
 % \def\dodoorlabelen[#1][#2]%
-%   {\definieernummer
+%   {\definenumber
 %      [#1][\c!voor=,\c!na=,\c!kopletter=,\c!wijze=\@@nrwijze,#2]%
 %    \setvalue           {#1}{\dodoubleempty\dodoorlabel[#1]}%
 %    \setvalue{\s!reset   #1}{\resetnumber[#1]}%
-%    \setvalue{\e!verhoog #1}{\verhoognummer[#1]}%
+%    \setvalue{\e!verhoog #1}{\incrementnumber[#1]}%
 %    \setvalue{\e!volgende#1}{\dodoubleempty\dovolgendedoorlabel[#1]}%
-%    \setvalue{\c!huidige #1}{\huidigenummer[#1]}}
+%    \setvalue{\c!huidige #1}{\currentnumber[#1]}}
 %
 % \def\doorlabelen%
 %   {\dodoubleargumentwithset\dodoorlabelen}
 
 \def\dodoorlabel[#1][#2]%
-  {\getvalue{\??lb#1\c!voor}%
-   \getvalue{\??lb#1\c!commando}%
-     {\doattributes{\??lb#1}\c!kopletter\c!kopkleur
-        {\dotextprefix{\getvalue{\??lb#1\c!tekst}}%
-         \getvalue{\e!volgende#1}[#2]}}%
-   \getvalue{\??lb#1\c!na}}%
+  {\getvalue{\??lb#1\c!before}%
+   \getvalue{\??lb#1\c!command}%
+     {\doattributes{\??lb#1}\c!headstyle\c!headcolor
+        {\dotextprefix{\getvalue{\??lb#1\c!text}}%
+         \getvalue{\e!next#1}[#2]}}%
+   \getvalue{\??lb#1\c!after}}%
 
 \def\dovolgendedoorlabel[#1][#2]%
-  {\volgendenummer[#1][\s!lab][#2]}
+  {\nextnumber[#1][\s!lab][#2]}
 
-\def\dodoorlabelen[#1][#2]%
+\def\dodefinelabel[#1][#2]%
   {\getparameters
      [\??lb#1]
-     [\c!wijze=\@@nrwijze,\c!commando=,\c!plaats=,#2]%
+     [\c!way=\@@nrway,\c!command=,\c!location=,#2]%
    % downward compatible
    \processaction
-     [\getvalue{\??lb#1\c!plaats}]
-     [  \v!inmarge=>\setvalue{\??lb#1\c!commando}{\inmarge  },
-       \v!inlinker=>\setvalue{\??lb#1\c!commando}{\inlinker },
-      \v!inrechter=>\setvalue{\??lb#1\c!commando}{\inrechter},
-          \v!marge=>\setvalue{\??lb#1\c!commando}{\inmarge  }]%
+     [\getvalue{\??lb#1\c!location}]
+     [  \v!inmargin=>\setvalue{\??lb#1\c!command}{\inmargin},
+       \v!inleft=>\setvalue{\??lb#1\c!command}{\inleft  },
+      \v!inright=>\setvalue{\??lb#1\c!command}{\inright },
+          \v!margin=>\setvalue{\??lb#1\c!command}{\inmargin}]%
    % inefficient, we need to redesign this command
-   \definieernummer
+   \definenumber
      [#1]
-     [\c!wijze=\getvalue{\??lb#1\c!wijze}]%
+     [\c!way=\getvalue{\??lb#1\c!way}]%
    % generated commands
    \setvalue           {#1}{\dodoubleempty\dodoorlabel[#1]}%
    \setvalue{\s!reset   #1}{\resetnumber[#1]}%
-   \setvalue{\e!verhoog #1}{\verhoognummer[#1]}%
-   \setvalue{\e!volgende#1}{\dodoubleempty\dovolgendedoorlabel[#1]}%
-   \setvalue{\c!huidige #1}{\huidigenummer[#1]}}
+   \setvalue{\e!increment #1}{\incrementnumber[#1]}%
+   \setvalue{\e!next#1}{\dodoubleempty\dovolgendedoorlabel[#1]}%
+   \setvalue{\c!current #1}{\currentnumber[#1]}}
 
-\def\doorlabelen
-  {\dodoubleargumentwithset\dodoorlabelen}
+\def\definelabel
+  {\dodoubleargumentwithset\dodefinelabel}
 
-\steldoordefinierenin
-  [\c!plaats=\v!links,
-   \c!kopletter=\v!vet,
-   \c!letter=\v!normaal,
-   \c!kleur=,
-   \c!kopkleur=,
-   \c!breedte=8em,
-   \c!afstand=0pt,
+\setupdescriptions
+  [\c!location=\v!left,
+   \c!headstyle=\v!bold,
+   \c!style=\v!normal,
+   \c!color=,
+   \c!headcolor=,
+   \c!width=8em,
+   \c!distance=0pt,
    \c!hang=,
-   \c!monster=,
-   \c!uitlijnen=,
-   \c!marge=\v!nee,
-   \c!voor=\blanko,
-   \c!tussen=\blanko,
-   \c!na=\blanko,
-   \c!springvolgendein=\v!ja,
-   \c!inspringen=\v!nooit,
-   \c!commando=]
-
-\steldoornummerenin
-  [\c!plaats=\v!boven,
-   \c!kopletter=\v!vet,
-   \c!kopkleur=,
-   \c!letter=\v!normaal,
-   \c!kleur=,
-   \c!breedte=8em,
-   \c!afstand=0pt,
+   \c!sample=,
+   \c!align=,
+   \c!margin=\v!no,
+   \c!before=\blank,
+   \c!inbetween=\blank,
+   \c!after=\blank,
+   \c!indentnext=\v!yes,
+   \c!indenting=\v!never,
+   \c!command=]
+
+\setupenumerations
+  [\c!location=\v!top,
+   \c!headstyle=\v!bold,
+   \c!headcolor=,
+   \c!style=\v!normal,
+   \c!color=,
+   \c!width=8em,
+   \c!distance=0pt,
    \c!hang=,
-   \c!monster=,
-   \c!uitlijnen=,
-   \c!marge=\v!nee,
-   \c!voor=\blanko,
-   \c!tussen=\blanko,
-   \c!na=\blanko,
-   \c!springvolgendein=\v!ja,
-   \c!inspringen=\v!nooit,
-   \c!tekst=,
-   \c!niveaus=3,                % to be upward compatible
-   \c!conversie=,               % to be upward compatible
-   \c!wijze=\v!per\v!tekst,
-   \c!sectienummer=\v!ja,
-   \c!scheider=.,
-   \c!afsluiter=,
-   \c!nummer=,
-   \c!commando=]
-
-\steldoorspringenin
-  [\c!letter=\v!normaal,
-   \c!kopletter=\v!normaal,
-   \c!kleur=,
-   \c!kopkleur=,
-   \c!breedte=\v!passend,
-   \c!tekst=\unknown,
-   \c!monster=,
-   \c!voor=\blanko,
-   \c!na=\blanko,
-   \c!afstand=1em,
-   \c!scheider={ :}]
+   \c!sample=,
+   \c!align=,
+   \c!margin=\v!no,
+   \c!before=\blank,
+   \c!inbetween=\blank,
+   \c!after=\blank,
+   \c!indentnext=\v!yes,
+   \c!indenting=\v!never,
+   \c!text=,
+   \c!levels=3,                % to be upward compatible
+   \c!conversion=,               % to be upward compatible
+   \c!way=\v!by\v!text,
+   \c!sectionnumber=\v!yes,
+   \c!separator=.,
+   \c!stopper=,
+   \c!number=,
+   \c!command=]
+
+\setupindentations
+  [\c!style=\v!normal,
+   \c!headstyle=\v!normal,
+   \c!color=,
+   \c!headcolor=,
+   \c!width=\v!fit,
+   \c!text=\unknown,
+   \c!sample=,
+   \c!before=\blank,
+   \c!after=\blank,
+   \c!distance=1em,
+   \c!separator={ :}]
 
 \protect \endinput
diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex
index d2c303413..1231fe776 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-fig,
+%D   [       filefile=core-fig,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Figure Inclusion,
@@ -181,14 +181,14 @@
 
 %D The next values are set:
 %D
-%D \startopsomming[opelkaar]
+%D \startitemize[packed]
 %D \sym  0  the dimensions are not found
 %D \sym  1  the dimensions are not preset at all
 %D \sym  2  the dimensions are taken from other
 %D \sym  3  the dimensions are taken from figure
 %D \sym  4  the dimensions are taken from texutil.tuf
 %D \sym  5  the dimensions are generated by texutil.tmp
-%D \stopopsomming
+%D \stopitemize
 %D
 %D In our search for the right file, that is, when no
 %D filetype is specified, we scan for the next set of files.
@@ -318,7 +318,7 @@
      \global\setbox\foundexternalfigure\vbox
        {\insidefloattrue
         \forgetall
-        \blanko[\v!blokkeer]% niet meer weg !
+        \blank[\v!disable]% niet meer weg !
         \startreadingfile
         \readfile{#1}\donothing\donothing
         \stopreadingfile
@@ -349,7 +349,7 @@
      \doifdefinedelse{\@@dogetfiguresize\@@efcurrenttype}
        {\executedtrue
         \getvalue{\@@dogetfiguresize\@@efcurrenttype}%
-          \@@efcurrentfile\@@efpagina
+          \@@efcurrentfile\@@efpage
           \!!widtha\!!heighta\!!widthb\!!heightb}
        \executedfalse
      \ifexecuted
@@ -584,38 +584,38 @@
 % bools gebruiken
 
 \def\setnaturalfiguresize
-  {\doifsomething\@@efbreedte
-     {\global\figwid\@@efbreedte}%
-   \doifsomething\@@efhoogte
-     {\global\fighei\@@efhoogte}%
-   \doifsomething\@@efschaal
-     {\figxsca\@@efschaal
-      \figysca\@@efschaal}}
+  {\doifsomething\@@efwidth
+     {\global\figwid\@@efwidth}%
+   \doifsomething\@@efheight
+     {\global\fighei\@@efheight}%
+   \doifsomething\@@efscale
+     {\figxsca\@@efscale
+      \figysca\@@efscale}}
 
 \def\setfactorfiguresize
-  {\doifinsetelse\@@effactor{\v!max,\v!passend,\v!ruim}
+  {\doifinsetelse\@@effactor{\v!max,\v!fit,\v!broad}
      {\doapplyfiguresize
       \ifdim\@@epw>\@@eph\relax
-        \docalculatefigurenorm\figwid\@@effactor\@@efmaxbreedte\hsize\@@efhsize
+        \docalculatefigurenorm\figwid\@@effactor\@@efmaxwidth\hsize\@@efhsize
         \docalculatefigurescales\figwid\@@epw\fighei\@@eph
       \else
-        \docalculatefigurenorm\fighei\@@effactor\@@efmaxhoogte\figurevsize\@@efvsize
+        \docalculatefigurenorm\fighei\@@effactor\@@efmaxheight\figurevsize\@@efvsize
         \docalculatefigurescales\fighei\@@eph\figwid\@@epw
       \fi
       \!!doneatrue}
-     {\doifinsetelse\@@efhfactor{\v!max,\v!passend,\v!ruim}
+     {\doifinsetelse\@@efhfactor{\v!max,\v!fit,\v!broad}
         {\doapplyfiguresize
-         \docalculatefigurenorm\fighei\@@efhfactor\@@efmaxhoogte\figurevsize\@@efvsize
+         \docalculatefigurenorm\fighei\@@efhfactor\@@efmaxheight\figurevsize\@@efvsize
          \docalculatefigurescales\fighei\@@eph\figwid\@@epw
          \!!doneatrue}
-        {\doifinsetelse\@@efbfactor{\v!max,\v!passend,\v!ruim}
+        {\doifinsetelse\@@efwfactor{\v!max,\v!fit,\v!broad}
            {\doapplyfiguresize
-            \docalculatefigurenorm\figwid\@@efbfactor\@@efmaxbreedte\hsize\@@efhsize
+            \docalculatefigurenorm\figwid\@@efwfactor\@@efmaxwidth\hsize\@@efhsize
             \docalculatefigurescales\figwid\@@epw\fighei\@@eph
             \!!doneatrue}                            % max ???
-           {\docalculatefigurenorm\fighei\@@effactor \@@efhoogte \teksthoogte\@@efvsize
-            \docalculatefigurenorm\fighei\@@efhfactor\@@efhoogte \teksthoogte\@@efvsize
-            \docalculatefigurenorm\figwid\@@efbfactor\@@efbreedte\hsize\hsize
+           {\docalculatefigurenorm\fighei\@@effactor \@@efheight \textheight\@@efvsize
+            \docalculatefigurenorm\fighei\@@efhfactor\@@efheight \textheight\@@efvsize
+            \docalculatefigurenorm\figwid\@@efwfactor\@@efwidth\hsize\hsize
             \!!doneafalse}}}%
    \if!!donea
      \ifdim\figwid>\@@efhsize\relax
@@ -628,18 +628,18 @@
    \fi}
 
 \def\setscalefiguresize
-  {\doifsomething\@@efschaal
+  {\doifsomething\@@efscale
      {\doapplyfigurescale\figwid\@@epw\figxsca
       \doapplyfigurescale\fighei\@@eph\figysca
       \global\figwid\zeropoint
       \global\fighei\zeropoint
-      \doifelsenothing\@@efmaxbreedte
-        {\doifsomething\@@efmaxhoogte
-           {\ifdim\@@eph>\@@efmaxhoogte
-              \global\fighei\@@efmaxhoogte
+      \doifelsenothing\@@efmaxwidth
+        {\doifsomething\@@efmaxheight
+           {\ifdim\@@eph>\@@efmaxheight
+              \global\fighei\@@efmaxheight
             \fi}}
-        {\ifdim\@@epw>\@@efmaxbreedte
-           \global\figwid\@@efmaxbreedte
+        {\ifdim\@@epw>\@@efmaxwidth
+           \global\figwid\@@efmaxwidth
          \fi}}}
 
 % \def\dosetdimensionfiguresize#1#2#3%
@@ -653,10 +653,10 @@
 
 \def\dosetdimensionfiguresize#1#2#3%
   {#1\relax
-   \doifsomething\@@efmaxbreedte
-     {\ifdim\figwid>\@@efmaxbreedte\global\figwid\@@efmaxbreedte#2\relax\fi}%
-   \doifsomething\@@efmaxhoogte
-     {\ifdim\fighei>\@@efmaxhoogte \global\fighei\@@efmaxhoogte #3\relax\fi}}
+   \doifsomething\@@efmaxwidth
+     {\ifdim\figwid>\@@efmaxwidth\global\figwid\@@efmaxwidth#2\relax\fi}%
+   \doifsomething\@@efmaxheight
+     {\ifdim\fighei>\@@efmaxheight \global\fighei\@@efmaxheight #3\relax\fi}}
 
 \def\setdimensionfiguresize
   {\ifdim\figwid>\zeropoint\relax
@@ -696,14 +696,14 @@
   {\getparameters[\??ex][#1]%
    \getparameters[\??ef][#1]% dangerous for figs with backgrounds
    \checkfiguresettings
-   \doifelsenothing\@@explaats % fig file paths
+   \doifelsenothing\@@exlocation % fig file paths
      {\scratchcounter\plusthree}
      {\doifelsenothing\@@exfile % tuf file paths
         {\scratchcounter\plusthree}
         {\scratchcounter\zerocount
-         \ExpandBothAfter\doifinset\v!lokaal\@@explaats
+         \ExpandBothAfter\doifinset\v!local\@@exlocation
            {\advance\scratchcounter\plusone}%
-         \ExpandBothAfter\doifinset\v!globaal\@@explaats
+         \ExpandBothAfter\doifinset\v!global\@@exlocation
            {\advance\scratchcounter\plustwo}}}%
    \chardef\figurefilemode\scratchcounter\relax
    \ifcase\figurefilemode
@@ -711,11 +711,11 @@
    \or % lokaal
      \let\figurepathlist\f!currentpath
    \or % globaal
-     \let\figurepathlist\@@exgebied
+     \let\figurepathlist\@@exdirectory
    \or % lokaal,globaal / non empty gebied
-     \edef\figurepathlist{\f!currentpath\ifx\@@exgebied\empty\else,\fi\@@exgebied}%
+     \edef\figurepathlist{\f!currentpath\ifx\@@exdirectory\empty\else,\fi\@@exdirectory}%
    \fi
-   \ExpandBothAfter\doifinset\v!default\@@explaats
+   \ExpandBothAfter\doifinset\v!default\@@exlocation
      {\edef\figurepathlist{\figurepathlist,}}% default tex path search
    \ifx\@@exfile\empty
      \chardef\figurefilemode\zerocount
@@ -725,32 +725,32 @@
 
 \def\resetexternalfigures
   {\setupexternalfigures
-     [\c!optie=,\c!maxbreedte=,\c!maxhoogte=,
-     %\c!splitskleur=,% needed ?
-      \c!voorgrondkleur=,
-      \c!kader=\v!uit,\c!achtergrond=]}
+     [\c!option=,\c!maxwidth=,\c!maxheight=,
+     %\c!splitcolor=,% needed ?
+      \c!foregroundcolor=,
+      \c!frame=\v!off,\c!background=]}
 
 %D Since we only need to reset some parameters, we can
 %D better use a faster alternative:
 
 \def\resetexternalfigures
   {\getparameters[\??ef]
-     [\c!optie=,\c!maxbreedte=,\c!maxhoogte=,
-     %\c!splitskleur=,% needed ?
-      \c!voorgrondkleur=,
-      \c!kader=\v!uit,\c!achtergrond=]}
+     [\c!option=,\c!maxwidth=,\c!maxheight=,
+     %\c!splitcolor=,% needed ?
+      \c!foregroundcolor=,
+      \c!frame=\v!off,\c!background=]}
 
 %D This one dropped the runtime of the \MAPS\ bibliography
 %D from over 110 seconds down to less than 105 seconds. The
 %D tremendously faster (but uglier) implementation is:
 
 \def\resetexternalfigures
-  {\let\@@efoptie         \empty
-   \let\@@efmaxbreedte    \empty
-   \let\@@efmaxhoogte     \empty
-   \let\@@efkader         \v!uit
-   \let\@@efvoorgrondkleur\empty
-   \let\@@efachtergrond   \empty}
+  {\let\@@efoption         \empty
+   \let\@@efmaxwidth    \empty
+   \let\@@efmaxheight     \empty
+   \let\@@efframe         \v!off
+   \let\@@efforegroundcolor\empty
+   \let\@@efbackground   \empty}
 
 % The following code will move:
 
@@ -763,11 +763,11 @@
   {\processaction
       [#2]
       [     \v!max=>\global#1=#4\relax,
-        \v!passend=>\global#1=#5\relax,
-           \v!ruim=>\global#1=#5\relax
-                    \global\advance #1 -4\@@exkorps\relax,
+        \v!fit=>\global#1=#5\relax,
+           \v!broad=>\global#1=#5\relax
+                    \global\advance #1 -4\@@exbodyfont\relax,
         \s!default=>\doifsomething{#3}{\global#1=#3\relax},
-        \s!unknown=>\global#1=\@@exkorps\relax
+        \s!unknown=>\global#1=\@@exbodyfont\relax
                     \global\divide#1 \!!ten\relax
                     \global\multiply#1 #2\relax]}
 
@@ -794,10 +794,10 @@
 
   \def\doapplyfigurescale#1#2#3%
     {\global#1=#2\relax
-     \ifcase0\@@efschaal\relax % beter: doifnum...
+     \ifcase0\@@efscale\relax % beter: doifnum...
        #3=\plusthousand
      \else
-       #3=\@@efschaal
+       #3=\@@efscale
      \fi\relax % important !
      \ifnum#3=\plusthousand\else
        \global\divide  #1 \plusthousand
@@ -820,11 +820,11 @@
     {#3\dimexpr(#1/\dimexpr(#2/\plusthousand))}
 
   \def\doapplyfigurescale#1#2#3%
-    {% #3=\ifnum0\number\@@efschaal=\zerocount\plusthousand\else\@@efschaal\fi
-     \ifcase0\@@efschaal\relax % @@efschaal kan empty zijn
+    {% #3=\ifnum0\number\@@efscale=\zerocount\plusthousand\else\@@efscale\fi
+     \ifcase0\@@efscale\relax % @@efschaal kan empty zijn
        #3=\plusthousand
      \else
-       #3=\@@efschaal
+       #3=\@@efscale
      \fi\relax % important !
      \global#1\ifnum#3=\plusthousand#2\else\dimexpr(#3\dimexpr(#2/\plusthousand))\fi
      \relax}
@@ -834,36 +834,36 @@
 \newdimen\figurevsize % we cannot manipulate any global vsize !
 
 \def\doapplyfiguresize
-  {\doifelsenothing\@@efmaxhoogte
-     {\figurevsize\teksthoogte
+  {\doifelsenothing\@@efmaxheight
+     {\figurevsize\textheight
       \ifinner
-        \figurevsize \vsize % \teksthoogte =\vsize
-        \scratchdimen\vsize % \scratchdimen=\teksthoogte
+        \figurevsize \vsize % \textheight =\vsize
+        \scratchdimen\vsize % \scratchdimen=\textheight
       \else\ifinsidefloat
-        \figurevsize \vsize % \teksthoogte =\vsize
-        \scratchdimen\vsize % \scratchdimen=\teksthoogte
+        \figurevsize \vsize % \textheight =\vsize
+        \scratchdimen\vsize % \scratchdimen=\textheight
       \else\ifinpagebody
-        \figurevsize \vsize % \teksthoogte =\vsize
-        \scratchdimen\vsize % \scratchdimen=\teksthoogte
+        \figurevsize \vsize % \textheight =\vsize
+        \scratchdimen\vsize % \scratchdimen=\textheight
       \else % hm, there should be an option to force this
         \ifdim\pagegoal<\maxdimen
           \ifdim\pagetotal<\pagegoal
             \scratchdimen\pagegoal
             \advance\scratchdimen -\pagetotal
           \else
-            \scratchdimen\figurevsize % \teksthoogte
+            \scratchdimen\figurevsize % \textheight
           \fi
         \else
-          \scratchdimen\figurevsize % \teksthoogte
+          \scratchdimen\figurevsize % \textheight
         \fi
       \fi\fi\fi}
-     {\figurevsize\@@efmaxhoogte}%
-   \doifelsenothing\@@efhoogte
+     {\figurevsize\@@efmaxheight}%
+   \doifelsenothing\@@efheight
      {\edef\@@efvsize{\the\scratchdimen}}
-     {\let\@@efvsize\@@efhoogte}%
-   \doifelsenothing\@@efbreedte
+     {\let\@@efvsize\@@efheight}%
+   \doifelsenothing\@@efwidth
      {\edef\@@efhsize{\the\hsize}}
-     {\let\@@efhsize\@@efbreedte}}
+     {\let\@@efhsize\@@efwidth}}
 
 % \def\convertfigureinsertscale#1#2#3#4%
 %   {\scratchdimen#1\relax
@@ -905,13 +905,13 @@
 \def\presetundefinedfigure#1%
   {\let\@@eftype      #1%
    \let\@@efextension #1%
-   \let\@@efobject    \v!nee
-   \let\@@efpreset    \v!nee
-   \ifx\@@efbreedte\empty
-     \def\@@efbreedte{8\lineheight}% 4cm
+   \let\@@efobject    \v!no
+   \let\@@efpreset    \v!no
+   \ifx\@@efwidth\empty
+     \def\@@efwidth{8\lineheight}% 4cm
    \fi
-   \ifx\@@efhoogte\empty
-     \def\@@efhoogte{6\lineheight}%  3cm
+   \ifx\@@efheight\empty
+     \def\@@efheight{6\lineheight}%  3cm
    \fi}
 
 \def\presetfiguremov{\presetundefinedfigure\c!mov}
@@ -941,9 +941,9 @@
 %  need to patch texutil.
 
 \def\checkfiguresettings
-  {\doifsomething\@@efregels
-     {\scratchdimen\@@efregels\lineheight
-      \edef\@@efhoogte{\the\scratchdimen}}}
+  {\doifsomething\@@eflines
+     {\scratchdimen\@@eflines\lineheight
+      \edef\@@efheight{\the\scratchdimen}}}
 
 \chardef\splitexternalfigure=0 % 0 nosplit 1 split/yes 2 split/no
 
@@ -954,7 +954,7 @@
 % this whole mess needs a clean up anyway
 
 \def\calculateexternalfigure[#1][#2][#3][#4][#5][#6]%
-  {\mindermeldingen
+  {\dontcomplain
    \setupexternalfigures
    \the\externalfigureresets % hook, see resource libraries
    \global\figwid\zeropoint \figxsca\plusone % see note *
@@ -986,44 +986,44 @@
       \c!t=,\c!s=,\c!a=,\c!f=\@@effilename]%
    \getparameters
      [\??ef]
-     [\c!type=\s!unknown,\c!methode=\@@eftype,\c!symbool=\v!nee,
-      \c!object=\@@exobject,\c!preset=\v!ja,\c!splitsen=,\c!formaat=,
-      \c!pagina=0,\c!sturing=\v!nee,\c!preview=\v!nee,\c!herhaal=\v!nee,
-      \c!maxbreedte=\@@exmaxbreedte,\c!maxhoogte=\@@exmaxhoogte,
-      \c!schaal=,\c!breedte=,\c!hoogte=,\c!scherm=,\c!regels=,\c!grid=,
-     %\c!voorgrondkleur=,
-      \c!factor=,\c!hfactor=,\c!bfactor=]%
+     [\c!type=\s!unknown,\c!method=\@@eftype,\c!symbol=\v!no,
+      \c!object=\@@exobject,\c!preset=\v!yes,\c!split=,\c!size=,
+      \c!page=0,\c!controls=\v!no,\c!preview=\v!no,\c!repeat=\v!no,
+      \c!maxwidth=\@@exmaxwidth,\c!maxheight=\@@exmaxheight,
+      \c!scale=,\c!width=,\c!height=,\c!display=,\c!lines=,\c!grid=,
+     %\c!foregroundcolor=,
+      \c!factor=,\c!hfactor=,\c!wfactor=]%
    \doif\@@efextension\c!mov\presetfiguremov
    \doif\@@efextension\c!avi\presetfigureavi
    #1[#4][#5][#6]%
    % lines -> height
    \checkfiguresettings
    % new
-   \doifinsetelse\@@efformaat{mediabox,cropbox,artbox,bleedbox,trimbox}
-     {\let\@@DriverImageBox\@@efformaat}%
+   \doifinsetelse\@@efsize{mediabox,cropbox,artbox,bleedbox,trimbox}
+     {\let\@@DriverImageBox\@@efsize}%
      {\let\@@DriverImageBox\empty}%
    % new, color separation
    \doifseparatingcolorselse
-     {\let\@@efvoorgrondkleur\empty
-      \doifelsenothing\@@efsplitsen
+     {\let\@@efforegroundcolor\empty
+      \doifelsenothing\@@efsplit
         {\chardef\splitexternalfigure0}
-        {\doifcolorchannelelse\@@efsplitsen
-           {\let\@@efobject\v!nee % ?
+        {\doifcolorchannelelse\@@efsplit
+           {\let\@@efobject\v!no % ?
             \chardef\splitexternalfigure1}
            {\chardef\splitexternalfigure2}}}
      {\chardef\splitexternalfigure0}%
    \relax % ends \chardef
    % new, fake color in gray bitmaps
-   \doifsomething\@@efvoorgrondkleur
+   \doifsomething\@@efforegroundcolor
      {\getparameters[\??ef]
-        [\c!achtergrond={\v!voorgrond,\v!kleur},
-         \c!achtergrondkleur=\@@efvoorgrondkleur]}%
+        [\c!background={\v!foreground,\v!color},
+         \c!backgroundcolor=\@@efforegroundcolor]}%
    %
-   \doif\@@efreset\v!ja \resetexternalfigures
+   \doif\@@efreset\v!yes \resetexternalfigures
    \doif\@@eftype \c!mov\presetfiguremov
    \doif\@@eftype \c!avi\presetfigureavi
    % hack
-   \doif\@@efmethode\c!mov
+   \doif\@@efmethod\c!mov
      {\doifsomething\@@efextension{\presetundefinedfigure\@@efextension}}%
    %
    \doif\@@eftype\v!buffer
@@ -1046,10 +1046,10 @@
      % Since tex code can have positional stuff and worse,
      % we want to avoid interference with how objects end
      % up in files, therefore:
-     \let\@@efobject\v!nee
+     \let\@@efobject\v!no
    \fi
-   \edef\@@efobjectname{\@@effilename-\@@eftype-\@@efextension-\@@efpagina}%
-   \doifelse\@@efobject\v!nee
+   \edef\@@efobjectname{\@@effilename-\@@eftype-\@@efextension-\@@efpage}%
+   \doifelse\@@efobject\v!no
      \donefalse
      {\doifspecialavailableelse\dostartscaling
         {\doifobjectssupportedelse
@@ -1095,7 +1095,7 @@
           \edef\@@effullname{\@@effilename.\@@efextension}%
           \def\figureextension##1{\@@efextension}%
         \fi}%
-     \doifelse\@@efpreset\v!nee
+     \doifelse\@@efpreset\v!no
        {\doifelse\@@eftype\s!unknown
           {\chardef\figurestatus0
            \let\@@eftype\figuretypes
@@ -1122,12 +1122,12 @@
      \edef\@@efextension{\figureextension{\@@eftype}}% dirty trick
      \global\figwid\zeropoint \figxsca\plusone
      \global\fighei\zeropoint \figysca\plusone
-     \doif\v!kader\@@exoptie
-       {\let\@@efkader\v!aan}%
+     \doif\v!frame\@@exoption
+       {\let\@@efframe\v!on}%
    \fi
    \ifcase\figurestatus
-     \let\@@efkader\v!aan
-     \let\@@efobject\v!nee
+     \let\@@efframe\v!on
+     \let\@@efobject\v!no
      \showmessage\m!figures1{\@@effilename}%
    \or
      \showmessage\m!figures2{\@@effullname}%
@@ -1138,7 +1138,7 @@
    \or
      \showmessage\m!figures5{\@@effullname,\@@efloadname}%
    \or % no message
-     \doifnot\@@efsymbool\v!ja
+     \doifnot\@@efsymbol\v!yes
        {\showmessage\m!figures8{\@@effullname}}%
    \fi
    \ifdim\@@epw=\zeropoint \chardef\figurestatus1 \fi
@@ -1148,7 +1148,7 @@
      \setnaturalfiguresize
      \xdef\naturalfigurewidth{\the\figwid}%
      \xdef\naturalfigureheight{\the\fighei}%
-     \let\@@efkader\v!uit
+     \let\@@efframe\v!off
    \else
      \global\let\naturalfigurewidth\@@epw
      \global\let\naturalfigureheight\@@eph
@@ -1157,26 +1157,26 @@
      \setdimensionfiguresize
      \processaction
        [\@@efgrid]
-       [   \v!ja=>\getnoflines\fighei
-                  \edef\@@efhoogte{\the\noflines\lineheight}%
+       [   \v!yes=>\getnoflines\fighei
+                  \edef\@@efheight{\the\noflines\lineheight}%
                   \global\gridfiguretrue,
-       \v!hoogte=>\getrawnoflines\fighei
+       \v!height=>\getrawnoflines\fighei
                   \scratchdimen\noflines\lineheight
                   \advance\scratchdimen\strutdepth
-                  \edef\@@efhoogte{\the\scratchdimen}%
+                  \edef\@@efheight{\the\scratchdimen}%
                   \global\gridfiguretrue,
-       \v!diepte=>\getrawnoflines\fighei
+       \v!depth=>\getrawnoflines\fighei
                   \scratchdimen\noflines\lineheight
                   \advance\scratchdimen-\strutdepth
-                  \edef\@@efhoogte{\the\scratchdimen}%
+                  \edef\@@efheight{\the\scratchdimen}%
                   \global\gridfiguretrue,
-   \v!halveregel=>\getrawnoflines\fighei
+   \v!halfline=>\getrawnoflines\fighei
                   \scratchdimen\noflines\lineheight
                   \advance\scratchdimen+.5\lineheight
-                  \edef\@@efhoogte{\the\scratchdimen}%
+                  \edef\@@efheight{\the\scratchdimen}%
                   \global\gridfiguretrue,
-      \v!passend=>\getrawnoflines\fighei
-                  \edef\@@efhoogte{\the\noflines\lineheight}%
+      \v!fit=>\getrawnoflines\fighei
+                  \edef\@@efheight{\the\noflines\lineheight}%
                   \global\gridfiguretrue]%
      \ifgridfigure
        \setfactorfiguresize
@@ -1190,29 +1190,29 @@
      \message
        {\externalfigurelog
           [\@@effullname:
-           t={\@@eftype}\space m={\@@efmethode}\space l=\@@eflabel\space
+           t={\@@eftype}\space m={\@@efmethod}\space l=\@@eflabel\space
            w=\number\figwid\space h=\number\fighei\space
            \c!sx=\scax\space\c!sy=\scay\space
            ox=\figx\space oy=\figy]}%
    \fi
-   \doif\v!leeg\@@exoptie
+   \doif\v!empty\@@exoption
      {\skipexternalfigurestrue
-      \let\@@efkader\v!uit}% ? ?
-   \doifelsenothing\@@efpagina % NIEUW ??
+      \let\@@efframe\v!off}% ? ?
+   \doifelsenothing\@@efpage % NIEUW ??
      {\let\@@efoptions\empty}
-     {\let\@@efoptions\@@efpagina}%
-   \doif\@@efpreview\v!ja{\addtocommalist\v!preview\@@efoptions}%
-   \doif\@@efsturing\v!ja{\addtocommalist\v!sturing\@@efoptions}%
-   \doif\@@efherhaal\v!ja{\addtocommalist\v!herhaal\@@efoptions}%
+     {\let\@@efoptions\@@efpage}%
+   \doif\@@efpreview\v!yes{\addtocommalist\v!preview\@@efoptions}%
+   \doif\@@efcontrols\v!yes{\addtocommalist\v!controls\@@efoptions}%
+   \doif\@@efrepeat\v!yes{\addtocommalist\v!repeat\@@efoptions}%
    \doif\@@eftype\c!mps
      {\ifcase\EPSspecial\else\ifinobject\else
         \@@eftrace{special mps, object forced}%
         \doglobal\increment\forcedMPSobject
         \edef\@@efobjectname{\c!mps::\forcedMPSobject}%
-        \let\@@efobject\v!ja
+        \let\@@efobject\v!yes
       \fi\fi}%
    \global\let\lastfigureobjectname\@@efobjectname
-   \doifelse\@@efobject\v!nee
+   \doifelse\@@efobject\v!no
      \donefalse
      {\doifobjectssupportedelse\donetrue\donefalse}%
    % this (for the moment) conveniently maps onto pdf which saves mapping
@@ -1232,12 +1232,12 @@
           {\vfill
            \ifdim\wd\foundexternalfigure=\zeropoint
              \doinsertfile
-               {\@@eftype,\@@efmethode}{\@@effullname,\@@eflabel}
+               {\@@eftype,\@@efmethod}{\@@effullname,\@@eflabel}
                {100}{100}\@@epx\@@epy\@@epw\@@eph\@@efoptions
            \else\ifskipexternalfigures
              \ruledhbox
                {\backgroundline
-                  [\@@efsplitskleur]{\fakebox\foundexternalfigure}}%
+                  [\@@efsplitcolor]{\fakebox\foundexternalfigure}}%
            \else
              \box\foundexternalfigure
            \fi\fi}%
@@ -1256,13 +1256,13 @@
         \edef\scax{\withoutpt\the\scratchdimen}%
         \scratchdimen\scay\points\divide\scratchdimen \plushundred
         \edef\scay{\withoutpt\the\scratchdimen}%
-       %\schaal[\c!sx=\scax,\c!sy=\scay]{\dowithfigure{\getobject{FIG}{\@@efobjectname}}}%
+       %\scale[\c!sx=\scax,\c!sy=\scay]{\dowithfigure{\getobject{FIG}{\@@efobjectname}}}%
         \doscalenextbox\scax\scay\figwid\fighei{\dowithfigure{\getobject{FIG}{\@@efobjectname}}}%
         \xdef\noffigurepages{\number\getvalue{\@@efobjectname\c!n}}%
       \else\ifdim\wd\foundexternalfigure=\zeropoint
         \dowithfigure
           {\doinsertfile
-             {\@@eftype,\@@efmethode}{\@@effullname,\@@eflabel}
+             {\@@eftype,\@@efmethod}{\@@effullname,\@@eflabel}
              \scax\scay\figx\figy\figwid\fighei\@@efoptions}%
         \xdef\noffigurepages{\number\nofinsertpages}%
       \else
@@ -1270,7 +1270,7 @@
         \edef\scax{\withoutpt\the\scratchdimen}%
         \scratchdimen\scay\points\divide\scratchdimen \plushundred
         \edef\scay{\withoutpt\the\scratchdimen}%
-       %\schaal[\c!sx=\scax,\c!sy=\scay]{\dowithfigure{\box\foundexternalfigure}}%
+       %\scale[\c!sx=\scax,\c!sy=\scay]{\dowithfigure{\box\foundexternalfigure}}%
         \doscalenextbox\scax\scay\figwid\fighei{\dowithfigure{\box\foundexternalfigure}}%
         \xdef\noffigurepages{\number\nofinsertpages}%
       \fi\fi
@@ -1310,14 +1310,14 @@
    \xdef\figurelabel   {#1}%
    \xdef\figurefilename{#2}%
    \xdef\figurefiletype{\@@eftype}%
-   \xdef\figurefilepage{\@@efpagina}%
+   \xdef\figurefilepage{\@@efpage}%
    \global\setbox\foundexternalfigure\vbox
      {\forgetall
       \ifcase\figurestatus
-        \resetsystemmode\v!figuur
+        \resetsystemmode\v!figure
         \let\figurefiletype\empty
       \else
-        \setsystemmode  \v!figuur % beter resource
+        \setsystemmode  \v!figure % beter resource
       \fi
       \ifconditional\externalfigurelevel % probably background
         \ifskipexternalfigures
@@ -1337,11 +1337,11 @@
         \else\ifcase\figurestatus
           \externalfigurereplacement{#1}{#2}{unknown}%
         \else\ifnum\splitexternalfigure=2
-          \backgroundline[\@@efsplitskleur]
+          \backgroundline[\@@efsplitcolor]
             {\fakebox\foundexternalfigure}%
         \else
           \the\externalfigurepostprocessors
-          \doifelse\@@efreset\v!ja
+          \doifelse\@@efreset\v!yes
             {\ht\foundexternalfigure\figureheight
              \dp\foundexternalfigure\zeropoint
              \wd\foundexternalfigure\figurewidth
@@ -1349,13 +1349,13 @@
             {\localframed % should also be applied to high res !
                [\??ef]
                [\c!offset=\v!overlay,
-                \c!breedte=\figurewidth,
-                \c!hoogte=\figureheight]
+                \c!width=\figurewidth,
+                \c!height=\figureheight]
                {\vfilll
                 \ifnum\splitexternalfigure=1
                   % hm, eigenlijk in dit geval achtergrondkleur
                   \hidesplitcolorfalse % really needed
-                  \backgroundline[\@@efsplitskleur]
+                  \backgroundline[\@@efsplitcolor]
                     {\box\foundexternalfigure}%
                 \else % = 0, no split mode
                   \box\foundexternalfigure
@@ -1371,16 +1371,16 @@
 
 \def\externalfigurereplacement#1#2#3%
   {\setupcolors
-     [\c!status=\v!lokaal]%
+     [\c!state=\v!local]%
    \expanded{\localframed
      [\??ef]
-     [\c!breedte=\figurewidth,
-      \c!hoogte=\figureheight,
-      \c!achtergrond=\v!raster,
-      \c!achtergrondraster=.8,
-     %\c!kader=\ifincolor\v!uit\else\v!aan\fi]
-     %\c!kader=\ifincolor\@@efkader\else\v!aan\fi]}%
-      \c!kader=\@@efkader]}%
+     [\c!width=\figurewidth,
+      \c!height=\figureheight,
+      \c!background=\v!screen,
+      \c!backgroundscreen=.8,
+     %\c!frame=\ifincolor\v!off\else\v!on\fi]
+     %\c!frame=\ifincolor\@@efframe\else\v!on\fi]}%
+      \c!frame=\@@efframe]}%
      {\tt\tfxx \nohyphens
         name:  \expanded{\verbatimstring{#1}}\\%
         file:  \expanded{\verbatimstring{#2}}\\%
@@ -1401,7 +1401,7 @@
 \def\appliedfigureshortname {\@@efcurrentpath/\@@effilename}
 \def\appliedfigurefullname  {\@@efcurrentfile}
 \def\appliedfigureidentifier{\@@efobjectname}
-\def\appliedfigureoptions   {\@@efoptie}
+\def\appliedfigureoptions   {\@@efoption}
 
 %D In \PDF\ one can specify an alternative graphic. This means
 %D that for instance a low resolution graphic can be used for
@@ -1420,15 +1420,15 @@
 %D The next macro does not work well with figure bases yet.
 
 \def\calculateexternalscreenfigure[#1][#2][#3][#4][#5][#6]%
-  {\ifx\@@efscherm\empty\else
-     \doifnot\@@efobject\v!nee
+  {\ifx\@@efdisplay\empty\else
+     \doifnot\@@efobject\v!no
        {\doifobjectssupportedelse
           {\doifspecialavailableelse\doregisterfigure
              {\bgroup
               #1[#4][#5][#6]%
               \doregisterfigure{FIG}{\lastfigureobjectname}%
-              \let\@@ef@@scherm\@@efscherm
-              \calculateexternalfigure[#1][\@@ef@@scherm][\@@ef@@scherm][#4,\c!scherm=][#5][#6]%
+              \let\@@ef@@scherm\@@efdisplay
+              \calculateexternalfigure[#1][\@@ef@@scherm][\@@ef@@scherm][#4,\c!display=][#5][#6]%
               \egroup}
              {}}
           {}}%
@@ -1448,7 +1448,7 @@
 
 \def\dogetfiguredimensions[#1][#2]%
   {{\let\immediate\relax % very dirty but prevents flushing, will change
-    \setbox0\hbox{\externalfigure[#1][#2,\c!scherm=,\c!object=\v!nee]}}}
+    \setbox0\hbox{\externalfigure[#1][#2,\c!display=,\c!object=\v!no]}}}
 
 % use the next one when the object must be forgotten (xobj
 % nums can migrate to the next object; maybe it should
@@ -1471,9 +1471,11 @@
 \def\dodoplaceexternalfigure[#1][#2][#3][#4][#5][#6]%
   {\doifsomething{#3}% catches \defineexternalfigure dummies
      {\bgroup
-      \def\textunderscore{_}% brrr, temp hack
+\pushmacro\textunderscore
+      \edef\textunderscore{\string_}% brrr, temp hack, still needed?
       \calculateexternalfigure[#1][#2][#3][#4][#5][#6]%
       \calculateexternalscreenfigure[#1][#2][#3][#4][#5][#6]%
+\popmacro\textunderscore
       \box\foundexternalfigure
       \egroup}}
 
@@ -1548,7 +1550,7 @@
 \def\doexternalfigure[#1][#2][#3]%
   {\bgroup
    \doifelsenothing{#1}
-     {\framed[\c!breedte=8\lineheight,\c!hoogte=6\lineheight]{external\\figure}}
+     {\framed[\c!width=8\lineheight,\c!height=6\lineheight]{external\\figure}}
      {\doifundefinedelse{\??ef\??ef#1}
         {\useexternalfigure[\s!dummy][#1][#2][#3]%
          \getexternalfigure{\s!dummy}[#3]}
@@ -1568,16 +1570,16 @@
 
 \def\showexternalfigurea
   {\bgroup
-   \mindermeldingen
+   \dontcomplain
    \def\presetfigure[##1][##2]%
-     {\getvalue{\e!start\v!figuur\e!tekst}[\v!links][]
-        {\v!geen}
+     {\getvalue{\e!start\v!figure\e!text}[\v!left][]
+        {\v!none}
         {\hbox
-           {\externalfigure[##1][\c!kader=\v!aan,\c!breedte=6cm][##2]%
+           {\externalfigure[##1][\c!frame=\v!on,\c!width=6cm][##2]%
             \tfskip
-            \framed[\c!breedte=\figurewidth,\c!hoogte=\figureheight]{}}}%
+            \framed[\c!width=\figurewidth,\c!height=\figureheight]{}}}%
         {\tt\tfa\expanded{\asciistr{##1}}}%
-        \blanko
+        \blank
         \tfx
         \def\docommando####1%
           {\beforesplitstring####1\at=\to\asciia
@@ -1588,7 +1590,7 @@
         \processcommalist[##2]\docommando
         \strut
         \endgraf
-      \getvalue{\e!stop\v!figuur\e!tekst}}%
+      \getvalue{\e!stop\v!figure\e!text}}%
    \pushendofline
    \readjobfile\@@exfile\donothing\donothing
    \popendofline
@@ -1599,7 +1601,7 @@
    \def\total{5}%
    \globalletempty\allfigures
    \doglobal\newcounter\figurecounter
-   \mindermeldingen
+   \dontcomplain
    \def\docommando##1{##1&}%
    \def\figurecaptions%
      {\crcr
@@ -1614,7 +1616,7 @@
          \advance\hsize -1em
          \externalfigure
            [##1]
-           [\c!kader=\v!aan,\c!factor=\v!max,\c!breedte=\hsize][##2]}%
+           [\c!frame=\v!on,\c!factor=\v!max,\c!width=\hsize][##2]}%
       \doglobal\addtocommalist{##1}\allfigures
      %\getvalue{\s!figurepreset}%
       \doglobal\increment\figurecounter
@@ -1677,16 +1679,16 @@
 
 \def\doshowexternalfigures[#1]%
   {\bgroup
-   \setupcolors[\c!status=\v!start]% to prevent mps color conversion
-   \getparameters[\??ex][\c!variant=a,\c!offset=\!!zeropoint,#1]%
-   \getvalue{showexternalfigure\@@exvariant}%
+   \setupcolors[\c!state=\v!start]% to prevent mps color conversion
+   \getparameters[\??ex][\c!alternative=a,\c!offset=\!!zeropoint,#1]%
+   \getvalue{showexternalfigure\@@exalternative}%
    \egroup}
 
 \def\showexternalfigures
   {\dosingleempty\doshowexternalfigures}
 
 \def\overlayfigure#1%
-  {\externalfigure[#1][\c!breedte=\overlaywidth,\c!hoogte=\overlayheight]}
+  {\externalfigure[#1][\c!width=\overlaywidth,\c!height=\overlayheight]}
 
 %D Still undocumented!
 
@@ -1715,10 +1717,10 @@
      {\position(#2,#3)%
         {\setnostrut
          \framed
-           [\c!breedte=#5\efxsteps,
-            \c!hoogte=#6\exysteps,
-            \c!offset=\v!geen,
-            \c!kader=#1,
+           [\c!width=#5\efxsteps,
+            \c!height=#6\exysteps,
+            \c!offset=\v!none,
+            \c!frame=#1,
             ##1]%
            {##2}}}%
    \complexorsimpleempty\efdocomment}
@@ -1729,10 +1731,10 @@
 
 \def\efdomarker(#1,#2)#3#4%    (h,b){kader}{tekst}
   {\framed
-     [\c!breedte=#1\efxsteps,
-      \c!hoogte=#2\efysteps,
-      \c!offset=\v!geen,
-      \c!kader=#3]%
+     [\c!width=#1\efxsteps,
+      \c!height=#2\efysteps,
+      \c!offset=\v!none,
+      \c!frame=#3]%
      {#4}}
 
 \def\effigure#1%
@@ -1742,16 +1744,16 @@
   {\bgroup
    \setnostrut
    \framed
-     [\c!breedte=#1\efxsteps,
-      \c!hoogte=#2\efysteps,
+     [\c!width=#1\efxsteps,
+      \c!height=#2\efysteps,
       \c!offset=\!!zeropoint,
-      \c!kader=#3]
+      \c!frame=#3]
      {#4}%
    \egroup}
 
 \def\efgoto(#1,#2)#3[#4]%    (h,b)kader[ref]
   {\setbox0=\vbox{\efdoarea(#1,#2)#3{}}%
-   \naarbox{\copy0}[#4]}
+   \gotobox{\copy0}[#4]}
 
 \def\efmark(#1,#2)#3(#4,#5)#6[#7]%
   {\advance\efreference \plusone
@@ -1759,7 +1761,7 @@
      {\hbox{\the\efreference}}%
    \position(#1,#2)
      {\gotosomeinternal\s!vwb{#7}\realfolio
-        {\efdomarker(#4,#5)\v!aan{\thisissomeinternal\s!vwa{#7}}}}}
+        {\efdomarker(#4,#5)\v!on{\thisissomeinternal\s!vwa{#7}}}}}
 
 \def\eftext#1(#2,#3)#4(#5,#6)#7[#8]%
   {\advance\efreference \plusone
@@ -1780,14 +1782,14 @@
   {\def\docommando##1%
      {\color[##1]
         {\blackrule
-           [\c!breedte=2em,
-            \c!hoogte=1ex,
-            \c!diepte=\!!zeropoint]}%
+           [\c!width=2em,
+            \c!height=1ex,
+            \c!depth=\!!zeropoint]}%
       \endgraf}%
-   \global\setbox\colorbarbox=\vbox
+   \global\setbox\colorbarbox\vbox
      {\forgetall
       \processcommalist[#1]\docommando}%
-   \global\setbox\colorbarbox=\vbox
+   \global\setbox\colorbarbox\vbox
      {\hskip2em\box\colorbarbox}%
    \global\wd\colorbarbox\zeropoint}
 
@@ -1800,10 +1802,10 @@
       \startpositioning
         \def\referring(##1,##2)##3(##4,##5)##6[##7]%
           {\position(##1,##2)
-             {\efgoto(##4,##5){\@@exhokjes}[##7]}}%
+             {\efgoto(##4,##5){\@@exframes}[##7]}}%
         \def\marking(##1,##2)##3(##4,##5)##6[##7]%
           {\position(##1,##2)
-             {\efthisis(##4,##5){\@@exhokjes}[##7]}}%
+             {\efthisis(##4,##5){\@@exframes}[##7]}}%
         \def\remark%
           {\efnocomment}%
         \def\colorbar##1[##2]%
@@ -1811,16 +1813,16 @@
         \position(0,0){\box0}%
         \linewidth\onepoint
         \setuppositioning
-          [\c!eenheid=pt,
-           \c!xschaal=\withoutpt\the\efxsteps,
-           \c!yschaal=\withoutpt\the\efysteps,
+          [\c!unit=pt,
+           \c!xscale=\withoutpt\the\efxsteps,
+           \c!yscale=\withoutpt\the\efysteps,
            \c!factor=1]%
         \ignorespaces#4%
         \def\referring(##1,##2)##3(##4,##5)##6[##7]%
           {}%
         \let\marking\referring
         \def\remark%
-          {\efcomment\v!nee}%
+          {\efcomment\v!no}%
         \def\colorbar##1[##2]%
           {\makecolorbar[##2]}%
         \ignorespaces#4%
@@ -1828,10 +1830,10 @@
       \box\colorbarbox}}
 
 \def\dodostartfigure[#1][#2][#3]#4\stopfigure
-  {\doifelse\v!test\@@exoptie
+  {\doifelse\v!test\@@exoption
      {\teststartfigure[#1][#2][#3]#4\teststopfigure
-      \let\@@exhokjes\v!aan}
-     {\let\@@exhokjes\v!uit}%
+      \let\@@exframes\v!on}
+     {\let\@@exframes\v!off}%
    \setvalue{\??ef\??ef#1}%
      {\dosingleempty{\placestartfigure[#1][#2][#3]#4\placestopfigure}}%
    \doifundefined{#1}{\setvalue{#1}{\getexternalfigure{#1}}}}
@@ -1842,14 +1844,14 @@
 \def\teststartfigure[#1][#2][#3]#4\teststopfigure%
   {\begingroup
      \setbox0\hbox
-       {\useexternalfigure[\s!dummy][#2][\c!bfactor=\v!max]%
+       {\useexternalfigure[\s!dummy][#2][\c!wfactor=\v!max]%
         \externalfigure[\s!dummy]}%
      \def\referring
        {\efmark}%
      \def\marking
        {\efmark}%
      \def\remark
-       {\efcomment\v!ja}%
+       {\efcomment\v!yes}%
      \def\colorbar##1[##2]%
        {}%
      \efreference\zerocount
@@ -1865,15 +1867,15 @@
                 \c!dx=\withoutpt\the\efxsteps,
                 \c!ny=\@@exymax,
                 \c!dy=\withoutpt\the\efysteps,
-                \c!xstap=1,
-                \c!ystap=1,
-                \c!schaal=1,
-                \c!offset=\v!nee,
-                \c!eenheid=pt]}%
+                \c!xstep=1,
+                \c!ystep=1,
+                \c!scale=1,
+                \c!offset=\v!no,
+                \c!unit=pt]}%
           \setuppositioning
-            [\c!eenheid=pt,
-             \c!xschaal=\withoutpt\the\efxsteps,
-             \c!yschaal=\withoutpt\the\efysteps,
+            [\c!unit=pt,
+             \c!xscale=\withoutpt\the\efxsteps,
+             \c!yscale=\withoutpt\the\efysteps,
              \c!factor=1]%
           \linewidth\onepoint
           \ignorespaces#4\relax
@@ -1890,7 +1892,7 @@
        {}%
      \setbox2\vbox
        {{\tfa\doifelsenothing{#1}{#2}{#1}}
-        \blanko
+        \blank
         \tfxx#4
         \vfilll}%
      \ifdim\ht0>\ht2
@@ -1914,10 +1916,10 @@
 %    \doifundefined{#1}{\setvalue{#1}{\getexternalfigure{#1}}}}
 
 \def\dodostartfigure[#1][#2][#3]#4\stopfigure
-  {\doifelse\v!test\@@exoptie
+  {\doifelse\v!test\@@exoption
      {\teststartfigure[#1][#2][#3]#4\teststopfigure
-      \let\@@exhokjes\v!aan}
-     {\let\@@exhokjes\v!uit}%
+      \let\@@exframes\v!on}
+     {\let\@@exframes\v!off}%
    \setvalue{\??ef\??ef#1}%
      {\def\next{\placestartfigure[#1][#2][#3]#4\placestopfigure}%
       \dosingleempty\next}%
@@ -1927,7 +1929,7 @@
   {\dotripleargument\dodostartfigure#1\stopfigure}
 
 \def\startfigure
-  {\grabuntil{\e!stop\v!figuur}\dostartfigure}
+  {\grabuntil{\e!stop\v!figure}\dostartfigure}
 
 %D \macros
 %D   {clip, setupclipping}
@@ -1936,25 +1938,25 @@
 %D arbitrary content. We can use \METAPOST\ to provide a non
 %D rectangular clipping path.
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPclip{fun}
 %D   clip currentpicture to fullcircle
 %D     shifted (.5,.5) xscaled \width yscaled \height ;
 %D \stopMPclip
-%D \stoptypen
+%D \stoptyping
 %D
 %D We get a rectangular piece of the figure when we say:
 %D
-%D \starttypen
+%D \starttyping
 %D \clip[x=2,y=1]{\externalfigure[photo]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we want to clip to the oval we defined a few lines ago,
 %D we say:
 %D
-%D \starttypen
+%D \starttyping
 %D \clip[nx=1,ny=1,x=1,y=1,mp=fun]{\externalfigure[photo]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The general characteristics of clipping can be set up with
 %D
@@ -1963,12 +1965,12 @@
 \def\doclip[#1]% nb top->bottom left->right
   {\bgroup
    \getparameters[\??cp][#1]%
-   \doifelse\@@cpstatus\v!start\dodoclip{\egroup\hbox}}
+   \doifelse\@@cpstate\v!start\dodoclip{\egroup\hbox}}
 
 \def\dodoclip
   {\dowithnextbox
-     {\ifdim\@@cpbreedte>\zeropoint
-        \!!dimena\@@cpbreedte
+     {\ifdim\@@cpwidth>\zeropoint
+        \!!dimena\@@cpwidth
         \!!dimenc\@@cphoffset
       \else
         \!!dimena\nextboxwd
@@ -1978,8 +1980,8 @@
         \!!dimena\@@cpsx\!!dimena
       \fi
       \relax % sure
-      \ifdim\@@cphoogte>\zeropoint
-        \!!dimenb\@@cphoogte
+      \ifdim\@@cpheight>\zeropoint
+        \!!dimenb\@@cpheight
         \!!dimend\nextboxht
         \advance\!!dimend -\@@cpvoffset
         \advance\!!dimend -\!!dimenb
@@ -1993,23 +1995,23 @@
         \advance\!!dimend \nextboxht
       \fi
       \setbox\nextbox\hbox                         % old
-        {\advance\!!dimenc -\@@cplinkeroffset      % new !
-         \advance\!!dimend -\@@cponderoffset       % new ! % - added
+        {\advance\!!dimenc -\@@cpleftoffset      % new !
+         \advance\!!dimend -\@@cpbottomoffset       % new ! % - added
          \hskip-\!!dimenc\lower\!!dimend\flushnextbox}% old
       \nextboxwd\zeropoint
       \nextboxht\zeropoint
       \nextboxdp\zeropoint
       \setbox\nextbox\hbox
-        {\advance\!!dimena \@@cplinkeroffset        % new !
-         \advance\!!dimena \@@cprechteroffset       % new !
-         \advance\!!dimenb \@@cponderoffset         % new !
-         \advance\!!dimenb \@@cpbovenoffset         % new !
+        {\advance\!!dimena \@@cpleftoffset        % new !
+         \advance\!!dimena \@@cprightoffset       % new !
+         \advance\!!dimenb \@@cpbottomoffset         % new !
+         \advance\!!dimenb \@@cptopoffset         % new !
          \dostartclipping\@@cpmp\!!dimena\!!dimenb  % old
            \flushnextbox
          \dostopclipping}%
       \setbox\nextbox\hbox                      % new !
-        {\!!dimena-\@@cplinkeroffset            % new !
-         \!!dimenb \@@cponderoffset             % new ! % - removed
+        {\!!dimena-\@@cpleftoffset            % new !
+         \!!dimenb \@@cpbottomoffset             % new ! % - removed
          \hskip\!!dimena\lower\!!dimenb\flushnextbox}% new !
       \nextboxwd\!!dimena
       \nextboxht\!!dimenb
@@ -2025,9 +2027,9 @@
 
 %D defining sound tracks:
 %D
-%D \starttypen
+%D \starttyping
 %D \useexternalsoundtrack[label][file]
-%D \stoptypen
+%D \stoptyping
 %D
 %D associated actions: StartSound StopSound PauseSound ResumeSound
 %D
@@ -2043,7 +2045,7 @@
 \def\checksoundtrack#1%
   {\iflocation
      \doifdefined{\??sd:#1}{\doifvaluesomething{\??sd:#1}
-       {\doinsertsoundtrack{\getvalue{\??sd:#1}}{#1}\@@sdoptie
+       {\doinsertsoundtrack{\getvalue{\??sd:#1}}{#1}\@@sdoption
         % brr, \..empty not really needed and maybe even wrong;
         % also, not here but in driver
         \letgvalueempty{\??sd:#1}}}%
@@ -2055,7 +2057,7 @@
   {\dodoubleargument\getparameters[\??sd]}
 
 \setupexternalsoundtracks
-  [\c!optie=]
+  [\c!option=]
 
 %D NEW: used in styledesign manual
 
@@ -2074,8 +2076,8 @@
 
 \defineexternalfigure
   [typeset]
-  [\c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=\s!white]
+  [\c!background=\v!color,
+   \c!backgroundcolor=\s!white]
 
 \def\dotypesetbuffer[#1][#2]% beware: this will mix up the mp graphics
   {\bgroup
@@ -2090,7 +2092,7 @@
    \doglobal\increment\noftypesetbuffers
    % batch is needed
    \executesystemcommand{texexec --batch --pdf --result=\bufferprefix typeset-\noftypesetbuffers\space \bufferprefix typeset.tex}%
-   %\externalfigure[\bufferprefix typeset-\noftypesetbuffers.pdf][\c!object=\v!nee,#2]%
+   %\externalfigure[\bufferprefix typeset-\noftypesetbuffers.pdf][\c!object=\v!no,#2]%
    \externalfigure[\bufferprefix typeset-\noftypesetbuffers.pdf][#2]%
    \egroup}
 
@@ -2108,55 +2110,55 @@
   {\executeifdefined{\??tz#1}\gobbletwoarguments{#2}{#3}}
 
 \def\dodotypesetfile#1#2#3#4% args settings file settings
-  {\doifmode{*\v!eerste}{\executesystemcommand{texmfstart texexec.pl --batch --pdf #1 #3}}%
+  {\doifmode{*\v!first}{\executesystemcommand{texmfstart texexec.pl --batch --pdf #1 #3}}%
    \doglobal\beforesplitstring#3\at.\to\typesetfilename
    \externalfigure[\typesetfilename.pdf][#2,#4]}
 
-\appendtoks \setupexternalfigures[\c!optie=\v!leeg] \to \everyfastmode
+\appendtoks \setupexternalfigures[\c!option=\v!empty] \to \everyfastmode
 \appendtoks \runMPgraphicsfalse                     \to \everyfastmode
 \appendtoks \insertMPgraphicsfalse                  \to \everyfastmode
 
 \appendtoks \flushMPgraphics \to \everygoodbye  % \everylastshipout
 
 \setupexternalfigures
-  [\c!optie=,
-   \c!object=\v!ja,
-   \c!reset=\v!nee,
-   \c!maxbreedte=\@@efbreedte,
-   \c!maxhoogte=\@@efhoogte,
-   \c!korps=\korpsgrootte,
-   \c!gebied=,
+  [\c!option=,
+   \c!object=\v!yes,
+   \c!reset=\v!no,
+   \c!maxwidth=\@@efwidth,
+   \c!maxheight=\@@efheight,
+   \c!bodyfont=\korpsgrootte,
+   \c!directory=,
    \c!file=\f!utilityfilename.\f!figureextension,
-   \c!straal=.5\korpsgrootte,
-   \c!hoek=\v!recht,
-   \c!kader=\v!uit,
-   \c!achtergrond=, % new
-   \c!splitskleur=\s!white,
+   \c!radius=.5\korpsgrootte,
+   \c!corner=\v!rectangular,
+   \c!frame=\v!off,
+   \c!background=, % new
+   \c!splitcolor=\s!white,
 %  \c!grid=,
-   \c!plaats={\v!lokaal,\v!globaal}]
+   \c!location={\v!local,\v!global}]
 
 \setupexternalfigures
-  [\c!hokjes=\v!uit,
+  [\c!frames=\v!off,
    \c!ymax=24,
    \c!xmax=]
 
 \useexternalfigure
-  [buffer] [\jobname] [\c!type=\v!buffer,\c!object=\v!nee]
+  [buffer] [\jobname] [\c!type=\v!buffer,\c!object=\v!no]
 
 \setupclipping
-  [\c!status=\v!start,
+  [\c!state=\v!start,
    \c!n=1, % was 2
    \c!nx=\@@cpn,\c!x=1,\c!sx=1,
    \c!ny=\@@cpn,\c!y=1,\c!sy=1,
-   \c!breedte=\!!zeropoint,
-   \c!hoogte=\!!zeropoint,
+   \c!width=\!!zeropoint,
+   \c!height=\!!zeropoint,
    \c!hoffset=\!!zeropoint,
    \c!voffset=\!!zeropoint,
    \c!offset=\zeropoint,
-   \c!linkeroffset=\@@cpoffset,  % \zeropoint,
-   \c!rechteroffset=\@@cpoffset, % \zeropoint,
-   \c!bovenoffset=\@@cpoffset,   % \zeropoint,
-   \c!onderoffset=\@@cpoffset,   % \zeropoint,
+   \c!leftoffset=\@@cpoffset,  % \zeropoint,
+   \c!rightoffset=\@@cpoffset, % \zeropoint,
+   \c!topoffset=\@@cpoffset,   % \zeropoint,
+   \c!bottomoffset=\@@cpoffset,   % \zeropoint,
    \c!mp=]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex
index cb8f0ed1d..0b1b1d430 100644
--- a/tex/context/base/core-fil.tex
+++ b/tex/context/base/core-fil.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-fil,
+%D   [       filefile=core-fil,
 %D        version=1997.11.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=File Support,
@@ -62,34 +62,40 @@
 %D method to define filesynonyms. The actual synonyms are
 %D defined elsewhere, but look like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definefilesynonym [chemic]  [chemie]
-%D \definefilesynonym [einheit] [eenheid]
-%D \definefilesynonym [unit]    [eenheid]
-%D \stoptypen
+%D \definefilesynonym [einheit] [unit]
+%D \definefilesynonym [unit]    [unit]
+%D \stoptyping
 %D
 %D So we can say in english:
 %D
-%D \starttypen
+%D \starttyping
 %D \usemodules[pictex,chemic,unit]
-%D \stoptypen
+%D \stoptyping
 %D
 %D and in dutch:
 %D
-%D \starttypen
-%D \usemodules[pictex,chemie,eenheid]
-%D \stoptypen
+%D \starttyping
+%D \usemodules[pictex,chemie,unit]
+%D \stoptyping
 
 \def\definefilesynonym
   {\dodoubleempty\dodefinefilesynonym}
 
+% \def\dodefinefilesynonym[#1][#2]%
+%   {\doifdefined{\??fs#1}
+%      {\doifnotvalue{\??fs#1}{#2}
+%         {\showmessage\m!files1{#1 (#2),\getvalue{\??fs#1}}}}%
+%    \doifelse{#1}{#2}
+%      {\letbeundefined{\??fs#1}{#2}}
+%      {\setevalue{\??fs#1}{#2}}}
+
 \def\dodefinefilesynonym[#1][#2]%
-  {\doifdefined{\??fs#1}
-     {\doifnotvalue{\??fs#1}{#2}
-        {\showmessage\m!files1{#1 (#2),\getvalue{\??fs#1}}}}%
-   \doifelse{#1}{#2}
-     {\letbeundefined{\??fs#1}{#2}}
-     {\setevalue{\??fs#1}{#2}}}
+  {\ifundefined{\??fs#1}\else
+     \doifnotvalue{\??fs#1}{#2}{\showmessage\m!files1{#1 (#2),\getvalue{\??fs#1}}}%
+   \fi
+   \doifelse{#1}{#2}{\letbeundefined{\??fs#1}{#2}}{\setevalue{\??fs#1}{#2}}}
 
 %D \macros
 %D   {truefilename}
@@ -97,18 +103,14 @@
 %D At the system level such a filename can be called upon by
 %D saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \truefilename{filename/filesynonym}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation shows that nesting is supported.
 
 \def\truefilename#1%
-  {\ifundefined{\??fs#1}%
-     #1%
-   \else
-     \truefilename{\getvalue{\??fs#1}}%
-   \fi}
+  {\ifundefined{\??fs#1}#1\else\truefilename{\csname\??fs#1\endcsname}\fi}
 
 %D \macros
 %D   {makeshortfilename}
@@ -221,9 +223,9 @@
 %D in a lazy way. Nota bene: such runtime definitions are
 %D global.
 %D
-%D \starttypen
+%D \starttyping
 %D \fetchruntimecommand\showaccents{\f!encodingprefix ...}
-%D \stoptypen
+%D \stoptyping
 
 \def\fetchruntimecommand#1#2%
   {\def#1{\dofetchruntimecommand#1{#2}}}
@@ -239,20 +241,21 @@
       \stopreadingfile
       \doglobal\setflag{#2}}%
    \ifx#1\undefined
-     \writestatus{\m!systems}{command \string#1 not found in file #2}%
+     \writestatus\m!systems{command \string#1 not found in file #2}%
      \def#1{{\infofont[unknown command \string#1]}}%
    \fi
    #1}
 
 %D To be documented and probably moved
 
-\def\stelexternebronnenin
-  {\dodoubleargument\getparameters[\??er]}
-
 \def\documentresources{\@@erurl}
 
-\stelexternebronnenin[url=]
+\def\setupexternalresources
+  {\dodoubleargument\getparameters[\??er]}
+
+\setupexternalresources
+  [url=]
 
 %D This module will be perfected / changed / weeded.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-fld.tex b/tex/context/base/core-fld.tex
index 765e79788..3e2dc0795 100644
--- a/tex/context/base/core-fld.tex
+++ b/tex/context/base/core-fld.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-fld,
+%D   [       filefile=core-fld,
 %D        version=1997.05.18,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Fill||in fields,
@@ -58,23 +58,23 @@
 
 \def\preparefieldvariables % evt \def's at the outer level (test) or \edef's here for fast testing
   {\let\@@DriverFieldNumber         \@@fdn
-   \let\@@DriverFieldStyle          \@@fdletter
-   \let\@@DriverFieldColor          \@@fdkleur
-   \let\@@DriverFieldBackgroundColor\@@fdveldachtergrondkleur
-   \let\@@DriverFieldFrameColor     \@@fdveldkaderkleur
-   \let\@@DriverFieldLayer          \@@fdveldlaag
-   \let\@@DriverFieldOption         \@@fdoptie
-   \let\@@DriverFieldAlign          \@@fduitlijnen
-   \let\@@DriverFieldClickIn        \@@fdklikin
-   \let\@@DriverFieldClickOut       \@@fdklikuit
-   \let\@@DriverFieldRegionIn       \@@fdgebiedin
-   \let\@@DriverFieldRegionOut      \@@fdgebieduit
-   \let\@@DriverFieldAfterKey       \@@fdnatoets
-   \let\@@DriverFieldFormat         \@@fdformatteer
-   \let\@@DriverFieldValidate       \@@fdvalideer
-   \let\@@DriverFieldCalculate      \@@fdbereken
+   \let\@@DriverFieldStyle          \@@fdstyle
+   \let\@@DriverFieldColor          \@@fdcolor
+   \let\@@DriverFieldBackgroundColor\@@fdfieldbackgroundcolor
+   \let\@@DriverFieldFrameColor     \@@fdfieldframecolor
+   \let\@@DriverFieldLayer          \@@fdfieldlayer
+   \let\@@DriverFieldOption         \@@fdoption
+   \let\@@DriverFieldAlign          \@@fdalign
+   \let\@@DriverFieldClickIn        \@@fdclickin
+   \let\@@DriverFieldClickOut       \@@fdclickout
+   \let\@@DriverFieldRegionIn       \@@fdregionin
+   \let\@@DriverFieldRegionOut      \@@fdregionout
+   \let\@@DriverFieldAfterKey       \@@fdafterkey
+   \let\@@DriverFieldFormat         \@@fdformat
+   \let\@@DriverFieldValidate       \@@fdvalidate
+   \let\@@DriverFieldCalculate      \@@fdcalculate
    \let\@@DriverFieldFocusIn        \@@fdfocusin
-   \let\@@DriverFieldFocusOut       \@@fdfocusuit}
+   \let\@@DriverFieldFocusOut       \@@fdfocusout}
 
 % todo : remove arguments, consider DriverField a namespace
 
@@ -304,7 +304,7 @@
 \def\logfields
   {\dosingleempty\doLogFields}
 
-%D \starttypen
+%D \starttyping
 %D \definefield [name] [type] [group] [values] [default]
 %D
 %D \definefield [WWWW] [text]  [textsetup]            [default text]
@@ -327,7 +327,7 @@
 %D
 %D \field[XXXX]
 %D \fitfield[XXXX]
-%D \stoptypen
+%D \stoptyping
 
 \newif\ifdefinemainfield \definemainfieldfalse
 
@@ -337,7 +337,7 @@
 %D The first alternative used a two pass data list and was
 %D implemented as follows:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\getmainfieldkids#1%
 %D   {\let\@@DriverFieldKids\empty
 %D    \ifdefinemainfield
@@ -351,24 +351,24 @@
 %D           \exitloop
 %D         \fi}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, the next alternative is much faster when we have
 %D a field with thousands of clones, something not that
 %D imaginary.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\getmainfieldkids#1%
 %D   {\let\@@DriverFieldKids\empty
 %D    \ifdefinemainfield
 %D      \definerawpasslist{fld:#1}% runtime defined by system
 %D      \moverawpasslist{fld:#1}\@@DriverFieldKids
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The data is written by file using:
 %D
-%D \starttypen
+%D \starttyping
 %D \newcounter\nofmainfieldkids
 %D
 %D \def\setmainfieldkid#1#2%
@@ -378,7 +378,7 @@
 %D         {fld:#1}%
 %D         {\nofmainfieldkids}%
 %D         {#2}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The trade of of this mechanism is that for each cloned or
 %D copied field, the uitlity file is to be read in order to
@@ -670,7 +670,7 @@
      \else\ifcase\@@DriverFieldFree\relax
        \doifdefinedelse{\strippedcsname\setupfield\@@DriverFieldGroup}
          {\let\dosetupfield=#1\getvalue{\strippedcsname\setupfield\@@DriverFieldGroup}}
-         {#1[\@@DriverFieldName][\v!label,\v!kader,\v!horizontaal][][][]}%
+         {#1[\@@DriverFieldName][\v!label,\v!frame,\v!horizontal][][][]}%
 \iftrialtypesetting\else
        \def\@@DriverFieldFree{1}%
        \changefield{#2}%
@@ -801,78 +801,78 @@
      [      \v!reset=>\ShowFieldLabelfalse\ShowFieldFramefalse
                       \HorizontalFieldfalse\VerticalFieldfalse,
             \v!label=>\ShowFieldLabeltrue,
-            \v!kader=>\ShowFieldFrametrue,
-      \v!horizontaal=>\HorizontalFieldtrue,
-        \v!vertikaal=>\VerticalFieldtrue]%
+            \v!frame=>\ShowFieldFrametrue,
+      \v!horizontal=>\HorizontalFieldtrue,
+        \v!vertical=>\VerticalFieldtrue]%
    \ifVerticalField
      \getparameters[\??fd]
-       [\c!afstand=\!!zeropoint,\c!tussen=\vskip\@@localoffset,
-        \c!uitlijnen=\v!rechts,\c!breedte=20em]%
+       [\c!distance=\!!zeropoint,\c!inbetween=\vskip\@@localoffset,
+        \c!align=\v!right,\c!width=20em]%
    \else\ifHorizontalField
      \getparameters[\??fd]
-       [\c!afstand=\@@localoffset,\c!tussen=,\c!uitlijnen=\c!links,
-        \c!hoogte=10ex]%
+       [\c!distance=\@@localoffset,\c!inbetween=,\c!align=\c!left,
+        \c!height=10ex]%
    \else
      \getparameters[\??fd]
-       [\c!afstand=\!!zeropoint,\c!tussen=,\c!uitlijnen=\c!links]%
+       [\c!distance=\!!zeropoint,\c!inbetween=,\c!align=\c!left]%
    \fi\fi
    \getparameters[\??fd]
-     [\c!n=,\c!voor=,\c!na=\vss,\c!letter=,\c!kleur=,#3]%
+     [\c!n=,\c!before=,\c!after=\vss,\c!style=,\c!color=,#3]%
    \reshapeframeboxfalse % else ugly spacing
    \ifShowFieldFrame
-     \localframed[\??fd][\c!strut=\v!nee,\c!uitlijnen=]\bgroup
+     \localframed[\??fd][\c!strut=\v!no,\c!align=]\bgroup
    \else
      \vbox\bgroup
    \fi
-     \mindermeldingen
+     \dontcomplain
      \ifShowFieldLabel
        \setbox0=\hbox
          {\reshapeframeboxtrue % else wrong dimensions
           \framed
-            [\c!letter=,\c!kleur=,\c!uitlijnen=\c!rechts,#4]
+            [\c!style=,\c!color=,\c!align=\c!right,#4]
             {\@@DriverFieldLabel}}%
      \fi
      \setbox2=\hbox
        {\reshapeframeboxtrue % else wrong dimensions
         \ifVerticalField
-          \setupframed[\c!hoogte=6ex,\c!breedte=\hsize]%
+          \setupframed[\c!height=6ex,\c!width=\hsize]%
         \else\ifHorizontalField
-          \setupframed[\c!hoogte=\vsize,\c!breedte=20em]%
+          \setupframed[\c!height=\vsize,\c!width=20em]%
         \else
-          \setupframed[\c!hoogte=2cm,\c!breedte=2cm]%
+          \setupframed[\c!height=2cm,\c!width=2cm]%
         \fi\fi
         \framed
-          [\c!uitlijnen=\v!rechts,\c!strut=\v!nee,#5]
+          [\c!align=\v!right,\c!strut=\v!no,#5]
           {\getparameters
              [\??fd]
-             [\c!kleur=,\c!letter=,\c!uitlijnen=\v!rechts,\c!optie=,
-              \c!klikin=,\c!klikuit=,\c!gebiedin=,\c!gebieduit=,
-              \c!natoets=,\c!formatteer=,\c!valideer=,\c!bereken=,
-              \c!focusin=,\c!focusuit=,
-              \c!veldoffset=\!!zeropoint,\c!veldachtergrondkleur=,
-              \c!veldkaderkleur=,\c!veldlaag=,#5]%
+             [\c!color=,\c!style=,\c!align=\v!right,\c!option=,
+              \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=,
+              \c!afterkey=,\c!format=,\c!validate=,\c!calculate=,
+              \c!focusin=,\c!focusout=,
+              \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=,
+              \c!fieldframecolor=,\c!fieldlayer=,#5]%
             \scratchdimen\framedwidth \edef\@@DriverFieldWidth {\the\scratchdimen}%
             \scratchdimen\framedheight\edef\@@DriverFieldHeight{\the\scratchdimen}%
             \vfill
-            \hbox{\lower\@@fdveldoffset\hbox{\typesetfield}}
+            \hbox{\lower\@@fdfieldoffset\hbox{\typesetfield}}
             \vss}}%
      \ifShowFieldLabel
        \ifVerticalField
          \vbox
            {\copy0
-            \@@fdtussen
+            \@@fdinbetween
             \copy2}%
        \else
          \hbox
            {\vbox \ifdim\ht2>\ht0 to \ht2 \fi
-              {\@@fdvoor
+              {\@@fdbefore
                \copy0
-               \@@fdna}%
-            \hskip\@@fdafstand
+               \@@fdafter}%
+            \hskip\@@fddistance
             \vbox \ifdim\ht0>\ht2 to \ht0 \fi
-              {\@@fdvoor
+              {\@@fdbefore
                \box2
-               \@@fdna}}%
+               \@@fdafter}}%
        \fi
      \else
        \box2
@@ -884,12 +884,12 @@
    \localframed
      [\??fd]
      [\c!n=1024, % beware: weblink plug in truncates
-      \c!strut=\v!nee,\c!kleur=,\c!letter=,\c!optie=,
-      \c!klikin=,\c!klikuit=,\c!gebiedin=,\c!gebieduit=,
-      \c!focusin=,\c!focusuit=,
-      \c!natoets=,\c!formatteer=,\c!valideer=,\c!bereken=,
-      \c!veldoffset=\!!zeropoint,\c!veldachtergrondkleur=,
-      \c!veldkaderkleur=,\c!veldlaag=,#5,\c!uitlijnen=]
+      \c!strut=\v!no,\c!color=,\c!style=,\c!option=,
+      \c!clickin=,\c!clickout=,\c!regionin=,\c!regionout=,
+      \c!focusin=,\c!focusout=,
+      \c!afterkey=,\c!format=,\c!validate=,\c!calculate=,
+      \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=,
+      \c!fieldframecolor=,\c!fieldlayer=,#5,\c!align=]
      {\dogetcommacommandelement1\from\@@DriverFieldValues\to\@@DriverFieldValue
       \ifx\@@DriverFieldValue\empty
         \let\@@DriverFieldValue\@@DriverFieldDefault
@@ -933,13 +933,13 @@
       \setupfield
         [systemfield]
         [\c!n=1024, % beware: weblink plugin truncates
-         \c!plaats=\v!laag,\c!strut=\v!ja,\c!veldoffset=0pt,
-         \c!hoogte=1.2\openlineheight,\c!breedte=\dimen0,\c!offset=\v!overlay,
-         \c!letter=,\c!uitlijnen=\v!midden,\c!kader=\v!uit,
-         \c!kleur=red,\c!veldachtergrondkleur=\s!white,\c!veldkaderkleur=blue,
-         \c!valideer=JS(Check_Answer{\currentsystemfield,\therightanswer})]%
+         \c!location=\v!low,\c!strut=\v!yes,\c!fieldoffset=0pt,
+         \c!height=1.2\openlineheight,\c!width=\dimen0,\c!offset=\v!overlay,
+         \c!style=,\c!align=\v!middle,\c!frame=\v!off,
+         \c!color=red,\c!fieldbackgroundcolor=\s!white,\c!fieldframecolor=blue,
+         \c!validate=JS(Check_Answer{\currentsystemfield,\therightanswer})]%
       \switchtobodyfont
-        [\c!klein]%
+        [\c!small]%
       \hbox to \wd0
         {\copy0\hskip-\wd0\hss\field[\currentsystemfield]\hss}}}
 
@@ -953,42 +953,42 @@
    \setupfields[\v!reset]%
    \useJSscripts[fld]%
    \setbox0\hbox
-     {\mindermeldingen
+     {\dontcomplain
       \nextsystemfield
       \setbox0=\hbox{#2}%
       \definesymbol
         [\currentsystemfield:txt]
-        [{\inframed[\c!kader=\v!uit,\c!achtergrond=\v!raster]{#3}}]%
+        [{\inframed[\c!frame=\v!off,\c!background=\v!screen]{#3}}]%
       \setbox2\hbox{\symbol[\currentsystemfield:txt]}%
       \definefield
         [\currentsystemfield:txt][check]
         [dummy][\currentsystemfield:txt][\currentsystemfield:txt]%
       \setupfield
         [dummy]
-        [\c!kader=\v!uit,
-         \c!gebieduit=JS(Hide_Field{\currentsystemfield:txt}),
-         \c!optie=\v!verborgen]%
+        [\c!frame=\v!off,
+         \c!regionout=JS(Hide_Field{\currentsystemfield:txt}),
+         \c!option=\v!hidden]%
       \hbox to \zeropoint
          {\dimen0\wd2\advance\dimen0 -\wd0
-          \doifelse{#1}\v!links
+          \doifelse{#1}\v!left
             {\hskip-\dimen0}
-            {\doif{#1}\v!midden
+            {\doif{#1}\v!middle
                {\hskip-.5\dimen0}}%
           \lower\openlineheight\hbox to \zeropoint
             {\fitfield[\currentsystemfield:txt]}}%
       \dimen0=\ifdim\wd0=\zeropoint 3em\else\wd0\fi
       \definesymbol
         [\currentsystemfield:but]
-        [{\framed[\c!hoogte=2ex,\c!breedte=\dimen0,\c!kader=\v!uit]{}}]%
+        [{\framed[\c!height=2ex,\c!width=\dimen0,\c!frame=\v!off]{}}]%
       \definefield
         [\currentsystemfield:but][push]
         [dummy][\currentsystemfield:but][\currentsystemfield:but]%
       \setupfield
         [dummy]
-        [\c!kader=\v!uit,
-         \c!optie=,
-         \c!gebiedin=JS(Vide_Field{\currentsystemfield:txt}),
-         \c!gebieduit=JS(Hide_Field{\currentsystemfield:txt})]%
+        [\c!frame=\v!off,
+         \c!option=,
+         \c!regionin=JS(Vide_Field{\currentsystemfield:txt}),
+         \c!regionout=JS(Hide_Field{\currentsystemfield:txt})]%
        \lower2ex\hbox to \zeropoint
          {\fitfield[\currentsystemfield:but]}%
       #2}%
@@ -1008,19 +1008,19 @@
   {\bgroup
    \getparameters[\??fd][\c!start=1,#3]%
    \setupfields[\v!reset]%
-   \definesymbol[\v!leeg][]%
+   \definesymbol[\v!empty][]%
    \useJSscripts[fld][FieldStack]%
    \newcounter\stackedfieldnumber
    \def\dododofieldstack##1%
      {\increment\stackedfieldnumber
       \ifnum\stackedfieldnumber=\@@fdstart\relax
-        \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!leeg][##1]%
+        \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!empty][##1]%
       \else
-        \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!leeg][\v!leeg]%
+        \definefield[#1:\stackedfieldnumber][check][#1][##1,\v!empty][\v!empty]%
       \fi}%
    \processcommalist[#2]\dododofieldstack
    \setupfield[#1][\v!reset]% added
-   \setupfield[#1][\c!optie=\v!alleenleesbaar,#3]% #3 swapped
+   \setupfield[#1][\c!option=\v!readonly,#3]% #3 swapped
    \newcounter\stackedfieldnumber
    \def\dododofieldstack##1%
      {\doglobal\increment\stackedfieldnumber
@@ -1049,13 +1049,11 @@
   {\dodoubleargument\getparameters[\??fr]}
 
 \def\checksubmitform#1%
-  {\setsubmitoutputformat\@@frmethode}
+  {\setsubmitoutputformat\@@frmethod}
 
 \setexecutecommandcheck {submitform} \checksubmitform
 
 \setupforms
-  [\c!methode=HTML]
+  [\c!method=HTML]
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/core-fnt.tex b/tex/context/base/core-fnt.tex
index 95d2906c3..8cf7921e3 100644
--- a/tex/context/base/core-fnt.tex
+++ b/tex/context/base/core-fnt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-fnt,
+%D   [       filefile=core-fnt,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Font Support,
@@ -22,9 +22,9 @@
 %D to save its meaning in order to be able to use this handy
 %D macro.
 %D
-%D \starttypen
+%D \starttyping
 %D so test\compound{}test can be used instead of test||test
-%D \stoptypen
+%D \stoptyping
 
 \bgroup \catcode`\|=\@@active \gdef\compound#1{|#1|} \egroup
 
@@ -39,104 +39,107 @@
 %D \macros
 %D   {kap,KAP,Kap,Kaps,nokap,userealcaps,usepseudocaps}
 %D
-%D We already introduced \type{\kap} as way to capitalize
+%D We already introduced \type{\cap} as way to capitalize
 %D words. This command comes in several versions:
 %D
 %D \startbuffer
-%D \kap {let's put on a \kap{cap}}
-%D \kap {let's put on a \nokap{cap}}
-%D \KAP {let's put on a \\{cap}}
-%D \Kap {let's put on a \\{cap}}
-%D \Kaps{let's put on a cap}
+%D \cap {let's put on a \cap{cap}}
+%D \cap {let's put on a \nocap{cap}}
+%D \CAP {let's put on a \\{cap}}
+%D \Cap {let's put on a \\{cap}}
+%D \Caps{let's put on a cap}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D Note the use of \type{\nokap}, \type{\\} and the nested
-%D \type{\kap}.
+%D Note the use of \type{\nocap}, \type{\\} and the nested
+%D \type{\cap}.
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D These macros show te main reason why we introduced the
 %D smaller \type{\tx} and \type{\txx}.
 %D
-%D \starttypen
-%D \kap\romeins{1995}
-%D \stoptypen
+%D \starttyping
+%D \cap\romannumerals{1995}
+%D \stoptyping
 %D
 %D This at first sight unusual capitilization is completely
 %D legal.
 %D
-%D \showsetup{\y!kap}
-%D \showsetup{\y!Kap}
-%D \showsetup{\y!KAP}
-%D \showsetup{\y!Kaps}
-%D \showsetup{\y!nokap}
+%D \showsetup{\y!smallcapped}
+%D \showsetup{\y!notsmallcapped}
+%D \showsetup{\y!CAPPED}
+%D \showsetup{\y!SmallCapped}
+%D \showsetup{\y!SmallCaps}
 %D
 %D The difference between pseudo and real caps is demonstrated
 %D below:
 %D
 %D \startbuffer
-%D \usepseudocaps \kap{Hans Hagen}
-%D \userealcaps   \kap{Hans Hagen}
+%D \usepseudocaps \cap{Hans Hagen}
+%D \userealcaps   \cap{Hans Hagen}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The \type {\bgroup} trickery below is needed because of
 %D \type {\groupedcommand}.
 
-\def\usepseudocaps%
+\def\usepseudocaps
   {\def\cap@@uppercase{\the\everyuppercase\uppercased}%
    \def\cap@@lowercase{\the\everylowercase\lowercased}%
    \def\cap@@visualize{\tx}}
 
-\def\userealcaps%
+\def\userealcaps
   {\let\cap@@uppercase\relax
   %\let\cap@@lowercase\relax % Definitely not!
    \def\cap@@visualize{\sc}}
 
 \usepseudocaps
 
-\def\dodokap#1#2%
+\unexpanded\def\smallcapped % else conflict with math
+  {\futurelet\next\dosmallcapped}
+
+\def\disablepseudocaps
+  {\let\smallcapped\donothing}
+
+\def\dosmallcapped
+  {\ifx\next\bgroup
+     \expandafter\dodosmallcapped\expandafter\relax
+   \else
+     \expandafter\dodosmallcapped
+   \fi}
+
+\def\dodosmallcapped#1#2%
   {\ifmmode\hbox\fi
    \bgroup
    \cap@@visualize
    \cap@@uppercase{#1{#2}}%
    \egroup}
 
-\unexpanded\def\nokap#1%
+\unexpanded\def\notsmallcapped#1%
   {\cap@@lowercase{#1}}
 
-\unexpanded\def\kap%
-  {\futurelet\next\dokap}
-
-\def\dokap%
-  {\ifx\next\bgroup
-     \expandafter\dodokap\expandafter\relax
-   \else
-     \expandafter\dodokap
-   \fi}
-
-\unexpanded\def\KAP#1%
-  {{\def\\##1{\kap{##1}}#1}}
+\unexpanded\def\CAPPED#1%
+  {{\def\\##1{\smallcapped{##1}}#1}}
 
-\unexpanded\def\Kap#1%
-  {\KAP{\\#1}}
+\unexpanded\def\SmallCapped#1%
+  {\CAPPED{\\#1}}
 
-\unexpanded\def\Kaps
-  {\let\processword\Kap
+\unexpanded\def\SmallCaps
+  {\let\processword\SmallCapped
    \processwords}
 
 %D Sure:
 
-\let\normalkap\kap
+\let\kap\smallcapped
 
 %D Some precautions for a \PLAIN\ \TEX\ definition.
 
@@ -146,7 +149,7 @@
   {\ifmmode
      \expandafter\normalcap
    \else
-     \expandafter\kap
+     \expandafter\smallcapped
    \fi}
 
 %D \macros
@@ -157,21 +160,21 @@
 %D
 %D \showsetup{setupcapitals}
 
-\def\setupcapitals%
+\def\setupcapitals
   {\dosingleempty\dosetupcapitals}
 
 \def\dosetupcapitals[#1]%
   {\getparameters[\??kk][#1]%
-   \doifelse{\@@kktitel}{\v!ja}
-     {\definealternativestyle[\v!kapitaal][\normalkap][\normalkap]%
+   \doifelse\@@kktitle\v!yes
+     {\definealternativestyle[\v!capital][\smallcapped][\smallcapped]%
       \definealternativestyle[\v!smallcaps][\sc][\sc]%
       \let\kap\normalkap}
-     {\definealternativestyle[\v!kapitaal][\normalkap][\uppercased]%
+     {\definealternativestyle[\v!capital][\smallcapped][\uppercased]%
       \definealternativestyle[\v!smallcaps][\sc][\uppercased]%
-      \def\kap{\doconvertfont{\v!kapitaal}}}%
-   \doifelse{\@@kksc}{\v!ja}
-     {\userealcaps}
-     {\usepseudocaps}}
+      \def\kap{\doconvertfont\v!capital}}%
+   \doifelse\@@kksc\v!yes
+     \userealcaps
+     \usepseudocaps}
 
 \ifx\uppercased\undefined \let\uppercased\uppercase \fi
 \ifx\lowercased\undefined \let\lowercased\lowercase \fi
@@ -188,8 +191,8 @@
 \def\lowercased#1{{\forceunexpanded\xdef\@@expanded{\lowercase{#1}}}\@@expanded}
 
 \setupcapitals
-  [\c!titel=\v!ja,
-   \c!sc=\v!nee]
+  [\c!title=\v!yes,
+   \c!sc=\v!no]
 
 %D \macros
 %D   {Word, Words, WORD, WORDS, doprocesswords}
@@ -197,21 +200,21 @@
 %D This is probably not the right place to present the next set
 %D of macros.
 %D
-%D \starttypen
+%D \starttyping
 %D \Word {far too many words}
 %D \Words{far too many words}
 %D \WORD {far too many words}
 %D \WORDS{far too many words}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \typebuffer
 %D
 %D This calls result in:
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D \showsetup{\y!Word}
@@ -264,16 +267,16 @@
 %D murder. Nevertheless we support this manipulation for use in
 %D for instance titles.
 %D
-%D \starttypen
+%D \starttyping
 %D \hbox to 5cm{\stretched{murder}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \typebuffer
 %D
 %D or
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D \showsetup{\y!stretched}
@@ -289,7 +292,7 @@
 %D \hbox to 3cm{\stretched{sp{\'e}c{\`\i}{\"a}l}}
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The first line of this macros takes care of boxing. Normally
 %D one will use an \type{\hbox} specification. The last line
@@ -302,16 +305,16 @@
 %D
 %D A convenient alternative is:
 %D
-%D \starttypen
+%D \starttyping
 %D \stretcheduppercase{Is this what you like?}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \typebuffer
 %D
 %D this one uses fixed skips and kerns.
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D The default skip can be set with:
@@ -383,8 +386,8 @@
    \else
      \setbox\scratchbox\hbox
        {\expandafter\handletokens\midwordbreaktokens\with\setmidwordbreaktoken
-        a\space \!!dimena=\the\lastskip
-        #1\space\!!dimenb=\the\lastskip \relax % needed
+        a\space \!!dimena\lastskip
+        #1\space\!!dimenb\lastskip \relax % needed
         \ifdim\!!dimena=\!!dimenb
           \globallet\domidwordbreak\relax
         \else
@@ -412,9 +415,9 @@
 %D \typebuffer
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D The next macros are derived from the \PLAIN\ \TEX\ one, but
@@ -434,12 +437,12 @@
 %D \showsetup{\y!setupunderbar}
 %D
 %D The alternatives show up as
-%D   {\setupunderbar [variant=a]\underbar{alternative a}},
-%D   {\setupunderbar [variant=b]\underbar{alternative b}},
-%D   {\setupunderbar [variant=c]\underbar{alternative c}}
+%D   {\setupunderbar [alternativevariant=a]\underbar{alternative a}},
+%D   {\setupunderbar [alternativevariant=b]\underbar{alternative b}},
+%D   {\setupunderbar [alternativevariant=c]\underbar{alternative c}}
 %D and
-%D   {\setupunderbar [lijndikte=1pt]\underbar{1pt width}},
-%D   {\setupunderbar [lijndikte=2pt]\underbar{2pt width}},
+%D   {\setupunderbar [rulethickness=1pt]\underbar{1pt width}},
+%D   {\setupunderbar [rulethickness=2pt]\underbar{2pt width}},
 %D or whatever. Because \type{\overstrike} uses the same
 %D method, the settings also apply to that macro.
 
@@ -467,7 +470,7 @@
 \def\dododounderbar#1#2#3%
   {\startmathmode
    \setbox0\hbox{#3}%
-   \setbox2\hbox{\color[\@@onlijnkleur]{\getvalue{underbarmethod\@@onvariant}{\wd0}{#1}{#2}}}%
+   \setbox2\hbox{\color[\@@onrulecolor]{\getvalue{underbarmethod\@@onalternative}{\wd0}{#1}{#2}}}%
    \wd0\zeropoint
    \ht2\ht0
    \dp2\dp0
@@ -476,21 +479,20 @@
 
 \unexpanded\def\dodounderbar#1%
   {\bgroup
-   \dimen0=\@@ononderoffset
+   \dimen0=\@@onbottomoffset
    \dimen0=\underbarlevel\dimen0
    \ifdone \else
     %\advance\dimen0 -1pt
      \advance\dimen0 -\strutht
    \fi
    \dimen2\dimen0
-   \advance\dimen2 \@@onlijndikte
+   \advance\dimen2 \@@onrulethickness
    \dododounderbar{-\dimen0}{\dimen2}{#1}%
    \egroup}
 
 \def\betweenunderbarwords
   {\bgroup
-   \setbox0\hbox
-     {\dodounderbar{\hskip\fontdimen2\font}}%
+   \setbox0\hbox{\dodounderbar{\hskip\fontdimen2\font}}%
    \nobreak
    \hskip\zeropoint\!!minus\fontdimen4\font
    \discretionary{}{}{\box0}%
@@ -530,16 +532,15 @@
 
 \def\dooverstrike#1%
   {\bgroup
-   \dimen0=\@@onbovenoffset
+   \dimen0=\@@ontopoffset
    \dimen2=\dimen0
-   \advance\dimen2 \@@onlijndikte
+   \advance\dimen2 \@@onrulethickness
    \dododounderbar{\dimen2}{-\dimen0}{#1}%
    \egroup}
 
 \def\betweenoverstrikewords
   {\bgroup
-   \setbox0\hbox
-     {\dooverstrike{\hskip\fontdimen2\font}}%
+   \setbox0\hbox{\dooverstrike{\hskip\fontdimen2\font}}%
    \nobreak
    \hskip\zeropoint\!!minus\fontdimen4\font
    \discretionary{}{}{\box0}%
@@ -584,7 +585,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Note the different placement of \type {\lohi}, where we
 %D need a bit more space. The implementation looks a bit
@@ -636,7 +637,7 @@
    \hbox
      {\setbox4\hbox{\dohighlow\lower{16}{.48}{.1}{#2}}%
       \setbox6\hbox{\dohighlow\raise{14}{.86}{.1}{#3}}%
-      \doif{#1}{\v!links}
+      \doif{#1}{\v!left}
         {\ifdim\wd4<\wd6
           \setbox4\hbox to \wd6{\hss\box4}%
         \else
@@ -655,30 +656,30 @@
 %D
 %D \startbuffer
 %D \lohi{aha}{ah} test \lohi{aha}{ah} test
-%D \lohi[links]{aha}{ah} test \lohi[links]{aha}{ah} test
+%D \lohi[left]{aha}{ah} test \lohi[left]{aha}{ah} test
 %D \lohi{aha}{ah} test\lohi{aha}{ah} test
-%D \lohi[links]{aha}{ah}test \lohi[links]{aha}{ah}test
+%D \lohi[left]{aha}{ah}test \lohi[left]{aha}{ah}test
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D \macros
 %D   {setupinitial,placeinitial,checkinitial}
 %D
 %D {\em To be documented.}
 %D
-%D \starttypen
+%D \starttyping
 %D \setupinitial[state=start] \placeinitial \input tufte
-%D \stoptypen
+%D \stoptyping
 %D
 %D and
 %D
-%D \starttypen
+%D \starttyping
 %D \def\bpar{\ifvmode\checkinitial\fi}
 %D \def\epar{\ifhmode\par\fi\checkinitial}
-%D \stoptypen
+%D \stoptyping
 
 %  to do: more fine tuning
 
@@ -689,24 +690,24 @@
 \definefontsynonym[initial][Initial] % internal but accepted too
 
 \setupinitial
-  [\c!status=\v!stop,
-   \c!plaats=\v!tekst,
+  [\c!state=\v!stop,
+   \c!location=\v!text,
    \c!n=3,
    \s!font=initial]
 
 \def\placeinitial
-  {\doifelse\@@dcplaats\v!marge{\chardef\DropMode\plusone}{\chardef\DropMode\zerocount}%
-   \doif    \@@dcstatus\v!start{\ifnum\@@dcn>0 \AutoDroppedCaps\fi}}
+  {\doifelse\@@dclocation\v!margin{\chardef\DropMode\plusone}{\chardef\DropMode\zerocount}%
+   \doif    \@@dcstate\v!start{\ifnum\@@dcn>0 \AutoDroppedCaps\fi}}
 
 \let\checkinitial\CheckDroppedCaps
 
 %D This module has only a few setups:
 
 \setupunderbar
-  [\c!variant=a,
-   \c!lijndikte=\linewidth,
-   \c!onderoffset=1.5pt,
-   \c!bovenoffset=2.5pt,
-   \c!lijnkleur=]
+  [\c!alternative=a,
+   \c!rulethickness=\linewidth,
+   \c!bottomoffset=1.5pt,
+   \c!topoffset=2.5pt,
+   \c!rulecolor=]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-gen.tex b/tex/context/base/core-gen.tex
index 679dbcddc..06fed883b 100644
--- a/tex/context/base/core-gen.tex
+++ b/tex/context/base/core-gen.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-gen,
+%D   [       filefile=core-gen,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=General,
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Context Core Macros / General}
 
@@ -22,27 +22,27 @@
 %D toekenningen. Allereerst een commando om waarden aan
 %D een \DIMENSION\ toe te kennen:
 %D
-%D \starttypen
+%D \starttyping
 %D \assigndimension
 %D   {<waarde>|klein|middel|groot|-klein|-middel|-groot|geen}
-%D   {\dimensie}
+%D   {\dimension}
 %D   {waarde klein}
 %D   {waarde middel}
 %D   {waarde groot}
-%D \stoptypen
+%D \stoptyping
 %D
-%D Hierbij krijgt de \DIMENSION\ \type{\dimensie} een waarde 
+%D Hierbij krijgt de \DIMENSION\ \type{\dimension} een waarde
 %D afhankelijk van het meegegeven trefwoord.
 %D
-%D \startsmaller
-%D \startregels
+%D \startnarrower
+%D \startlines
 %D \type{(-)klein }\qquad (--) waarde klein
 %D \type{(-)middel}\qquad (--) waarde middel
 %D \type{(-)groot }\qquad (--) waarde groot
 %D \type{geen     }\qquad 0pt
 %D \type{waarde   }\qquad waarde
-%D \stopregels
-%D \stopsmaller
+%D \stoplines
+%D \stopnarrower
 %D
 %D Een trefwoord mag worden voorafgegaan door een \type{-}.
 %D Deze macro toont een voorbeeld van het gebruik van
@@ -51,69 +51,69 @@
 %D Analoog aan het bovenstaande commando kennen we een
 %D commando om waarden toe te kennen aan een macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \assignalfadimension
 %D   {<waarde>|klein|middel|groot|geen}
 %D   {\macro}
 %D   {waarde klein}
 %D   {waarde middel}
 %D   {waarde groot}
-%D \stoptypen
+%D \stoptyping
 
 \def\assigndimension#1#2#3#4#5%
   {\processaction
      [#1]
-     [   \v!klein=>#2=#3,
-        \v!middel=>#2=#4,
-         \v!groot=>#2=#5,
-          \v!geen=>#2=\zeropoint,
-        -\v!klein=>#2=-#3,
-       -\v!middel=>#2=-#4,
-        -\v!groot=>#2=-#5,
+     [   \v!small=>#2=#3,
+        \v!medium=>#2=#4,
+         \v!big=>#2=#5,
+          \v!none=>#2=\zeropoint,
+        -\v!small=>#2=-#3,
+       -\v!medium=>#2=-#4,
+        -\v!big=>#2=-#5,
        \s!unknown=>#2=#1]}
 
 \def\assignalfadimension#1#2#3#4#5%
   {\processaction
      [#1]
-     [   \v!klein=>\edef#2{#3},
-        \v!middel=>\edef#2{#4},
-         \v!groot=>\edef#2{#5},
-          \v!geen=>\edef#2{0},
+     [   \v!small=>\edef#2{#3},
+        \v!medium=>\edef#2{#4},
+         \v!big=>\edef#2{#5},
+          \v!none=>\edef#2{0},
        \s!unknown=>\edef#2{#1}]}
 
 %D De onderstaande implementatie is veel sneller, maar
 %D tegelijkertijd ook veel lelijker. Omdat we deze macro
 %D relatief weinig aanroepen laten we deze optimalisatie maar
 %D achterwege. Bovendien kunnen oplossingen als deze de
-%D hash||table aardig uitputten (\type{\doifdefined}).
+%D hash||table aardig uitputten (\type {\doifdefined}).
 %D
-%D \starttypen
+%D \starttyping
 %D \edef\@@dimension{@@dim}
 %D \edef\@@negdimension{\@@dimension-}
 %D
 %D \def\assigndimension#1#2#3#4#5%
-%D   {\setvalue{\@@dimension\v!klein}{#3}%
-%D    \setvalue{\@@dimension\v!middel}{#4}%
-%D    \setvalue{\@@dimension\v!groot}{#5}%
-%D    \setvalue{\@@dimension\v!geen}{\!!zeropoint}%
-%D    \setvalue{\@@negdimension\v!klein}{-#3}%
-%D    \setvalue{\@@negdimension\v!middel}{-#4}%
-%D    \setvalue{\@@negdimension\v!groot}{-#5}%
-%D    \setvalue{\@@negdimension\v!geen}{\!!zeropoint}%
+%D   {\setvalue{\@@dimension   \v!small }{#3}%
+%D    \setvalue{\@@dimension   \v!medium}{#4}%
+%D    \setvalue{\@@dimension   \v!big   }{#5}%
+%D    \setvalue{\@@dimension   \v!none  }{\!!zeropoint}%
+%D    \setvalue{\@@negdimension\v!small }{-#3}%
+%D    \setvalue{\@@negdimension\v!medium}{-#4}%
+%D    \setvalue{\@@negdimension\v!big   }{-#5}%
+%D    \setvalue{\@@negdimension\v!none  }{\!!zeropoint}%
 %D    \doifdefinedelse{\@@dimension#1}
 %D      {#2=\getvalue{\@@dimension#1}}
 %D      {#2=#1}}
-%D \stoptypen
+%D \stoptyping
 %D
-%D Let's give this a try: 
+%D Let's give this a try:
 
-\let\nopv!geen     \v!geen
-\let\posv!groot    \v!groot 
-\let\posv!middel   \v!middel
-\let\posv!klein    \v!klein 
-\edef\negv!groot {-\v!groot }
-\edef\negv!middel{-\v!middel}
-\edef\negv!klein {-\v!klein }
+\let\nopv!geen     \v!none
+\let\posv!groot    \v!big
+\let\posv!middel   \v!medium
+\let\posv!klein    \v!small
+\edef\negv!groot {-\v!big }
+\edef\negv!middel{-\v!medium}
+\edef\negv!klein {-\v!small }
 
 %\def\assigndimension#1#2#3#4#5%
 %  {\edef\!!stringa{#1}%
@@ -158,38 +158,38 @@
 %D
 %D Een variant hierop is het commando:
 %D
-%D \starttypen
+%D \starttyping
 %D \assignvalue
 %D   {<waarde>|klein|middel|groot}
 %D   {\macro}
 %D   {waarde klein }
 %D   {waarde middel}
 %D   {waarde groot}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Hierbij krijgt \type{\macro} een waarde afhankelijk van
 %D het meegegeven trefwoord:
 %D
-%D \startsmaller
-%D \startregels
+%D \startnarrower
+%D \startlines
 %D \type{klein }\qquad waarde klein
 %D \type{middel}\qquad waarde middel
 %D \type{groot }\qquad waarde groot
 %D \type{waarde}\qquad waarde
-%D \stopregels
-%D \stopsmaller
+%D \stoplines
+%D \stopnarrower
 %D
 %D Hier doet \type{geen} dus niet mee.
 
 \def\assignvalue#1#2#3#4#5%
   {\processaction
      [#1]
-     [   \v!klein=>\edef#2{#3},
-        \v!middel=>\edef#2{#4},
-         \v!groot=>\edef#2{#5},
+     [   \v!small=>\edef#2{#3},
+        \v!medium=>\edef#2{#4},
+         \v!big=>\edef#2{#5},
        \s!unknown=>\edef#2{#1}]}
 
-%D Or faster: 
+%D Or faster:
 
 %\def\assignvalue#1#2#3#4#5%
 %  {\edef\!!stringa{#1}%
@@ -211,12 +211,12 @@
 %D Een breedte van een opgegeven tekst kan worden berekend en
 %D toegekend aan een \DIMENSION\ met:
 %D
-%D \starttypen
+%D \starttyping
 %D \assignwidth
-%D   {\dimensie}
+%D   {\dimension}
 %D   {<waarde>|passend|ruim}
 %D   {tekst}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Dit commando sluit, evenals de bovenstaande
 %D \type{\assign}||commando's, aan op de wijze waarop
@@ -228,10 +228,10 @@
   {\doifelsenothing{#2}
      {\setbox0\hbox{#3}%
       #1\wd0}
-     {\doifinsetelse{#2}{\v!passend,\v!ruim}
+     {\doifinsetelse{#2}{\v!fit,\v!broad}
         {\setbox0=\hbox{#3}%
          #1\wd0
-         \doif{#2}\v!ruim{\advance#1 #4}}%
+         \doif{#2}\v!broad{\advance#1 #4}}%
         {#1=#2}}}%
 
 \protect \endinput
diff --git a/tex/context/base/core-grd.tex b/tex/context/base/core-grd.tex
index 652b7bc94..7b358fa2f 100644
--- a/tex/context/base/core-grd.tex
+++ b/tex/context/base/core-grd.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-grd,
+%D   [       filefile=core-grd,
 %D        version=1998.03.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Grid Snapping (Experimental),
@@ -34,7 +34,7 @@
 %D
 %D The macros put some white space around the box:
 %D
-%D \haalbuffer[1]
+%D \getbuffer[1]
 %D
 %D A simple alternative is \type {\baselinecorrection}, which
 %D only looks at the previous line.
@@ -50,7 +50,7 @@
 %D This time the last preceding line gets a correction,%
 %D dependant on the depth.
 %D
-%D \haalbuffer[2]
+%D \getbuffer[2]
 %D
 %D One can make the correction visible by saying \type
 %D {\showbaselinecorrection}. Part of the correction is
@@ -59,11 +59,11 @@
 %D
 %D When visualize the first example looks like:
 %D
-%D {\showbaselinecorrection\haalbuffer[1]}
+%D {\showbaselinecorrection\getbuffer[1]}
 %D
 %D and the second one comes out as:
 %D
-%D {\showbaselinecorrection\haalbuffer[2]}
+%D {\showbaselinecorrection\getbuffer[2]}
 
 % \definecolor[GridLineColor][red]
 % \definecolor[GridTextColor][blue]
@@ -206,7 +206,7 @@
 %            \nointerlineskip
 %            \dotopbaselinecorrection
 % %        \else
-% %          \ifbinnenkolommen
+% %          \ifinsidecolumns
 % %            % \vskip\dimen2           % this could definitely
 % %            % \penalty\outputpenalty  % be improved
 % %          \else
@@ -236,7 +236,7 @@
   {\ifvmode \ifdim\pagegoal<\maxdimen
      \bgroup
      \setbaselinecorrections
-     \witruimte
+     \whitespace
      \nointerlineskip
      \dotopbaselinecorrection
      \egroup
@@ -321,7 +321,7 @@
 \def\dosnaptogrid[#1]%
   {\resetlastlinewidth % maybe in more places, otherwise spacing gets messed up
    \ifgridsnapping
-     \iffirstargument\doifsomething{#1}{\verplaatsopgrid[#1]}\fi
+     \iffirstargument\doifsomething{#1}{\moveongrid[#1]}\fi
      \expandafter\dodosnaptogrid
    \fi}
 
@@ -384,7 +384,7 @@
         \chardef\depthsnapmethod \plustwo
         \chardef\heightsnapmethod\plustwo
       \fi
-      \ifdim\nextboxht<\teksthoogte % handle special case (like page fig)
+      \ifdim\nextboxht<\textheight % handle special case (like page fig)
         \ifcase\@@alignsnapbox\relax
           \ifcase\@@alignsnap\else % 1=top 2=high 3=middle 4=low
             \ifshowgridboxes
@@ -410,7 +410,7 @@
           \edef\presnapskip{\the\lastskip}%
           % mixing single/double columns sometimes goes wrong,
           % check 'som' document
-          \ifbinnenkolommen
+          \ifinsidecolumns
             \forcepresnaptrue
           \fi
           \forcedpresnapcorrection
@@ -589,7 +589,7 @@
           \flushnextbox
         \fi
       \else
-        \setbox\nextbox\vbox to \teksthoogte
+        \setbox\nextbox\vbox to \textheight
           {\ifdim\nextboxdp=\zeropoint
              \hbox{\lower\strutdepth\flushnextbox}
            \else % this branch is yet untested
@@ -614,7 +614,7 @@
 \def\snaptomathgrid % probably not working ok, also kind of obsolete
   {\ifgridsnapping
      \dowithnextbox
-       {\blanko[\v!regel]\snaptogrid\vbox{\flushnextbox}\blanko[\v!regel]}
+       {\blank[\v!line]\snaptogrid\vbox{\flushnextbox}\blank[\v!line]}
      \vbox\bgroup
        \let\setdisplayskips\relax
        \abovedisplayskip\zeropoint
@@ -790,11 +790,11 @@
   {\global\chardef\@@alignsnapbox3
    \global\let\@@alignsnapamount\commalistelement}
 
-\def\doverplaatsopgrid[#1]%
-  {\ifgridsnapping\doifsomething{#1}{\dodoverplaatsopgrid[#1]}\fi}
+\def\domoveongrid[#1]%
+  {\ifgridsnapping\doifsomething{#1}{\dodomoveongrid[#1]}\fi}
 
 
-\def\dodoverplaatsopgrid[#1]% some day : speed up
+\def\dodomoveongrid[#1]% some day : speed up
   {\global\chardef\@@alignsnap\zerocount
    \global\chardef\@@alignsnapbox\zerocount
    \global\chardef\@@alignsnapdepth\zerocount
@@ -802,40 +802,40 @@
    \global\let\@@alignsnapamount\!!zeropoint
    \donefalse
    \expanded{\processallactionsinset[#1]}
-     [\v!standaard=>,
-        \v!normaal=>, % to be sure
-             \v!ja=>, % to be sure
-          \v!boven=>\gridwarning+\positiveextrasnap\extrasnapbefore,
-          \v!onder=>\gridwarning+\positiveextrasnap\extrasnapafter,
-          \v!beide=>\positiveextrasnap\extrasnaparound,
-         -\v!boven=>\gridwarning-\negativeextrasnap\extrasnapbefore,
-         -\v!onder=>\gridwarning-\negativeextrasnap\extrasnapafter,
-         -\v!beide=>\negativeextrasnap\extrasnaparound,
-          \v!tekst=>\global\chardef\@@alignsnapmethod\plusone, % accurate calculations
-         \v!pagina=>\global\chardef\@@alignsnap1, % topskip
-           \v!hoog=>\global\chardef\@@alignsnap2,
-         \v!midden=>\global\chardef\@@alignsnap3,
-           \v!laag=>\global\chardef\@@alignsnap4,
-        \v!passend=>\global\chardef\@@alignsnapbox1, % new
-           \v!ruim=>\global\chardef\@@alignsnapbox2, % new
-         \v!diepte=>\global\chardef\@@alignsnapdepth1, % new
-          \v!regel=>\global\chardef\@@alignsnapbox3
+     [\v!standard=>,
+        \v!normal=>, % to be sure
+             \v!yes=>, % to be sure
+          \v!top=>\gridwarning+\positiveextrasnap\extrasnapbefore,
+          \v!bottom=>\gridwarning+\positiveextrasnap\extrasnapafter,
+          \v!both=>\positiveextrasnap\extrasnaparound,
+         -\v!top=>\gridwarning-\negativeextrasnap\extrasnapbefore,
+         -\v!bottom=>\gridwarning-\negativeextrasnap\extrasnapafter,
+         -\v!both=>\negativeextrasnap\extrasnaparound,
+          \v!text=>\global\chardef\@@alignsnapmethod\plusone, % accurate calculations
+         \v!page=>\global\chardef\@@alignsnap1, % topskip
+           \v!high=>\global\chardef\@@alignsnap2,
+         \v!middle=>\global\chardef\@@alignsnap3,
+           \v!low=>\global\chardef\@@alignsnap4,
+        \v!fit=>\global\chardef\@@alignsnapbox1, % new
+           \v!broad=>\global\chardef\@@alignsnapbox2, % new
+         \v!depth=>\global\chardef\@@alignsnapdepth1, % new
+          \v!line=>\global\chardef\@@alignsnapbox3
 %                   \global\chardef\@@alignsnapdepth1
                     \global\chardef\@@alignsnap4,
           \v!reset=>\positiveextrasnap\extrasnapreset,
-           \v!geen=>\global\chardef\@@alignsnap0
+           \v!none=>\global\chardef\@@alignsnap0
                     \global\chardef\@@alignsnapbox0,
         \s!default=>,
         \s!unknown=>\@@unknowngriddisplacement]}
 
-\def\verplaatsopgrid
-  {\dosingleempty\doverplaatsopgrid}
+\def\moveongrid
+  {\dosingleempty\domoveongrid}
 
-\def\doplaatsopgrid[#1]%
-  {\doverplaatsopgrid[#1]\snaptogrid\vbox}
+\def\doplaceongrid[#1]%
+  {\domoveongrid[#1]\snaptogrid\vbox}
 
-\def\plaatsopgrid
-  {\dosingleempty\doplaatsopgrid}
+\def\placeongrid
+  {\dosingleempty\doplaceongrid}
 
 %D Snapping is rather robust as long as we use whole lines.
 %D Half lines of white space can however be handled when they
@@ -845,11 +845,11 @@
 %D was written as an extension to the grid typesetting needed
 %D for typesetting (part of) the \MAPS.
 %D
-%D \starttypen
+%D \starttyping
 %D \setuptyping
 %D   [before={\blank[halfline]},
 %D    after={\blank[halfline]}]
-%D \stoptypen
+%D \stoptyping
 
 \newif\iffuzzysnapdone
 \newif\iffuzzysnapping
@@ -942,7 +942,7 @@
 
 \def\docheckfuzzysnap#1%
   {\bgroup
-   \mindermeldingen
+   \dontcomplain
    \setbox\fuzzysnapbox\copy#1\relax
    \setbox\fuzzysnapsplit\vsplit\fuzzysnapbox to 1\lineheight
    \let\topfuzzymark\empty % indeed here ... no real mark
@@ -1017,4 +1017,4 @@
 
 \let\checkgridsnapping\relax
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-hlp.tex b/tex/context/base/core-hlp.tex
index 198a5e09a..5964d85e6 100644
--- a/tex/context/base/core-hlp.tex
+++ b/tex/context/base/core-hlp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-hlp,
+%D   [       filefile=core-hlp,
 %D        version=1998.10.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Help (Experimental),
@@ -8,30 +8,30 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-% todo : dedicated vide/hide voor helps 
+% todo : dedicated vide/hide voor helps
 
 %D This is an experimental and private module, so the interface
 %D and functionality can change. Pieces of code will be moved
-%D to other modules. More features are possible but will be 
-%D interfaces later. See m-chart for an application as well 
-%D as the second tno-tpd manual (graphic in margin, click 
-%D on it, pop up big one, use menu with hides, as well as 
+%D to other modules. More features are possible but will be
+%D interfaces later. See m-chart for an application as well
+%D as the second tno-tpd manual (graphic in margin, click
+%D on it, pop up big one, use menu with hides, as well as
 %D background, etc. etc.
 
-\unprotect 
+\unprotect
 
 \defineframedtext
   [\v!helptext]
 
 \setupframedtexts
   [\v!helptext]
-  [\c!breedte=.75\tekstbreedte,
-   \c!uitlijnen=\v!normaal,
-   \c!kader=\v!uit,
-   \c!achtergrond=\v!raster]
+  [\c!width=.75\textwidth,
+   \c!align=\v!normal,
+   \c!frame=\v!off,
+   \c!background=\v!screen]
 
 \newcounter     \nofhelpdataentries
 \newconditional \somehelpdatadefined
@@ -39,7 +39,7 @@
 \appendtoks \getpagehelpdata         \to \beforeeverypage
 \appendtoks \synchronizepagehelpdata \to \aftereverypage
 
-% will be proper state variable 
+% will be proper state variable
 
 \let\pagehelpdata\empty
 
@@ -47,7 +47,7 @@
   {\let\synchronizepagehelpdata\relax}
 
 \def\resetpagehelpdata
-  {\iflocation  
+  {\iflocation
      \let\synchronizepagehelpdata\resetpagehelpdata
      \global\let\pagehelpdata\empty
      \resetreference[HideHelp]%
@@ -72,7 +72,7 @@
      \fi
      \ifx\pagehelpdata\empty \else
        \useJSscripts[fld]%
-       \definereference[HideHelp][JS(Hide_Fields)]% for the moment 
+       \definereference[HideHelp][JS(Hide_Fields)]% for the moment
      \fi
    \fi\fi}
 
@@ -100,7 +100,7 @@
    \fi
    \dostartbuffer[\v!helptext][\e!start\v!helptext][\e!stop\v!helptext]}
 
-\long\def\helptext[#1]#2% 
+\long\def\helptext[#1]#2%
   {\iflocation
      \global\settrue\somehelpdatadefined
     %\definesymbol[helpinfo:#1][{\doframedtext[\v!helptext]{#2}}]%
@@ -109,12 +109,12 @@
      \dopresetfieldsymbol{\v!helptext:#1}%
    \fi}
 
-\let\definehelptext\helptext % for backward compabilities sake 
+\let\definehelptext\helptext % for backward compabilities sake
 
 \def\dohelpdata#1%
-  {\setbox0\hbox
+  {\setbox\scratchbox\hbox
      {\startoverlay
-        {\box0}
+        {\box\scratchbox}
        %{\definemainfield[help:#1][check][helpsetup][helpinfo:#1][helpinfo:#1]%
         {\definemainfield[help:#1][check][helpsetup][\v!helptext:#1][\v!helptext:#1]%
          \fitfield[help:#1]}
@@ -128,16 +128,16 @@
        \setupfields[\v!reset]%
        \setupfield
          [helpsetup]
-         [\c!breedte=\v!passend,
-          \c!hoogte=\v!passend,
-          \c!kader=\v!uit,
-          \c!klikin=JS(Hide_Fields),
-          \c!optie={\v!alleenleesbaar,\v!verborgen}]%
-       \setbox0=\box\voidb@x
+         [\c!width=\v!fit,
+          \c!height=\v!fit,
+          \c!frame=\v!off,
+          \c!clickin=JS(Hide_Fields),
+          \c!option={\v!readonly,\v!hidden}]%
+       \setbox\scratchbox\emptybox
        \processcommacommand[\pagehelpdata]\dohelpdata
-       \box0
+       \box\scratchbox
      \fi
-     \egroup  
+     \egroup
    \fi}
 
 \def\helpbutton % also gobble spaces between [][]
@@ -150,15 +150,15 @@
      \expandafter\dodohelpbutton
    \fi}
 
-\def\dodohelpbutton[#1][#2]#3[#4]% #2 is space gobbling dummy 
-  {\iflocation 
+\def\dodohelpbutton[#1][#2]#3[#4]% #2 is space gobbling dummy
+  {\iflocation
      \setpagehelpdata[#4]%
      \useJSscripts[fld]%
      \button[#1]{#3}[JS(Vide_Hide_Fields{help:#4})]%
    \fi}
 
-\def\donohelpbutton[#1][#2]% 
-  {\dodohelpbutton[#1][]{}[#2]} 
+\def\donohelpbutton[#1][#2]%
+  {\dodohelpbutton[#1][]{}[#2]}
 
 \def\doifhelpinfo#1#2%
   {\iflocation
@@ -170,4 +170,4 @@
      \doifsymboldefinedelse{helpinfo:#1}{#2}{#3}%
    \fi}
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/core-ini.tex b/tex/context/base/core-ini.tex
index 4fe47b813..e1bdd154a 100644
--- a/tex/context/base/core-ini.tex
+++ b/tex/context/base/core-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ini,
+%D   [       filefile=core-ini,
 %D        version=2003.12.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Additional Initialization,
@@ -18,15 +18,40 @@
 
 \unprotect
 
-\appendtoks \flushsyncresets      \to \everyendoftextbody
+\everypar  \emptytoks
+\neverypar \emptytoks
 
-\appendtoks \ignorespaces         \to \everybeginofpar
+\appendtoks \flushnotes                  \to \everypar
+\appendtoks \synchronizesidefloats       \to \everypar
+\appendtoks \checkindentation            \to \everypar
+\appendtoks \showparagraphnumber         \to \everypar
+\appendtoks \flushmargincontents         \to \everypar
+\appendtoks \flushcommentanchors         \to \everypar
+\appendtoks \synchronizenotes            \to \everypar
+\appendtoks \OTRSETshowstatus            \to \everypar
+\appendtoks \flushpostponedbookmark      \to \everypar
+\appendtoks \registerparoptions          \to \everypar
+\appendtoks \flushsyncpositions          \to \everypar
+\appendtoks \flushpostponednodedata      \to \everypar
+\appendtoks \dohandlespeech              \to \everypar
+\appendtoks \insertparagraphintro        \to \everypar
 
-\appendtoks \removeunwantedspaces \to \everyendofpar
-%appendtoks \strut                \to \everyendofpar % option ?
-\appendtoks \flushsyncresets      \to \everyendofpar
-\appendtoks \setlastlinewidth     \to \everyendofpar % must happen before endgraf
-\appendtoks \endgraf              \to \everyendofpar
+\appendtoks \flushpostponedbookmark      \to \neverypar
+
+\appendtoks \flushnotes                  \to \everydisplay
+\appendtoks \adjustsidefloatdisplaylines \to \everydisplay
+
+\appendtoks \flushsyncpositions          \to \everyheadstart
+
+\appendtoks \flushsyncresets             \to \everyendoftextbody
+
+\appendtoks \ignorespaces                \to \everybeginofpar
+
+\appendtoks \removeunwantedspaces        \to \everyendofpar
+%appendtoks \strut                       \to \everyendofpar % option ?
+\appendtoks \flushsyncresets             \to \everyendofpar
+\appendtoks \setlastlinewidth            \to \everyendofpar % must happen before endgraf
+\appendtoks \endgraf                     \to \everyendofpar
 
 % Todo: verbatim, xml, tex, move code to here
 
@@ -35,4 +60,4 @@
 \appendtoks \catcode`|=\@@active \let|\normalcompound \to \everyTEXinputmode
 \appendtoks \catcode`|=\@@letter                      \to \everyXMLinputmode
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-ins.tex b/tex/context/base/core-ins.tex
index c1185f7de..c1888e656 100644
--- a/tex/context/base/core-ins.tex
+++ b/tex/context/base/core-ins.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ins,
+%D   [       filefile=core-ins,
 %D        version=2002.04.16,
 %D          title=\CONTEXT\ Insertion Macros,
 %D       subtitle=Insertions, 
diff --git a/tex/context/base/core-int.tex b/tex/context/base/core-int.tex
index 2a9899095..52af211d1 100644
--- a/tex/context/base/core-int.tex
+++ b/tex/context/base/core-int.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-int,
+%D   [       filefile=core-int,
 %D        version=1995.01.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Interaction,
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-% evt interactiebalken runtime laden (scheelt 8K)
+% evt interactionbaren runtime laden (scheelt 8K)
 
 %D Still to be done properly.
 
@@ -197,8 +197,8 @@
    \fi
    \iflocation
      \hbox
-       {%\setupinteraction[\c!breedte=\!!zeropoint]%
-        \setinteractionparameter\c!breedte\!!zeropoint
+       {%\setupinteraction[\c!width=\!!zeropoint]%
+        \setinteractionparameter\c!width\!!zeropoint
         \doganaareenpagina\??lk\gotobegincharacter\firstlink\hss
         \ifnum\noflinks>2
           \hskip\@@lkafstand
@@ -259,8 +259,8 @@
    \fi
    \iflocation
      \hbox
-       {%\setupinteraction[\c!breedte=\!!zeropoint]%
-        \setinteractionparameter\c!breedte\!!zeropoint
+       {%\setupinteraction[\c!width=\!!zeropoint]%
+        \setinteractionparameter\c!width\!!zeropoint
         #2\relax
         \hskip\@@lkafstand
         \doganaareenpagina\??lk\gotobegincharacter\firstlink\hss
@@ -279,42 +279,42 @@
 
 \let\setupinteractionscreens\empty
 
-\def\berekeninteractiescherm
-  {\doifelse\@@scbreedte\v!passend
-     {\!!widtha\linkerrandbreedte
-      \advance\!!widtha \linkerrandafstand
-      \advance\!!widtha \linkermargebreedte
-      \advance\!!widtha \linkermargeafstand
-      \ifdim\rugwit>\!!widtha\ifdim\rugwit>\zeropoint\relax
-        \advance\rugwit -\!!widtha
+\def\docalculateinteractionscreen
+  {\doifelse\@@scwidth\v!fit
+     {\!!widtha\leftedgewidth
+      \advance\!!widtha \leftedgedistance
+      \advance\!!widtha \leftmarginwidth
+      \advance\!!widtha \leftmargindistance
+      \ifdim\backspace>\!!widtha\ifdim\backspace>\zeropoint\relax
+        \advance\backspace -\!!widtha
       \fi\fi
-      \advance\!!widtha \zetbreedte
-      \advance\!!widtha \rechtermargeafstand
-      \advance\!!widtha \rechtermargebreedte
-      \advance\!!widtha \rechterrandafstand
-      \advance\!!widtha \rechterrandbreedte
-      \scratchdimen\@@scrugwit
-      \advance\scratchdimen \@@scrugoffset
+      \advance\!!widtha \makeupwidth
+      \advance\!!widtha \rightmargindistance
+      \advance\!!widtha \rightmarginwidth
+      \advance\!!widtha \rightedgedistance
+      \advance\!!widtha \rightedgewidth
+      \scratchdimen\@@scbackspace
+      \advance\scratchdimen \@@schoroffset
       \advance\!!widtha 2\scratchdimen}
-     {\doifelse\@@scbreedte\v!max
-        {\!!widtha\printpapierbreedte}
-        {\!!widtha\@@scbreedte}}%
-   \doifelse\@@schoogte\v!passend
-     {\!!heighta\bovenhoogte
-      \advance\!!heighta \bovenafstand
-      \ifdim\kopwit>\!!heighta\ifdim\kopwit>\zeropoint\relax
-        \advance\kopwit -\!!heighta
+     {\doifelse\@@scwidth\v!max
+        {\!!widtha\printpaperwidth}
+        {\!!widtha\@@scwidth}}%
+   \doifelse\@@scheight\v!fit
+     {\!!heighta\topheight
+      \advance\!!heighta \topdistance
+      \ifdim\topspace>\!!heighta\ifdim\topspace>\zeropoint\relax
+        \advance\topspace -\!!heighta
       \fi\fi
-      \advance\!!heighta \zethoogte
-      \advance\!!heighta \onderafstand
-      \advance\!!heighta \onderhoogte
-      \scratchdimen\@@sckopwit
-      \advance\scratchdimen \@@sckopoffset
+      \advance\!!heighta \makeupheight
+      \advance\!!heighta \bottomdistance
+      \advance\!!heighta \bottomheight
+      \scratchdimen\@@sctopspace
+      \advance\scratchdimen \@@scveroffset
       \advance\!!heighta 2\scratchdimen}
-     {\doifelse\@@schoogte\v!max
-        {\!!heighta\printpapierhoogte}
-        {\!!heighta\@@schoogte}}%
-   \doif\@@scwachttijd\v!geen{\let\@@scwachttijd\zerocountervalue}}
+     {\doifelse\@@scheight\v!max
+        {\!!heighta\printpaperheight}
+        {\!!heighta\@@scheight}}%
+   \doif\@@scdelay\v!none{\let\@@scdelay\zerocountervalue}}
 
 % The macro is not to be changed; only the \@@ia-variables
 % may be set! ConTeXt is the producer but we no longer
@@ -323,10 +323,10 @@
 % with documents produced outside our control.
 
 \def\doprepareidentity
-  {\let\!!stringa\@@iatrefwoord
-   \let\@@iatrefwoord\empty
-   \def\doprepareidentity##1{\edef\@@iatrefwoord
-     {\@@iatrefwoord\ifx\@@iatrefwoord\empty\else\space\fi##1}}%
+  {\let\!!stringa\@@iakeyword
+   \let\@@iakeyword\empty
+   \def\doprepareidentity##1{\edef\@@iakeyword
+     {\@@iakeyword\ifx\@@iakeyword\empty\else\space\fi##1}}%
    \@EA\processcommacommand\@EA[\!!stringa]\doprepareidentity
    \global\let\doprepareidentity\relax}
 
@@ -335,8 +335,8 @@
      \doprepareidentity
      \expanded
        {\dosetupidentity
-          {\@@iatitel}{\@@iasubtitel}{\@@iaauteur}{#1}%
-          {\@@iadatum}{\@@iatrefwoord}}%
+          {\@@iatitle}{\@@iasubtitle}{\@@iaauthor}{#1}%
+          {\@@iadate}{\@@iakeyword}}%
      \global\let\initializeidentity\relax
   }%\fi}
 
@@ -347,11 +347,11 @@
 
 \def\initializepaper
   {\bgroup
-   \ifx\@@pplinks \empty
-   \ifx\@@pprechts\empty
-   \ifx\@@ppboven \empty
-   \ifx\@@pponder \empty
-   \ifx\@@pcstatus\v!start
+   \ifx\@@ppleft \empty
+   \ifx\@@ppright\empty
+   \ifx\@@pptop \empty
+   \ifx\@@ppbottom \empty
+   \ifx\@@pcstate\v!start
      \locationfalse\fi\else
      \locationfalse\fi\else
      \locationfalse\fi\else
@@ -359,43 +359,43 @@
      \locationfalse\fi
    \iflocation % without screen settings
      \egroup
-     \dosetuppaper\papersize\papierbreedte\papierhoogte
+     \dosetuppaper\papersize\paperwidth\paperheight
    \else
      \egroup
-     \dosetuppaper\printpapersize\printpapierbreedte\printpapierhoogte
+     \dosetuppaper\printpapersize\printpaperwidth\printpaperheight
    \fi}
 
 \appendtoks \initializepaper \to \everyshipout
 
 \def\doinitializepaper
   {\bgroup
-   \berekeninteractiescherm
-   \ifdim\!!widtha>\papierbreedte\ifdim\!!widtha>\zeropoint
-     \papierbreedte\!!widtha
+   \docalculateinteractionscreen
+   \ifdim\!!widtha>\paperwidth\ifdim\!!widtha>\zeropoint
+     \paperwidth\!!widtha
    \fi\fi
-   \ifdim\!!heighta>\papierhoogte\ifdim\!!heighta>\zeropoint
-     \papierhoogte\!!heighta
+   \ifdim\!!heighta>\paperheight\ifdim\!!heighta>\zeropoint
+     \paperheight\!!heighta
    \fi\fi
    \dosetuppaper
      {\printpapersize}
-     {\the\papierbreedte}
-     {\the\papierhoogte}%
+     {\the\paperwidth}
+     {\the\paperheight}%
    \egroup}
 
 \let\@@pcscreendata\empty
 
 \def\dosetupinteractionscreens % met a, b en \number
-  {\doifnot\@@pcstatus\v!start\dodosetupinteractionscreens}
+  {\doifnot\@@pcstate\v!start\dodosetupinteractionscreens}
 
-\setvalue{\??sc\c!optie\v!max         }{1} % tzt share with driver
-\setvalue{\??sc\c!optie\v!bookmark    }{2} % tzt share with driver
-\setvalue{\??sc\c!optie\v!passend     }{3} % tzt share with driver
-\setvalue{\??sc\c!optie\v!dubbelzijdig}{4} % tzt share with driver
+\setvalue{\??sc\c!option\v!max         }{1} % tzt share with driver
+\setvalue{\??sc\c!option\v!bookmark    }{2} % tzt share with driver
+\setvalue{\??sc\c!option\v!fit     }{3} % tzt share with driver
+\setvalue{\??sc\c!option\v!doublesided}{4} % tzt share with driver
 
 \def\dodosetupinteractionscreens % met a, b en \number
   {\bgroup
-   \berekeninteractiescherm
-   \!!counte=0\getvalue{\??sc\c!optie\@@scoptie}\relax
+   \docalculateinteractionscreen
+   \!!counte=0\getvalue{\??sc\c!option\@@scoption}\relax
    % niet waterdicht
    \doifnot{\the\!!widtha\the\!!heighta}\@@pcscreendata
      {\xdef\@@pcscreendata{\the\!!widtha\the\!!heighta}%
@@ -406,7 +406,7 @@
    \dosetupcropbox\rugoffset\kopoffset\!!widtha\!!heighta
    \egroup}
 
-\def\dostelinteractieschermin[#1]%
+\def\dosetupinteractionscreen[#1]%
   {\getparameters[\??sc][#1]%
    \ifproductionrun
      \let\initializepaper\doinitializepaper
@@ -415,8 +415,8 @@
 
 \appendtoks \setupinteractionscreens \to \everyshipout
 
-\def\stelinteractieschermin
-  {\dosingleempty\dostelinteractieschermin}
+\def\setupinteractionscreen
+  {\dosingleempty\dosetupinteractionscreen}
 
 %D Due to requests I finally decided to support bookmarks, a
 %D driver dependant way of showing tables of content. The most
@@ -441,10 +441,10 @@
 \def\@@booklevel{bl::}
 \def\@@bookcount{bc::}
 
-\definieerlijst[\@@bookmark]
+\definelist[\@@bookmark]
 
-\appendtoks\flushpostponedbookmark\to\everypar
-\appendtoks\flushpostponedbookmark\to\neverypar
+% \appendtoks\flushpostponedbookmark\to\everypar
+% \appendtoks\flushpostponedbookmark\to\neverypar
 
 \newtoks\postponedbookmarks
 
@@ -462,11 +462,11 @@
      \egroup
    \fi
    \doglobal\prependtoks
-     \schrijfnaarlijst[\@@bookmark]{}{#1}%
+     \writetolist[\@@bookmark]{}{#1}%
    \to\postponedbookmarks}
 
 \def\complexbookmark[#1]#2%
-  {\doglobal\appendtoks\schrijfnaarlijst[#1]{}{#2}\to\postponedbookmarks}
+  {\doglobal\appendtoks\writetolist[#1]{}{#2}\to\postponedbookmarks}
 
 \definecomplexorsimple\bookmark
 
@@ -494,7 +494,7 @@
        \flushbookmark
        \egroup
      \else
-       \expanded{\placebookmarks\@EA[\getvalue{\??ih\v!inhoud\c!lijst}]}%
+       \expanded{\placebookmarks\@EA[\getvalue{\??ih\v!content\c!list}]}%
      \fi
    \fi}
 
@@ -608,7 +608,7 @@
    \iftracebookmarks(#6: #4)\quad(\the\openbookmark)\par\fi
    \doinsertbookmark{#2}{#3}{#4}{#5}{\openbookmark}}
 
-% \startinteractiemenu[rechts]
+% \startinteractionmenu[rechts]
 %   \but [eerste]  eerste  \\
 %   \txt hello world       \\
 %   \but [tweede]  tweede  \\
@@ -620,14 +620,14 @@
 %   \but [tweede]  tweede  \\
 %   \com \vfill            \\
 %   \but [derde]   derde   \\
-% \stopinteractiemenu
+% \stopinteractionmenu
 
 \newif\iflocationmenupermitted
 
-\def\testinteractiemenu#1%
+\def\testinteractionmenu#1%
    {\iflocation
-      \doifelse\@@iamenu\v!aan
-        {\doifelsevalue{\??am#1\c!status}\v!start
+      \doifelse\@@iamenu\v!on
+        {\doifelsevalue{\??am#1\c!state}\v!start
            {\global\locationmenupermittedtrue}
            {\global\locationmenupermittedfalse}}
         {\global\locationmenupermittedfalse}%
@@ -635,22 +635,22 @@
       \global\locationmenupermittedfalse
     \fi}
 
-\def\doblokkeerinteractiemenu[#1][#2][#3]%
-  {\def\dodoblokkeerinteractiemenu##1%
+\def\dodisableinteractionmenu[#1][#2][#3]%
+  {\def\dododisableinteractionmenu##1%
      {\doifelse{#3}{}
-        {\letvalue{\??am##1\c!blokkade}\empty}
-        {\edef\interactieblokkade{\getvalue{\??am##1\c!blokkade}}
+        {\letvalue{\??am##1\c!obstruction}\empty}
+        {\edef\interactieblokkade{\getvalue{\??am##1\c!obstruction}}
          \def\docommando####1%
            {#1{####1}{\interactieblokkade}}% #1 = \remove or \add
          \processcommalist[#3]\docommando
-         \setevalue{\??am##1\c!blokkade}{\interactieblokkade}}}%
-   \processcommalist[#2]\dodoblokkeerinteractiemenu}
+         \setevalue{\??am##1\c!obstruction}{\interactieblokkade}}}%
+   \processcommalist[#2]\dododisableinteractionmenu}
 
-\def\blokkeerinteractiemenu
-  {\dotripleempty\doblokkeerinteractiemenu[\addtocommalist]}
+\def\disableinteractionmenu
+  {\dotripleempty\dodisableinteractionmenu[\addtocommalist]}
 
-\def\geefinteractiemenuvrij
-  {\dotripleempty\doblokkeerinteractiemenu[\removefromcommalist]}
+\def\enableinteractionmenu
+  {\dotripleempty\dodisableinteractionmenu[\removefromcommalist]}
 
 % ja   : kader/achtergrond met tekst
 % leeg : kader/achtergrond maar geen tekst
@@ -683,7 +683,7 @@
   {\global\skippedmenuitemfalse
    \setbox\locationbox\hbox
      {\resetgoto % anders cyclische aanroep !
-      \localframed[#1][#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}}%
+      \localframed[#1][#2]{\dolocationattributes{#1}\c!style\c!color{#3}}}%
    \iflocationclick
      \hbox{\gotolocation{#4}{\box\locationbox}}%
    \else
@@ -693,10 +693,10 @@
 \let\dosetlocationboxyes\dosetlocationboxcontent
 
 \def\dosetlocationboxempty#1[%
-  {\dosetlocationboxcontent{#1}[\c!leeg=\v!ja,}
+  {\dosetlocationboxcontent{#1}[\c!empty=\v!yes,}
 
 \def\dosetlocationboxno#1[%
-  {\dosetlocationboxcontent{#1}[\c!leeg=\v!ja,\c!kader=,\c!achtergrond=,}
+  {\dosetlocationboxcontent{#1}[\c!empty=\v!yes,\c!frame=,\c!background=,}
 
 \def\dosetlocationboxnone#1[#2]#3[#4]%
   {\global\skippedmenuitemtrue}
@@ -757,18 +757,18 @@
       \gotolocation
         {#4}% % needed
         {\ifrealreferencepage
-           \ifcase\csname\??am\??am\csname#1\c!zelfdepagina\endcsname\endcsname\relax
-             \copycsname#1\c!kleur\endcsname\csname#1\c!contrastkleur\endcsname
-             \localframed[#1][#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+           \ifcase\csname\??am\??am\csname#1\c!samepage\endcsname\endcsname\relax
+             \copycsname#1\c!color\endcsname\csname#1\c!contrastcolor\endcsname
+             \localframed[#1][#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
            \or
-             \localframed[#1][\c!leeg=\v!ja,#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+             \localframed[#1][\c!empty=\v!yes,#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
            \or
-             \localframed[#1][\c!leeg=\v!ja,\c!kader=,\c!achtergrond=,#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+             \localframed[#1][\c!empty=\v!yes,\c!frame=,\c!background=,#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
            \or
              \global\skippedmenuitemtrue
            \fi
          \else
-           \localframed[#1][#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+           \localframed[#1][#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
          \fi}}%
    \ifskippedmenuitem\else\box\locationbox\fi}
 
@@ -777,23 +777,23 @@
    \setbox\locationbox\hbox
      {\resetgoto % anders cyclische aanroep !
       \global\skippedmenuitemfalse
-      \ifcase\csname\??am\??am\csname#1\c!onbekendeverwijzing\endcsname\endcsname\relax
-        \localframed[#1][#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+      \ifcase\csname\??am\??am\csname#1\c!unknownreference\endcsname\endcsname\relax
+        \localframed[#1][#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
       \or
-        \localframed[#1][\c!leeg=\v!ja,#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+        \localframed[#1][\c!empty=\v!yes,#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
       \or
-        \localframed[#1][\c!leeg=\v!ja,\c!kader=,\c!achtergrond=,#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}%
+        \localframed[#1][\c!empty=\v!yes,\c!frame=,\c!background=,#2]{\dolocationattributes{#1}\c!style\c!color{#3}}%
       \or
         \global\skippedmenuitemtrue
       \fi}%
    \ifskippedmenuitem\else\box\locationbox\fi}
 
 \def\setlocationboxraw#1[#2]#3[#4]%
-  {\localframed[#1][#2]{\dolocationattributes{#1}\c!letter\c!kleur{#3}}}
+  {\localframed[#1][#2]{\dolocationattributes{#1}\c!style\c!color{#3}}}
 
 \def\setlocationbox#1[#2]#3[#4]%
   {\bgroup % really needed !
-   \edef\permittedreferences{\csname#1\c!blokkade\endcsname}%
+   \edef\permittedreferences{\csname#1\c!obstruction\endcsname}%
    \doifreferencepermittedelse{#4}%
      {\setlocationboxyes{#1}[#2]{#3}[#4]}%
      {\setlocationboxnop{#1}[#2]{#3}[#4]}%
@@ -819,9 +819,9 @@
 \def\executeamboxcommands#1#2#3#4#5%
   {%\processaction
    %  [\getvalue{\??am#1\c!dummy}]
-   %  [  \v!ja=>\chardef\handleunknownmenuitem=0\relax,
-   %   \v!leeg=>\chardef\handleunknownmenuitem=1\relax,
-   %    \v!nee=>\chardef\handleunknownmenuitem=2\relax]%
+   %  [  \v!yes=>\chardef\handleunknownmenuitem=0\relax,
+   %   \v!empty=>\chardef\handleunknownmenuitem=1\relax,
+   %    \v!no=>\chardef\handleunknownmenuitem=2\relax]%
    \getvalue{\??am#1#3}\relax
    \ifextendedmenu
      \setamboxcommands{#1}{#4}%
@@ -861,20 +861,20 @@
 \to \everysetmenucommands
 
 \def\menu@raw[#1]#2\\%
-  {\@@amboxcommand\naarbox{\ignorespaces#2\unskip}[#1]\\}%
+  {\@@amboxcommand\gotobox{\ignorespaces#2\unskip}[#1]\\}%
 
 \def\menu@but[#1]#2\\%
   {\@@amboxcommand\do@@amposition\currentmenu{#1}{\setlocationbox{\??am\currentmenu}[]{\ignorespaces#2\unskip}[#1]}\\}%
 
 \def\menu@got[#1]#2\\% pas op! offset
-  {\@@amboxcommand\setlocationbox{\??am\currentmenu}[\c!kader=\v!uit,\c!achtergrond=]{\ignorespaces#2\unskip}[#1]\\}%
+  {\@@amboxcommand\setlocationbox{\??am\currentmenu}[\c!frame=\v!off,\c!background=]{\ignorespaces#2\unskip}[#1]\\}%
 
 \def\menu@nop#1\\%
  %{\@@amboxcommand\phantom{\localframed[\??am\currentmenu][]{#1}}\\}%
-  {\@@amboxcommand\setlocationboxraw{\??am\currentmenu}[\c!kader=\v!uit,\c!achtergrond=,\c!leeg=\v!ja]{\ignorespaces#1\unskip}[]\\}%
+  {\@@amboxcommand\setlocationboxraw{\??am\currentmenu}[\c!frame=\v!off,\c!background=,\c!empty=\v!yes]{\ignorespaces#1\unskip}[]\\}%
 
 \def\menu@txt#1\\%
-  {\@@amboxcommand\localframed[\??am\currentmenu][\c!kader=\v!uit,\c!achtergrond=]{\ignorespaces#1\unskip}\\}%
+  {\@@amboxcommand\localframed[\??am\currentmenu][\c!frame=\v!off,\c!background=]{\ignorespaces#1\unskip}\\}%
 
 \def\menu@rul#1\\% ook \do@@amposition !
   {\@@amboxcommand\localframed[\??am\currentmenu][]{\ignorespaces#1\unskip}\\}%
@@ -902,24 +902,24 @@
 
 \def\@@amhbox#1#2#3#4%
   {\def\currentmenu{#3}%
-   \testinteractiemenu{#3}%
+   \testinteractionmenu{#3}%
    \iflocationmenupermitted
      \bgroup
      \showcomposition
      \def\dolocationcommand##1{\dosetlocationcommanditem{#3}{##1}}%
-     \dimen0=\zetbreedte
+     \dimen0=\makeupwidth
      \advance\dimen0 \pagebackgroundhoffset
      \advance\dimen0 \pagebackgroundhoffset
-     \advance\dimen0 -\getvalue{\??am#3\c!linkeroffset}%
-     \advance\dimen0 -\getvalue{\??am#3\c!rechteroffset}%
+     \advance\dimen0 -\getvalue{\??am#3\c!leftoffset}%
+     \advance\dimen0 -\getvalue{\??am#3\c!rightoffset}%
      \setbox0\hbox to \dimen0
        {\forgetall
-        \executeamboxcommands{#3}{#4}\c!links\c!midden\c!rechts}%
+        \executeamboxcommands{#3}{#4}\c!left\c!middle\c!right}%
      \setbox0\hbox{\do@@ammenuposition{#3}{\box0}}%
-     \wd0=\zetbreedte
+     \wd0=\makeupwidth
      % geen \ht=#2 setting (yet)
      \hskip-\pagebackgroundhoffset
-     \hskip \getvalue{\??am#3\c!linkeroffset}%
+     \hskip \getvalue{\??am#3\c!leftoffset}%
      \box0\relax
      \egroup
    \else
@@ -928,30 +928,30 @@
 
 \def\@@amvbox#1#2#3#4% don't change skipping, this one works!
   {\def\currentmenu{#3}%
-   \testinteractiemenu{#3}%
+   \testinteractionmenu{#3}%
    \iflocationmenupermitted
      \bgroup
      \showcomposition
-     \dimen0=\teksthoogte
+     \dimen0=\textheight
      \advance\dimen0 \pagebackgroundvoffset
      \advance\dimen0 \pagebackgroundvoffset
      \advance\dimen0 \pagebackgrounddepth
-     \advance\dimen0 -\getvalue{\??am#3\c!bovenoffset}%
-     \advance\dimen0 -\getvalue{\??am#3\c!onderoffset}%
+     \advance\dimen0 -\getvalue{\??am#3\c!topoffset}%
+     \advance\dimen0 -\getvalue{\??am#3\c!bottomoffset}%
      \setbox0\vbox to \dimen0
        {\forgetall                     % Voor't geval de afstand
-       %\setupblank[\v!standaard]%   % (tijdelijk) is aangepast.
+       %\setupblank[\v!standard]%   % (tijdelijk) is aangepast.
         \restorestandardblank
         \hsize#2\relax
-        \executeamboxcommands{#3}{#4}\c!voor\c!tussen\c!na}%
+        \executeamboxcommands{#3}{#4}\c!before\c!inbetween\c!after}%
      \setbox0\vbox{\hbox{\do@@ammenuposition{#3}{\box0}}}%
      \setbox0\vbox
        {\vskip-\pagebackgroundvoffset
-        \vskip\getvalue{\??am#3\c!bovenoffset}%
+        \vskip\getvalue{\??am#3\c!topoffset}%
         \ht0=\zeropoint
         \box0
         \vskip\pagebackgroundvoffset}% overbodig
-     \ht0=\teksthoogte
+     \ht0=\textheight
      \wd0=#2\relax
      \box0
      \egroup
@@ -963,84 +963,84 @@
   \let\do@@ammenuposition\gobbleoneargument % hook for positional thingies
 \fi
 
-\setvalue{\??am\s!do\v!rechts}{\@@amvbox{\dodummypageskip\v!rechts}\rechterrandbreedte}
-\setvalue{\??am\s!do\v!links }{\@@amvbox{\dodummypageskip\v!links}\linkerrandbreedte}
-\setvalue{\??am\s!do\v!boven }{\@@amhbox{\dodummypageskip\v!boven}\bovenhoogte}
-\setvalue{\??am\s!do\v!onder }{\@@amhbox{\dodummypageskip\v!onder}\onderhoogte}
+\setvalue{\??am\s!do\v!right}{\@@amvbox{\dodummypageskip\v!right}\rightedgewidth}
+\setvalue{\??am\s!do\v!left }{\@@amvbox{\dodummypageskip\v!left}\leftedgewidth}
+\setvalue{\??am\s!do\v!top }{\@@amhbox{\dodummypageskip\v!top}\topheight}
+\setvalue{\??am\s!do\v!bottom }{\@@amhbox{\dodummypageskip\v!bottom}\bottomheight}
 
-\def\dointeractiemenu#1#2%
-  {\getvalue{\??am\s!do\getvalue{\??am#1\c!plaats}}{#1}{#2}}
+\def\dointeractionmenu#1#2%
+  {\getvalue{\??am\s!do\getvalue{\??am#1\c!location}}{#1}{#2}}
 
-\unexpanded\def\interactiemenu[#1]%
+\unexpanded\def\interactionmenu[#1]%
   {\getvalue{\??am\c!menu#1}}
 
-\def\horizontaalinteractiemenu#1#2#3#4%
+\def\horizontalinteractionmenu#1#2#3#4%
   {\ifdim#2>\zeropoint % new
      \dimen2\zeropoint
      \setbox0\hbox
        {\def\docommando##1%
-          {\doifnotvalue{\??am##1\c!status}\v!geen
+          {\doifnotvalue{\??am##1\c!state}\v!none
              {\hskip\dimen2
               \setbox2\hbox to #2
-                {\getvalue{\??am##1#3}\interactiemenu[##1]\getvalue{\??am##1#4}}%
-              \doifelsevalue{\??am##1\c!afstand}\v!overlay
+                {\getvalue{\??am##1#3}\interactionmenu[##1]\getvalue{\??am##1#4}}%
+              \doifelsevalue{\??am##1\c!distance}\v!overlay
                 {\dimen2\zeropoint
                  \wd2\zeropoint}%
-                {\dimen2=\getvalue{\??am##1\c!afstand}}%
+                {\dimen2=\getvalue{\??am##1\c!distance}}%
               \box2}}%
-       \startinteractie
+       \startinteraction
        \processcommacommand[\getvalue{\??am#1}]\docommando
-       \stopinteractie}%
+       \stopinteraction}%
      \wd0=#2\relax
      \box0\relax
    \fi}
 
-\def\vertikaalinteractiemenu#1#2#3#4%
+\def\verticalinteractionmenu#1#2#3#4%
   {\ifdim#2>\zeropoint % new
      \dimen2\zeropoint
      \setbox0\vbox
        {\def\docommando##1%
-          {\doifnotvalue{\??am##1\c!status}\v!geen
+          {\doifnotvalue{\??am##1\c!state}\v!none
              {\vskip\dimen2
               \setbox2\vbox to #2
-                {\getvalue{\??am##1#3}\interactiemenu[##1]\getvalue{\??am##1#4}}%
-              \doifelsevalue{\??am##1\c!afstand}\v!overlay
+                {\getvalue{\??am##1#3}\interactionmenu[##1]\getvalue{\??am##1#4}}%
+              \doifelsevalue{\??am##1\c!distance}\v!overlay
                 {\dimen2\zeropoint
                  \offinterlineskip
                  \dp2\zeropoint
                  \ht2\zeropoint}%
-                {\dimen2=\getvalue{\??am##1\c!afstand}}%
+                {\dimen2=\getvalue{\??am##1\c!distance}}%
               \box2}}%
-        \startinteractie
+        \startinteraction
         \processcommacommand[\getvalue{\??am#1}]\docommando
-        \stopinteractie}%
+        \stopinteraction}%
      \ht0=#2\relax
      \dp0\zeropoint
      \box0\relax
    \fi}
 
-\letvalue{\??am\v!links }\empty
-\letvalue{\??am\v!rechts}\empty
-\letvalue{\??am\v!boven }\empty
-\letvalue{\??am\v!onder }\empty
+\letvalue{\??am\v!left }\empty
+\letvalue{\??am\v!right}\empty
+\letvalue{\??am\v!top }\empty
+\letvalue{\??am\v!bottom }\empty
 
 % todo : \defineinteractionmenuclass
 
-\def\interactiemenus[#1]%
+\def\interactionmenus[#1]%
   {\iflocation
      \getvalue{\??am\??am\c!menu#1}%
    \else
      \dodummypageskip{#1}%
    \fi}
 
-\setvalue{\??am\??am\c!menu\v!links}%
-  {\horizontaalinteractiemenu\v!links\linkerrandbreedte\c!links\c!rechts}
-\setvalue{\??am\??am\c!menu\v!rechts}%
-  {\horizontaalinteractiemenu\v!rechts\rechterrandbreedte\c!links\c!rechts}
-\setvalue{\??am\??am\c!menu\v!boven}%
-  {\vertikaalinteractiemenu\v!boven\bovenhoogte\c!voor\c!na}
-\setvalue{\??am\??am\c!menu\v!onder}%
-  {\vertikaalinteractiemenu\v!onder\onderhoogte\c!voor\c!na}
+\setvalue{\??am\??am\c!menu\v!left}%
+  {\horizontalinteractionmenu\v!left\leftedgewidth\c!left\c!right}
+\setvalue{\??am\??am\c!menu\v!right}%
+  {\horizontalinteractionmenu\v!right\rightedgewidth\c!left\c!right}
+\setvalue{\??am\??am\c!menu\v!top}%
+  {\verticalinteractionmenu\v!top\topheight\c!before\c!after}
+\setvalue{\??am\??am\c!menu\v!bottom}%
+  {\verticalinteractionmenu\v!bottom\bottomheight\c!before\c!after}
 
 % this can be implemented with the following command (which
 % is new, undocumented, experimental, untested, etc etc)
@@ -1049,13 +1049,13 @@
   {\dodoubleargument\dodefineinteractionmenuclass}
 
 \def\dodefineinteractionmenuclass[#1][#2]% tag hori|veri
-  {\doifelse{#2}\v!vertikaal
+  {\doifelse{#2}\v!vertical
      {\setvalue{\??am\??am\c!menu#1}%
-        {\vertikaalinteractiemenu
-           {#1}{\getvalue{\??am#1\c!breedte}}\c!voor\c!na}}
+        {\verticalinteractionmenu
+           {#1}{\getvalue{\??am#1\c!width}}\c!before\c!after}}
      {\setvalue{\??am\??am\c!menu#1}%
-        {\horizontaalinteractiemenu
-           {#1}{\getvalue{\??am#1\c!hoogte}}\c!links\c!rechts}}}
+        {\horizontalinteractionmenu
+           {#1}{\getvalue{\??am#1\c!height}}\c!left\c!right}}}
 
 % \setupinteraction[menu=on,state=start]
 %
@@ -1075,7 +1075,7 @@
 %   \but [nextpage]  test-b \\
 % \stopinteractionmenu
 %
-% \setupheadertexts[{\interactiemenu[another]}]
+% \setupheadertexts[{\interactionmenu[another]}]
 %
 % \starttext
 %
@@ -1090,18 +1090,18 @@
 
 \def\local@@ambox#1#2#3#4% don't change skipping, this one works!
   {\bgroup
-   \testinteractiemenu{#3}%
+   \testinteractionmenu{#3}%
    \iflocationmenupermitted
-     \executeamboxcommands{#3}{#4}\c!voor\c!tussen\c!na
+     \executeamboxcommands{#3}{#4}\c!before\c!inbetween\c!after
    \else
      #1\relax
    \fi
    \egroup}
 
 \unprotected\def\includemenu[#1]%
-  {\doifvalue{\??am#1\c!status}\v!lokaal
+  {\doifvalue{\??am#1\c!state}\v!local
      {\bgroup
-      \letvalue{\??am#1\c!status}\v!start
+      \letvalue{\??am#1\c!state}\v!start
       \let\@@amvbox\local@@ambox
       \let\@@amhbox\local@@ambox
       \getvalue{\??am\c!menu#1}%
@@ -1112,83 +1112,83 @@
 
 % for the moment we will support the old method
 %
-% \stelinteractiemenuin[right][{abc[xyz]},...]
-% \stelinteractiemenuin[right][key=val,...]
+% \stelinteractionmenuin[right][{abc[xyz]},...]
+% \stelinteractionmenuin[right][key=val,...]
 
 \newif\ifextendedmenu
 
-\def\definieerinteractiemenu
-  {\dotripleempty\dodefinieerinteractiemenu}
+\def\defineinteractionmenu
+  {\dotripleempty\dodefineinteractionmenu}
 
-\def\dodefinieerinteractiemenu[#1][#2]% compatibility hack
+\def\dodefineinteractionmenu[#1][#2]% compatibility hack
   {\convertargument#2\to\ascii        % will disappear soon
    \doifinstringelse[\ascii
      \dodostelinteractielijstmenuinx
-     \dododefinieerinteractiemenu
+     \dododefineinteractionmenu
    [#1][#2]}
 
 % [name] [location]
 % [name] [location] [pars]
 
-\def\dododefinieerinteractiemenu[#1][#2][#3]%
+\def\dododefineinteractionmenu[#1][#2][#3]%
   {% main settings
    \letvalue{\??am\c!menu#1}\empty
    % \setvalue{\??am\c!menu#1}%
-   %   {\extendedmenufalse\dointeractiemenu{#1}{}}%
+   %   {\extendedmenufalse\dointeractionmenu{#1}{}}%
    \setvalue{\@@dodolijstelement#1}%
-     {\def\dosomelijstelement{\dodomenulijstelement{#1}}}%
+     {\def\dosomelijstelement{\dodomenulistelement{#1}}}%
    \presetlocalframed[\??am#1]%
    % register location
    \expanded{\addtocommalist{#1}\@EA\noexpand\csname\??am#2\endcsname}%
    % inherit settings
    \doifnot{#1}{#2}
      {\copyparameters[\??am#1][\??am#2]
-        [\c!links,\c!midden,\c!rechts,\c!voor,\c!na,\c!tussen,%
-         \c!breedte,\c!hoogte,\c!afstand,\c!offset,%
-         \c!kader,\c!kaderkleur,\c!lijndikte,%
-         \c!achtergrond,\c!achtergrondkleur,\c!achtergrondraster,%
-         \c!letter,\c!kleur,\c!contrastkleur,\c!zelfdepagina,\c!onbekendeverwijzing,%
-         \c!linkeroffset,\c!rechteroffset,\c!bovenoffset,\c!onderoffset]}%
+        [\c!left,\c!middle,\c!right,\c!before,\c!after,\c!inbetween,%
+         \c!width,\c!height,\c!distance,\c!offset,%
+         \c!frame,\c!framecolor,\c!rulethickness,%
+         \c!background,\c!backgroundcolor,\c!backgroundscreen,%
+         \c!style,\c!color,\c!contrastcolor,\c!samepage,\c!unknownreference,%
+         \c!leftoffset,\c!rightoffset,\c!topoffset,\c!bottomoffset]}%
    % additional settings
-   \getparameters[\??am#1][\c!plaats=#2,\c!blokkade=,#3]}
+   \getparameters[\??am#1][\c!location=#2,\c!obstruction=,#3]}
 
-\def\stelinteractiemenuin
-  {\dodoubleargument\dostelinteractiemenuin}
+\def\setupinteractionmenu
+  {\dodoubleargument\dosetupinteractionmenu}
 
-\def\dostelinteractiemenuin[#1][% compatibillity hack
+\def\dosetupinteractionmenu[#1][% compatibillity hack
   {\doifnextcharelse\bgroup     % will disappear soon
      {\dodostelinteractielijstmenuiny[#1][}
-     {\dodostelinteractiemenuin      [#1][}}
+     {\dodosetupinteractionmenu      [#1][}}
 
 \def\dodostelinteractielijstmenuinx[#1][#2][#3]% compatibillity hack
-  {\setvalue{\??am\c!menu#1}{\extendedmenufalse\dointeractiemenu{#1}{#2}}}
+  {\setvalue{\??am\c!menu#1}{\extendedmenufalse\dointeractionmenu{#1}{#2}}}
 
 \def\dodostelinteractielijstmenuiny[#1][#2]% compatibillity hack
   {\setvalue{\??am\c!menu#1}%
-     {\extendedmenufalse\dointeractiemenu{#1}{#2}}}
+     {\extendedmenufalse\dointeractionmenu{#1}{#2}}}
 
-\def\dodostelinteractiemenuin[#1][#2]%
+\def\dodosetupinteractionmenu[#1][#2]%
   {\def\docommando##1{\getparameters[\??am##1][#2]}%
    \processcommalist[#1]\docommando}
 
-\setvalue{\??am\??am\v!ja  }{0}
-\setvalue{\??am\??am\v!leeg}{1}
-\setvalue{\??am\??am\v!nee }{2}
-\setvalue{\??am\??am\v!geen}{3}
+\setvalue{\??am\??am\v!yes  }{0}
+\setvalue{\??am\??am\v!empty}{1}
+\setvalue{\??am\??am\v!no }{2}
+\setvalue{\??am\??am\v!none}{3}
 \setvalue{\??am\??am       }{1} % default
 
-\processbetween{\v!interactiemenu}\dostartinteractiemenu
+\processbetween{\v!interactionmenu}\dostartinteractionmenu
 
-\def\dostartinteractiemenu#1%
-  {\dodostartinteractiemenu#1\dodostopinteractiemenu}
+\def\dostartinteractionmenu#1%
+  {\dodostartinteractionmenu#1\dodostopinteractionmenu}
 
-\def\dodostartinteractiemenu[#1]#2\dodostopinteractiemenu
-  {\setvalue{\??am\c!menu#1}{\extendedmenutrue\dointeractiemenu{#1}{#2}}}
+\def\dodostartinteractionmenu[#1]#2\dodostopinteractionmenu
+  {\setvalue{\??am\c!menu#1}{\extendedmenutrue\dointeractionmenu{#1}{#2}}}
 
 \def\resetinteractionmenu[#1]%
   {\letvalue{\??am\c!menu#1}\empty}
 
-\def\dodomenulijstelement#1#2#3#4#5#6#7%
+\def\dodomenulistelement#1#2#3#4#5#6#7%
   {\setbox0=\hbox
      {\let\gotolocation\gobbleoneargument % hack to catch last []
 %\locationclickfalse % ipv ^
@@ -1196,24 +1196,18 @@
       \setlocationboxyes
         {\??am#1}% % needed !
         []% no settings
-        {\limitatetext{#5}{\getvalue{\??li#2\c!maxbreedte}}{\unknown}}% % needed !
+        {\limitatetext{#5}{\getvalue{\??li#2\c!maxwidth}}{\unknown}}% % needed !
         []}% normally the destination, catch by gobble
    \@@amboxcommand\do@@amposition{#1}{#7}% beware, we pass the pagenumber
      {\ignorespaces\linklisttoelement{#2}{#3}{#6}{#7}{\box0}\unskip}\\}
 
-% \scherm moet worden als \pagina
+% \scherm moet worden als \page
 
-\def\simplescherm%  zou niet nodig moeten zijn
-  {\iflocation
-     \pagina[\v!ja]%
-   \fi}
+\def\screen
+  {\dosingleempty\doscreen}
 
-\def\complexscherm[#1]%
-  {\iflocation
-     \pagina[#1]%
-   \fi}
-
-\definecomplexorsimple\scherm
+\def\doscreen[#1]%
+  {\iflocation\page[#1]\fi}
 
 \unexpanded\def\menubutton
   {\dodoubleempty\domenubutton}
@@ -1259,7 +1253,7 @@
   {\bgroup
    \def\setlocationbox##1[##2]##3[##4]%
      {\localframed[##1][##2]%
-        {\dolocationattributes{##1}\c!letter\c!kleur{##3}}}%
+        {\dolocationattributes{##1}\c!style\c!color{##3}}}%
    \domenubutton[#1][#2]#3[]%
    \egroup}
 
@@ -1286,15 +1280,15 @@
 
 \newif\ifsynchronisation
 
-\def\startsynchronisatie%
+\def\startsynchronization%
   {\iflocation\ifsynchronisation
      \doglobal\increment\synccounter
    \fi\fi}
 
-\def\stopsynchronisatie%
+\def\stopsynchronization%
   {\iflocation\ifsynchronisation
      %\thisisdestination{\syncprefix:\synccounter}%
-     \paginareferentie[\syncprefix:\synccounter]%
+     \pagereference[\syncprefix:\synccounter]%
      \ifvmode
        \@EA\setmark\@EA\syncmarker\@EA{\synccounter} % \marking[\syncmarker]{\synccounter}%
      \else
@@ -1302,35 +1296,35 @@
      \fi
    \fi\fi}
 
-\def\synchroniseer%
-  {\startsynchronisatie
-   \stopsynchronisatie}
+\def\synchronize%
+  {\startsynchronization
+   \stopsynchronization}
 
-\def\dostelsynchronisatiein[#1]%
+\def\dosetupsynchronization[#1]%
   {\getparameters[\??sy][#1]%
-   \doifelse\@@systatus\v!start
+   \doifelse\@@systate\v!start
      \synchronisationtrue
      \synchronisationfalse}
 
-\def\stelsynchronisatiein
-  {\dosingleargument\dostelsynchronisatiein}
+\def\setupsynchronization
+  {\dosingleargument\dosetupsynchronization}
 
-\def\definieersynchronisatie
-  {\dosingleargument\dodefinieersynchronisatie}
+\def\definesynchronization
+  {\dosingleargument\dodefinesynchronization}
 
-\def\stelsynchronisatiebalkin
+\def\setupsynchronizationbar
   {\dodoubleargument\getparameters[\??ba]}
 
 \presetlocalframed[\??ba]
 
-\setvalue{synchronisatie\v!pagina}[#1]%
+\setvalue{synchronisatie\v!page}[#1]%
   {\bgroup
-  %\setupinteraction[\c!breedte=\!!zeropoint]%
-   \setinteractionparameter\c!breedte\!!zeropoint
+  %\setupinteraction[\c!width=\!!zeropoint]%
+   \setinteractionparameter\c!width\!!zeropoint
    \setbox0=\hbox
      {\localframed[\??ba][]%
-        {\dolocationattributes\??ba\c!letter\c!kleur{\strut\@@batekst}}}%
-   \mindermeldingen
+        {\dolocationattributes\??ba\c!style\c!color{\strut\@@batext}}}%
+   \dontcomplain
    \def\onder%
      {\leaders\hrule\!!depth1ex\!!height-.5ex\hfil}%
    \def\boven##1##2##3%
@@ -1341,9 +1335,9 @@
       \advance\dimen0 -##3\dimen2
       %\gotodestination
       %  {}{#1}{\syncprefix:##1}{}
-      %  {\hbox to \dimen0{\color[\locationcolor\@@bakleur]{\onder}}}}%
-      \naarbox
-        {\hbox to \dimen0{\color[\locationcolor\@@bakleur]{\onder}}}%
+      %  {\hbox to \dimen0{\color[\locationcolor\@@bacolor]{\onder}}}}%
+      \gotobox
+        {\hbox to \dimen0{\color[\locationcolor\@@bacolor]{\onder}}}%
         [#1::\syncprefix:##1]}%
    \hbox
      {\def\check##1##2%
@@ -1370,25 +1364,25 @@
       \box0\relax}%
    \egroup}
 
-\setvalue{synchronisatie\v!lokaal}[#1]%
+\setvalue{synchronisatie\v!local}[#1]%
   {\bgroup
-  %\setupinteraction[\c!breedte=\!!zeropoint]%
-   \setinteractionparameter\c!breedte\!!zeropoint
+  %\setupinteraction[\c!width=\!!zeropoint]%
+   \setinteractionparameter\c!width\!!zeropoint
    \def\blackrule{\hbox{\vrule\!!height.5em\!!width.5em}}%
    %\gotodestination
    %   {}{##1}{\syncprefix:#1}{0}
-   %   {\color[\locationcolor\@@bakleur]{\blackrule}}%
-   \naarbox %
-     {\color[\locationcolor\@@bakleur]{\blackrule}}%
+   %   {\color[\locationcolor\@@bacolor]{\blackrule}}%
+   \gotobox %
+     {\color[\locationcolor\@@bacolor]{\blackrule}}%
      [#1::\syncprefix:\synccounter]%
    \egroup}
 
-\def\synchronisatiebalk[#1][#2]%
+\def\synchronizationbar[#1][#2]%
   {\iflocation\ifsynchronisation
      \bgroup
-     \stelsynchronisatiebalkin
-       [\c!tekst=\getvalue{doc:des:#1},#2]%
-     \getvalue{synchronisatie\@@bavariant}[#1]%
+     \setupsynchronizationbar
+       [\c!text=\getvalue{doc:des:#1},#2]%
+     \getvalue{synchronisatie\@@baalternative}[#1]%
      \egroup
    \fi\fi}
 
@@ -1408,7 +1402,7 @@
          {\hbox{\gotorealpage{}{}{#3}
             {#2}}}
          {\hbox{\gotorealpage{}{}{#3}
-            {\dolocationattributes{#1}\c!letter\c!kleur{#2}}}}%
+            {\dolocationattributes{#1}\c!style\c!color{#2}}}}%
      \fi
    \else
      {#2}%
@@ -1416,13 +1410,13 @@
 
 \presetlocalframed[\??ib]
 
-\def\interactiebalka
+\def\interactionbara
   {\iflocation
      \bgroup
-    %\setupinteraction[\c!breedte=\!!zeropoint]%
-     \setinteractionparameter\c!breedte\!!zeropoint
-     \setupblackrules[\c!hoogte=\v!max,\c!diepte=\v!max]% maten ??
-     \!!widthb\@@ibbreedte
+    %\setupinteraction[\c!width=\!!zeropoint]%
+     \setinteractionparameter\c!width\!!zeropoint
+     \setupblackrules[\c!height=\v!max,\c!depth=\v!max]% maten ??
+     \!!widthb\@@ibwidth
      \advance\!!widthb -2.75em\relax
      \!!widtha\!!widthb
      \divide\!!widtha \lastpage\relax
@@ -1431,20 +1425,20 @@
        \ifvoid\meterbox
          \bgroup
          \processaction
-           [\@@ibstap]
-           [   \v!klein=>\dimen0=.25em\relax,
-              \v!middel=>\dimen0=.5em\relax,
-               \v!groot=>\dimen0=1em\relax,
+           [\@@ibstep]
+           [   \v!small=>\dimen0=.25em\relax,
+              \v!medium=>\dimen0=.5em\relax,
+               \v!big=>\dimen0=1em\relax,
              \s!unknown=>\dimen0=\!!widtha]%
          \ifdim\!!widtha<\dimen0\relax
            \!!counta\dimen0\relax
            \!!countb\!!widtha
            \divide\!!counta \!!countb
          \else
-           \!!counta\@@ibstap\relax
+           \!!counta\@@ibstep\relax
          \fi
          \!!widtha=\!!counta\!!widtha
-         \setbox0\hbox{\blackrule[\c!breedte=\!!widtha]}%
+         \setbox0\hbox{\blackrule[\c!width=\!!widtha]}%
          \global\setbox\meterbox\hbox to \!!widthb
            {\hss
             % brrr
@@ -1457,9 +1451,9 @@
      \egroup
      \noindent
      \strut
-     \hbox to \@@ibbreedte
-       {\mindermeldingen
-        \setupblackrules[\c!breedte=1em]%
+     \hbox to \@@ibwidth
+       {\dontcomplain
+        \setupblackrules[\c!width=1em]%
         \doganaareenpagina\??ib\blackrule\firstpage
         \hss
         \color[middlegray]{\copy\meterbox}%
@@ -1467,7 +1461,7 @@
           {\ifdim\!!widtha<1em\relax
              \!!widtha=1em\relax
            \fi
-           \setupblackrules[\c!breedte=\!!widtha]%
+           \setupblackrules[\c!width=\!!widtha]%
            \ifnum\realpageno>\plusone
              \!!counta\realpageno
              \advance\!!counta -2\relax
@@ -1475,7 +1469,7 @@
              % or just: \hskip\zeropoint\!!plus\!!counta \relax % cm gives overflow
              \doganaareenpagina\??ib\blackrule\prevpage
            \fi
-           \color[\@@ibcontrastkleur]{\blackrule[\c!breedte=.5em]}%
+           \color[\@@ibcontrastcolor]{\blackrule[\c!width=.5em]}%
            \ifnum\realpageno<\lastpage\relax
              \doganaareenpagina\??ib\blackrule\nextpage
              \!!counta\lastpage
@@ -1489,23 +1483,23 @@
      \egroup
    \fi}
 
-\def\interactiebalkb
+\def\interactionbarb
   {\ifnum\lastpage>\firstpage\relax
-     \interactiebuttons
-       [\v!eerstepagina,
-        \v!vorigepagina,
-        \v!volgendepagina,
-        \v!laatstepagina]%
+     \interactionbuttons
+       [\v!firstpage,
+        \v!previouspage,
+        \v!nextpage,
+        \v!lastpage]%
    \fi}
 
-\def\interactiebalkc
+\def\interactionbarc
   {\iflocation
      \ifnum\lastpage>\plusone
-       \hbox to \@@ibbreedte
-         {\setupblackrules[\c!hoogte=\@@ibhoogte,\c!diepte=\@@ibdiepte]%
+       \hbox to \@@ibwidth
+         {\setupblackrules[\c!height=\@@ibheight,\c!depth=\@@ibdepth]%
           \def\gotox##1%
-            {\doganaareenpagina{}{\blackrule[\c!breedte=##1]}}%
-          \dimen0=\@@ibbreedte\relax
+            {\doganaareenpagina{}{\blackrule[\c!width=##1]}}%
+          \dimen0=\@@ibwidth\relax
           \advance\dimen0 -4em
           \!!counta\lastpage
           \advance\!!counta \minusone
@@ -1516,11 +1510,11 @@
           \!!countb\lastpage
           \advance\!!countb -\realpageno
           \!!widthb\!!countb\dimen0
-          \startcolor[\locationcolor\@@ibkleur]%
+          \startcolor[\locationcolor\@@ibcolor]%
           \gotox{1em}\firstpage
           \hss
           \gotox\!!widtha\prevpage
-          \color[\@@ibcontrastkleur]{\blackrule[\c!breedte=1em]}%
+          \color[\@@ibcontrastcolor]{\blackrule[\c!width=1em]}%
           \gotox\!!widthb\nextpage
           \hss
           \gotox{1em}\lastpage
@@ -1528,28 +1522,28 @@
      \fi
    \fi}
 
-\def\interactiebalkd
+\def\interactionbard
   {\iflocation\ifshowingsubpage
      \ifnum\nofsubpages>\plusone
        \hbox
        \bgroup
-      %\setupinteraction[\c!breedte=\!!zeropoint]%
-       \setinteractionparameter\c!breedte\!!zeropoint
+      %\setupinteraction[\c!width=\!!zeropoint]%
+       \setinteractionparameter\c!width\!!zeropoint
        \ifbalksymbool % beter: 3 chars assign en 3*box
-         \setupsymbolset[\@@iasymboolset]%
-         \setbox0\hbox{\symbol[\v!vorige]}%
-         \setbox2\hbox{\symbol[\v!ergens]}%
-         \setbox4\hbox{\symbol[\v!volgende]}%
+         \setupsymbolset[\@@iasymbolset]%
+         \setbox0\hbox{\symbol[\v!previous]}%
+         \setbox2\hbox{\symbol[\v!somewhere]}%
+         \setbox4\hbox{\symbol[\v!next]}%
        \else
          \setbox0\hbox
            {\vrule
-              \!!height\@@ibhoogte
-              \!!depth\@@ibdiepte
-              \!!width\@@ibbreedte}%
+              \!!height\@@ibheight
+              \!!depth\@@ibdepth
+              \!!width\@@ibwidth}%
          \setbox2\copy0
          \setbox4\copy0
        \fi
-       \startcolor[\locationcolor\@@ibkleur]%
+       \startcolor[\locationcolor\@@ibcolor]%
        \for\teller=1\to\nofsubpages\step1\do % brr, \dostepwiserecurse
          {\bgroup
           \increment(\teller,\firstsubpage)\relax
@@ -1558,52 +1552,52 @@
             \gotorealpage{}{}{\teller}{\copy0}\relax
           \else\ifnum\teller=\realpageno\relax
             \color
-              [\@@ibcontrastkleur]
+              [\@@ibcontrastcolor]
               {\gotorealpage{}{}{\teller}{\copy2}}%
           \else
             \gotorealpage{}{}{\teller}{\copy4}\relax
           \fi\fi
           \egroup
-          \hskip\@@ibafstand}%
+          \hskip\@@ibdistance}%
        \unskip
        \stopcolor
        \egroup
      \fi
    \fi\fi}
 
-\def\interactiebalke%  KAN WORDEN GECOMBINEERD MET D
+\def\interactionbare%  KAN WORDEN GECOMBINEERD MET D
   {\iflocation\ifshowingsubpage
      \ifnum\nofsubpages>\plusone
        \bgroup
-       \!!widthb\@@ibafstand
+       \!!widthb\@@ibdistance
        \multiply\!!widthb \nofsubpages
-       \advance\!!widthb -\@@ibafstand % (n-1)
-       \!!widtha\@@ibbreedte
+       \advance\!!widthb -\@@ibdistance % (n-1)
+       \!!widtha\@@ibwidth
        \advance\!!widtha -\!!widthb
        \divide\!!widtha \nofsubpages\relax
-       \ifdim\!!widtha<\@@ibafstand\relax
-         \interactiebalkf
+       \ifdim\!!widtha<\@@ibdistance\relax
+         \interactionbarf
        \else
-        %\setupinteraction[\c!breedte=\!!zeropoint]%
-         \setinteractionparameter\c!breedte\!!zeropoint
+        %\setupinteraction[\c!width=\!!zeropoint]%
+         \setinteractionparameter\c!width\!!zeropoint
          \noindent
-         \hbox to \@@ibbreedte
+         \hbox to \@@ibwidth
            \bgroup
              \ifbalksymbool
-               \setupsymbolset[\@@iasymboolset]%
-               \setbox0\hbox{\symbol[\v!vorige]}%
-               \setbox2\hbox{\symbol[\v!ergens]}%
-               \setbox4\hbox{\symbol[\v!volgende]}%
+               \setupsymbolset[\@@iasymbolset]%
+               \setbox0\hbox{\symbol[\v!previous]}%
+               \setbox2\hbox{\symbol[\v!somewhere]}%
+               \setbox4\hbox{\symbol[\v!next]}%
              \else
                \setbox0\hbox
                   {\vrule
-                     \!!height\@@ibhoogte
-                     \!!depth\@@ibdiepte
+                     \!!height\@@ibheight
+                     \!!depth\@@ibdepth
                      \!!width\!!widtha}%
                \setbox2\copy0
                \setbox4\copy0
              \fi
-             \startcolor[\locationcolor\@@ibkleur]%
+             \startcolor[\locationcolor\@@ibcolor]%
              \for\teller=1\to\nofsubpages\step1\do
                {\bgroup
                 \increment(\teller,\firstsubpage)\relax
@@ -1612,7 +1606,7 @@
                   \gotorealpage{}{}{\teller}{\copy0}\relax
                 \else\ifnum\teller=\realpageno\relax
                   \color
-                    [\@@ibcontrastkleur]
+                    [\@@ibcontrastcolor]
                     {\gotorealpage{}{}{\teller}{\copy2}}%
                 \else
                   \gotorealpage{}{}{\teller}{\copy4}\relax
@@ -1627,13 +1621,13 @@
      \fi
    \fi\fi}
 
-\def\interactiebalkf%  !! KAN WORDEN GECOMBINEERD MET D !!
+\def\interactionbarf%  !! KAN WORDEN GECOMBINEERD MET D !!
   {\iflocation\ifshowingsubpage
      \ifnum\nofsubpages>\plusone
-      %\setupinteraction[\c!breedte=\!!zeropoint]%
-       \setinteractionparameter\c!breedte\!!zeropoint
+      %\setupinteraction[\c!width=\!!zeropoint]%
+       \setinteractionparameter\c!width\!!zeropoint
        \noindent
-       \hbox to \@@ibbreedte
+       \hbox to \@@ibwidth
        \bgroup
        \!!countb\zerocount
        \loop
@@ -1641,32 +1635,32 @@
          \!!countc\nofsubpages
          \divide\!!countc \!!countb
          \advance\!!countc \plusone
-         \!!widthb\@@ibafstand
+         \!!widthb\@@ibdistance
          \multiply\!!widthb \!!countc
-         \advance\!!widthb -\@@ibafstand
-         \!!widtha\@@ibbreedte
+         \advance\!!widthb -\@@ibdistance
+         \!!widtha\@@ibwidth
          \advance\!!widtha -\!!widthb
          \divide\!!widtha \!!countc
-         \ifdim\!!widtha<\@@ibafstand\relax
+         \ifdim\!!widtha<\@@ibdistance\relax
        \repeat
 \advance\!!countc -2
-\!!widtha-\@@ibafstand
+\!!widtha-\@@ibdistance
 \!!widtha=\!!countc\!!widtha
-\advance\!!widtha \@@ibbreedte
+\advance\!!widtha \@@ibwidth
 \advance\!!countc \plusone
 \divide\!!widtha \!!countc
        \ifbalksymbool
-         \setupsymbolset[\@@iasymboolset]%
-         \setbox0\hbox{\symbol[\v!vorige]}%
-         \setbox4\hbox{\symbol[\v!ergens]}%
-         \setbox8\hbox{\symbol[\v!volgende]}%
+         \setupsymbolset[\@@iasymbolset]%
+         \setbox0\hbox{\symbol[\v!previous]}%
+         \setbox4\hbox{\symbol[\v!somewhere]}%
+         \setbox8\hbox{\symbol[\v!next]}%
          \setbox2\copy4
          \setbox6\copy4
        \else
          \setbox0\hbox
            {\vrule
-              \!!height\@@ibhoogte
-              \!!depth\@@ibdiepte
+              \!!height\@@ibheight
+              \!!depth\@@ibdepth
               \!!width\!!widtha}%
          \setbox4\copy0
          \setbox8\copy0
@@ -1682,14 +1676,14 @@
        \def\gotox##1%
          {\ifnum\teller=\realpageno
             \color
-              [\@@ibcontrastkleur]
+              [\@@ibcontrastcolor]
               {\gotorealpage{}{}{\teller}{\copy##1}}%
           \else
             \gotorealpage{}{}{\teller}{\copy##1}%
           \fi
           \!!countf\zerocount
           \hss}%
-       \startcolor[\locationcolor\@@ibkleur]%
+       \startcolor[\locationcolor\@@ibcolor]%
        \!!countc\realpageno \advance\!!countc -2
        \!!countd\realpageno \advance\!!countd 2
        \!!countf\zerocount
@@ -1722,47 +1716,47 @@
      \fi
    \fi\fi}
 
-\def\interactiebalkg
+\def\interactionbarg
   {\ifnum\lastsubpage>\firstsubpage\relax
-     \interactiebuttons
-       [\v!eerstesubpagina,
-        \v!vorigesubpagina,
-        \v!volgendesubpagina,
-        \v!laatstesubpagina]%
+     \interactionbuttons
+       [\v!firstsubpage,
+        \v!previoussubpage,
+        \v!nextsubpage,
+        \v!lastsubpage]%
    \fi}
 
-\def\checkinteractiebalk#1#2#3%
-  {\ifdim\@@ibbreedte=\zeropoint\def\@@ibbreedte{#1}\fi
-   \doifnothing\@@ibhoogte{\def\@@ibhoogte{#2}}%
-   \doifnothing\@@ibdiepte{\def\@@ibdiepte{#3}}}
+\def\checkinteractionbar#1#2#3%
+  {\ifdim\@@ibwidth=\zeropoint\def\@@ibwidth{#1}\fi
+   \doifnothing\@@ibheight{\def\@@ibheight{#2}}%
+   \doifnothing\@@ibdepth{\def\@@ibdepth{#3}}}
 
-\def\complexinteractiebalk[#1]%
+\def\complexinteractionbar[#1]%
   {\doifelse{#1}\v!reset
     {\global\setbox\meterbox\box\voidb@x}%
     {\bgroup
        \iflocation
          \checksubpages % goes wrong / loads \numberofpages too
          \getparameters[\??ib][#1]%
-         \doif\@@ibstatus\v!start
-           {\startinteractie
+         \doif\@@ibstate\v!start
+           {\startinteraction
             \processaction % breedte defaults !
-              [\@@ibvariant]
-              [         c=>\checkinteractiebalk{.5em}\v!max \v!max,
-                        d=>\checkinteractiebalk{.5em}{.5em} \!!zeropoint,
-                        e=>\checkinteractiebalk{.5em}{.5em} \!!zeropoint,
-                        f=>\checkinteractiebalk{.5em}{.5em} \!!zeropoint,
-               \s!default=>\checkinteractiebalk{10em}\v!ruim\!!zeropoint,
-               \s!unknown=>\checkinteractiebalk{10em}\v!ruim\!!zeropoint]%
-            \doifelse\@@ibsymbool\v!ja
+              [\@@ibalternative]
+              [         c=>\checkinteractionbar{.5em}\v!max \v!max,
+                        d=>\checkinteractionbar{.5em}{.5em} \!!zeropoint,
+                        e=>\checkinteractionbar{.5em}{.5em} \!!zeropoint,
+                        f=>\checkinteractionbar{.5em}{.5em} \!!zeropoint,
+               \s!default=>\checkinteractionbar{10em}\v!broad\!!zeropoint,
+               \s!unknown=>\checkinteractionbar{10em}\v!broad\!!zeropoint]%
+            \doifelse\@@ibsymbol\v!yes
               \balksymbooltrue\balksymboolfalse
-            \getvalue{interactiebalk\@@ibvariant}%
-            \stopinteractie}%
+            \getvalue{interactionbar\@@ibalternative}%
+            \stopinteraction}%
        \fi
      \egroup}}
 
-\definecomplexorsimpleempty\interactiebalk
+\definecomplexorsimpleempty\interactionbar
 
-\def\stelinteractiebalkin%
+\def\setupinteractionbar
   {\dodoubleargument\getparameters[\??ib]}
 
 % Er wordt vooralsnog uitgegaan van een symmetrische
@@ -1771,20 +1765,20 @@
 \def\c!profiel!! {profiel:}  % brrr
 \def\c!versie!!  {versie:}
 
-\def\dodefinieerprofiel[#1][#2]%
+\def\dodefineprofile[#1][#2]%
   {\iflocation
-     \def\dododefinieerprofiel##1%
-       {\def\dodododefinieerprofiel####1%
+     \def\dododefineprofile##1%
+       {\def\dodododefineprofile####1%
           {\doifdefinedelse{\c!profiel!!####1}%
              {\edef\!!stringa{\getvalue{\c!profiel!!####1}}%
               \setevalue{\c!profiel!!####1}{\!!stringa,##1}}%
              {\setevalue{\c!profiel!!####1}{##1}}}%
-        \processcommalist[#2]\dodododefinieerprofiel}%
-     \processcommalist[#1]\dododefinieerprofiel
+        \processcommalist[#2]\dodododefineprofile}%
+     \processcommalist[#1]\dododefineprofile
    \fi}
 
-\def\definieerprofiel%
-  {\dodoubleargument\dodefinieerprofiel}
+\def\defineprofile%
+  {\dodoubleargument\dodefineprofile}
 
 % Als met \getpar wordt gewerkt, dan moet \next worden toegepast.
 
@@ -1807,25 +1801,25 @@
           {\addtocommalist{##2}\processedprofiles
             ##1\relax
             \ifcase#1\relax
-              \dobeginofprofile{##2}\papierbreedte\papierhoogte\profilepage
+              \dobeginofprofile{##2}\paperwidth\paperheight\profilepage
             \else
               \doendofprofile
             \fi}}%
      \let\processedprofiles\empty
      \def\doprocessprofile##1%
-       {\doifelse{\@@pfoptie}{\v!test}%
-          {\goodbreak\blanko\nobreak\tt[\spatie
-           \ifcase#1\v!start\else\v!stop\fi profiel\spatie ##1:\spatie
+       {\doifelse{\@@pfoption}{\v!test}%
+          {\goodbreak\blank\nobreak\tt[\space
+           \ifcase#1\v!start\else\v!stop\fi profiel\space ##1:\space
            \doifdefinedelse{\c!profiel!!##1}%
              {\def\dodoprocessprofile####1%
                 {\processoneprofile
-                   {\naar{####1}[\c!profiel!!####1]}%
+                   {\goto{####1}[\c!profiel!!####1]}%
                    {####1}%
-                 \spatie}%
+                 \space}%
               \processcommacommand
                 [\getvalue{\c!profiel!!##1}]\dodoprocessprofile}%
              {- }%
-           ]\nobreak\blanko}%
+           ]\nobreak\blank}%
           {\doifdefined{\c!profiel!!##1}%
              {\def\dodoprocessprofile####1%
                 {\processoneprofile{}{####1}}%
@@ -1836,11 +1830,11 @@
      \par % needed for pdftex
    \fi}
 
-\def\startprofiel[#1]%
+\def\startprofile[#1]%
   {\iflocation
      \bgroup
      \addtocommalist{#1}\actualprofile
-     \def\stopprofiel%
+     \def\stopprofile%
        {\processprofile1[#1]%
         \egroup}%
      \def\next{\processprofile0[#1]}% % \DoAfterFi \processprofile0[#1]%
@@ -1849,14 +1843,14 @@
    \fi
    \next}
 
-\let\stopprofiel\relax
+\let\stopprofile\relax
 
-\def\dovolgprofiel#1[#2]%
+\def\dofollowprofile#1[#2]%
   {\iflocation
      \hbox
        {\dostartgoto
           \data
-            {\dolocationattributes\??ia\c!letter\c!kleur{#1\presetgoto}}%
+            {\dolocationattributes\??ia\c!style\c!color{#1\presetgoto}}%
           \start
             \dostartgotoprofile\buttonwidth\buttonheight{#2}%
           \stop
@@ -1866,13 +1860,13 @@
      {#1}%
    \fi}
 
-\def\volgprofiel#1[#2]%
+\def\followprofile#1[#2]%
   {\iflocation
-     \doif\@@pfoptie\v!test{\pagereference[\c!profiel!!#2]}%
-     \dovolgprofiel{#1}[#2]%
+     \doif\@@pfoption\v!test{\pagereference[\c!profiel!!#2]}%
+     \dofollowprofile{#1}[#2]%
    \fi}
 
-\def\stelprofielenin%
+\def\setupprofiles%
   {\dodoubleargument\getparameters[\??pf]}
 
 % Als er nog geen tekst op de pagina staat, dan heeft het
@@ -1916,13 +1910,13 @@
 \def\minimumversion{0}
 \def\actualversion{0}
 
-\def\dostelversiesin[#1]%
+\def\dosetupversions[#1]%
   {\getparameters[\??ve][#1]
-   \stripcharacter.\from\@@venummer\to\minimumversion
+   \stripcharacter.\from\@@venumber\to\minimumversion
    \setversion}
 
-\def\stelversiesin%
-  {\dosingleargument\dostelversiesin}
+\def\setupversions%
+  {\dosingleargument\dosetupversions}
 
 \definetwopasslist{\s!versionbegin}
 \definetwopasslist{\s!versionend}
@@ -1990,11 +1984,11 @@
 \let\resetpageversion = \relax
 \let\checkpageversion = \relax
 
-\def\complexstartversie[#1]%
+\def\complexstartversion[#1]%
   {\bgroup
    \doifelsenothing\actualprofile
-     {\startprofiel[#1]}%
-     {\startprofiel[#1,\actualprofile]}%
+     {\startprofile[#1]}%
+     {\startprofile[#1,\actualprofile]}%
    \def\docomplexstartversie##1%
      {\stripcharacter.\from##1\to\actualversion
       \ifnum\versionlevel>\zerocount\relax
@@ -2013,10 +2007,10 @@
      {\docomplexstartversie{0}}%
      {\processcommalist[#1]\docomplexstartversie}}
 
-\definecomplexorsimpleempty\startversie
+\definecomplexorsimpleempty\startversion
 
-\def\stopversie%
-  {\stopprofiel
+\def\stopversion%
+  {\stopprofile
    \doglobal\decrement\versionlevel
    \ifnum\versionlevel<\zerocount
      \showmessage\m!versions1\empty
@@ -2031,21 +2025,21 @@
   {\catcode`@=\active        % we can't use \@@active here
    \long\def@##1##2 %
      {\ifx##1+%
-        \startversie[##2]%
+        \startversion[##2]%
       \else\ifx##1-%
-        \stopversie
+        \stopversion
       \else
         \oldatcharacter##1##2 %
       \fi\fi}}
 \egroup
 
-\def\markeerversie
+\def\markversion
   {\showmessage\m!versions2\empty
    \let\setpageversion\dosetpageversion
    \let\resetpageversion\relax
    \let\checkpageversion\relax}
 
-\def\selecteerversie
+\def\selectversion
   {\checkrecentcontributions
    \showmessage\m!versions3\recentcontributions
    \let\setpageversio\gobbleoneargument
@@ -2053,50 +2047,50 @@
    \let\checkpageversion\docheckpageversion
    \setversion}
 
-\def\dodefinieerversie[#1][#2]%
+\def\dodefineversion[#1][#2]%
   {\setvalue{\c!versie!!#1}{#2}%
-   \definieerprofiel[#1][#2]}
+   \defineprofile[#1][#2]}
 
-\def\definieerversie
-  {\dodoubleargument\dodefinieerversie}
+\def\defineversion
+  {\dodoubleargument\dodefineversion}
 
-\def\volgversie
-  {\volgprofiel}
+\def\followversion
+  {\followprofile}
 
-\def\volgprofielversie#1[#2][#3]%
+\def\followprofileversion#1[#2][#3]%
   {\def\docommando##1%
-     {\definieerprofiel[#2#3][##1]}%
+     {\defineprofile[#2#3][##1]}%
    \processcommacommand[\getvalue{\c!versie!!#3}]\docommando
-   \volgprofiel#1[#2#3]}
+   \followprofile#1[#2#3]}
 
 \newcounter\currentpagetransition
 
 \newif\ifrandomtransitions
 
-\def\stelpaginaovergangenin%
-  {\dosingleempty\dostelpaginaovergangenin}
+\def\setuppagetransitions%
+  {\dosingleempty\dosetuppagetransitions}
 
-\def\dostelpaginaovergangenin[#1]%
+\def\dosetuppagetransitions[#1]%
   {\doifelsenothing{#1}
-     {\doifnot\@@scwachttijd\v!geen
+     {\doifnot\@@scdelay\v!none
         {\let\setpagetransition\setsomepagedelay}}
      {\doifelse{#1}\v!start
-        {\doifnot\@@scwachttijd\v!geen
+        {\doifnot\@@scdelay\v!none
            {\let\setpagetransition\setsomepagedelay}}
         {\doglobal\newcounter\currentpagetransition
          \doifinsetelse{#1}{\v!reset,\v!stop}
            {\let\setpagetransition\relax}
            {\let\setpagetransition\setsomepagetransition
-            \doifinsetelse\v!willekeurig{#1}
+            \doifinsetelse\v!random{#1}
               {\randomtransitionstrue}{\randomtransitionsfalse}%
             \edef\userpagetransitions{#1}%
-            \@EA\removefromcommalist\@EA{\v!willekeurig}\userpagetransitions
+            \@EA\removefromcommalist\@EA{\v!random}\userpagetransitions
             \ifx\userpagetransitions\empty
               \let\userpagetransitions\pagetransitions
             \fi}}}}
 
 \def\setsomepagedelay
-  {\expanded{\dosetpagetransition{0}{\@@scwachttijd}}}
+  {\expanded{\dosetpagetransition{0}{\@@scdelay}}}
 
 \def\setsomepagetransition
   {\iflocation
@@ -2114,9 +2108,9 @@
        \doglobal\newcounter\currentpagetransition
        \setsomepagetransition
      \else
-       \doifelse\@@scwachttijd\v!geen
+       \doifelse\@@scdelay\v!none
          {\expanded{\dosetpagetransition{\commalistelement}{0}}}
-         {\expanded{\dosetpagetransition{\commalistelement}{\@@scwachttijd}}}%
+         {\expanded{\dosetpagetransition{\commalistelement}{\@@scdelay}}}%
      \fi
    \fi}
 
@@ -2134,7 +2128,7 @@
 %D \hbox to 15em
 %D   {\hss
 %D    \dorecurse{10}
-%D      {\verticalpositionbar\pos\recurselevel\min1\max10\token\blokje\\
+%D      {\verticalpositionbar\pos\recurselevel\min1\max10\token\blackrule\\
 %D       \hss}}
 %D \stopbuffer
 
@@ -2176,27 +2170,16 @@
 
 \newbox\commentbox
 
-% \def\doflushcommentanchors
-%    {\let\next\relax
-%     \processaction
-%       [\@@ccplaats]
-%       [     \v!inmarge=>\let\next\inmarge,
-%          \v!linkerrand=>\let\next\inleftedge,
-%         \v!rechterrand=>\let\next\inrightedge,
-%         \v!linkermarge=>\let\next\inleftmargin,
-%        \v!rechtermarge=>\let\next\inrightmargin]%
-%     \next{\hbox{\raise\strutht\box\commentbox}}}
-
 \def\doflushcommentanchors
    {\let\next\relax % new
     \processaction
-      [\@@ccplaats]
-      [%      \v!tekst=>\let\next\relax, % new
-            \v!inmarge=>\let\next\inmarge,
-         \v!linkerrand=>\let\next\inleftedge,
-        \v!rechterrand=>\let\next\inrightedge,
-        \v!linkermarge=>\let\next\inleftmargin,
-       \v!rechtermarge=>\let\next\inrightmargin]%
+      [\@@cclocation]
+      [%      \v!text=>\let\next\relax, % new
+            \v!inmargin=>\let\next\inmargin, % brr not the same as inleft|rightmargin
+         \v!leftedge=>\let\next\inleftedge,
+        \v!rightedge=>\let\next\inrightedge,
+        \v!leftmargin=>\let\next\inleftmargin,
+       \v!rightmargin=>\let\next\inrightmargin]%
     \next{\hbox{\raise\strutht\box\commentbox}}}
 
 \def\flushcommentanchors % in everypar so indirect
@@ -2208,41 +2191,41 @@
 \setvalue{\e!start\v!comment}% the dummy triple gobbles trailing spaces
   {\dotripleempty\dostartcommentaar}
 
-\def\commentaar
-  {\dodoubleempty\docommentaar}
+\def\comment
+  {\dodoubleempty\docomment}
 
-\def\dodocommentaar#1%
-  {\!!widtha\@@ccbreedte
-   \!!heighta\@@cchoogte
-   \doifelse\@@ccoptie\v!max
+\def\dodocomment#1%
+  {\!!widtha\@@ccwidth
+   \!!heighta\@@ccheight
+   \doifelse\@@ccoption\v!max
      {\let\@@ccopen   \!!plusone}{\let\@@ccopen   \!!zerocount}%
-   \doifelse\@@ccoptie\v!buffer
+   \doifelse\@@ccoption\v!buffer
      {\let\@@cccollect\!!plusone}{\let\@@cccollect\!!zerocount}%
    \preparecommentvariables
    \doinsertcomment
-     \@@cctitel\!!widtha\!!heighta
-     \@@cckleur\@@ccopen\@@ccsymbool
+     \@@cctitle\!!widtha\!!heighta
+     \@@cccolor\@@ccopen\@@ccsymbol
      \@@cccollect{#1}}
 
 \def\preparecommentvariables % more will move here as with fields
-  {\let\@@DriverCommentLayer\@@cctekstlaag}
+  {\let\@@DriverCommentLayer\@@cctextlayer}
 
 \def\dopreparecommentaar#1#2%
   {\doifassignmentelse{#1}
      {\getparameters[\??cc][#1]}
-     {\getparameters[\??cc][\c!titel=#1,#2]}%
+     {\getparameters[\??cc][\c!title=#1,#2]}%
    \obeylines
-   \doif\@@ccspatie\v!ja\obeyspaces}
+   \doif\@@ccspace\v!yes\obeyspaces}
 
 \def\dostartcommentaar[#1][#2][#3]%
   {\bgroup
-   \doifelse\@@ccstatus\v!start
+   \doifelse\@@ccstate\v!start
      {\dopreparecommentaar{#1}{#2}%
       \long\def\docommando##1%
         {\global\setbox\commentbox\frozenhbox
            {\hbox to \zeropoint
-              {\struttedbox{\tbox{\dodocommentaar{##1}}}\hss}%
-            \hskip\ifvoid\commentbox\@@ccmarge\else\@@ccafstand\fi
+              {\struttedbox{\tbox{\dodocomment{##1}}}\hss}%
+            \hskip\ifvoid\commentbox\@@ccmargin\else\@@ccdistance\fi
             \box\commentbox}%
          \egroup}}%
      {\long\def\docommando##1%
@@ -2251,12 +2234,12 @@
 
 \letvalue{\e!stop\v!comment}\relax % handy for \expanded{...}
 
-\def\docommentaar[#1][#2]#3%
-  {\doif\@@ccstatus\v!start
+\def\docomment[#1][#2]#3%
+  {\doif\@@ccstate\v!start
      {\hbox to \zeropoint
         {\dopreparecommentaar{#1}{#2}%
-         \hskip-\@@ccmarge
-         \struttedbox{\tbox{\dodocommentaar{#3}}\hss}}}%
+         \hskip-\@@ccmargin
+         \struttedbox{\tbox{\dodocomment{#3}}\hss}}}%
    \ignorespaces}
 
 % \startcommentaar
@@ -2412,10 +2395,10 @@
   {\dodoubleempty\getparameters[\??at]}
 
 \setupattachments
-  [\c!status=\v!start,
-   \c!kleur=\@@iakleur,
-   \c!tekstlaag=,
-   \c!symbool=]
+  [\c!state=\v!start,
+   \c!color=\@@iacolor,
+   \c!textlayer=,
+   \c!symbol=]
 
 % jammer, tussen/midden had erin gemoeten; \c!commando toevoegen
 
@@ -2425,15 +2408,15 @@
 \def\doregistermenubuttons[#1][#2]% [menu id] [register]
   {\bgroup
    \ifsecondargument
-     \stelinteractiemenuin
-       [#1][\c!onbekendeverwijzing=\v!ja,\c!zelfdepagina=\v!ja]%
+     \setupinteractionmenu
+       [#1][\c!unknownreference=\v!yes,\c!samepage=\v!yes]%
      \def\docommando##1%
        {\registermenucommand{\menubutton[#1]{##1}[#2:##1]}}%
    \else
      \def\docommando##1%
        {\registermenucommand
           {\button
-             [\c!onbekendeverwijzing=\v!ja,\c!zelfdepagina=\v!ja]
+             [\c!unknownreference=\v!yes,\c!samepage=\v!yes]
              {##1}[#1:##1]}}%
    \fi
    \handletokens abcdefghijklmnopqrstuvwxyz\with\docommando % moet anders
@@ -2443,205 +2426,197 @@
   {\dodoubleempty\doregistermenubuttons}
 
 \stelkoppelingenin
-  [\c!afstand=.25em,
-   \c!breedte=\v!passend,
-   \c!plaats=\v!laag,
-   \c!kleur=\@@iakleur,
-   \c!kader=\v!uit,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=]
-
-\definieerinteractiemenu
-  [\v!rechts]
-  [\v!rechts]
-  [\c!voor=,
-   \c!na=\vfil,
-   \c!tussen=\blanko,
-   \c!afstand=\bodyfontsize, % 12pt
-   \c!links=\hss,
-   \c!rechts=\hss,
-   \c!breedte=\rechterrandbreedte,
-   \c!hoogte=\v!ruim]
-
-\definieerinteractiemenu
-  [\v!links]
-  [\v!links]
-  [\c!voor=,
-   \c!na=\vfil,
-   \c!tussen=\blanko,
-   \c!afstand=\bodyfontsize, % 12pt
-   \c!links=\hss,
-   \c!rechts=\hss,
-   \c!breedte=\linkerrandbreedte,
-   \c!hoogte=\v!ruim]
-
-\definieerinteractiemenu
-  [\v!onder]
-  [\v!onder]
-  [\c!voor=\vss,
-   \c!na=\vss,
-   \c!midden=\hfil,
-   \c!afstand=\bodyfontsize, % 12pt
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!ruim]
-
-\definieerinteractiemenu
-  [\v!boven]
-  [\v!boven]
-  [\c!voor=\vss,
-   \c!na=\vss,
-   \c!midden=\hfil,
-   \c!afstand=\bodyfontsize, % 12pt
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!ruim]
-
-\stelinteractiemenuin
-  [\v!links,\v!rechts,\v!boven,\v!onder]
+  [\c!distance=.25em,
+   \c!width=\v!fit,
+   \c!location=\v!low,
+   \c!color=\@@iacolor,
+   \c!frame=\v!off,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=]
+
+\defineinteractionmenu
+  [\v!right]
+  [\v!right]
+  [\c!before=,
+   \c!after=\vfil,
+   \c!inbetween=\blank,
+   \c!distance=\bodyfontsize, % 12pt
+   \c!left=\hss,
+   \c!right=\hss,
+   \c!width=\rightedgewidth,
+   \c!height=\v!broad]
+
+\defineinteractionmenu
+  [\v!left]
+  [\v!left]
+  [\c!before=,
+   \c!after=\vfil,
+   \c!inbetween=\blank,
+   \c!distance=\bodyfontsize, % 12pt
+   \c!left=\hss,
+   \c!right=\hss,
+   \c!width=\leftedgewidth,
+   \c!height=\v!broad]
+
+\defineinteractionmenu
+  [\v!bottom]
+  [\v!bottom]
+  [\c!before=\vss,
+   \c!after=\vss,
+   \c!middle=\hfil,
+   \c!distance=\bodyfontsize, % 12pt
+   \c!width=\v!fit,
+   \c!height=\v!broad]
+
+\defineinteractionmenu
+  [\v!top]
+  [\v!top]
+  [\c!before=\vss,
+   \c!after=\vss,
+   \c!middle=\hfil,
+   \c!distance=\bodyfontsize, % 12pt
+   \c!width=\v!fit,
+   \c!height=\v!broad]
+
+\setupinteractionmenu
+  [\v!left,\v!right,\v!top,\v!bottom]
   [\c!offset=.25em,
-   \c!positie=\v!nee,
-   \c!kader=\v!aan,
-   \c!achtergrond=,
-   \c!achtergrondkleur=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!letter=\@@ialetter,
-   \c!kleur=\@@iakleur,
-   \c!contrastkleur=\@@iacontrastkleur,
-   \c!status=\v!start,
-   \c!zelfdepagina=\v!ja,
-   \c!onbekendeverwijzing=\v!leeg,
-   \c!bovenoffset=\!!zeropoint,
-   \c!onderoffset=\!!zeropoint,
-   \c!linkeroffset=\!!zeropoint,
-   \c!rechteroffset=\!!zeropoint]
-
-%\def\plaatslinkerrandtekstblok {\interactiemenus[\v!links ]}
-%\def\plaatsrechterrandtekstblok{\interactiemenus[\v!rechts]}
-%\def\plaatsboventekstblok      {\interactiemenus[\v!boven ]}
-%\def\plaatsondertekstblok      {\interactiemenus[\v!onder ]}
-
-\def\plaatslinkerrandtekstblok % Is \hss/\hsize really needed here?
-  {\hbox to \linkerrandbreedte % (check outer level and settings)
-     {\hsize\linkerrandbreedte
+   \c!position=\v!no,
+   \c!frame=\v!on,
+   \c!background=,
+   \c!backgroundcolor=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!style=\@@iastyle,
+   \c!color=\@@iacolor,
+   \c!contrastcolor=\@@iacontrastcolor,
+   \c!state=\v!start,
+   \c!samepage=\v!yes,
+   \c!unknownreference=\v!empty,
+   \c!topoffset=\!!zeropoint,
+   \c!bottomoffset=\!!zeropoint,
+   \c!leftoffset=\!!zeropoint,
+   \c!rightoffset=\!!zeropoint]
+
+\def\placeleftedgetextblock % Is \hss/\hsize really needed here?
+  {\hbox to \leftedgewidth % (check outer level and settings)
+     {\hsize\leftedgewidth
       \hss
-      \interactiemenus[\v!links]}}
+      \interactionmenus[\v!left]}}
 
-\def\plaatsrechterrandtekstblok % Is \hss/\hsize really needed here?
-  {\hbox to \rechterrandbreedte % (check outer level and settings)
-     {\hsize\rechterrandbreedte
-      \interactiemenus[\v!rechts]%
+\def\placerightedgetextblock % Is \hss/\hsize really needed here?
+  {\hbox to \rightedgewidth % (check outer level and settings)
+     {\hsize\rightedgewidth
+      \interactionmenus[\v!right]%
       \hss}}
 
-\def\plaatsboventekstblok
-  {\vbox to \bovenhoogte
-     {\vsize\bovenhoogte
+\def\placetoptextblock
+  {\vbox to \topheight
+     {\vsize\topheight
 %      \getvalue{\??tk\v!boven\v!tekst\c!voor}
-      \getvalue{\??tk\v!boven\c!voor}
-      \interactiemenus[\v!boven]
+      \getvalue{\??tk\v!top\c!before}
+      \interactionmenus[\v!top]
 %      \getvalue{\??tk\v!boven\v!tekst\c!na}
-      \getvalue{\??tk\v!boven\c!na}
+      \getvalue{\??tk\v!top\c!after}
       \kern\zeropoint}}
 
-\def\plaatsondertekstblok
-  {\vbox to \onderhoogte
-     {\vsize\onderhoogte
+\def\placebottomtextblock
+  {\vbox to \bottomheight
+     {\vsize\bottomheight
 %      \getvalue{\??tk\v!onder\v!tekst\c!voor}
-      \getvalue{\??tk\v!onder\c!voor}
-      \interactiemenus[\v!onder]
+      \getvalue{\??tk\v!bottom\c!before}
+      \interactionmenus[\v!bottom]
 %      \getvalue{\??tk\v!onder\v!tekst\c!na}
-      \getvalue{\??tk\v!onder\c!na}
+      \getvalue{\??tk\v!bottom\c!after}
       \kern\zeropoint}}
 
 \ifx\leftedgetextcontent\undefined \else
 
-  \appendtoks \plaatslinkerrandtekstblok  \hskip-\linkerrandbreedte  \to \leftedgetextcontent
-  \appendtoks \plaatsrechterrandtekstblok \hskip-\rechterrandbreedte \to \rightedgetextcontent
-  \appendtoks \plaatsboventekstblok       \vskip-\bovenhoogte        \to \toptextcontent
-  \appendtoks \plaatsondertekstblok       \vskip-\onderhoogte        \to \bottomtextcontent
+  \appendtoks \placeleftedgetextblock  \hskip-\leftedgewidth  \to \leftedgetextcontent
+  \appendtoks \placerightedgetextblock \hskip-\rightedgewidth \to \rightedgetextcontent
+  \appendtoks \placetoptextblock       \vskip-\topheight      \to \toptextcontent
+  \appendtoks \placebottomtextblock    \vskip-\bottomheight   \to \bottomtextcontent
 
 \fi
 
-\stelinteractieschermin
-  [\c!breedte=\printpapierbreedte,
-   \c!hoogte=\printpapierhoogte,
-   \c!rugoffset=\!!zeropoint,
-   \c!kopoffset=\!!zeropoint,
-   \c!rugwit=\rugwit,
-   \c!kopwit=\kopwit,
-   \c!optie=\v!min,
-   \c!wachttijd=\v!geen]
-
-\stelbuttonsin
-  [\c!status=\v!start,
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!ruim,
+\setupinteractionscreen
+  [\c!width=\printpaperwidth,
+   \c!height=\printpaperheight,
+   \c!horoffset=\!!zeropoint,
+   \c!veroffset=\!!zeropoint,
+   \c!backspace=\backspace,
+   \c!topspace=\topspace,
+   \c!option=\v!min,
+   \c!delay=\v!none]
+
+\setupbuttons
+  [\c!state=\v!start,
+   \c!width=\v!fit,
+   \c!height=\v!broad,
    \c!offset=0.25em,
-   \c!kader=\v!aan,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=,
-   \c!letter=\@@ialetter,
-   \c!kleur=\@@iakleur,
-   \c!contrastkleur=\@@iacontrastkleur,
-   \c!zelfdepagina=\v!ja,
-   \c!onbekendeverwijzing=\v!ja]
-
-\stelinteractiebalkin
-  [\c!status=\v!start,
-   \c!variant=a,
-   \c!symbool=\v!nee,
-   \c!breedte=\rechterrandbreedte,
-   \c!hoogte=, % these are taken care
-   \c!diepte=, % of at calling time
-   \c!afstand=.5em, % beter relateren aan breedte
-   \c!stap=1,
-   \c!kleur=\@@iakleur,
-   \c!contrastkleur=\@@iacontrastkleur,
-   \c!kader=\v!aan,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=,
-   \c!zelfdepagina=\v!ja,
-   \c!onbekendeverwijzing=\v!ja]
-
-\stelsynchronisatiebalkin
-  [\c!variant=\v!pagina,
-   \c!breedte=\rechterrandbreedte,
-   \c!letter=\@@ialetter,
-   \c!kleur=\@@iakleur,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=]
-
-\stelsynchronisatiein
-  [\c!status=\v!stop]
-
-\stelprofielenin
-  [\c!optie=]
-
-\stelprogrammasin
-  [\c!gebied=]
-
-\stelpaginaovergangenin
+   \c!frame=\v!on,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=,
+   \c!style=\@@iastyle,
+   \c!color=\@@iacolor,
+   \c!contrastcolor=\@@iacontrastcolor,
+   \c!samepage=\v!yes,
+   \c!unknownreference=\v!yes]
+
+\setupinteractionbar
+  [\c!state=\v!start,
+   \c!alternative=a,
+   \c!symbol=\v!no,
+   \c!width=\rightedgewidth,
+   \c!height=, % these are taken care
+   \c!depth=, % of at calling time
+   \c!distance=.5em, % beter relateren aan breedte
+   \c!step=1,
+   \c!color=\@@iacolor,
+   \c!contrastcolor=\@@iacontrastcolor,
+   \c!frame=\v!on,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=,
+   \c!samepage=\v!yes,
+   \c!unknownreference=\v!yes]
+
+\setupsynchronizationbar
+  [\c!alternative=\v!page,
+   \c!width=\rightedgewidth,
+   \c!style=\@@iastyle,
+   \c!color=\@@iacolor,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=]
+
+\setupsynchronization
+  [\c!state=\v!stop]
+
+\setupprofiles
+  [\c!option=]
+
+\setuppagetransitions
   [\v!reset]
 
 \setupcomment
-  [\c!status=\v!start,
-   \c!marge=2.5em,
-   \c!afstand=1em,
-   \c!breedte=.3\tekstbreedte,
-   \c!hoogte=.2\teksthoogte,
-   \c!kleur=\@@iakleur,
-   \c!titel=,
-   \c!spatie=\v!nee,
-   \c!symbool=\v!normaal,
-   \c!plaats=\v!inmarge,
-   \c!optie=,
-   \c!tekstlaag=]
-
-\stelversiesin    % beware, @ is made active here,
-  [\c!nummer=1,   % therefore we set this one at the end
-   \c!letter=\ss,
-   \c!kleur=]
+  [\c!state=\v!start,
+   \c!margin=2.5em,
+   \c!distance=1em,
+   \c!width=.3\textwidth,
+   \c!height=.2\textheight,
+   \c!color=\@@iacolor,
+   \c!title=,
+   \c!space=\v!no,
+   \c!symbol=\v!normal,
+   \c!location=\v!inmargin,
+   \c!option=,
+   \c!textlayer=]
+
+\setupversions    % beware, @ is made active here,
+  [\c!number=1,   % therefore we set this one at the end
+   \c!style=\ss,
+   \c!color=]
 
 \protect \endinput
diff --git a/tex/context/base/core-itm.tex b/tex/context/base/core-itm.tex
index a67d22603..956410f88 100644
--- a/tex/context/base/core-itm.tex
+++ b/tex/context/base/core-itm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-itm, % updated
+%D   [       filefile=core-itm, % updated
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=itemgroups,
@@ -80,9 +80,9 @@
 
 \def\doitemattributes   #1{\doattributes{\??op\currentitemgroup#1}}
 
-\def\@@globalitemsymbol #1{\??op\currentitemgroup\c!symbool\s!global#1}
-\def\@@localitemsymbol  #1{\??op\currentitemgroup\c!symbool\s!local #1}
-\def\@@currentitemsymbol#1{\??op\currentitemgroup\c!symbool         #1}
+\def\@@globalitemsymbol #1{\??op\currentitemgroup\c!symbol\s!global#1}
+\def\@@localitemsymbol  #1{\??op\currentitemgroup\c!symbol\s!local #1}
+\def\@@currentitemsymbol#1{\??op\currentitemgroup\c!symbol         #1}
 
 \def\@@itemcounter{\s!itemcount\currentitemgroup}
 
@@ -103,30 +103,30 @@
    \fi}
 
 \def\initializeitemgrouplevel#1% safeguard
-  {\ifundefined{\??op\currentitemgroup#1\c!breedte}%
+  {\ifundefined{\??op\currentitemgroup#1\c!width}%
      \doinitializeitemgrouplevel{#1}%
    \fi}
 
 \def\doinitializeitemgrouplevel#1%
   {\copyparameters
      [\??op\currentitemgroup#1][\??oo]
-     [\c!breedte,\c!factor,\c!afstand,\c!uitlijnen,\c!optie,
-      \c!letter,\c!marletter,\c!symletter,\c!kopletter,
-      \c!kleur,\c!markleur,\c!symkleur,\c!kopkleur,
-      \c!kopvoor,\c!kopna,\c!voor,\c!tussen,\c!na,
-      \c!afsluiter,\c!plaatsafsluiter,\c!inspringen,
-      \c!n,\c!binnen,\c!symbool,\c!marge,\c!items,
-      \c!linkermarge,\c!rechtermarge,
-      \c!start,\c!linkertekst,\c!rechtertekst]}
+     [\c!width,\c!factor,\c!distance,\c!align,\c!option,
+      \c!style,\c!marstyle,\c!symstyle,\c!headstyle,
+      \c!color,\c!marcolor,\c!symcolor,\c!headcolor,
+      \c!beforehead,\c!afterhead,\c!before,\c!inbetween,\c!after,
+      \c!stopper,\c!placestopper,\c!indenting,
+      \c!n,\c!inner,\c!symbol,\c!margin,\c!items,
+      \c!leftmargin,\c!rightmargin,
+      \c!start,\c!lefttext,\c!righttext]}
 
 \def\setupitemgroups
   {\dosingleargument\dosetupitemgroups}
 
 \def\dosetupitemgroups[#1]% still undocumented
-  {\getparameters[\??oo][\c!niveaus=4,#1]%
+  {\getparameters[\??oo][\c!levels=4,#1]%
    % will change (remove)
-   \ifnum\@@ooniveaus>\maxitemlevel
-     \edef\maxitemlevel{\@@ooniveaus}%
+   \ifnum\@@oolevels>\maxitemlevel
+     \edef\maxitemlevel{\@@oolevels}%
      \dorecurse\maxitemlevel{\initializeitemgroupslevel\recurselevel}%
    \fi}
 
@@ -153,52 +153,52 @@
 \def\dododosetupitemgroupconstant[#1][#2#3#4]% * permits [2]
   {\processaction
      [#2#3#4]
-     [   \v!opelkaar*=>\packitems,
+     [   \v!packed*=>\packitems,
             \v!intro*=>\itemintrotrue,
         \v!autointro*=>\autoitemintrotrue,
-             \v!ruim*=>\setitemparameter{#1}\c!factor{1},
-        #2#3*\v!ruim*=>\setitemparameter{#1}\c!factor{#2#3},
-          #2*\v!ruim*=>\setitemparameter{#1}\c!factor{#2},
-            \v!tekst*=>\textitemstrue
+             \v!broad*=>\setitemparameter{#1}\c!factor{1},
+        #2#3*\v!broad*=>\setitemparameter{#1}\c!factor{#2#3},
+          #2*\v!broad*=>\setitemparameter{#1}\c!factor{#2},
+            \v!text*=>\textitemstrue
                        \settrue\inlinelistitem
                        \dosetuppackeditemgroup{#1}%
                        \packitems,
-         \v!kolommen*=>\packitems,
-            \v!marge*=>\setitemparameter{#1}\c!breedte{-2em}, % signal
-          \v!inmarge*=>\setitemparameter{#1}\c!breedte{-2em}, % signal
-          \v!opmarge*=>\doifnot{#1}{1}{\setitemparameter{#1}\c!breedte{0em}}, % signal
-          \v!intekst*=>\settrue\inlinelistitem, % new
-              \v!los*=>\optimizeitemsfalse,
-           \v!alinea*=>\paragraphitemstrue
+         \v!columns*=>\packitems,
+            \v!margin*=>\setitemparameter{#1}\c!width{-2em}, % signal
+          \v!inmargin*=>\setitemparameter{#1}\c!width{-2em}, % signal
+          \v!atmargin*=>\doifnot{#1}{1}{\setitemparameter{#1}\c!width{0em}}, % signal
+          \v!intext*=>\settrue\inlinelistitem, % new
+              \v!loose*=>\optimizeitemsfalse,
+           \v!paragraph*=>\paragraphitemstrue
                        \packitems,
-      \v!aansluitend*=>\dosetuppackeditemgroup{#1}%
+      \v!joinedup*=>\dosetuppackeditemgroup{#1}%
                        \packitems,
-        \v!aanelkaar*=>\setitemparameter{#1}\c!factor{-1},
-   #2#3*\v!aanelkaar*=>\setitemparameter{#1}\c!factor{-#2#3},
-     #2*\v!aanelkaar*=>\setitemparameter{#1}\c!factor{-#2},
-        \v!afsluiter*=>\setitemparameter{#1}\c!plaatsafsluiter\v!ja,
-        \v!vanelkaar*=>\packeditemsfalse,
-        \v!standaard*=>\dosetupstandarditemgroup{#1}]}
+        \v!serried*=>\setitemparameter{#1}\c!factor{-1},
+   #2#3*\v!serried*=>\setitemparameter{#1}\c!factor{-#2#3},
+     #2*\v!serried*=>\setitemparameter{#1}\c!factor{-#2},
+        \v!stopper*=>\setitemparameter{#1}\c!placestopper\v!yes,
+        \v!unpacked*=>\packeditemsfalse,
+        \v!standard*=>\dosetupstandarditemgroup{#1}]}
 
 \def\dosetupstandarditemgroup#1%
   {\getparameters
      [\??op\currentitemgroup#1]
-     [\c!breedte=1.5em,
+     [\c!width=1.5em,
       \c!factor=0,
-      \c!afstand=.5em,
-      \c!kopvoor=,
-      \c!kopna=\blanko,
-      \c!voor=\blanko,
-      \c!tussen=\blanko,
-      \c!na=\blanko,
-      \c!binnen=]}
+      \c!distance=.5em,
+      \c!beforehead=,
+      \c!afterhead=\blank,
+      \c!before=\blank,
+      \c!inbetween=\blank,
+      \c!after=\blank,
+      \c!inner=]}
 
 \def\dosetuppackeditemgroup#1%
-  {\letitemparameter{#1}\c!kopvoor\empty
-   \letitemparameter{#1}\c!kopna  \empty
-   \letitemparameter{#1}\c!voor   \empty
-   \letitemparameter{#1}\c!na     \empty
-   \letitemparameter{#1}\c!tussen \empty}
+  {\letitemparameter{#1}\c!beforehead\empty
+   \letitemparameter{#1}\c!afterhead  \empty
+   \letitemparameter{#1}\c!before   \empty
+   \letitemparameter{#1}\c!after     \empty
+   \letitemparameter{#1}\c!inbetween \empty}
 
 \def\dosetupitemgroupconstant[#1][#2]%
   {\def\dodosetupitemgroupconstant##1%
@@ -213,18 +213,18 @@
 \def\dododododosetupitemgroup[#1][#2]%
   {\doifassignmentelse{#2}%
      {\dosetupitemgroupvariable[#1][#2]}%
-     {\setitemparameter{#1}\c!optie{#2}}}%
+     {\setitemparameter{#1}\c!option{#2}}}%
 
 \def\dodododosetupitemgroup[#1][#2]%
   {\ConvertToConstant\doifnot{#2}{}
-     {\doifelse{#1}\v!elk
+     {\doifelse{#1}\v!each
         {\dorecurse\maxitemlevel{\ExpandFirstAfter\dododododosetupitemgroup[\recurselevel][#2]}}
         {\ExpandFirstAfter\dododododosetupitemgroup[#1][#2]}}}
 
 \def\dododosetupitemgroup[#1][#2]%
   {\ConvertToConstant\doifelse{#2}{}
      {\ifcase\itemlevel\relax
-        \dodododosetupitemgroup[\v!elk][#1]%
+        \dodododosetupitemgroup[\v!each][#1]%
       \else
         \dodododosetupitemgroup[\itemlevel][#1]%
       \fi}
@@ -267,7 +267,7 @@
 \def\setitemlevel#1%
   {\ifnum\itemlevel>\zerocount
      \firstlisttrue
-     \doifnotinset\v!verder{#1}
+     \doifnotinset\v!continue{#1}
        {\doifinset{0}{#1}{\setitemparameter\itemlevel\c!start{0}}%
         \doifsomething{\getitemparameter\itemlevel\c!start}
           {\setcounter{\@@itemcounter\itemlevel}{\getitemparameter\itemlevel\c!start}%
@@ -275,8 +275,8 @@
            \letitemparameter\itemlevel\c!start\empty}}%
      \def\tempnumber
        {\countervalue{\@@itemcounter\itemlevel}}%
-     \doifelse{\getitemparameter\itemlevel\c!plaatsafsluiter}\v!ja
-       {\def\tempsymbol{\getitemparameter\itemlevel\c!afsluiter}}
+     \doifelse{\getitemparameter\itemlevel\c!placestopper}\v!yes
+       {\def\tempsymbol{\getitemparameter\itemlevel\c!stopper}}
        {\let\tempsymbol\empty}%
    \fi}
 
@@ -316,32 +316,32 @@
       \setxvalue{\@@globalitemsymbol\itemlevel}{\currentitemsymbol}%
       \setgvalue{\@@localitemsymbol \itemlevel}{\unknownitemsymbol}%
       \def\listitem{\symbol[\currentitemsymbol]}%
-      \let\@@opsymbool\empty}% \let\docommando\gobbleoneargument}
+      \let\@@opsymbol\empty}% \let\docommando\gobbleoneargument}
      {\doifconversiondefinedelse{#1}
         {\edef\currentitemsymbol{#1}%
          \setxvalue{\@@globalitemsymbol\itemlevel}{\currentitemsymbol}%
          \setgvalue{\@@localitemsymbol \itemlevel}%
            {\convertnumber{\currentitemsymbol}{\countervalue{\@@itemcounter\itemlevel}}}%
          \iftextitems
-           \doifsomething{\getitemparameter\itemlevel\c!linkertekst}
+           \doifsomething{\getitemparameter\itemlevel\c!lefttext}
              {\let\tempsymbol\empty}%
          \fi
          \def\listitem
            {\getitemparameter\itemlevel
-              {\iftextitems\c!linkertekst\else\c!links\fi}%
+              {\iftextitems\c!lefttext\else\c!left\fi}%
             \getvalue{\@@localitemsymbol\itemlevel}\tempsymbol
             \getitemparameter\itemlevel
-              {\iftextitems\c!rechtertekst\else\c!rechts\fi}}%
-        \let\@@opsymbool\empty}%\let\docommando\gobbleoneargument}
+              {\iftextitems\c!righttext\else\c!right\fi}}%
+        \let\@@opsymbol\empty}%\let\docommando\gobbleoneargument}
        {}}}
 
 \def\calculatelistwidth#1#2% distance deals with 'broad'
-  {#2=\getitemparameter{#1}\c!afstand\relax
+  {#2=\getitemparameter{#1}\c!distance\relax
    \ifnum\getitemparameter{#1}\c!factor>\zerocount
      \ifdim#2=\zeropoint #2=.5em\fi
    \fi
    \multiply#2 \getitemparameter{#1}\c!factor
-   \advance #2 \getitemparameter{#1}\c!breedte\relax}
+   \advance #2 \getitemparameter{#1}\c!width\relax}
 
 % The next conditionals deal with \item \startitemgroup. It
 % looks like a hack to skip back, but that way we preserve
@@ -393,7 +393,7 @@
 %    \doifsomething{\getitemparameter\itemlevel\c!inspringen}
 %      {\expanded{\setupindenting[\getitemparameter\itemlevel\c!inspringen]}}%
 %    \doifinset\v!kolommen{#1}%
-%      {\ifbinnenkolommen\else\ifnum\itemcolumndepth=\zerocount
+%      {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount
 %         \globallet\itemcolumndepth\itemlevel
 %         \getitemparameter\itemlevel\c!voor
 %         \processfirstactioninset
@@ -482,7 +482,7 @@
    \fi
    \doglobal\increment(\itemlevel,\itemincrement)%
    \initializeitemgrouplevel\itemlevel % safeguard
-   \edef\itemgroupoptions{\getitemparameter\itemlevel\c!optie}%
+   \edef\itemgroupoptions{\getitemparameter\itemlevel\c!option}%
    \ifx\itemgroupoptions\empty
      \edef\itemgroupoptions{#1}%
    \else
@@ -510,7 +510,7 @@
 %      {% is \expanded needed?
 %       \expanded{\setupindenting[\getitemparameter\itemlevel\c!inspringen]}}%
 %    \doifinset\v!kolommen{#1}%
-%      {\ifbinnenkolommen\else\ifnum\itemcolumndepth=\zerocount
+%      {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount
 %         \globallet\itemcolumndepth\itemlevel
 %         \getitemparameter\itemlevel\c!voor
 %         \processfirstactioninset
@@ -598,29 +598,29 @@
          \settrue\concatnextitem       % new, concat
        \fi                             % new, concat
      \fi                               % new, concat
-     \iftextitems\else\doifnotinset\v!tekst{#1}\par\fi % suboptimal
+     \iftextitems\else\doifnotinset\v!text{#1}\par\fi % suboptimal
    \fi
    \begingroup
    \ifnum\itemlevel=\plusone % NIEUW
-     \doadaptleftskip {\getitemparameter1\c!marge}%
-     \doadaptleftskip {\getitemparameter1\c!linkermarge}%
-     \doadaptrightskip{\getitemparameter1\c!rechtermarge}%
+     \doadaptleftskip {\getitemparameter1\c!margin}%
+     \doadaptleftskip {\getitemparameter1\c!leftmargin}%
+     \doadaptrightskip{\getitemparameter1\c!rightmargin}%
    \fi
-   \dosetraggedcommand{\getitemparameter\itemlevel\c!uitlijnen}\raggedcommand
-   \doifsomething{\getitemparameter\itemlevel\c!inspringen}
+   \dosetraggedcommand{\getitemparameter\itemlevel\c!align}\raggedcommand
+   \doifsomething{\getitemparameter\itemlevel\c!indenting}
      {% is \expanded needed?
-      \expanded{\setupindenting[\getitemparameter\itemlevel\c!inspringen]}}%
-   \doifinset\v!kolommen{#1}%
-     {\ifbinnenkolommen\else\ifnum\itemcolumndepth=\zerocount
+      \expanded{\setupindenting[\getitemparameter\itemlevel\c!indenting]}}%
+   \doifinset\v!columns{#1}%
+     {\ifinsidecolumns\else\ifnum\itemcolumndepth=\zerocount
         \globallet\itemcolumndepth\itemlevel
-        \getitemparameter\itemlevel\c!voor
+        \getitemparameter\itemlevel\c!before
         \processfirstactioninset
           [#1]
-          [  \v!een=>\!!counta1\relax,
-            \v!twee=>\!!counta2\relax,
-            \v!drie=>\!!counta3\relax,
-            \v!vier=>\!!counta4\relax,
-            \v!vijf=>\!!counta5\relax,
+          [  \v!one=>\!!counta1\relax,
+            \v!two=>\!!counta2\relax,
+            \v!three=>\!!counta3\relax,
+            \v!four=>\!!counta4\relax,
+            \v!five=>\!!counta5\relax,
          \s!unknown=>\@EA\!!counta\getitemparameter\itemlevel\c!n]%
         % new
         \edef\columneditemleftskip{\the\leftskip}%
@@ -637,10 +637,10 @@
         % so far
         \startcolumns
           [\c!n=\!!counta, % netter \??op\itemlevel\c!n
-           \c!hoogte=,
-           \c!lijn=\v!uit,
-           \c!balanceren=\v!ja,
-           \c!uitlijnen=\v!nee]%
+           \c!height=,
+           \c!rule=\v!off,
+           \c!balance=\v!yes,
+           \c!align=\v!no]%
       \fi\fi}%
    \doifinsetelse\v!intro{#1}\itemintrotrue\itemintrofalse
    \doglobal\increment\noflists
@@ -657,26 +657,26 @@
   %\getitemparameter\itemlevel\empty
    \let\listitem\empty % ** start value
    \doifelsenothing{#1} % iffirstargument
-     {\edef\@@opsymbool{\getitemparameter\itemlevel\c!symbool}%
+     {\edef\@@opsymbol{\getitemparameter\itemlevel\c!symbol}%
       \letgvalueempty{\@@globalitemsymbol\itemlevel}%
-      \global\letitemparameter\itemlevel\v!verder\empty
-    % \setitemmark\@@opsymbool % ** default value
+      \global\letitemparameter\itemlevel\v!continue\empty
+    % \setitemmark\@@opsymbol % ** default value
       \dosetupitemgroupvariable[\itemlevel][#2]}
      {\dosetupitemgroupconstant[\itemlevel][#1]%
       \dosetupitemgroupvariable[\itemlevel][#2]%
-      \doifinsetelse\v!verder{#1}% \noexpand, else problems in non-etex with chinese
-        {\edef\@@opsymbool{\noexpand\getvalue{\@@globalitemsymbol\itemlevel}}%
-         \getitemparameter\itemlevel\v!verder}
-        {\edef\@@opsymbool{\noexpand\getitemparameter{\itemlevel}{\c!symbool}}%
-         \global\setitemparameter\itemlevel\v!verder
+      \doifinsetelse\v!continue{#1}% \noexpand, else problems in non-etex with chinese
+        {\edef\@@opsymbol{\noexpand\getvalue{\@@globalitemsymbol\itemlevel}}%
+         \getitemparameter\itemlevel\v!continue}
+        {\edef\@@opsymbol{\noexpand\getitemparameter{\itemlevel}{\c!symbol}}%
+         \global\setitemparameter\itemlevel\v!continue
            {\dosetupitemgroupconstant[\itemlevel][#1]%
             \dosetupitemgroupvariable[\itemlevel][#2]}}%
       \def\docommando##1% \setitemmark resets \docommando
         {\doifnot{##1}{0}{\setitemmark{##1}}}%
-    % \processcommalist[#1,\@@opsymbool]\docommando
+    % \processcommalist[#1,\@@opsymbol]\docommando
       \processcommalist[#1]\docommando}% ** preset sequence or provided sequence
    \ifx\listitem\empty
-     \setitemmark\@@opsymbool % ** default value
+     \setitemmark\@@opsymbol % ** default value
      \ifx\listitem\empty
        \edef\currentitemsymbol{\itemlevel}% ** fall back
      \fi
@@ -686,10 +686,10 @@
    \fi\fi
    \ifparagraphitems
      \ifnum\itemlevel>\plusone
-       \letitemparameter\itemlevel\c!tussen\empty
+       \letitemparameter\itemlevel\c!inbetween\empty
      \fi
    \else\ifpackeditems
-     \letitemparameter\itemlevel\c!tussen\empty
+     \letitemparameter\itemlevel\c!inbetween\empty
    \fi\fi
    \calculatelistwidth\itemlevel{\dimen0}%
    \ifdim\dimen0>\zeropoint\relax
@@ -709,18 +709,18 @@
    \ifnum\itemcolumndepth=\itemlevel\relax
      \stopcolumns
      \doglobal\newcounter\itemcolumndepth
-     \getitemparameter\itemlevel\c!na
+     \getitemparameter\itemlevel\c!after
    \else
      \ifnum\itemlevel=\plusone
        \doitembreak\allowbreak           % toegevoegd
-       \getitemparameter1\c!na
+       \getitemparameter1\c!after
        \dochecknextindentation\??oo
      \else
        % nieuw, not yet nobreak handling
        \ifcase\autoitemgroupspacing
-         \getitemparameter\itemlevel\c!na
+         \getitemparameter\itemlevel\c!after
        \or
-         \getitemparameter\itemlevel\c!na
+         \getitemparameter\itemlevel\c!after
        \fi
      \fi
    \fi
@@ -746,7 +746,7 @@
   {\subitemtrue\itemgroupitem}
 
 \def\itemgroupsymbol#1%
-  {\def\symsymbol{\doitemattributes\itemlevel\c!symletter\c!symkleur{#1}}%
+  {\def\symsymbol{\doitemattributes\itemlevel\c!symstyle\c!symcolor{#1}}%
    \symbolitemtrue
    \itemgroupitem}
 
@@ -754,7 +754,7 @@
   {\itemgroupsymbol
      {\calculatelistwidth\itemlevel{\dimen0}%
       \hbox to \dimen0
-        {#1\hskip\getitemparameter\itemlevel\c!afstand}}}
+        {#1\hskip\getitemparameter\itemlevel\c!distance}}}
 
 \def\itemgrouphead
   {\headitemtrue\doitemgrouphead}
@@ -770,20 +770,20 @@
 \def\itemgroupmargin#1%
   {\def\marsymbol
      {\llap
-        {\doitemattributes\itemlevel\c!marletter\c!markleur{#1}%
-         \hskip\leftskip\hskip\linkermargeafstand}}%
+        {\doitemattributes\itemlevel\c!marstyle\c!marcolor{#1}%
+         \hskip\leftskip\hskip\leftmargindistance}}%
    \itemgroupitem}
 
-\appendtoks \let\item       \itemgroupitem    \to \itemgroupcommands
-\appendtoks \let\itm        \itemgroupitem    \to \itemgroupcommands
-\appendtoks \let\but        \itemgroupbutton  \to \itemgroupcommands
-\appendtoks \let\nop        \itemgroupdummy   \to \itemgroupcommands
-\appendtoks \letvalue\v!sub \itemgroupsubitem \to \itemgroupcommands
-\appendtoks \letvalue\v!sym \itemgroupsymbol  \to \itemgroupcommands
-\appendtoks \letvalue\v!ran \itemgroupedge    \to \itemgroupcommands
-\appendtoks \letvalue\v!kop \itemgrouphead    \to \itemgroupcommands
-\appendtoks \letvalue\v!its \itemgroupitems   \to \itemgroupcommands
-\appendtoks \letvalue\v!mar \itemgroupmargin  \to \itemgroupcommands
+\appendtoks \let\item        \itemgroupitem    \to \itemgroupcommands
+\appendtoks \let\itm         \itemgroupitem    \to \itemgroupcommands
+\appendtoks \let\but         \itemgroupbutton  \to \itemgroupcommands
+\appendtoks \let\nop         \itemgroupdummy   \to \itemgroupcommands
+\appendtoks \letvalue\v!sub  \itemgroupsubitem \to \itemgroupcommands
+\appendtoks \letvalue\v!sym  \itemgroupsymbol  \to \itemgroupcommands
+\appendtoks \letvalue\v!ran  \itemgroupedge    \to \itemgroupcommands
+\appendtoks \letvalue\v!head \itemgrouphead    \to \itemgroupcommands
+\appendtoks \letvalue\v!its  \itemgroupitems   \to \itemgroupcommands
+\appendtoks \letvalue\v!mar  \itemgroupmargin  \to \itemgroupcommands
 
 % Sometimes the user demands get pretty weird:
 %
@@ -794,7 +794,7 @@
 % \stopitemize
 
 \def\itemgroupheadsym#1%
-  {\def\symsymbol{\doitemattributes\itemlevel\c!symletter\c!symkleur{#1}}%
+  {\def\symsymbol{\doitemattributes\itemlevel\c!symstyle\c!symcolor{#1}}%
    \symbolitemtrue
    \headitemtrue
    \doitemgrouphead}
@@ -805,7 +805,7 @@
   {\flushnotes\penalty-5\relax}
 
 \def\itemnobreak %  +5
-  {\flushnotes\penalty+5\ifbinnenkolommen\else00\fi\relax}
+  {\flushnotes\penalty+5\ifinsidecolumns\else00\fi\relax}
 
 \def\dolistitem % evt aantal items opslaan per niveau, scheelt zoeken
   {\iftextitems
@@ -847,22 +847,22 @@
    \noindent
    \setbox8\hbox
      {\ifheaditem
-        \doitemattributes\itemlevel\c!kopletter\c!kopkleur{\listitem}%
+        \doitemattributes\itemlevel\c!headstyle\c!headcolor{\listitem}%
       \else\ifsymbolitem
         \symsymbol
       \else
-        \doitemattributes\itemlevel\c!letter\c!kleur{\listitem}%
+        \doitemattributes\itemlevel\c!style\c!color{\listitem}%
       \fi\fi}%
    \doifsomething\somdestination
-     {\setbox8\hbox{\naar{\box8}[\somdestination]}}%
+     {\setbox8\hbox{\goto{\box8}[\somdestination]}}%
    \globallet\somdestination\empty
-   \dimen2=\getitemparameter\itemlevel\c!breedte\relax
+   \dimen2=\getitemparameter\itemlevel\c!width\relax
    % new, prevents loops when symbol is (not yet found) graphic
    \ht8=\strutheight
    \dp8=\strutdepth
    % so that content differs per run (esp mp graphics afterwards)
    \ifdim\dimen2<\zeropoint\relax
-     \llap{\ifsubitem\llap{+}\fi\box8\hskip\linkermargeafstand}%
+     \llap{\ifsubitem\llap{+}\fi\box8\hskip\leftmargindistance}%
    \else
      \ifdim\dimen2=\zeropoint\relax
        \calculatelistwidth1{\dimen0}%
@@ -914,7 +914,7 @@
      \or % 1
        \ifnum\itemcolumndepth=0\relax
          \ifitemintro\doitembreak\nobreak\fi
-         \getitemparameter1\c!voor
+         \getitemparameter1\c!before
          \ifitemintro\doitembreak\nobreak\fi
        \fi
      \else % 2 en hoger
@@ -922,18 +922,18 @@
          \let\previtemlevel\itemlevel
          \decrement\previtemlevel
          \ifcase\autoitemgroupspacing\relax % nieuw
-           \getitemparameter\itemlevel\c!voor
+           \getitemparameter\itemlevel\c!before
          \or
-            \doifelsenothing{\getitemparameter\itemlevel\c!voor}
-              {\getitemparameter\itemlevel\c!voor}
-              {\getitemparameter\previtemlevel\c!tussen}%
+            \doifelsenothing{\getitemparameter\itemlevel\c!before}
+              {\getitemparameter\itemlevel\c!before}
+              {\getitemparameter\previtemlevel\c!inbetween}%
          \else
-           \getitemparameter\previtemlevel\c!tussen % == itemlevel-1
+           \getitemparameter\previtemlevel\c!inbetween % == itemlevel-1
          \fi
        \fi
      \fi
    \else
-     \getitemparameter\itemlevel\c!tussen
+     \getitemparameter\itemlevel\c!inbetween
    \fi
    \ifconditional\concatnextitem % new, concat
      \vskip-\lastskip            % new, concat
@@ -943,9 +943,9 @@
    \ignorespaces
    \dolistitem
    \ifpackeditems
-     \setupwhitespace[\v!geen]%
+     \setupwhitespace[\v!none]%
    \fi
-   \getitemparameter\itemlevel\c!binnen
+   \getitemparameter\itemlevel\c!inner
    \marsymbol
    \let\marsymbol\relax
    \doifsomething{#1}
@@ -969,11 +969,11 @@
 
 \def\complexdoitemgrouphead[#1]#2\par% % beter in \complexdosom hangen met een if
   {\iffirstlist\else\doitembreak\allowbreak\fi
-   \ifpackeditems\else\getitemparameter\itemlevel\c!kopvoor\fi
+   \ifpackeditems\else\getitemparameter\itemlevel\c!beforehead\fi
    \iffirstlist\ifitemintro\else\ifcase\itemlevel % incr in \complexdosom
       \doitembreak\allowbreak
    \fi\fi\fi
-   \complexdoitemgroupitem[#1]{\doitemattributes\itemlevel\c!kopletter\c!kopkleur
+   \complexdoitemgroupitem[#1]{\doitemattributes\itemlevel\c!headstyle\c!headcolor
      {\ignorespaces#2}}%
    \iftextitems
      \removeunwantedspaces\space\ignorespaces
@@ -981,7 +981,7 @@
      \par
    \fi
    \doitembreak\nobreak
-   \ifpackeditems\else\getitemparameter\itemlevel\c!kopna\fi
+   \ifpackeditems\else\getitemparameter\itemlevel\c!afterhead\fi
    \doitembreak\nobreak
    \noindentation}
 
@@ -1014,41 +1014,41 @@
    \ignorespaces}
 
 \setupitemgroups % undocumented
-  [\c!niveaus=6,
-   \c!marge=\zeropoint,
-   \c!linkermarge=\zeropoint,
-   \c!rechtermarge=\zeropoint,
-   \c!springvolgendein=\v!ja,
-   \c!breedte=1.5em,
+  [\c!levels=6,
+   \c!margin=\zeropoint,
+   \c!leftmargin=\zeropoint,
+   \c!rightmargin=\zeropoint,
+   \c!indentnext=\v!yes,
+   \c!width=1.5em,
    \c!factor=0,
-   \c!afstand=.5em,
-  %\c!uitlijnen=\v!normaal, % definitely not \v!normaal, see mails and
-   \c!uitlijnen=, % debug reports of David A & Patrick G on context list
-   \c!kleur=,
-   \c!inspringen=, % untouched if empty
-   \c!kleur=,
-   \c!letter=, % kan tzt weg
-   \c!marletter=\c!type,  % \c! ???
-   \c!symletter=,
-   \c!kopletter=,
-   \c!markleur=,
-   \c!symkleur=,
-   \c!kopkleur=,
-   \c!kopvoor=,
-   \c!kopna=\blanko,
-   \c!voor=\blanko,
-   \c!tussen=\blanko,
-   \c!na=\blanko,
-   \c!afsluiter=.,
-   \c!plaatsafsluiter=\v!ja,
-   \c!binnen=,
+   \c!distance=.5em,
+  %\c!align=\v!normal, % definitely not \v!normal, see mails and
+   \c!align=, % debug reports of David A & Patrick G on context list
+   \c!color=,
+   \c!indenting=, % untouched if empty
+   \c!color=,
+   \c!style=, % kan tzt weg
+   \c!marstyle=\c!type,  % \c! ???
+   \c!symstyle=,
+   \c!headstyle=,
+   \c!marcolor=,
+   \c!symcolor=,
+   \c!headcolor=,
+   \c!beforehead=,
+   \c!afterhead=\blank,
+   \c!before=\blank,
+   \c!inbetween=\blank,
+   \c!after=\blank,
+   \c!stopper=.,
+   \c!placestopper=\v!yes,
+   \c!inner=,
    \c!n=2,
    \c!items=4,
-   \c!linkertekst=(,
-   \c!rechtertekst=),
+   \c!lefttext=(,
+   \c!righttext=),
    \c!start=1,
-   \c!optie=,
-   \c!symbool=\itemlevel] % \v!niveau
+   \c!option=,
+   \c!symbol=\itemlevel] % \v!niveau
 
 \def\defineitemgroup
   {\dodoubleempty\dodefineitemgroup}
@@ -1059,18 +1059,18 @@
       \def\currentitemgroup{#1}%
       \setvalue{\e!start#1}{\startitemgroup[#1]}%
       \setvalue{\e!stop#1}{\stopitemgroup}%
-      \setvalue{\e!stel#1\e!in}{\setupitemgroup[#1]}%
-      \getparameters[\??ig#1][\c!niveaus=3,#2]%
-      \ifnum\getvalue{\??ig#1\c!niveaus}<\maxitemlevel\relax
-        \letvalue{\??ig#1\c!niveaus}\maxitemlevel
+      \setvalue{\e!setup#1\e!in}{\setupitemgroup[#1]}%
+      \getparameters[\??ig#1][\c!levels=3,#2]%
+      \ifnum\getvalue{\??ig#1\c!levels}<\maxitemlevel\relax
+        \letvalue{\??ig#1\c!levels}\maxitemlevel
       \fi
-      \dorecurse{\getvalue{\??ig#1\c!niveaus}}{\initializeitemgrouplevel\recurselevel}%
+      \dorecurse{\getvalue{\??ig#1\c!levels}}{\initializeitemgrouplevel\recurselevel}%
       \popmacro\currentitemgroup}}
 
 % efficient default itemize as well as upward compatible
 % definition:
 
-\defineitemgroup [\v!itemize] [\c!niveaus=6]
+\defineitemgroup [\v!itemize] [\c!levels=6]
 
 % keep these, needed for styles:
 
@@ -1078,4 +1078,4 @@
 % \def\stopitemize  {\stopitemgroup}
 % \def\setupitemize {\setupitemgroup[\v!itemize]}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex
index d39baff7c..a58617776 100644
--- a/tex/context/base/core-job.tex
+++ b/tex/context/base/core-job.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-job, % copied from main-001,
+%D   [       filefile=core-job, % copied from main-001,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Job Handling,
@@ -15,24 +15,6 @@
 
 \writestatus{loading}{Context Core Macros / Job Handling}
 
-%S InputFile     \input
-%S InputFile     \omgeving    \environment
-%S InputFile     \projekt     \project
-%S InputFile     \produkt     \product
-%S InputFile     \onderdeel   \component
-%S
-%S CheckStrings  \start  \stop
-%S CheckStrings  \begin  \end
-%S CheckStrings  \begin  \eind
-%S
-%S CheckChars    { }
-%S CheckChars    [ ]
-%S CheckChars    ( )
-%S
-%S CheckChar     $
-
-% \appendtoks \reportprotectionstate \to \everydump
-
 \unprotect
 
 \let \currentproject     \empty
@@ -43,7 +25,7 @@
 \let \loadedfiles        \empty
 \let \processedfiles     \empty
 
-\let \geenfilesmeer      \relax
+\let \nomorefiles        \relax
 
 \newcounter\textlevel
 \newcounter\fileprocesslevel
@@ -133,12 +115,12 @@
 % test \@@svgebied
 
 \def\loadallsystemfiles#1#2%
-  {\ifx\@@svgebied\empty
+  {\ifx\@@svdirectory\empty
      \readsysfile{#1}{\showmessage\m!systems2{#1}}{#2}%
    \else% yet undocumented
      \def\doloadsystemfile##1%
        {\readsetfile{##1}{#1}{\showmessage\m!systems2{#1}}{#2}}%
-     \processcommacommand[\@@svgebied]\doloadsystemfile
+     \processcommacommand[\@@svdirectory]\doloadsystemfile
    \fi}
 
 \def\loadsystemfiles
@@ -199,7 +181,7 @@
 \appendtoks \checknotes           \to \everyjob % depends on bodyfont
 \appendtoks \initializeMPgraphics \to \everyjob % after loading system files
 
-\appendtoks \pagina[\v!laatste] \pagina           \to \everybye
+\appendtoks \page[\v!last] \page           \to \everybye
 \appendtoks \ifarrangingpages\poparrangedpages\fi \to \everybye
 \appendtoks \registerfileinfo[end]\jobname        \to \everybye
 
@@ -229,7 +211,7 @@
   {\the\everystarttext
    \global\everystarttext\emptytoks}
 
-\def\starttekst
+\def\starttext
   {\doateverystarttext
    \ifnum\textlevel=\zerocount
      \registerfileinfo[begin]\jobname
@@ -237,7 +219,7 @@
    \fi
    \doglobal\increment\textlevel\relax}
 
-\def\stoptekst
+\def\stoptext
   {\doglobal\decrement\textlevel\relax
    \ifnum\textlevel>\zerocount \else
      \the\everystoptext
@@ -247,9 +229,6 @@
      \expandafter\end
    \fi}
 
-\let\starttext\starttekst
-\let\stoptext \stoptekst
-
 \let\normalend=\end
 
 \def\end
@@ -282,79 +261,72 @@
 \def\verwerkfile#1 %
   {\doexecutefile{#1}}
 
-\def\omgeving #1 % at outermost level only
-  {\def\startomgeving ##1 {}%
-   \let\stopomgeving\relax
+\def\environment #1 % at outermost level only
+  {\def\startenvironment ##1 {}%
+   \let\stopenvironment\relax
    \dostarttextfile{#1}%
    \startreadingfile
    \processfile{#1}% was : \readlocfile{#1}{}{}
    \stopreadingfile
    \dostoptextfile}
 
-\def\onderdeel #1 % at outermost level only
+\def\component #1 % at outermost level only
   {\dostarttextfile{#1}%
    \processfile{#1}%
    \dostoptextfile}
 
-\def\environment{\omgeving} % for the moment, no \let !
-
 \newcounter\filelevel
 
-\def\!!donextlevel#1#2#3#4#5#6\\%
+\def\donextlevel#1#2#3#4#5#6\\%
   {\beforesplitstring#6\at.\to#1
    \ifcase\filelevel\relax
-     \starttekst
-     \def\projekt   ##1 {#2{##1}}%
-     \def\omgeving  ##1 {#3{##1}}%
-     \def\produkt   ##1 {#4{##1}}%
-     \def\onderdeel ##1 {#5{##1}}%
+     \starttext
+     \def\project   ##1 {#2{##1}}%
+     \def\environment  ##1 {#3{##1}}%
+     \def\product   ##1 {#4{##1}}%
+     \def\component ##1 {#5{##1}}%
    \fi
    \increment\filelevel\relax
    \fullexpandoneargafter\addtocommalist{#1}\loadedfiles}
 
 \def\doprevlevel
   {\ifnum\filelevel=\plusone
-     \expandafter\stoptekst
+     \expandafter\stoptext
    \else
      \decrement\filelevel\relax
      \expandafter\endinput
    \fi}
 
-\def\startprojekt #1 %
-  {\!!donextlevel\currentproject
+\def\startproject #1 %
+  {\donextlevel\currentproject
      \donotexecutefile\doexecutefileonce
      \doexecutefileonce\doexecutefile#1\\}
 
-\def\stopprojekt
-  {\doprevlevel}
-
-\def\startprodukt #1 %
+\def\startproduct #1 %
   {\doateverystarttext
-   \!!donextlevel\currentproduct
+   \donextlevel\currentproduct
      \doexecutefileonce\doexecutefileonce
      \donotexecutefile\doexecutefile#1\\}
 
-\def\stopprodukt
-  {\doprevlevel}
-
-\def\startonderdeel #1 %
+\def\startcomponent #1 %
   {\doateverystarttext
-   \!!donextlevel\currentcomponent
+   \donextlevel\currentcomponent
      \doexecutefileonce\doexecutefileonce
      \donotexecutefile\doexecutefile#1\\}
 
-\def\stoponderdeel
-  {\doprevlevel}
-
-\def\startomgeving #1 %
-  {\!!donextlevel\currentenvironment
+\def\startenvironment #1 %
+  {\donextlevel\currentenvironment
      \donotexecutefile\doexecutefileonce
      \donotexecutefile\donotexecutefile#1\\}
 
-\def\stopomgeving
-  {\doprevlevel}
+\def\stopproject    {\doprevlevel}
+\def\stopproduct    {\doprevlevel}
+\def\stopcomponent  {\doprevlevel}
+\def\stopenvironment{\doprevlevel}
+
+% more or less replaced by modes
 
-\def\startdeelomgeving[#1]%
+\setvalue{\e!start\v!localenvironment}[#1]%
   {\let\loadedlocalenvironments\empty
    \def\docommando##1%
      {\beforesplitstring##1\at.\to\someevironment
@@ -364,18 +336,10 @@
        {\currentproject,\currentproduct,%
         \currentcomponent,\currentenvironment}
        {\loadedlocalenvironments}
-     {\letvalue{\e!stop\v!deelomgeving}\relax}
-     {\grabuntil{\e!stop\v!deelomgeving}\relax}}
-
-\def\startproduct{\startprodukt}
-\def\stopproduct {\stopprodukt}
-\def\startproject{\startprojekt}
-\def\stopproject {\stopprojekt}
-
-\def\project{\projekt}
-\def\product{\produkt}
+     {\letvalue{\e!stop\v!localenvironment}\relax}
+     {\grabuntil{\e!stop\v!localenvironment}\relax}}
 
-\def\deelomgeving #1 %
+\setvalue{\v!localenvironment} #1 %
   {\doexecutefileonce{#1}}
 
 % Het <pagina>-karakter (FormFeed), wordt omgezet in \par
@@ -386,16 +350,16 @@
 
 \neverypar=\emptytoks
 
-\appendtoks \flushnotes                     \to \everypar
-\appendtoks \ifinner\else\checksidefloat\fi \to \everypar
-\appendtoks \checkindentation               \to \everypar
-\appendtoks \showparagraphnumber            \to \everypar
-\appendtoks \flushmargincontents            \to \everypar
-\appendtoks \flushcommentanchors            \to \everypar
-\appendtoks \synchronizenotes               \to \everypar
+% \appendtoks \flushnotes                     \to \everypar
+% \appendtoks \synchronizesidefloats          \to \everypar
+% \appendtoks \checkindentation               \to \everypar
+% \appendtoks \showparagraphnumber            \to \everypar
+% \appendtoks \flushmargincontents            \to \everypar
+% \appendtoks \flushcommentanchors            \to \everypar
+% \appendtoks \synchronizenotes               \to \everypar
 
-\appendtoks \flushnotes                     \to \everydisplay
-\appendtoks \adjustsidefloatdisplaylines    \to \everydisplay
+% \appendtoks \flushnotes                     \to \everydisplay
+% \appendtoks \adjustsidefloatdisplaylines    \to \everydisplay
 
 %D Better here than in supp-mps:
 
@@ -405,4 +369,4 @@
 
 \resetutilities
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-lnt.tex b/tex/context/base/core-lnt.tex
index 30eab8b24..8f874e6d2 100644
--- a/tex/context/base/core-lnt.tex
+++ b/tex/context/base/core-lnt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-lnt,
+%D   [       filefile=core-lnt,
 %D        version=2002.05.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Line Notes,
@@ -44,10 +44,10 @@
    \expanded{\beforesplitstring#2}\at--\to\linenotelinenumber
    \ifnum\linenotelinenumber=\linenumber\relax
      % todo: \onlyfootnote{#2}{#3}% == configurable
-    % \setupnote[#1][\c!nummercommando=\gobbleoneargument]%
+    % \setupnote[#1][\c!numbercommand=\gobbleoneargument]%
     % \setnotetext[#1]{\rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}#2: #3}%
       \def\linenotelinenumber##1{#2}%
-      \setupnote[#1][\c!nummercommando=\linenotelinenumber]%
+      \setupnote[#1][\c!numbercommand=\linenotelinenumber]%
       \setnote[#1]{#3}%
    \fi
    \egroup}
@@ -73,7 +73,7 @@
         {#1}{\currenttextreference}}{#2}\to\collectedlinenotes}
      \donothing
    \dotracedlinenote\empty
-   \expanded{\eenregel[\??rr:\linenotecounter]}}
+   \expanded{\someline[\??rr:\linenotecounter]}}
 
 \def\dostartlinenote#1[#2]#3%
   {\doifreferencefoundelse{\??rr:#2}%
@@ -81,10 +81,10 @@
         {#1}{\currenttextreference}}{#3}\to\collectedlinenotes}
      \donothing
    \dotracedlinenote{#2}%
-   \startregel[\??rr:#2]}
+   \startline[\??rr:#2]}
 
 \def\dostoplinenote#1[#2]%
-  {\stopregel[\??rr:#2]}
+  {\stopline[\??rr:#2]}
 
 % defining them
 
@@ -202,4 +202,4 @@
 %
 % {\typebuffer[setup-1] \getbuffer[setup-1,setup-2,test]} \page
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex
index e12ada300..deffc59d8 100644
--- a/tex/context/base/core-lst.tex
+++ b/tex/context/base/core-lst.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-lst,
+%D   [       filefile=core-lst,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Lists,
@@ -20,10 +20,10 @@
 % can be made faster if needed
 
 \def\getlistlevel[#1]#2#3% [list] \variable \default
-  {\doifdefinedelse{\??ko#1\c!sectie}
-     {\edef#2{\getvalue{\??ko#1\c!sectie}}%
-      \doifdefinedelse{\??se#2\c!niveau}
-        {\edef#2{\getvalue{\??se#2\c!niveau}}}
+  {\doifdefinedelse{\??ko#1\c!section}
+     {\edef#2{\getvalue{\??ko#1\c!section}}%
+      \doifdefinedelse{\??se#2\c!level}
+        {\edef#2{\getvalue{\??se#2\c!level}}}
         {\edef#2{#3}}}
      {\edef#2{#3}}}
 
@@ -33,21 +33,21 @@
 % number uses the text container. We use reference mapping
 % (define reference) to keep track of the current ref.
 
-\def\doschrijfnaarlijst#1%
-  {\doifelsevalue{\??li#1\c!status}\v!start
-     \dodoschrijfnaarlijst\gobblefourarguments{#1}}
+\def\dowritetolist#1%
+  {\doifelsevalue{\??li#1\c!state}\v!start
+     \dodowritetolist\gobblefourarguments{#1}}
 
-\def\dodoschrijfnaarlijst#1#2#3#4%
+\def\dodowritetolist#1#2#3#4%
   {\begingroup
    \def\currentlist{#1}%
    \convertexpanded{\??li\currentlist}{#3}\asciilistentry
    \makesectionformat
-   \doifelse\@@nmstatus\v!start
+   \doifelse\@@nmstate\v!start
      {\def\dopaginanummer{\noexpand\pagenumber}}
      {\def\dopaginanummer{0}}%
    % niet waterdicht, wat te doen met figuren en zo
    % first hack: scheelt rommel, second hack: alleen koppen
-   \doifelsevalue{\??rf\currentlist\c!status}\v!start
+   \doifelsevalue{\??rf\currentlist\c!state}\v!start
      {\doif{\@@sectionlevel\@@sectie}{0}\autocrossdocumentfalse}
      {\autocrossdocumentfalse}%
    % blijft nog wat zwakjes en inefficient
@@ -57,7 +57,7 @@
     %\thisisdestination{\currentlist::\sectionformat}%
      \@EA\setsectieenkoppeling\@EA{\currentlist}%
      \edef\currentlevel{\@@sectionlevel\@@sectie}%
-     \processcommacommand[\crossdocumentreferences]\dododoschrijfnaarlijst
+     \processcommacommand[\crossdocumentreferences]\dododowritetolist
      \egroup
    \else
      \thisisnextinternal\currentlist
@@ -74,13 +74,13 @@
    \next % \schrijfwegnaarlijst
    \endgroup}
 
-\def\dododoschrijfnaarlijst#1%
+\def\dododowritetolist#1%
   {\def\docommando##1%
-     {\doifvalue{\??rf##1\c!status}\v!start
+     {\doifvalue{\??rf##1\c!state}\v!start
         {\setsectieenkoppeling{##1}%
          \def\level{\@@sectionlevel\@@sectie}%
          \ifnum\level>\currentlevel
-           \expanded{\definereference[#1::##1][\v!geen]}%
+           \expanded{\definereference[#1::##1][\v!none]}%
          \else\ifnum\level=\currentlevel
            \expanded{\definereference[#1::##1][#1::{##1::\sectionformat}]}%
          \fi\fi}}%
@@ -88,35 +88,12 @@
 
 % so far
 
-% \def\doschrijftussenlijst#1#2%
-%   {\doifvalue{\??li#1\c!status}\v!start
-%      {\dodoschrijftussenlijst{#1}{#2}}}
-%
-% \def\dodoschrijftussenlijst#1#2%
-%   {\begingroup
-%    \convertargument#2\to\ascii
-%    \makesectionformat
-%    \doifelse{\@@nmstatus}\v!start
-%      {\def\dopaginanummer{\noexpand\pagenumber}}
-%      {\def\dopaginanummer{0}}%
-%    \edef\schrijfwegnaarlijst%
-%      {\writeutilitycommand%
-%         {\listbetween%
-%            {#1}%
-%            {\ascii}%
-%            {\sectionformat\sectionseparator\sectionseparator\dopaginanummer}%
-%            {\noexpand\realfolio}}}%
-%    \schrijfwegnaarlijst
-%    \endgroup}
-%
-% no reason for indirectness
-
-\def\doschrijftussenlijst#1#2%
-  {\doifvalue{\??li#1\c!status}\v!start
+\def\dowritebetweenlist#1#2%
+  {\doifvalue{\??li#1\c!state}\v!start
      {\begingroup
       \convertargument#2\to\ascii
       \makesectionformat
-      \doifelse{\@@nmstatus}\v!start
+      \doifelse{\@@nmstate}\v!start
         {\def\dopaginanummer{\noexpand\pagenumber}}
         {\def\dopaginanummer{0}}%
       \edef\next % \schrijfwegnaarlijst
@@ -154,8 +131,8 @@
    \endgroup}
 
 \def\setlistentries
-  {\def\listentry  ##1{\executeifdefined{##1\c!lijst }\gobblefivearguments }%
-   \def\listbetween##1{\executeifdefined{##1\c!tussen}\gobblethreearguments}}
+  {\def\listentry  ##1{\executeifdefined{##1\c!list }\gobblefivearguments }%
+   \def\listbetween##1{\executeifdefined{##1\c!inbetween}\gobblethreearguments}}
 
 \def\resetlistentries
   {\let\listentry  \gobblesixarguments
@@ -188,111 +165,111 @@
 
 \def\lijstdots{\leaders\hbox to .5em{\hss.\hss}\hfill}
 
-\def\@@livariant%
+\def\@@lialternative%
   {\lijstvariantb}
 
 \@@livariantb
 
 \def\setlistparameter#1#2{\@EA\def\csname\??li#1#2\endcsname}
 
-\def\dostellijstin[#1][#2]% slow -)
+\def\dosetuplist[#1][#2]% slow -)
   {\def\docommando##1%
      {\getparameters[\??li##1][#2]%
-      \preparepaginaprefix{\??li##1}}%
+      \preparepageprefix{\??li##1}}%
    \processcommalist[#1]\docommando}
 
-\def\stellijstin
-  {\dodoubleargument\dostellijstin}
+\def\setuplist
+  {\dodoubleargument\dosetuplist}
 
 \def\dodosetlijst#1%
-  {\def\geenlijst{\splitsequence{\getvalue{\??li#1\c!limittext}}}%
-   \setvalue{#1\c!tussen}{\dotussenlijst {#1}}%
-   \setvalue{#1\c!lijst }{\dolijstelement{#1}}}
+  {\def\nolist{\splitsequence{\getvalue{\??li#1\c!limittext}}}%
+   \setvalue{#1\c!inbetween}{\dotussenlijst {#1}}%
+   \setvalue{#1\c!list }{\dolijstelement{#1}}}
 
 \def\dodoresetlijst#1%
-  {\let\geenlijst\empty
-   \setvalue{#1\c!tussen}{\gobblefourarguments{#1}}%
-   \setvalue{#1\c!lijst }{\gobblesixarguments {#1}}}
+  {\let\nolist\empty
+   \setvalue{#1\c!inbetween}{\gobblefourarguments{#1}}%
+   \setvalue{#1\c!list }{\gobblesixarguments {#1}}}
 
-\let\geenlijst\empty
+\let\nolist\empty
 
-\def\dodefinieerlijst[#1][#2][#3]%
+\def\dodefinelist[#1][#2][#3]%
   {\presetlocalframed[\??li#1]%
    \getparameters
      [\??li#1]
-     [\c!hoogte=\v!ruim,
-      \c!diepte=\v!ruim,
+     [\c!height=\v!broad,
+      \c!depth=\v!broad,
       \c!offset=0.25em,
-      \c!maxbreedte=,
-      \c!status=\v!start,
-      \c!koppeling=\v!uit,
-      \c!criterium=\v!lokaal,
-      \c!breedte=3em,
-      \c!variant=\c!b,
-      \c!letter=\v!normaal,
-      \c!tekstletter=\getvalue{\??li#1\c!letter},
-      \c!nummerletter=\getvalue{\??li#1\c!letter},
-      \c!paginaletter=\getvalue{\??li#1\c!letter},
-      \c!kleur=,
-      \c!tekstkleur=\getvalue{\??li#1\c!kleur},
-      \c!nummerkleur=\getvalue{\??li#1\c!kleur},
-      \c!paginakleur=\getvalue{\??li#1\c!kleur},
-      \c!nummercommando=\lijstnummercommando,
-      \c!tekstcommando=\lijsttekstcommando,
-      \c!paginacommando=\lijstpaginacommando,
-      \c!paginanummer=\v!ja,
-      \c!paginaovergangen=,
-      \c!marge=\!!zeropoint,
-      \c!titeluitlijnen=,
-      \c!voor=,
-      \c!na=,
-      \c!tussen=,
-      \c!symbool=,
-      \c!interactie=\v!sectienummer,
-      \v!deel\v!nummer=\v!ja,  % nodig ? % v
-      \c!label=\v!nee,
-      \c!afstand=\!!zeropoint,
-      \c!scheider=\@@koscheider,
+      \c!maxwidth=,
+      \c!state=\v!start,
+      \c!coupling=\v!off,
+      \c!criterium=\v!local,
+      \c!width=3em,
+      \c!alternative=\c!b,
+      \c!style=\v!normal,
+      \c!textstyle=\getvalue{\??li#1\c!style},
+      \c!numberstyle=\getvalue{\??li#1\c!style},
+      \c!pagestyle=\getvalue{\??li#1\c!style},
+      \c!color=,
+      \c!textcolor=\getvalue{\??li#1\c!color},
+      \c!numbercolor=\getvalue{\??li#1\c!color},
+      \c!pagecolor=\getvalue{\??li#1\c!color},
+      \c!numbercommand=\lijstnummercommando,
+      \c!textcommand=\lijsttekstcommando,
+      \c!pagecommand=\lijstpaginacommando,
+      \c!pagenumber=\v!yes,
+      \c!pageboundaries=,
+      \c!margin=\!!zeropoint,
+      \c!aligntitle=,
+      \c!before=,
+      \c!after=,
+      \c!inbetween=,
+      \c!symbol=,
+      \c!interaction=\v!sectionnumber,
+      \v!part\v!number=\v!yes,  % nodig ? % v
+      \c!label=\v!no,
+      \c!distance=\!!zeropoint,
+      \c!separator=\@@koseparator,
       \c!limittext=\@@kolimittext,
-      \c!afsluiter=,
-      \c!expansie=]%
+      \c!stopper=,
+      \c!expansion=]%
    \doifassignmentelse{#2}
      {\getparameters[\??li#1][#2]}
      {\ConvertToConstant\doifnot{#2}{}
         {\copyparameters % interactie ?
            [\??li#1][\??li#2]
-           [\c!status,\c!breedte,\c!variant,\c!letter,\c!kleur,
-            \c!tekstletter,\c!tekstkleur,\c!tekstcommando,
-            \c!paginaletter,\c!paginacommando,\c!paginakleur,
-            \c!nummerletter,\c!nummerkleur,\c!nummercommando,
-            \c!paginanummer,\c!paginaovergangen,\c!marge,\c!symbool,
+           [\c!state,\c!width,\c!alternative,\c!style,\c!color,
+            \c!textstyle,\c!textcolor,\c!textcommand,
+            \c!pagestyle,\c!pagecommand,\c!pagecolor,
+            \c!numberstyle,\c!numbercolor,\c!numbercommand,
+            \c!pagenumber,\c!pageboundaries,\c!margin,\c!symbol,
             \c!limittext,
-            \c!titeluitlijnen,\c!voor,\c!na,\c!tussen,\v!deel\c!nummer,\c!label]%
+            \c!aligntitle,\c!before,\c!after,\c!inbetween,\v!part\c!number,\c!label]%
          \getparameters[\??li#1][#3]}}%
     \addutilityreset{#1}%
     \setvalue{\s!set  #1}{\dodosetlijst  {#1}}%
     \setvalue{\s!reset#1}{\dodoresetlijst{#1}}}
 
-\def\definieerlijst
-  {\dotripleempty\dodefinieerlijst}
+\def\definelist
+  {\dotripleempty\dodefinelist}
 
 \def\iflijstgeplaatst{\ifutilitydone}
 
-\def\plaatslijst
-  {\dodoubleempty\doplaatslijst}
+\def\placelist
+  {\dodoubleempty\doplacelist}
 
 \def\plaatsruwelijst
   {\dodoubleempty\doplaatsruwelijst}
 
 \def\dobeginoflist
   {\begingroup
-   \startopelkaar[\v!blanko]}
+   \startpacked[\v!blank]}
 
 \def\doendoflist
-  {\stopopelkaar
+  {\stoppacked
    \endgroup}
 
-\def\doplaatslijst[#1][#2]%
+\def\doplacelist[#1][#2]%
   {\dobeginoflist
    \plaatsruwelijst[#1][#2]%
    \doendoflist}
@@ -300,8 +277,8 @@
 \def\plaatsruwelijst[#1][#2]%
   {\begingroup
    \dogetcommalistelement1\from#1\to\firstlistelement
-   \dostellijstin[#1][#2]%
-   \doifvalue{\??li\firstlistelement\c!koppeling}\v!aan
+   \dosetuplist[#1][#2]%
+   \doifvalue{\??li\firstlistelement\c!coupling}\v!on
      {\startlistreferences{#1}}%
    \dosettoclevel\??li\firstlistelement
    \honorlocalfilterlevel
@@ -328,33 +305,33 @@
 % \stoptypen
 
 \def\dosettoclevel#1#2%
-  {\ifundefined{#1#2\c!nummer}%
+  {\ifundefined{#1#2\c!number}%
      \dosetfilterlevel{\getvalue{#1#2\c!criterium}}\empty
    \else
-     \doifelsevaluenothing{#1#2\c!nummer}%
+     \doifelsevaluenothing{#1#2\c!number}%
        {\dosetfilterlevel{\getvalue{#1#2\c!criterium}}\empty}
        {\setsectieenkoppeling{\getvalue{#1#2\c!criterium}}%
         \dosetfilterlevel
           {\previoussection\@@sectie}%
-          {\getvalue{#1#2\c!nummer}}}%
+          {\getvalue{#1#2\c!number}}}%
    \fi}
 
 \def\dosetlistmode
   {\iflijstgeplaatst
-     \setsystemmode  \v!lijst
+     \setsystemmode  \v!list
    \else
-     \resetsystemmode\v!lijst
+     \resetsystemmode\v!list
    \fi}
 
-\def\dodovolledigelijst[#1][#2][#3]%  enkelvoud, meervoud, instellingen
+\def\dodocompletelist[#1][#2][#3]%  enkelvoud, meervoud, instellingen
   {\expanded{\systemsuppliedtitle[#2]{\noexpand\headtext{#2}}}% expansion needed for v! vs french !
-   \doplaatslijst[#1][#3]}
+   \doplacelist[#1][#3]}
 
-\def\dovolledigelijst[#1][#2]%
-  {\dodovolledigelijst[#1][#1][#2]}
+\def\docompletelist[#1][#2]%
+  {\dodocompletelist[#1][#1][#2]}
 
-\def\volledigelijst%
-  {\dodoubleempty\dovolledigelijst}
+\def\completelist
+  {\dodoubleempty\docompletelist}
 
 \def\lijstelementen        {}   % bevat lijst met paginaovergangen
 \def\lijstnummercommando #1{#1} % geen strut i.v.m. intractieve versie
@@ -362,7 +339,7 @@
 \def\lijstpaginacommando #1{\strut#1}
 
 \def\doassigndimen#1#2#3%
-  {\doifinsetelse{#2}{\v!passend,\v!ruim}
+  {\doifinsetelse{#2}{\v!fit,\v!broad}
      {#1=#3\relax}
      {#1=#2\relax}}
 
@@ -418,13 +395,13 @@
 
 \def\dosetlistsymbol#1% #2%
   {\executeifdefined
-     {listsymbol@\getvalue{\??li#1\c!symbool}}%
+     {listsymbol@\getvalue{\??li#1\c!symbol}}%
      \listsymbol@default
      {#1}} % {#2}
 
 \def\listsymbol@none#1#2%
   {\def\currentlistsymbol%
-     {\doassigndimen{\dimen0}{\getvalue{\??li#1\c!breedte}}{1.5em}%
+     {\doassigndimen{\dimen0}{\getvalue{\??li#1\c!width}}{1.5em}%
       \hbox to \dimen0{}}}
 
 \def\listsymbol@one#1#2%
@@ -435,27 +412,27 @@
 
 \def\listsymbol@three#1#2%
   {\def\currentlistsymbol % very slow
-     {{\doassigndimen{\dimen0}{\getvalue{\??li#1\c!breedte}}{1.5em}%
-       \doassigndimen{\dimen2}{\getvalue{\??li#1\c!hoogte}}{1ex}%
-       \doassigndimen{\dimen4}{\getvalue{\??li#1\c!diepte}}{0pt}%
+     {{\doassigndimen{\dimen0}{\getvalue{\??li#1\c!width}}{1.5em}%
+       \doassigndimen{\dimen2}{\getvalue{\??li#1\c!height}}{1ex}%
+       \doassigndimen{\dimen4}{\getvalue{\??li#1\c!depth}}{0pt}%
        \vrule\!!width\dimen0\!!height\dimen2\!!depth\dimen4}}}
 
 \def\listsymbol@default#1#2%
-  {\doifelsevalue{\??li#1\c!prefix}\v!nee % ook nog eerste
+  {\doifelsevalue{\??li#1\c!prefix}\v!no % ook nog eerste
      {\edef\splitlistsymbol{\removefirstprefix{#2}}}
-     {\doifelsevalue{\??li#1\c!prefix}\v!geen
+     {\doifelsevalue{\??li#1\c!prefix}\v!none
         {\edef\splitlistsymbol{\removeallprefixes{#2}}}%
         {\def\splitlistsymbol{#2}}}% geen \edef ivm � enz
    \def\currentlistsymbol% kan iets efficienter met \ifdone
-     {\doifvalue{\??li#1\c!label}\v!ja{\leftlabeltext{#1}}%
+     {\doifvalue{\??li#1\c!label}\v!yes{\leftlabeltext{#1}}%
       \strut
-      \def\numberseparator{\getvalue{\??li#1\c!scheider}}%
+      \def\numberseparator{\getvalue{\??li#1\c!separator}}%
       \@EA\dohandlelistnumber\@EA{\splitlistsymbol}%
-      \getvalue{\??li#1\c!afsluiter}%
-      \doifvalue{\??li#1\c!label}\v!ja{\rightlabeltext{#1}}}}
+      \getvalue{\??li#1\c!stopper}%
+      \doifvalue{\??li#1\c!label}\v!yes{\rightlabeltext{#1}}}}
 
 \def\listsymbol@unknown#1#2%
-  {\def\currentlistsymbol{\getvalue{\??li#1\c!symbool}}}
+  {\def\currentlistsymbol{\getvalue{\??li#1\c!symbol}}}
 
 % so far for list symbols
 
@@ -471,16 +448,16 @@
 \setvalue{\@@dodolijstelement f}{\let\dosomelijstelement\dodofixdlijstelementF}
 \setvalue{\@@dodolijstelement g}{\let\dosomelijstelement\dodofixdlijstelementG}
 
-\setvalue{\@@dodolijstelement\v!geen}%
+\setvalue{\@@dodolijstelement\v!none}%
   {\def\dosomelijstelement{\dodofreevlijstelement}}
 
-\setvalue{\@@dodolijstelement\v!vertikaal}%
+\setvalue{\@@dodolijstelement\v!vertical}%
   {\def\dosomelijstelement{\dodofreevlijstelement}}
 
-\setvalue{\@@dodolijstelement\v!horizontaal}%
+\setvalue{\@@dodolijstelement\v!horizontal}%
   {\def\dosomelijstelement{\dodofreehlijstelement}}
 
-\setvalue{\@@dodolijstelement\v!commando}%
+\setvalue{\@@dodolijstelement\v!command}%
   {\let\dosomelijstelement\dodocommandlijstelement}
 
 % Here I learned something new: \leftskip can be changed
@@ -498,17 +475,17 @@
   {\doiftoclevelelse[#5]{\dodolijstelement{#1}{#2}{#3}{#4}{#5}{#6}}{}}
 
 \def\dodolijstelement#1#2#3#4#5#6%
-  {\getvalue{\@@dodolijstelement\getvalue{\??li#1\c!variant}}%
+  {\getvalue{\@@dodolijstelement\getvalue{\??li#1\c!alternative}}%
    %\showcomposition
-   \let\@@iabreedte\!!zeropoint  % moet boolean worden
+   \let\@@iawidth\!!zeropoint  % moet boolean worden
    \bgroup
    \edef\lijstelementen
-     {\getvalue{\??li#1\c!paginaovergangen}}%
+     {\getvalue{\??li#1\c!pageboundaries}}%
    \ExpandBothAfter\doifinset{#3}\lijstelementen
      {\showmessage\m!systems{14}{#3}%
-      \pagina}%
+      \page}%
    \egroup
-   \mindermeldingen
+   \dontcomplain
    \setfullsectionnumber{\??li#1}%
    \dosetlistsymbol{#1}{#3}%
    \dosomelijstelement{#1}{#2}{#3}{#4}{#5}{#6}%
@@ -516,53 +493,53 @@
 
 \def\dolistattributes#1#2#3%
   {\doifvaluesomething{\??li#1#3}
-     {\resetinteractionparameter\c!kleur
-      \resetinteractionparameter\c!contrastkleur}%
+     {\resetinteractionparameter\c!color
+      \resetinteractionparameter\c!contrastcolor}%
    \doattributes{\??li#1}{#2}{#3}}
 
 \def\dodocommandlijstelement#1#2#3#4#5#6%
-  {\doifdefinedelse{\??li#1\c!commando}
-     {\getvalue{\??li#1\c!commando}%
-        {#3}{#4}{\paginaprefix\??li#1[#5]\translatednumber[#5]}}
-     {[#1: #3 - #4 - \paginaprefix\??li#1[#5]\translatednumber[#5]]}}
+  {\doifdefinedelse{\??li#1\c!command}
+     {\getvalue{\??li#1\c!command}%
+        {#3}{#4}{\pageprefix\??li#1[#5]\translatednumber[#5]}}
+     {[#1: #3 - #4 - \pageprefix\??li#1[#5]\translatednumber[#5]]}}
 
 \def\dodofreelijstelement#1#2#3#4#5#6#7#8%
   {\def\makelijstelement##1##2%
      {\noindent % new and needed
       \hbox
-        {\doifelsevalue{\??li#1\c!interactie}{##1} % \??li ipv \??ia
+        {\doifelsevalue{\??li#1\c!interaction}{##1} % \??li ipv \??ia
            {\setbox0\hbox{\showcontrastlocation{\??li#1}{#6}{##2}}%
             \linklisttoelement{#1}{#2}{#5}{#6}{\box0}}%{\copy0}}%
            {##2}}}%
-   \getvalue{\??li#1\c!voor}% can be \hskip
-   \doifdefinedelse{\??li#1\c!commando}
-     {\makelijstelement{\getvalue{\??li#1\c!interactie}}% this forces all
-        {\getvalue{\??li#1\c!commando}%
+   \getvalue{\??li#1\c!before}% can be \hskip
+   \doifdefinedelse{\??li#1\c!command}
+     {\makelijstelement{\getvalue{\??li#1\c!interaction}}% this forces all
+        {\getvalue{\??li#1\c!command}%
            {#3}% geen conversies etc
            {#4}% geen conversies etc
-           {\paginaprefix\??li#1[#5]%
+           {\pageprefix\??li#1[#5]%
             \translatednumber[#5]}}}
      {#7%
       \vbox
         {\forgetall
-         \makelijstelement\v!alles
-           {\makelijstelement\v!sectienummer
-              {\dolistattributes{#1}\c!nummerletter\c!nummerkleur
-                 {\getvalue{\??li#1\c!nummercommando}{\currentlistsymbol}}}%
-            \makelijstelement\v!tekst
-              {\dolistattributes{#1}\c!tekstletter\c!tekstkleur
+         \makelijstelement\v!all
+           {\makelijstelement\v!sectionnumber
+              {\dolistattributes{#1}\c!numberstyle\c!numbercolor
+                 {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}}%
+            \makelijstelement\v!text
+              {\dolistattributes{#1}\c!textstyle\c!textcolor
                  {\let\\=\newlineinlist
                   \dontconvertfont
-                  \getvalue{\??li#1\c!tekstcommando}{#4}}}%
-            \doifvalue{\??li#1\c!paginanummer}\v!ja
+                  \getvalue{\??li#1\c!textcommand}{#4}}}%
+            \doifvalue{\??li#1\c!pagenumber}\v!yes
               {\doifsomething{#5}
-                 {\makelijstelement\v!paginanummer
-                    {\dolistattributes{#1}\c!paginaletter\c!paginakleur
-                       {\getvalue{\??li#1\c!paginacommando}
-                          {\paginaprefix\??li#1[#5]%
+                 {\makelijstelement\v!pagenumber
+                    {\dolistattributes{#1}\c!pagestyle\c!pagecolor
+                       {\getvalue{\??li#1\c!pagecommand}
+                          {\pageprefix\??li#1[#5]%
                            \translatednumber[#5]}}}}}}}%
       #8}%
-   \getvalue{\??li#1\c!na}}
+   \getvalue{\??li#1\c!after}}
 
 \def\dodofreehlijstelement#1#2#3#4#5#6%
   {\dodofreelijstelement{#1}{#2}{#3}{#4}{#5}{#6}
@@ -578,64 +555,64 @@
 % now also in abc
 
 \def\limitatedlistentry#1#2%
-  {\doifelsenothing{\??li#1\c!maxbreedte}
-     {\getvalue{\??li#1\c!tekstcommando}{#2}}
-     {\getvalue{\??li#1\c!tekstcommando}%
+  {\doifelsenothing{\??li#1\c!maxwidth}
+     {\getvalue{\??li#1\c!textcommand}{#2}}
+     {\getvalue{\??li#1\c!textcommand}%
         {\limitatetext
            {#2}%
-           {\getvalue{\??li#1\c!maxbreedte}}%
+           {\getvalue{\??li#1\c!maxwidth}}%
            {\splitsymbol{\getvalue{\??li#1\c!limittext}}}}}}
 
 \def\dodofixdlijstelementABC#1#2#3#4#5#6% weeden
   {\endgraf
-   \leftskip\getvalue{\??li#1\c!marge}% na de \endgraf !
-   \getvalue{\??li#1\c!voor}%
-   \!!widthc\getvalue{\??li#1\c!afstand}%
-   \doifelsevalue{\??li#1\c!breedte}\v!passend
+   \leftskip\getvalue{\??li#1\c!margin}% na de \endgraf !
+   \getvalue{\??li#1\c!before}%
+   \!!widthc\getvalue{\??li#1\c!distance}%
+   \doifelsevalue{\??li#1\c!width}\v!fit
      {\!!widtha\zeropoint}
      {\doifelsenothing{#3}
-        {\doifelsevalue{\??li#1\c!titeluitlijnen}\v!ja
+        {\doifelsevalue{\??li#1\c!aligntitle}\v!yes
            {\!!widtha\zeropoint
             \!!widthc\zeropoint}
-           {\!!widtha\getvalue{\??li#1\c!breedte}}}
-        {\!!widtha\getvalue{\??li#1\c!breedte}}}%
-   \getvalue{\??li\c!variant\getvalue{\??li#1\c!variant}}%
+           {\!!widtha\getvalue{\??li#1\c!width}}}
+        {\!!widtha\getvalue{\??li#1\c!width}}}%
+   \getvalue{\??li\c!alternative\getvalue{\??li#1\c!alternative}}%
    \endgraf
    \def\makelijstelement##1##2%
-     {\doifelsevalue{\??li#1\c!interactie}{##1}
+     {\doifelsevalue{\??li#1\c!interaction}{##1}
         {\setbox0\hbox{\showcontrastlocation\??ia{#6}{##2}}%
          \linklisttoelement{#1}{#2}{#5}{#6}{\box0}}%{\copy0}}%
         {\hbox{##2}}}%
-   \doifvalue{\??li#1\c!interactie}\v!tekst % not supported
-     {\setlistparameter{#1}\c!interactie\v!alles}%
-   \makelijstelement\v!alles
+   \doifvalue{\??li#1\c!interaction}\v!text % not supported
+     {\setlistparameter{#1}\c!interaction\v!all}%
+   \makelijstelement\v!all
      {\hbox to \hsize
-        {\dostartattributes{\??li#1}\c!letter\c!kleur\empty
+        {\dostartattributes{\??li#1}\c!style\c!color\empty
          \!!widthb\hsize
          \setbox2\hbox \ifdim\!!widtha>\zeropoint to \!!widtha \fi
-           {\makelijstelement\v!sectienummer
-              {\dolistattributes{#1}\c!nummerletter\c!nummerkleur
-                 {\getvalue{\??li#1\c!nummercommando}{\currentlistsymbol}}%
+           {\makelijstelement\v!sectionnumber
+              {\dolistattributes{#1}\c!numberstyle\c!numbercolor
+                 {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}%
             \hfill}}%
          \setbox4\hbox
-           {\doifvalue{\??li#1\c!paginanummer}\v!ja
+           {\doifvalue{\??li#1\c!pagenumber}\v!yes
               {\doifsomething{#5}    % \lijstwidth is new ; temp hack
                  {\hbox \ifdim\lijstwidth>\zeropoint to \lijstwidth\fi
                     {\hfill
-                     \makelijstelement\v!paginanummer
-                       {\dolistattributes{#1}\c!paginaletter\c!paginakleur
-                          {\getvalue{\??li#1\c!paginacommando}%
-                             {\paginaprefix\??li#1[#5]%
+                     \makelijstelement\v!pagenumber
+                       {\dolistattributes{#1}\c!pagestyle\c!pagecolor
+                          {\getvalue{\??li#1\c!pagecommand}%
+                             {\pageprefix\??li#1[#5]%
                               \translatednumber[#5]}}}}}}}%
          \vbox
            {\hsize\!!widthb
-            \setupalign[\getvalue{\??li#1\c!uitlijnen}]%
+            \setupalign[\getvalue{\??li#1\c!align}]%
             \ifdim\!!widtha<\hsize
               \hangindent=\wd2
-              \dimen2=\!!widthc % \getvalue{\??li#1\c!afstand}%
+              \dimen2=\!!widthc % \getvalue{\??li#1\c!distance}%
               \advance\hangindent \dimen2
               \hangafter=1
-              \doifvalue{\??li#1\c!hang}\v!nee{\hangafter\zerocount}%
+              \doifvalue{\??li#1\c!hang}\v!no{\hangafter\zerocount}%
               \ifdim\wd4=\zeropoint % \ifvoid4
                 % we kunnen gewoon afbreken aan het eind
               \else
@@ -652,10 +629,10 @@
             \box2\relax
             \hskip\dimen2
             \bgroup
-            \dolistattributes{#1}\c!tekstletter\c!tekstkleur
+            \dolistattributes{#1}\c!textstyle\c!textcolor
               {\let\\=\newlineinlist
                \dontconvertfont
-              %\getvalue{\??li#1\c!tekstcommando}{#4}}%
+              %\getvalue{\??li#1\c!textcommand}{#4}}%
                \limitatedlistentry{#1}{#4}}%
               %\carryoverpar % new otherwise wrong linespacing
             \egroup
@@ -671,54 +648,54 @@
    \nointerlineskip % anders verkeerde spatiering bij multi-line
    \endgraf
    \allowbreak
-   \getvalue{\??li#1\c!na}}
+   \getvalue{\??li#1\c!after}}
 
 % overrulen interactie kan sneller, bv door hulpconstanten
 % te gebruiken en die te letten
 
 \def\dodofixdlijstelementD#1#2#3#4#5#6%
-  {%\leftskip=\getvalue{\??li#1\c!marge}%
+  {%\leftskip=\getvalue{\??li#1\c!margin}%
    \ifvmode
-     \advance\leftskip\getvalue{\??li#1\c!marge}%  AANGEPAST
+     \advance\leftskip\getvalue{\??li#1\c!margin}%  AANGEPAST
    \fi
    \bgroup
    \ifvmode
      \noindent\leavevmode % leavevmode ? ? ?
    \fi
-   \doifvalue{\??li#1\c!interactie}\v!tekst % not supported
-     {\setlistparameter{#1}\c!interactie\v!sectienummer}%
-   \doifvalue{\??li#1\c!interactie}\v!alles % not supported
-     {\setlistparameter{#1}\c!interactie\v!sectienummer}%
+   \doifvalue{\??li#1\c!interaction}\v!text % not supported
+     {\setlistparameter{#1}\c!interaction\v!sectionnumber}%
+   \doifvalue{\??li#1\c!interaction}\v!all % not supported
+     {\setlistparameter{#1}\c!interaction\v!sectionnumber}%
    \def\makelijstelement##1##2%
-     {\doifelsevalue{\??li#1\c!interactie}{##1}
+     {\doifelsevalue{\??li#1\c!interaction}{##1}
         {\setbox0\hbox{\showcontrastlocation\??ia{#6}{##2}}%
          \linklisttoelement{#1}{#2}{#5}{#6}{\box0}}%{\copy0}}%
         {\hbox{##2}}}%
    \setbox4=\hbox
-     {\doifvalue{\??li#1\c!paginanummer}\v!ja
+     {\doifvalue{\??li#1\c!pagenumber}\v!yes
         {\doifsomething{#5}
-           {\makelijstelement\v!paginanummer
-              {\dolistattributes{#1}\c!paginaletter\c!paginakleur
-                 {\getvalue{\??li#1\c!paginacommando}
-                    {\paginaprefix\??li#1[#5]%
+           {\makelijstelement\v!pagenumber
+              {\dolistattributes{#1}\c!pagestyle\c!pagecolor
+                 {\getvalue{\??li#1\c!pagecommand}
+                    {\pageprefix\??li#1[#5]%
                      \translatednumber[#5]}}}}}}%
    \donetrue
-   \doifnothing{#3}{\doifvaluenothing{\??li#1\c!symbool}\donefalse}%
+   \doifnothing{#3}{\doifvaluenothing{\??li#1\c!symbol}\donefalse}%
    \ifdone
      \hbox
-       {\getvalue{\??li#1\c!links}%
-        \makelijstelement\v!sectienummer
-          {\dolistattributes{#1}\c!nummerletter\c!nummerkleur
-             {\getvalue{\??li#1\c!nummercommando}{\currentlistsymbol}}}%
-          \getvalue{\??li#1\c!rechts}%
+       {\getvalue{\??li#1\c!left}%
+        \makelijstelement\v!sectionnumber
+          {\dolistattributes{#1}\c!numberstyle\c!numbercolor
+             {\getvalue{\??li#1\c!numbercommand}{\currentlistsymbol}}}%
+          \getvalue{\??li#1\c!right}%
         \hskip.5em}%
      \nobreak
    \fi
    \tolerance3500 % niet zomaar veranderen
-   \dolistattributes{#1}\c!tekstletter\c!tekstkleur
+   \dolistattributes{#1}\c!textstyle\c!textcolor
      {\let\\=\newlineinlist
       \dontconvertfont
-     %\getvalue{\??li#1\c!tekstcommando}{#4}}%
+     %\getvalue{\??li#1\c!textcommand}{#4}}%
       \limitatedlistentry{#1}{#4}}%
    \ifvoid4\else
      \nobreak
@@ -726,7 +703,7 @@
      \nobreak
      \box4
    \fi
-   \dimen0=\getvalue{\??li#1\c!afstand}\relax
+   \dimen0=\getvalue{\??li#1\c!distance}\relax
    \ifdim\dimen0<1em\relax
      \hskip1em\!!plus1em\!!minus.25em\relax
    \else
@@ -736,20 +713,20 @@
 
 \def\dodofixdlijstelementE#1%
   {\dodofixdlijstelementEFG
-     {\setupinteraction[\c!strut=\v!nee]}
-     {\localframed[\??li#1][\c!diepte=\!!zeropoint,\c!kleur=]}
+     {\setupinteraction[\c!strut=\v!no]}
+     {\localframed[\??li#1][\c!depth=\!!zeropoint,\c!color=]}
      {#1}}
 
 \def\dodofixdlijstelementF#1%
   {\dodofixdlijstelementEFG
      {}
-     {\dosetraggedhbox{\getvalue{\??li#1\c!uitlijnen}}\raggedbox}
+     {\dosetraggedhbox{\getvalue{\??li#1\c!align}}\raggedbox}
      {#1}}
 
 \def\dodofixdlijstelementG#1%
   {\dodofixdlijstelementEFG
      {}
-     \regelmidden
+     \midaligned
      {#1}}
 
 \def\dodofixdlijstelementEFG#1#2#3#4#5#6#7#8%
@@ -759,18 +736,18 @@
       \let\\=\newlineinlist
       \setbox0\hbox
         {#2{\showcontrastlocation\??ia{#8}%
-          {\dostartattributes{\??li#3}\c!letter\c!kleur\empty
+          {\dostartattributes{\??li#3}\c!style\c!color\empty
            \ignorespaces\dontconvertfont\setstrut
            \begstrut
-          %\doifelsenothing{\??li#3\c!maxbreedte}
-          %  {\getvalue{\??li#3\c!tekstcommando}{#6}}
-          %  {\getvalue{\??li#3\c!tekstcommando}{\limitatetext{#6}{\getvalue{\??li#3\c!maxbreedte}}{\unknown}}}%
+          %\doifelsenothing{\??li#3\c!maxwidth}
+          %  {\getvalue{\??li#3\c!textcommand}{#6}}
+          %  {\getvalue{\??li#3\c!textcommand}{\limitatetext{#6}{\getvalue{\??li#3\c!maxwidth}}{\unknown}}}%
            \limitatedlistentry{#3}{#6}%
            \endstrut % struts new
            \dostopattributes}}}%
       \linklisttoelement{#3}{#4}{#7}{#8}{\box0}}%{\copy0}}%
    \par % should be an option
-   \getvalue{\??li#3\c!tussen}}
+   \getvalue{\??li#3\c!inbetween}}
 
 % better:
 %
@@ -786,22 +763,22 @@
 \def\linklisttoelement#1#2#3#4#5% % list location format page data
   {\gotonextinternal{#1}{#2}{#4}{#5}}
 
-\def\schrijfnaarlijst[#1]#2#3%
+\def\writetolist[#1]#2#3%
   {\doifsomething{#1}
      {\convertargument#2\to\firstlistelement
-      \@EA\doschrijfnaarlijst\@EA{#1}{\firstlistelement}{#3}{\v!kop}}}
+      \@EA\dowritetolist\@EA{#1}{\firstlistelement}{#3}{\v!head}}}
 
 \def\dotussenlijst#1#2#3#4% pas op: wordt ook elders gedefinieerd
   {\doiftoclevelelse[#3]{#2}{}}
 
-\def\schrijftussenlijst[#1]#2%
-  {\@EA\doschrijftussenlijst\@EA{#1}{#2}} % #2 weg en \expanded
+\def\writebetweenlist[#1]#2%
+  {\@EA\dowritebetweenlist\@EA{#1}{#2}} % #2 weg en \expanded
 
 % NOG ENGELS MAKEN
 
-\def\lijstlengte  {\utilitylistlength}
-\def\lijstbreedte {\utilitylistwidth}
-\def\lijsthoogte  {\utilitylistheight}
+\def\listlength  {\utilitylistlength}
+\def\listwidth {\utilitylistwidth}
+\def\listheight  {\utilitylistheight}
 
 \def\utilitylistlength {0}
 \def\utilitylistwidth  {0pt}
@@ -812,18 +789,18 @@
      {\doglobal\increment\utilitylistlength
       \hbox
         {\doattributes
-          {\??li#1}\c!tekstletter\c!tekstkleur
+          {\??li#1}\c!textstyle\c!textcolor
           {\let\\=\newlineinlist
            \dontconvertfont
-           \getvalue{\??li#1\c!tekstcommando}{#4}}}%
+           \getvalue{\??li#1\c!textcommand}{#4}}}%
       \global\utilitydonetrue}
      {}}
 
-\def\dobepaallijstkenmerken[#1][#2]%
+\def\dodeterminelistcharacteristics[#1][#2]%
   {\begingroup
    \doglobal\newcounter\utilitylistlength
    \let\dolijstelement\dolijstelementX
-   \dostellijstin[#1][#2]%
+   \dosetuplist[#1][#2]%
    \dogetcommalistelement1\from#1\to\commalistelement
    \dosettoclevel\??li\commalistelement
    \setbox0\vbox{\doutilities{listentries,#1}\jobname{#1}\relax\par}%
@@ -832,8 +809,8 @@
    \endgroup
    \dosetlistmode}
 
-\def\bepaallijstkenmerken
-  {\dodoubleempty\dobepaallijstkenmerken}
+\def\determinelistcharacteristics
+  {\dodoubleempty\dodeterminelistcharacteristics}
 
 % \definieerreferentielijst
 %   [externalfigure]
@@ -877,28 +854,28 @@
 
 \def\referentiebutton#1[#2]%
   {\hbox\bgroup                        % the \hbox is needed to bypass
-   \let\referenceprefix=\empty         % \dontleavehmode in \naarbox
-   \setupinteraction[\c!kleur=,\c!contrastkleur=,\c!strut=]%
+   \let\referenceprefix=\empty         % \dontleavehmode in \gotobox
+   \setupinteraction[\c!color=,\c!contrastcolor=,\c!strut=]%
    \setupreferencing[\c!prefix=]%
-   \naarbox{\hbox{\ignorespaces#1}}[#2]%
+   \gotobox{\hbox{\ignorespaces#1}}[#2]%
    \egroup}
 
 \newcounter\referencecounter
 
 \def\doreferentielijstelement#1#2#3#4#5%
   {\doiftoclevelelse[#4]
-     {\getvalue{\??rl#1\c!voor}%
+     {\getvalue{\??rl#1\c!before}%
       \referentiebutton
-        {\getvalue{\??rl#1\c!commando}{#3}\pagereference[\r!to#2]}%
+        {\getvalue{\??rl#1\c!command}{#3}\pagereference[\r!to#2]}%
         [\r!from#2]%
       \global\utilitydonetrue
-      \getvalue{\??rl#1\c!na}}
+      \getvalue{\??rl#1\c!after}}
      {}}
 
 \def\doplaatsreferentielijst[#1][#2]%
   {\begingroup
 %   \let\doschrijfnaarreferentielijst=\gobblethreearguments
-   \stelreferentielijstin[#1][#2,\c!status=\v!stop]%
+   \setupreferencelist[#1][#2,\c!state=\v!stop]%
    \dogetcommalistelement1\from#1\to\commalistelement
    \dosettoclevel\??rl\commalistelement
    \doutilities{listentries,#1}\jobname{#1}\relax\par
@@ -907,11 +884,11 @@
 \def\plaatsreferentielijst%
   {\dodoubleempty\doplaatsreferentielijst}
 
-\def\doschrijfnaarreferentielijst#1#2#3%
-  {\doifvalue{\??rl#1\c!status}\v!start
+\def\dowritetoreferencelist#1#2#3%
+  {\doifvalue{\??rl#1\c!state}\v!start
      {\begingroup
       \makesectionformat
-      \doifelse{\@@nmstatus}\v!start
+      \doifelse{\@@nmstate}\v!start
         {\def\dopaginanummer{\noexpand\pagenumber}}
         {\def\dopaginanummer{0}}%
       \edef\schrijfwegnaarlijst%
@@ -925,127 +902,117 @@
       \schrijfwegnaarlijst
       \endgroup}}
 
-%\def\schrijfnaarreferentielijst[#1]#2#3% #1=class #2=data #3=visualization
-%  {\doifelsevalue{\??rl#1\c!status}{\v!start}
-%     {\doglobal\increment\referencecounter
-%      \referentiebutton
-%        {#3%
-%         \pagereference[\r!from\referencecounter]%
-%         \doschrijfnaarreferentielijst{#1}{\referencecounter}{#2}}%
-%        [\r!to\referencecounter]}
-%     {#3}}
-
-\def\schrijfnaarreferentielijst[#1]#2% #1=class #2=data #3=visualization
+\def\writetoreferencelist[#1]#2% #1=class #2=data #3=visualization
   {\dowithnextbox
-     {\doifelsevalue{\??rl#1\c!status}\v!start
+     {\doifelsevalue{\??rl#1\c!state}\v!start
         {\doglobal\increment\referencecounter % must be resolved due to #2
          \referentiebutton
            {\flushnextbox
             \pagereference[\r!from\referencecounter]%
-            \doschrijfnaarreferentielijst{#1}{\referencecounter}{#2}}%
+            \dowritetoreferencelist{#1}{\referencecounter}{#2}}%
            [\r!to\referencecounter]}
         {\flushnextbox}}
      \hbox} % \vbox ?
 
 \def\referencelistentry#1%
-  {\executeifdefined{#1\c!lijst}\gobblefourarguments}
+  {\executeifdefined{#1\c!list}\gobblefourarguments}
 
 \def\dodosetreferentielijst#1%
-  {\setvalue{#1\c!lijst}{\doreferentielijstelement{#1}}}
+  {\setvalue{#1\c!list}{\doreferentielijstelement{#1}}}
 
 \def\dodoresetreferentielijst#1%
-  {\setvalue{#1\c!lijst}{\gobblefourarguments}}
-
-\def\dodefinieerreferentielijst[#1][#2]%
-  {\stelreferentielijstin[#1]
-     [\c!commando=,
-      \c!status=\v!start,
-      \c!criterium=\v!alles,
-      \c!voor=,
-      \c!na=,
+  {\setvalue{#1\c!list}{\gobblefourarguments}}
+
+\def\dodefinereferencelist[#1][#2]%
+  {\setupreferencelist[#1]
+     [\c!command=,
+      \c!state=\v!start,
+      \c!criterium=\v!all,
+      \c!before=,
+      \c!after=,
       #2]%
    \setcounter{#1}{0}%
    \addutilityreset{#1}%
    \setvalue{\s!set  #1}{\dodosetreferentielijst  {#1}}%
    \setvalue{\s!reset#1}{\dodoresetreferentielijst{#1}}}
 
-\def\definieerreferentielijst%
-  {\dodoubleempty\dodefinieerreferentielijst}
+\def\definereferencelist%
+  {\dodoubleempty\dodefinereferencelist}
 
-\def\dostelreferentielijstin[#1][#2]%
+\def\dosetupreferencelist[#1][#2]%
   {\getparameters[\??rl#1][#2]}
 
-\def\stelreferentielijstin%
-  {\dodoubleempty\dostelreferentielijstin}
+\def\setupreferencelist%
+  {\dodoubleempty\dosetupreferencelist}
 
-\def\dostelsamengesteldelijstin[#1][#2]%
+\def\dosetupcombinedlist[#1][#2]%
   {\getparameters[\??ih#1][#2]%
-   \expanded{\stellijstin[\getvalue{\??ih#1\c!lijst}]}[#2]}
+   \expanded{\setuplist[\getvalue{\??ih#1\c!list}]}[#2]}
 
-\def\stelsamengesteldelijstin%
-  {\dodoubleargument\dostelsamengesteldelijstin}
+\def\setupcombinedlist%
+  {\dodoubleargument\dosetupcombinedlist}
 
-\def\doplaatssamengesteldelijst[#1][#2]%
+\def\doplacecombinedlist[#1][#2]%
   {\begingroup
    \getparameters[\??ih#1][#2]%
    \dosettoclevel\??ih{#1}%
-   \edef\samengesteldelijst{\getvalue{\??ih#1\c!lijst}}%
+   \edef\samengesteldelijst{\getvalue{\??ih#1\c!list}}%
   %\stripspaces\from\samengesteldelijst\to\samengesteldelijst
-   \doifelsevalue{\??ih#1\c!niveau}\v!huidige % criterium=vorige,niveau=huidige
-     {\!!counta=0\@@koniveau} % hm: \@@koniveau
-     {\fullexpandoneargafter\doifnumberelse{\getvalue{\??ih#1\c!niveau}}% in verband
-        {\!!counta\getvalue{\??ih#1\c!niveau}% met de vorige implementatie
+   \doifelsevalue{\??ih#1\c!level}\v!current % criterium=vorige,niveau=huidige
+     {\!!counta=0\@@kolevel} % hm: \@@kolevel
+     {\fullexpandoneargafter\doifnumberelse{\getvalue{\??ih#1\c!level}}% in verband
+        {\!!counta\getvalue{\??ih#1\c!level}% met de vorige implementatie
          \advance\!!counta \plusone % accepteren we ook nummers (0==deel)
          \getfromcommacommand[\samengesteldelijst][\!!counta]%
          \edef\maximumlijst{\commalistelement}}%
-        {\edef\maximumlijst{\getvalue{\??ih#1\c!niveau}}}%
-      \!!counta\getvalue{\??se\getvalue{\??ko\maximumlijst\c!sectie}\c!niveau}}%
+        {\edef\maximumlijst{\getvalue{\??ih#1\c!level}}}%
+      \!!counta\getvalue{\??se\getvalue{\??ko\maximumlijst\c!section}\c!level}}%
    \let\!!stringa\samengesteldelijst
    \let\samengesteldelijst\empty
    \def\docommando##1%
-     {\ifnum\getvalue{\??se\getvalue{\??ko##1\c!sectie}\c!niveau}>\!!counta
+     {\ifnum\getvalue{\??se\getvalue{\??ko##1\c!section}\c!level}>\!!counta
       \else
         \addtocommalist{##1}\samengesteldelijst
       \fi}%
    \processcommacommand[\!!stringa]\docommando
-   \doifvalue{\??ih#1\c!koppeling}\v!aan
+   \doifvalue{\??ih#1\c!coupling}\v!on
      {\startlistreferences{#1}}%
-   \ExpandFirstAfter\dodoplaatssamengesteldelijst[\samengesteldelijst][#2]%
+   \ExpandFirstAfter\dodoplacecombinedlist[\samengesteldelijst][#2]%
    \stoplistreferences{#1}%
    \endgroup
    \dosetlistmode}
 
-\def\dodoplaatssamengesteldelijst[#1][#2]%
+\def\dodoplacecombinedlist[#1][#2]%
   {\dobeginoflist
-   \dostellijstin[#1][#2]%
+   \dosetuplist[#1][#2]%
    \doutilities{listentries,#1}\jobname{#1}\relax\par
    \doendoflist}
 
 \def\dovolledigesamengesteldelijst[#1][#2]%
   {\expanded{\systemsuppliedtitle[#1]{\noexpand\headtext{#1}}}% expansion due to v! vs french !
-   \doplaatssamengesteldelijst[#1][#2]}
+   \doplacecombinedlist[#1][#2]}
 
-\def\dodefinieersamengesteldelijst[#1][#2][#3]%
+\def\dodefinecombinedlist[#1][#2][#3]%
   {\makerawcommalist[#2]\samengesteldelijst % for fast processing
-   \letvalue{\??ih#1\c!lijst}\samengesteldelijst
+   \letvalue{\??ih#1\c!list}\samengesteldelijst
    \getcommalistsize[#2]%
    \getfromcommalist[#2][\commalistsize]%
-   \doeassign[\??ih#1][\c!niveau=\commalistelement]%
+   \doeassign[\??ih#1][\c!level=\commalistelement]%
    \getparameters
      [\??ih#1]
-     [\c!criterium=\v!lokaal,#3]%
-   \setvalue{\e!stel#1\e!in}%
-     {\dodoubleempty\dostelsamengesteldelijstin[#1]}%
-   \setvalue{\e!plaats#1}%
-     {\dodoubleempty\doplaatssamengesteldelijst[#1]}%
-   \setvalue{\e!volledige#1}%
+     [\c!criterium=\v!local,#3]%
+   \setvalue{\e!setup#1\e!in}%
+     {\dodoubleempty\dosetupcombinedlist[#1]}%
+   \setvalue{\e!place#1}%
+     {\dodoubleempty\doplacecombinedlist[#1]}%
+   \setvalue{\e!complete#1}%
      {\dodoubleempty\dovolledigesamengesteldelijst[#1]}}
 
-\def\definieersamengesteldelijst%
-  {\dotripleempty\dodefinieersamengesteldelijst}
+\def\definecombinedlist%
+  {\dotripleempty\dodefinecombinedlist}
 
-\def\plaatssamengesteldelijst%
-  {\dodoubleempty\doplaatssamengesteldelijst}
+\def\placecombinedlist%
+  {\dodoubleempty\doplacecombinedlist}
 
 % new and yet undocumented (used in cocoa qa)
 %
@@ -1068,15 +1035,15 @@
    \xdef\listlengthcounter{0}}
 
 \setupremaininglistlength
-  [\c!links=\hss,\c!rechts=,\c!nummer=\v!ja,
-   \c!voor=\blanko,\c!na=\pagina,
-   \c!letter=\v!kleinnormaal,\c!kleur=]
+  [\c!left=\hss,\c!right=,\c!number=\v!yes,
+   \c!before=\blank,\c!after=\page,
+   \c!style=\v!smallnormal,\c!color=]
 
 \def\resetremaininglistlength
   {\dodoubleempty\doresetremaininglistlength}
 
 \def\doresetremaininglistlength[#1][#2]%
-  {\bepaallijstkenmerken[#1][#2]% \determinelistcharacteristics[#1][#2]%
+  {\determinelistcharacteristics[#1][#2]% \determinelistcharacteristics[#1][#2]%
    \xdef\listlengthcounter{\number\utilitylistlength}}
 
 \def\showremaininglistlength
@@ -1084,21 +1051,21 @@
    \ifnum\listlengthcounter>\plusone
      \scratchdimen\pagetotal
      \setbox\scratchbox\vbox
-       {\@@llvoor\par\horizontalstrut\par\horizontalstrut\par\@@llna}%
+       {\@@llbefore\par\horizontalstrut\par\horizontalstrut\par\@@llafter}%
      \advance\scratchdimen \ht\scratchbox
      \advance\scratchdimen \dp\scratchbox
      \ifdim\scratchdimen>\pagegoal
-       \@@llvoor
+       \@@llbefore
        \nobreak\hbox to \hsize
-         {\doifnot\@@llnummer\v!ja{\let\listlengthcounter\empty}%
-          \doattributes\??ll\c!letter\c!kleur{\@@lllinks\listlengthcounter\@@llrechts}}
-       \@@llna
+         {\doifnot\@@llnumber\v!yes{\let\listlengthcounter\empty}%
+          \doattributes\??ll\c!style\c!color{\@@llleft\listlengthcounter\@@llright}}
+       \@@llafter
      \fi
    \fi
    \doglobal\decrement\listlengthcounter\relax
    \egroup}
 
-\stelreferentielijstin
-  [\c!letter=\v!normaal]
+\setupreferencelist
+  [\c!style=\v!normal]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-ltb.tex b/tex/context/base/core-ltb.tex
index b5521cfad..74d12fa0b 100644
--- a/tex/context/base/core-ltb.tex
+++ b/tex/context/base/core-ltb.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ltb,
+%D   [       filefile=core-ltb,
 %D        version=2002.10.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Line Tables,
@@ -107,23 +107,23 @@
 
 \setuplinetable
   [\c!n=\!!maxcard,
-   \c!regels=\!!maxcard,
+   \c!lines=\!!maxcard,
    \c!nx=\plusone,
-   \c!nlinks=0,
-   \c!herhaal=\v!ja, % when \c!nlinks>0, repeat on both pages
-   \c!voor=,
-   \c!na=,
-   \c!tussen=\pagina,
-   \c!afstand=\zeropoint,
-   \c!rek=\v!nee,
-   \c!uitlijnen=\c!rechts,
-   \c!linkeroffset=.25ex,
-   \c!rechteroffset=\linetableparameter\c!linkeroffset,
-   \c!maxbreedte=\zeropoint,
-   \c!breedte=5em,
-   \c!hoogte=\v!passend, % \v!regel = faster
-   \c!achtergrond=,
-   \c!achtergrondkleur=]
+   \c!nleft=0,
+   \c!repeat=\v!yes, % when \c!nleft>0, repeat on both pages
+   \c!before=,
+   \c!after=,
+   \c!inbetween=\page,
+   \c!distance=\zeropoint,
+   \c!stretch=\v!no,
+   \c!align=\c!right,
+   \c!leftoffset=.25ex,
+   \c!rightoffset=\linetableparameter\c!leftoffset,
+   \c!maxwidth=\zeropoint,
+   \c!width=5em,
+   \c!height=\v!fit, % \v!line = faster
+   \c!background=,
+   \c!backgroundcolor=]
 
 \def\linetableparameter#1%
   {\csname\??le#1\endcsname}
@@ -147,8 +147,8 @@
 \def\linetablerparameter#1% faster, leaner and meaner
   {\csname
      \ifnum\linetablerow=\zerocount % geen ifcase
-       \ifcsname\??ler\v!hoofd#1\endcsname
-         \??ler\v!hoofd#1%
+       \ifcsname\??ler\v!header#1\endcsname
+         \??ler\v!header#1%
        \else\ifcsname\??ler0#1\endcsname
          \??ler0#1%
        \else
@@ -166,13 +166,13 @@
    \endcsname}
 
 \def\setnoftableslines
-  {\doifelse{\linetableparameter\c!regels}\v!passend
+  {\doifelse{\linetableparameter\c!lines}\v!fit
      {% nearly the same as core-tab, so same bugs
       \ifdim\pagegoal<\maxdimen
         \scratchdimen\pagegoal
         \advance\scratchdimen -\pagetotal
       \else
-        \scratchdimen\teksthoogte
+        \scratchdimen\textheight
       \fi
       \advance\scratchdimen -\strutdp
       \ifdim\prevdepth<\maxdimen\ifdim\prevdepth>\zeropoint
@@ -181,7 +181,7 @@
       \fi\fi
       \getrawnoflines\scratchdimen
       \xdef\noflinetablelines{\the\noflines}}
-     {\xdef\noflinetablelines{\linetableparameter\c!regels}}}
+     {\xdef\noflinetablelines{\linetableparameter\c!lines}}}
 
 \def\startlinetablecell
   {\dosingleempty\dostartlinetablecell}
@@ -193,17 +193,17 @@
    \fi
    \xdef\linetablestep{\linetablecparameter\c!nx}%
    \ifcase\linetablestep\or
-     \scratchdimen\linetablecparameter\c!breedte
-     \scratchskip \linetablecparameter\c!afstand
+     \scratchdimen\linetablecparameter\c!width
+     \scratchskip \linetablecparameter\c!distance
    \else
      \scratchdimen  \zeropoint
      \scratchskip   \zeropoint
      \scratchcounter\linetablecolumn
      \dorecurse\linetablestep
-       {\advance\scratchdimen\linetablecparameter\c!breedte
-       %\advance\scratchskip \linetablecparameter\c!afstand
+       {\advance\scratchdimen\linetablecparameter\c!width
+       %\advance\scratchskip \linetablecparameter\c!distance
         \global\advance      \linetablecolumn\plusone
-        \advance\scratchskip \linetablecparameter\c!afstand
+        \advance\scratchskip \linetablecparameter\c!distance
        }%
      \global\linetablecolumn\scratchcounter
    \fi
@@ -227,25 +227,25 @@
    \setbox\scratchbox\hbox
      \bgroup
      \dontcomplain
-     \hskip\linetablecparameter\c!linkeroffset\relax
+     \hskip\linetablecparameter\c!leftoffset\relax
      % 0 = width, unknown height
      % 1 = width, fixed height
      % 2 = no width, auto hsize
      \ifnum\linetablemode<\plustwo
-       \advance\scratchdimen-\linetablecparameter\c!linkeroffset
-       \advance\scratchdimen-\linetablecparameter\c!rechteroffset
+       \advance\scratchdimen-\linetablecparameter\c!leftoffset
+       \advance\scratchdimen-\linetablecparameter\c!rightoffset
      \fi
      \ifcase\linetablemode
-       \dosetraggedcommand{\linetablecparameter\c!uitlijnen}%
+       \dosetraggedcommand{\linetablecparameter\c!align}%
        \vtop \ifdim\linetableheight>\zeropoint to\linetableheight \fi \bgroup
          \hsize\scratchdimen
          \raggedcommand
      \else
-       \setalignmentswitch{\linetablecparameter\c!uitlijnen}%
+       \setalignmentswitch{\linetablecparameter\c!align}%
        \hbox \ifcase\linetablemode \or to\scratchdimen \fi \bgroup
          \ifcase\alignmentswitch\hss\or\hss\fi
      \fi
-     \dostartattributes{\??lec\number\linetablecolumn}\c!letter\c!kleur\empty
+     \dostartattributes{\??lec\number\linetablecolumn}\c!style\c!color\empty
      \begstrut \ignorespaces}
 
 \def\stoplinetablecell
@@ -257,13 +257,13 @@
      \ifcase\alignmentswitch\else\hss\fi
    \fi
    \egroup
-   \hskip\linetablecparameter\c!rechteroffset
+   \hskip\linetablecparameter\c!rightoffset
    \egroup
    \iflinetablepreroll
      \box\scratchbox
    \else
-     \doif{\linetablecparameter\c!achtergrond}\v!kleur
-       {\backgroundline[\linetablecparameter\c!achtergrondkleur]}%
+     \doif{\linetablecparameter\c!background}\v!color
+       {\backgroundline[\linetablecparameter\c!backgroundcolor]}%
        {\box\scratchbox}%
    \fi
    \egroup}
@@ -275,11 +275,11 @@
    \else
      \vbox
        {\ifvoid\tablebox\linetablepart\else\unvbox\tablebox\linetablepart\fi
-        \doif{\linetablerparameter\c!achtergrond}\v!kleur
-          {\backgroundline[\linetablerparameter\c!achtergrondkleur]}%
+        \doif{\linetablerparameter\c!background}\v!color
+          {\backgroundline[\linetablerparameter\c!backgroundcolor]}%
           {\box\scratchbox}% is also arg to \backgroundline
         \endgraf
-        \linetablerparameter\c!na}%
+        \linetablerparameter\c!after}%
    \fi}
 
 \def\flushlinetableparts
@@ -290,7 +290,7 @@
      \iflinetablepreroll
        % forget about them
      \else
-       \doifelse{\linetableparameter\c!regels}\v!passend
+       \doifelse{\linetableparameter\c!lines}\v!fit
          {\scratchdimen\pagetotal}%
          {\scratchdimen\zeropoint}%
        \dorecurse\noflinetableparts
@@ -308,10 +308,10 @@
           \dp\tablebox\linetablepart\strutdepth
           \hbox to \hsize{\box\tablebox\linetablepart\hss}%
           \ifnum\linetablepart<\noflinetableparts\relax
-            \linetableparameter\c!tussen
+            \linetableparameter\c!inbetween
           \fi}%
        \ifnum\linetablerows<\noflinetablerows\relax
-         \linetableparameter\c!tussen
+         \linetableparameter\c!inbetween
        \else
          % after, later
        \fi
@@ -350,8 +350,8 @@
 \def\startlinetablepart
   {\global\linetablesubcol\zerocount
    \setbox\scratchbox\hbox\bgroup
-   \doconvertfont{\linetablerparameter\c!letter}%
-   \startcolor[\linetablerparameter\c!kleur]%
+   \doconvertfont{\linetablerparameter\c!style}%
+   \startcolor[\linetablerparameter\c!color]%
    \ignorespaces}
 
 \def\stoplinetablepart
@@ -365,7 +365,7 @@
        % we're collecting the repeater
      \else
        \scratchdimen\hsize \advance\scratchdimen-\wd\scratchbox\relax
-       \ifdim\scratchdimen>\linetableparameter\c!rek\else
+       \ifdim\scratchdimen>\linetableparameter\c!stretch\else
          \setbox\scratchbox\hbox to \hsize{\unhbox\scratchbox}%
        \fi
      \fi
@@ -478,22 +478,22 @@
   {\bgroup
    \inlinetabletrue
    % autowidth
-   \doif{\linetableparameter\c!maxbreedte}\v!passend
-     {\setuplinetable[\c!maxbreedte=\zeropoint]}%
+   \doif{\linetableparameter\c!maxwidth}\v!fit
+     {\setuplinetable[\c!maxwidth=\zeropoint]}%
    \processaction
-     [\linetableparameter\c!rek]
-     [\v!nee=>{\setuplinetable[\c!rek=\maxdimen]},% no stretch
-       \v!ja=>{\setuplinetable[\c!rek=\zeropoint]}]% max stretch
-   \chardef\linetablerepeat\linetableparameter\c!nlinks
+     [\linetableparameter\c!stretch]
+     [\v!no=>{\setuplinetable[\c!stretch=\maxdimen]},% no stretch
+       \v!yes=>{\setuplinetable[\c!stretch=\zeropoint]}]% max stretch
+   \chardef\linetablerepeat\linetableparameter\c!nleft
    \chardef\linetablesplitstatus % =
-     \ifdim\linetableparameter\c!maxbreedte>\zeropoint
+     \ifdim\linetableparameter\c!maxwidth>\zeropoint
        \zerocount \else \plusone
      \fi
    % optional prevdepth correction
    \iflinetablepreroll
      \globallet\noflinetablerows\!!zerocount
    \else
-     \linetableparameter\c!voor
+     \linetableparameter\c!before
    \fi
    \globallet\linetablerows\!!zerocount
    \globallet\noflinetablecolumns\!!zerocount
@@ -533,7 +533,7 @@
    \chardef\linetableheadstatus\zerocount % blocked
    \flushlinetableparts
    \iflinetablepreroll \else
-     \linetableparameter\c!na
+     \linetableparameter\c!after
    \fi
    \globallet\linetablepart    \!!zerocount
    \globallet\noflinetableparts\!!zerocount
@@ -599,12 +599,12 @@
 %   \fi\fi\fi
 %
    \linetableheight\zeropoint
-   \edef\!!stringa{\linetablerparameter\c!hoogte}%
+   \edef\!!stringa{\linetablerparameter\c!height}%
    \ifx\!!stringa\empty
      \chardef\linetablehmode\zerocount
-   \else\ifx\!!stringa\v!passend
+   \else\ifx\!!stringa\v!fit
      \chardef\linetablehmode\plusone
-   \else\ifx\!!stringa\v!regel
+   \else\ifx\!!stringa\v!line
      \chardef\linetablehmode\plustwo
    \else
      \linetableheight\!!stringa
@@ -646,7 +646,7 @@
 \def\checklinetablepage
   {\global\chardef\linetablepage\zerocount
    \ifcase\linetablerepeat \else \ifcase\linetablepage
-     \doif{\linetableparameter\c!herhaal}\v!nee
+     \doif{\linetableparameter\c!repeat}\v!no
        {\global\chardef\linetablepage\doifoddpageelse\plusone\plustwo}%
    \fi \fi}
 
@@ -695,7 +695,7 @@
    \globallet\noflinetablerows\linetablerows
    \dorecurse\noflinetablecolumns % global, from last run {\linetableparameter\c!n}
      {%\writestatus{linetable}{\recurselevel->\getvalue{\??lew\recurselevel}}%
-      \setevalue{\??lec\recurselevel\c!breedte}{\getvalue{\??lew\recurselevel}}%
+      \setevalue{\??lec\recurselevel\c!width}{\getvalue{\??lew\recurselevel}}%
       \letgvalue{\??lew\recurselevel}\!!zeropoint}} % init next table
 
 % todo: store in box instead of macro
@@ -785,4 +785,4 @@
   {\NC aaa \NC bb \NC c \NC ddddd \NC eeee \NC ff \NC \NR}
 \stoplinetable
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/core-mak.tex b/tex/context/base/core-mak.tex
index 0d41bd8f5..3f912500f 100644
--- a/tex/context/base/core-mak.tex
+++ b/tex/context/base/core-mak.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-mak,
+%D   [       filefile=core-mak,
 %D        version=1997.10.05,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=General Makeup Commands,
@@ -25,16 +25,16 @@
 \def\dodefineplacement[#1][#2]%
   {\getparameters
      [\??pl#1]
-     [\c!links=\hss,
-      \c!rechts=\hss,
-      \c!regelcorrectie=\v!uit,
-      \c!dieptecorrectie=\v!uit,
-      \c!marge=\v!standaard,
-      \c!grid=\v!midden,
-      %\c!voor=,
-      %\c!na=,
+     [\c!left=\hss,
+      \c!right=\hss,
+      \c!linecorrection=\v!off,
+      \c!depthcorrection=\v!off,
+      \c!margin=\v!standard,
+      \c!grid=\v!middle,
+      %\c!before=,
+      %\c!after=,
       #2]%
-   \setvalue{\e!plaats#1}{\doplacement[\??pl#1]}}
+   \setvalue{\e!place#1}{\doplacement[\??pl#1]}}
 
 \def\defineplacement
   {\dodoubleempty\dodefineplacement}
@@ -72,31 +72,31 @@
      {\forgetall}
      {\setlocalhsize
       \getparameters[#1][#2]%
-      \getvalue{#1\c!voor}%
+      \getvalue{#1\c!before}%
       \begingroup
       \positioningparfalse
       \setbox\nextbox\hbox to \localhsize
-        {\getvalue{#1\c!links}%
+        {\getvalue{#1\c!left}%
          \flushnextbox
-         \getvalue{#1\c!rechts}}%
+         \getvalue{#1\c!right}}%
       \ifinsidefloat \else
         \addlocalbackgroundtobox\nextbox
       \fi
       \ifgridsnapping
-        \doifundefined{#1\c!grid}{\letvalue{#1\c!grid}\v!midden}%
+        \doifundefined{#1\c!grid}{\letvalue{#1\c!grid}\v!middle}%
         % unchecked
-        \doifinset{\getvalue{#1\c!marge}}{\v!standaard,\v!ja}\noindent
+        \doifinset{\getvalue{#1\c!margin}}{\v!standard,\v!yes}\noindent
         \snaptogrid[\getvalue{#1\c!grid}]\hbox{\flushnextbox}%
       \else
-        \doifvalue{#1\c!regelcorrectie}\v!aan \startbaselinecorrection
-        \doifinset{\getvalue{#1\c!marge}}{\v!standaard,\v!ja}\noindent
+        \doifvalue{#1\c!linecorrection}\v!on \startbaselinecorrection
+        \doifinset{\getvalue{#1\c!margin}}{\v!standard,\v!yes}\noindent
         \flushnextbox
-        \doifvalue{#1\c!dieptecorrectie}\v!aan\baselinecorrection
-        \doifvalue{#1\c!regelcorrectie }\v!aan\stopbaselinecorrection
+        \doifvalue{#1\c!depthcorrection}\v!on\baselinecorrection
+        \doifvalue{#1\c!linecorrection }\v!on\stopbaselinecorrection
       \fi
       \endgroup
-      \getvalue{#1\c!na}%
+      \getvalue{#1\c!after}%
       \egroup}
    \vbox}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-mar.tex b/tex/context/base/core-mar.tex
index bb9fc0eca..3552137a6 100644
--- a/tex/context/base/core-mar.tex
+++ b/tex/context/base/core-mar.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-mar,
+%D   [       filefile=core-mar,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Markings,
@@ -36,13 +36,13 @@
 \beginTEX
 
 \def\mainmarking#1%
-  {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else
-     \csname\??mk#1\c!koppeling\endcsname
+  {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else
+     \csname\??mk#1\c!coupling\endcsname
    \fi}
 
 \def\fastresetmarker#1%
-  {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else
-     \@EA\resetmark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname
+  {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else
+     \@EA\resetmark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname
    \fi}
 
 \endTEX
@@ -50,13 +50,13 @@
 \beginETEX \ifcsname
 
 \def\mainmarking#1%
-  {\ifcsname\??mk#1\c!koppeling\endcsname
-     \csname\??mk#1\c!koppeling\endcsname
+  {\ifcsname\??mk#1\c!coupling\endcsname
+     \csname\??mk#1\c!coupling\endcsname
    \fi}
 
 \def\fastresetmarker#1%
-  {\ifcsname\??mk#1\c!koppeling\endcsname
-     \@EA\resetmark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname
+  {\ifcsname\??mk#1\c!coupling\endcsname
+     \@EA\resetmark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname
    \fi}
 
 \endETEX
@@ -79,10 +79,10 @@
 
 % betere protectie
 
-\letvalue{\??mk\??mk \v!vorige}\gettopmark
-\letvalue{\??mk\??mk \v!eerste}\getfirstmark
-\letvalue{\??mk\??mk\v!laatste}\getbotmark
-\letvalue{\??mk\??mk\v!huidige}\getcurrentmark
+\letvalue{\??mk\??mk \v!previous}\gettopmark
+\letvalue{\??mk\??mk \v!first}\getfirstmark
+\letvalue{\??mk\??mk\v!last}\getbotmark
+\letvalue{\??mk\??mk\v!current}\getcurrentmark
 
 % todo: make it work in balancing
 %
@@ -98,19 +98,19 @@
 %   \stopcolumns
 % \stoptext
 
-\letvalue{\??mk\??mk\v!kolom:\v!eerste }\getsplitfirstmark
-\letvalue{\??mk\??mk\v!kolom:\v!laatste}\getsplitbottommark
+\letvalue{\??mk\??mk\v!column:\v!first }\getsplitfirstmark
+\letvalue{\??mk\??mk\v!column:\v!last}\getsplitbottommark
 
 \ifx\decouplemarking\undefined \def\decouplemarking[#1]{} \fi
 
 \def\dododefinemarking[#1][#2]%
   {\getparameters[\??mk#1]
-     [\c!expansie=\v!nee,  % saves a macro
-      \c!scheider={ --- }, % watch the spaces
+     [\c!expansion=\v!no,  % saves a macro
+      \c!separator={ --- }, % watch the spaces
       \c!limittext=\@@kolimittext,
-        \c!status=\v!start]%
+        \c!state=\v!start]%
    \decouplemarking[#1]%  % no coupling with sections
-   \setevalue{\??mk#1\c!koppeling}{#2}%
+   \setevalue{\??mk#1\c!coupling}{#2}%
    \expandafter\newmark\csname\??mk#2\endcsname
    \showmessage\m!systems{13}{#1,[#2]}}
 
@@ -124,11 +124,11 @@
 
 \def\definerawmarking[#1]% global ! ! ! !
   {\getgparameters[\??mk#1]
-     [\c!expansie=\v!nee,  % saves a macro
-      \c!scheider={ --- }, % watch the spaces
+     [\c!expansion=\v!no,  % saves a macro
+      \c!separator={ --- }, % watch the spaces
       \c!limittext=,
-        \c!status=\v!start]%
-   \setxvalue{\??mk#1\c!koppeling}{#1}%
+        \c!state=\v!start]%
+   \setxvalue{\??mk#1\c!coupling}{#1}%
    \expandafter\newmark\csname\??mk#1\endcsname
    \showmessage\m!systems{13}{#1}}
 
@@ -144,9 +144,9 @@
 \beginTEX
 
 \def\fetchmark[#1][#2]% never \unexpanded
-  {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else
+  {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else
      \@EA\@EA\csname\??mk\??mk#2\endcsname
-     \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname
+     \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname
    \fi}
 
 \endTEX
@@ -154,40 +154,40 @@
 \beginETEX \ifcsname
 
 \def\fetchmark[#1][#2]% never \unexpanded
-  {\ifcsname\??mk#1\c!koppeling\endcsname
+  {\ifcsname\??mk#1\c!coupling\endcsname
    % \@EA\@EA\csname\??mk\??mk#2\endcsname
-   % \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname
+   % \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname
      \csname\??mk\??mk#2\@EA\endcsname
-     \csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname
+     \csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname
    \fi}
 
 \endETEX
 
 \def\fetchtwomarks[#1]%
-  {\doifsomething{\fetchmark[#1][\v!eerste]}
-     {\fetchmark[#1][\v!eerste]%
-      \doifsomething{\fetchmark[#1][\v!laatste]}
-        {\doifnot{\fetchmark[#1][\v!eerste]}{\fetchmark[#1][\v!laatste]}
-            {\getvalue{\??mk#1\c!scheider}\fetchmark[#1][\v!laatste]}}}}
+  {\doifsomething{\fetchmark[#1][\v!first]}
+     {\fetchmark[#1][\v!first]%
+      \doifsomething{\fetchmark[#1][\v!last]}
+        {\doifnot{\fetchmark[#1][\v!first]}{\fetchmark[#1][\v!last]}
+            {\getvalue{\??mk#1\c!separator}\fetchmark[#1][\v!last]}}}}
 
 \def\fetchallmarks[#1]%
-  {\doifsomething{\fetchmark[#1][\v!eerste]}
-     {\doifsomething{\fetchmark[#1][\v!vorige]}
-        {\doifnot{\fetchmark[#1][\v!vorige]}{\fetchmark[#1][\v!eerste]}
-           {\fetchmark[#1][\v!vorige]\getvalue{\??mk#1\c!scheider}}}}%
+  {\doifsomething{\fetchmark[#1][\v!first]}
+     {\doifsomething{\fetchmark[#1][\v!previous]}
+        {\doifnot{\fetchmark[#1][\v!previous]}{\fetchmark[#1][\v!first]}
+           {\fetchmark[#1][\v!previous]\getvalue{\??mk#1\c!separator}}}}%
       \fetchtwomarks[#1]}
 
 \def\dogetmarking[#1][#2]%
-  {\doifvalue{\??mk#1\c!status}\v!start
+  {\doifvalue{\??mk#1\c!state}\v!start
      {\bgroup
      %\def\nomarking##1{\unknown\ }%
       \def\nomarking{\splitsequence{\getvalue{\??mk#1\c!limittext}}}%
       \setfullsectionnumber{\??mk#1}%
       \processaction % slow
         [#2]
-        [  \v!beide=>{\fetchtwomarks[#1]},
-           \v!alles=>{\fetchallmarks[#1]},
-         \s!default=>{\fetchmark    [#1][\v!eerste]},
+        [  \v!both=>{\fetchtwomarks[#1]},
+           \v!all=>{\fetchallmarks[#1]},
+         \s!default=>{\fetchmark    [#1][\v!first]},
          \s!unknown=>{\fetchmark    [#1][#2]}]%
       \egroup}}
 
@@ -202,11 +202,11 @@
 \beginTEX
 
 \def\domarking[#1]#2%
-  {\@EA\ifx\csname\??mk#1\c!koppeling\endcsname\else
+  {\@EA\ifx\csname\??mk#1\c!coupling\endcsname\else
      \bgroup
-     \doifelsevalue{\??mk#1\c!expansie}\v!ja
+     \doifelsevalue{\??mk#1\c!expansion}\v!yes
        \expandmarkstrue\expandmarksfalse
-     \@EA\setsomemark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname{#2}%
+     \@EA\setsomemark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname{#2}%
      \egroup
    \fi}
 
@@ -215,11 +215,11 @@
 \beginETEX \ifcsname
 
 \def\domarking[#1]#2%
-  {\ifcsname\??mk#1\c!koppeling\endcsname
+  {\ifcsname\??mk#1\c!coupling\endcsname
      \bgroup
-     \doifelsevalue{\??mk#1\c!expansie}\v!ja
+     \doifelsevalue{\??mk#1\c!expansion}\v!yes
        \expandmarkstrue\expandmarksfalse
-     \@EA\setsomemark\csname\??mk\csname\??mk#1\c!koppeling\endcsname\endcsname{#2}%
+     \@EA\setsomemark\csname\??mk\csname\??mk#1\c!coupling\endcsname\endcsname{#2}%
      \egroup
    \fi}
 
@@ -231,7 +231,7 @@
 %D Used in placing text lines.
 
 \def\doifelsemarking#1%
-  {\ifundefined{\??mk#1\c!koppeling}%
+  {\ifundefined{\??mk#1\c!coupling}%
      \expandafter\secondoftwoarguments
    \else
      \expandafter\firstoftwoarguments
diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex
index ccdccb2e5..5df24960f 100644
--- a/tex/context/base/core-mat.tex
+++ b/tex/context/base/core-mat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-mat,
+%D   [       filefile=core-mat,
 %D        version=1998.12.07,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Math Fundamentals,
@@ -82,8 +82,8 @@
 % we don't use the skip's
 
 \def\displayskipsize#1#2% obsolete
-  {\ifdim\tussenwit>\zeropoint
-     #1\tussenwit\!!plus#2\tussenwit\!!minus#2\tussenwit\relax
+  {\ifdim\ctxparskip>\zeropoint
+     #1\ctxparskip\!!plus#2\ctxparskip\!!minus#2\ctxparskip\relax
    \else
      #1\lineheight\!!plus#2\lineheight\!!minus#2\lineheight\relax
    \fi}
@@ -124,12 +124,12 @@
    \abovedisplayshortskip\zeropoint
    \belowdisplayshortskip\zeropoint}
 
-\definieernummer % \doorlabelen
-  [\v!formule]
-  [\c!tekst=\v!formule,
-   \c!wijze=\@@fmwijze,
-   \c!blokwijze=\@@fmblokwijze,
-   \c!plaats=\v!intekst]
+\definenumber % \definelabel
+  [\v!formula]
+  [\c!text=\v!formula,
+   \c!way=\@@fmway,
+   \c!blockway=\@@fmblockway,
+   \c!location=\v!intext]
 
 \def\setupformulas
   {\dodoubleargument\getparameters[\??fm]}
@@ -137,13 +137,13 @@
 \newconditional\handleformulanumber
 \newconditional\incrementformulanumber
 
-\def\dododoformulenummer#1#2#3#4% (#1,#2)=outer(ref,sub) (#3,#4)=inner(ref,sub)
+\def\dododoformulanumber#1#2#3#4% (#1,#2)=outer(ref,sub) (#3,#4)=inner(ref,sub)
   {\hbox\bgroup
    \ifconditional\handleformulanumber
      \ifconditional\incrementformulanumber
-       \verhoognummer[\v!formule]%
+       \incrementnumber[\v!formula]%
      \fi
-     \maakhetnummer[\v!formule]%
+     \maakhetnummer[\v!formula]%
      \setbox0\hbox{\ignorespaces#2\unskip}%
      \ifdim\wd0>\zeropoint
        \edef\hetsubnummer{#2}%
@@ -157,26 +157,26 @@
      \fi
      \doifsomething{#3}{\rawreference\s!for{#3}{\hetnummer\hetsubnummer}}%
      \rm % nodig ?
-     \@@fmnummercommando
-       {\dostartattributes\??fm\c!nummerletter\c!nummerkleur
+     \@@fmnumbercommand
+       {\dostartattributes\??fm\c!numberstyle\c!numbercolor
         \strut
-        \@@fmlinks
+        \@@fmleft
         \preparethenumber\??fm\hetnummer\preparednumber
-        \labeltexts\v!formule
+        \labeltexts\v!formula
           {\ignorespaces\preparednumber\ignorespaces\hetsubnummer\unskip}%
-        \@@fmrechts
+        \@@fmright
         \dostopattributes}%
    \fi
    \egroup}
 
-\def\dodoformulenummer[#1][#2][#3]%
-  {\doquadruplegroupempty\dododoformulenummer{#1}{#2}{#3}}
+\def\dodoformulanumber[#1][#2][#3]%
+  {\doquadruplegroupempty\dododoformulanumber{#1}{#2}{#3}}
 
-\def\doformulenummer
-  {\dotripleempty\dodoformulenummer}
+\def\doformulanumber
+  {\dotripleempty\dodoformulanumber}
 
-\setvalue{\e!start\v!formule}{\dostartformula{}}
-\setvalue{\e!stop \v!formule}{\dostopformula}
+\setvalue{\e!start\v!formula}{\dostartformula{}}
+\setvalue{\e!stop \v!formula}{\dostopformula}
 
 \def\definieerformule
   {\dodoubleempty\dodefinieerformule}
@@ -185,13 +185,13 @@
   {\doifsomething{#1}
      {\copyparameters
         [\??fm#1][\??fm]
-        [\c!voorwit,\c!nawit,\c!grid,
-         \c!linkermarge,\c!rechtermarge,\c!marge,
-         \c!springvolgendein,\c!variant,
-         \c!strut,\c!uitlijnen,\c!afstand]%
+        [\c!spacebefore,\c!spaceafter,\c!grid,
+         \c!leftmargin,\c!rightmargin,\c!margin,
+         \c!indentnext,\c!alternative,
+         \c!strut,\c!align,\c!distance]%
       \setupformulas[#1][#2]%
-      \setvalue{\e!start#1\v!formule}{\dostartformula{#1}}%
-      \setvalue{\e!stop #1\v!formule}{\dostopformula}}}
+      \setvalue{\e!start#1\v!formula}{\dostartformula{#1}}%
+      \setvalue{\e!stop #1\v!formula}{\dostopformula}}}
 
 \newtoks \everysetupformulas \relax % we need a hook for extensions in modules
 
@@ -210,38 +210,38 @@
   {\csname\??fm\currentformula#1\endcsname}
 
 \setupformulas
-  [\c!wijze=\@@nrwijze,
-   \c!blokwijze=,
-   \c!sectienummer=\@@nrsectienummer,
-   \c!plaats=\v!rechts,
-   \c!links=(,
-   \c!rechts=),
-   \c!voorwit=,
-   \c!nawit=\@@fmvoorwit,
-   \c!linkermarge=\!!zeropoint,
-   \c!rechtermarge=\!!zeropoint,
-   \c!marge=,
-   \c!springvolgendein=\v!nee,
-   \c!variant=\s!default,
-   \c!uitlijnen=,
-   \c!strut=\v!nee,
-   \c!scheider=\@@koscheider,
-   \c!afstand=1em]
+  [\c!way=\@@nrway,
+   \c!blockway=,
+   \c!sectionnumber=\@@nrsectionnumber,
+   \c!location=\v!right,
+   \c!left=(,
+   \c!right=),
+   \c!spacebefore=,
+   \c!spaceafter=\@@fmspacebefore,
+   \c!leftmargin=\!!zeropoint,
+   \c!rightmargin=\!!zeropoint,
+   \c!margin=,
+   \c!indentnext=\v!no,
+   \c!alternative=\s!default,
+   \c!align=,
+   \c!strut=\v!no,
+   \c!separator=\@@koseparator,
+   \c!distance=1em]
 
 \def\currentformula          {}
 \def\predisplaysizethreshhold{2em} % was 3em
 
 \def\leftdisplayskip    {\leftskip}
 \def\rightdisplayskip   {\rightskip}
-\def\leftdisplaymargin  {\formulaparameter\c!linkermarge}
-\def\rightdisplaymargin {\formulaparameter\c!rechtermarge}
+\def\leftdisplaymargin  {\formulaparameter\c!leftmargin}
+\def\rightdisplaymargin {\formulaparameter\c!rightmargin}
 \def\displaygridsnapping{\formulaparameter\c!grid}
 
 \def\beforedisplayspace
-  {\doifnot{\formulaparameter\c!voorwit}\v!geen{\blanko[\formulaparameter\c!voorwit]}}
+  {\doifnot{\formulaparameter\c!spacebefore}\v!none{\blank[\formulaparameter\c!spacebefore]}}
 
 \def\afterdisplayspace
-  {\doifnot{\formulaparameter\c!nawit  }\v!geen{\blanko[\formulaparameter\c!nawit  ]}}
+  {\doifnot{\formulaparameter\c!spaceafter  }\v!none{\blank[\formulaparameter\c!spaceafter  ]}}
 
 \def\setpredisplaysize#1%
   {\predisplaysize#1\relax
@@ -294,8 +294,8 @@
    \switchtoformulabodyfont[#2]%
    \parskip\formulaparskip
    \def\currentformula{#1}%
-   \doifsomething{\formulaparameter\c!marge}% so we test first
-     {\dosetleftskipadaption{\formulaparameter\c!marge}%
+   \doifsomething{\formulaparameter\c!margin}% so we test first
+     {\dosetleftskipadaption{\formulaparameter\c!margin}%
       \edef\leftdisplaymargin{\the\leftskipadaption}}% overloaded
    \long\def\dostartformula##1{\bgroup\let\dostopformula\egroup}%
    \freezedimenmacro\leftdisplayskip
@@ -312,11 +312,11 @@
    \else
      \resetlastlinewidth
    \fi
-   \getvalue{\e!start\formulaparameter\c!variant\v!formule}}
+   \getvalue{\e!start\formulaparameter\c!alternative\v!formula}}
 
 \def\switchtoformulabodyfont{\switchtobodyfont}
 
-\setvalue{\v!formule}{\dosingleempty\doformula}
+\setvalue{\v!formula}{\dosingleempty\doformula}
 
 \def\doformula[#1]#2%
   {\begingroup
@@ -329,7 +329,7 @@
 
 \def\dostopformula
   {\doplaceformulanumber
-   \getvalue{\e!stop\formulaparameter\c!variant\v!formule}%
+   \getvalue{\e!stop\formulaparameter\c!alternative\v!formula}%
    \resetlastlinewidth
    \nonoindentation
    \dochecknextindentation{\??fm\currentformula}%
@@ -396,10 +396,10 @@
      \ifdim\lastskip<\zeropoint\else
        \par
          \ifvmode \ifdim\parskip>\zeropoint\relax
-           \witruimte \vskip-\parskip % kind of forces and cancels again
+           \whitespace \vskip-\parskip % kind of forces and cancels again
          \fi \fi
      \fi
-     \doif\displaygridcorrection{-\v!boven}{\kern-\strutht}% new, currently only option/default
+     \doif\displaygridcorrection{-\v!top}{\kern-\strutht}% new, currently only option/default
      \beforedisplayspace
      \par
      \ifvmode
@@ -419,7 +419,7 @@
      \egroup
      \afterdisplayspace
    \else
-     \par\ifvmode\ifdim\parskip>\zeropoint\witruimte\vskip-\parskip\fi\fi
+     \par\ifvmode\ifdim\parskip>\zeropoint\whitespace\vskip-\parskip\fi\fi
      \afterdisplayspace
      \egroup
    \fi
@@ -470,7 +470,7 @@
   {\iffirstargument
      \xdef\displaygridcorrection{#1}%
    \else
-     \gdef\displaygridcorrection{-\v!boven}% handy with short preline
+     \gdef\displaygridcorrection{-\v!top}% handy with short preline
    \fi
    \globallet\displaylinecorrection\displaygridcorrection}
 
@@ -481,8 +481,8 @@
   {\dotripleargument\dodefineformulaalternative}
 
 \def\dodefineformulaalternative[#1][#2][#3]%
-  {\setvalue{\e!start#1\v!formule}{#2}%
-   \setvalue{\e!stop #1\v!formule}{#3}}
+  {\setvalue{\e!start#1\v!formula}{#2}%
+   \setvalue{\e!stop #1\v!formula}{#3}}
 
 \defineformulaalternative[\s!default][\startdisplaymath][\stopdisplaymath]
 
@@ -494,25 +494,25 @@
 
 \definieerformule
   [sp]
-  [\c!voorwit=\v!geen,\c!nawit=\v!geen,
-   \c!springvolgendein=\v!nee,
-   \c!variant=single]
+  [\c!spacebefore=\v!none,\c!spaceafter=\v!none,
+   \c!indentnext=\v!no,
+   \c!alternative=single]
 
 \definieerformule
   [sd]
-  [\c!voorwit=\v!geen,\c!nawit=\v!geen,
-   \c!springvolgendein=\v!ja,
-   \c!variant=single]
+  [\c!spacebefore=\v!none,\c!spaceafter=\v!none,
+   \c!indentnext=\v!yes,
+   \c!alternative=single]
 
 \definieerformule
   [mp]
-  [\c!springvolgendein=\v!nee,
-   \c!variant=multi]
+  [\c!indentnext=\v!no,
+   \c!alternative=multi]
 
 \definieerformule
   [md]
-  [\c!springvolgendein=\v!ja,
-   \c!variant=multi]
+  [\c!indentnext=\v!yes,
+   \c!alternative=multi]
 
 % in m-math
 %
@@ -540,15 +540,15 @@
 % \convertcommand\next\to\ascii \getfirstcharacter\ascii
 % \ifx\firstcharacter\letterbackslash % a \cs
 
-\def\plaatsformule
+\def\placeformula
   {\settrue\incrementformulanumber
-   \dodoubleempty\doplaatsformule}
+   \dodoubleempty\doplaceformula}
 
-\def\plaatssubformule
+\def\placesubformula
   {\setfalse\incrementformulanumber
-   \dodoubleempty\doplaatsformule}
+   \dodoubleempty\doplaceformula}
 
-\def\doplaatsformule[#1][#2]% #2 = dummy, gobbles spaces
+\def\doplaceformula[#1][#2]% #2 = dummy, gobbles spaces
   {\def\redoplaatsformule
      {\bgroup\def\dostartformula####1{\relax}%
       \ifx\next\bgroup
@@ -557,7 +557,7 @@
         \expandafter\convertargument\e!start\to\asciiA
         \expandafter\convertargument\next   \to\asciiB
         \ExpandBothAfter\doifincsnameelse\asciiA\asciiB
-          {\egroup \@EA\dodoplaatsformule}% [ref]\start
+          {\egroup \@EA\dodoplaceformula}% [ref]\start
           {\egroup \@EA\dispplaatsformule}% [ref]$$
       \fi[#1]{}}%
    \futurelet\next\redoplaatsformule}
@@ -567,48 +567,48 @@
      {\expandafter\convertargument\e!start\to\asciiA
       \expandafter\convertargument\next   \to\asciiB
       \ExpandBothAfter\doifincsnameelse\asciiA\asciiB
-        {\egroup \dodoplaatsformule}% [ref]\start
+        {\egroup \dodoplaceformula}% [ref]\start
         {\egroup \dispplaatsformule}% [ref]$$
       [#1]{#3}}%
    \futurelet\next\redoplaatsformule#4}
 
 \def\dispplaatsformule[#1]#2$$#3$$%
-  {\dodoplaatsformule[#1]{#2}\dostartformula{}#3\dostopformula}
+  {\dodoplaceformula[#1]{#2}\dostartformula{}#3\dostopformula}
 
 \let\normalreqno\eqno
 \let\normalleqno\leqno
 
-\def\dodoplaatsformule[#1]#2% messy, needs a clean up
+\def\dodoplaceformula[#1]#2% messy, needs a clean up
   {\doifelse{#1}{-}
      {\setfalse\handleformulanumber}
      {\doifelse{#2}{-}
         {\setfalse\handleformulanumber}
         {\settrue\handleformulanumber}}%
    \ifconditional\handleformulanumber
-     \def\formulenummer
-       {%\global\let\subformulenummer\doformulenummer % no, bug
-        \doformulenummer[#1][#2]}%
-     \def\subformulenummer
+     \def\formulanumber
+       {%\global\let\subformulanumber\doformulanumber % no, bug
+        \doformulanumber[#1][#2]}%
+     \def\subformulanumber
        {\setfalse\incrementformulanumber
-        \formulenummer}%
+        \formulanumber}%
      \gdef\doplaceformulanumber
        {\global\let\doplaceformulanumber\empty
-        \doifelse\@@fmplaats\v!links
-          {\normalleqno{\doformulenummer[#1][#2][]{}}}
-          {\normalreqno{\doformulenummer[#1][#2][]{}}}}%
+        \doifelse\@@fmlocation\v!left
+          {\normalleqno{\doformulanumber[#1][#2][]{}}}
+          {\normalreqno{\doformulanumber[#1][#2][]{}}}}%
    \else
-     \def\formulenummer{\doformulenummer[#1][#2]}%
-     \global\let\subformulenummer\doformulenummer
+     \def\formulanumber{\doformulanumber[#1][#2]}%
+     \global\let\subformulanumber\doformulanumber
      \global\let\doplaceformulanumber\empty
    \fi}
 
 %D We need a hook into the plain math alignment macros
 %D
-%D \starttypen
+%D \starttyping
 %D \displaylines
 %D \eqalignno
 %D \eqalignno
-%D \stoptypen
+%D \stoptyping
 %D
 %D Otherwise we get a missing \type {$$} error reported.
 
@@ -627,13 +627,13 @@
 %D modules.
 
 \def\startinnermath
-  {\getvalue{\e!start\??fm\formulaparameter\c!uitlijnen}}
+  {\getvalue{\e!start\??fm\formulaparameter\c!align}}
 
 \def\stopinnermath
-  {\getvalue{\e!stop \??fm\formulaparameter\c!uitlijnen}}
+  {\getvalue{\e!stop \??fm\formulaparameter\c!align}}
 
 \def\mathinnerstrut
-  {\doif{\formulaparameter\c!strut}\v!ja\strut}
+  {\doif{\formulaparameter\c!strut}\v!yes\strut}
 
 \long\def\defineinnermathhandler#1#2#3%
   {\setvalue{\e!start\??fm#1}{#2}%
@@ -659,7 +659,7 @@
      \ifx\@leqno\empty\else \ifcase#2
        \rlap{\@leqno}%
      \else
-       \@leqno\hskip\formulaparameter\c!afstand
+       \@leqno\hskip\formulaparameter\c!distance
      \fi \fi
      #1}
 
@@ -668,13 +668,13 @@
    \ifx\@eqno\empty\else \ifcase#2
      \llap{\@eqno}%
    \else
-     \hskip\formulaparameter\c!afstand\@eqno
+     \hskip\formulaparameter\c!distance\@eqno
    \fi \fi
    \egroup}
 
-\defineinnermathhandler\v!rechts{\startmathbox\empty1}{\stopmathbox\hfill0}
-\defineinnermathhandler\v!links {\startmathbox\hfill0}{\stopmathbox\empty1}
-\defineinnermathhandler\v!midden{\startmathbox\hfill0}{\stopmathbox\hfill0}
+\defineinnermathhandler\v!right{\startmathbox\empty1}{\stopmathbox\hfill0}
+\defineinnermathhandler\v!left {\startmathbox\hfill0}{\stopmathbox\empty1}
+\defineinnermathhandler\v!middle{\startmathbox\hfill0}{\stopmathbox\hfill0}
 
 %D [The examples below are in english and don't process in the
 %D  documentation style, which will be english some day.]
@@ -867,7 +867,7 @@
 \to \everysupersub
 
 \appendtoks
-  \doifelse\@@mtformaat\v!klein
+  \doifelse\@@mtsize\v!small
     {\let\gridsupsubstyle    \scriptscriptstyle
      \let\gridsupsubbodyfont \setsmallbodyfont}%
     {\let\gridsupsubstyle    \scriptstyle
@@ -875,7 +875,7 @@
 \to \everysetuptextformulas
 
 \setuptextformulas
-  [\c!formaat=\v!normaal]
+  [\c!size=\v!normal]
 
 \def\dogridsupsub#1#2%
   {\begingroup
@@ -1005,13 +1005,13 @@
 % \to \everysetuptextformulas
 
 \appendtoks
- \doifelse\@@mtgrid\v!ja        \settrue\setfalse\crazymathsnapping
- \doifelse\@@mtstap\v!halveregel\settrue\setfalse\halfcrazymathlines
+ \doifelse\@@mtgrid\v!yes        \settrue\setfalse\crazymathsnapping
+ \doifelse\@@mtstep\v!halfline\settrue\setfalse\halfcrazymathlines
 \to \everysetuptextformulas
 
 \setuptextformulas
-  [\c!grid=\v!ja,
-   \c!stap=\v!regel]
+  [\c!grid=\v!yes,
+   \c!step=\v!line]
 
 \newcount\crazymathhack
 
@@ -1021,7 +1021,7 @@
 \let\lastcrazymathpostlines\!!zerocount
 
 \def\crazymathtag{amh:\the\crazymathhack}
-\def\crazytexttag{\v!tekst:\lastcrazymathpage}
+\def\crazytexttag{\v!text:\lastcrazymathpage}
 
 \def\crazymathindent{\hskip\MPx\crazymathtag\hskip-\MPx\crazytexttag}
 
@@ -1040,13 +1040,13 @@
 \def\snappedinlineformula
   {\dosingleempty\dosnappedinlineformula}
 
-%D \starttabulatie[|Tl|l|]
+%D \starttabulate[|Tl|l|]
 %D \NC - \NC half lines        \NC \NR
 %D \NC + \NC full lines        \NC \NR
 %D \NC = \NC force             \NC \NR
 %D \NC < \NC force, minus pre  \NC \NR
 %D \NC > \NC force, minus post \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \newif\if!!donee
 \newif\if!!donef
@@ -1362,7 +1362,7 @@
 % \gform{\frac{1200}{k+12} - 42 = 6}
 % \stopregels
 
-%D \macro
+%D \macros
 %D   {restoremathstyle}
 %D
 %D We can pick up the current math style by calling \type
@@ -1385,9 +1385,9 @@
 %D If one want to be sure that something is typeset in the
 %D appropriate style, \type {\mathstyle} can be used:
 %D
-%D \starttypen
+%D \starttyping
 %D \mathstyle{something}
-%D \stoptypen
+%D \stoptyping
 
 \def\mathstyle#1%
   {\mathchoice
@@ -1428,7 +1428,7 @@
 %D handle math style restoring, which makes sure units and
 %D chemicals come out ok.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\frac#1#2%
 %D   {\relax
 %D    \ifmmode
@@ -1436,14 +1436,14 @@
 %D    \else
 %D       $\frac{#1}{#2}$%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Better is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\frac#1#2%
 %D   {\relax\mathematics{{{\mathstyle{#1}}\over{\mathstyle{#2}}}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type {\frac} macro kind of replaces the awkward \type
 %D {\over} primitive. Say that we have the following formulas:
@@ -1599,17 +1599,17 @@
 %D $\negative 10^{\negative 10^{\negative 10}}$.
 
 \setupformulas
-  [\c!wijze=\@@nrwijze,
-   \c!blokwijze=,
-   \c!sectienummer=\@@nrsectienummer,
-   \c!plaats=\v!rechts,
-   \c!links=(,
-   \c!rechts=),
-   \c!nummerletter=,
-   \c!nummerkleur=,
-   \c!nummercommando=,
-   \c!voorwit=\v!groot,
-   \c!nawit=\@@fmvoorwit,
+  [\c!way=\@@nrway,
+   \c!blockway=,
+   \c!sectionnumber=\@@nrsectionnumber,
+   \c!location=\v!right,
+   \c!left=(,
+   \c!right=),
+   \c!numberstyle=,
+   \c!numbercolor=,
+   \c!numbercommand=,
+   \c!spacebefore=\v!big,
+   \c!spaceafter=\@@fmspacebefore,
    \c!grid=]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex
index 389c1b698..2849afe05 100644
--- a/tex/context/base/core-mis.tex
+++ b/tex/context/base/core-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-mis,
+%D   [       filefile=core-mis,
 %D        version=1998.01.29,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Miscelaneous,
@@ -106,11 +106,11 @@
    \def\docommando##1%
      {\advance\!!counta \plusone
       \processaction
-        [\@@isuitlijnen]
-        [  \v!links=>\hbox to \scratchdimen{\strut##1\hss},
-          \v!rechts=>\hbox to \scratchdimen{\hss\strut##1},
-          \v!midden=>\hbox to \scratchdimen{\hss\strut##1\hss},
-           \v!marge=>\ifnum\!!counta=\plusone\hss\else\hfill\fi
+        [\@@isalign]
+        [  \v!left=>\hbox to \scratchdimen{\strut##1\hss},
+          \v!right=>\hbox to \scratchdimen{\hss\strut##1},
+          \v!middle=>\hbox to \scratchdimen{\hss\strut##1\hss},
+           \v!margin=>\ifnum\!!counta=\plusone\hss\else\hfill\fi
                      \strut##1%
                      \ifnum\!!counta=\nofitems\hss\else\hfill\fi,
          \s!default=>\hbox to \scratchdimen{\hss\strut##1\hss}, % midden
@@ -129,22 +129,22 @@
       \fi\fi}%
    \vbox{#2}}
 
-\def\dostelitemsin[#1]%
+\def\dosetupitems[#1]%
   {\getparameters[\??is][#1]%
-   \doif\@@isbreedte\v!onbekend
-     {\def\@@isbreedte{\hsize}}%
-   \doifconversiondefinedelse\@@issymbool
-     {\def\doitembullet##1{\convertnumber{\@@issymbool}{##1}}}
-     {\doifsymboldefinedelse\@@issymbool
-        {\def\doitembullet##1{\symbol[\@@issymbool]}}{}}}
+   \doif\@@iswidth\v!unknown
+     {\def\@@iswidth{\hsize}}%
+   \doifconversiondefinedelse\@@issymbol
+     {\def\doitembullet##1{\convertnumber{\@@issymbol}{##1}}}
+     {\doifsymboldefinedelse\@@issymbol
+        {\def\doitembullet##1{\symbol[\@@issymbol]}}{}}}
 
 \def\makeitemsandbullets#1%
-  {\doifelse\@@isn\v!onbekend
+  {\doifelse\@@isn\v!unknown
      {\getcommalistsize[#1]%
       \edef\nofitems{\commalistsize}}
      {\edef\nofitems{\@@isn}}%
    \setbox0\hbox
-     {\doitems \@@isbreedte
+     {\doitems \@@iswidth
         {\processcommalist[#1]\docommando}}%
    \setbox2\hbox
      {\doitems \@@isbulletbreedte
@@ -155,90 +155,90 @@
   {\let\doitems#2%
    \def\@@isbulletbreedte{#3}%
    \makeitemsandbullets{#1}%
-   \@@isvoor}
+   \@@isbefore}
 
 \def\dostopitems
-  {\@@isna
+  {\@@isafter
    \egroup}
 
-\setvalue{doitems\v!boven}#1%
-  {\dostartitems{#1}\horitems\@@isbreedte
+\setvalue{doitems\v!top}#1%
+  {\dostartitems{#1}\horitems\@@iswidth
    \noindent\vbox
      {\forgetall
-      \doifsomething\@@issymbool
-        {\doifnot\@@issymbool\v!geen
+      \doifsomething\@@issymbol
+        {\doifnot\@@issymbol\v!none
            {\box2
-            \@@istussen
+            \@@isinbetween
             \nointerlineskip}}%
       \box0}%
    \dostopitems}
 
-\setvalue{doitems\v!onder}#1%
-  {\dostartitems{#1}\horitems\@@isbreedte
+\setvalue{doitems\v!bottom}#1%
+  {\dostartitems{#1}\horitems\@@iswidth
    \noindent\vbox
      {\forgetall
       \box0
-      \doifsomething\@@issymbool
-        {\@@istussen
+      \doifsomething\@@issymbol
+        {\@@isinbetween
          \nointerlineskip
          \box2}}%
    \dostopitems}
 
-\setvalue{doitems\v!inmarge}#1%
+\setvalue{doitems\v!inmargin}#1%
   {\dostartitems{#1}\veritems{-1.5em}%  - is a signal
-   \noindent\hbox{\llap{\box2\hskip\linkermargeafstand}\box0}%
+   \noindent\hbox{\llap{\box2\hskip\leftmargindistance}\box0}%
    \dostopitems}
 
-\setvalue{doitems\v!links}#1%
+\setvalue{doitems\v!left}#1%
   {\advance\hsize -1.5em%
    \dostartitems{#1}\veritems{1.5em}%
    \noindent\hbox{\box2\box0}%
    \dostopitems}
 
-\setvalue{doitems\v!rechts}#1%
+\setvalue{doitems\v!right}#1%
   {\dostartitems{#1}\veritems{0em}%
    \noindent\hbox{\box0\hskip-\wd2\box2}%
    \dostopitems}
 
-\def\stelitemsin
-  {\dosingleargument\dostelitemsin}
+\def\setupitems
+  {\dosingleargument\dosetupitems}
 
 \def\complexitems[#1]%
   {\bgroup
-   \stelitemsin[#1]%
+   \setupitems[#1]%
    \parindent\zeropoint
    \setlocalhsize
    \hsize\localhsize
-   \mindermeldingen
-  %\doifundefined{doitems\@@isplaats}%
-  %  {\let\@@isplaats\v!links}%
-  %\getvalue{doitems\@@isplaats}}
-   \executeifdefined{doitems\@@isplaats}{\let\@@isplaats\v!links}}
+   \dontcomplain
+  %\doifundefined{doitems\@@islocation}%
+  %  {\let\@@islocation\v!left}%
+  %\getvalue{doitems\@@islocation}}
+   \executeifdefined{doitems\@@islocation}{\let\@@islocation\v!left}}
 
 \definecomplexorsimpleempty\items
 
-\stelitemsin
-  [\c!plaats=\v!links,
-   \c!symbool=5,
-   \c!breedte=\hsize,
-   \c!uitlijnen=\v!midden,
-   \c!n=\v!onbekend,
-   \c!voor=\blanko,
-   \c!tussen={\blanko[\v!middel]},
-   \c!na=\blanko]
+\setupitems
+  [\c!location=\v!left,
+   \c!symbol=5,
+   \c!width=\hsize,
+   \c!align=\v!middle,
+   \c!n=\v!unknown,
+   \c!before=\blank,
+   \c!inbetween={\blank[\v!medium]},
+   \c!after=\blank]
 
 % Te zijner tijd [plaats=boven,onder,midden] implementeren,
 % in dat geval moet eerst de maximale hoogte worden bepaald.
 %
 % Overigens kan een en ander mooier met \halign.
 
-\def\dodefinieeralineas[#1][#2]%
+\def\dodefineparagraphs[#1][#2]%
   {\setvalue{\s!do\s!next#1}%
      {\def\\{\getvalue{#1}}}%
    \setvalue{#1}%
      {\getvalue{\s!do\s!next#1}%
       \dostartalineas{#1}}%
-   \setvalue{\e!volgende#1}%
+   \setvalue{\e!next#1}%
      {\getvalue{#1}}%
    \setvalue{\e!start#1}%
      {\bgroup
@@ -249,36 +249,36 @@
       \getvalue{#1}}%
    \getparameters[\??al#1]%
      [\c!n=3,
-      \c!voor=\blanko,
-      \c!na=\blanko,
-      \c!afstand=1em,
-      \c!hoogte=\v!passend,
-      \c!lijn=\v!uit,
-      \c!commando=,
-      \c!uitlijnen=,
-      \c!tolerantie=\v!soepel,
-      \c!letter=,
-      \c!kleur=,
-      \c!boven=,
-      \c!boven=\vss,
-      \c!onder=\vfill,
+      \c!before=\blank,
+      \c!after=\blank,
+      \c!distance=1em,
+      \c!height=\v!fit,
+      \c!rule=\v!off,
+      \c!command=,
+      \c!align=,
+      \c!tolerance=\v!tolerant,
+      \c!style=,
+      \c!color=,
+      \c!top=,
+      \c!top=\vss,
+      \c!bottom=\vfill,
       #2]%
-   \setvalue{\e!stel#1\e!in}%
-     {\stelalineasin[#1]}%
+   \setvalue{\e!setup#1\e!in}%
+     {\setupparagraphs[#1]}%
    \dorecurse
       {\getvalue{\??al#1\c!n}}
-      {\stelalineasin[#1][\recurselevel]
-         [\c!breedte=,
-          \c!onder=\getvalue{\??al#1\c!onder},
-          \c!boven=\getvalue{\??al#1\c!boven},
-          \c!hoogte=\getvalue{\??al#1\c!hoogte},
-          \c!letter=\getvalue{\??al#1\c!letter},
-          \c!kleur=\getvalue{\??al#1\c!kleur},
-          \c!lijn=\getvalue{\??al#1\c!lijn},
-          \c!uitlijnen=\getvalue{\??al#1\c!uitlijnen},
-          \c!tolerantie=\getvalue{\??al#1\c!tolerantie},
-          \c!afstand=\getvalue{\??al#1\c!afstand}]}%
-   \stelalineasin[#1][1][\c!afstand=0em]}
+      {\setupparagraphs[#1][\recurselevel]
+         [\c!width=,
+          \c!bottom=\getvalue{\??al#1\c!bottom},
+          \c!top=\getvalue{\??al#1\c!top},
+          \c!height=\getvalue{\??al#1\c!height},
+          \c!style=\getvalue{\??al#1\c!style},
+          \c!color=\getvalue{\??al#1\c!color},
+          \c!rule=\getvalue{\??al#1\c!rule},
+          \c!align=\getvalue{\??al#1\c!align},
+          \c!tolerance=\getvalue{\??al#1\c!tolerance},
+          \c!distance=\getvalue{\??al#1\c!distance}]}%
+   \setupparagraphs[#1][1][\c!distance=0em]}
 
 % nog monster
 %
@@ -292,11 +292,11 @@
 %        {\getvalue{\??dd#1\c!monster}}}}
 %  {0pt}
 
-\def\definieeralineas%
-  {\dodoubleargument\dodefinieeralineas}
+\def\defineparagraphs%
+  {\dodoubleargument\dodefineparagraphs}
 
-\def\dostelalineasin[#1][#2][#3]%
-  {\doifelse{#2}\v!elk
+\def\dosetupparagraphs[#1][#2][#3]%
+  {\doifelse{#2}\v!each
      {\dorecurse
         {\getvalue{\??al#1\c!n}}
         {\getparameters[\??al#1\recurselevel][#3]}}
@@ -306,15 +306,15 @@
            {\getparameters[\??al#1##1][#3]}%
          \processcommalist[#2]\docommando}}}
 
-\def\stelalineasin
-  {\dotripleempty\dostelalineasin}
+\def\setupparagraphs
+  {\dotripleempty\dosetupparagraphs}
 
 \newcount\alteller
 \newcount\alnsize
 \newdimen\alhsize
 
 \def\doalinealijn#1#2%
-  {\doifelsevalue{\??al#2\the\alteller\c!lijn}\v!aan
+  {\doifelsevalue{\??al#2\the\alteller\c!rule}\v!on
      {\dimen2=#1\relax
       \hskip.5\dimen2
       \hskip-\linewidth
@@ -323,26 +323,26 @@
      {\hskip#1}}
 
 \def\dostartalinea#1%
-  {\doifelsevaluenothing{\??al#1\the\alteller\c!breedte}
+  {\doifelsevaluenothing{\??al#1\the\alteller\c!width}
      {\!!widtha\alhsize
       \divide\!!widtha \alnsize}
-     {\!!widtha\getvalue{\??al#1\the\alteller\c!breedte}}%
+     {\!!widtha\getvalue{\??al#1\the\alteller\c!width}}%
    \dostartattributes
-     {\??al#1\the\alteller}\c!letter\c!kleur
+     {\??al#1\the\alteller}\c!style\c!color
      \empty
-   \doifelsevalue{\??al#1\the\alteller\c!hoogte}\v!passend
+   \doifelsevalue{\??al#1\the\alteller\c!height}\v!fit
      {\setbox0\vtop}
-     {\setbox0\vtop to \getvalue{\??al#1\the\alteller\c!hoogte}}%
+     {\setbox0\vtop to \getvalue{\??al#1\the\alteller\c!height}}%
    \bgroup
-   \blanko[\v!blokkeer]%
+   \blank[\v!disable]%
    \forgetall
-   \getvalue{\??al#1\the\alteller\c!boven}%
-   \getvalue{\??al#1\c!binnen}%
+   \getvalue{\??al#1\the\alteller\c!top}%
+   \getvalue{\??al#1\c!inner}%
    \hsize\!!widtha  % setting \wd afterwards removed
-   \getvalue{\??al#1\the\alteller\c!binnen}%
-   \edef\!!stringa{\getvalue{\??al#1\the\alteller\c!uitlijnen}}%  nodig?
+   \getvalue{\??al#1\the\alteller\c!inner}%
+   \edef\!!stringa{\getvalue{\??al#1\the\alteller\c!align}}%  nodig?
    \expandafter\setupalign\expandafter[\!!stringa]%
-   \edef\!!stringa{\getvalue{\??al#1\the\alteller\c!tolerantie}}% nodig?
+   \edef\!!stringa{\getvalue{\??al#1\the\alteller\c!tolerance}}% nodig?
    \expandafter\setuptolerance\expandafter[\!!stringa]%
    \ignorespaces
    \endgraf
@@ -357,7 +357,7 @@
    \everypar{\begstrut\everypar\emptytoks}%
    %
    \ignorespaces\geenspatie % dubbel: \ignorespaces
-   \getvalue{\??al#1\the\alteller\c!commando}}
+   \getvalue{\??al#1\the\alteller\c!command}}
 
 \def\dostopalinea#1%
   {\ifvmode
@@ -365,7 +365,7 @@
    \else
      \unskip\endstrut\endgraf
    \fi
-   \getvalue{\??al#1\the\alteller\c!onder}%
+   \getvalue{\??al#1\the\alteller\c!bottom}%
    \egroup
    \ifdim\wd0=\zeropoint % no data
      \wd0\!!widtha
@@ -386,12 +386,12 @@
 
 \def\doalinea#1%
   {\global\advance\alteller \plusone
-   \doifelsevaluenothing{\??al#1\the\alteller\c!afstand}
+   \doifelsevaluenothing{\??al#1\the\alteller\c!distance}
      {\doifnot{\the\alteller}{1}
-        {\hskip\getvalue{\??al#1\c!afstand}}}
+        {\hskip\getvalue{\??al#1\c!distance}}}
      {\doifelse{\the\alteller}{1}%
-        {\hskip\getvalue{\??al#1\the\alteller\c!afstand}}
-        {\doalinealijn{\getvalue{\??al#1\the\alteller\c!afstand}}{#1}}}%
+        {\hskip\getvalue{\??al#1\the\alteller\c!distance}}
+        {\doalinealijn{\getvalue{\??al#1\the\alteller\c!distance}}{#1}}}%
    \setvalue{#1}{\dostopalinea{#1}}%
    \dostartalinea{#1}}
 
@@ -403,15 +403,15 @@
    \alnsize\getvalue{\??al#1\c!n}\relax
    \dorecurse
      {\getvalue{\??al#1\c!n}}
-     {\doifelsevaluenothing{\??al#1\recurselevel\c!afstand}
+     {\doifelsevaluenothing{\??al#1\recurselevel\c!distance}
         {\doifnot{\recurselevel}{1}
-           {\global\advance\alhsize -\getvalue{\??al#1\c!afstand}\relax}}
-        {\global\advance\alhsize -\getvalue{\??al#1\recurselevel\c!afstand}\relax}%
-      \doifvaluesomething{\??al#1\recurselevel\c!breedte}
+           {\global\advance\alhsize -\getvalue{\??al#1\c!distance}\relax}}
+        {\global\advance\alhsize -\getvalue{\??al#1\recurselevel\c!distance}\relax}%
+      \doifvaluesomething{\??al#1\recurselevel\c!width}
         {\global\advance\alnsize \minusone
-         \global\advance\alhsize -\getvalue{\??al#1\recurselevel\c!breedte}\relax}}%
-   %\witruimte                 % gaat fout bij \framed
-   \getvalue{\??al#1\c!voor}%
+         \global\advance\alhsize -\getvalue{\??al#1\recurselevel\c!width}\relax}}%
+   %\whitespace                 % gaat fout bij \framed
+   \getvalue{\??al#1\c!before}%
    \leavevmode                 % gaat wel goed bij \framed
    \vbox\bgroup\hbox\bgroup\doalinea{#1}}
 
@@ -419,33 +419,33 @@
   {\egroup
    \egroup
    \par
-   \getvalue{\??al#1\c!na}}%
+   \getvalue{\??al#1\c!after}}%
 
-\def\dosteltabin[#1]%
+\def\dosetuptab[#1]%
   {\getparameters[\??ta]
-     [\c!kopletter=\v!normaal,
-      \c!kopkleur=,
-      \c!letter=\v!normaal,
-      \c!kleur=,
-      \c!breedte=\v!ruim,
-      \c!monster={\hskip4em},
-      \c!voor=,
-      \c!na=,
+     [\c!headstyle=\v!normal,
+      \c!headcolor=,
+      \c!style=\v!normal,
+      \c!color=,
+      \c!width=\v!broad,
+      \c!sample={\hskip4em},
+      \c!before=,
+      \c!after=,
       #1]%
-   \doordefinieren
+   \definedescription
      [tab]
-     [\c!kopletter=\@@takopletter,
-      \c!kopkleur=\@@takleur,
-      \c!monster=\@@tamonster,
-      \c!breedte=\@@tabreedte,
-      \c!voor=\@@tavoor,
-      \c!na=\@@tana]}
-
-\def\steltabin
-  {\dosingleargument\dosteltabin}
-
-\steltabin
-  [\c!plaats=\v!links]
+     [\c!headstyle=\@@taheadstyle,
+      \c!headcolor=\@@tacolor,
+      \c!sample=\@@tasample,
+      \c!width=\@@tawidth,
+      \c!before=\@@tabefore,
+      \c!after=\@@taafter]}
+
+\def\setuptab
+  {\dosingleargument\dosetuptab}
+
+\setuptab
+  [\c!location=\v!left]
 
 % The following macro's are derived from PPCHTEX and
 % therefore take some LaTeX font-switching into account.
@@ -511,7 +511,7 @@
 \def\celsius#1{#1\mathematics{^\circ}C}
 \def\graden   {\mathematics{^\circ}}
 \def\inch     {\hbox{\rm\char125\relax}}
-\def\breuk#1#2{\mathematics{#1\over#2}}
+\def\fraction#1#2{\mathematics{#1\over#2}}
 
 \def\bedragprefix {\euro\normalfixedspace}
 \def\bedragsuffix {}
@@ -546,10 +546,10 @@
 \def\doorsnede
   {\hbox{\rlap/$\circ$} }
 
-\unexpanded\def\punten
-  {\dosingleempty\dopunten}
+\unexpanded\def\periods
+  {\dosingleempty\doperiods}
 
-\def\dopunten[#1]%
+\def\doperiods[#1]%
   {\scratchdimen.5em%
    \hbox to \iffirstargument#1\else5\fi \scratchdimen
      {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}}
@@ -560,7 +560,7 @@
 % for compatibility
 
 \unexpanded\def\unknown
-  {\dontleavehmode\punten[3]}
+  {\dontleavehmode\periods[3]}
 
 \def\midboundarycharacter#1#2%
   {%\nobreak
@@ -581,11 +581,11 @@
 
 % actually this is pretty old, but temporary moved here
 
-\def\stelkoppeltekenin
+\def\setuphyphenmark
   {\dodoubleargument\getparameters[\??kp]}
 
-\stelkoppeltekenin
-  [\c!teken=\compoundhyphen]
+\setuphyphenmark
+  [\c!sign=\compoundhyphen]
 
 \definehspace [sentence]      [\zeropoint]
 \definehspace [intersentence] [.250em]
@@ -610,7 +610,7 @@
   [\c!rightsubsentence]
   [\rightboundarycharacter\c!rightsubsentence{sentence}]
 
-\installdiscretionaries || \@@kpteken
+\installdiscretionaries || \@@kpsign
 
 \newsignal \subsentencesignal
 \newcounter\subsentencelevel
@@ -697,7 +697,7 @@
 
 \def\leftquotationmark
   {\setbox\scratchbox\hbox{\symbol[\c!leftquotation]}%
-   \doif\@@ciplaats\v!marge{\hskip-\wd\scratchbox}%
+   \doif\@@cilocation\v!margin{\hskip-\wd\scratchbox}%
    \box\scratchbox}
 
 \def\rightquotationmark
@@ -705,32 +705,32 @@
 
 \newsignal\quotationsignal
 
-\def\stelciterenin
+\def\setupquote
   {\dodoubleargument\getparameters[\??ci]}
 
-\def\stelcitatenin
-  {\stelciterenin}
+% \def\setuoquotation
+%   {\setupquote}
 
-\def\startcitaat
-  {\bgroup\dosingleempty\dostartcitaat}
+\def\startquotation
+  {\bgroup\dosingleempty\dostartquotation}
 
-\def\dostartcitaat[#1]%
-  {\@@civoor
+\def\dostartquotation[#1]%
+  {\@@cibefore
    \doifelsenothing{#1}
-     {\let\dostopcitaat\relax}
-     {\startsmaller[#1]%
-      \let\dostopcitaat\stopsmaller}%
-   \dostartattributes\??ci\c!letter\c!kleur\empty
+     {\let\dostopquotation\relax}
+     {\startnarrower[#1]%
+      \let\dostopquotation\stopnarrower}%
+   \dostartattributes\??ci\c!style\c!color\empty
    \leftquotationmark
    \ignorespaces}
 
-\def\stopcitaat
+\def\stopquotation
   {\removeunwantedspaces
    \removelastskip
    \rightquotationmark
    \dostopattributes
-   \dostopcitaat
-   \@@cina
+   \dostopquotation
+   \@@ciafter
    \egroup}
 
 \def\dohandlequotation#1#2%
@@ -749,13 +749,13 @@
 \def\handlequotation#1%
   {\dohandlequotation{#1}\relax}
 
-\unexpanded\def\citaat
+\unexpanded\def\quotation
   {\groupedcommand
      {\dohandlequotation\c!leftquotation \relax}
      {\dohandlequotation\c!rightquotation\removelastskip}}
 
-\unexpanded\def\citeer
-  {\doifelse\@@ciletter\v!normaal\doquotedcite\doattributedcite}
+\unexpanded\def\quote
+  {\doifelse\@@cistyle\v!normal\doquotedcite\doattributedcite}
 
 \def\doquotedcite
   {\groupedcommand
@@ -764,14 +764,14 @@
 
 \def\doattributedcite
   {\groupedcommand
-     {\dostartattributes\??ci\c!letter\c!kleur}
+     {\dostartattributes\??ci\c!style\c!color}
      {\dostopattributes}}
 
 %D The previous one fails in \placefloat[left]{}{}, so instead
 %D we use the next alternative, where the first one is handled
 %D outside group. Watch the strut.
 
-\unexpanded\def\citaat
+\unexpanded\def\quotation
   {\dohandlequotation\c!leftquotation\relax
    \groupedcommand \donothing
      {\dohandlequotation\c!rightquotation\removelastskip}}
@@ -781,12 +781,12 @@
    \groupedcommand \donothing
      {\dohandlequotation\c!rightquote\removelastskip}}
 
-\stelciterenin
-  [\c!plaats=\v!marge,
-   \c!letter=\v!normaal,
-   \c!kleur=,
-   \c!voor=\startsmaller,
-   \c!na=\stopsmaller]
+\setupquote
+  [\c!location=\v!margin,
+   \c!style=\v!normal,
+   \c!color=,
+   \c!before=\startnarrower,
+   \c!after=\stopnarrower]
 
 %D The next features was so desperately needed by Giuseppe
 %D Bilotta that he made a module for it. Since this is a
@@ -829,7 +829,7 @@
      {\dohandlequotation\c!rightspeech\removelastskip
       \doglobal\decrement\speechlevel\relax}}
 
-\appendtoks \dohandlespeech \to \everypar
+% \appendtoks \dohandlespeech \to \everypar
 
 % this will replace the quotation and speed definitions
 
@@ -847,26 +847,26 @@
   {\doifassignmentelse{#2}
      {\getparameters
         [\??ci#1]
-        [\c!plaats=\v!marge, % \v!tekst \v!alinea
-         \c!voorwit=,
-         \c!nawit=\delimitedtextparameter\c!voorwit,
-         \c!letter=\v!normaal,
-         \c!kleur=,
-         \c!linkermarge=\zeropoint,
-         \c!rechtermarge=\delimitedtextparameter\c!linkermarge,
-         \c!springvolgendein=\v!ja,
-         \c!voor=,
-         \c!na=,
-         \c!links=,
-         \c!rechts=,
-         \c!niveau=0,
-         \c!herhaal=\v!nee,
+        [\c!location=\v!margin, % \v!text \v!paragraph
+         \c!spacebefore=,
+         \c!spaceafter=\delimitedtextparameter\c!spacebefore,
+         \c!style=\v!normal,
+         \c!color=,
+         \c!leftmargin=\zeropoint,
+         \c!rightmargin=\delimitedtextparameter\c!leftmargin,
+         \c!indentnext=\v!yes,
+         \c!before=,
+         \c!after=,
+         \c!left=,
+         \c!right=,
+         \c!level=0,
+         \c!repeat=\v!no,
         #2]}%
      {\doifdefined{#2}
         {\copyparameters[\??ci#1][\??ci#2]
-           [\c!plaats,\c!voorwit,\c!nawit,\c!letter,\c!kleur,
-            \c!linkermarge,\c!rechtermarge,\c!springvolgendein,
-            \c!voor,\c!na,\c!links,\c!rechts]}}%
+           [\c!location,\c!spacebefore,\c!spaceafter,\c!style,\c!color,
+            \c!leftmargin,\c!rightmargin,\c!indentnext,
+            \c!before,\c!after,\c!left,\c!right]}}%
    \doifsomething{#1}
      {\unexpanded\setvalue{#1}{\delimitedtext[#1]}%
       \setvalue{\e!start#1}{\startdelimitedtext[#1]}%
@@ -883,37 +883,37 @@
    \fi}
 
 \def\dorepeatdelimitedtext
-  {\relax\ifcase\delimitedtextparameter\c!niveau\else
-     \dohandledelimitedtext\c!midden
+  {\relax\ifcase\delimitedtextparameter\c!level\else
+     \dohandledelimitedtext\c!middle
    \fi}
 
 \def\startdelimitedtext[#1]%
   {\bgroup
    \def\currentdelimitedtext{#1}%
-   \doif{\delimitedtextparameter\c!herhaal}\v!ja
+   \doif{\delimitedtextparameter\c!repeat}\v!yes
      {\appendtoks \dorepeatdelimitedtext \to \everypar}%
-   \doifinsetelse{\delimitedtextparameter\c!plaats}{\v!alinea,\v!marge}%
+   \doifinsetelse{\delimitedtextparameter\c!location}{\v!paragraph,\v!margin}%
      {\dosingleempty\dostartdelimitedtextpar}\dostartdelimitedtexttxt}
 
 \def\dostartdelimitedtextpar[#1]%
   {\let\dostopdelimitedtext\dostopdelimitedtextpar
-   \doifsomething{\delimitedtextparameter\c!voorwit}
-     {\blanko[\delimitedtextparameter\c!voorwit]}%
-   \delimitedtextparameter\c!voor
+   \doifsomething{\delimitedtextparameter\c!spacebefore}
+     {\blank[\delimitedtextparameter\c!spacebefore]}%
+   \delimitedtextparameter\c!before
    % nicer:
-   % \doadaptleftskip {\delimitedtextparameter\c!linkermarge}%
-   % \doadaptrightskip{\delimitedtextparameter\c!rechtermarge}%
+   % \doadaptleftskip {\delimitedtextparameter\c!leftmargin}%
+   % \doadaptrightskip{\delimitedtextparameter\c!rightmargin}%
    % backward compatible:
    \doifelsenothing{#1}
-     {\doadaptleftskip {\delimitedtextparameter\c!linkermarge}%
-      \doadaptrightskip{\delimitedtextparameter\c!rechtermarge}%
+     {\doadaptleftskip {\delimitedtextparameter\c!leftmargin}%
+      \doadaptrightskip{\delimitedtextparameter\c!rightmargin}%
       \let\dodostopdelimitedtextpar\endgraf}
-     {\startsmaller[#1]\let\dodostopdelimitedtextpar\stopsmaller}%
+     {\startnarrower[#1]\let\dodostopdelimitedtextpar\stopnarrower}%
    % so far
    \dochecknextindentation{\??ci\currentdelimitedtext}%
-   \dostartattributes{\??ci\currentdelimitedtext}\c!letter\c!kleur\empty
+   \dostartattributes{\??ci\currentdelimitedtext}\c!style\c!color\empty
    \leftdelimitedtextmark
-   \doglobal\incrementvalue{\??ci\currentdelimitedtext\c!niveau}%
+   \doglobal\incrementvalue{\??ci\currentdelimitedtext\c!level}%
    \ignorespaces}
 
 \def\dostopdelimitedtextpar
@@ -922,30 +922,30 @@
    \rightdelimitedtextmark
    \dostopattributes
    \dodostopdelimitedtextpar
-   \delimitedtextparameter\c!na
-   \doifsomething{\delimitedtextparameter\c!nawit}
-     {\blanko[\delimitedtextparameter\c!nawit]}}
+   \delimitedtextparameter\c!after
+   \doifsomething{\delimitedtextparameter\c!spaceafter}
+     {\blank[\delimitedtextparameter\c!spaceafter]}}
 
 \def\dostartdelimitedtexttxt
   {\let\dostopdelimitedtext\dostopdelimitedtexttxt
-   \dostartattributes{\??ci\currentdelimitedtext}\c!letter\c!kleur\empty
-   \dohandledelimitedtext\c!links
+   \dostartattributes{\??ci\currentdelimitedtext}\c!style\c!color\empty
+   \dohandledelimitedtext\c!left
    \ignorespaces}
 
 \def\dostopdelimitedtexttxt
   {\removeunwantedspaces
-   \dohandledelimitedtext\c!rechts
+   \dohandledelimitedtext\c!right
    \dostopattributes}
 
 \def\stopdelimitedtext
   {\dostopdelimitedtext
-   \doglobal\decrementvalue{\??ci\currentdelimitedtext\c!niveau}%
+   \doglobal\decrementvalue{\??ci\currentdelimitedtext\c!level}%
    \egroup}
 
 \def\delimitedtext[#1]%
   {\pushmacro\currentdelimitedtext
    \def\currentdelimitedtext{#1}%
-   \doifinsetelse{\delimitedtextparameter\c!plaats}{\v!alinea,\v!marge}%
+   \doifinsetelse{\delimitedtextparameter\c!location}{\v!paragraph,\v!margin}%
      \dodelimitedtextpar\dodelimitedtexttxt}
 
 % shortcuts
@@ -956,12 +956,12 @@
 
 \def\leftdelimitedtextmark
   {\dontleavehmode
-   \setbox\scratchbox\hbox{\delimitedtextparameter\c!links}%
-   \doif{\delimitedtextparameter\c!plaats}\v!marge{\hskip-\wd\scratchbox}%
+   \setbox\scratchbox\hbox{\delimitedtextparameter\c!left}%
+   \doif{\delimitedtextparameter\c!location}\v!margin{\hskip-\wd\scratchbox}%
    \box\scratchbox}
 
 \def\rightdelimitedtextmark
-  {\hsmash{\delimitedtextparameter\c!rechts}}
+  {\hsmash{\delimitedtextparameter\c!right}}
 
 \def\dohandledelimitedtext#1#2%
   {\bgroup
@@ -985,26 +985,26 @@
   {\dohandledelimitedtext{#1}\relax}
 
 \unexpanded\def\dodelimitedtextpar
-  {\dohandledelimitedtext\c!links\relax
+  {\dohandledelimitedtext\c!left\relax
    \groupedcommand
      \donothing
-     {\dohandledelimitedtext\c!rechts\removelastskip}}
+     {\dohandledelimitedtext\c!right\removelastskip}}
 
 \unexpanded\def\dodelimitedtexttxt
-  {\doifelse{\delimitedtextparameter\c!letter}\v!normaal
+  {\doifelse{\delimitedtextparameter\c!style}\v!normal
      \doquoteddelimited\doattributeddelimited}
 
 \def\doquoteddelimited
-  {\dohandledelimitedtext\c!links\relax
+  {\dohandledelimitedtext\c!left\relax
    \groupedcommand
      \donothing
-     {\dohandledelimitedtext\c!rechts
+     {\dohandledelimitedtext\c!right
       \removelastskip
       \popmacro\currentdelimitedtext}}
 
 \def\doattributeddelimited
   {\groupedcommand
-     {\dostartattributes{\??ci\currentdelimitedtext}\c!letter\c!kleur}
+     {\dostartattributes{\??ci\currentdelimitedtext}\c!style\c!color}
      {\dostopattributes
       \popmacro\currentdelimitedtext}}
 
@@ -1070,22 +1070,22 @@
 
 % seldom used, move from kernel to run time module
 
-\def\dotoevoegen#1%
+\def\doadding#1%
   {\def\next{#1}%
-   \dorecurse{#1}{\inlinker{\next~+}\let\next\empty\crlf}}
+   \dorecurse{#1}{\inleft{\next~+}\let\next\empty\crlf}}
 
-\def\complextoevoegen[#1]%
-  {\blanko
+\def\complexadding[#1]%
+  {\blank
    \processaction
      [#1]
-     [  \v!klein=>\dotoevoegen{3},
-       \v!middel=>\dotoevoegen{6},
-        \v!groot=>\dotoevoegen{9},
-      \s!default=>\dotoevoegen{6},
-      \s!unknown=>\dotoevoegen{#1}]
-   \blanko}
-
-\definecomplexorsimpleempty\toevoegen
+     [  \v!small=>\doadding{3},
+       \v!medium=>\doadding{6},
+        \v!big=>\doadding{9},
+      \s!default=>\doadding{6},
+      \s!unknown=>\doadding{#1}]
+   \blank}
+
+\definecomplexorsimpleempty\adding
 
 % seldom used, move from kernel to run time module
 
@@ -1098,20 +1098,20 @@
      [\c!x=0,\c!y=0,
       \c!nx=10,\c!ny=10,
       \c!dx=.5,\c!dy=.5,
-      \c!xstap=0,\c!ystap=0,
-      \c!eenheid=\s!cm,
-      \c!schaal=1,
+      \c!xstep=0,\c!ystep=0,
+      \c!unit=\s!cm,
+      \c!scale=1,
       \c!factor=1,
-      \c!offset=\v!ja,
-      \c!plaats=\v!links,
+      \c!offset=\v!yes,
+      \c!location=\v!left,
       #1]%
    \startpositioning
-     \dimen0=\@@rtdx\@@rteenheid\relax
-     \dimen0=\@@rtschaal\dimen0\relax
+     \dimen0=\@@rtdx\@@rtunit\relax
+     \dimen0=\@@rtscale\dimen0\relax
      \dimen0=\@@rtfactor\dimen0\relax
      \multiply\dimen0 \@@rtnx\relax
-     \dimen2=\@@rtdy\@@rteenheid\relax
-     \dimen2=\@@rtschaal\dimen2\relax
+     \dimen2=\@@rtdy\@@rtunit\relax
+     \dimen2=\@@rtscale\dimen2\relax
      \dimen2=\@@rtfactor\dimen2\relax
      \multiply\dimen2 \@@rtny\relax
      \def\horline
@@ -1131,8 +1131,8 @@
      \def\setlegend##1##2##3%
        {\gdef\@@gridc{0}%
         \dimen0=2em\relax
-        \dimen2=##2\@@rteenheid\relax
-        \dimen2=\@@rtschaal\dimen2\relax
+        \dimen2=##2\@@rtunit\relax
+        \dimen2=\@@rtscale\dimen2\relax
         \dimen2=\@@rtfactor\dimen2\relax
         \divide\dimen0 \dimen2\relax
         \xdef\@@gride{\number\dimen0}%
@@ -1159,16 +1159,16 @@
              \doglobal\increment(\@@gridc,##1)}}%
      \def\draw##1##2##3##4##5##6##7##8##9%
        {\setuppositioning
-          [\c!status=##8,
-           \c!xstap=\v!absoluut,
-           \c!ystap=\v!absoluut,
-           \c!eenheid=\@@rteenheid,
-           \c!schaal=\@@rtschaal,
+          [\c!state=##8,
+           \c!xstep=\v!absolute,
+           \c!ystep=\v!absolute,
+           \c!unit=\@@rtunit,
+           \c!scale=\@@rtscale,
            \c!factor=\@@rtfactor,
            \c!offset=\@@rtoffset,
            \c!xoffset=##6,
            \c!yoffset=##7]%
-        \doifelse{##9}\v!midden
+        \doifelse{##9}\v!middle
           {\scratchdimen##3pt\scratchdimen.5\scratchdimen
            \edef\@@psxx{\withoutpt\the\scratchdimen}%
            \scratchdimen##4pt\scratchdimen.5\scratchdimen
@@ -1178,25 +1178,25 @@
           {\edef\@@psxx{0}\edef\@@psyy{0}\edef\@@pszz{##2}}%
         \position(\@@psxx,\@@psyy){##1}%
         \setuppositioning
-          [\c!status=##8,
-           \c!xstap=\v!relatief,
-           \c!ystap=\v!relatief,
-           \c!schaal=\@@rtschaal,
+          [\c!state=##8,
+           \c!xstep=\v!relative,
+           \c!ystep=\v!relative,
+           \c!scale=\@@rtscale,
            \c!factor=\@@rtfactor,
            \c!offset=\@@rtoffset,
-           \c!eenheid=\@@rteenheid]%
+           \c!unit=\@@rtunit]%
         \dorecurse\@@pszz{\position(##3,##4){##5}}}%
      \draw
        \verline\@@rtnx\@@rtdx0\verline\!!zeropoint\!!zeropoint\v!start\empty
      \draw
        \horline\@@rtny0\@@rtdy\horline\!!zeropoint\!!zeropoint\v!start\empty
      \tfx
-     \doifnot\@@rtxstap{0}
-       {\setlegend\@@rtxstap\@@rtdx\@@rtx
-        \draw\legend\@@rtnx\@@rtdx0\legend{-1em}{-1.5em}\v!overlay\@@rtplaats}%
-     \doifnot\@@rtystap{0}
-       {\setlegend\@@rtystap\@@rtdy\@@rty
-        \draw\legend\@@rtny0\@@rtdy\legend{-2em}{-.75ex}\v!overlay\@@rtplaats}%
+     \doifnot\@@rtxstep{0}
+       {\setlegend\@@rtxstep\@@rtdx\@@rtx
+        \draw\legend\@@rtnx\@@rtdx0\legend{-1em}{-1.5em}\v!overlay\@@rtlocation}%
+     \doifnot\@@rtystep{0}
+       {\setlegend\@@rtystep\@@rtdy\@@rty
+        \draw\legend\@@rtny0\@@rtdy\legend{-2em}{-.75ex}\v!overlay\@@rtlocation}%
   \stoppositioning
   \endgroup}
 
@@ -1220,21 +1220,21 @@
 %
 % eigenlijk kan ook door... zo worden uitgebreid!
 
-\doornummeren
+\defineenumeration
   [@publicatie]
-  [\c!plaats=\v!links,
-   \c!breedte=\@@pbbreedte,\c!hang=,\c!monster=,
-   \c!voor=\@@pbvoor,\c!na=\@@pbna,\c!tussen=,
-   \c!kopletter=\@@pbkopletter,\c!letter=,
-   \c!kopkleur=\@@pbkopkleur,\c!kleur=,
-   \c!wijze=\@@pbwijze,\c!blokwijze=\@@pbblokwijze,
-   \c!tekst=,\c!links=\@@pblinks,\c!rechts=\@@pbrechts]
-
-\def\dostelpublicatiesin[#1]%
+  [\c!location=\v!left,
+   \c!width=\@@pbwidth,\c!hang=,\c!sample=,
+   \c!before=\@@pbbefore,\c!after=\@@pbafter,\c!inbetween=,
+   \c!headstyle=\@@pbheadstyle,\c!style=,
+   \c!headcolor=\@@pbheadcolor,\c!color=,
+   \c!way=\@@pbway,\c!blockway=\@@pbblockway,
+   \c!text=,\c!left=\@@pbleft,\c!right=\@@pbright]
+
+\def\dosetuppublications[#1]%
   {\getparameters[\??pb][#1]}
 
-\def\stelpublicatiesin%
-  {\dosingleargument\dostelpublicatiesin}
+\def\setuppublications%
+  {\dosingleargument\dosetuppublications}
 
 \def\apa@publicatie
   {\doifsomething\@@pb@naam    {\@@pb@naam,\space}%
@@ -1257,50 +1257,50 @@
       {\letvalue{\??pb @##1}\empty
        \setvalue{##1}####1{\setvalue{\??pb @##1}{####1}\ignorespaces}}%
    \def\getpublicatie%
-     {\doifsomething\@@pbvariant{\getvalue{\@@pbvariant @publicatie}}}%
-   \doifelse\@@pbnummeren\v!ja
+     {\doifsomething\@@pbalternative{\getvalue{\@@pbalternative @publicatie}}}%
+   \doifelse\@@pbnumbering\v!yes
       {\@publicatie[#1]\dosetpublicatie#2\getpublicatie\par}%
-      {\@@pbvoor
+      {\@@pbbefore
        \dosetpublicatie\ignorespaces#2\getpublicatie
-       \@@pbna}%
+       \@@pbafter}%
    \egroup}
 
 \definecomplexorsimpleempty\startpublicatie
 
-\def\publicatie#1[#2]%
-  {\@@pblinks\in{#1}[#2]\@@pbrechts}
+\def\publication#1[#2]%
+  {\@@pbleft\in{#1}[#2]\@@pbright}
 
-\stelpublicatiesin
-  [\c!nummeren=\v!ja,
-   \c!variant=\c!apa,
-   \c!breedte=2em,
+\setuppublications
+  [\c!numbering=\v!yes,
+   \c!alternative=\c!apa,
+   \c!width=2em,
    \c!hang=,
-   \c!monster=,
-   \c!voor=,
-   \c!na=,
-   \c!tussen=,
-   \c!kopletter=,
-   \c!kopkleur=,
-   \c!letter=,
-   \c!kleur=,
-   \c!blokwijze=\v!per\v!tekst,
-   \c!wijze=\v!per\v!tekst,
-   \c!tekst=,
-   \c!links={[},
-   \c!rechts={]}]
+   \c!sample=,
+   \c!before=,
+   \c!after=,
+   \c!inbetween=,
+   \c!headstyle=,
+   \c!headcolor=,
+   \c!style=,
+   \c!color=,
+   \c!blockway=\v!by\v!text,
+   \c!way=\v!by\v!text,
+   \c!text=,
+   \c!left={[},
+   \c!right={]}]
 
 % only used at pragma, move from kernel to run time module
 
-\def\kenmerkdatum
-  {\currentdate[\v!kenmerk]}
+\def\referraldate
+  {\currentdate[\v!referral]}
 
-\def\dokenmerk[#1]%
+\def\doreferral[#1]%
    {\noheaderandfooterlines
     \bgroup
     \getparameters
       [\??km]
       [\c!bet=\unknown,\c!dat=\unknown,\c!ken=\unknown,
-       \c!van=,\c!aan=,\c!ref=,#1]%
+       \c!from=,\c!to=,\c!ref=,#1]%
     % moet anders, hoort niet in 01b
     \assigntranslation[\s!nl=referentie,\s!en=reference,\s!de=Referenz,\s!sp=referencia]\to\@@@kmref
     \assigntranslation[\s!nl=van,\s!en=from,\s!de=Von,\s!sp=de]\to\@@@kmvan
@@ -1314,15 +1314,15 @@
       \NC\@@@kmbet\EQ\@@kmbet\NC\NR
       \NC\@@@kmdat\EQ\@@kmdat\NC\NR
       \NC\@@@kmken\EQ\expanded{\kap{\@@kmken}}\NC\NR
-      \doifsomething{\@@kmvan\@@kmaan}{\NC\NC\NC\NR}%
-      \doifsomething \@@kmvan         {\NC\@@@kmvan\EQ\@@kmvan\NC\NR}%
-      \doifsomething \@@kmaan         {\NC\@@@kmaan\EQ\@@kmaan\NC\NR}%
+      \doifsomething{\@@kmfrom\@@kmto}{\NC\NC\NC\NR}%
+      \doifsomething \@@kmfrom         {\NC\@@@kmvan\EQ\@@kmfrom\NC\NR}%
+      \doifsomething \@@kmto         {\NC\@@@kmaan\EQ\@@kmto\NC\NR}%
       \doifsomething \@@kmref         {\NC\NC\NC\NR\NC\@@@kmref\EQ\@@kmref\NC\NR}%
     \stopdummy
     \egroup}
 
-\def\kenmerk
-  {\dosingleargument\dokenmerk}
+\def\referral
+  {\dosingleargument\doreferral}
 
 % NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW
 % NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW NIEUW
@@ -1359,8 +1359,8 @@
 
 \stelrijenin
   [\c!n=2,
-   \c!boven=,
-   \c!onder=\vfill]
+   \c!top=,
+   \c!bottom=\vfill]
 
 % THIS WAS MAIN-003.TEX
 
@@ -1393,24 +1393,24 @@
 \stopmessages
 
 \definetabulate
-  [\v!legenda]
+  [\v!legend]
   [|emj1|i1|mR|]
 
 \setuptabulate
-  [\v!legenda]
-  [\c!eenheid=.75em,\c!binnen=\setquicktabulate\leg,EQ={=}]
+  [\v!legend]
+  [\c!unit=.75em,\c!inner=\setquicktabulate\leg,EQ={=}]
 
 \definetabulate
-  [\v!legenda][\v!twee]
+  [\v!legend][\v!two]
   [|emj1|emk1|i1|mR|]
 
 \definetabulate
-  [\v!gegeven]
+  [\v!fact]
   [|R|ecmj1|i1mR|]
 
 \setuptabulate
-  [\v!gegeven]
-  [\c!eenheid=.75em,\c!binnen=\setquicktabulate\geg,EQ={=}]
+  [\v!fact]
+  [\c!unit=.75em,\c!inner=\setquicktabulate\fact,EQ={=}]
 
 \unexpanded\def\xbox
   {\bgroup\aftergroup\egroup\hbox\bgroup\tx\let\next=}
@@ -1521,7 +1521,7 @@
 %D \type {bottom} or \type {right}. The macro macro is used as
 %D follows.
 %D
-%D \starttypen
+%D \starttyping
 %D \placefigure
 %D   {whow}
 %D   {\placelegend
@@ -1572,7 +1572,7 @@
 %D      {\startitemize[packed]
 %D       \item head \item legs \item  tail \item belly \item horns
 %D       \stopitemize}}
-%D \stoptypen
+%D \stoptyping
 
 \newbox\firstpairedbox
 \newbox\secondpairedbox
@@ -1584,22 +1584,22 @@
   {\getparameters
      [\??ld#1]
      [\c!n=1,
-      \c!afstand=\bodyfontsize,
-      \c!voor=,
-      \c!na=,
-      \c!kleur=,
-      \c!letter=,
-      \c!tussen={\blanko[\v!middel]},
-      \c!breedte=\hsize,
-      \c!hoogte=\vsize,
-      \c!maxbreedte=\zetbreedte,
-      \c!maxhoogte=\zethoogte,
-      \c!korps=,
-      \c!uitlijnen=,
-      \c!plaats=\v!onder,
+      \c!distance=\bodyfontsize,
+      \c!before=,
+      \c!after=,
+      \c!color=,
+      \c!style=,
+      \c!inbetween={\blank[\v!medium]},
+      \c!width=\hsize,
+      \c!height=\vsize,
+      \c!maxwidth=\makeupwidth,
+      \c!maxheight=\makeupheight,
+      \c!bodyfont=,
+      \c!align=,
+      \c!location=\v!bottom,
       #2]%
-   \setvalue{\e!stel#1\e!in}{\setuppairedbox[#1]}%
-   \setvalue{\e!plaats#1}{\placepairedbox[#1]}}
+   \setvalue{\e!setup#1\e!in}{\setuppairedbox[#1]}%
+   \setvalue{\e!place#1}{\placepairedbox[#1]}}
 
 \def\setuppairedbox
   {\dodoubleempty\dosetuppairedbox}
@@ -1614,17 +1614,17 @@
   {\setuppairedbox[#1][#2]%     % and don't change them
    \copyparameters % brrr
      [\??ld][\??ld#1]
-     [\c!n,\c!afstand,\c!tussen,\c!voor,\c!na,
-      \c!breedte,\c!hoogte,\c!maxbreedte,\c!maxhoogte,
-      \c!kleur,\c!letter,\c!korps,\c!uitlijnen,\c!plaats]%
-   \@@ldvoor\bgroup
+     [\c!n,\c!distance,\c!inbetween,\c!before,\c!after,
+      \c!width,\c!height,\c!maxwidth,\c!maxheight,
+      \c!color,\c!style,\c!bodyfont,\c!align,\c!location]%
+   \@@ldbefore\bgroup
    \global\setsystemmode{pairedbox}%
    \beforefirstpairedbox
    \dowithnextbox
      {\betweenbothpairedboxes
       \dowithnextbox
         {\afterbothpairedboxes
-         \egroup\@@ldna
+         \egroup\@@ldafter
          \egroup}
       \vbox\bgroup
         \insidesecondpairedbox
@@ -1634,47 +1634,47 @@
 \def\beforefirstpairedbox
   {\chardef\pairedlocationa1 % left
    \chardef\pairedlocationb4 % middle
-   \getfromcommacommand[\@@ldplaats][1]%
+   \getfromcommacommand[\@@ldlocation][1]%
    \processaction
      [\commalistelement]
-     [ \v!links=>\chardef\pairedlocationa0,
-      \v!rechts=>\chardef\pairedlocationa1,
-       \v!boven=>\chardef\pairedlocationa2,
-       \v!onder=>\chardef\pairedlocationa3]%
-   \getfromcommacommand[\@@ldplaats][2]%
+     [ \v!left=>\chardef\pairedlocationa0,
+      \v!right=>\chardef\pairedlocationa1,
+       \v!top=>\chardef\pairedlocationa2,
+       \v!bottom=>\chardef\pairedlocationa3]%
+   \getfromcommacommand[\@@ldlocation][2]%
    \processaction
      [\commalistelement]
-     [ \v!links=>\chardef\pairedlocationb0,
-      \v!rechts=>\chardef\pairedlocationb1,
-        \v!hoog=>\chardef\pairedlocationb2,
-       \v!boven=>\chardef\pairedlocationb2,
-        \v!laag=>\chardef\pairedlocationb3,
-       \v!onder=>\chardef\pairedlocationb3,
-      \v!midden=>\chardef\pairedlocationb4]}
+     [ \v!left=>\chardef\pairedlocationb0,
+      \v!right=>\chardef\pairedlocationb1,
+        \v!high=>\chardef\pairedlocationb2,
+       \v!top=>\chardef\pairedlocationb2,
+        \v!low=>\chardef\pairedlocationb3,
+       \v!bottom=>\chardef\pairedlocationb3,
+      \v!middle=>\chardef\pairedlocationb4]}
 
 \def\betweenbothpairedboxes
-  {\switchtobodyfont[\@@ldkorps]% split under same regime
+  {\switchtobodyfont[\@@ldbodyfont]% split under same regime
    \setbox\firstpairedbox\flushnextbox
    \ifnum\pairedlocationa<2
      \hsize\wd\firstpairedbox % trick
-     \hsize\@@ldbreedte
+     \hsize\@@ldwidth
      \scratchdimen\wd\firstpairedbox
-     \advance\scratchdimen \@@ldafstand
+     \advance\scratchdimen \@@lddistance
      \bgroup\advance\scratchdimen \hsize
-     \ifdim\scratchdimen>\@@ldmaxbreedte\relax
+     \ifdim\scratchdimen>\@@ldmaxwidth\relax
        \egroup
-       \hsize\@@ldmaxbreedte
+       \hsize\@@ldmaxwidth
        \advance\hsize -\scratchdimen
      \else
        \egroup
      \fi
    \else
      \hsize\wd\firstpairedbox
-     \hsize\@@ldbreedte % can be \hsize
-     \ifdim\hsize>\@@ldmaxbreedte\relax \hsize\@@ldmaxbreedte \fi % can be \hsize
+     \hsize\@@ldwidth % can be \hsize
+     \ifdim\hsize>\@@ldmaxwidth\relax \hsize\@@ldmaxwidth \fi % can be \hsize
    \fi
    \ifnum\@@ldn>\plusone
-     \setrigidcolumnhsize\hsize\@@ldafstand\@@ldn
+     \setrigidcolumnhsize\hsize\@@lddistance\@@ldn
    \fi}
 
 % \def\afterbothpairedboxes
@@ -1722,7 +1722,7 @@
 
 \def\afterbothpairedboxes
   {\setbox\secondpairedbox\vbox
-     {% \localstartcolor[\@@ldkleur]% does not work yet
+     {% \localstartcolor[\@@ldcolor]% does not work yet
         \ifnum\@@ldn>1
           \rigidcolumnbalance\nextbox
         \else
@@ -1734,11 +1734,11 @@
    \ifnum\pairedlocationa<2
      \scratchdimen\maxoftwoboxdimens\ht\firstpairedbox\secondpairedbox
      \vsize\scratchdimen
-     \ifdim\scratchdimen<\@@ldhoogte\relax % can be \vsize
-       \scratchdimen\@@ldhoogte
+     \ifdim\scratchdimen<\@@ldheight\relax % can be \vsize
+       \scratchdimen\@@ldheight
      \fi
-     \ifdim\scratchdimen>\@@ldmaxhoogte\relax
-       \scratchdimen\@@ldmaxhoogte
+     \ifdim\scratchdimen>\@@ldmaxheight\relax
+       \scratchdimen\@@ldmaxheight
      \fi
      \valignpairedbox\firstpairedbox \scratchdimen
      \valignpairedbox\secondpairedbox\scratchdimen
@@ -1748,11 +1748,11 @@
      \halignpairedbox\secondpairedbox\scratchdimen
      \scratchdimen\ht\secondpairedbox
      \vsize\scratchdimen
-     \ifdim\ht\secondpairedbox<\@@ldhoogte\relax % can be \vsize
-       \scratchdimen\@@ldhoogte\relax % \relax needed
+     \ifdim\ht\secondpairedbox<\@@ldheight\relax % can be \vsize
+       \scratchdimen\@@ldheight\relax % \relax needed
      \fi
-     \ifdim\scratchdimen>\@@ldmaxhoogte\relax % todo: totale hoogte
-       \scratchdimen\@@ldmaxhoogte\relax % \relax needed
+     \ifdim\scratchdimen>\@@ldmaxheight\relax % todo: totale hoogte
+       \scratchdimen\@@ldmaxheight\relax % \relax needed
      \fi
      \ifdim\scratchdimen>\ht\secondpairedbox
        \setbox\secondpairedbox\vbox to \scratchdimen
@@ -1762,18 +1762,18 @@
      \fi
    \fi
    \ifcase\pairedlocationa
-     \box\secondpairedbox\hskip\@@ldafstand\box\firstpairedbox \or
-     \box\firstpairedbox \hskip\@@ldafstand\box\secondpairedbox\or
-     \box\secondpairedbox\endgraf \nointerlineskip \@@ldtussen \box\firstpairedbox \or
-     \box\firstpairedbox \endgraf \nointerlineskip \@@ldtussen \box\secondpairedbox\else
+     \box\secondpairedbox\hskip\@@lddistance\box\firstpairedbox \or
+     \box\firstpairedbox \hskip\@@lddistance\box\secondpairedbox\or
+     \box\secondpairedbox\endgraf \nointerlineskip \@@ldinbetween \box\firstpairedbox \or
+     \box\firstpairedbox \endgraf \nointerlineskip \@@ldinbetween \box\secondpairedbox\else
    \fi
    \egroup}
 
 \def\insidesecondpairedbox
   {\forgetall
-   \setupalign[\@@lduitlijnen]%
+   \setupalign[\@@ldalign]%
    \tolerantTABLEbreaktrue % hm.
-   \blanko[\v!blokkeer]%
+   \blank[\v!disable]%
    \everypar{\begstrut}}
 
 \def\maxoftwoboxdimens#1#2#3%
@@ -1791,7 +1791,7 @@
       \box#1\relax
       \ifcase\pairedlocationb\hss\or\or\or\or\hss\fi}}
 
-\definepairedbox[\v!legenda]
+\definepairedbox[\v!legend]
 
 %D Goody:
 
@@ -1811,9 +1811,9 @@
 \def\dodefinecombination[#1][#2]%
   {\copyparameters
      [\??co#1][\??co]
-     [\c!breedte,\c!hoogte,\c!afstand,\c!plaats,%
-      \c!voor,\c!tussen,\c!na,\c!uitlijnen,%
-      \c!letter,\c!kleur]%
+     [\c!width,\c!height,\c!distance,\c!location,%
+      \c!before,\c!inbetween,\c!after,\c!align,%
+      \c!style,\c!color]%
    \getparameters
      [\??co#1][#2]}
 
@@ -1842,8 +1842,8 @@
      \let\currentcombination\empty
    \fi
    \forgetall
-   \doifelse{\combinationparameter\c!hoogte}\v!passend
-     \vbox {\vbox to \combinationparameter\c!hoogte}%
+   \doifelse{\combinationparameter\c!height}\v!fit
+     \vbox {\vbox to \combinationparameter\c!height}%
    \bgroup
   %\doifelsenothing{#1}
   %  {\dodostartcombination[2*1*]}
@@ -1854,21 +1854,21 @@
      [\ifsecondargument#2\else\iffirstargument#1\else2\fi\fi*1*]}}
 
 \long\def\dodostartcombination[#1*#2*#3]%
-  {\stelfractiesin
-     [\c!n=\v!passend,\c!afstand=\combinationparameter\c!afstand]%
+  {\setuphorizontaldivision
+     [\c!n=\v!fit,\c!distance=\combinationparameter\c!distance]%
    \global\horcombination#1%
    \global\totcombination#2%
    \global\setbox\combinationstack\emptybox
    \xdef\maxhorcombination{\the\horcombination}%
    \multiply\totcombination\horcombination
    \tabskip\zeropoint
-   \doifelse{\combinationparameter\c!breedte}\v!passend
-     {\halign}{\halign to \combinationparameter\c!breedte}%
+   \doifelse{\combinationparameter\c!width}\v!fit
+     {\halign}{\halign to \combinationparameter\c!width}%
    \bgroup&%
    %\hfil##\hfil% now : location={left,top}
-   \ExpandBothAfter\doifnotinset\v!links{\combinationparameter\c!plaats}\hfil
+   \ExpandBothAfter\doifnotinset\v!left{\combinationparameter\c!location}\hfil
    ##%
-   \ExpandBothAfter\doifnotinset\v!rechts{\combinationparameter\c!plaats}\hfil
+   \ExpandBothAfter\doifnotinset\v!right{\combinationparameter\c!location}\hfil
    &\tabskip\zeropoint \!!plus 1fill##\cr
    \docombination}
 
@@ -1884,8 +1884,8 @@
         \def\nextnext
           {\ifx\nexttoken\egroup \else % the next box is empty
              \hsize\wd0
-             \setupalign[\combinationparameter\c!uitlijnen]%
-             \dostartattributes{\??co\currentcombination}\c!letter\c!kleur\empty
+             \setupalign[\combinationparameter\c!align]%
+             \dostartattributes{\??co\currentcombination}\c!style\c!color\empty
              \bgroup
              \aftergroup\endstrut
              \aftergroup\dostopattributes
@@ -1992,12 +1992,12 @@
 
 \def\dodocombination
   {\vbox
-     {\forgetall % \setupwhitespace[\v!geen]%
+     {\forgetall % \setupwhitespace[\v!none]%
       \let\next\vbox
       \ExpandFirstAfter\processallactionsinset
-        [\combinationparameter\c!plaats]
-        [  \v!boven=>\let\next\depthonlybox, % \tbox,
-          \v!midden=>\let\next\halfwaybox]%
+        [\combinationparameter\c!location]
+        [  \v!top=>\let\next\depthonlybox, % \tbox,
+          \v!middle=>\let\next\halfwaybox]%
       \next{\copy0}%
       % we need to save the caption for a next alignment line
       \saveoncombinationstack2}%
@@ -2009,18 +2009,18 @@
          {\cr
           \flushcombinationstack
           \noalign
-            {\forgetall % \setupwhitespace[\v!geen]% no
+            {\forgetall % \setupwhitespace[\v!none]% no
              \global\setbox\combinationstack\emptybox
              \nointerlineskip
-             \combinationparameter\c!na
-             \combinationparameter\c!voor
+             \combinationparameter\c!after
+             \combinationparameter\c!before
              \vss
              \nointerlineskip}%
           \global\horcombination\maxhorcombination\relax
           \docombination}%
      \else
        \def\next
-         {&&&\hskip\combinationparameter\c!afstand&\docombination}%
+         {&&&\hskip\combinationparameter\c!distance&\docombination}%
      \fi
    \else
      \def\next
@@ -2044,7 +2044,7 @@
   {\noalign
      {\ifdim\ht\combinationstack>\zeropoint
 \nointerlineskip % nieuw
-        \combinationparameter\c!tussen
+        \combinationparameter\c!inbetween
         \global\horcombination\maxhorcombination
         \globallet\doflushcombinationstack\dodoflushcombinationstack
       \else
@@ -2069,16 +2069,16 @@
    \next}
 
 \setupcombinations
-  [\c!breedte=\v!passend,
-   \c!hoogte=\v!passend,
-   \c!afstand=1em,
-   \c!plaats=\v!onder, % can be something {top,left}
-   \c!voor=\blanko,
-   \c!tussen={\blanko[\v!middel]},
-   \c!letter=,
-   \c!kleur=,
-   \c!na=,
-   \c!uitlijnen=\v!midden]
+  [\c!width=\v!fit,
+   \c!height=\v!fit,
+   \c!distance=1em,
+   \c!location=\v!bottom, % can be something {top,left}
+   \c!before=\blank,
+   \c!inbetween={\blank[\v!medium]},
+   \c!style=,
+   \c!color=,
+   \c!after=,
+   \c!align=\v!middle]
 
 % does not work
 %
@@ -2115,20 +2115,20 @@
 \def\placesidebyside
   {\plaatsondernaastelkaar\valign\vss}
 
-\def\dogebruikexternefiles[#1][#2]%
+\def\douseexternalfiles[#1][#2]%
   {\getparameters
      [\??fi#1]
      [\c!file=,
-      \c!korps=,
-      \c!optie=,
+      \c!bodyfont=,
+      \c!option=,
       #2]}
 
-\def\gebruikexternefiles
-  {\dodoubleargument\dogebruikexternefiles}
+\def\useexternalfiles
+  {\dodoubleargument\douseexternalfiles}
 
 \def\dostelexternefilesin[#1][#2]%
   {\doifundefinedelse{\??fi#1\c!file}
-     {\gebruikexternefiles[#1][#2]}
+     {\useexternalfiles[#1][#2]}
      {\getparameters[\??fi#1][#2]}}
 
 \def\stelexternefilesin
@@ -2138,28 +2138,28 @@
   {\bgroup
    \getparameters[\??fi#1][\c!file=,#3]%
    \doinputonce{\getvalue{\??fi#1\c!file}}%
-   \ExpandFirstAfter\switchtobodyfont[\getvalue{\??fi#1\c!korps}]%
+   \ExpandFirstAfter\switchtobodyfont[\getvalue{\??fi#1\c!bodyfont}]%
    \readsysfile{#2}  % beter: loc of fix gebied
      \donothing
      {\showmessage\m!systems{41}{#2,#1}}%
    \egroup}
 
-\def\dogebruikexternefile[#1][#2][#3][#4]%
+\def\douseexternalfile[#1][#2][#3][#4]%
   {\stelexternefilesin[#1][]%
    \doinputonce{\getvalue{\??fi#1\c!file}}%
    \doifelsenothing{#2}
      {\setvalue{#3}{\verwerkexternefile{#1}{#3}{#4}}}
      {\setvalue{#2}{\verwerkexternefile{#1}{#3}{#4}}}}
 
-\def\gebruikexternefile
-  {\doquadrupleargument\dogebruikexternefile}
+\def\useexternalfile
+  {\doquadrupleargument\douseexternalfile}
 
-\gebruikexternefiles
+\useexternalfiles
   [pictex]
-  [\c!korps=\v!klein,
+  [\c!bodyfont=\v!small,
    \c!file=pictex]
 
-\gebruikexternefiles
+\useexternalfiles
   [table]
   [\c!file=table]
 
@@ -2266,7 +2266,7 @@
   {\setbox\nextbox\vbox to \@@layerysiz
      {\vfill
       \hbox to \@@layerxsiz
-        {\dostartrotation\@@rorotatie
+        {\dostartrotation\@@rorotation
            \nextboxwd\zeropoint
            \nextboxht\zeropoint
            \flushnextbox
@@ -2298,8 +2298,8 @@
    \fi
    \setbox\nextbox\vbox{\hbox{\raise\nextboxdp\flushnextbox}}%
    \!!dimena \nextboxht
-   \calculatecos\@@rorotatie\edef\cos{\calculatedcos\@@rorotatie}%
-   \calculatesin\@@rorotatie\edef\sin{\calculatedsin\@@rorotatie}%
+   \calculatecos\@@rorotation\edef\cos{\calculatedcos\@@rorotation}%
+   \calculatesin\@@rorotation\edef\sin{\calculatedsin\@@rorotation}%
    \@@layerxpos\zeropoint
    \@@layerypos\zeropoint
    \@@layerxoff\zeropoint
@@ -2386,9 +2386,9 @@
 
 \def\dorotatenextbox#1#2%
   {\doifsomething{#1}
-     {\edef\@@rorotatie{\number#1}% get rid of leading zeros and spaces
+     {\edef\@@rorotation{\number#1}% get rid of leading zeros and spaces
       \setbox\nextbox\vbox{\flushnextbox}% not really needed
-      \dodorotatenextbox\@@rorotatie#2}%
+      \dodorotatenextbox\@@rorotation#2}%
    \hbox{\boxcursor\flushnextbox}}
 
 \def\dodorotatebox#1% {angle} \hbox/\vbox/\vtop
@@ -2410,19 +2410,19 @@
 \def\complexrotate[#1]% framed met diepte !
   {\getparameters[\??ro][#1]%
    \processaction
-     [\@@roplaats]
-     [\v!diepte=>\!!counta\plusthree\donefalse,% depth   fit   - raw box
-     \v!passend=>\!!counta\plustwo  \donefalse,% depth   tight - raw box
-        \v!ruim=>\!!counta\plusone  \donefalse,% nodepth fit   - raw box
-        \v!hoog=>\!!counta\plusone  \donetrue,%  nodepth fit   - framed
+     [\@@rolocation]
+     [\v!depth=>\!!counta\plusthree\donefalse,% depth   fit   - raw box
+     \v!fit=>\!!counta\plustwo  \donefalse,% depth   tight - raw box
+        \v!broad=>\!!counta\plusone  \donefalse,% nodepth fit   - raw box
+        \v!high=>\!!counta\plusone  \donetrue,%  nodepth fit   - framed
      \s!default=>\!!counta\plusthree\donetrue,%  depth   fit   - framed
      \s!unknown=>\!!counta\plusthree\donetrue]%  depth   fit   - framed
    \ifdone
-     \def\docommand{\localframed[\??ro][#1,\c!plaats=]}%
+     \def\docommand{\localframed[\??ro][#1,\c!location=]}%
    \else
      \let\docommand\relax
    \fi
-   \dowithnextbox{\dorotatenextbox\@@rorotatie\!!counta\egroup}\vbox\docommand}
+   \dowithnextbox{\dorotatenextbox\@@rorotation\!!counta\egroup}\vbox\docommand}
 
 \presetlocalframed[\??ro]
 
@@ -2430,12 +2430,12 @@
   {\dodoubleargument\getparameters[\??ro]}
 
 \setuprotate
-  [\c!rotatie=90,
-   \c!plaats=\v!normaal,
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!passend,
+  [\c!rotation=90,
+   \c!location=\v!normal,
+   \c!width=\v!fit,
+   \c!height=\v!fit,
    \c!offset=\v!overlay,
-   \c!kader=\v!uit]
+   \c!frame=\v!off]
 
 % \dostepwiserecurse{0}{360}{10}
 %   {\startlinecorrection[blank]
@@ -2506,15 +2506,15 @@
 %    \hbox}
 
 \def\doscalelikeafigure % quite dirty and potential interference possible
-  {\doifsomething{\@@xyfactor\@@xyhfactor\@@xybfactor\@@xyschaal
-                  \@@xybreedte\@@xyhoogte\@@xyregels}
-     {\let \@@efschaal \@@xyschaal
+  {\doifsomething{\@@xyfactor\@@xyhfactor\@@xywfactor\@@xyscale
+                  \@@xywidth\@@xyheight\@@xylines}
+     {\let \@@efscale \@@xyscale
       \let \@@effactor \@@xyfactor
-      \let \@@efbfactor\@@xybfactor
+      \let \@@efwfactor\@@xywfactor
       \let \@@efhfactor\@@xyhfactor
-      \let \@@efbreedte\@@xybreedte
-      \let \@@efhoogte \@@xyhoogte
-      \let \@@efregels \@@xyregels
+      \let \@@efwidth\@@xywidth
+      \let \@@efheight \@@xyheight
+      \let \@@eflines \@@xylines
       \let \@@efgrid   \@@xygrid
       \let \@@epx      \!!zeropoint
       \let \@@epy      \!!zeropoint
@@ -2533,13 +2533,13 @@
       \scratchdimen\scay\points \divide\scratchdimen \plushundred
       \edef\@@xysy{\withoutpt\the\scratchdimen}}}
 
-\def\doschaal[#1]%
+\def\doscale[#1]%
   {\bgroup
    \forgetall
    \getparameters
      [\??xy]
-     [\c!schaal=,\c!breedte=,\c!hoogte=,\c!regels=,
-      \c!factor=,\c!hfactor=,\c!bfactor=,\c!grid=,
+     [\c!scale=,\c!width=,\c!height=,\c!lines=,
+      \c!factor=,\c!hfactor=,\c!wfactor=,\c!grid=,
       \c!sx=1,\c!sy=1,#1]%
    \dowithnextbox
      {\dontshowcomposition
@@ -2565,8 +2565,8 @@
       \egroup}
    \hbox}
 
-\def\schaal
-  {\dosingleempty\doschaal}
+\def\scale
+  {\dosingleempty\doscale}
 
 % mirror
 
@@ -2581,7 +2581,7 @@
       \flushnextbox
       \egroup}}
 
-\def\spiegel
+\def\mirror
   {\domirrorbox\hbox}
 
 %\setbox0=\hbox{gans}
@@ -2592,32 +2592,38 @@
 
 % to be used in some other places! todo!
 %
-% verdelen \hsize in fracties, wordt nog wat algemener,
-% beetje vaag nu
+% divides \hsize in fractions, will be made a bit more
+% clever and advanced when needed
 %
-% \fractie[n/m,elementen,afstand]
+% \horizontaldivision[n/m,elements,distance]
 %
-% \fractie[2/5,3,1em]
-% \fractie[2/5,3,1em]
-% \fractie[1/5,3,1em]
+% \horizontaldivision[2/5,3,1em]
+% \horizontaldivision[2/5,3,1em]
+% \horizontaldivision[1/5,3,1em]
 %
-% \stelfractiesin[afstand=,aantal=]  (passend,passend)
+% \setuphorizontaldivision[afstand=,aantal=]  (passend,passend)
 
 \def\??fr{@@fr}
 
-\def\stelfractiesin
+\def\setuphorizontaldivision
   {\dodoubleargument\getparameters[\??fr]}
 
-\def\dodofractie[#1/#2,#3,#4,#5]%
+\def\horizontaldivision
+  {\dosingleargument\dohorizontaldivision}
+
+\def\dohorizontaldivision[#1]%
+  {\dodohorizontaldivision[#1,,,,,,]}
+
+\def\dodohorizontaldivision[#1/#2,#3,#4,#5]%
   {\doifelsenothing{#3}
-     {\doifelse\@@frn\v!passend
+     {\doifelse\@@frn\v!fit
         {\!!counta#2\relax}
         {\!!counta\@@frn\relax}}
      {\!!counta#3\relax}%
    \doifelsenothing{#4}
-     {\doifelse\@@frafstand\v!passend
+     {\doifelse\@@frdistance\v!fit
         {\!!widtha\zeropoint}
-        {\!!widtha\@@frafstand}}
+        {\!!widtha\@@frdistance}}
      {\!!widtha#4}%
    \advance\!!counta \minusone
    \multiply\!!widtha \!!counta
@@ -2625,15 +2631,9 @@
    \divide\hsize #2\relax
    \hsize#1\hsize}
 
-\def\dofractie[#1]%
-  {\dodofractie[#1,,,,,,]}
-
-\def\fractie
-  {\dosingleargument\dofractie}
-
-\stelfractiesin
-  [\c!afstand=\tfskipsize,
-   \c!n=\v!passend]
+\setuphorizontaldivision
+  [\c!distance=\tfskipsize,
+   \c!n=\v!fit]
 
 %D This one is for Daniel Pittman, who wanted tight
 %D fractions. We show three versions. First the simple
@@ -2646,7 +2646,7 @@
 %D test \vfrac{1}{2} test \vfrac{123}{456} test
 %D \stopbuffer
 %D
-%D \typebuffer {\showmakeup\haalbuffer}
+%D \typebuffer {\showmakeup\getbuffer}
 %D
 %D A better way to handle the kerning is the following, here
 %D we kind of assume that tye slash is symmetrical and has
@@ -2657,11 +2657,11 @@
 %D   {\hbox{\high{\tx#1}\hbox to \zeropoint{\hss/\hss}\low{\tx#2}}}
 %D \stopbuffer
 %D
-%D \typebuffer {\showmakeup\haalbuffer}
+%D \typebuffer {\showmakeup\getbuffer}
 %D
 %D The third and best alternative is the following:
 %D
-%D {\showmakeup\haalbuffer}\crlf\haalbuffer
+%D {\showmakeup\getbuffer}\crlf\getbuffer
 %D
 %D This time we measure the height of the \type {/} and
 %D shift over the maximum height and depths of this
@@ -2710,11 +2710,11 @@
 
 %D Under construction:
 %D
-%D \starttypen
+%D \starttyping
 %D \commalistsentence[aap,noot,mies]
 %D \commalistsentence[aap,noot]
 %D \commalistsentence[aap]
-%D \stoptypen
+%D \stoptyping
 
 \let\handlecommalistsentence\firstofoneargument
 
diff --git a/tex/context/base/core-nav.tex b/tex/context/base/core-nav.tex
index c1c065208..e05f8de10 100644
--- a/tex/context/base/core-nav.tex
+++ b/tex/context/base/core-nav.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-nav,
+%D   [       filefile=core-nav,
 %D        version=1998.01.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Navigation,
@@ -34,9 +34,9 @@
 
 %D There is no interaction at all unless enabled by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupinteraction[state=start]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The other settings are:
 %D
@@ -57,7 +57,7 @@
 
 \def\dodosetupinteraction[#1]% % \dosetupinteraction == special
   {\getparameters[\??ia][#1]%
-   \doifelse\@@iastatus\v!start
+   \doifelse\@@iastate\v!start
      {\iflocation\else
         \showmessage\m!interactions2{\ifusepagedestinations\space(PAGE)\fi}%
         \global\locationtrue
@@ -67,26 +67,26 @@
         \global\locationfalse
       \fi}%
    \iflocation
-     \setsystemmode  \v!interactie
+     \setsystemmode  \v!interaction
    \else
-     \resetsystemmode\v!interactie
+     \resetsystemmode\v!interaction
    \fi
    \dosetuppageview\@@iafocus
-   \doifsomething\@@iabereken
-     {\doregistercalculationset\@@iabereken}%
-   \doifelse\@@iastrut\v!ja
+   \doifsomething\@@iacalculate
+     {\doregistercalculationset\@@iacalculate}%
+   \doifelse\@@iastrut\v!yes
      \locationstruttrue
      \locationstrutfalse
-   \doifelse\@@iaklik\v!ja
+   \doifelse\@@iaclick\v!yes
      \highlighthyperlinkstrue
      \highlighthyperlinksfalse
-   \doifelse\@@iasplitsen\v!ja
+   \doifelse\@@iasplit\v!yes
      \locationsplittrue
      \locationsplitfalse
-   \doifelse\@@iascherm\v!nieuw
+   \doifelse\@@iadisplay\v!new
      \gotonewwindowtrue
      \gotonewwindowfalse
-   \doifelse\@@iapagina\v!ja
+   \doifelse\@@iapage\v!yes
      {\global\usepagedestinationstrue}
      {\global\usepagedestinationsfalse}}
 
@@ -95,8 +95,8 @@
 \def\dolocationstartup
   {\iflocation
      \dosetupinteraction
-     \handlereferenceactions\@@iaopenactie \dosetupopenaction
-     \handlereferenceactions\@@iasluitactie\dosetupcloseaction
+     \handlereferenceactions\@@iaopenaction \dosetupopenaction
+     \handlereferenceactions\@@iacloseaction\dosetupcloseaction
      \setupinteractionscreens
      \global\let\dolocationstartup\relax
    \fi}
@@ -105,8 +105,8 @@
 
 \def\dolocationpagecheck % brr pdf dependent
   {\iflocation
-     \handlereferenceactions\@@iaopenpaginaactie \dosetupopenpageaction
-     \handlereferenceactions\@@iasluitpaginaactie\dosetupclosepageaction
+     \handlereferenceactions\@@iaopenpageaction \dosetupopenpageaction
+     \handlereferenceactions\@@iaclosepageaction\dosetupclosepageaction
    \fi}
 
 \appendtoks \dolocationpagecheck \to \everyshipout
@@ -127,9 +127,9 @@
 %D The solution lays in passing the strut characteristics in
 %D a proper way, in our case by applying \type{\presetgoto}:
 %D
-%D \starttypen
+%D \starttyping
 %D {some piece of text \presetgoto}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro stores the current strut values.
 
@@ -150,8 +150,8 @@
      \globallet\@@ia@@hoogte\strutheight
      \globallet\@@ia@@diepte\strutdepth
    \else
-     \globallet\@@ia@@hoogte\@@iahoogte
-     \globallet\@@ia@@diepte\@@iadiepte
+     \globallet\@@ia@@hoogte\@@iaheight
+     \globallet\@@ia@@diepte\@@iadepth
    \fi}
 
 %D In the macros that deal with making areas into hyperlinks,
@@ -163,8 +163,8 @@
    \else
      \hbox
        {\setbox0\hbox{#1}%
-        \ifdim\wd0<\@@iabreedte\relax
-          \buttonwidth\@@iabreedte\relax
+        \ifdim\wd0<\@@iawidth\relax
+          \buttonwidth\@@iawidth\relax
         \else
           \buttonwidth\wd0
         \fi
@@ -181,7 +181,7 @@
         \advance\buttonheight \dimen0
         \setbox2\hbox
           {\lower\dimen0\hbox
-             {\mindermeldingen
+             {\dontcomplain
               \dimen0=.5\wd0 % direct skipping is faster of course
               \advance\dimen0 -.5\buttonwidth % buts this is nicer
               \hskip\dimen0#2#3}}% when visualizing things
@@ -233,16 +233,16 @@
 \def\interactioncolor
   {\iflocation
      \ifrealreferencepage
-       \@@iacontrastkleur
+       \@@iacontrastcolor
      \else
-       \@@iakleur
+       \@@iacolor
      \fi
    \fi}
 
 %D CHECK WHERE USED / CONSISTENCY
 
 \def\showlocation#1%
-  {\iflocation\color[\@@iakleur]{#1\presetgoto}\else#1\fi}
+  {\iflocation\color[\@@iacolor]{#1\presetgoto}\else#1\fi}
 
 %D When local color settings are to be used, we can use the
 %D next macro, where \type{#1} is a tag like \type{\??tg} and
@@ -250,7 +250,7 @@
 
 \def\showcoloredlocation#1#2%
   {\iflocation
-     \color[\getvalue{#1\c!kleur}]{#2\presetgoto}%
+     \color[\getvalue{#1\c!color}]{#2\presetgoto}%
    \else
      #2%
    \fi}
@@ -261,11 +261,11 @@
 \def\showcontrastlocation#1#2#3% the \@EA is needed
   {\iflocation
      \ifnum#2=\realpageno\relax
-       \doifelsevaluenothing{#1\c!kleur}
+       \doifelsevaluenothing{#1\c!color}
          {#3\presetgoto}
-         {\color[\getvalue{#1\c!contrastkleur}]{#3\presetgoto}}%
+         {\color[\getvalue{#1\c!contrastcolor}]{#3\presetgoto}}%
      \else
-       \color[\getvalue{#1\c!kleur}]{#3\presetgoto}%
+       \color[\getvalue{#1\c!color}]{#3\presetgoto}%
      \fi
    \else
      #3%
@@ -294,20 +294,20 @@
    \egroup}
 
 \def\navigating
-  {\dolocationattributes\??ia\c!letter\c!kleur}
+  {\dolocationattributes\??ia\c!style\c!color}
 
 %D Although not decently supported in current viewers, a
 %D provisory hiding mechanims is implemented. Areas marked as
 %D such, are visible on screen, but invisible on paper. Don't
 %D trust this mechanism yet!
 
-\def\dostartinteractie
+\def\dostartinteraction
   {\bgroup
-   \let\stopinteractie\egroup
+   \let\stopinteraction\egroup
    \dowithnextbox{\dostarthide\flushnextbox\dostophide\egroup}\hbox}
 
-\let\startinteractie = \relax
-\let\stopinteractie  = \relax
+\let\startinteraction = \relax
+\let\stopinteraction  = \relax
 
 % in the future:
 %
@@ -326,34 +326,34 @@
 % \definereference [AtOpenInitializeForm] [\v!geen]
 
 \setupinteraction % start fit page and reset form
-  [\c!status=\v!stop,
-   \c!pagina=\v!nee,
-   \c!klik=\v!ja,
-   \c!scherm=,
-  %\c!openactie={\v!eerstepagina,AtOpenInitializeForm},
-  %\c!openactie={\v!eerstepagina,\v!ResetForm},
-  %\c!openactie=\v!ResetForm, % too buggy in reader 4.05
-   \c!openactie=,
-   \c!sluitactie=,
-   \c!openpaginaactie=,
-   \c!sluitpaginaactie=,
-   \c!scherm=\v!normaal,
-   \c!focus=\v!passend,
-   \c!menu=\v!uit,
-   \c!letter=\v!vet,
-   \c!bereken=,
-   \c!strut=\v!ja,
-   \c!splitsen=\v!ja,
-   \c!kleur=interactioncolor,
-   \c!contrastkleur=interactioncontrastcolor,
-   \c!symboolset=,
-   \c!breedte=1em,
-   \c!hoogte=\!!zeropoint,
-   \c!diepte=\!!zeropoint,
-   \c!titel=\jobname, % needed for fdf/x
-   \c!subtitel=,
-   \c!auteur=,
-   \c!trefwoord=,
-   \c!datum=\@@iatimestamp]
-
-\protect \endinput
\ No newline at end of file
+  [\c!state=\v!stop,
+   \c!page=\v!no,
+   \c!click=\v!yes,
+   \c!display=,
+  %\c!openaction={\v!firstpage,AtOpenInitializeForm},
+  %\c!openaction={\v!firstpage,\v!ResetForm},
+  %\c!openaction=\v!ResetForm, % too buggy in reader 4.05
+   \c!openaction=,
+   \c!closeaction=,
+   \c!openpageaction=,
+   \c!closepageaction=,
+   \c!display=\v!normal,
+   \c!focus=\v!fit,
+   \c!menu=\v!off,
+   \c!style=\v!bold,
+   \c!calculate=,
+   \c!strut=\v!yes,
+   \c!split=\v!yes,
+   \c!color=interactioncolor,
+   \c!contrastcolor=interactioncontrastcolor,
+   \c!symbolset=,
+   \c!width=1em,
+   \c!height=\!!zeropoint,
+   \c!depth=\!!zeropoint,
+   \c!title=\jobname, % needed for fdf/x
+   \c!subtitle=,
+   \c!author=,
+   \c!keyword=,
+   \c!date=\@@iatimestamp]
+
+\protect \endinput
diff --git a/tex/context/base/core-new.tex b/tex/context/base/core-new.tex
index 908414e72..824bcd3f6 100644
--- a/tex/context/base/core-new.tex
+++ b/tex/context/base/core-new.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-nav,
+%D   [       filefile=core-nav,
 %D        version=1995.01.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=New ones,
@@ -272,12 +272,12 @@
 % todo : \startsetups[name][XML] \setups[name][XML]
 
 \expanded
-  {\long\def\@EA\noexpand\csname\e!start\v!instellingen\endcsname
+  {\long\def\@EA\noexpand\csname\e!start\v!setups\endcsname
      {\bgroup\noexpand\doifnextcharelse[%
-        {\noexpand\startsetupsA\@EA\noexpand\csname\e!stop\v!instellingen\endcsname}
-        {\noexpand\startsetupsB\@EA\noexpand\csname\e!stop\v!instellingen\endcsname}}}
+        {\noexpand\startsetupsA\@EA\noexpand\csname\e!stop\v!setups\endcsname}
+        {\noexpand\startsetupsB\@EA\noexpand\csname\e!stop\v!setups\endcsname}}}
 
-\letvalue{\e!stop\v!instellingen}\relax
+\letvalue{\e!stop\v!setups}\relax
 
 \unexpanded \def\setups % {..} or [..]
   {\doifnextcharelse\bgroup\dosetupsA\dosetupsB}
@@ -412,7 +412,7 @@
    \defineactivecharacter #1 {\@EA\doshortcut\string#2} %
    \getparameters
      [\??te\string#2#3]
-     [\c!commandos=,\c!commando=,\c!letter=,\c!kleur=,#4]}
+     [\c!commands=,\c!command=,\c!style=,\c!color=,#4]}
 
 \def\doshortcut#1%
   {\ifmmode
@@ -429,27 +429,27 @@
 
 \def\dododoshortcut#1:#2\end
   {\doifelsenothing{#2}
-     {\doifundefinedelse{\shorttag\c!commandos}
+     {\doifundefinedelse{\shorttag\c!commands}
         {\shortcut}
         {\@EA\dodododoshortcut\@EA\shorttag\@EA:\shortcut:\end}}
-     {\doifundefinedelse{\shorttag#1\c!commandos}
+     {\doifundefinedelse{\shorttag#1\c!commands}
         {\shortcut}
         {\dodododoshortcut\shorttag#1:#2\end}}%
    \egroup}
 
 \def\dodododoshortcut#1:#2:\end
-  {\getvalue{#1\c!commandos}%
-   \doattributes{#1}\c!letter\c!kleur{\getvalue{#1\c!commando}{#2}}}
-
-%D \defineshortcut     [\c!letter=\v!type]
-%D \defineshortcut [b] [\c!letter=\v!vet]
-%D \defineshortcut [e] [\c!letter=\em]
-%D \defineshortcut [t] [\c!letter=\v!type]
-%D \defineshortcut [c] [\c!letter=\v!kap]
-%D \defineshortcut [k] [\c!letter=\v!kap]
-%D \defineshortcut [u] [\c!letter=\v!type,\c!commando=\hyphenatedurl]
+  {\getvalue{#1\c!commands}%
+   \doattributes{#1}\c!style\c!color{\getvalue{#1\c!command}{#2}}}
+
+%D \defineshortcut     [style=type]
+%D \defineshortcut [b] [style=bold]
+%D \defineshortcut [e] [style=\em]
+%D \defineshortcut [t] [style=type]
+%D \defineshortcut [c] [style=cap]
+%D \defineshortcut [k] [style=cap]
+%D \defineshortcut [u] [style=type,command=\hyphenatedurl]
 %D
-%D \startregels
+%D \startlines
 %D test <ziezo> test
 %D test test <t:ziezo>
 %D test test <b:ziezo>
@@ -461,21 +461,21 @@
 %D test test <t:zi:ezo:> dat (zi:ezo:)
 %D well, <u:http://www.pragma-ade.nl> looks fuzzy
 %D $10<20$
-%D \stopregels
+%D \stoplines
 %D
-%D \defineshortcut [<>] [i] [\c!letter=\it]
-%D \defineshortcut [()] [b] [\c!letter=\bf]
-%D \defineshortcut [++] [s] [\c!letter=\sl]
-%D \defineshortcut [//] [u] [\c!letter=\underbars]
-%D \defineshortcut [--] [a] [\c!letter=\overstrike]
+%D \defineshortcut [<>] [i] [style=\it]
+%D \defineshortcut [()] [b] [style=\bf]
+%D \defineshortcut [++] [s] [style=\sl]
+%D \defineshortcut [//] [u] [style=\underbars]
+%D \defineshortcut [--] [a] [style=\overstrike]
 %D
-%D \startregels
+%D \startlines
 %D it seems <i:to work> well
 %D it seems (b:to work) well
 %D it seems +s:to work+ well
 %D it seems /u:to work/ well
 %D it seems -a:to work- well
-%D \stopregels
+%D \stoplines
 
 % \def\setupenv{\dodoubleargument\rawgetparameters[\??en]}
 %
@@ -545,4 +545,4 @@
 
 \egroup
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex
index b2b381d0d..a2013a618 100644
--- a/tex/context/base/core-not.tex
+++ b/tex/context/base/core-not.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-not,
+%D   [       filefile=core-not,
 %D        version=2002.05.10,    % 1997.09.15
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Note Handling, % Footnote Handling
@@ -25,13 +25,13 @@
 
 %D Footnotes are can be characterized by three components:
 %D
-%D \startopsomming[opelkaar]
-%D \som a small number \voetnoot {a footnote number} or
-%D      symbol {\stelvoetnotenin [conversie=set 2]\voetnoot
+%D \startitemize[packed]
+%D \item a small number \footnote {a footnote number} or
+%D      symbol {\setupfootnotes [conversionconversie=set 2]\footnote
 %D      {a footnote}}
-%D \som and a similar mark at the bottom of the page
-%D \som followed by some additional text
-%D \stopopsomming
+%D \item and a similar mark at the bottom of the page
+%D \item followed by some additional text
+%D \stopitemize
 %D
 %D Because footnotes are declared at the location of their
 %D reference. Footnotes can be seen as a special kind of
@@ -50,9 +50,9 @@
 %D It's sort of a custom to precede footnotes by a horizontal
 %D rule and although fancy rules like
 %D
-%D \starttypen
+%D \starttyping
 %D \hbox to 10em{\hskip-3em\dotfill}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Are quite ligitimate, we default to a simple one 20\% of the
 %D text width.
@@ -74,11 +74,11 @@
 %D
 %D \showsetup{\y!setupfootnotes}
 
-\let\currentnote\v!voetnoot
+\let\currentnote\v!footnote
 
 \def\noteparameter     #1{\csname\??vn     \currentnote#1\endcsname}
 \def\notedefparameter  #1{\csname\??vn\??vn\currentnote#1\endcsname}
-\def\footnoteparameter #1{\csname\??vn      \v!voetnoot#1\endcsname}
+\def\footnoteparameter #1{\csname\??vn      \v!footnote#1\endcsname}
 
 \def\startnotedef        {\csname\e!start\??vn\??vn\currentnote\endcsname}
 \def\stopnotedef         {\csname\e!stop \??vn\??vn\currentnote\endcsname}
@@ -144,9 +144,9 @@
 %D suitable symbol set, symbols can be used instead of numbers,
 %D by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupfootnotes[conversion=set 2]
-%D \stoptypen
+%D \stoptyping
 
 \def\definenote
   {\dodoubleempty\dodefinenote}
@@ -160,62 +160,62 @@
      \@EA\newbox\csname\??vn+\currentnote\endcsname % local box
      \@EA\newbox\csname\??vn-\currentnote\endcsname % local box
      \doglobal\addtocommalist{#1}\noteinsertions
-     \doordefinieren
+     \definedescription
        [\??vn\??vn\currentnote]
-       [\c!plaats=\v!inlinker,
-        \c!breedte=\v!passend,
-        \c!kopletter=\noteparameter\c!letter,
-        \c!kopkleur=\noteparameter\c!kleur,
-        \c!voor=,
-        \c!na=]%
+       [\c!location=\v!inleft,
+        \c!width=\v!fit,
+        \c!headstyle=\noteparameter\c!style,
+        \c!headcolor=\noteparameter\c!color,
+        \c!before=,
+        \c!after=]%
      \presetlocalframed
        [\??vn\currentnote]%
      \getparameters
        [\??vn\currentnote]
-       [\c!plaats=\v!pagina,
-        \c!wijze=\v!per\v!deel,
-        \c!sectienummer=\v!nee,
-        \c!conversie=,
-        \c!lijn=\v!aan,
-        \c!voor=\blanko,
-        \c!korps=\v!klein,
-        \c!letter=,
-        \c!kleur=,
-        \c!na=,
-        \c!lijnkleur=,
-        \c!lijndikte=\linewidth,
-        \c!kader=\v!uit,
-        \c!margeafstand=.5em,
-        \c!kolomafstand=1em,
-        \c!afstand=.125em,
-        \c!uitlijnen=\v!normaal,
-        \c!tolerantie=\v!soepel,
-        \c!splitsen=\v!soepel,
-       %\c!breedte=\zetbreedte,
-       %\c!breedte=\ifdim\hsize<\zetbreedte\hsize\else\zetbreedte\fi,
-        \c!breedte=\defaultnotewidth,
-        \c!hoogte=\teksthoogte,
-        \c!nummercommando=\high,
-        \c!commando=\noteparameter\c!nummercommando, % downward compatible
-        \c!scheider=\@@koscheider,
-        \c!tekstcommando=\high,
-        \c!tekstletter=\tx,
-        \c!tekstkleur=,
-        \c!interactie=\v!ja,
+       [\c!location=\v!page,
+        \c!way=\v!by\v!part,
+        \c!sectionnumber=\v!no,
+        \c!conversion=,
+        \c!rule=\v!on,
+        \c!before=\blank,
+        \c!bodyfont=\v!small,
+        \c!style=,
+        \c!color=,
+        \c!after=,
+        \c!rulecolor=,
+        \c!rulethickness=\linewidth,
+        \c!frame=\v!off,
+        \c!margindistance=.5em,
+        \c!columndistance=1em,
+        \c!distance=.125em,
+        \c!align=\v!normal,
+        \c!tolerance=\v!tolerant,
+        \c!split=\v!tolerant,
+       %\c!width=\makeupwidth,
+       %\c!width=\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi,
+        \c!width=\defaultnotewidth,
+        \c!height=\textheight,
+        \c!numbercommand=\high,
+        \c!command=\noteparameter\c!numbercommand, % downward compatible
+        \c!separator=\@@koseparator,
+        \c!textcommand=\high,
+        \c!textstyle=\tx,
+        \c!textcolor=,
+        \c!interaction=\v!yes,
         \c!n=1]%
-    \definieernummer
+    \definenumber
       [\currentnote]
-      [\c!wijze=\noteparameter\c!wijze,
-       \c!sectienummer=\noteparameter\c!wijze,
-       \c!conversie=\noteparameter\c!conversie]%
-    \letvalue{\??vn\c!lijn:\currentnote}\normalnoterule
+      [\c!way=\noteparameter\c!way,
+       \c!sectionnumber=\noteparameter\c!way,
+       \c!conversion=\noteparameter\c!conversion]%
+    \letvalue{\??vn\c!rule:\currentnote}\normalnoterule
     \unexpanded\setvalue{\currentnote}{\setnote[#1]}%
-    \unexpanded\setvalue{\currentnote\v!tekst}{\setnotetext[#1]}%
+    \unexpanded\setvalue{\currentnote\v!text}{\setnotetext[#1]}%
     \setupnote[\currentnote][#2]%
   \fi}
 
 \def\setupnotedefinition[#1]%
-  {\steldoordefinierenin[\??vn\??vn#1]}
+  {\setupdescriptions[\??vn\??vn#1]}
 
 \def\setupnote
   {\dodoubleempty\dosetupnote}
@@ -226,16 +226,16 @@
      \getparameters
        [\??vn\currentnote][#2]%
      \processaction
-       [\noteparameter\c!lijn]
-       [    \v!aan=>\letvalue{\??vn\c!lijn:\currentnote}\normalnoterule,
-            \v!uit=>\letvalue{\??vn\c!lijn:\currentnote}\relax,
-        \s!default=>\letvalue{\??vn\c!lijn:\currentnote}\relax,
-        \s!unknown=>\setvalue{\??vn\c!lijn:\currentnote}{\noteparameter\c!lijn}]%
+       [\noteparameter\c!rule]
+       [    \v!on=>\letvalue{\??vn\c!rule:\currentnote}\normalnoterule,
+            \v!off=>\letvalue{\??vn\c!rule:\currentnote}\relax,
+        \s!default=>\letvalue{\??vn\c!rule:\currentnote}\relax,
+        \s!unknown=>\setvalue{\??vn\c!rule:\currentnote}{\noteparameter\c!rule}]%
      \processaction % todo
-       [\noteparameter\c!splitsen]
-       [    \v!soepel=>\notepenalty\zeropoint,
-            \v!streng=>\notepenalty9999,
-        \v!zeerstreng=>\notepenalty\maxdimen,
+       [\noteparameter\c!split]
+       [    \v!tolerant=>\notepenalty\zeropoint,
+            \v!strict=>\notepenalty9999,
+        \v!verystrict=>\notepenalty\maxdimen,
            \s!default=>\notepenalty\zeropoint,
            \s!unknown=>\notepenalty\commalistelement]%
    \fi
@@ -256,9 +256,9 @@
    % \footnoteparameter and not \noteparameter (**)
    \setnotedistance
    \count\currentnoteins\plusthousand
-   \ExpandBothAfter\doifcommonelse{\v!kolommen,\v!laatstekolom}{\footnoteparameter\c!plaats} % **
+   \ExpandBothAfter\doifcommonelse{\v!columns,\v!lastcolumn}{\footnoteparameter\c!location} % **
      {\chardef\clevernotes\plustwo}
-     {\ExpandBothAfter\doifinsetelse{\v!eerstekolom}{\footnoteparameter\c!plaats} % **
+     {\ExpandBothAfter\doifinsetelse{\v!firstcolumn}{\footnoteparameter\c!location} % **
        {\chardef\clevernotes\plusone}
        {\chardef\clevernotes\zerocount}}%
     \ifcase\clevernotes\relax
@@ -271,9 +271,9 @@
         \scratchcounter\noteparameter\c!n\relax
         \divide\count\currentnoteins \scratchcounter
       \fi
-      \ExpandBothAfter\doifinsetelse\v!pagina{\footnoteparameter\c!plaats} % **
+      \ExpandBothAfter\doifinsetelse\v!page{\footnoteparameter\c!location} % **
         {\global\endnotesfalse
-         \ExpandBothAfter\doifinsetelse\v!hoog{\footnoteparameter\c!plaats} % **
+         \ExpandBothAfter\doifinsetelse\v!high{\footnoteparameter\c!location} % **
            {\global\bottomnotesfalse}
            {\global\bottomnotestrue}}
         {\global\endnotestrue
@@ -291,7 +291,7 @@
       \setclevernotes
    \fi
    \ifnotelimit
-     \dimen\currentnoteins\noteparameter\c!hoogte
+     \dimen\currentnoteins\noteparameter\c!height
      \multiply\dimen\currentnoteins \scratchcounter
    \fi}
 
@@ -304,15 +304,15 @@
 %D those of the stretch component.
 
 \def\placenoterule
-  {\getvalue{\??vn\c!lijn:\currentnote}}
+  {\getvalue{\??vn\c!rule:\currentnote}}
 
 \def\normalnoterule
   {\ifvmode
      \color
-       [\noteparameter\c!lijnkleur]
+       [\noteparameter\c!rulecolor]
        {\hrule
           \!!width .2\hsize
-          \!!height\noteparameter\c!lijndikte
+          \!!height\noteparameter\c!rulethickness
           \!!depth \zeropoint}%
      \kern\strutdepth
    \fi}
@@ -326,21 +326,21 @@
 \def\setnotedistance
   {\setbox\scratchbox\vbox
      {\forgetall
-      \noteparameter\c!voor
+      \noteparameter\c!before
       \placenoterule
-      \noteparameter\c!na}%
+      \noteparameter\c!after}%
    \global\skip\currentnoteins\ht\scratchbox
    \setbox\scratchbox\box\voidb@x} % scratchbox can be in use
 
 \ifx\setnotehsize\undefined
 
-  \def\setnotehsize{\hsize\noteparameter\c!breedte} % can be overloaded
+  \def\setnotehsize{\hsize\noteparameter\c!width} % can be overloaded
 
 \fi
 
 \def\setclevernotes
   {\def\startpushnote  {\bgroup % wellicht ooit kopuitlijnen
-                        \stelinmargein[\c!uitlijnen=\v!links]%
+                        \setupinmargin[\c!align=\v!left]%
                         \startnotedef}%
    \def\stoppushnote   {\stopnotedef
                         \egroup}%
@@ -349,15 +349,15 @@
 
 \def\setcolumnnotes
   {\def\startpushnote  {\setnotehsize % possibly overloaded
-                        \setrigidcolumnhsize\hsize{\noteparameter\c!kolomafstand}{\noteparameter\c!n}%
+                        \setrigidcolumnhsize\hsize{\noteparameter\c!columndistance}{\noteparameter\c!n}%
                         \bgroup
-                        \stelinmargein[\c!uitlijnen=\v!links]%
+                        \setupinmargin[\c!align=\v!left]%
                         \startnotedef}%
    \def\stoppushnote   {\stopnotedef
                         \egroup}%
    \def\startpopnotes  {\bgroup
                         \setnotehsize
-                        \setrigidcolumnhsize\hsize{\noteparameter\c!kolomafstand}{\noteparameter\c!n}%
+                        \setrigidcolumnhsize\hsize{\noteparameter\c!columndistance}{\noteparameter\c!n}%
                         \setbox0\vbox\bgroup}%
    \def\stoppopnotes   {\egroup
                         \setbox0\vbox
@@ -367,12 +367,12 @@
 
 \def\settextnotes
   {\def\startpushnote  {\startvboxtohbox
-                        \dostartattributes{\??vn\currentnote}\c!letter\c!kleur{}}%
-   \def\stoppushnote   {\hskip\noteparameter\c!kolomafstand % plus.5em minus.5em
+                        \dostartattributes{\??vn\currentnote}\c!style\c!color{}}%
+   \def\stoppushnote   {\hskip\noteparameter\c!columndistance % plus.5em minus.5em
                         \dostopattributes
                         \stopvboxtohbox}%
    \def\startpopnotes  {\vbox\bgroup
-                        \doifnotinset{\noteparameter\c!breedte}{\v!passend,\v!ruim}\setnotehsize
+                        \doifnotinset{\noteparameter\c!width}{\v!fit,\v!broad}\setnotehsize
                         \beginofshapebox}%
    \def\stoppopnotes   {\endofshapebox
                         \reshapebox{\ifhbox\shapebox\unhbox\else\box\fi\shapebox\endgraf}%
@@ -382,7 +382,7 @@
 %D The formatting depends on the width of the table, so we
 %D have to set \type {n} to zero.
 %D
-%D \starttypen
+%D \starttyping
 %D \startbuffer
 %D \bTABLE
 %D \bTR \bTD one \footnote{\dorecurse{10}{abcd }} \eTD \bTD two \eTD \eTR
@@ -393,7 +393,7 @@
 %D \startlocalfootnotes[n=0,location={text,none}]
 %D \placelegend[n=2]{\getbuffer}{\placelocalfootnotes}
 %D \stoplocalfootnotes
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {footnote}
@@ -421,10 +421,10 @@
 %D something like:
 %D
 %D \bgroup
-%D \startsmaller
-%D \stelvoetnotenin[conversie=set 1]
-%D \haalbuffer
-%D \stopsmaller
+%D \startnarrower
+%D \setupfootnotes[conversionconversie=set 1]
+%D \getbuffer
+%D \stopnarrower
 %D \egroup
 %D
 %D Typesetting footnotes is, at least for the moment, disabled
@@ -468,9 +468,9 @@
 %D instead of a reference, no number is typeset. We can
 %D temporary disable footnotes by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \notesenabledfalse
-%D \stoptypen
+%D \stoptyping
 %D
 %D which can be handy while for instance typesetting tables
 %D of contents. The pagewise footnote numbering is dedicated
@@ -510,7 +510,7 @@
 
 \def\dododonote#1%
   {\doglobal\increment\internalfootreference
-   \doifelse{\noteparameter\c!wijze}{\v!per\v!pagina}
+   \doifelse{\noteparameter\c!way}{\v!by\v!page}
      {\settrue\pagewisenotes}
      {\setfalse\pagewisenotes}%
    \doifelse{#1}{-}
@@ -523,7 +523,7 @@
            \fi}
           {}%
       \fi
-      \verhoognummer[\currentnote]%
+      \incrementnumber[\currentnote]%
       \maakhetnummer[\currentnote]%
       \rawreference\s!fnt{#1}\hetnummer
       \let\lastnotenumber\hetnummer}%
@@ -541,7 +541,7 @@
 %D especially when we keep the reference and text at one page.
 %D On the other hand we need interactivity when we refer to
 %D previous notes or use end notes. Therefore we support
-%D interactive footnote numbers in two ways \voetnoot{This
+%D interactive footnote numbers in two ways \footnote{This
 %D feature was implemented years after we were able to do so,
 %D mainly because endnotes had to be supported.} that is,
 %D automatically (vise versa) and by user supplied reference.
@@ -562,7 +562,7 @@
   {\bgroup
    \settrue\processingnote
   %\restorecatcodes % to be tested first
-   \ifinregels % otherwise problems with \type <crlf> {xxx}
+   \iftypesettinglines % otherwise problems with \type <crlf> {xxx}
      \ignorelines % makes footnotes work in \startlines ... \stoplines
    \fi
    \ifnotesymbol
@@ -579,27 +579,22 @@
      \redoconvertfont % to undo \undo calls in in headings etc
      \splittopskip\strutht  % not actually needed here
      \splitmaxdepth\strutdp % not actually needed here
-     \iffixedlayoutdimensions % ugly hack, will change
-       \linkermargeafstand\noteparameter\c!margeafstand
-       \rechtermargeafstand\linkermargeafstand
-     \else
-       \def\linkermargeafstand{\noteparameter\c!margeafstand}%
-       \let\rechtermargeafstand\linkermargeafstand
-     \fi
+     \leftmargindistance\noteparameter\c!margindistance
+     \rightmargindistance\leftmargindistance
      \ifcase\noteparameter\c!n\relax % new 31-07-99 ; always ?
-       \doifnotinset{\noteparameter\c!breedte}{\v!passend,\v!ruim}\setnotehsize
+       \doifnotinset{\noteparameter\c!width}{\v!fit,\v!broad}\setnotehsize
      \fi
      \startpushnote
        {\ifx\lastnotenumber\empty \else
           \preparethenumber{\??vn\currentnote}\lastnotenumber\preparednumber
-          \doifelse{\noteparameter\c!interactie}\v!nee
-            {\noteparameter\c!nummercommando
-               {\preparednumber\domovednote\v!volgendepagina\v!vorigepagina}}%
-            {\naarbox{\noteparameter\c!commando % was \c!nummercommando, but compatible
-               {\preparednumber\domovednote\v!volgendepagina\v!vorigepagina}}%
+          \doifelse{\noteparameter\c!interaction}\v!no
+            {\noteparameter\c!numbercommand
+               {\preparednumber\domovednote\v!nextpage\v!previouspage}}%
+            {\gotobox{\noteparameter\c!command % was \c!numbercommand, but compatible
+               {\preparednumber\domovednote\v!nextpage\v!previouspage}}%
                [\s!fnt:f:\internalfootreference]}%
         \fi
-        \doifelse{\noteparameter\c!interactie}\v!nee
+        \doifelse{\noteparameter\c!interaction}\v!no
           {\ifconditional\pagewisenotes
              \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}%
            \fi}%
@@ -639,16 +634,16 @@
 \def\dolastnotesymbol
   {\unskip\unskip
    \ifdim\lastkern=\notesignal
-     \dodonotesymbol{\kern\noteparameter\c!afstand}% gets the font right, hack !
+     \dodonotesymbol{\kern\noteparameter\c!distance}% gets the font right, hack !
    \fi
    \nobreak
-   \doifelse{\noteparameter\c!interactie}\v!nee
-     {\dodonotesymbol{\lastnotenumber\domovednote\v!vorigepagina\v!volgendepagina}%
+   \doifelse{\noteparameter\c!interaction}\v!no
+     {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}%
       \ifconditional\pagewisenotes
         \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}%
       \fi}
-     {\naarbox
-        {\dodonotesymbol{\lastnotenumber\domovednote\v!vorigepagina\v!volgendepagina}}%
+     {\gotobox
+        {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}}%
         [\s!fnt:t:\internalfootreference]%
       \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}}%
    \globallet\lastnotesymbol\relax}
@@ -686,7 +681,7 @@
 %    \egroup}
 
 \def\dodonotesymbol#1%
-  {\noteparameter\c!tekstcommando{\doattributes{\??vn\currentnote}\c!tekstletter\c!tekstkleur{#1}}}
+  {\noteparameter\c!textcommand{\doattributes{\??vn\currentnote}\c!textstyle\c!textcolor{#1}}}
 
 \def\donotesymbol[#1][#2]%
   {\bgroup
@@ -695,7 +690,7 @@
      \ifsecondargument
        \ifx\lastnotesymbol\relax
          \unskip
-         \naarbox{\dodonotesymbol\currenttextreference}[#2]%
+         \gotobox{\dodonotesymbol\currenttextreference}[#2]%
        \else
          \lastnotesymbol
        \fi
@@ -720,7 +715,7 @@
   {%\ifvoid\currentnoteins \else % unsafe, strange
    \relax\ifdim\ht\currentnoteins>\zeropoint\relax
      \ifendnotes \else
-       \noteparameter\c!voor
+       \noteparameter\c!before
        \placenoterule  % alleen in ..mode
        \bgroup
        \setnotebodyfont
@@ -739,9 +734,9 @@
        \setbox2\hbox
          {\localframed
             [\??vn\currentnote]
-            [\c!breedte=\v!passend,
-             \c!hoogte=\v!passend,
-             \c!strut=\v!nee,
+            [\c!width=\v!fit,
+             \c!height=\v!fit,
+             \c!strut=\v!no,
              \c!offset=\v!overlay]
             {\ifdim\dp0=\zeropoint         % this hack is needed because \vadjust
                \hbox{\lower\strutdp\box0}% % in margin number placement
@@ -752,7 +747,7 @@
        \dp2=\strutdepth % so we know that it has the note bodyfont depth
        \box2
        \egroup
-       \noteparameter\c!na
+       \noteparameter\c!after
      \fi
    \fi}
 
@@ -761,21 +756,21 @@
 %D problem of disappearing inserts when they're called for in
 %D deeply nested boxes. The general case looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \postponenotes
 %D \.box{whatever we want with footnotes}
 %D \flushnotes
-%D \stoptypen
+%D \stoptyping
 %D
 %D This alternative can be used in headings, captions, tables
 %D etc. The latter one sometimes calls for notes local to
 %D the table, which can be realized by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \setlocalfootnotes
 %D some kind of table with local footnotes
 %D \placelocalfootnotes
-%D \stoptypen
+%D \stoptyping
 %D
 %D Postponing is accomplished by simply redefining the (local)
 %D insert operation. A not too robust method uses the
@@ -849,9 +844,9 @@
 %D This is a nasty and new secondary footnote flusher. It
 %D can be hooked into \type {\everypar} like:
 %D
-%D \starttypen
+%D \starttyping
 %D \appendtoks \synchronizenotes \to \everypar
-%D \stoptypen
+%D \stoptyping
 
 \def\dosynchronizenotes
   {\insert\currentnoteins{\unvbox\currentnoteins}}
@@ -865,8 +860,8 @@
   {\ifdim\ht#1>\zeropoint
      \endgraf
      \ifvmode
-       \witruimte
-       \noteparameter\c!voor
+       \whitespace
+       \noteparameter\c!before
      \fi
      \snaptogrid\hbox
        {\setnotebodyfont
@@ -874,7 +869,7 @@
           {\startpopnotes
            \unvbox#1\endgraf\relax
            \stoppopnotes}%
-        \doif{\noteparameter\c!breedte}\v!passend % new, auto width
+        \doif{\noteparameter\c!width}\v!fit % new, auto width
           {\setbox0\hbox                          % uggly but ok.
              {\beginofshapebox
               \unhbox0\setbox0=\lastbox\unvbox0
@@ -883,9 +878,9 @@
               \vbox{\flushshapebox}}}%
         \localframed
           [\??vn\currentnote]
-          [\c!breedte=\v!passend,
-            \c!hoogte=\v!passend,
-             \c!strut=\v!nee,
+          [\c!width=\v!fit,
+            \c!height=\v!fit,
+             \c!strut=\v!no,
             \c!offset=\v!overlay]
           {\ifdim\dp0=\zeropoint   % this hack is needed because \vadjust
              \hbox{\lower\strutdp\box0}% % in margin number placement
@@ -893,25 +888,25 @@
              \box0
            \fi}}%
      \ifvmode
-       \noteparameter\c!na
+       \noteparameter\c!after
      \fi
    \fi}
 
 %D A stupid alternative is also provided:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupfootnotes[location={text,none}]
-%D \stoptypen
+%D \stoptyping
 
 \def\placenotesasnone#1% is grouped already
   {\ifdim\ht#1>\zeropoint
-     \noteparameter\c!voor
+     \noteparameter\c!before
      \setnotebodyfont
      \startpopnotes % make sure that fake height is killed
      \unvbox#1\endgraf
      \stoppopnotes
      \setbox0=\lastbox \ifvbox0 \unvbox0\else\box0\fi % enable columns
-     \noteparameter\c!na
+     \noteparameter\c!after
    \fi}
 
 %D \macros
@@ -923,7 +918,7 @@
 %D \showsetup{\y!startlocalfootnotes}
 %D \showsetup{\y!placelocalfootnotes}
 
-\def\defaultnotewidth{\zetbreedte}
+\def\defaultnotewidth{\makeupwidth}
 
 \def\collectlocalnotes
   {\def\localnoteinsert##1% was \gdef, but never reset!
@@ -941,7 +936,7 @@
 \def\dostartlocalnotes[#1]%
   {\let\autopostponenotes\postponenotes
    \let\postponenotes\collectlocalnotes
-   \def\defaultnotewidth{\ifdim\hsize<\zetbreedte\hsize\else\zetbreedte\fi}%
+   \def\defaultnotewidth{\ifdim\hsize<\makeupwidth\hsize\else\makeupwidth\fi}%
    \processnotes
      {\doifsomething{#1}{\setupnote[\currentnote][#1]}%
       \savenumber[\currentnote]%
@@ -960,7 +955,7 @@
   {\bgroup
    \dolocalsetupnotes{#1}{#2}
    \processnotes
-     {\ExpandBothAfter\doifinsetelse\v!geen{\noteparameter\c!plaats}
+     {\ExpandBothAfter\doifinsetelse\v!none{\noteparameter\c!location}
         \placenotesasnone\placenotesintext\localpostponednotes}%
    \egroup
    \checknotes}
@@ -968,16 +963,16 @@
 %D These commands can be used like:
 %D
 %D \startbuffer
-%D \startlocalnotes[breedte=.3\hsize,n=0]
-%D   \plaatstabel
+%D \startlocalnotes[width=.3\hsize,n=0]
+%D   \placetable
 %D     {Some Table}
-%D     \plaatsonderelkaar
-%D       {\starttabel[|l|r|]
+%D     \placeontopofeachother
+%D       {\starttable[|l|r|]
 %D        \HL
-%D        \VL Nota\voetnoot{Bene} \VL Bene\voetnoot{Nota} \VL\SR
-%D        \VL Bene\voetnoot{Nota} \VL Nota\voetnoot{Bene} \VL\SR
+%D        \VL Nota\footnote{Bene} \VL Bene\footnote{Nota} \VL\SR
+%D        \VL Bene\footnote{Nota} \VL Nota\footnote{Bene} \VL\SR
 %D        \HL
-%D        \stoptabel}
+%D        \stoptable}
 %D       {\placelocalnotes}
 %D \stoplocalnotes
 %D \stopbuffer
@@ -988,7 +983,7 @@
 %D thanks to the grouping of the local footnotes, we don't need
 %D additional braces.
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D \macros
 %D   {placefootnotes}
@@ -1026,7 +1021,7 @@
 \def\dodoplacenotes
   {\ifendnotes % hm, todo: per noteclass
      \ifinpagebody \else \ifdim\ht\localpostponednotes>\zeropoint
-       \ExpandBothAfter\doifinsetelse\v!geen{\noteparameter\c!plaats}
+       \ExpandBothAfter\doifinsetelse\v!none{\noteparameter\c!location}
          \placenotesasnone\placenotesintext\localpostponednotes
      \fi \fi
    \else \ifdim\ht\currentnoteins>\zeropoint
@@ -1095,19 +1090,19 @@
 %D explictly postponing footnotes? The solution turned out to
 %D be rather simple:
 %D
-%D \starttypen
+%D \starttyping
 %D \everypar  {...\flushnotes...}
 %D \neverypar {...\postponenotes}
-%D \stoptypen
+%D \stoptyping
 %D
 %D and
 %D
-%D \starttypen
+%D \starttyping
 %D \def\ejectinsert%
 %D   {...
 %D    \flushnotes
 %D    ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can use \type{\neverypar} because in most commands
 %D sensitive to footnote gobbling we disable \type{\everypar}
@@ -1122,33 +1117,33 @@
 \def\setnotebodyfont
   {\let\setnotebodyfont\relax
    \restoreglobalbodyfont
-   \switchtobodyfont[\noteparameter\c!korps]%
-   \setuptolerance[\noteparameter\c!tolerantie]%
-   \setupalign[\noteparameter\c!uitlijnen]}
+   \switchtobodyfont[\noteparameter\c!bodyfont]%
+   \setuptolerance[\noteparameter\c!tolerance]%
+   \setupalign[\noteparameter\c!align]}
 
 %D The footnote mechanism defaults to a traditional one
 %D column way of showing them. By default we precede them by
 %D a small line.
 
-\definenote[\v!voetnoot]
+\definenote[\v!footnote]
 
 %D Compatibility macros:
 
-            \def\setupfootnotedefinition{\setupnotedefinition                [\v!voetnoot]}
-            \def\setupfootnotes         {\setupnote                          [\v!voetnoot]}
-\unexpanded \def\footnote               {\setnote                            [\v!voetnoot]}
-\unexpanded \def\footnotetext           {\setnotetext                        [\v!voetnoot]}
-            \def\note                   {\dodoubleempty\notesymbol           [\v!voetnoot]} %  alleen footnote
-            \def\placefootnotes         {\dodoubleempty\doplacefootnotes     [\v!voetnoot]}
-            \def\placelocalfootnotes    {\dodoubleempty\doplacelocalfootnotes[\v!voetnoot]}
+            \def\setupfootnotedefinition{\setupnotedefinition                [\v!footnote]}
+            \def\setupfootnotes         {\setupnote                          [\v!footnote]}
+\unexpanded \def\footnote               {\setnote                            [\v!footnote]}
+\unexpanded \def\footnotetext           {\setnotetext                        [\v!footnote]}
+            \def\note                   {\dodoubleempty\notesymbol           [\v!footnote]} %  alleen footnote
+            \def\placefootnotes         {\dodoubleempty\doplacefootnotes     [\v!footnote]}
+            \def\placelocalfootnotes    {\dodoubleempty\doplacelocalfootnotes[\v!footnote]}
             \def\startlocalfootnotes    {\startlocalnotes}
             \def\stoplocalfootnotes     {\stoplocalnotes }
 
 \def\doplacefootnotes     [#1][#2]%
-  {\ifsecondargument\placenotes     [#1][#2,\c!hoogte=\teksthoogte]\else\placenotes     [#1]\fi}
+  {\ifsecondargument\placenotes     [#1][#2,\c!height=\textheight]\else\placenotes     [#1]\fi}
 
 \def\doplacelocalfootnotes[#1][#2]%
-  {\ifsecondargument\placelocalnotes[#1][#2,\c!hoogte=\teksthoogte]\else\placelocalnotes[#1]\fi}
+  {\ifsecondargument\placelocalnotes[#1][#2,\c!height=\textheight]\else\placelocalnotes[#1]\fi}
 
 %D Backward compatibility command:
 
@@ -1204,4 +1199,4 @@
 % funny \mynote[funny] funny \mynote[funny] \page
 % funny \mynote[funny] funny \mynote[funny] funny \mynote[funny] \page
 
-% \stoptext
\ No newline at end of file
+% \stoptext
diff --git a/tex/context/base/core-ntb.tex b/tex/context/base/core-ntb.tex
index de988a306..14d4e943b 100644
--- a/tex/context/base/core-ntb.tex
+++ b/tex/context/base/core-ntb.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ntb,
+%D   [       filefile=core-ntb,
 %D        version=2000.04.18,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Natural Tables,
@@ -25,11 +25,13 @@
 
 %D To Do:
 %D
+%D \starttyping
 %D splitsen = ja | herhaal => als nofTH>1 then ja als herhaal
+%D \stoptyping
 
 %D To Do:
 %D
-%D \starttypen
+%D \starttyping
 %D break over pagina
 %D kop herhalen
 %D reset settings
@@ -41,7 +43,7 @@
 %D \setupTABLE                                                 [a=b]
 %D
 %D \bTH \eTH
-%D \stoptypen
+%D \stoptyping
 
 % the section setup does not work yet, data needs to be stored,
 % i.e.each row should know if it's a head/body/foot, and there
@@ -51,16 +53,16 @@
 
 %D A simple way to force equal line spacing is to say:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\bTBLCELL{\begstrut}
 %D \def\eTBLCELL{\endstrut}
-%D \stoptypen
+%D \stoptyping
 
 %D However, the next alternative also takes care of preceding
 %D and following white space.
 
 \def\bTBLCELL % why not \doinhibitblank
-  {\inhibitblank\doconvertfont\tbltblletter\empty\everypar{\begstrut}}
+  {\inhibitblank\doconvertfont\tbltblstyle\empty\everypar{\begstrut}}
 
 \def\eTBLCELL
   {\ifhmode
@@ -169,26 +171,26 @@
   {\ifthirdargument
      \processaction
        [#1]
-       [  \v!rij=>{\dosetupTABLExy[\c!y][#2][#3]},%
-        \v!kolom=>{\dosetupTABLExy[\c!x][#2][#3]},%
+       [  \v!row=>{\dosetupTABLExy[\c!y][#2][#3]},%
+        \v!column=>{\dosetupTABLExy[\c!x][#2][#3]},%
                r=>{\dosetupTABLExy[\c!y][#2][#3]},%
                c=>{\dosetupTABLExy[\c!x][#2][#3]},%
                y=>{\dosetupTABLExy[\c!y][#2][#3]},%
                x=>{\dosetupTABLExy[\c!x][#2][#3]},%
         \v!start=>{\dosetupTABLExy[#1][#2][#3]},%
-        \v!hoofd=>{\dosetupTABLExy[#1][#2][#3]},%
+        \v!header=>{\dosetupTABLExy[#1][#2][#3]},%
       \s!unknown=>{\dosetupTABLEzz[#1][#2][#3]}]%
    \else\ifsecondargument
      \processaction
        [#1]
-       [  \v!rij=>{\dosetupTABLExy[\c!y][\v!elk][#2]},%
-        \v!kolom=>{\dosetupTABLExy[\c!x][\v!elk][#2]},%
-               r=>{\dosetupTABLExy[\c!y][\v!elk][#2]},%
-               c=>{\dosetupTABLExy[\c!x][\v!elk][#2]},%
-               y=>{\dosetupTABLExy[\c!y][\v!elk][#2]},%
-               x=>{\dosetupTABLExy[\c!x][\v!elk][#2]},%
-        \v!start=>{\dosetupTABLExy[#1][\v!elk][#2]},%
-        \v!hoofd=>{\dosetupTABLExy[#1][\v!elk][#2]},%
+       [  \v!row=>{\dosetupTABLExy[\c!y][\v!each][#2]},%
+        \v!column=>{\dosetupTABLExy[\c!x][\v!each][#2]},%
+               r=>{\dosetupTABLExy[\c!y][\v!each][#2]},%
+               c=>{\dosetupTABLExy[\c!x][\v!each][#2]},%
+               y=>{\dosetupTABLExy[\c!y][\v!each][#2]},%
+               x=>{\dosetupTABLExy[\c!x][\v!each][#2]},%
+        \v!start=>{\dosetupTABLExy[#1][\v!each][#2]},%
+        \v!header=>{\dosetupTABLExy[#1][\v!each][#2]},%
       \s!unknown=>{\dosetupTABLEzz[\c!x][#1][#2]}]%
    \else
      \getparameters[\@@tbl\@@tbl][#1]%
@@ -225,41 +227,41 @@
 
 \def\setupTBLcell#1#2% cell over col over row
   {\setupTBLsection % already forgotten
-   \getvalue{\@@tblprefix\c!y\v!elk}%
-   \getvalue{\@@tblprefix\c!x\v!elk}%
+   \getvalue{\@@tblprefix\c!y\v!each}%
+   \getvalue{\@@tblprefix\c!x\v!each}%
    \getvalue{\@@tblprefix\c!y\v!oddeven{#1}}%
    \getvalue{\@@tblprefix\c!x\v!oddeven{#2}}%
    \getvalue{\@@tblprefix\c!x\v!oddeven{#2}\c!y\v!oddeven{#1}}%
    \ifnum#1=\plusone
-     \getvalue{\@@tblprefix\c!y\v!eerste}%
-     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!eerste}\donothing
+     \getvalue{\@@tblprefix\c!y\v!first}%
+     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!first}\donothing
    \fi
    \ifnum#2=\plusone
-     \getvalue{\@@tblprefix\c!x\v!eerste}%
-     \executeifdefined{\@@tblprefix\c!x\v!eerste\c!y#1}\donothing
+     \getvalue{\@@tblprefix\c!x\v!first}%
+     \executeifdefined{\@@tblprefix\c!x\v!first\c!y#1}\donothing
    \fi
    \ifnum#1=\maximumrow\relax
-     \getvalue{\@@tblprefix\c!y\v!laatste}%
-     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!laatste}\donothing
+     \getvalue{\@@tblprefix\c!y\v!last}%
+     \executeifdefined{\@@tblprefix\c!x#2\c!y\v!last}\donothing
    \fi
    \ifnum#2=\maximumcol\relax
-     \getvalue{\@@tblprefix\c!x\v!laatste}%
-     \executeifdefined{\@@tblprefix\c!x\v!laatste\c!y#1}\donothing
+     \getvalue{\@@tblprefix\c!x\v!last}%
+     \executeifdefined{\@@tblprefix\c!x\v!last\c!y#1}\donothing
    \fi
    \ifnum#1=\maximumrow\relax\ifnum#2=\maximumcol\relax
-     \getvalue{\@@tblprefix\c!x\v!laatste\c!y\v!laatste}%
+     \getvalue{\@@tblprefix\c!x\v!last\c!y\v!last}%
    \fi\fi
    \ifnum#1=\plusone \ifnum#2=\plusone
-     \getvalue{\@@tblprefix\c!x\v!eerste\c!y\v!eerste}%
+     \getvalue{\@@tblprefix\c!x\v!first\c!y\v!first}%
    \fi\fi
    \ifnum#1>\noftblhdnxlines\else
-     \executeifdefined{\@@tblprefix\v!hoofd\v!elk}\donothing
-     \executeifdefined{\@@tblprefix\v!hoofd#2}\donothing
+     \executeifdefined{\@@tblprefix\v!header\v!each}\donothing
+     \executeifdefined{\@@tblprefix\v!header#2}\donothing
    \fi
    \executeifdefined{\@@tblprefix\c!y#1}\donothing
    \executeifdefined{\@@tblprefix\c!x#2}\donothing
    \executeifdefined{\@@tblprefix\c!x#2\c!y#1}\donothing
-   \global\letcscsname\@@tblsplitafter\csname\@@tbl\@@tbl\c!na\endcsname
+   \global\letcscsname\@@tblsplitafter\csname\@@tbl\@@tbl\c!after\endcsname
    \relax}
 
 \globallet\@@tblsplitafter\relax
@@ -268,7 +270,7 @@
 %
 % \bTABLE[split=yes]
 % \bTR \bTD left \eTD\bTD right \eTD\eTR
-% \bTR[after=\pagina] \bTD left \eTD\bTD right \eTD\eTR
+% \bTR[after=\page] \bTD left \eTD\bTD right \eTD\eTR
 % \bTR \bTD left \eTD\bTD right \eTD\eTR
 % \eTABLE
 
@@ -278,7 +280,7 @@
 \long\def\parseTR[#1][#2]#3\eTR% [#2] is dummy that kills spaces
   {\def\currentcol{0}\increment\maximumrow
    \let\currentcolpos\currentcol
-   \setupTABLE[\v!rij][\maximumrow][#1]#3}
+   \setupTABLE[\v!row][\maximumrow][#1]#3}
 
 \long\def\parseTD[#1][#2]#3\eTD % [#2] is dummy that kills spaces
   {\getparameters[\@@tbl][\c!ny=\tblnr,\c!nx=\tblnc,nc=1,nr=1,#1]%
@@ -315,8 +317,8 @@
 
 \long\def\parseTH[#1]#2\eTH
   {\parseTD
-     [#1,\c!kleur=\tbltblkopkleur,\c!letter=\tbltblkopletter,%
-      \c!karakteruitlijnen=\v!nee]#2\eTD}
+     [#1,\c!color=\tbltblheadcolor,\c!style=\tbltblheadstyle,%
+      \c!aligncharacter=\v!no]#2\eTD}
 
 %D new
 
@@ -358,85 +360,13 @@
 \chardef\TBLpass=0
 
 \def\presetallTABLEparameters% each odd|even level
-  {\executeifdefined{\@@rawtblprefix\v!start\v!elk}\relax
+  {\executeifdefined{\@@rawtblprefix\v!start\v!each}\relax
    \executeifdefined{\@@rawtblprefix\v!start\v!oddeven\TBLlevel}\relax
    \executeifdefined{\@@rawtblprefix\v!start\number\TBLlevel}\relax}
 
 \def\bTABLE
   {\dosingleempty\dobTABLE}
 
-% \def\dobTABLE[#1]%
-%   {\pushTBL
-%    % box not here
-%    \bgroup
-%    \resetcharacteralign % new
-%    \getparameters
-%      [\@@tbl\@@tbl]
-%      [\c!uitlijnen={\v!rechts,\v!ruim,\v!hoog},#1]%
-%    \processaction
-%      [\tbltblsplitsen]
-%      [     \v!ja=>\enableTBLbreaktrue,
-%       \v!herhaal=>\enableTBLbreaktrue\multipleTBLheadstrue]%
-%    \processaction
-%      [\tbltblhoofd]
-%      [\v!herhaal=>\multipleTBLheadstrue]%
-%    \ifnum\TBLlevel>\plusone
-%      \vbox
-%    \else\ifenableTBLbreak
-%      % no \vbox
-%    \else
-%      \vbox
-%    \fi\fi
-%    \bgroup
-%    \localcolortrue
-%    \presetallTABLEparameters
-%    \ExpandFirstAfter\processallactionsinset
-%      [\tbltbloptie]
-%      [\v!rek=>\autoTBLspreadtrue]%
-%    \linewidth\tbltbllijndikte % needs to be frozen
-%    \dontcomplain
-%    \let\currentcol\!!zerocount
-%    \let\maximumrowspan\!!plusone
-%    \let\maximumcol\currentcol
-%    \let\maximumrow\currentcol
-%    \def\bTR{\dodoubleempty\parseTR}%
-%    \def\bTD{\dodoubleempty\parseTD}%
-%    \def\bTH{\dodoubleempty\parseTH}%
-%    \def\bTN{\dodoubleempty\parseTN}%
-%    \endgraf}
-
-% \def\dobTABLE[#1]%
-%   {\pushTBL
-%    % box not here
-%    \bgroup
-%    \resetcharacteralign % new
-%    \getparameters
-%      [\@@tbl\@@tbl]
-%      [\c!uitlijnen={\v!rechts,\v!ruim,\v!hoog},#1]%
-%    \processaction
-%      [\tbltblsplitsen]
-%      [     \v!ja=>\enableTBLbreaktrue,
-%       \v!herhaal=>\enableTBLbreaktrue\multipleTBLheadstrue]%
-%    \processaction
-%      [\tbltblhoofd]
-%      [\v!herhaal=>\multipleTBLheadstrue]%
-%    \localcolortrue
-%    \presetallTABLEparameters
-%    \ExpandFirstAfter\processallactionsinset
-%      [\tbltbloptie]
-%      [\v!rek=>\autoTBLspreadtrue]%
-%    \linewidth\tbltbllijndikte % needs to be frozen
-%    \dontcomplain
-%    \let\currentcol\!!zerocount
-%    \let\maximumrowspan\!!plusone
-%    \let\maximumcol\currentcol
-%    \let\maximumrow\currentcol
-%    \def\bTR{\dodoubleempty\parseTR}%
-%    \def\bTD{\dodoubleempty\parseTD}%
-%    \def\bTH{\dodoubleempty\parseTH}%
-%    \def\bTN{\dodoubleempty\parseTN}%
-%    \endgraf}
-
 \def\dobTABLE[#1]%
   {\pushTBL
    % box not here
@@ -445,14 +375,14 @@
    \resetcharacteralign % new
    \getparameters
      [\@@tbl\@@tbl]
-     [\c!uitlijnen={\v!rechts,\v!ruim,\v!hoog},#1]%
+     [\c!align={\v!right,\v!broad,\v!high},#1]%
    \processaction
-     [\tbltblsplitsen]
-     [     \v!ja=>\enableTBLbreaktrue,
-      \v!herhaal=>\enableTBLbreaktrue\multipleTBLheadstrue]%
+     [\tbltblsplit]
+     [     \v!yes=>\enableTBLbreaktrue,
+      \v!repeat=>\enableTBLbreaktrue\multipleTBLheadstrue]%
    \processaction
-     [\tbltblhoofd]
-     [\v!herhaal=>\multipleTBLheadstrue]%
+     [\tbltblheader]
+     [\v!repeat=>\multipleTBLheadstrue]%
 %    \ifnum\TBLlevel>\plusone
 %      \vbox
 %    \else\ifenableTBLbreak
@@ -464,9 +394,9 @@
    \localcolortrue
    \presetallTABLEparameters
    \ExpandFirstAfter\processallactionsinset
-     [\tbltbloptie]
-     [\v!rek=>\autoTBLspreadtrue]%
-   \linewidth\tbltbllijndikte % needs to be frozen
+     [\tbltbloption]
+     [\v!stretch=>\autoTBLspreadtrue]%
+   \linewidth\tbltblrulethickness % needs to be frozen
    \dontcomplain
    \let\currentcol\!!zerocount
    \let\maximumrowspan\!!plusone
@@ -631,7 +561,7 @@
         \increment\rowTBL\relax
         \ifnum\rowTBL>\noftblhdnxlines\relax
           \ifnum\rowTBL<\maximumrow\relax
-            \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
+            \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}%
           \fi
         \fi
       \egroup}}
@@ -683,7 +613,7 @@
    \setbox\scratchbox\hbox
      {\localframed
         [\@@tbl\@@tbl]
-        [\c!kader=\v!uit,\c!achtergrond=,\c!uitlijnen=\v!nee]
+        [\c!frame=\v!off,\c!background=,\c!align=\v!no]
         {\strut}}%
    \edef\minimalcellheight{\the\ht\scratchbox}%
    \dorecurse\maximumcol
@@ -702,7 +632,7 @@
    \def\makeTBL##1##2%
      {\gettbltxt{##1}{##2}}%
    \def\inTBLcell##1##2%
-     {\ExpandBothAfter\doifinsetelse\localwidth{\v!passend,\v!ruim} % user set
+     {\ExpandBothAfter\doifinsetelse\localwidth{\v!fit,\v!broad} % user set
         {}
         {\scratchdimen\gettblaut\colTBL\relax
          \ifdim\localwidth>\scratchdimen
@@ -813,103 +743,6 @@
         \settblwid\recurselevel{\the\scratchdimen}}%
    \fi}
 
-% \def\splittblbox#1% #1 <> 0/2
-%   {\unvbox#1}
-
-% \def\splittblbox#1% #1 <> 0/2
-%   {\ifinsidefloat
-%      \unvbox#1%
-%    \else
-%      % spacing between rows gets lost in split
-%      \setbox4\vbox
-%        {\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
-%      \setbox2\vbox
-%        {}%
-%      \dorecurse\noftblheadlines
-%        {\setbox0\vsplit#1 to \lineheight
-%         \setbox2\vbox{\unvcopy2\unvcopy0}}%
-%      \ifcase\noftblheadlines\else\unvcopy2\fi
-%      \donefalse
-%      \doloop
-%        {\setbox0\vsplit#1 to \lineheight
-%         \ifdim\pagegoal<\maxdimen
-%           \setbox0\vbox{\unvbox0}%
-%           \dimen0\ht0
-%           \advance\dimen0\ht4
-%           \advance\dimen0\pagetotal
-%           \ifdim\dimen0>\pagegoal
-%             \bgroup \pagina \egroup % make sure that local vars are kept
-%             \ifcase\noftblheadlines\else\unvcopy2\fi
-%           \fi
-%         \fi
-%         \ifdone
-%           \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
-%         \fi
-%         \unvbox0
-%         \allowbreak
-%         \ifvoid#1 \exitloop \else \donetrue \fi}%
-%    \fi}
-
-% \bTABLE[split=repeat]
-%   \bTABLEhead
-%     \bTR \bTH lxxxeft \eTH\bTD right \eTD\eTR
-%   \eTABLEhead
-%   \bTABLEbody
-%     \dorecurse{100}{\bTR[after={\pagina[bigpreference]}] \bTD left \eTD\bTD right \eTD\eTR}
-%     \dorecurse{100}{\bTR\bTD left \eTD\bTD right \eTD\eTR}
-%   \eTABLEbody
-% \eTABLE
-
-% \def\splittblbox#1% #1 <> 0/2
-%   {\ifinsidefloat
-%      \unvbox#1%
-%    \else
-%      % spacing between rows gets lost in split
-%      \setbox4\vbox
-%        {\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
-%      \setbox2\vbox
-%        {}%
-%      \dorecurse\noftblheadlines
-%        {\setbox0\vsplit#1 to \lineheight
-%         \setbox2\vbox{\unvcopy2\unvcopy0}}%
-%      \ifcase\noftblheadlines\else\unvcopy2\fi
-%      \donefalse
-%      \doloop
-%        {\setbox0\vsplit#1 to \lineheight
-%         \ifdim\pagegoal<\maxdimen
-%           \setbox0\vbox{\unvbox0}%
-%           \dimen0\ht0
-%           \advance\dimen0\ht4
-%           \advance\dimen0\pagetotal
-%           \ifdim\dimen0>\pagegoal
-%             \bgroup \pagina \egroup % make sure that local vars are kept
-%             \ifcase\noftblheadlines\else\unvcopy2\fi
-%           \fi
-%         \fi
-%         \ifdone
-%           \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
-%         \fi
-%         \unvbox0
-%         %\allowbreak
-%         \bgroup
-%           \scratchcounter\recurselevel
-%           \advance\scratchcounter\noftblheadlines
-%           \setupTBLcell{\number\scratchcounter}1
-%           \ifx\@@tblsplitafter\relax
-%             \allowbreak
-%           \else
-%             \doifelsenothing\@@tblsplitafter
-%                \allowbreak
-%               {\scratchcounter\realpageno
-%                \@@tblsplitafter
-%                \ifnum\scratchcounter<\realpageno
-%                  \ifcase\noftblheadlines\else\unvcopy2\fi
-%                \fi}%
-%           \fi
-%         \egroup
-%         \ifvoid#1 \exitloop \else \donetrue \fi}%
-%    \fi}
-
 \newbox\finaltblbox
 
 \def\notsplittblbox#1%
@@ -923,86 +756,14 @@
   {\ifinsidefloat
      \notsplittblbox{#1}%
    \else
-     \executeifdefined{splittblbox\tbltblsplitsmethode}\splittblboxa{#1}%
+     \executeifdefined{splittblbox\tbltblsplitmethod}\splittblboxa{#1}%
    \fi}
 
-% \def\splittblboxa#1% spacing between rows gets lost in split
-%   {\ifmultipleTBLheads
-%      \setbox\scratchbox\vbox{#1}%
-%      \setbox8\vbox{\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
-%      \setbox2\vbox{}%
-%      \setbox4\vbox{}%
-%      \dorecurse\noftblheadlines
-%        {\setbox0\vsplit\scratchbox to \lineheight
-%         \setbox2\vbox{\unvcopy2\unvcopy0}}%
-%      \dorecurse\noftblnextlines
-%        {\setbox0\vsplit\scratchbox to \lineheight
-%         \setbox4\vbox{\unvcopy4\unvcopy0}}%
-%      \ifcase\noftblheadlines\else
-%        \ifdim\pagegoal<\maxdimen
-%          \dimen0\ht2
-%          \advance\dimen0\ht8
-%          \advance\dimen0\pagetotal\relax
-%          \ifdim\dimen0>\pagegoal
-%            \bgroup\pagina\egroup % make sure that local vars are kept
-%          \fi
-%        \fi
-%        \unvcopy2
-%        \ifcase\noftblnextlines\else
-%          \setbox2\box4
-%        \fi
-%      \fi
-%      \donefalse
-%      \!!doneafalse
-%      \doloop
-%        {\setbox0\vsplit\scratchbox to \lineheight
-%         \if!!donea
-%           \ifdim\pagegoal<\maxdimen
-%             \setbox0\vbox{\unvbox0}%
-%             \ifdim\ht0>\zeropoint
-%               \dimen0\ht0
-%               \advance\dimen0\ht8
-%               \advance\dimen0\pagetotal\relax
-%               \ifdim\dimen0>\pagegoal
-%                 \bgroup\pagina\egroup % make sure that local vars are kept
-%                 \ifcase\noftblheadlines\else\unvcopy2\fi
-%               \fi
-%             \fi
-%           \fi
-%         \fi
-%         \!!doneatrue
-%         \ifdone
-%           \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
-%         \fi
-%         \unvbox0
-%         %\allowbreak
-%         \bgroup
-%           % todo: what if tblnextlines ?
-%           \scratchcounter\recurselevel
-%           \advance\scratchcounter\noftblheadlines
-%           \setupTBLcell{\number\scratchcounter}1
-%           \ifx\@@tblsplitafter\relax
-%             \allowbreak
-%           \else
-%             \doifelsenothing\@@tblsplitafter
-%                \allowbreak
-%               {\scratchcounter\realpageno
-%                \@@tblsplitafter
-%                \ifnum\scratchcounter<\realpageno
-%                  \ifcase\noftblheadlines\else\unvcopy2\fi
-%                \fi}%
-%           \fi
-%         \egroup
-%         \ifvoid\scratchbox \exitloop \else \donetrue \fi}%
-%    \else
-%      \notsplittblbox{#1}%
-%    \fi}
-
 \newbox\TABLEsplitbox
 
 \def\splittblboxa#1% spacing between rows gets lost in split
   {\setbox\TABLEsplitbox\vbox{#1}%
-   \setbox8\vbox{\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
+   \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}}%
    \ifmultipleTBLheads
      \setbox2\vbox{}%
      \setbox4\vbox{}%
@@ -1018,7 +779,7 @@
          \advance\dimen0\ht8
          \advance\dimen0\pagetotal\relax
          \ifdim\dimen0>\pagegoal
-           \bgroup\pagina\egroup % make sure that local vars are kept
+           \bgroup\page\egroup % make sure that local vars are kept
          \fi
        \fi
        \unvcopy2
@@ -1039,7 +800,7 @@
             \advance\dimen0\ht8
             \advance\dimen0\pagetotal\relax
             \ifdim\dimen0>\pagegoal
-              \bgroup\pagina\egroup % make sure that local vars are kept
+              \bgroup\page\egroup % make sure that local vars are kept
               \ifmultipleTBLheads
                 \ifcase\noftblheadlines\else\unvcopy2\fi
               \fi
@@ -1049,7 +810,7 @@
       \fi
       \!!doneatrue
       \ifdone
-        \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
+        \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}%
       \fi
       \unvbox0
       %\allowbreak
@@ -1076,63 +837,11 @@
       \egroup
       \ifvoid\TABLEsplitbox \exitloop \else \donetrue \fi}}
 
-% \def\splittblboxb#1%
-%   {\setbox\scratchbox\vbox{#1}%
-%    \setbox8\vbox{\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
-%    \ifmultipleTBLheads
-%      \setbox2\vbox{}%
-%      \setbox4\vbox{}%
-%      \dorecurse\noftblheadlines
-%        {\setbox0\vsplit\scratchbox to \lineheight
-%         \setbox2\vbox{\unvcopy2\unvcopy0}}%
-%      \dorecurse\noftblnextlines
-%        {\setbox0\vsplit\scratchbox to \lineheight
-%         \setbox4\vbox{\unvcopy4\unvcopy0}}%
-%    \fi
-%    \!!doneafalse
-%    \doloop
-%      {\ifdim\pagegoal<\maxdimen
-%         \scratchdimen\pagegoal
-%         \advance\scratchdimen-\pagetotal
-%       \else
-%         \scratchdimen\teksthoogte
-%       \fi
-%       \ifmultipleTBLheads
-%         \ifcase\noftblheadlines\else
-%           \advance\scratchdimen-\ht2
-%         \fi
-%       \fi
-%       \advance\scratchdimen-\ht8
-%       \setbox\finaltblbox\vbox
-%         {\ifmultipleTBLheads
-%            \ifcase\noftblheadlines\else
-%              \unvcopy2
-%              \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
-%            \fi
-%          \fi
-%          \setbox0\vsplit\scratchbox to\scratchdimen
-%          \unvbox0}%
-%       \if!!donea\else\ifcase\noftblnextlines\else
-%         \setbox2\box4
-%       \fi\fi
-%       \!!doneatrue
-%       \postprocessTABLEsplitbox\finaltblbox
-%       \beforeTABLEsplitbox
-%       \box\finaltblbox
-%       \afterTABLEsplitbox
-%       \setupTBLcell{\number\scratchcounter}1
-%       \@@tblsplitafter
-%       \ifvoid\scratchbox
-%         \exitloop
-%       \else
-%         \pagina
-%       \fi}}
-
 \let\extratblsplitheight\zeropoint % additional space taken by before/afterTABLEsplitbox
 
 \def\splittblboxb#1%
   {\setbox\TABLEsplitbox\vbox{#1}%
-   \setbox8\vbox{\doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}}%
+   \setbox8\vbox{\doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}}%
    \ifmultipleTBLheads
      \setbox2\vbox{}%
      \setbox4\vbox{}%
@@ -1150,7 +859,7 @@
         \scratchdimen\pagegoal
         \advance\scratchdimen-\pagetotal
       \else
-        \scratchdimen\teksthoogte
+        \scratchdimen\textheight
       \fi
       \ifmultipleTBLheads
         \ifcase\noftblheadlines\else
@@ -1167,7 +876,7 @@
         {\ifmultipleTBLheads
            \ifcase\noftblheadlines\else
              \unvcopy2
-             \doifsomething\tbltbltussenwit{\blank[\tbltbltussenwit]}%
+             \doifsomething\tbltblspaceinbetween{\blank[\tbltblspaceinbetween]}%
            \fi
          \fi
          \setbox0\vsplit\TABLEsplitbox to\scratchdimen
@@ -1195,7 +904,7 @@
         \box\finaltblbox
         \afterTABLEsplitbox
         \@@tblsplitafter
-        \pagina
+        \page
       \fi}}
 
 % ! ! ! ! TODO: naast \postprocessTABLEsplitbox ook evt \postprocessTABLEbox voor niet split
@@ -1221,7 +930,7 @@
         \advance\!!dimena -\scratchdimen
       \else
         \scratchdimen\gettblwid\recurselevel\relax
-        \ifdim\scratchdimen>\tbltblmaxbreedte\relax
+        \ifdim\scratchdimen>\tbltblmaxwidth\relax
           \ifcase#1\else\settblwid\recurselevel\!!zeropoint\fi
           \advance\!!counta \plusone
         \else
@@ -1319,12 +1028,12 @@
       \the\tbltoks}}
 
 \def\TBLcharalign
-  {\doifelse\tbltblkarakteruitlijnen\v!ja
+  {\doifelse\tbltblaligncharacter\v!yes
      \doTBLcharalign\gobbleoneargument}
 
 \long\def\doTBLcharalign#1#2% column data
   {\edef\alignmentclass{#1}%
-   \edef\alignmentcharacter{\tbltbluitlijnkarakter}%
+   \edef\alignmentcharacter{\tbltblaligncharacter}%
    \ifcase\TBLpass\or
      \setfirstpasscharacteralign\checkalignment{#2}% {\strut#2\unskip}%
    \fi % force hsize, so always a second
@@ -1338,7 +1047,7 @@
      {\setupTBLcell{#1}{#2}%
       \localframed
         [\@@tbl\@@tbl]
-        [#3,\c!achtergrond=,\c!kader=\v!uit]% 25% faster
+        [#3,\c!background=,\c!frame=\v!off]% 25% faster
         {\bTBLCELL\TBLcharalign{#2}{#4}\eTBLCELL\inTBLcell{#1}{#2}}}%
    \scratchdimen\gettblwid\colTBL\relax
    \ifdim\wd\scratchbox>\scratchdimen
@@ -1381,7 +1090,7 @@
      {\setupTBLcell{#2}{#3}%
       \localframed
         [\@@tbl\@@tbl]
-        [#4,#1,\c!kader=\v!uit,\c!achtergrond=]
+        [#4,#1,\c!frame=\v!off,\c!background=]
         {\bTBLCELL#5\eTBLCELL}}%
    \setbox2\null
    \wd2\wd\scratchbox \ht2\ht\scratchbox \dp2\dp\scratchbox
@@ -1398,14 +1107,14 @@
 \long\def\dohandleTBLcellB#1#2[#3]#4%
    {\scratchdimen\gettblaut\colTBL\relax
     \ifdim\scratchdimen>\zeropoint\relax
-      \let\tblwidthkey\c!breedte \edef\tblwidth{\the\scratchdimen}%
+      \let\tblwidthkey\c!width \edef\tblwidth{\the\scratchdimen}%
     \else
       \scratchdimen\gettblwid\colTBL\relax
       \ifdim\scratchdimen>\zeropoint\relax
         \ifnum\gettblcol{#1}{#2}=\maximumcol\relax
           \scratchdimen\hsize
         \fi
-        \let\tblwidthkey\c!breedte \edef\tblwidth{\the\scratchdimen}%
+        \let\tblwidthkey\c!width \edef\tblwidth{\the\scratchdimen}%
       \else
         \let\tblwidthkey\s!unknown \let \tblwidth \!!zeropoint
       \fi
@@ -1420,8 +1129,8 @@
    \bgroup
    \localframed
      [\@@tbl\@@tbl]
-     [#3,\c!breedte=\widthTBL,
-      \c!achtergrond=,\c!kader=\v!uit]% 25% faster
+     [#3,\c!width=\widthTBL,
+      \c!background=,\c!frame=\v!off]% 25% faster
      {\bTBLCELL\TBLcharalign{#2}{#4}\eTBLCELL}%
    \egroup}
 
@@ -1429,36 +1138,36 @@
   {\setupTBLcell{#1}{#2}%
    \getparameters[\@@tbl\@@tbl][#3]% to get the color right, the way we
    \color % handle color here prevents interference due to whatsit nodes
-     [\tbltblkleur] % as well as permits local colors to take precedence
+     [\tbltblcolor] % as well as permits local colors to take precedence
      {\ifdim\heightTBL=\zeropoint\relax % case: nc=maxcolumns
         \localframed
           [\@@tbl\@@tbl]
-          [\c!kleur=,\c!breedte=\widthTBL]
+          [\c!color=,\c!width=\widthTBL]
           {\bTBLCELL\TBLcharalign{#2}{#4}\eTBLCELL}%
       \else
         \localframed
           [\@@tbl\@@tbl]
-          [\c!kleur=,\c!breedte=\widthTBL,\c!hoogte=\heightTBL]
+          [\c!color=,\c!width=\widthTBL,\c!height=\heightTBL]
           {\bTBLCELL\TBLcharalign{#2}{#4}\eTBLCELL}%
       \fi}}
 
 \setupTABLE
-  [\c!kaderoffset=.5\linewidth,
-   \c!achtergrondoffset=\v!kader,
-   \c!kaderkleur=\s!black,
-   \c!kleur=,
-   \c!letter=,
-   \c!kopletter=\v!vet,
-   \c!kopkleur=,
-   \c!strut=\v!nee,
-   \c!karakteruitlijnen=\v!nee,
-   \c!uitlijnkarakter={,},
-   \c!optie=, % \v!rek
-   \c!splitsen=\v!nee,
-   \c!hoofd=,
-   \c!tussenwit=,
-   \c!maxbreedte=8em,
-   \c!splitsmethode=a]
+  [\c!frameoffset=.5\linewidth,
+   \c!backgroundoffset=\v!frame,
+   \c!framecolor=\s!black,
+   \c!color=,
+   \c!style=,
+   \c!headstyle=\v!bold,
+   \c!headcolor=,
+   \c!strut=\v!no,
+   \c!aligncharacter=\v!no,
+   \c!alignmentcharacter={,},
+   \c!option=, % \v!stretch
+   \c!split=\v!no,
+   \c!header=,
+   \c!spaceinbetween=,
+   \c!maxwidth=8em,
+   \c!splitmethod=a]
 
 %D We have already prepared the previous macros for nesting,
 %D so we only have to pop in the right ones:
@@ -1523,21 +1232,21 @@
          [\@@tbl\@@tbl]%    % achtergrond, achtergrondraster, achtergrondkleur
        % not ok yet
        \setupTABLE
-         [\c!kaderoffset=.5\linewidth,
-          \c!achtergrondoffset=\v!kader,
-          \c!kaderkleur=\s!black,
-          \c!kleur=,
-          \c!letter=,
-          \c!kopletter=,
-          \c!kopkleur=,
-          \c!strut=\v!nee,
-          \c!karakteruitlijnen=\v!nee,
-          \c!uitlijnkarakter={,},
-          \c!maxbreedte=8em]%
+         [\c!frameoffset=.5\linewidth,
+          \c!backgroundoffset=\v!frame,
+          \c!framecolor=\s!black,
+          \c!color=,
+          \c!style=,
+          \c!headstyle=,
+          \c!headcolor=,
+          \c!strut=\v!no,
+          \c!aligncharacter=\v!no,
+          \c!alignmentcharacter={,},
+          \c!maxwidth=8em]%
      \else
        \setupTABLE
-         [\c!breedte=\v!passend,
-          \c!hoogte=\v!passend]%
+         [\c!width=\v!fit,
+          \c!height=\v!fit]%
      \fi
   \fi}
 
@@ -1559,8 +1268,8 @@
 % \VL text \VL text \VL \AR
 % \stoptable
 
-\def\complexTableTB[#1]{\TABLEnoalign{\blanko[#1]}}
-\def\simpleTableTB     {\TABLEnoalign{\blanko}}
+\def\complexTableTB[#1]{\TABLEnoalign{\blank[#1]}}
+\def\simpleTableTB     {\TABLEnoalign{\blank}}
 
 \def\TabulateTB
   {\complexorsimpleTable{TB}}
@@ -1584,4 +1293,4 @@
 \appendtoks\let\TB\TableTB   \to\everytable
 \appendtoks\let\TB\TabulateTB\to\everytabulate
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-num.tex b/tex/context/base/core-num.tex
index 43e1832f4..5b15a3f90 100644
--- a/tex/context/base/core-num.tex
+++ b/tex/context/base/core-num.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-num,
+%D   [       filefile=core-num,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Numbering,
@@ -17,58 +17,61 @@
 
 %  Commando's ten behoeve van nummeren:
 %
-%    \definieernummer[naam]
-%    \stelnummerin[naam][wijze=,blok=,tekst=,plaats=,conversie=,start=]
-%    \setnumber[naam]{waarde}
-%    \resetnumber[naam]
-%    \verhoognummer[naam]
-%    \verlaagnummer[naam]
-%    \volgendenummer[naam][tag][referentie]
-%    \nummer[naam]
-%    \huidigenummer[naam]
-%    \savenumber[naam]
-%    \restorenumber[naam]
-
-\newif\ifnummeren
-
-\def\@@thenumber#1{\s!number\csname\s!number#1\c!nummer\endcsname}
-
-\def\dostelnummerin[#1][#2]%
+%    \definenumber[name]
+%    \setupnumber[name][wijze=,blok=,tekst=,plaats=,conversie=,start=]
+%    \setnumber[name]{value}
+%    \resetnumber[name]
+%    \incrementnumber[name]
+%    \decrementnumber[name]
+%    \convertednumber[name] % getnumber
+%    \savenumber[name]
+%    \restorenumber[name]
+%    \convertednumner[name]
+%    \rawnumber[name]
+
+% private (defined in core-sec.tex)
+%
+%    \nextnumber[name][tag][reference]
+%    \currentnumber[name]
+
+\def\@@thenumber#1{\s!number\csname\s!number#1\c!number\endcsname}
+
+\def\dosetupnumber[#1][#2]%
   {\@EA\let\@EA\savedstartnumber\csname\@@thenumber{#1}\c!start\endcsname
    \getparameters[\@@thenumber{#1}][\c!start=,#2]%
    \doifelsevaluenothing{\@@thenumber{#1}\c!start}
      {\letvalue{\@@thenumber{#1}\c!start}\savedstartnumber}
      {\setcounter{\@@thenumber{#1}}{\getvalue{\@@thenumber{#1}\c!start}}}}
 
-\def\stelnummerin
-  {\dodoubleargument\dostelnummerin}
+\def\setupnumber
+  {\dodoubleargument\dosetupnumber}
+
+\def\definenumber
+  {\dodoubleempty\dodefinenumber}
 
-\def\dodefinieernummer[#1][#2]% ook overal class als localframed
+\def\dodefinenumber[#1][#2]% ook overal class als localframed
   {\doifassignmentelse{#2}
-     {\dododefinieernummer[#1][#2]}
+     {\dododefinenumber[#1][#2]}
      {\doifelsenothing{#2} % can break on not yet defined macros in #2
-        {\dododefinieernummer[#1][#2]}
-        {\setvalue{\s!number#1\c!nummer}{#2}}}}
+        {\dododefinenumber[#1][#2]}
+        {\setvalue{\s!number#1\c!number}{#2}}}}
 
-\def\dododefinieernummer[#1][#2]%
+\def\dododefinenumber[#1][#2]%
   {\getparameters
      [\s!number#1]
-     [\c!nummer=#1,
+     [\c!number=#1,
       \s!check=,
-      \c!wijze=\@@nrwijze,
-      \c!wijze\c!lokaal=\getvalue{\@@thenumber{#1}\c!wijze},
-      \c!sectienummer=\v!ja,
-      \c!tekst=,  % weg hier
-      \c!plaats=, % weg hier, was trouwens \c!zetwijze
-      \c!conversie=\v!cijfers,
+      \c!way=\@@nrway,
+      \c!way\c!local=\getvalue{\@@thenumber{#1}\c!way},
+      \c!sectionnumber=\v!yes,
+      \c!text=,  % weg hier
+      \c!location=, % weg hier, was trouwens \c!zetwijze
+      \c!conversion=\v!numbers,
       \c!start=0,
       #2]%
     \makecounter{\@@thenumber{#1}}%
     \setcounter{\@@thenumber{#1}}{\getvalue{\@@thenumber{#1}\c!start}}}
 
-\def\definieernummer
-  {\dodoubleempty\dodefinieernummer}
-
 \def\setnumber[#1]#2%
   {\setcounter{\@@thenumber{#1}}{#2}}
 
@@ -84,12 +87,9 @@
 \def\reset
   {\dosingleargument\doreset}
 
-%\def\verhoognummer[#1]%
+%\def\incrementnumber[#1]%
 %  {\checknummer{#1}%
-%   \ifnummeren
-%   \else
-%     \resetcounter{\@@thenumber{#1}}%
-%   \fi
+%   \doifnot\@@nrstatus\v!start{\resetcounter{\@@thenumber{#1}}}%
 %   \pluscounter{\@@thenumber{#1}}}
 
 \def\savenumber[#1]%
@@ -100,57 +100,49 @@
 
 % nieuw, maar kan dit (i.v.m. (sub)page?)
 
-% \def\verhoognummer[#1]%
+% \def\incrementnumber[#1]%
 %   {\checknummer{#1}%
-%    \ifnummeren
-%      \pluscounter{\@@thenumber{#1}}%
-%    \else
-%      \setcounter{\@@thenumber{#1}}{0\csname\@@thenumber{#1}\c!start\endcsname}%
-%    \fi}
-
-\def\verhoognummer[#1]%
-  {\doifelsevalue{\@@thenumber{#1}\c!wijze}{\v!per\v!pagina}
+%    \doifelse\@@nrstatus\v!start
+%      {\pluscounter{\@@thenumber{#1}}}
+%      {\setcounter{\@@thenumber{#1}}{0\csname\@@thenumber{#1}\c!start\endcsname}}}
+
+\def\incrementnumber[#1]% bypage tricky: needs a
+  {\doifelsevalue{\@@thenumber{#1}\c!way}{\v!by\v!page}
      {\checkpagechange{#1}%
       \ifpagechanged\resetcounter{\@@thenumber{#1}}\fi}
      {\checknummer{#1}}%
-   \ifnummeren
-     \pluscounter{\@@thenumber{#1}}%
-   \else
-     \setcounter{\@@thenumber{#1}}{0\getvalue{\@@thenumber{#1}\c!start}}%
-   \fi}
+   \doifelse\@@nrstate\v!start % only here
+     {\pluscounter{\@@thenumber{#1}}}
+     {\setcounter{\@@thenumber{#1}}{0\getvalue{\@@thenumber{#1}\c!start}}}}
 
 % \defineenumeration [test] [way=bypage,text=\lastchangedpage]
 %
 % \starttext \dorecurse{10}{\test \input tufte \par} \stoptext
 
-\def\verlaagnummer[#1]%
+\def\decrementnumber[#1]%
   {\minuscounter{\@@thenumber{#1}}}
 
-\def\nummer[#1]%
+\def\convertednumber[#1]%
   {\convertnumber
-     {\getvalue{\@@thenumber{#1}\c!conversie}}
+     {\getvalue{\@@thenumber{#1}\c!conversion}}
      {\countervalue{\@@thenumber{#1}}}}
 
-\def\ruwenummer[#1]%
+\def\rawnumber[#1]%
   {\countervalue{\@@thenumber{#1}}}
+
+\let\getnumber\convertednumber
 
 \ifx\checknummer\undefined \let\checknummer\gobbleoneargument \fi
 
 % ook de pag nummers hierheen halen ivm \@@nrwijze
 
-\def\dostelnummerenin[#1]%                 globaal
-  {\getparameters[\??nr][#1]%
-   \doifelse\@@nrstatus\v!start
-     {\global\nummerentrue}
-     {\global\nummerenfalse}}%
-
-\def\stelnummerenin
-  {\dosingleargument\dostelnummerenin}
+\def\setupnumbering
+  {\dodoubleempty\getparameters[\??nr]}
 
-\stelnummerenin
-  [\c!wijze=\v!per\v!hoofdstuk,
-   \c!blokwijze=,
-   \c!sectienummer=\v!ja,
-   \c!status=\v!start]
+\setupnumbering
+  [\c!way=\v!by\v!chapter,
+   \c!blockway=,
+   \c!sectionnumber=\v!yes,
+   \c!state=\v!start]
 
 \protect \endinput
diff --git a/tex/context/base/core-obj.tex b/tex/context/base/core-obj.tex
index 2b2fcc98b..9b3aa1619 100644
--- a/tex/context/base/core-obj.tex
+++ b/tex/context/base/core-obj.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-obj,
+%D   [       filefile=core-obj,
 %D        version=1998.01.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Object Handling,
@@ -71,10 +71,10 @@
 %D application can save lots of bytes, while the latter use is
 %D more a necessity than byte saving.
 %D
-%D \starttypen
+%D \starttyping
 %D \setobject{class}{name}\somebox{}
 %D \getobject{class}{name}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here \type{\somebox} can be whatever box specification suits
 %D \TEX. We save the dimensions of an object, although some
@@ -219,9 +219,9 @@
 
 %D If needed one can ask for the dimensions of an object with:
 %D
-%D \starttypen
+%D \starttyping
 %D \getobjectdimensions{class}{name}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The results are reported in \type {\objectwidth}, \type
 %D {\objectheight} and \type {\objectdepth}.
@@ -252,10 +252,10 @@
 %D defined before they are used, but forward referencing
 %D sometimes occurs.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetobjectreference {class} {identifier} {reference value} {page}
 %D \dogetobjectreference {class} {identifier} \csname
-%D \stoptypen
+%D \stoptyping
 %D
 %D These commands are to be called by the \type{\startobject},
 %D \type{\stopobject} and \type{\insertobject} specials.
@@ -332,10 +332,10 @@
 %D To prevent redundant definition of objects, one can use
 %D the next tests:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifobjectfoundelse{class}{object}{do then}{do else}
 %D \doifobjectreferencefoundelse{class}{object}{do then}{do else}
-%D \stoptypen
+%D \stoptyping
 
 \beginTEX
 
@@ -382,9 +382,9 @@
 %D reuse when possible. To enable mechanisms to determine
 %D what method to use, we provide:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifobjectssupportedelse{true action}{false action}
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we can see, currently objects depend on the special
 %D driver.
@@ -404,4 +404,4 @@
 %D support objects while we still want to be able to use the
 %D \DVI\ output.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-par.tex b/tex/context/base/core-par.tex
index 0c68a1427..053075349 100644
--- a/tex/context/base/core-par.tex
+++ b/tex/context/base/core-par.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-par,
+%D   [       filefile=core-par,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Paragraph Tricks,
@@ -88,14 +88,14 @@
    \def\doresetparagraph
      {\resetparagraphlines}%
    \def\dobeforeparagraph
-     {\startregelnummeren[\v!verder]}%
+     {\startlinenumbering[\v!continue]}%
    \def\doafterparagraph
-     {\stopregelnummeren}%
+     {\stoplinenumbering}%
    \def\dobeforeskipparagraph
-     {\stopregelnummeren
+     {\stoplinenumbering
       \let\paragraphnumber\relax}%
    \def\doafterskipparagraph
-     {\startregelnummeren[\v!verder]}}
+     {\startlinenumbering[\v!continue]}}
 
 \long\def\directpushparagraph#1%
   {\doglobal\increment\totalnofparagraphs
@@ -173,7 +173,7 @@
    \fi}
 
 \def\dopopparagraphs[#1]%
-  {\doifnotinset{#1}{\v!geen,0}
+  {\doifnotinset{#1}{\v!none,0}
      {\dosetparagraph
       \doglobal\newcounter\globalparagraphnumber
       \doglobal\newcounter\discardedparagraphs
diff --git a/tex/context/base/core-pos.tex b/tex/context/base/core-pos.tex
index 2e37c8440..a84645321 100644
--- a/tex/context/base/core-pos.tex
+++ b/tex/context/base/core-pos.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-pos,
+%D   [       filefile=core-pos,
 %D        version=1999.08.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Positioning Support,
@@ -79,22 +79,22 @@
 %D
 %D The three specials involved are:
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetposition          {identifier}
 %D \dosetpositionwhd       {identifier} {width} {height} {depth}
 %D \dosetpositionplus      {identifier} {width} {height} {depth} {list}
 %D \dosetpositionpapersize {width} {height}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Either directly, when using \PDFTEX, or by means of a
 %D postprocessor, when using \DVI\ output, these end up in the
 %D utility file as:
 %D
-%D \starttypen
+%D \starttyping
 %D \pospxy     {identifier} {page} {x} {y}
 %D \pospxywhd  {identifier} {page} {x} {y} {w} {h} {d}
 %D \pospxylist {identifier} {page} {x} {y} {w} {h} {d} {list}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This means that we have to provide both a utility set and
 %D reset macro for positions.
@@ -130,8 +130,8 @@
 
 \def\registerpageposition#1% this one is flushed first !
   {\ifpositioning\ifcase\realpageno\or
-     \ifdim\printpapierhoogte=\papierhoogte\else
-       \ifdim\printpapierbreedte=\papierbreedte\else
+     \ifdim\printpaperheight=\paperheight\else
+       \ifdim\printpaperwidth=\paperwidth\else
          \setbox#1\hbox{\hpos\pageanchor{\box#1}}%
        \fi
      \fi
@@ -358,15 +358,15 @@
 %D extra argument, denoting what additional parameter to pick
 %D up. So, the third extra is fetched with,
 %D
-%D \starttypen
+%D \starttyping
 %D \MPplus{identifier}{3}{default}
-%D \stoptypen
+%D \stoptyping
 %D
 %D All extras (comma separated) are fetched with:
 %D
-%D \starttypen
+%D \starttyping
 %D \MPrest{identifier}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The extra parameters are not treated.
 
@@ -430,8 +430,8 @@
   {\ifpositioning \else
      \global\positioningtrue
      \dosetpositionpapersize
-       {\number\printpapierbreedte}%
-       {\number\printpapierhoogte }%
+       {\number\printpaperwidth}%
+       {\number\printpaperheight }%
    \fi
    \doglobal\increment\currentpositions}
 
@@ -582,7 +582,7 @@
 
 %D The next one will be overloaded later.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dopositionaction#1% test saves hash entry in etex
 %D   {\ifundefined{\POSactionprefix#1::}\else
 %D      \ifnum\MPp{#1}>\zerocount % new
@@ -612,7 +612,7 @@
 %D        \traceposstring\clap\cyan{<#1>}%
 %D      \fi
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 
 \def\doifpositionaction#1%
   {\ifundefined{\POSactionprefix#1::}%
@@ -630,9 +630,9 @@
 
 %D We can copy a position with:
 %D
-%D \starttypen
+%D \starttyping
 %D \copyposition {to} {from}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again, this is a global action.
 
@@ -650,9 +650,9 @@
 %D one of the reasons why we need to be able to test for
 %D existence, using:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifpositionelse {identifier} {found action} {not found action}
-%D \stoptypen
+%D \stoptyping
 
 % \def\doifpositionelse#1%
 %   {\doifdefinedelse{\POSprefix#1}}
@@ -673,7 +673,7 @@
 %D We have several macros available to save positions. Later
 %D we will see applications.
 %D
-%D \starttabulatie[|l|l||]
+%D \starttabulate[|l|l||]
 %D \NC \type {\xypos} \NC    \NC simple position with no dimensions \NC \NR
 %D \NC \type {\hpos}  \NC    \NC position and characteristics of a \type {\hbox}                    \NC \NR
 %D \NC \type {\vpos}  \NC    \NC position and characteristics of a \type {\vbox}                    \NC \NR
@@ -681,7 +681,7 @@
 %D \NC \type {\epos}  \NC e: \NC end point in a line \NC \NR
 %D \NC \type {\fpos}  \NC f: \NC begin point in a paragraph \NC \NR
 %D \NC \type {\tpos}  \NC t: \NC end point in a paragraph \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Each macro takes an identifier as argument, and the \type
 %D {\hpos} and \type {\vpos} also expect box content.
@@ -810,7 +810,7 @@
         \hss}%
    \fi}
 
-\appendtoks \registerparoptions \to \everypar
+% \appendtoks \registerparoptions \to \everypar
 
 %D \macros
 %D   {doifoverlappingelse}
@@ -818,11 +818,11 @@
 %D A first application of positional information, is to
 %D determine if two boxes do overlap:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifoverlappingelse{point a}{point b}
 %D   {action when overlapping}
 %D   {action when not overlapping}
-%D \stoptypen
+%D \stoptyping
 
 % \def\doifoverlappingelse#1#2#3#4%
 %   {\relax\ifnum\MPp{#1}=\MPp{#2}\relax
@@ -915,14 +915,14 @@
 %D Instead of letting the user handle fuzzy expansion, we
 %D provide a simple test on positione being on the same page.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifpositionsonsamepageelse{point a}{point b}
 %D   {action when on same page}
 %D   {action when not on same page}
 %D \doifpositionsonthispageelse{point a}{point b}
 %D   {action when on this page}
 %D   {action when not on this page}
-%D \stoptypen
+%D \stoptyping
 
 \def\dodoifpositionsonsamepageelse#1#2#3#4%
   {\bgroup
@@ -966,16 +966,16 @@
 
 \def\placepositionanchors % todo : depth pagebox
   {\ifpositioning
-     \setbox\scratchbox\vbox to \teksthoogte
+     \setbox\scratchbox\vbox to \textheight
        {\simpletopskipcorrection
         \hbox{\strut\dopositionaction\headanchor}%
         \vfill
         \hbox{\strut\dopositionaction\tailanchor}}%
      \dp\scratchbox\zeropoint
-     \wd\scratchbox\zetbreedte % not \zeropoint, else wrong text backgrounds
+     \wd\scratchbox\makeupwidth % not \zeropoint, else wrong text backgrounds
      \hpos\textanchor{\box\scratchbox}%
    \else
-     \vskip\teksthoogte
+     \vskip\textheight
    \fi}
 
 %D The first version of this module implemented head and tail
@@ -1070,17 +1070,17 @@
 %D We can best demonstrate this in an example, say:
 %D
 %D \startbuffer[text]
-%D \omlijnd
-%D   [achtergrond=sample,uitlijnen=midden,breedte=7cm]
+%D \framed
+%D   [backgroundachtergrond=sample,align=middle,width=7cm]
 %D   {We want to connect \hpos {A-1} {this} word with its
 %D    grammatical cousin \hpos {A-2} {that}.}
 %D \stopbuffer
 %D
 %D \typebuffer[text]
 %D
-%D \startregelcorrectie
-%D %\haalbuffer[graphic,sample,text]
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D %\getbuffer[graphic,sample,text]
+%D \stoplinecorrection
 %D
 %D The graphic is defined in the following way, using some
 %D macros defined in an auxiliary \METAPOST\ module that is
@@ -1501,10 +1501,10 @@
 
 % will be overloaded, and/or code below moved to core-box
 
-\defineoverlay[\v!tekst-2][\positionoverlay{\v!tekst-2}]
-\defineoverlay[\v!tekst-1][\positionoverlay{\v!tekst-1}]
-\defineoverlay[\v!tekst+1][\positionoverlay{\v!tekst+1}]
-\defineoverlay[\v!tekst+2][\positionoverlay{\v!tekst+2}]
+\defineoverlay[\v!text-2][\positionoverlay{\v!text-2}]
+\defineoverlay[\v!text-1][\positionoverlay{\v!text-1}]
+\defineoverlay[\v!text+1][\positionoverlay{\v!text+1}]
+\defineoverlay[\v!text+2][\positionoverlay{\v!text+2}]
 
 %D The auxiliary \METAPOST\ macros are defined by default,
 %D by saying:
@@ -1685,12 +1685,12 @@
   \MPpositiongraphic{mpos:par}{}%
 \stopMPpositionmethod
 
-%D \starttypen
+%D \starttyping
 %D \setupbackground
 %D   [test]
 %D   [mp=mpos:par:columnset,
-%D    methode=mpos:par:columnset]
-%D \stoptypen
+%D    methodmethode=mpos:par:columnset]
+%D \stoptyping
 
 %D We need to treat floats in a special way.
 
@@ -1699,7 +1699,7 @@
 \to \MPinitializations
 
 \def\textbackgroundoverlay#1%
-  {\iflocalpositioning\v!lokaal\else\v!tekst\fi#1}
+  {\iflocalpositioning\v!local\else\v!text\fi#1}
 
 \newcounter\localpositionnumber
 
@@ -1788,7 +1788,7 @@
    \setuptextbackground[#1][#2]%
    \let\dodostarttextbackground\relax
    \let\dodostoptextbackground \relax
-   \doifvalue{\??td#1\c!status}\v!start
+   \doifvalue{\??td#1\c!state}\v!start
      {\dopresettextbackground{#1}}%
    \dodostarttextbackground}
 
@@ -1796,12 +1796,12 @@
 
 \def\dopresettextbackground#1% todo: \backgroundparameter
   {\ExpandFirstAfter\processaction % \EFA niet echt nodig
-     [\getvalue{\??td#1\c!plaats}]
-     [ \v!tekst=>\let\dodostarttextbackground\dostarttextbackgroundtxt
+     [\getvalue{\??td#1\c!location}]
+     [ \v!text=>\let\dodostarttextbackground\dostarttextbackgroundtxt
                  \let\dodostoptextbackground \dostoptextbackgroundtxt,
-      \v!alinea=>\let\dodostarttextbackground\dostarttextbackgroundpar
+      \v!paragraph=>\let\dodostarttextbackground\dostarttextbackgroundpar
                  \let\dodostoptextbackground \dostoptextbackgroundpar,
-        \v!geen=>\let\dodostarttextbackground\relax
+        \v!none=>\let\dodostarttextbackground\relax
                  \let\dodostoptextbackground \relax]%
    \ifx\dodostarttextbackground\dostarttextbackgroundpar % untested
      \ifnum\textbackgrounddepth>\plusone % new
@@ -1809,33 +1809,33 @@
        \let\dodostoptextbackground \dostoptextbackgroundtxt
      \fi
    \fi
-   \doifelsevalue{\??td#1\c!kader}\v!aan
-     {\doifelsevalue{\??td#1\c!hoek}\v!rond
-        {\setvalue{\??td#1\c!kader}{2}}
-        {\setvalue{\??td#1\c!kader}{1}}}
-     {\setvalue{\??td#1\c!kader}{0}}%
-   \doifelsevalue{\??td#1\c!achtergrond}\v!kleur
-     {\setvalue{\??td#1\c!achtergrond}{1}}
-     {\setvalue{\??td#1\c!achtergrond}{0}}%
-  %\startpositionoverlay{\v!tekst\getvalue{\??td#1\c!niveau}}%
-   \startpositionoverlay{\textbackgroundoverlay{\getvalue{\??td#1\c!niveau}}}%
+   \doifelsevalue{\??td#1\c!frame}\v!on
+     {\doifelsevalue{\??td#1\c!corner}\v!round
+        {\setvalue{\??td#1\c!frame}{2}}
+        {\setvalue{\??td#1\c!frame}{1}}}
+     {\setvalue{\??td#1\c!frame}{0}}%
+   \doifelsevalue{\??td#1\c!background}\v!color
+     {\setvalue{\??td#1\c!background}{1}}
+     {\setvalue{\??td#1\c!background}{0}}%
+  %\startpositionoverlay{\v!text\getvalue{\??td#1\c!level}}%
+   \startpositionoverlay{\textbackgroundoverlay{\getvalue{\??td#1\c!level}}}%
      \expanded
        {\setMPpositiongraphicrange % moet veel efficienter
           {\btbanchor}% {b:\currentparbackground}%
           {\etbanchor}% {e:\currentparbackground}%
-          {\getvalue{\??td#1\c!methode}}%
+          {\getvalue{\??td#1\c!method}}%
           {self=\currentparbackground,
            mp=\getvalue{\??td#1\c!mp},
-           gridtype=\getvalue{\??td#1\c!variant},
-           filltype=\getvalue{\??td#1\c!achtergrond},
-           linetype=\getvalue{\??td#1\c!kader},
-           gridcolor=\getvalue{\??td#1\c!kaderkleur},
-           linecolor=\getvalue{\??td#1\c!kaderkleur},
-           fillcolor=\getvalue{\??td#1\c!achtergrondkleur},
-           filloffset=\getvalue{\??td#1\c!achtergrondoffset},
-           gridwidth=\getvalue{\??td#1\c!lijndikte},
-           linewidth=\getvalue{\??td#1\c!lijndikte},
-           lineradius=\getvalue{\??td#1\c!straal}}}%
+           gridtype=\getvalue{\??td#1\c!alternative},
+           filltype=\getvalue{\??td#1\c!background},
+           linetype=\getvalue{\??td#1\c!frame},
+           gridcolor=\getvalue{\??td#1\c!framecolor},
+           linecolor=\getvalue{\??td#1\c!framecolor},
+           fillcolor=\getvalue{\??td#1\c!backgroundcolor},
+           filloffset=\getvalue{\??td#1\c!backgroundoffset},
+           gridwidth=\getvalue{\??td#1\c!rulethickness},
+           linewidth=\getvalue{\??td#1\c!rulethickness},
+           lineradius=\getvalue{\??td#1\c!radius}}}%
    \stoppositionoverlay}
 
 \def\stoptextbackground
@@ -1843,7 +1843,7 @@
    \carryoverpar\egroup}
 
 \def\starttextbackgroundmanual
-  {\dostartattributes{\??td\currenttextbackground}\c!letter\c!kleur\empty
+  {\dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
    \fpos\currentparbackground\ignorespaces}
 
 \def\stoptextbackgroundmanual
@@ -1852,7 +1852,7 @@
 
 \def\dostarttextbackgroundtxt
   {\ifvmode \leavevmode \fi
-   \dostartattributes{\??td\currenttextbackground}\c!letter\c!kleur\empty
+   \dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
    \fpos\currentparbackground\ignorespaces}
 
 \def\dostoptextbackgroundtxt
@@ -1892,8 +1892,8 @@
 
 \def\dostarttextbackgroundpar
   {\endgraf % new
-   \getvalue{\??td\currenttextbackground\c!voor}%
-   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!bovenoffset}\to\scratchskip
+   \getvalue{\??td\currenttextbackground\c!before}%
+   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!topoffset}\to\scratchskip
    \xdef\textbackgroundskip{\the\scratchskip}%
    \noindent
    \ifgridsnapping
@@ -1908,29 +1908,29 @@
    \bgroup
    \endgraf % we need a vertical nobreak - 29/06/2004
    \nobreak \vskip-\lineheight \nobreak
-   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!bovenoffset}\to\scratchskip
+   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!topoffset}\to\scratchskip
    \ifgridsnapping \else \ifdim\textbackgroundskip>\zeropoint
      \kern\textbackgroundskip\nobreak
    \fi \fi
-   \dosetleftskipadaption{\getvalue{\??td\currenttextbackground\c!linkeroffset}}%
+   \dosetleftskipadaption{\getvalue{\??td\currenttextbackground\c!leftoffset}}%
    \advance\leftskip\leftskipadaption
-   \dosetleftskipadaption{\getvalue{\??td\currenttextbackground\c!rechteroffset}}%
+   \dosetleftskipadaption{\getvalue{\??td\currenttextbackground\c!rightoffset}}%
    \advance\rightskip\leftskipadaption
    % new
-   \dosetraggedcommand{\getvalue{\??td\currenttextbackground\c!uitlijnen}}%
+   \dosetraggedcommand{\getvalue{\??td\currenttextbackground\c!align}}%
    \raggedcommand
    %
-   \dostartattributes{\??td\currenttextbackground}\c!letter\c!kleur\empty
-   \geenwitruimte
+   \dostartattributes{\??td\currenttextbackground}\c!style\c!color\empty
+   \nowhitespace
    \seteffectivehsize
-   \doinhibitblank %   \blanko[\v!blokkeer]% new
+   \doinhibitblank %   \blank[\v!disable]% new
    \par}
 
 \def\dostoptextbackgroundpar
   {\par
    \removelastskip % new
    \dostopattributes
-   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!onderoffset}\to\scratchskip
+   \doassignsomeskip\getvalue{\??td\currenttextbackground\c!bottomoffset}\to\scratchskip
    \ifdim\lastskip>\zeropoint
      \advance\scratchskip-\lastskip
    \fi
@@ -1939,7 +1939,7 @@
      \kern\scratchskip\nobreak
    \fi \fi
    \nobreak \vskip-\lineheight \nobreak
-   \geenwitruimte
+   \nowhitespace
    \egroup
 \bgroup \forgeteverypar % NOT REALLY NEEDED, SAVES HASH/MEM
    \nobreak \noindent \strut \hfill \kern\zeropoint
@@ -1954,7 +1954,7 @@
    \fi
 \egroup
    \endgraf % new
-   \getvalue{\??td\currenttextbackground\c!na}}
+   \getvalue{\??td\currenttextbackground\c!after}}
 
 \let\textparpages \!!zeropoint
 \let\textparheight\!!zeropoint
@@ -1983,12 +1983,12 @@
      \advance\scratchdimen \MPh\textanchor\relax
      \ifcase\scratchcounter>2 \ifnum\scratchcounter<5
        % more pages
-       \scratchdimen\teksthoogte
+       \scratchdimen\textheight
        \advance\scratchcounter \minusone
        \multiply\scratchdimen \scratchcounter
      \else
        % keep'm small
-       \scratchdimen5\teksthoogte
+       \scratchdimen5\textheight
      \fi \fi
    \fi
    \edef\textparheight{\the\scratchdimen}%
@@ -1999,7 +1999,7 @@
    \else
      % two or more pages / maybe also hang
      \ifx#3\relax
-       \scratchdimen\zetbreedte % \tekstbreedte
+       \scratchdimen\makeupwidth % \textwidth
      \else
        \scratchdimen\MPw\MPparanchor
        \advance\scratchdimen-\MPl\MPparanchor
@@ -2011,18 +2011,18 @@
 \def\mintextparheight{4\lineheight}
 
 \def\dontsplitnexttextbackground % dangerous but useful
-  {\ifdim\pagetotal>\teksthoogte \else
+  {\ifdim\pagetotal>\textheight \else
      \ifdim\pagegoal=\maxdimen \else
       \calculatenexttextpardimensions
       % too tricky
       % \scratchdimen=\textparheight
       % \advance\scratchdimen\pagetotal\relax
       % \ifdim\scratchdimen>\pagegoal
-      % \pagina
+      % \page
       % \fi
       \ifdim\textparheight>\zeropoint
         \ifdim\textparheight>\mintextparheight\else
-          \pagina % option
+          \page % option
         \fi
       \fi
     \fi
@@ -2034,13 +2034,13 @@
 \def\dodefinetextbackground[#1][#2]%
   {\ifsecondargument % why ?
      \copyparameters[\??td#1][\??td]
-       [\c!status,\c!plaats,\c!variant,\c!mp,\c!methode,
-        \c!achtergrond,\c!achtergrondkleur,\c!hoek,\c!niveau,
-        \c!achtergrondoffset,\c!voor,\c!na,\c!uitlijnen,
-        \c!straal,\c!kader,\c!kaderkleur,\c!lijndikte,
-        \c!linkeroffset,\c!rechteroffset,\c!bovenoffset,\c!onderoffset]%
+       [\c!state,\c!location,\c!alternative,\c!mp,\c!method,
+        \c!background,\c!backgroundcolor,\c!corner,\c!level,
+        \c!backgroundoffset,\c!before,\c!after,\c!align,
+        \c!radius,\c!frame,\c!framecolor,\c!rulethickness,
+        \c!leftoffset,\c!rightoffset,\c!topoffset,\c!bottomoffset]%
      \getparameters[\??td#1][#2]%
-     \doifvalue{\??td#1\c!status}\v!start\checktextbackgrounds
+     \doifvalue{\??td#1\c!state}\v!start\checktextbackgrounds
      \unexpanded\setvalue{#1}%
        {\groupedcommand{\starttextbackground[#1]}{\stoptextbackground}}%
      \setvalue{\e!start#1}{\starttextbackground[#1]}%
@@ -2050,15 +2050,6 @@
 \def\setuptextbackground
   {\dodoubleargument\dosetuptextbackground}
 
-%\def\dosetuptextbackground[#1][#2]%
-%  {\ifsecondargument
-%     \getparameters[\??td#1][#2]%
-%     \def\currenttextbackground{#1}%
-%     \doifvalue{\??td#1\c!status}{\v!start}{\checktextbackgrounds}%
-%   \else
-%     \setuptextbackground[][#1]%
-%   \fi}
-
 \def\dosetuptextbackground[#1][#2]%
   {\ifsecondargument
      \doifelsenothing{#1}
@@ -2071,7 +2062,7 @@
 \def\dodosetuptextbackground#1#2%
   {\getparameters[\??td#2][#1]%
    \def\currenttextbackground{#2}%
-   \doifvalue{\??td#2\c!status}\v!start\checktextbackgrounds}
+   \doifvalue{\??td#2\c!state}\v!start\checktextbackgrounds}
 
 \let\currenttextbackground\empty
 
@@ -2083,35 +2074,35 @@
 
 \setuptextbackground
   [\c!mp=mpos:par:columnset,      % buggy: mpos:par:shape
-   \c!methode=mpos:par:columnset, %
-   \c!status=\v!start,
-   \c!plaats=\v!tekst,
-   \c!linkeroffset=\!!zeropoint, % 1em,
-   \c!rechteroffset=\getvalue{\??td\currenttextbackground\c!linkeroffset},
-   \c!bovenoffset=\!!zeropoint,  % \v!middel,
-   \c!onderoffset=\getvalue{\??td\currenttextbackground\c!bovenoffset},
-   \c!niveau=-1,
-   \c!variant=0,
-   \c!uitlijnen=,
-   \c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=lightgray,
-   \c!achtergrondoffset=\!!zeropoint,
-   \c!hoek=\v!recht,
-   \c!straal=.5\bodyfontsize,
-   \c!kader=\v!aan,
-   \c!kaderkleur=blue,
-   \c!lijndikte=\linewidth]
+   \c!method=mpos:par:columnset, %
+   \c!state=\v!start,
+   \c!location=\v!text,
+   \c!leftoffset=\!!zeropoint, % 1em,
+   \c!rightoffset=\getvalue{\??td\currenttextbackground\c!leftoffset},
+   \c!topoffset=\!!zeropoint,  % \v!medium,
+   \c!bottomoffset=\getvalue{\??td\currenttextbackground\c!topoffset},
+   \c!level=-1,
+   \c!alternative=0,
+   \c!align=,
+   \c!background=\v!color,
+   \c!backgroundcolor=lightgray,
+   \c!backgroundoffset=\!!zeropoint,
+   \c!corner=\v!rectangular,
+   \c!radius=.5\bodyfontsize,
+   \c!frame=\v!on,
+   \c!framecolor=blue,
+   \c!rulethickness=\linewidth]
 
 %D As an example we define a grid background:
 
 \definetextbackground
   [\v!grid]
-  [\c!status=\v!stop,
-   \c!plaats=\v!alinea,
-   \c!kader=\v!uit,
-   \c!kaderkleur=red,
-   \c!achtergrond=,
-   \c!variant=1]
+  [\c!state=\v!stop,
+   \c!location=\v!paragraph,
+   \c!frame=\v!off,
+   \c!framecolor=red,
+   \c!background=,
+   \c!alternative=1]
 
 \ifx\basegrid\undefined \else \letvalue\v!grid=\basegrid \fi
 
@@ -2170,15 +2161,15 @@
 %D A non graphic example of the use of positioning, is to stack
 %D text in for instance the margin.
 %D
-%D \stackposdown \inlinker {some text}The text \type {some text}
-%D goes into the left margin, and \stackposdown \inlinker {some
+%D \stackposdown \inleft {some text}The text \type {some text}
+%D goes into the left margin, and \stackposdown \inleft {some
 %D more}\type {some more} as well. When they overlap, they
 %D will not touch.
 %D
-%D Here we said \type {\stackposdown \inlinker{some text}}. Instead
-%D of \stackposleft \inlinker {one}stacking \stackposleft \inlinker
+%D Here we said \type {\stackposdown \inleft{some text}}. Instead
+%D of \stackposleft \inleft {one}stacking \stackposleft \inleft
 %D {two}vertically, one can stack horizontally by \stackposleft
-%D \inlinker {three}using \type {\stackposleft}.
+%D \inleft {three}using \type {\stackposleft}.
 %D
 %D We can go in all four directions, using \type {\stackposdown},
 %D \type {\stackposup}, \type {\stackposleft} and \type
@@ -2284,11 +2275,14 @@
 % \stopbuffer
 % \getbuffer \typebuffer \flushstatus \page
 
+\newdimen\laststackvmove
+
 \def\stackeddown
   {\bgroup
    % this macro assumes a few things and is meant to work for margin notes
    \dowithnextbox
      {\doglobal\increment\currentautopos
+      \global\laststackvmove\zeropoint
       \hpos{\POSstackprefix\currentautopos}
         {\edef\next
            {\nextboxht\the\nextboxht
@@ -2335,6 +2329,7 @@
              {\MPw\currentposition}{\the\scratchskip}{\MPd\currentposition}}%
            %\registerstatus{new \currentautopos: \MPy\currentposition/\MPh\currentposition}%
            \egroup
+           \global\laststackvmove\scratchdimen % new
            \setbox\nextbox\iftracepositions\@EA\ruledhbox\else\@EA\hbox\fi
              {\lower\scratchdimen\flushnextbox}%
            \next
@@ -2394,9 +2389,9 @@
 %D For a right menu, a sequence of calls to \type
 %D {right_menu_button} is generated.
 %D
-%D \starttypen
+%D \starttyping
 %D right_menu_button (n, p, s=0/1/2, x, y, w, h, d) ;
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here, n is the number of the button, s a status variable,
 %D while the rest is positional info. The status variable is
@@ -2415,7 +2410,7 @@
 % 0=notfound  1=found  2=currentpage
 
 \def\do@@amposition#1#2#3%
-  {\doifelsevalue{\??am#1\c!positie}\v!ja
+  {\doifelsevalue{\??am#1\c!position}\v!yes
      {\doglobal\increment\currentamposition
       \doifnumberelse{#2}
         {\docheckrealreferencepage{#2}%
@@ -2563,21 +2558,21 @@
 %D
 %D \typebuffer
 %D
-%D % \haalbuffer
+%D % \getbuffer
 %D
 %D \startbuffer
-%D \starttabulatie[|c|c|c|]
+%D \starttabulate[|c|c|c|]
 %D \GFC[f:x] this is a small  \NC       table            \NC     in which we \NC \FR
 %D \NC       will demonstrate \GFC[g:z] that this        \GTC[g] positioning \NC \MR
 %D \GSC[e:y] mechanism also   \GTC[f]   works quite well \NC     in tables   \NC \LR
-%D \stoptabulatie
+%D \stoptabulate
 %D \stopbuffer
 %D
 %D The table itself defines three areas (a, b and~c) using
 %D these frames.
 %D
 %D \typebuffer
-%D % \haalbuffer
+%D % \getbuffer
 %D
 %D Tables (based on \TABLE) are supported by:
 
@@ -2614,22 +2609,22 @@
 %D \setMPpositiongraphic{b:z}{tableshade}{from=b:z,to=e:z,color=blue}
 %D \stopbuffer
 %D
-%D \typebuffer \haalbuffer
+%D \typebuffer \getbuffer
 %D
 %D The definition of the table looks about the same as the
 %D previous one:
 %D
 %D \startbuffer
-%D \starttabel[|c|c|c|]
+%D \starttable[|c|c|c|]
 %D \GFC[b:z] \cw{this is a small}  \NC       \cw{table}            \NC     in which we      \NC \FR
 %D \NC       \cw{will demonstrate} \GFC[c:y] \cw{that this}        \GTC[c] \cw{positioning} \NC \MR
 %D \GSC[a:x] \cw{mechanism also}   \GTC[b]   \cw{works quite well} \NC     in tables        \NC \LR
-%D \stoptabel
+%D \stoptable
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 
 % \definepositionframed[w][background=color,backgroundcolor=yellow]
 % \definepositionframed[x][background=color,backgroundcolor=red]
@@ -2697,7 +2692,7 @@
       \lower\dimen2\hbox
         {\advance\dimen2 \MPh{b:#1}%
          \framed
-           [\c!breedte=\dimen0,\c!hoogte=\dimen2,
+           [\c!width=\dimen0,\c!height=\dimen2,
             \c!offset=\v!overlay,#2]{}}}%
    \smashedbox\scratchbox
    \egroup}
@@ -2713,4 +2708,4 @@
 %    \advance\scratchdimen -\MPx{mh:#1}%
 %    \edef\righthdistance{\the\scratchdimen}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex
index 67b4cf3e1..109c84917 100644
--- a/tex/context/base/core-ref.tex
+++ b/tex/context/base/core-ref.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ref,
+%D   [       filefile=core-ref,
 %D        version=1998.01.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Cross Referencing,
@@ -136,16 +136,16 @@
 %D
 %D There are three ways of defining a reference:
 %D
-%D \starttypen
+%D \starttyping
 %D \pagereference[here]
 %D \textreference[here]{some text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D the third alternative combines them in:
 %D
-%D \starttypen
+%D \starttyping
 %D \reference[here]{some text}
-%D \stoptypen
+%D \stoptyping
 
 \def\textreference {\dosingleargument\dotextreference}
 \def\pagereference {\dosingleargument\dopagereference}
@@ -153,11 +153,11 @@
 
 %D These are implemented in a low level form as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dotextreference[#1]{\rawtextreference\s!txt{#1}} % #2
 %D \def\dopagereference[#1]{\rawpagereference\s!pag{#1}}
 %D \def\doreference    [#1]{\rawreference    \s!ref{#1}} % #2
-%D \stoptypen
+%D \stoptyping
 %D
 %D or without expansion problems:
 
@@ -244,9 +244,9 @@
 %D a the utility file. The next macro does the job and
 %D generates entries like:
 %D
-%D \starttypen
+%D \starttyping
 %D \mainreference{prefix}{reference}{page}{realpage}{text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We did not yet discuss prefixing. Especially in interactive
 %D documents, it's not always easy to keep track of duplicate
@@ -335,12 +335,12 @@
 %D {page}, you can access the reference directly. The latter
 %D case nills the prefix method, thereby saving some memory.
 %D
-%D \starttabulatie[||||]
+%D \starttabulate[||||]
 %D \NC filename::tag \NC page(filename::pnum) \NC tag     \NC\NR
 %D \NC   $\star$     \NC                      \NC         \NC\NR
 %D \NC   $\star$     \NC $\star$              \NC $\star$ \NC\NR
 %D \NC               \NC $\star$              \NC         \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \chardef\autocrossfilereferences=0
 
@@ -380,7 +380,7 @@
             {\showmessage\m!references2{[##1][##2],##4 (auto \currentutilityfilename)}}%
         \or
           \doifundefinedelse{\r!cross##1##2}
-            {\expanded{\definereference[##1##2][\noexpand\v!pagina(\fileprefix##4)]}}
+            {\expanded{\definereference[##1##2][\noexpand\v!page(\fileprefix##4)]}}
             {\showmessage\m!references2{[##1][##2],##4 (auto \currentutilityfilename)}}%
         \fi
       \else\ifcase0##4\else
@@ -448,10 +448,10 @@
 %D for navigational purposes. The main reason for this is that
 %D we want to treat both categories alike:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{go back}[PreviousJump]
 %D \goto{colofon}[colofon page]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here \type{PreviousJump} is handled by the viewer, while the
 %D \type{colofon page} reference is, apart from hyperlinking, a
@@ -534,19 +534,19 @@
 
 %D In practice accessing a reference comes down to:
 %D
-%D \startopsomming[opelkaar]
-%D \som  checking the validity
-%D \som  determining the type
-%D \som  filtering the content
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item  checking the validity
+%D \item  determining the type
+%D \item  filtering the content
+%D \stopitemize
 %D
 %D We'll deal with the last two steps first. References are
 %D saved in the general format:
 %D
-%D \starttypen
+%D \starttyping
 %D {\referenceclass{realpage}{page}{text}}
 %D {\referenceclass{type}{data}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we filter the content, next macros are set when we
 %D meet a normal cross reference:
@@ -646,15 +646,15 @@
 %D Text references can contain more than one entry and
 %D therefore we check for
 %D
-%D \starttypen
+%D \starttyping
 %D {entry}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D {{entry}{entry}{entry}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D and split accordingly.
 
@@ -749,7 +749,7 @@
 %D have \type{\goto}, \type{\button} and alike. These are more
 %D versatile and look like:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto[reference]
 %D \goto[outer reference::]
 %D \goto[outer reference::inner reference]
@@ -757,7 +757,7 @@
 %D \goto[operation(action{argument,argument})]
 %D \goto[action]
 %D \goto[action{argument}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first one is a normal reference, the second and third
 %D are references to a file or \URL. The brace delimited
@@ -767,21 +767,21 @@
 %D When we split off the components of such a reference, the
 %D results are available in:
 %D
-%D \starttypen
+%D \starttyping
 %D \currentreferencespecial
 %D \currentreferenceoperation
 %D \currentreferencearguments
 %D \currentinnerreference
 %D \currentouterreference
 %D \currentfullreference
-%D \stoptypen
+%D \stoptyping
 %D
 %D Splitting a reference is done by:
 %D
-%D \starttypen
+%D \starttyping
 %D \splitofffullreference {reference}
 %D \splitoffreference     {reference}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second alternative can be used in a second stage
 %D splitoff and only handles \type{::}.
@@ -895,20 +895,20 @@
 %D prefixed one. Consider for instance the prefix set to
 %D \type{sidetrack}.
 %D
-%D \starttypen
+%D \starttyping
 %D \pagereference[important]
 %D \pagereference[unimportant]
-%D \setupreferencing[prefix=sidetrack]
+%D \setupreferencing[prefixprefix=sidetrack]
 %D \pagereference[important]
-%D \stoptypen
+%D \stoptyping
 %D
 %D results in saving (writing) the references
 %D
-%D \starttypen
+%D \starttyping
 %D ...{}{important}
 %D ...{}{unimportant}
 %D ...{sidetrack}{important}...
-%D \stoptypen
+%D \stoptyping
 %D
 %D Now when we call for \type{unimportant}, we will indeed get
 %D the pagenumber associated to this reference. But when we
@@ -922,16 +922,16 @@
 %D Before we start analyzing, I introduce a general
 %D definition macro. Consider:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{do}[JS(My_Script{"test",123}),titlepage]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This can also be achieved by:
 %D
-%D \starttypen
+%D \starttyping
 %D \definereference[startup][JS(My_Script{"test",123}),titlepage]
 %D \goto{do}[REF(startup)]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Now is this is a handy feature or not?
 %D
@@ -1212,16 +1212,16 @@
 
 %D For most situations, we could use:
 %D
-%D \starttypen
+%D \starttyping
 %D \let\doifreferencefoundelse=\dodoifreferencefoundelse
-%D \stoptypen
+%D \stoptyping
 %D
 %D But when we also want to support chained references, we need
 %D some more. Such a chained reference is defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{somewhere}[JS(somescript),nextpage,JS(anotherscript)]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Actually supporting chains is up to the special driver. Here
 %D we only provide the hooks.
@@ -1461,10 +1461,10 @@
 %D The inner case is simple. Only two cases have to be taken
 %D care of:
 %D
-%D \starttypen
-%D \naar{some text}[reference]
-%D \naar{some text}[prefix:reference]
-%D \stoptypen
+%D \starttyping
+%D \goto{some text}[reference]
+%D \goto{some text}[prefix:reference]
+%D \stoptyping
 
 %\def\docheckinnerreference%
 %  {\global\let\predefinedreference=\currentinnerreference
@@ -1540,13 +1540,13 @@
 %D References to other files however are treated strict or
 %D tolerant, depending on their loading and availability:
 %D
-%D \starttypen
+%D \starttyping
 %D \useexternaldocument[somefile][filename][a nice description]
 %D
 %D \goto{checked   reference}[somefile::reference]
 %D \goto{unchecked reference}[somefile::]
 %D \goto{unchecked reference}[anotherfile::reference]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here we use the dummy reference \type{somefile::} set in
 %D \type{\setouterreference} as a signal that indeed references
@@ -1671,9 +1671,9 @@
    \the\everyreference % cleanup : etc in french
    \ifvoorlopig\ifinpagebody\else
      \doifsomething{#2}
-       {\inlinker
+       {\inleft
           {\infofont
-           \scratchdimen\linkermargebreedte
+           \scratchdimen\leftmarginwidth
            \advance\scratchdimen -2em
            \doboundtext{#2}\scratchdimen{..}->}}%
    \fi\fi
@@ -1734,9 +1734,9 @@
 %D Sometimes we want to temporary put a reference out of
 %D order. An example can be found in the menu macros.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifreferencepermittedelse{reference}{set}{true}{false}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second argument can be a comma seperated list.
 
@@ -1807,10 +1807,10 @@
 %D location. The latter one can be seen as a hyperlink to the
 %D former one. In the next macros one we use constructs like:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostart...
 %D \dostop...
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such macros are used to invoke the relevant specials from
 %D the special driver modules (see \type{spec-ini}). The flag
@@ -1829,13 +1829,13 @@
 %D The previous tho macros were easy ones, opposite to their
 %D counterparts. A common component in these is:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartgoto
 %D   \data  {..}
 %D   \start {..}
 %D   \stop  {..}
 %D \dostopgoto
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here data can be whatever needs highlighting, e.g. {\em
 %D figure 2.4}, and the start and stop entries handle the
@@ -1889,9 +1889,9 @@
 %D uppercase here, since the suffix is handled in the special
 %D driver. Conversion is taken care of by:
 %D
-%D \starttypen
+%D \starttyping
 %D \setreferencefilename somefilename\to\SomeFileName
-%D \stoptypen
+%D \stoptyping
 
 % \def\setreferencefilename#1\to#2%
 %   {\doifelse{\@@converteerfile}{\v!ja} % boolean is sneller
@@ -1915,10 +1915,10 @@
 %D macros. Setting such references to unique values is
 %D completely up to the macros that call them.
 %D
-%D \starttypen
+%D \starttyping
 %D \thisissomeinternal{tag}{identifier}
 %D \gotosomeinternal  {tag}{identifier}{pagenumber}{text}
-%D \stoptypen
+%D \stoptyping
 
 \def\thisissomeinternal#1#2%  tag reference
   {\doifsomething{#2}{\thisisdestination{#1:#2}}}
@@ -1928,10 +1928,10 @@
 
 %D An automatic mechanism is provided too:
 %D
-%D \starttypen
+%D \starttyping
 %D \thisisnextinternal{tag}
 %D \gotonextinternal  {tag}{number}{pagenumber}{text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first macro increments a counter. The value of this
 %D counter is available in the macro \type{\nextinternalreference}
@@ -2017,25 +2017,25 @@
 %D Special locations are those that are accessed by saying
 %D things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{calculate total}[JS(summarize{10,23,56}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D After several intermediate steps this finally arrives at
 %D the next macro and expands into (simplified):
 %D
-%D \starttypen
+%D \starttyping
 %D \gotoJSlocation{total{summarize{10,23,56}}}{calculate total}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first argument is the full reference, the second one
 %D is the text, in some kind of manipulated form. In practice
 %D we split references, so we get:
 %D
-%D \starttypen
+%D \starttyping
 %D \gotoJSlocation{summarize{10,23,56}}{calculate}
 %D \gotoJSlocation{summarize{10,23,56}}{total}
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{calculate} and \type{total} are colored, boxed
 %D or whatever \type{\goto} is told to do.
@@ -2060,9 +2060,9 @@
 
 %D This \type{\def} alike macro is to be used as:
 %D
-%D \starttypen
+%D \starttyping
 %D \definespeciallocation{JS}#1#2{... #1 ... #2 ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In module \type {java-ini} one can see that \type
 %D {\gotoJSlocation} looks much like the previous goto
@@ -2104,9 +2104,9 @@
 %D In case a command action needs to do some checking in
 %D advance, one can assign an check function by:
 %D
-%D \starttypen
+%D \starttyping
 %D \setexecutecommandcheck{startsound}\checksoundtrack
-%D \stoptypen
+%D \stoptyping
 
 \def\setexecutecommandcheck#1#2% #2 permits \first \second
   {\setvalue{\s!do:\s!do:#1}{#2}}
@@ -2173,6 +2173,7 @@
 \setglobalsystemreference \rt!exec \v!HideField        {hide}
 \setglobalsystemreference \rt!exec \v!ShowField        {show}
 \setglobalsystemreference \rt!exec \v!GotoPage         {gotopage}
+\setglobalsystemreference \rt!exec \v!GotoPage         {gotopage}
 \setglobalsystemreference \rt!exec \v!Query            {query}
 \setglobalsystemreference \rt!exec \v!QueryAgain       {queryagain}
 \setglobalsystemreference \rt!exec \v!FitWidth         {fitwidth}
@@ -2229,29 +2230,29 @@
      [\??rf]
      [\c!prefix=\s!unknown,#1]%
    \processaction
-     [\@@rfstatus]
+     [\@@rfstate]
      [  \v!stop=>\referencingfalse,
        \v!start=>\referencingtrue]%
    \processaction
-     [\@@rfinteractie]
-     [  \v!alles=>\let\dowantedreference\docompletereference,
+     [\@@rfinteraction]
+     [  \v!all=>\let\dowantedreference\docompletereference,
         \v!label=>\let\dowantedreference\dolabelonlyreference,
-        \v!tekst=>\let\dowantedreference\dotextonlyreference,
-      \v!symbool=>\let\dowantedreference\dosymbolreference]%
+        \v!text=>\let\dowantedreference\dotextonlyreference,
+      \v!symbol=>\let\dowantedreference\dosymbolreference]%
    \chardef\autocrossfilereferences\zerocount
    \processaction
      [\@@rfautofile]
-     [     \v!ja=>\chardef\autocrossfilereferences\plusone,
-       \v!pagina=>\chardef\autocrossfilereferences\plustwo]%
+     [     \v!yes=>\chardef\autocrossfilereferences\plusone,
+       \v!page=>\chardef\autocrossfilereferences\plustwo]%
    \chardef\referencefilecase\zerocount
-   \processaction[\@@rfconverteerfile]
-     [   \v!ja=>\chardef\referencefilecase\plusone,
-      \v!groot=>\chardef\referencefilecase\plusone,
-      \v!klein=>\chardef\referencefilecase\plustwo]%
-  %\doifelse\@@rfstrut\v!ja % some day an option
+   \processaction[\@@rfconvertfile]
+     [   \v!yes=>\chardef\referencefilecase\plusone,
+      \v!big=>\chardef\referencefilecase\plusone,
+      \v!small=>\chardef\referencefilecase\plustwo]%
+  %\doifelse\@@rfstrut\v!yes % some day an option
   %  \referencetruttrue\referencestrutfalse
    \setupreferenceprefix[\@@rfprefix]%
-   \doifelse\@@rfglobaal\v!ja
+   \doifelse\@@rfglobal\v!yes
      {\settrue \autoglobalfilereferences}
      {\setfalse\autoglobalfilereferences}}
 
@@ -2285,9 +2286,9 @@
 %D and passes them to a handle. This is a rather dreadfull
 %D hack!
 %D
-%D \starttypen
+%D \starttyping
 %D \handlereferenceactions{references}\handle
-%D \stoptypen
+%D \stoptyping
 %D
 %D So, \type {\handle} does the final job, which in for
 %D instance the \PDF\ drivers comes down to doing something
@@ -2313,7 +2314,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D We can ask for upto five reference components:
 %D
@@ -2329,9 +2330,9 @@
 %D
 %D And get back:
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 
 \def\ref{\dodoubleargument\doref}
 
@@ -2373,24 +2374,26 @@
 
 % \let\normalover \over
 
-\definecommand in   {\doinatreference\currenttextreference}
-\definecommand op   {\doinatreference\currentpagereference}
-\definecommand over {\dospecialover}
+\definecommand in    {\doinatreference\currenttextreference}
+\definecommand at    {\doinatreference\currentpagereference}
+\definecommand about {\dospecialabout}
+\definecommand from  {\dospecialfrom}
+\definecommand over  {\dospecialabout} % needed here, else math problems
 
-\unexpanded\def\dospecialover[#1]%
+\unexpanded\def\dospecialabout[#1]%
   {\dontleavehmode
    \bgroup
    \def\thecurrentsubtextreference
-     {\limitatetext\currentsubtextreference\@@rfbreedte\unknown}%
+     {\limitatetext\currentsubtextreference\@@rfwidth\unknown}%
   %\leaveoutervmode % no
-   \@@rflinks
+   \@@rfleft
    \doifreferencefoundelse{#1}
      {\let\crlf\space
       \let\\\space
-      \let\donaarfixed\donaarspace
-      \donaarspace{\thecurrentsubtextreference}[#1]}
+      \let\dogotofixed\dogotospace
+      \dogotospace{\thecurrentsubtextreference}[#1]}
      {\unknownreference{#1}\dummyreference}%
-   \@@rfrechts
+   \@@rfright
    \referentieinfo{<}{#1}%
    \egroup}
 
@@ -2398,14 +2401,14 @@
 %D would at first sight expect. This is due to the fact that we
 %D distinguish three (five) alternative calls:
 %D
-%D \plaatsfiguur
-%D   [hier][three calls]
+%D \placefigure
+%D   [here][three calls]
 %D   {Three alternatives reference calls.}
-%D   \startcombinatie[1*3]
-%D     {\framed{\type{ \in }}} {a}
-%D     {\framed{\type{ \at }}} {b}
-%D     {\framed{\type{\goto}}} {c}
-%D  \stopcombinatie
+%D   {\startcombination[1*3]
+%D      {\framed{\type{ \in }}} {a}
+%D      {\framed{\type{ \at }}} {b}
+%D      {\framed{\type{\goto}}} {c}
+%D    \stopcombination}
 %D
 %D \startbuffer
 %D \in figure[fig:three calls]
@@ -2419,9 +2422,9 @@
 %D
 %D This turns up as:
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D
 %D The dual \type{{}} results in a split reference. In a
 %D document meant for paper, one is tempted to use the last
@@ -2480,30 +2483,30 @@
 
 \def\dosymbolreference#1#2[#3]%
   {\bgroup
-   \setupsymbolset[\@@iasymboolset]%
+   \setupsymbolset[\@@iasymbolset]%
    \removelastskip
    \ifx\currentreferencespecial\empty
      \ifx\currentouterreference\empty
        \ifnum0\currentrealreference=\zerocount
-         \ifhmode\strut\high{\symbol[\v!nergens]}\fi
+         \ifhmode\strut\high{\symbol[\v!nowhere]}\fi
        \else\ifnum0\currentrealreference>\realpageno
-         \dodosymbolreference{#2}{\high{\symbol[\v!volgende]}}%
+         \dodosymbolreference{#2}{\high{\symbol[\v!next]}}%
        \else\ifnum0\currentrealreference<\realpageno
-         \dodosymbolreference{#2}{\high{\symbol[\v!vorige]}}%
+         \dodosymbolreference{#2}{\high{\symbol[\v!previous]}}%
        \else
-         \ifhmode\strut\high{\symbol[\v!nergens]}\fi
+         \ifhmode\strut\high{\symbol[\v!nowhere]}\fi
        \fi\fi\fi
      \else
-       \gotoouterlocation{#3}{\showlocation{\high{\symbol[\v!ergens]}}}%
+       \gotoouterlocation{#3}{\showlocation{\high{\symbol[\v!somewhere]}}}%
      \fi
    \else
-     \gotospeciallocation{#3}{\showlocation{\high{\symbol[\v!ergens]}}}%
+     \gotospeciallocation{#3}{\showlocation{\high{\symbol[\v!somewhere]}}}%
    \fi
    \egroup}
 
 \def\dodosymbolreference#1#2%
   {#1\hbox{\gotorealpage\empty\empty\currentrealreference
-    {\dolocationattributes\??ia\c!letter\c!kleur{#2}}}}
+    {\dolocationattributes\??ia\c!style\c!color{#2}}}}
 
 %D The other alternatives just conform their names: only the
 %D label, only the text, or the label and the text.
@@ -2513,36 +2516,36 @@
 
 % \def\docompletereference#1#2[#3]%
 %   {\doifsomespaceelse{#2}
-%      {\doifsomething{#2}{\donaarspace{#2}[#3]~}\donaarfixed{#1}[#3]}
-%      {\donaarfixed{\dotextprefix{#2}#1}[#3]}}
+%      {\doifsomething{#2}{\dogotospace{#2}[#3]~}\dogotofixed{#1}[#3]}
+%      {\dogotofixed{\dotextprefix{#2}#1}[#3]}}
 %
 % better:
 
 % \def\docompletereference#1#2[#3]%
 %   {\iflocationsplit
 %       \doifsomespaceelse{#2}
-%         {\donaarspace{\dotextprefix{#2}#1}[#3]}
-%         {\donaarfixed{\dotextprefix{#2}#1}[#3]}%
+%         {\dogotospace{\dotextprefix{#2}#1}[#3]}
+%         {\dogotofixed{\dotextprefix{#2}#1}[#3]}%
 %    \else
-%      \donaarfixed{\dotextprefix{#2}#1}[#3]%
+%      \dogotofixed{\dotextprefix{#2}#1}[#3]%
 %    \fi}
 %
 % more efficient
 
 \def\docompletereference#1#2[#3]%
   {\iflocationsplit
-     \doifsomespaceelse{#2}\donaarspace\donaarfixed{\dotextprefix{#2}#1}[#3]%
+     \doifsomespaceelse{#2}\dogotospace\dogotofixed{\dotextprefix{#2}#1}[#3]%
    \else
-     \donaarfixed{\dotextprefix{#2}#1}[#3]%
+     \dogotofixed{\dotextprefix{#2}#1}[#3]%
    \fi}
 
 \def\dolabelonlyreference#1#2[#3]%
   {\doifsomespaceelse{#2}
-     {\doifsomething{#2}{\donaarspace{#2}[#3]}}
-     {\donaarfixed{\dotextprefix{#2}}[#3]}}
+     {\doifsomething{#2}{\dogotospace{#2}[#3]}}
+     {\dogotofixed{\dotextprefix{#2}}[#3]}}
 
 \def\dotextonlyreference#1#2[#3]%
-  {\dotextprefix{#2}\donaarfixed{#1}[#3]}
+  {\dotextprefix{#2}\dogotofixed{#1}[#3]}
 
 \let\dowantedreference=\docompletereference
 
@@ -2555,7 +2558,7 @@
 %D
 %D [more documentation will be added]
 %D
-%D \starttypen
+%D \starttyping
 %D \definereferenceformat[informula]  [left=(,right=),text=formula]
 %D \definereferenceformat[informulas] [left=(,right=),text=formulas]
 %D \definereferenceformat[andformula] [left=(,right=),text=and]
@@ -2566,7 +2569,7 @@
 %D the \informulas {formulas}[b] \informula {and} [for:c]
 %D the \informulas [b] \informula {en} [for:c]
 %D the \informulas [b] \andformula [for:c]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Instead of a text, one can specify a label, which should
 %D be defined with \type {\setuplabeltext}.
@@ -2577,29 +2580,29 @@
 \def\dodefinereferenceformat[#1][#2]%
   {\iffirstargument
      \getparameters[\??rf#1]
-       [\c!links=,  % of the number
-        \c!rechts=, % of the number
-        \c!tekst=,  % before the number
+       [\c!left=,  % of the number
+        \c!right=, % of the number
+        \c!text=,  % before the number
         \c!label=,  % can be {left}{right}
-        \c!commando=\in,
+        \c!command=\in,
         #2]%
      \unexpanded\setvalue{#1}%
        {\dontleavehmode\doexecutereferenceformat{#1}}%
    \fi}
 
 \def\noexecutelabelreferenceformat#1%
-  {\doifvaluesomething{\??rf#1\c!tekst}
-     {\gdef\textofreference{\csname\??rf#1\c!tekst\endcsname}}%
-   \csname\??rf#1\c!commando\endcsname}
+  {\doifvaluesomething{\??rf#1\c!text}
+     {\gdef\textofreference{\csname\??rf#1\c!text\endcsname}}%
+   \csname\??rf#1\c!command\endcsname}
 
 \def\doexecutelabelreferenceformat#1%
-  {\csname\??rf#1\c!commando\endcsname
+  {\csname\??rf#1\c!command\endcsname
      {\leftlabeltext {\csname\??rf#1\c!label\endcsname}}%
      {\rightlabeltext{\csname\??rf#1\c!label\endcsname}}}
 
 \def\doexecutereferenceformat#1%
-  {\gdef\leftofreference {\csname\??rf#1\c!links \endcsname}%
-   \gdef\rightofreference{\csname\??rf#1\c!rechts\endcsname}%
+  {\gdef\leftofreference {\csname\??rf#1\c!left \endcsname}%
+   \gdef\rightofreference{\csname\??rf#1\c!right\endcsname}%
    \global\let\textofreference\empty % otherwise ~ added
    \doifelsevaluenothing{\??rf#1\c!label}
      \noexecutelabelreferenceformat\doexecutelabelreferenceformat{#1}}
@@ -2662,7 +2665,7 @@
 %D previous macros are implemented using the goto
 %D functionality.
 %D
-%D \showsetup{\y!naar}
+%D \showsetup{\y!goto}
 %D
 %D One important chaacteristic is that the first argument of
 %D \type{\goto} (and therefore \type{\at} and \type{\in} is
@@ -2675,11 +2678,11 @@
 %   \doifreferencefoundelse{#2}
 %     {\doifelsenothing{#1}
 %        {\dosymbolreference{}{}[#2]}
-%        {\donaarspace{#1}[#2]}}
+%        {\dogotospace{#1}[#2]}}
 %     {\unknownreference{#2}#1}%
 %   \referentieinfo{<}{#2}}
 
-\def\donaar#1[#2]%
+\def\dogoto#1[#2]%
   {\dontleavehmode
   %\leaveoutervmode
 \bgroup
@@ -2687,35 +2690,35 @@
    \doifreferencefoundelse{#2}
      {\doifelsenothing{#1}
         {\dosymbolreference{}{}[#2]}
-        {\donaarspace{#1}[#2]}}
+        {\dogotospace{#1}[#2]}}
      {\unknownreference{#2}#1\relax}% \relax catches lookahead
 \egroup
    \referentieinfo{<}{#2}}
 
-\unexpanded\def\naar#1#2%
-  {\donaar{#1}#2}
+\unexpanded\def\goto#1#2%
+  {\dogoto{#1}#2}
 
 \newif\ifsharesimilarreferences \sharesimilarreferencestrue
 \newcount\similarreference % 0=noppes 1=create/refer 2,3,..=refer
 
-\def\donaarspace#1[#2]%
+\def\dogotospace#1[#2]%
   {\iflocationsplit
      \ifsecondaryreference\setbox0\hbox\fi % due to space insertion
-       {\let\donaarspace\donaarfixed
+       {\let\dogotospace\dogotofixed
         \iflocation
           \def\processisolatedword##1%
             {\ifisolatedwords\ifsharesimilarreferences
                \global\advance\similarreference \plusone
              \fi\fi
              \hbox{\gotolocation{#2}{##1\presetgoto}}}%
-          \doattributes\??ia\c!letter\c!kleur
+          \doattributes\??ia\c!style\c!color
             {\processisolatedwords{#1}\processisolatedword}%
         \else
           #1\relax % \relax prevents #1's next macros from gobbling \fi
         \fi}%
    \else
      \iflocation
-       \doattributes\??ia\c!letter\c!kleur
+       \doattributes\??ia\c!style\c!color
          {\gotolocation{#2}{#1\presetgoto}}%
      \else
        #1\relax % \relax prevents #1's next macros from gobbling \fi
@@ -2723,9 +2726,9 @@
    \fi
    \global\similarreference\zerocount}
 
-\def\donaarfixed#1[#2]%
+\def\dogotofixed#1[#2]%
   {{\iflocation
-      \hbox{\gotolocation{#2}{\doattributes\??ia\c!letter\c!kleur
+      \hbox{\gotolocation{#2}{\doattributes\??ia\c!style\c!color
         {#1\presetgoto}}}%
     \else
       #1%
@@ -2736,13 +2739,13 @@
 
 %D --- NOG IN HANDLEIDING ---
 
-\unexpanded\def\naarbox#1[#2]%
+\unexpanded\def\gotobox#1[#2]%
   {\dontleavehmode
    \bgroup
    \locationstrutfalse
   %\leaveoutervmode
    \doifreferencefoundelse{#2}
-     {\donaarfixed{#1}[#2]}
+     {\dogotofixed{#1}[#2]}
      {\hbox{\unknownreference{#2}#1}}%
    \referentieinfo{<}{#2}%
    \egroup}
@@ -2751,9 +2754,9 @@
 %D or as an \URL. Both are handled by the same mechanism and
 %D can be issued by saying something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto[dictionary::the letter a]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The macros that are responsible for handling these
 %D references, use the next six variables:
@@ -2769,41 +2772,41 @@
 %D are made, so in most cases such a document reference in an
 %D indirect one.
 %D
-%D \showsetup{\y!gebruikexterndocument}
+%D \showsetup{\y!useexternaldocument}
 %D
 %D For example:
 %D
-%D \starttypen
+%D \starttyping
 %D \useexternaldocument
 %D   [dictionary][engldict]
 %D   [The Famous English Dictionary]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next macro implements these relations, and also take
 %D care of loading the document specific references.
 
-\def\gebruikexterndocument%
-  {\dotripleargument\dogebruikexterndocument}
+\def\useexternaldocument%
+  {\dotripleargument\douseexternaldocument}
 
-\def\dogebruikexterndocument[#1][#2][#3]%
+\def\douseexternaldocument[#1][#2][#3]%
   {\bgroup
    \ifsecondargument
      \doifelsenothing{#1}
-       {\dogebruikexterndocument[#2][#2][#3]}
+       {\douseexternaldocument[#2][#2][#3]}
        {\doifelsenothing{#3}
-          {\dogebruikexterndocument[#1][#2][#2]}
+          {\douseexternaldocument[#1][#2][#2]}
           {\doifsomething{#2}
              {\setgvalue{\v!file:::#1}{\doexternaldocument[][#2][#3]}% just \do
-              \doif\@@rfstatus\v!start
+              \doif\@@rfstate\v!start
                 {\doifparentfileelse{#2}
                    {\showmessage\m!references{21}{#2}}
-                   {\dodogebruikexterndocument{#1}{#2}}}}}}%
+                   {\dodouseexternaldocument{#1}{#2}}}}}}%
    \else
-     \dodogebruikexterndocument{#1}{#1}%
+     \dodouseexternaldocument{#1}{#1}%
    \fi
    \egroup}
 
-\def\dodogebruikexterndocument#1#2%
+\def\dodouseexternaldocument#1#2%
   {\bgroup % prevents wrong loading of \jobname
      \def\fileprefix{#1::}%
      \let\setglobalcrossreference\setoutercrossreference
@@ -2813,39 +2816,39 @@
 
 %D The \URL\ alternative takes four arguments:
 %D
-%D \showsetup{\y!gebruikURL}
+%D \showsetup{\y!useURL}
 %D
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \useURL
 %D   [dictionary][http://www.publisher.com/public][engldict]
 %D   [The Famous English Dictionary]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Several specifications are possible:
 %D
-%D \starttypen
+%D \starttyping
 %D \useURL [id] [url] [file] [description]
 %D \useURL [id] [url] [file]
 %D \useURL [id] [url]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This time we don't load the references when no file is
 %D specified. This is logical when one keeps in mind that a
 %D valid \URL\ can also be a mail address.
 
-\def\gebruikURL
+\def\useURL
   {\bgroup
    \protectlabels
    \catcode`\#=12\catcode`\%=12\catcode`\/=12
    \catcode`\_=12\catcode`\~=12\catcode`\:=12
-   \dodoubleempty\dogebruikURL}
+   \dodoubleempty\douseURL}
 
-\def\dogebruikURL[#1][#2]%
-  {\egroup\doquadrupleempty\dodogebruikURL[#1][#2]}
+\def\douseURL[#1][#2]%
+  {\egroup\doquadrupleempty\dodouseURL[#1][#2]}
 
-\def\dodogebruikURL[#1][#2][#3][#4]%
+\def\dodouseURL[#1][#2][#3][#4]%
   {\iffirstargument
      \iffourthargument
        \setgvalue{\v!file:::#1}{\doexternaldocument[#2][#3][#4]}%
@@ -2856,20 +2859,18 @@
      \fi\fi\fi
    \fi}
 
-\let\gebruikurl\gebruikURL
-
 %D \macros
 %D   {url,setupurl}
 %D
 %D We also have: \type{\url} for directly calling the
 %D description. So we can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \useURL [one] [http://www.test.nl]
 %D \useURL [two] [http://www.test.nl] [] [Some Site]
 %D
 %D \url[one] or \from[two] or \goto{Whatever Site}[URL(two)]
-%D \stoptypen
+%D \stoptyping
 %D
 %D An \URL\ can be set up with
 %D
@@ -2881,18 +2882,18 @@
 \unexpanded\def\url[#1]% slow
   {\bgroup
    \processaction
-     [\@@urvariant]
-     [ \v!geen=>\chardef\urlsplitmode\zerocount,
-      \v!beide=>\chardef\urlsplitmode\plusone,
-         \v!na=>\chardef\urlsplitmode\plustwo,
-       \v!voor=>\chardef\urlsplitmode\plusthree]%
-   \doifelse\@@urspatie\v!ja
+     [\@@uralternative]
+     [ \v!none=>\chardef\urlsplitmode\zerocount,
+      \v!both=>\chardef\urlsplitmode\plusone,
+         \v!after=>\chardef\urlsplitmode\plustwo,
+       \v!before=>\chardef\urlsplitmode\plusthree]%
+   \doifelse\@@urspace\v!yes
      {\setbetweenisolatedwords%
         {\scratchskip\currentspaceskip
          \hskip\zeropoint\!!plus.2\scratchskip}}
      {\setbetweenisolatedwords\allowbreak}%
    \def\doexternaldocument[##1][##2][##3]{\hyphenatedurl{##1}}%
-   \dostartattributes\??ur\c!letter\c!kleur{}%
+   \dostartattributes\??ur\c!style\c!color{}%
    \getvalue{\v!file:::#1}%
    \dostopattributes
    \egroup}
@@ -2901,7 +2902,7 @@
 %D \URL's break ok, according to the setting of a switch,
 %D
 %D \startbuffer
-%D \gebruikURL
+%D \useURL
 %D   [test]
 %D   [sentence_sentence%sentence#sentence~sentence/sentence//sentence:sentence.sentence]
 %D \stopbuffer
@@ -2910,21 +2911,21 @@
 %D
 %D Such an \URL\ is, depending on the settings, hyphenated as:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox to \hsize
 %D   {\hss\en
-%D    \stelrefererenin[urlvariant=beide]%
+%D    \setupreferencing[urlalternative=both]%
 %D    \vbox{\hsize.25cm\hbox{\bf both}\prewordbreak\url[test]}%
 %D    \hss
-%D    \stelrefererenin[urlvariant=voor]%
+%D    \setupreferencing[urlalternative=before]%
 %D    \vbox{\hsize.25cm\hbox{\bf before}\prewordbreak\url[test]}%
 %D    \hss
-%D    \stelrefererenin[urlvariant=na]%
+%D    \setupreferencing[urlalternative=after]%
 %D    \vbox{\hsize.25cm\hbox{\bf after}\prewordbreak\url[test]}%
 %D    \hss}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D By setting \type{urlspace=yes} one can get slightly better
 %D spacing when using very long \URL's.
@@ -2965,60 +2966,63 @@
 %D also specify a suitable name (the last argument). This name
 %D can be called upon with:
 %D
-%D \showsetup{\y!uit}
+%D \showsetup{\y!from}
 %D
 %D As can be expected, this macro used \type{\goto} to
 %D perform its task.
 
-\definecomplexorsimple\uit
-
-\def\simpleuit
-  {\bgroup
-   \protectlabels
-   \ifundefined{\v!file:::\otherlabel}%
-     {\tttf[\otherlabel]}%
-   \else
-     \def\doexternaldocument[##1][##2][##3]{##3}%
-     \csname\v!file:::\otherlabel\endcsname
-   \egroup}
-
 % normal version:
 %
-% \def\complexuit[#1]%
+% \def\from[#1]%
 %   {\dontleavehmode % added, but probably not needed
 %    \bgroup
 %    \doifinstringelse{::}{#1}{\docomplexuit[#1]}{\docomplexuit[#1::]}}
 %
 % since we need to serve active :'s we need the less readable:
 
-\def\complexuit[#1]%
+\def\dospecialfrom % retest this one !
+  {\dosingleempty\dodospecialfrom}
+
+\def\dodospecialfrom[#1]%
   {\dontleavehmode % added, but probably not needed
    \bgroup
    \protectlabels % needed for active french :'s
-   \edef\!!stringa{#1}%
-   \doifincsnameelse{::}\!!stringa\donothing{\edef\!!stringa{#1::}}%
-   \@EA\docomplexuit\@EA[\!!stringa]}
+   \iffirstargument
+     \edef\!!stringa{#1}%
+     \doifincsnameelse{::}\!!stringa\donothing{\edef\!!stringa{#1::}}%
+     \expanded{\redospecialfrom[\!!stringa]}%
+   \else
+     \expanded{\nodospecialfrom[\otherlabel]}%
+   \fi
+   \egroup}
 
-\def\docomplexuit[#1::#2]%
+\def\redospecialfrom[#1::#2]%
   {\ifundefined{\v!file:::#1}%
-     {\tttf[#1]}%
+     \tttf[#1]%
    \else
-     \def\doexternaldocument[##1][##2][##3]{\naar{##3}[#1::#2]}%
+     \def\doexternaldocument[##1][##2][##3]{\goto{##3}[#1::#2]}%
      \csname\v!file:::#1\endcsname
-   \fi
-   \egroup}
+   \fi}
+
+\def\nodospecialfrom[#1]%
+  {\ifundefined{\v!file:::#1}%
+     \tttf[#1]%
+   \else
+     \def\doexternaldocument[##1][##2][##3]{##3}% different than ^
+     \csname\v!file:::#1\endcsname
+   \fi}
 
 %D We also support:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some text}[file(identifier{location}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D which is completely equivalent with
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some text}[identifier::location]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The fastest implementation would be:
 
@@ -3045,75 +3049,75 @@
 %D logical to have the viewer specific ones available in a dual
 %D way too. At first glance we could do with:
 %D
-%D \starttypen
-%D \definespeciallocation\v!actie
+%D \starttyping
+%D \definespeciallocation\v!action
 %D   {\getreferenceelements\currentreferenceoperation
 %D    \handleexecreference}
-%D \stoptypen
+%D \stoptyping
 %D
 %D An better alternative, slower but error aware, is
 
 % \definespecialtest\v!actie
 %   {\localdoifreferencefoundelse\currentreferenceoperation}
 
-\definespecialtest\v!actie % rather ugly action(whatever{argument})
+\definespecialtest\v!action % rather ugly action(whatever{argument})
   {\expanded{\localdoifreferencefoundelse{\currentreferenceoperation
      \ifx\currentreferencearguments\empty\else{\currentreferencearguments}\fi}}}
 
-\definespeciallocation\v!actie
+\definespeciallocation\v!action
   {\handleexecreference}
 
 %D So now we can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some action}[PreviousJump]
-%D \stoptypen
+%D \stoptyping
 %D
 %D as well as:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some text}[action(PreviousJump]
-%D \stoptypen
+%D \stoptyping
 
 %D A special case of references are those to programs. These,
 %D very system dependant references are implemented by abusing
 %D some of the previous macros.
 %D
-%D \showsetup{\y!stelprogrammasin}
-%D \showsetup{\y!definieerprogramma}
-%D \showsetup{\y!programma}
+%D \showsetup{\y!setupprograms}
+%D \showsetup{\y!defineprogram}
+%D \showsetup{\y!program}
 %D
 %D The latter gives access to the description of the program,
 %D being the last argument to the definition command.
 
-\def\stelprogrammasin
+\def\setupprograms
   {\dodoubleargument\getparameters[\??pr]}
 
-\def\dodefinieerprogramma[#1][#2][#3]%
-  {\setgvalue{\v!programma:::#1}{\doprogramma{#2}{#3}}}
+\def\dodefineprogram[#1][#2][#3]%
+  {\setgvalue{\v!program:::#1}{\doprogram{#2}{#3}}}
 
-\def\definieerprogramma
-  {\dotripleargument\dodefinieerprogramma}
+\def\defineprogram
+  {\dotripleargument\dodefineprogram}
 
-\def\programma#1[#2]%
+\def\program#1[#2]%
   {\bgroup
-   \ifundefined{\v!programma:::#2}%
+   \ifundefined{\v!program:::#2}%
      {\tttf[#2]}%
    \else
-     \def\doprogramma##1##2%
-       {\naar{\doifelsenothing{#1}{##2}{#1}}[\v!programma(#2)]}%
-     \csname\v!programma:::#2\endcsname
+     \def\doprogram##1##2%
+       {\goto{\doifelsenothing{#1}{##2}{#1}}[\v!program(#2)]}%
+     \csname\v!program:::#2\endcsname
    \fi
    \egroup}
 
 % needs an update: program(abc{arg})
 
-\definespeciallocation\v!programma#1#2%
+\definespeciallocation\v!program#1#2%
   {\bgroup
    \iflocation
-     \doifdefinedelse{\v!programma:::\currentreferenceoperation}
-       {\def\doprogramma##1##2{\def\@@programfile{##1}}%
-        \getvalue{\v!programma:::\currentreferenceoperation}}
+     \doifdefinedelse{\v!program:::\currentreferenceoperation}
+       {\def\doprogram##1##2{\def\@@programfile{##1}}%
+        \getvalue{\v!program:::\currentreferenceoperation}}
        {\let\@@programfile\currentreferenceoperation}%
      \convertcommand\@@programfile\to\ascii
      \dostartgoto
@@ -3121,7 +3125,7 @@
          {#2}%
        \start
          \dostartrunprogram\buttonwidth\buttonheight
-           {\@@prgebied\ascii}\currentreferencearguments
+           {\@@prdirectory\ascii}\currentreferencearguments
        \stop
          \dostoprunprogram
      \dostopgoto
@@ -3133,9 +3137,9 @@
 %D As we can see, we directly use the special reference
 %D mechanism, which means that
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some text}[program(name{args})]
-%D \stoptypen
+%D \stoptyping
 %D
 %D is valid.
 
@@ -3145,46 +3149,46 @@
 %D make this meaning available as a special reference method.
 %D So now one can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \gotopage{some text}[location]
 %D \gotopage{some text}[number]
 %D \gotopage{some text}[file::number]
-%D \stoptypen
+%D \stoptyping
 %D
 %D as well as:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{some text}[page(location)]
 %D \goto{some text}[page(number)]
 %D \goto{some text}[file::page(number)]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here location is a keyword like \type{nextpage}.
 %D
-%D \showsetup{\y!naarpagina}
-
-\def\dodefinieerpagina[#1][#2]%
-  {\setvalue{\v!pagina:::#1}{#2}}
-
-\def\definieerpagina%
-  {\dodoubleargument\dodefinieerpagina}
-
-\definieerpagina [\v!eerstepagina]      [\firstpage]
-\definieerpagina [\v!vorigepagina]      [\prevpage]
-\definieerpagina [\v!volgendepagina]    [\nextpage]
-\definieerpagina [\v!laatstepagina]     [\lastpage]
-\definieerpagina [\v!eerstesubpagina]   [\firstsubpage]
-\definieerpagina [\v!vorigesubpagina]   [\prevsubpage]
-\definieerpagina [\v!volgendesubpagina] [\nextsubpage]
-\definieerpagina [\v!laatstesubpagina]  [\lastsubpage]
-\definieerpagina [\v!eerste]            [\firstpage]
-\definieerpagina [\v!vorige]            [\prevpage]
-\definieerpagina [\v!volgende]          [\nextpage]
-\definieerpagina [\v!laatste]           [\lastpage]
-\definieerpagina [\v!eerste\v!sub]      [\firstsubpage]
-\definieerpagina [\v!vorige\v!sub]      [\prevsubpage]
-\definieerpagina [\v!volgende\v!sub]    [\nextsubpage]
-\definieerpagina [\v!laatste\v!sub]     [\lastsubpage]
+%D \showsetup{\y!gotopage}
+
+\def\dodefinepage[#1][#2]%
+  {\setvalue{\v!page:::#1}{#2}}
+
+\def\definepage
+  {\dodoubleargument\dodefinepage}
+
+\definepage [\v!firstpage]      [\firstpage]
+\definepage [\v!previouspage]      [\prevpage]
+\definepage [\v!nextpage]    [\nextpage]
+\definepage [\v!lastpage]     [\lastpage]
+\definepage [\v!firstsubpage]   [\firstsubpage]
+\definepage [\v!previoussubpage]   [\prevsubpage]
+\definepage [\v!nextsubpage] [\nextsubpage]
+\definepage [\v!lastsubpage]  [\lastsubpage]
+\definepage [\v!first]            [\firstpage]
+\definepage [\v!previous]            [\prevpage]
+\definepage [\v!next]          [\nextpage]
+\definepage [\v!last]           [\lastpage]
+\definepage [\v!first\v!sub]      [\firstsubpage]
+\definepage [\v!previous\v!sub]      [\prevsubpage]
+\definepage [\v!next\v!sub]    [\nextsubpage]
+\definepage [\v!last\v!sub]     [\lastsubpage]
 
 %D Because we combine both methods, we have to take care of
 %D the \type{file::page(n)} as well as \type{page(file::n)}.
@@ -3248,7 +3252,7 @@
 %      {#2}%
 %    \fi}
 
-\definespeciallocation\v!pagina#1#2% page(n) page(+n) page(-n)
+\definespeciallocation\v!page#1#2% page(n) page(+n) page(-n)
   {\iflocation
      \ifx\currentouterreference\empty
        \splitoffreference\currentreferenceoperation
@@ -3275,8 +3279,8 @@
        \setouterlocation\currentouterreference
        \doifnonzeropositiveelse\currentinnerreference
          \donothing
-         {\doifdefinedelse{\v!pagina:::\currentinnerreference}
-            {\edef\currentinnerreference{\getvalue{\v!pagina:::\currentinnerreference}}}
+         {\doifdefinedelse{\v!page:::\currentinnerreference}
+            {\edef\currentinnerreference{\getvalue{\v!page:::\currentinnerreference}}}
             {\edef\currentinnerreference{1}}}%
        \gotorealpage\otherURL\otherfile\currentinnerreference{#2}%
      \fi
@@ -3284,18 +3288,16 @@
      {#2}%
    \fi}
 
-\def\naarpagina#1[#2]%
-  {\naar{#1}[\v!pagina(#2)]}
-
-\let\ganaarpagina=\naarpagina
+\def\gotopage#1[#2]%
+  {\goto{#1}[\v!page(#2)]}
 
 %D A still very rudimentary|/|experimental forward|/|backward
 %D reference mechanism is provided by the macro \type{\atpage}:
 %D
-%D \starttypen
+%D \starttyping
 %D ... \somewhere{backward text}{forward text}[someref] ...
-%D ... \oppagina[someref] ...
-%D \stoptypen
+%D ... \atpage[someref] ...
+%D \stoptyping
 %D
 %D In future versions there will be more sophisticated
 
@@ -3308,11 +3310,11 @@
      {\ifforwardreference
         \doifelsenothing{#1}
           {\dosymbolreference{}{}[#4]}
-          {\donaarspace{#1}[#4]}%
+          {\dogotospace{#1}[#4]}%
       \else
         \doifelsenothing{#2}
           {\dosymbolreference{}{}[#4]}
-          {\donaarspace{#2}[#4]}%
+          {\dogotospace{#2}[#4]}%
       \fi}
      {\unknownreference{#4}#1/#2}%
    \referentieinfo{<}{#4}}
@@ -3323,15 +3325,15 @@
    \doifreferencefoundelse{#1}
      {\ifrealreferencepage
         \ifforwardreference
-          \donaarfixed{\labeltext\v!hierboven}[#1]%
+          \dogotofixed{\labeltext\v!hencefore}[#1]%
         \else
-          \donaarfixed{\labeltext\v!hieronder}[#1]%
+          \dogotofixed{\labeltext\v!hereafter}[#1]%
         \fi
       \else
-        \donaarfixed{\labeltexts\v!oppagina\currentpagereference}[#1]%
+        \dogotofixed{\labeltexts\v!atpage\currentpagereference}[#1]%
       \fi}
      {\unknownreference{#1}%
-      \labeltexts\v!pagina\dummyreference}%
+      \labeltexts\v!page\dummyreference}%
    \referentieinfo{<}{#1}}
 
 %D We can cross link documents by using:
@@ -3340,16 +3342,16 @@
 %D
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \coupledocument[print][somefile][chapter,section]
-%D \stoptypen
+%D \stoptyping
 %D
 %D After which when applicable, we have available the
 %D references:
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{print version}[print::chapter]
-%D \stoptypen
+%D \stoptyping
 %D
 %D and alike. The title placement definition macros have a
 %D key \type{file}, which is interpreted as the file to jump
@@ -3371,10 +3373,10 @@
        {\startnointerference
         \doutilities{#3}{##1}{#3}\relax\relax
         \stopnointerference}%
-     \dogebruikexterndocument[#1][#2][#4]%
+     \douseexternaldocument[#1][#2][#4]%
      \doglobal\addtocommalist{#1}\crossdocumentreferences
      \def\docommando##1%
-       {\globalletvalue{\??rf##1\c!status}\v!start % for fast checking
+       {\globalletvalue{\??rf##1\c!state}\v!start % for fast checking
         \doglobal\addtocommalist{##1}\crossdocumentelements}%
      \processcommalist[#3]\docommando
      \ifutilitydone
@@ -3390,13 +3392,13 @@
 
 \def\checkcontrastreference#1%
   {\ifnum\currentreferencetype=\rt!page\ifnum\currentdatareference=\realpageno
-     \doifdefined{#1\c!contrastkleur}
-       {\setevalue{#1\c!kleur}{\getvalue{#1\c!contrastkleur}}}%
+     \doifdefined{#1\c!contrastcolor}
+       {\setevalue{#1\c!color}{\getvalue{#1\c!contrastcolor}}}%
    \fi\fi}
 
 \def\checkcontrastreference#1%
   {\ifnum\currentreferencetype=\rt!page\relax\ifnum\currentdatareference=\realpageno
-     \copycsname#1\c!kleur\endcsname\csname#1\c!contrastkleur\endcsname
+     \copycsname#1\c!color\endcsname\csname#1\c!contrastcolor\endcsname
    \fi\fi}
 
 %D Buttons are just what their names says: things that can be
@@ -3413,7 +3415,7 @@
 %D
 %D gives
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D This command is formally specified as:
 %D
@@ -3421,14 +3423,9 @@
 %D
 %D The characteristics can be set with:
 %D
-%D \showsetup{\y!stelbuttonsin}
+%D \showsetup{\y!setupbuttons}
 
-%\def\dostelbuttonsin[#1]%
-%  {\getparameters[\??bt][#1]%
-%   \dododostelinteractiemenuin{\??bt\c!onbekendeverwijzing}%
-%   \dododostelinteractiemenuin{\??bt\c!zelfdepagina}}
-
-\def\stelbuttonsin
+\def\setupbuttons
   {\dodoubleargument\getparameters[\??bt]}
 
 \definecomplexorsimpleempty\button
@@ -3443,39 +3440,12 @@
 
 \def\buttonframed{\dodoubleempty\localframed[\??bt]} % goodie
 
-% \def\dodocomplexbutton#1[#2]#3[#4]%
-%   {\bgroup
-%    \doifvalue{#1\c!status}{\v!stop}{\locationfalse}%
-%    \iflocation
-%      \resetgoto
-%      \ConvertConstantAfter\doifelse{#3}{\v!geen}
-%        {\!!doneafalse}
-%        {\!!doneatrue}%
-%      \doifelsenothing{#4} % in handleiding, is soort dummy
-%        {\if!!donea\hbox\else\hphantom\fi
-%           {\localframed[#1][#2]{#3}}}%
-%        {\doifreferencefoundelse{#4}
-%           {\setbox0=\if!!donea\hbox\else\hphantom\fi
-%              {\localframed[#1][#2]
-%                 {\checkcontrastreference{#1}%
-%                  \dolocationattributes{#1}\c!letter\c!kleur{\ignorespaces#3}}}%
-%            \startinteractie
-%           %\hbox{\gotolocation{#4}{\copy0}}%
-%            \hbox{\gotolocation{#4}{\box0}}%
-%            \stopinteractie}
-%           {\unknownreference{#4}%
-%            \if!!donea\hbox\else\hphantom\fi
-%              {\localframed[#1][#2]
-%                 {\ignorespaces#3}}}}% !!!!!!!!!!
-%    \fi
-%    \egroup}
-
 \long\def\dodocomplexbutton#1[#2]#3[#4]% #3 can contain [] -> {#3} later
   {\bgroup
-   \doifvalue{#1\c!status}\v!stop\locationfalse
+   \doifvalue{#1\c!state}\v!stop\locationfalse
    \iflocation
      \resetgoto
-     \ConvertConstantAfter\doifelse{#3}\v!geen\hphantom\hbox
+     \ConvertConstantAfter\doifelse{#3}\v!none\hphantom\hbox
        {\doifelsenothing{#4}
           {\setlocationboxnop#1[#2]{#3}[#4]}
           {\doifreferencefoundelse{#4}
@@ -3490,15 +3460,15 @@
 %D macro builds such a row based on a specification list.
 %D
 %D \startbuffer
-%D \interactiebuttons
-%D   [breedte=\hsize][pagina,VorigeSprong,VerlaatViewer]
+%D \interactionbuttons
+%D   [width=\hsize][page,PreviousJump,ExitViewer]
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
 %D gives
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Apart from individual entries, one can use \type{page} and
 %D \type {subpage} as shortcuts to their four associated buttons.
@@ -3507,67 +3477,67 @@
 
 % does not work well with for instance SomeRef{whatever}
 
-\def\interactiebuttons
-  {\dodoubleempty\dointeractiebuttons}
+\def\interactionbuttons
+  {\dodoubleempty\dointeractionbuttons}
 
-\def\dointeractiebuttons[#1][#2]% er is een verdeel macro \fractie
+\def\dointeractionbuttons[#1][#2]% er is een verdeel macro \horizontalfractions
   {\iflocation
      \bgroup
-     \doif\@@ibstatus\v!stop\locationfalse
+     \doif\@@ibstate\v!stop\locationfalse
      \iflocation
        \ifsecondargument
-         \checkinteractiebalk{1.5em}\v!ruim\!!zeropoint % brrrrr
+         \checkinteractionbar{1.5em}\v!broad\!!zeropoint % brrrrr
          \setbox2=\hbox
-           {\setupsymbolset[\@@iasymboolset]%
-            \localframed[\??ib][#1,\c!achtergrond=]{\symbol[\v!vorigepagina]}}%
+           {\setupsymbolset[\@@iasymbolset]%
+            \localframed[\??ib][#1,\c!background=]{\symbol[\v!previouspage]}}%
          \!!heighta\ht2 % needed because we default to nothing
-         \stelinteractiebalkin[#1,\c!strut=\v!nee]%
-        %\setupinteraction[\c!breedte=\!!zeropoint]%
-         \setinteractionparameter\c!breedte\!!zeropoint
+         \setupinteractionbar[#1,\c!strut=\v!no]%
+        %\setupinteraction[\c!width=\!!zeropoint]%
+         \setinteractionparameter\c!width\!!zeropoint
          \!!counta\zerocount % new, was 1
          \processallactionsinset
            [#2]
-           [       \v!pagina=>\advance\!!counta 4,
-             \v!sub\v!pagina=>\advance\!!counta 4,
+           [       \v!page=>\advance\!!counta 4,
+             \v!sub\v!page=>\advance\!!counta 4,
                   \s!unknown=>\advance\!!counta 1]%
-         \ifdim\@@ibbreedte=\!!zeropoint\relax
+         \ifdim\@@ibwidth=\!!zeropoint\relax
            \!!widtha2em
-           \advance\!!widtha \@@ibafstand  % new
+           \advance\!!widtha \@@ibdistance  % new
            \!!widthb\!!counta\!!widtha
-           \advance\!!widthb -\@@ibafstand % new
+           \advance\!!widthb -\@@ibdistance % new
          \else
-           \!!widtha\@@ibbreedte
-           \!!widthb\@@ibafstand           % new
+           \!!widtha\@@ibwidth
+           \!!widthb\@@ibdistance           % new
            \multiply\!!widthb \!!counta    % new
-           \advance\!!widthb -\@@ibafstand % new
+           \advance\!!widthb -\@@ibdistance % new
            \advance\!!widtha -\!!widthb    % new
            \divide\!!widtha \!!counta
-           \!!widthb\@@ibbreedte
+           \!!widthb\@@ibwidth
          \fi
          \def\goto##1%
            {\setnostrut
-            \setupsymbolset[\@@iasymboolset]%
+            \setupsymbolset[\@@iasymbolset]%
             \edef\localreference{##1}%
             \dodocomplexbutton\??ib
-              [\c!hoogte=\!!heighta,\c!breedte=\!!widtha]%
+              [\c!height=\!!heighta,\c!width=\!!widtha]%
               {\dontleavehmode\symbol[\localreference]}%
               [\localreference]%
             \hss}%
          \hbox to \!!widthb
            {\processallactionsinset
               [#2]
-              [    \v!pagina=>\goto\v!eerstepagina
-                              \goto\v!volgendepagina
-                              \goto\v!vorigepagina
-                              \goto\v!laatstepagina,
-             \v!sub\v!pagina=>\goto\v!eerstesubpagina
-                              \goto\v!volgendesubpagina
-                              \goto\v!vorigesubpagina
-                              \goto\v!laatstesubpagina,
+              [    \v!page=>\goto\v!firstpage
+                              \goto\v!nextpage
+                              \goto\v!previouspage
+                              \goto\v!lastpage,
+             \v!sub\v!page=>\goto\v!firstsubpage
+                              \goto\v!nextsubpage
+                              \goto\v!previoussubpage
+                              \goto\v!lastsubpage,
                   \s!unknown=>\goto\commalistelement]%
             \unskip}%
        \else
-         \interactiebuttons[][#1]%
+         \interactionbuttons[][#1]%
        \fi
      \fi
      \egroup
@@ -3578,18 +3548,18 @@
 %D
 %D For converience we provide:
 %D
-%D \starttypen
+%D \starttyping
 %D \overlaybutton[reference]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command can be used to define overlays an/or can be
 %D used in the whatevertext areas, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineoverlay[PrevPage][\overlaybutton{PrevPage}]
 %D \setupbackgrounds[page][background=PrevPage]
 %D \setuptexttexts[\overlaybutton{NextPage}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D For practical reasons, this macro accepts square brackets
 %D as well as braces.
@@ -3626,9 +3596,9 @@
 %D In previous macros we used \type {\dotextprefix} to
 %D generate a space between a label and a number.
 %D
-%D \starttypen
+%D \starttyping
 %D \dotextprefix{text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Only when \type {text} is not empty, a space is inserted.
 
@@ -3638,7 +3608,7 @@
    \setbox\scratchbox\hbox{#1}% to be solved some day
    \ifdim\wd\scratchbox>\zeropoint
      \unhbox\scratchbox
-     \iflabeltextdone\else\@@rfscheider\fi
+     \iflabeltextdone\else\@@rfseparator\fi
    \else
      \unhbox\scratchbox
    \fi
@@ -3649,48 +3619,37 @@
 %D to are typeset.
 
 \setupreferencing
-  [\c!status=\v!start,
-   \c!autofile=\v!nee,
-   \v!deel\c!nummer=\v!ja,
-   \v!hoofdstuk\c!nummer=\v!nee,
-   \c!interactie=\v!alles,
-  %\c!urlvariant=\v!beide,
-  %\c!urlspatie=\v!nee,
+  [\c!state=\v!start,
+   \c!autofile=\v!no,
+   \v!part\c!number=\v!yes,
+   \v!chapter\c!number=\v!no,
+   \c!interaction=\v!all,
+  %\c!urlalternative=\v!both,
+  %\c!urlspace=\v!no,
   %\c!urlletter=,
   %\c!urlkleur=,
-   \c!converteerfile=\v!nee,
-  %\c!strut=\v!nee, % some day an option
+   \c!convertfile=\v!no,
+  %\c!strut=\v!no, % some day an option
    \c!prefix=,
-   \c!breedte=.75\zetbreedte,
-   \c!links=\citaat\bgroup,
-   \c!rechts=\egroup,
-   \c!globaal=\v!nee,
-   \c!expansie=\v!nee,
-   \c!scheider=\nonbreakablespace]
+   \c!width=.75\makeupwidth,
+   \c!left=\quotation\bgroup,
+   \c!right=\egroup,
+   \c!global=\v!no,
+   \c!expansion=\v!no,
+   \c!separator=\nonbreakablespace]
 
 \let\nonbreakablespace=~
 
 \setupurl
-  [\c!variant=\v!beide,
-   \c!spatie=\v!nee,
-   \c!letter=\v!type,
-   \c!kleur=]
-
-%D We also set up buttons (not yet, this one calls a menu macro):
-
-% \stelbuttonsin
-%   [\c!status=\v!start,
-%    \c!breedte=\v!passend,
-%    \c!hoogte=\v!ruim,
-%    \c!offset=0.25em,
-%    \c!kader=\v!aan,
-%    \c!achtergrond=,
-%    \c!achtergrondraster=\@@rsraster,
-%    \c!achtergrondkleur=,
-%    \c!letter=\@@ialetter,
-%    \c!kleur=\@@iakleur,
-%    \c!zelfdepagina=\v!ja,
-%    \c!onbekendeverwijzing=\v!ja]
+  [\c!alternative=\v!both,
+   \c!space=\v!no,
+   \c!style=\v!type,
+   \c!color=]
+
+\setupprograms
+  [\c!directory=]
+
+%D We cannot set up buttons (not yet, this one calls a menu macro):
 
 % under consideration:
 %
@@ -3734,4 +3693,4 @@
 %
 % \stoptext
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-reg.tex b/tex/context/base/core-reg.tex
index 33a93b25d..d2461f203 100644
--- a/tex/context/base/core-reg.tex
+++ b/tex/context/base/core-reg.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-reg,
+%D   [       filefile=core-reg,
 %D        version=1999.12.27,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Register Management,
@@ -51,22 +51,22 @@
 %
 %    \registerentry  {tag} {letter}
 
-\def\dostelregisterin[#1][#2][#3]%
+\def\dosetupregister[#1][#2][#3]%
   {\ifthirdargument
-     \def\dodostelregisterin##1%
+     \def\dodosetupregister##1%
        {\getparameters[\??id##1#2][#3]%
-        \preparepaginaprefix{\??id##1}}%
+        \preparepageprefix{\??id##1}}%
    \else
-     \def\dodostelregisterin##1%
+     \def\dodosetupregister##1%
        {\getparameters[\??id##1][#2]%
-        \doifvalue{\??id##1\c!koppeling}\v!ja
-          {\appendtoks\koppelregister[##1][#2]\to\everystarttext}%
-        \preparepaginaprefix{\??id##1}}%
+        \doifvalue{\??id##1\c!coupling}\v!yes
+          {\appendtoks\coupleregister[##1][#2]\to\everystarttext}%
+        \preparepageprefix{\??id##1}}%
    \fi
-   \processcommalist[#1]\dodostelregisterin}
+   \processcommalist[#1]\dodosetupregister}
 
-\def\stelregisterin
-  {\dotripleempty\dostelregisterin}
+\def\setupregister
+  {\dotripleempty\dosetupregister}
 
 \def\getlastregisterentry#1%
   {\def\docommando##1%
@@ -80,7 +80,7 @@
    \ifduplicate\getlastregisterentry{#3}\fi
    \convertexpanded{\??id\currentregister}{#3}\asciiregisterentry
    \makesectionformat
-   \doifelsevalue{\??id\currentregister\c!eigennummer}\v!ja
+   \doifelsevalue{\??id\currentregister\c!ownnumber}\v!yes
      \donetrue\donefalse
    % the spaces between } { are essential for texutil's split
    \edef\schrijfwegnaarregister%
@@ -101,7 +101,7 @@
 \def\doregister#1%
   {\chardef\registerpagestatus\plusone
    \def\currentregister{#1}%
-   \doifelsevalue{\??id\currentregister\c!eigennummer}\v!ja
+   \doifelsevalue{\??id\currentregister\c!ownnumber}\v!yes
      {\dosingleempty\dodoregister}
      {\dosingleempty\donoregister}}
 
@@ -200,12 +200,12 @@
 %  {\edef\currentregister{#1}%    % om gebruik van \ExpandBothAfter
 %   \doprocesspageregister}       % mogelijk te maken
 
-\def\doschrijfnaarregister[#1]%  % de twee-traps-aanroep is nodig
+\def\dowritetoregister[#1]%  % de twee-traps-aanroep is nodig
   {\edef\currentregister{#1}%    % om gebruik van \ExpandBothAfter
    \doprocesspageregister{}}     % mogelijk te maken
 
-\def\schrijfnaarregister
-  {\dodoubleempty\doschrijfnaarregister}
+\def\writetoregister
+  {\dodoubleempty\dowritetoregister}
 
 \def\ifregistergeplaatst{\ifutilitydone}
 
@@ -229,7 +229,7 @@
 \def\setregisterpage#1%
   {\let\registerpageseparator\empty
    \processaction
-     [\getvalue{\??id#1\c!symbool}]
+     [\getvalue{\??id#1\c!symbol}]
      [      \c!n=>{\def\doregisterpage##1[##2]%
                      {\doregisterpagelocation{#1}{\registerpagenumber}\/}},
             \c!a=>{\def\doregisterpage##1[##2]%
@@ -238,8 +238,8 @@
                      {\doregisterpagelocation{#1}{$\bullet$}}},
                2=>{\def\doregisterpage##1[##2]%
                      {\doregisterpagelocation{#1}{\vrule\!!width1em\!!height1ex\!!depth\!!zeropoint}}},
-         \v!geen=>{\def\doregisterpage##1[##2]{}},%
-      \s!unknown=>{\def\registerpagesymbol{\getvalue{\??id#1\c!symbool}}%
+         \v!none=>{\def\doregisterpage##1[##2]{}},%
+      \s!unknown=>{\def\registerpagesymbol{\getvalue{\??id#1\c!symbol}}%
                    \def\doregisterpage##1[##2]%
                      {\doregisterpagelocation{#1}{\registerpagesymbol}}},
       \s!default=>{\def\registerpageseparator%
@@ -247,7 +247,7 @@
                    \def\doregisterpage##1[##2]%
                      {\doregisterpagehowto{##1}
                         {\strut
-                         \paginaprefix{\??id##1}[##2]%
+                         \pageprefix{\??id##1}[##2]%
                          \translatednumber[##2]}}}]}
 
 \let\registerpagehowto\empty
@@ -258,13 +258,13 @@
    \def\registertexthowto{#2}}%
 
 \def\doregistertexthowto#1#2%
-  {\dostartattributes{\??id#1\registertexthowto}\c!tekstletter\c!tekstkleur{}%
-   \getvalue{\??id#1\c!tekstcommando}{#2}%
+  {\dostartattributes{\??id#1\registertexthowto}\c!textstyle\c!textcolor{}%
+   \getvalue{\??id#1\c!textcommand}{#2}%
    \dostopattributes}
 
 \def\doregisterpagehowto#1#2%
-  {\dostartattributes{\??id#1\registerpagehowto}\c!paginaletter\c!paginakleur{}%
-   \getvalue{\??id#1\c!paginacommando}{#2}%
+  {\dostartattributes{\??id#1\registerpagehowto}\c!pagestyle\c!pagecolor{}%
+   \getvalue{\??id#1\c!pagecommand}{#2}%
    \dostopattributes}
 
 \def\registerentry #1{\executeifdefined{#1\s!entry }\gobbleoneargument  }
@@ -300,10 +300,10 @@
 \chardef\lastregisterpagestatus=0
 
 \def\limitedregisterentry#1#2%
-  {\getvalue{\??id#1\c!tekstcommando}%
-     {\doifelsenothing{\??id#1\c!maxbreedte}
+  {\getvalue{\??id#1\c!textcommand}%
+     {\doifelsenothing{\??id#1\c!maxwidth}
         {#2}
-        {\limitatetext{#2}{\getvalue{\??id#1\c!maxbreedte}}{\unknown}}}}
+        {\limitatetext{#2}{\getvalue{\??id#1\c!maxwidth}}{\unknown}}}}
 
 \def\dosetpageregisterpage#1#2#3#4#5#6%
   {\doifreglevelelse[#5]{\dodosetpageregisterpage{#1}{#2}{#3}{#4}{#5}{#6}}{}}
@@ -347,7 +347,7 @@
 %       \donefalse % waiting for "to" pagenumber
 %     \else
 %       \registerpageseparator
-%       |\spatie|\relax % \relax needed because | looks ahead
+%       |\space|\relax % \relax needed because | looks ahead
 %       \donetrue
 %     \fi\fi\fi
 %     \ifdone
@@ -384,7 +384,7 @@
        \egroup
        \!!doneafalse}%
     \!!doneafalse
-    \doifelsevalue{\??id#2\c!interactie}\v!tekst
+    \doifelsevalue{\??id#2\c!interaction}\v!text
       {\ifcase\currententrylevel                 \or
          \!!doneatrue\c!entrya\c!entryb\c!entryc \or
          \c!entrya\!!doneatrue\c!entryb\c!entryc \or
@@ -398,7 +398,7 @@
    % \global\firstregisterentrytrue
     \iffirstregisterpage
       \global\chardef\lastregisterpagestatus\zerocount
-      \expandafter\hskip\getvalue{\??id#2\c!afstand}\relax
+      \expandafter\hskip\getvalue{\??id#2\c!distance}\relax
       \donetrue
     \else\ifnum#1=3
       |--|\relax % -- !
@@ -407,11 +407,11 @@
       \donefalse % waiting for "to" pagenumber
     \else
       \registerpageseparator
-      |\spatie|\relax % \relax needed because | looks ahead
+      |\space|\relax % \relax needed because | looks ahead
       \donetrue
     \fi\fi\fi
     \ifdone
-      \doifelsevalue{\??id#2\c!interactie}\v!paginanummer
+      \doifelsevalue{\??id#2\c!interaction}\v!pagenumber
         {\bgroup
          \setbox0\hbox
            {\showlocation{\doregisterpage{#2}[#5]\ifnum#1=2\/\fi}}%
@@ -431,7 +431,7 @@
          {\doregistertexthowto{#1}{\strut\limitedregisterentry{#1}{##1}}}%
        \getvalue
          {#1\ifcase\currententrylevel\s!entrya\or\s!entryb\else\s!entryc\fi}%
-         {\doregisterpagehowto{#1}{\labeltexts\v!zie{#3}}}%
+         {\doregisterpagehowto{#1}{\labeltexts\v!see{#3}}}%
        \c!entryletter\c!entrya\c!entryb\c!entryc
        \global\let\c!entrya\relax
        \global\let\c!entryb\relax
@@ -447,35 +447,35 @@
 
 \def\doregistercharacter[#1]#2%
   {\global\firstregisterentrytrue
-   \doifelsevalue{\??id#1\c!aanduiding}\v!ja
+   \doifelsevalue{\??id#1\c!indicator}\v!yes
      {\executeifdefined
-        {\strippedcsname\doregistercharacter\getvalue{\??id#1\c!variant}}%
+        {\strippedcsname\doregistercharacter\getvalue{\??id#1\c!alternative}}%
         \doregistercharactera
         [#1]{#2}}
      {\noregistercharacter[#1]{#2}}}
 
 \def\noregistercharacter[#1]#2%
-  {\getvalue{\??id#1\c!voor}%
+  {\getvalue{\??id#1\c!before}%
    \goodbreak}
 
 % a = <before> <goodbreak> <character> <par> <after> <nobreak>
 
 \def\doregistercharactera[#1]#2%
-  {\getvalue{\??id#1\c!voor}%
+  {\getvalue{\??id#1\c!before}%
    \vskip\lineheight\goodbreak\vskip-\lineheight
    \ifhmode\unskip\else\noindent\fi % brrr
-   \getvalue{\??id#1\c!commando}{\doattributes{\??id#1}\c!letter\c!kleur{\strut\ignorespaces#2}}%
-   \getvalue{\??id#1\c!na}%
+   \getvalue{\??id#1\c!command}{\doattributes{\??id#1}\c!style\c!color{\strut\ignorespaces#2}}%
+   \getvalue{\??id#1\c!after}%
    \par\nobreak}
 
 % b = <goodbreak> <before> <character> <after> <nobreak>
 
 \def\doregistercharacterb[#1]#2% here no lineheight hackery ! ! !
-  {\getvalue{\??id#1\c!voor}%
+  {\getvalue{\??id#1\c!before}%
    \ifhmode\unskip\else\noindent\fi % brrr
-   \getvalue{\??id#1\c!commando}%
-     {\doattributes{\??id#1}\c!letter\c!kleur{\strut\ignorespaces#2}}%
-   \getvalue{\??id#1\c!na}%
+   \getvalue{\??id#1\c!command}%
+     {\doattributes{\??id#1}\c!style\c!color{\strut\ignorespaces#2}}%
+   \getvalue{\??id#1\c!after}%
    \nobreak}
 
 \def\doregistercharacterA[#1]#2{\doregistercharactera[#1]{\WORD{#2}}}
@@ -485,7 +485,7 @@
 %D \type {#2} can be \type {\string} itself.
 
 \def\doregisterreference[#1]#2%
-  {\doifvalue{\??id#1\c!refereren}\v!aan
+  {\doifvalue{\??id#1\c!referencing}\v!on
      {\pagereference[#1:#2]}}
 
 \def\dosetpageregisterletter#1#2%
@@ -609,7 +609,7 @@
       % aangepast
       \def\dodocommando[##1-##2]%
         {\gotonextinternal{\s!ind}{##1}{##2}{\box0}}%
-      \doifelsevalue{\??id#1\c!interactie}\v!paginanummer
+      \doifelsevalue{\??id#1\c!interaction}\v!pagenumber
         {\limitedregisterentry{#1}{#2}} % paginanummer
         {{\setbox0\hbox{\limitedregisterentry{#1}{\begstrut#2}}%
           \ifx\firstlistreference\empty  % tekst,alles
@@ -621,9 +621,9 @@
           \else
             \expandafter\dodocommando\expandafter[\firstlistreference]%
           \fi}}%
-      \doifvalue{\??id#1\c!nummer}\v!ja
-        {\hskip\getvalue{\??id#1\c!afstand}(\commalistsize)}%
-      \doifnotvalue{\??id#1\c!interactie}\v!tekst % paginanummer,alles
+      \doifvalue{\??id#1\c!number}\v!yes
+        {\hskip\getvalue{\??id#1\c!distance}(\commalistsize)}%
+      \doifnotvalue{\??id#1\c!interaction}\v!text % paginanummer,alles
         {\def\docommando##1##2%
            {{\setbox0\hbox{\showlocation{\hbox to 1em{\hss\symbol[##2]\hss}}}%
              \ifx##1\empty
@@ -631,10 +631,10 @@
              \else
                \expandafter\dodocommando\expandafter[##1]%
              \fi}}%
-         \hskip\getvalue{\??id#1\c!afstand}%
-         \docommando\firstlistreference\v!vorige
-         \docommando\midlistreference\v!ergens
-         \docommando\lastlistreference\v!volgende}%
+         \hskip\getvalue{\??id#1\c!distance}%
+         \docommando\firstlistreference\v!previous
+         \docommando\midlistreference\v!somewhere
+         \docommando\lastlistreference\v!next}%
       % tot hier
     \else
 % \endgraf
@@ -644,7 +644,7 @@
 \endgraf}
 
 \def\dosetregister#1%
-  {\doifelsevalue{\??id#1\c!koppeling}\v!ja
+  {\doifelsevalue{\??id#1\c!coupling}\v!yes
      {\ifautoregisterhack
         \dosetautoregister{#1}%
       \else
@@ -696,12 +696,12 @@
         {}}%
 \fi}
 
-\def\dokoppelregister[#1][#2]%
+\def\docoupleregister[#1][#2]%
   {\iflocation
      \ifcase0\countervalue{autolink:#1}\relax % only once
        \begingroup
        \let\dosetregister\doloadregisterlinks
-       \stelregisterin[#1][#2]%
+       \setupregister[#1][#2]%
        \doutilities{#1}\jobname{#1}\relax\relax
        \endgroup
        \ifautoregisterhack
@@ -712,8 +712,8 @@
      \fi
    \fi}
 
-\def\koppelregister
-  {\dodoubleempty\dokoppelregister}
+\def\coupleregister
+  {\dodoubleempty\docoupleregister}
 
 \def\dodocommandoprolinrefAA[#1-#2]%
   {\def\lastlistreference{#1-#2}}
@@ -741,7 +741,7 @@
 \def\docommandoprolinrefB#1#2#3%
   {\bgroup
    \ifx#2\empty
-     \doifvalue{\??id#1\c!onbekendeverwijzing}\v!leeg{\hskip1em}%
+     \doifvalue{\??id#1\c!unknownreference}\v!empty{\hskip1em}%
    \else
      \setbox0\hbox to 1em{\hss\showlocation{\symbol[#3]}\hss}%
      \expandafter\dodocommandoprolinrefB\expandafter[#2]%
@@ -770,14 +770,14 @@
          \let\prevlistreference\empty
          \let\nextlistreference\empty
        \fi
-       \setalignmentswitch{\getvalue{\??id#1\c!plaats}}%
+       \setalignmentswitch{\getvalue{\??id#1\c!location}}%
        \ifcase\alignmentswitch
          % links
-         \docommandoprolinrefB{#1}\prevlistreference\v!vorige
-         \docommandoprolinrefB{#1}\nextlistreference\v!volgende
+         \docommandoprolinrefB{#1}\prevlistreference\v!previous
+         \docommandoprolinrefB{#1}\nextlistreference\v!next
        \or
          % midden
-         \docommandoprolinrefB{#1}\prevlistreference\v!vorige
+         \docommandoprolinrefB{#1}\prevlistreference\v!previous
        \or
          % rechts
        \fi
@@ -790,11 +790,11 @@
          % links
        \or
          % midden
-         \docommandoprolinrefB{#1}\nextlistreference\v!volgende
+         \docommandoprolinrefB{#1}\nextlistreference\v!next
        \or
          % rechts
-         \docommandoprolinrefB{#1}\prevlistreference\v!vorige
-         \docommandoprolinrefB{#1}\nextlistreference\v!volgende
+         \docommandoprolinrefB{#1}\prevlistreference\v!previous
+         \docommandoprolinrefB{#1}\nextlistreference\v!next
        \fi}}
 
 \def\dodolinkedregister[#1][#2]#3% page auto link
@@ -839,11 +839,11 @@
      \pagereference[-:\s!lin:\internallistreference]%
      \pluscounter{autolink:#1}%
      \bgroup
-    %\setupinteraction[\c!kleur=,\c!contrastkleur=,\c!letter=]% kan sneller
-     \resetinteractionparameter\c!kleur
-     \resetinteractionparameter\c!contrastkleur
-     \resetinteractionparameter\c!letter
-     \naarbox
+    %\setupinteraction[\c!color=,\c!contrastcolor=,\c!style=]% kan sneller
+     \resetinteractionparameter\c!color
+     \resetinteractionparameter\c!contrastcolor
+     \resetinteractionparameter\c!style
+     \gotobox
        {\limitedregisterentry{#1}{\begstrut#2}}%
        [JS(SetRegisterEntry{\v!register,\countervalue{autolink:#1},#2,{\alllistreferences}})]%
      \egroup
@@ -865,8 +865,8 @@
 
 %D The first implementation used one main field with clones.
 %D In a 2500 page document this resulted in a rather (anoying)
-%D long start||up time. This \citeer {every page its own field}
-%D solution, combined with a \citeer {page open action}, works
+%D long start||up time. This \quote {every page its own field}
+%D solution, combined with a \quote {page open action}, works
 %D much faster, but is conceptually pretty weak.
 
 \def\complexregisterfield[#1]%
@@ -880,123 +880,117 @@
 
 \setupfield
   [\v!register]
-  [\c!breedte=10em,
-   \c!hoogte=3ex,
-   \c!uitlijnen=\v!midden,
-   \c!optie=\v!alleenleesbaar,
-   \c!plaats=\v!laag]
+  [\c!width=10em,
+   \c!height=3ex,
+   \c!align=\v!middle,
+   \c!option=\v!readonly,
+   \c!location=\v!low]
 
 \def\doinitializeautoregister#1%
   {\useJSscripts[reg]%
    \useJSpreamblenow{LinkedRegisters}%
-   \setupinteraction[\c!openpaginaactie=JS(UpdateRegisterField{\v!register})]%
+   \setupinteraction[\c!openpageaction=JS(UpdateRegisterField{\v!register})]%
    \definereference[\v!reset   \v!register][JS(ResetRegisterEntry{\v!register})]%
-   \definereference[\v!eerste  \v!register][JS(GotoFirstRegisterEntry{\v!register})]%
-   \definereference[\v!vorige  \v!register][JS(GotoPreviousRegisterEntry{\v!register})]%
-   \definereference[\v!volgende\v!register][JS(GotoNextRegisterEntry{\v!register})]%
-   \definereference[\v!laatste \v!register][JS(GotoLastRegisterEntry{\v!register})]}
+   \definereference[\v!first  \v!register][JS(GotoFirstRegisterEntry{\v!register})]%
+   \definereference[\v!previous  \v!register][JS(GotoPreviousRegisterEntry{\v!register})]%
+   \definereference[\v!next\v!register][JS(GotoNextRegisterEntry{\v!register})]%
+   \definereference[\v!last \v!register][JS(GotoLastRegisterEntry{\v!register})]}
 
 \def\doinitializelinkregister#1%
   {}
 
 % todo ruwe register
 
-\def\plaatsregister
-  {\dosingleargument\doplaatsregister}
-
-\def\doplaatsregister[#1]%
-  {\def\currentregister{#1}%
-   \complexorsimpleempty\doplaatsregister}
-
-\def\complexdoplaatsregister[#1]%
-  {\begingroup
-   \stelregisterin[\currentregister][#1]%
-   \raggedright
-   \startcolumns
-     [\c!n=\getvalue{\??id\currentregister\c!n},
-      \c!balanceren=\getvalue{\??id\currentregister\c!balanceren},
-      \c!uitlijnen=\getvalue{\??id\currentregister\c!uitlijnen}]%
-   \mindermeldingen
-   \startopelkaar[\v!blanko]%
-   \doutilities\currentregister\jobname\currentregister\relax\par
-   \stopopelkaar
-   \stopcolumns
-   \endgroup}
-
-% \def\complexdovolledigregister[#1]% \@EA's kunnen weg
-%   {\@EA\plaatsvolledig\@EA{\@EA\systemsuppliedchapter\@EA}%
-%      \@EA{\@EA\currentregister\@EA}%
-%      \@EA{\@EA\headtext\@EA{\currentregister}}%
-%      {\complexdoplaatsregister[#1]}}
-
-\def\complexdovolledigregister[#1]% the expansion is needed because we don't want
-   {\expanded                     % \v!'s in the tuo file (french)
-      {\plaatsvolledig
-         {\noexpand\systemsuppliedchapter}%
-         {\currentregister}%
-         {\noexpand\headtext{\currentregister}}%
-         {\noexpand\complexdoplaatsregister[#1]}}}
-
-\def\dovolledigregister[#1]%
-  {\def\currentregister{#1}%
-   \complexorsimpleempty\dovolledigregister}
+\def\placeregister
+  {\dodoubleempty\doplaceregister}
+
+\def\doplaceregister[#1][#2]%
+  {\iffirstargument
+     \begingroup
+     \def\currentregister{#1}%
+     \setupregister[\currentregister][#2]%
+     \raggedright
+     \startcolumns
+       [\c!n=\getvalue{\??id\currentregister\c!n},
+        \c!balance=\getvalue{\??id\currentregister\c!balance},
+        \c!align=\getvalue{\??id\currentregister\c!align}]%
+     \dontcomplain
+     \startpacked[\v!blank]%
+     \doutilities\currentregister\jobname\currentregister\relax\par
+     \stoppacked
+     \stopcolumns
+     \endgroup
+   \fi}
 
-\def\volledigregister
-  {\dosingleargument\doplaatsregister}
+\def\completeregister
+  {\dodoubleempty\doplaceregister}
+
+\def\docompleteregister[#1][#2]%
+  {\iffirstargument
+     \begingroup
+     \def\currentregister{#1}%
+     \expanded % the expansion is needed because we don't want \v!'s in the tuo file (french)
+       {\plaatsvolledig
+          {\noexpand\systemsuppliedchapter}%
+          {\currentregister}%
+          {\noexpand\headtext{\currentregister}}%
+          {\noexpand\placeregister[\currentregister][#2]}}%
+     \endgroup
+   \fi}
 
-\def\dodefinieerregister[#1][#2]%
-  {\stelregisterin[#1]%
+\def\dodefineregister[#1][#2]%
+  {\setupregister[#1]%
      [\c!n=2,
-      \c!balanceren=\v!ja,  % \v!nee komt niet zo vaak voor
-      \c!uitlijnen=\v!nee,
-      \c!voor=\blanko,      % binnen kolommen: \blanko[\v!regel]
-      \c!na=,
-      \c!symbool=,
-      \c!interactie=\v!paginanummer,
-      \c!variant=\v!a,
-      \c!afstand=1em,
-      \c!letter=\v!vet,
-      \c!paginaletter=\v!schuin,
-      \c!aanduiding=\v!ja,
-      \v!deel\v!nummer=\v!ja, % v
-      \v!hoofdstuk\c!nummer=\v!nee,
-      \c!criterium=\v!alles,
-      \c!commando=,
-      \c!refereren=\v!aan,
-      \c!plaats=\v!midden,
-      \c!maxbreedte=,
-      \c!nummer=\v!nee,
-      \c!onbekendeverwijzing=\v!leeg,
-      \c!expansie=]%
+      \c!balance=\v!yes,  % \v!no komt niet zo vaak voor
+      \c!align=\v!no,
+      \c!before=\blank,      % binnen kolommen: \blank[\v!line]
+      \c!after=,
+      \c!symbol=,
+      \c!interaction=\v!pagenumber,
+      \c!alternative=\v!a,
+      \c!distance=1em,
+      \c!style=\v!bold,
+      \c!pagestyle=\v!slanted,
+      \c!indicator=\v!yes,
+      \v!part\v!number=\v!yes, % v
+      \v!chapter\c!number=\v!no,
+      \c!criterium=\v!all,
+      \c!command=,
+      \c!referencing=\v!on,
+      \c!location=\v!middle,
+      \c!maxwidth=,
+      \c!number=\v!no,
+      \c!unknownreference=\v!empty,
+      \c!expansion=]%
    \presetheadtext[#1=\Word{#1}]%
    \setvalue{#1}%
      {\doregister{#1}}%
-   \setvalue{\e!gekoppelde#1}%
+   \setvalue{\e!coupled#1}%
      {\dolinkedregister{#1}}%
    \setvalue{\s!set#1}%
      {\dosetregister{#1}}%
    \setvalue{\s!reset#1}%
      {\doresetregister{#1}}%
    \addutilityreset{#1}%
-   \setvalue{\e!zie#1}%
+   \setvalue{\e!see#1}%
      {\dozieregister{#1}}%
-   \setvalue{\e!plaats#1}%
-     {\doplaatsregister[#1]}%
-   \setvalue{\e!volledige#1}%
-     {\dovolledigregister[#1]}%
-   \setvalue{\e!stel#1\e!in}[##1]%
+   \setvalue{\e!place#1}%
+     {\doplaceregister[#1]}%
+   \setvalue{\e!complete#1}%
+     {\docompleteregister[#1]}%
+   \setvalue{\e!setup#1\e!in}[##1]%
      {\getparameters[\??id#1][##1]}}
 
-\def\definieerregister%
-  {\dodoubleargument\dodefinieerregister}
+\def\defineregister%
+  {\dodoubleargument\dodefineregister}
 
 \def\registerlengte{\utilityregisterlength}
 
 \def\utilityregisterlength{0}
 
-\def\dobepaalregisterkenmerken[#1][#2]%
+\def\dodetermineregistercharacteristics[#1][#2]%
   {\begingroup
-   \stelregisterin[#1][#2]%
+   \setupregister[#1][#2]%
    \dosetreglevel{#1}%
    \setvalue{#1\s!from}%
      {\getvalue{#1\s!page}}%
@@ -1015,14 +1009,14 @@
      \resetsystemmode\v!register
    \fi}
 
-\def\bepaalregisterkenmerken
-  {\dodoubleempty\dobepaalregisterkenmerken}
+\def\determineregistercharacteristics
+  {\dodoubleempty\dodetermineregistercharacteristics}
 
-\definieerregister
+\defineregister
   [\v!index]
   [\v!indices]
 
-% \stelregisterin[index][koppeling=ja]
+% \setupregister[index][koppeling=ja]
 %
 % \stelveldenin
 %   [register][achtergrond=raster,kader=uit]
@@ -1051,4 +1045,4 @@
 %
 % \volledigeindex
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-rul.tex b/tex/context/base/core-rul.tex
index 202511786..55579d861 100644
--- a/tex/context/base/core-rul.tex
+++ b/tex/context/base/core-rul.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-rul,
+%D   [       filefile=core-rul,
 %D        version=1998.10.16,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Ruled Stuff Handling,
@@ -57,11 +57,11 @@
 %D as give access to more suitable methods of rendering. Such a
 %D method looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\methodegraybox
 %D     \width#1\height#2\depth#3\raster#4\corner#5\radius#6\\%
 %D   { ... }
-%D \stoptypen
+%D \stoptyping
 %D
 %D The string \type{graybox} is a common element in the name,
 %D so we can have for instance \type {\postscriptgraybox} or
@@ -72,32 +72,32 @@
 %D
 %D \startbuffer
 %D \periodgraybox
-%D   \width.5\hsize\height1cm\depth0cm\raster.85\corner\v!nee\radius0pt\\
+%D   \width.5\hsize\height1cm\depth0cm\raster.85\corner\v!no\radius0pt\\
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
 %D becomes:
 %D
-%D %\startregelcorrectie
-%D %  \vbox to 1cm{\haalbuffer}
-%D %\stopregelcorrectie
+%D %\startlinecorrection
+%D %  \vbox to 1cm{\getbuffer}
+%D %\stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D   \unprotect
 %D   \vbox to 1cm
-%D     {\getvalue{\v!punt graybox}%
-%D        \width.5\hsize\height1cm\depth0cm\raster.85\corner\v!nee\radius0pt\\}
+%D     {\getvalue{period graybox}%
+%D        \width.5\hsize\height1cm\depth0cm\raster.85\corner\v!no\radius0pt\\}
 %D   \protect
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D There are two predefined methodes, one uses periods and the
 %D other uses small rules. The second method is less
 %D efficient, but sometimes give better results. The dimensions
 %D of the resullting box are set to zero.
 
-\setvalue{\v!punt graybox}{\processraster\symbol\rasterdot}
-\setvalue{\v!lijn graybox}{\processraster\symbol\rasterbox}
+\setvalue{\v!dot graybox}{\processraster\symbol\rasterdot}
+\setvalue{\v!rule graybox}{\processraster\symbol\rasterbox}
 
 \def\rasterdot{\rasterfont.}
 \def\rasterbox{\hss\vrule\!!width.4pt\!!height.4pt\!!depth\zeropoint}
@@ -116,7 +116,7 @@
     \symbol#1\width#2\height#3\depth#4\raster#5\corner#6\radius#7\\%
   {\bgroup
    \forgetall
-   \mindermeldingen
+   \dontcomplain
    \dimen10=\onepoint
    \dimen10=\@@rsfactor\dimen10
    \dimen10=#5\dimen10
@@ -146,7 +146,7 @@
 %D The most appropriate way to call for this feature is
 %D using \type{\graybox}, which is defined as:
 
-\def\graybox{\getvalue{\@@rsmethode graybox}}
+\def\graybox{\getvalue{\@@rsmethod graybox}}
 
 %D This macro takes the five arguments mentioned earlier and
 %D obey the user's settings.
@@ -156,13 +156,13 @@
 %D terms of speed, memory usage and file size, to use a driver
 %D supported method.
 
-\setvalue{\v!extern graybox}\width#1\height#2\depth#3\raster#4\corner#5\radius#6\\%
+\setvalue{\v!external graybox}\width#1\height#2\depth#3\raster#4\corner#5\radius#6\\%
   {\setgraybox\width#1\height#2\depth#3\raster#4\corner#5\radius#6\\}
 
 %D For compatibility reasons we also define the original one:
 
 \setvalue{\v!postscript graybox}%
-  {\getvalue{\v!extern graybox}}
+  {\getvalue{\v!external graybox}}
 
 %D A quite valid way of letting drivers do the job, is giving
 %D a solid rule a gray texture.
@@ -186,7 +186,7 @@
 
 \def\dofilledbox\width#1\height#2\depth#3\corner#4\radius#5\\%
   {\bgroup
-   \doifelse{#4}\v!rond
+   \doifelse{#4}\v!round
      {\dimen0=#5\relax   % just in case of .x\bodyfontsize
       \ifzeropt\dimen0
         \dofilledlinedbox\width#1\height#2\depth#3\\%
@@ -200,7 +200,7 @@
   {\vrule\!!width#1\!!height#2\!!depth#3}%
 
 \def\dofilledroundbox\width#1\height#2\depth#3\radius#4\\%
-  {\ovalbox{#1}{#2}{#3}\ruledlinewidth{#4}\v!uit\v!aan}
+  {\ovalbox{#1}{#2}{#3}\ruledlinewidth{#4}\v!off\v!on}
 
 \def\ovalbox#1#2#3#4#5#6#7% direct #1 etc passeren
   {\bgroup
@@ -209,10 +209,10 @@
    \scratchdimen#3\edef\ovaldep{\the\scratchdimen}%
    \scratchdimen#4\edef\ovallin{\the\scratchdimen}%
    \scratchdimen#5\edef\ovalrad{\the\scratchdimen}%
-   \doifelse{#6}\v!aan           % will be a macro that handles
+   \doifelse{#6}\v!on           % will be a macro that handles
      {\let\ovalstr\!!plusone}    % start, stop, ja, nee, aan, uit
      {\let\ovalstr\!!zerocount}% % and something \doif
-   \doifelse{#7}\v!aan
+   \doifelse{#7}\v!on
      {\let\ovalfil\!!plusone}
      {\let\ovalfil\!!zerocount}%
    \doovalbox\ovalwid\ovalhei\ovaldep\ovallin\ovalrad\ovalstr\ovalfil
@@ -258,10 +258,10 @@
 %D \startbuffer[tmp-1]
 %D \defineoverlay
 %D   [fancy]
-%D   [{\externfiguur
+%D   [{\externalfigure
 %D       [mp-cont.502]
-%D       [breedte=\overlaywidth,
-%D        hoogte=\overlayheight]}]
+%D       [width=\overlaywidth,
+%D        height=\overlayheight]}]
 %D \stopbuffer
 %D
 %D \typebuffer[tmp-1]
@@ -269,15 +269,15 @@
 %D  That for instance can be uses in:
 %D
 %D  \startbuffer[tmp-2]
-%D  \omlijnd[achtergrond=fancy]{How Fancy!}
-%D  \omlijnd[achtergrond=fancy,kader=uit]{Even More Fancy!}
+%D  \framed[backgroundachtergrond=fancy]{How Fancy!}
+%D  \framed[backgroundachtergrond=fancy,frame=off]{Even More Fancy!}
 %D  \stopbuffer
 %D
 %D  and looks like:
 %D
-%D  \startregelcorrectie
-%D  \vbox{\baselineskip24pt\haalbuffer[tmp-1]\haalbuffer[tmp-2]}
-%D  \stopregelcorrectie
+%D  \startlinecorrection
+%D  \vbox{\baselineskip24pt\getbuffer[tmp-1]\getbuffer[tmp-2]}
+%D  \stoplinecorrection
 %D
 %D The formal definition is:
 %D
@@ -288,18 +288,18 @@
 %D setting of the width, height and depth variables.
 %D Multiple backgrounds are possible and are specified as:
 %D
-%D \starttypen
-%D \omlijnd[achtergrond={one,two,three}]{Three backgrounds!}
-%D \stoptypen
+%D \starttyping
+%D \framed[background={one,two,three}]{Three backgrounds!}
+%D \stoptyping
 %D
 %D Most drawing packages only know width and height. Therefore
 %D the dimensions have a slightly different meaning here:
 %D
-%D \startopsomming[opelkaar]
-%D \som \type{\overlaywidth }: width of the overlay
-%D \som \type{\overlayheight}: height plus depth of the overlay
-%D \som \type{\overlaydepth }: depth of the overlay
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item \type{\overlaywidth }: width of the overlay
+%D \item \type{\overlayheight}: height plus depth of the overlay
+%D \item \type{\overlaydepth }: depth of the overlay
+%D \stopitemize
 %D
 %D The resulting box is lowered to the right depth.
 
@@ -401,10 +401,10 @@
 
 %D We predefine two already familiar backgrounds:
 
-\setvalue{\??ov\v!raster}#1#2#3#4#5#6#7%
+\setvalue{\??ov\v!screen}#1#2#3#4#5#6#7%
   {\graybox\width#1\height#2\depth#3\raster#5\corner#6\radius#7\\}
 
-\setvalue{\??ov\v!kleur}#1#2#3#4#5#6#7%
+\setvalue{\??ov\v!color}#1#2#3#4#5#6#7%
   {\colorbox\width#1\height#2\depth#3\color#4\corner#6\radius#7\\}
 
 %D After all these preparations, the background macro does no
@@ -412,11 +412,11 @@
 %D macro starts up a call chain, depending on the background
 %D one needs:
 %D
-%D \startopsomming[opelkaar]
-%D \som a raster, color or user defined shape
-%D \som square or round corners
-%D \som a \TEX\ or driver based method
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item a raster, color or user defined shape
+%D \item square or round corners
+%D \item a \TEX\ or driver based method
+%D \stopitemize
 %D
 %D The macro can be extended by adding commands to the token
 %D list register \type {\everybackgroundbox}. For this
@@ -480,7 +480,7 @@
 %D One can explictly insert the foreground box. For that
 %D purpose we introduce the overlay \type {foreground}.
 
-\defineoverlay[\v!voorgrond][\foregroundbox]
+\defineoverlay[\v!foreground][\foregroundbox]
 
 %D We can specify overlays as a comma separated list of
 %D overlays, a sometimes handy feature.
@@ -521,7 +521,7 @@
 
 \def\dostrokedbox\width#1\height#2\depth#3\corner#4\radius#5\toggle#6\\%
   {\bgroup
-   \doifelse{#4}\v!rond
+   \doifelse{#4}\v!round
      {\dimen0=#5\relax   % just in case of .x\bodyfontsize
       \ifzeropt\dimen0
         \dostrokedlinedbox\width#1\height#2\depth#3\toggle#6\\%
@@ -554,18 +554,18 @@
 
 \def\@@frame@@{@@frame@@}
 
-\setvalue{t\@@frame@@\v!aan\v!aan}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
-\setvalue{t\@@frame@@\v!uit\v!aan}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
-      \setvalue{t\@@frame@@\v!aan}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
-\setvalue{b\@@frame@@\v!aan\v!aan}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
-\setvalue{b\@@frame@@\v!uit\v!aan}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
-      \setvalue{b\@@frame@@\v!aan}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
-\setvalue{l\@@frame@@\v!aan\v!aan}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
-\setvalue{l\@@frame@@\v!uit\v!aan}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
-      \setvalue{l\@@frame@@\v!aan}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
-\setvalue{r\@@frame@@\v!aan\v!aan}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
-\setvalue{r\@@frame@@\v!uit\v!aan}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
-      \setvalue{r\@@frame@@\v!aan}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
+\setvalue{t\@@frame@@\v!on\v!on}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
+\setvalue{t\@@frame@@\v!off\v!on}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
+      \setvalue{t\@@frame@@\v!on}{\hrule\!!height\ruledlinewidth\kern-\ruledlinewidth}
+\setvalue{b\@@frame@@\v!on\v!on}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
+\setvalue{b\@@frame@@\v!off\v!on}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
+      \setvalue{b\@@frame@@\v!on}{\kern-\ruledlinewidth\hrule\!!height\ruledlinewidth}
+\setvalue{l\@@frame@@\v!on\v!on}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
+\setvalue{l\@@frame@@\v!off\v!on}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
+      \setvalue{l\@@frame@@\v!on}{\vrule\!!width\ruledlinewidth\kern-\ruledlinewidth}
+\setvalue{r\@@frame@@\v!on\v!on}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
+\setvalue{r\@@frame@@\v!off\v!on}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
+      \setvalue{r\@@frame@@\v!on}{\kern-\ruledlinewidth\vrule\!!width\ruledlinewidth}
 
 %D I condidered using the low level support command
 %D \type{\ruledhbox}, but this would slow down processing by a
@@ -577,7 +577,7 @@
 %D {\ovalbox}.
 
 \def\dostrokedroundbox\width#1\height#2\depth#3\radius#4\toggle#5\left#6\\%
-  {\doif{#5}{\v!aan}{\ovalbox{#1}{#2}{#3}{\ruledlinewidth}{#4}{\v!aan}{\v!uit}}}
+  {\doif{#5}{\v!on}{\ovalbox{#1}{#2}{#3}{\ruledlinewidth}{#4}{\v!on}{\v!off}}}
 
 %D The next few macros are probably the most misused ones in
 %D \CONTEXT. They deal with putting rules around boxes, provide
@@ -636,17 +636,17 @@
 
 \def\copylocalframed[#1]#2[#3]%
   {\copyparameters[#1][#3]%
-     [\c!breedte,\c!hoogte,\c!offset,\c!leeg,\c!lijndikte,%
-      \c!straal,\c!hoek,\c!diepte,\c!kader,\c!kaderkleur,%
-      \c!voorgrondletter,\c!voorgrondkleur,\c!regels,\c!orientatie,%
-      \c!bovenkader,\c!onderkader,\c!linkerkader,\c!rechterkader,%
-      \c!lijndikte,\c!kaderoffset,\c!achtergrond,\c!component,%
-      \c!achtergrondoffset,\c!achtergrondraster,\c!achtergrondkleur,%
-      \c!uitlijnen,\c!onder,\c!boven,\c!strut,\c!plaats,\c!setups]%
-   \copyparameters[#1\c!achtergrond][#1]%
-     [\c!straal,\c!hoek,\c!diepte]%
-   \copyparameters[#1\c!kader][#1]%
-     [\c!straal,\c!hoek,\c!diepte]}
+     [\c!width,\c!height,\c!offset,\c!empty,\c!rulethickness,%
+      \c!radius,\c!corner,\c!depth,\c!frame,\c!framecolor,%
+      \c!foregroundstyle,\c!foregroundcolor,\c!lines,\c!orientation,%
+      \c!topframe,\c!bottomframe,\c!leftframe,\c!rightframe,%
+      \c!rulethickness,\c!frameoffset,\c!background,\c!component,%
+      \c!backgroundoffset,\c!backgroundscreen,\c!backgroundcolor,%
+      \c!align,\c!bottom,\c!top,\c!strut,\c!location,\c!setups]%
+   \copyparameters[#1\c!background][#1]%
+     [\c!radius,\c!corner,\c!depth]%
+   \copyparameters[#1\c!frame][#1]%
+     [\c!radius,\c!corner,\c!depth]}
 
 \def\setupframed
   {\dodoubleargument\getparameters[\??oi]}
@@ -699,23 +699,23 @@
    \inframedtrue
    \edef\@@framed{#1}%
    % this piece of pre expansion is needed (sometimes used in frameoffset)
-   % \doifvaluesomething{\@@framed\c!lijndikte}         % obsolete
-   %   {\ruledlinewidth\getvalue{\@@framed\c!lijndikte}}% obsolete
+   % \doifvaluesomething{\@@framed\c!rulethickness}         % obsolete
+   %   {\ruledlinewidth\getvalue{\@@framed\c!rulethickness}}% obsolete
    % this piece of pre expansion is needed (sometimes used circular)
-   \scratchdimen\framedparameter\c!kaderoffset
-   \setevalue{\@@framed\c!kaderoffset}{\the\scratchdimen}%
-   \doifnotvalue{\@@framed\c!achtergrondoffset}\v!kader
-     {\scratchdimen\framedparameter\c!achtergrondoffset
-      \setevalue{\@@framed\c!achtergrondoffset}{\the\scratchdimen}}%
+   \scratchdimen\framedparameter\c!frameoffset
+   \setevalue{\@@framed\c!frameoffset}{\the\scratchdimen}%
+   \doifnotvalue{\@@framed\c!backgroundoffset}\v!frame
+     {\scratchdimen\framedparameter\c!backgroundoffset
+      \setevalue{\@@framed\c!backgroundoffset}{\the\scratchdimen}}%
    % to prevent deadlock in case of self refering
    \ifsecondargument % faster
      \getparameters[\@@framed][#2]% here !
    \fi
    % we need to register the (outer) color
-   \startregistercolor[\framedparameter\c!voorgrondkleur]%
+   \startregistercolor[\framedparameter\c!foregroundcolor]%
    % to get the right spacing
-   \doifvaluesomething{\@@framed\c!voorgrondletter}
-     {\@EA\doconvertfont\csname\@@framed\c!voorgrondletter\endcsname\empty}%
+   \doifvaluesomething{\@@framed\c!foregroundstyle}
+     {\@EA\doconvertfont\csname\@@framed\c!foregroundstyle\endcsname\empty}%
    % beware, both the frame and background offset can be overruled
    %
    \edef\doframedsetups{\framedparameter\c!setups}%
@@ -724,26 +724,26 @@
    \fi
    % the next macros are visible
    \edef\localoffset{\framedparameter\c!offset}%
-   \edef\localwidth {\framedparameter\c!breedte}%
-   \edef\localheight{\framedparameter\c!hoogte}%
-   \edef\localformat{\framedparameter\c!uitlijnen}%
+   \edef\localwidth {\framedparameter\c!width}%
+   \edef\localheight{\framedparameter\c!height}%
+   \edef\localformat{\framedparameter\c!align}%
    \edef\localstrut {\framedparameter\c!strut}%
    % these are not
-   \edef\@@localframing    {\framedparameter\c!kader}%
-   \edef\@@locallocation   {\framedparameter\c!plaats}%
-   \edef\@@localorientation{\framedparameter\c!orientatie}%
+   \edef\@@localframing    {\framedparameter\c!frame}%
+   \edef\@@locallocation   {\framedparameter\c!location}%
+   \edef\@@localorientation{\framedparameter\c!orientation}%
    %
    \ifx\@@localframing\v!overlay   % no frame, no offset, no framewidth
      \boxhasframefalse
      \let\localoffset\v!overlay
-   \else\ifx\@@localframing\v!geen % no frame, no framewidth
+   \else\ifx\@@localframing\v!none % no frame, no framewidth
      \boxhasframefalse
    \else
      \boxhasframetrue
    \fi\fi
    \ifboxhasframe
-     \doifvaluesomething{\@@framed\c!lijndikte}
-       {\ruledlinewidth\framedparameter\c!lijndikte\relax
+     \doifvaluesomething{\@@framed\c!rulethickness}
+       {\ruledlinewidth\framedparameter\c!rulethickness\relax
         \ifinheritruledlinewidth\linewidth\ruledlinewidth\fi}%
    \else
      \ruledlinewidth\zeropoint
@@ -753,16 +753,16 @@
    \else
      \boxhasformattrue
      \dosetraggedcommand\localformat
-     \edef\dobeforeframedbox{\raggedtopcommand\framedparameter\c!boven}%
-     \edef\doafterframedbox {\framedparameter\c!onder\raggedbottomcommand}%
+     \edef\dobeforeframedbox{\raggedtopcommand\framedparameter\c!top}%
+     \edef\doafterframedbox {\framedparameter\c!bottom\raggedbottomcommand}%
    \fi
-   \ifx\localoffset\v!geen
+   \ifx\localoffset\v!none
      \boxhasoffsetfalse
      \boxhasstrutfalse
      \boxisoverlaidfalse
      \@@localoffset\ruledlinewidth
    \else\ifx\localoffset\v!overlay
-   % \ifx\@@localframing\v!nee \boxhasframefalse \fi % test first
+   % \ifx\@@localframing\v!no \boxhasframefalse \fi % test first
      \boxhasoffsetfalse
      \boxhasstrutfalse
      \boxisoverlaidtrue
@@ -780,24 +780,24 @@
      \@@localoffset\localoffset
      \advance\@@localoffset \ruledlinewidth
    \fi\fi
-   \ifx\localwidth\v!passend
+   \ifx\localwidth\v!fit
      \ifboxhasformat
        \boxhaswidthtrue
        \!!widtha\hsize
      \else
        \boxhaswidthfalse
      \fi
-   \else\ifx\localwidth\v!vast % equals \v!ruim
+   \else\ifx\localwidth\v!fixed % equals \v!broad
      \ifboxhasformat
        \boxhaswidthtrue
        \!!widtha\hsize
      \else
        \boxhaswidthfalse
      \fi
-   \else\ifx\localwidth\v!ruim
+   \else\ifx\localwidth\v!broad
      \boxhaswidthtrue
      \!!widtha\hsize
-   \else\ifx\localwidth\v!lokaal
+   \else\ifx\localwidth\v!local
      \boxhaswidthtrue
      \setlocalhsize
      \!!widtha\localhsize
@@ -805,9 +805,9 @@
      \boxhaswidthtrue
      \!!widtha\localwidth
    \fi\fi\fi\fi
-   \ifx\localheight\v!passend
+   \ifx\localheight\v!fit
      \boxhasheightfalse % no longer: \boxhasstrutfalse
-   \else\ifx\localheight\v!ruim
+   \else\ifx\localheight\v!broad
      \boxhasheightfalse
    \else
      \boxhasheighttrue
@@ -816,9 +816,9 @@
    \ifboxhasheight
      % obey user set height, also downward compatible
    \else
-     \doifvaluesomething{\@@framed\c!regels}
-       {\ifcase\framedparameter\c!regels\else
-          \!!heighta\framedparameter\c!regels\lineheight
+     \doifvaluesomething{\@@framed\c!lines}
+       {\ifcase\framedparameter\c!lines\else
+          \!!heighta\framedparameter\c!lines\lineheight
           \edef\localheight{\the\!!heighta}%
           \boxhasheighttrue
         \fi}%
@@ -833,11 +833,11 @@
    % i.e. disable (colsetbackgroundproblemintechniek)
    \advance\!!widtha  -2\@@localoffset
    \advance\!!heighta -2\@@localoffset
-   \ifx\localstrut\v!nee
+   \ifx\localstrut\v!no
      \boxhasstrutfalse
-   \else\ifx\localstrut\v!globaal
+   \else\ifx\localstrut\v!global
      \setstrut
-   \else\ifx\localstrut\v!lokaal
+   \else\ifx\localstrut\v!local
      \setfontstrut
    \fi\fi\fi
    \ifboxhasstrut
@@ -939,26 +939,26 @@
 %D Beware: setting \type {top} and \type {bottom} to nothing, may
 %D result in a frame that is larger that the given height! try:
 %D
-%D \starttypen
+%D \starttyping
 %D \framed
 %D   [height=3cm,top=,bottom=,offset=overlay]
 %D   {\strut test \shapefill \strut test}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is intended behaviour and not a bug! One can always set
 %D
-%D \starttypen
+%D \starttyping
 %D ...,bottom=\kern0pt,...
-%D \stoptypen
+%D \stoptyping
 
 \def\stoplocalframed
   {\dontshowcomposition
    \@@stopframedorientation
    \ifboxhasformat
-     \ifx\localwidth\v!passend
+     \ifx\localwidth\v!fit
        \ifreshapeframebox\doreshapeframedbox\fi
        \boxhaswidthfalse
-     \else\ifx\localwidth\v!vast
+     \else\ifx\localwidth\v!fixed
        \boxhaswidthfalse
      \else
        \resetshapeframebox
@@ -972,7 +972,7 @@
    \ifboxhasheight
      \ht\framebox\!!heighta
    \fi
-   \doifvalue{\@@framed\c!leeg}\v!ja
+   \doifvalue{\@@framed\c!empty}\v!yes
      {\setbox\scratchbox\null
       \wd\scratchbox\wd\framebox
       \ht\scratchbox\ht\framebox
@@ -991,37 +991,70 @@
      \let\postprocessframebox\relax % prevent nesting
      \next\framebox
    \fi
-   \edef\overlaylinecolor{\framedparameter\c!kaderkleur}%
+   \edef\overlaylinecolor{\framedparameter\c!framecolor}%
    \edef\overlaylinewidth{\the\ruledlinewidth}% \@@...
    \ifboxhasframe % real or invisible frame
      \doframedbox
    \fi
-   \doifvaluesomething{\@@framed\c!achtergrond}\dobackedbox
-   \ifx\@@locallocation\v!laag
+   \doifvaluesomething{\@@framed\c!background}\dobackedbox
+   \ifx\@@locallocation\v!low
      \doinlineframedbox
-   \else\ifx\@@locallocation\v!diepte
+   \else\ifx\@@locallocation\v!depth
      \doloweredframedbox
-   \else\ifx\@@locallocation\v!hangend
+   \else\ifx\@@locallocation\v!hanging
      \dohangingframedbox
    \fi\fi\fi
    \box\framebox
    \egroup
    \egroup}
 
-\let\@@startframedorientation\relax
-\let\@@stopframedorientation \relax
+% \let\@@startframedorientation\relax
+% \let\@@stopframedorientation \relax
+
+% \framed[width=12cm,height=3cm,orientation=0]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=90]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=180]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=270]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=-90]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=-180]{\input ward\relax}
+% \framed[width=12cm,height=3cm,orientation=-270]{\input ward\relax}
+
+\def\@@startframedorientation
+  {\let\@@stopframedorientation \relax
+   \ifx\@@localorientation\empty\else
+     \ifcase\@@localorientation\else
+       \scratchcounter\@@localorientation
+       \divide\scratchcounter\plustwo
+       \ifodd\scratchcounter
+         \swapmacros\framedwidth\framedheight
+         \swapmacros\localwidth \localheight
+         \swapdimens\!!heighta  \!!widtha
+         \def\@@stopframedorientation{\@@dostopframedorientation\plusone}%
+       \else
+         \def\@@stopframedorientation{\@@dostopframedorientation\zerocount}%
+       \fi
+     \fi
+   \fi}
+
+\def\@@dostopframedorientation#1%
+  {\ifcase#1\else
+     \swapmacros\framedwidth\framedheight
+     \swapmacros\localwidth \localheight
+     \swapdimens\!!heighta  \!!widtha
+   \fi
+   \setbox\framebox\hbox{\dorotatebox\@@localorientation\hbox{\box\framebox}}}
 
 %D The last conditional takes care of the special situation of
-%D in||line \inframed[hoogte=3cm]{framed} boxes. Such boxes have
+%D in||line \inframed[height=3cm]{framed} boxes. Such boxes have
 %D to be \inframed{aligned} with the running text.
 
 \def\doinframed[#1]% we could omit #1] but readibility ...
-  {\framed[\c!plaats=\v!laag,#1]}
+  {\framed[\c!location=\v!low,#1]}
 
 \unexpanded\def\inframed
   {\dosingleempty\doinframed}
 
-%D When we set \type{\c!leeg} to \type{\v!ja}, we get
+%D When we set \type{empty} to \type{yes}, we get
 %D ourselves a frame and/or background, but no content, so
 %D actually we have a sort of phantom framed box.
 
@@ -1029,11 +1062,11 @@
 %D spacing, we provide a way to specify a foregroundcolor.
 
 \def\docolorframebox
-  {\doifvaluesomething{\@@framed\c!voorgrondkleur}
-     {\doifcolorelse{\framedparameter\c!voorgrondkleur}
+  {\doifvaluesomething{\@@framed\c!foregroundcolor}
+     {\doifcolorelse{\framedparameter\c!foregroundcolor}
         {\setbox\framebox\hbox
            {\localcolortrue
-            \color[\framedparameter\c!voorgrondkleur]{\box\framebox}}}
+            \color[\framedparameter\c!foregroundcolor]{\box\framebox}}}
         {}}}
 
 %D \macros
@@ -1042,7 +1075,7 @@
 %D When Tobias asked how to frame mathematical elements in
 %D formulas, Taco's posted the next macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\mframed#1%
 %D   {\relax
 %D    \ifmmode
@@ -1050,13 +1083,13 @@
 %D    \else
 %D      \framed{$#1$}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because \type {\ifinner} does not (always) reports what
 %D one would expect, we move the test to the outer level. We
 %D also want to pass arguments,
 %D
-%D \starttypen
+%D \starttyping
 %D \def\mframed%
 %D   {\dosingleempty\domframed}
 %D
@@ -1071,37 +1104,13 @@
 %D    \else
 %D      \inframed[#1]{$#2$}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Still better is the next alternative, if only because it
 %D takes care of setting the super- and subscripts styles
 
 \ifx\restoremathstyle\undefined \let\restoremathstyle\relax \fi
 
-%\def\domframed[#1][#2]#3%
-%  {\begingroup
-%   \ifmmode
-%     \ifinner
-%       \let\mframedstyle\relax
-%     \else
-%       \let\mframedstyle\displaystyle
-%     \fi
-%   \else
-%     \let\mframedstyle\relax
-%   \fi
-%   #1\ifdone
-%     \def\normalstrut{$\mframedstyle\restoremathstyle\vphantom($}%
-%     \framed
-%      %[\c!kaderoffset=.25ex,\c!offset=\v!overlay,#2]
-%       [\c!kaderoffset=\@@oioffset,\c!offset=\v!overlay,#2]
-%       {$\mframedstyle\restoremathstyle#3$}%
-%   \else
-%     \inframed
-%       [#2]
-%       {$\mframedstyle\restoremathstyle#3$}%
-%   \fi
-%   \endgroup}
-
 \def\domframed[#1][#2]#3%
   {\begingroup
    \ifmmode
@@ -1116,7 +1125,7 @@
    #1\ifdone
      \def\normalstrut{$\mframedstyle\vphantom($}%
      \framed
-       [\c!kaderoffset=\@@oioffset,\c!offset=\v!overlay,#2]
+       [\c!frameoffset=\@@oioffset,\c!offset=\v!overlay,#2]
        {$\mframedstyle#3$}%
    \else
      \inframed
@@ -1135,42 +1144,42 @@
 %D the \type {\mframed}.
 %D
 %D \startbuffer
-%D \startformule
+%D \startformula
 %D   x \times   \mframed{y} \times y^{z_z}
 %D   x \times \inmframed{y} \times y^{z_z}
-%D \stopformule
+%D \stopformula
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D However, we got into troubles when we want to nest sub- and
 %D superscripts, like in
 %D
 %D \startbuffer
-%D \startformule
+%D \startformula
 %D   x \times \mframed{y} \times y^{\mframed{z}_{\mframed{z}}}
-%D \stopformule
+%D \stopformula
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Therefore, we can best use \type {\super} and \type {\suber}
 %D instead of \type {^} and \type {_}. Both commands take care
 %D of proper font switching.
 %D
 %D \startbuffer
-%D \startformule
+%D \startformula
 %D   x \times \mframed{y} \times y\super{\mframed{z}\suber{\mframed{z}}}
-%D \stopformule
+%D \stopformula
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D As usual, one can specify in what way the text should be
 %D framed. One should be aware of the fact that, inorder to
@@ -1179,14 +1188,14 @@
 %D instead.
 %D
 %D \startbuffer
-%D \startformule
-%D   x \times y\super{\mframed[kaderkleur=rood]{z}\suber{z}}
-%D \stopformule
+%D \startformula
+%D   x \times y\super{\mframed[framecolor=red]{z}\suber{z}}
+%D \stopformula
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D For inline use, we also provide the \type {\inmframed}
 %D alternative: we want $x \times \inmframed{y}$ in inline
@@ -1207,56 +1216,56 @@
 %D what needs to be done by the auxiliary macros.
 %D
 %D \startbuffer
-%D \framed[hoogte=1cm,offset=.5cm]   {rule based learning}
-%D \framed[hoogte=1cm,offset=0cm]    {rule based learning}
-%D \framed[hoogte=1cm,offset=geen]   {rule based learning}
-%D \framed[hoogte=1cm,offset=overlay]{rule based learning}
+%D \framed[height=1cm,offset=.5cm]   {rule based learning}
+%D \framed[height=1cm,offset=0cm]    {rule based learning}
+%D \framed[height=1cm,offset=none]   {rule based learning}
+%D \framed[height=1cm,offset=overlay]{rule based learning}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \hbox{\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \hbox{\getbuffer}
+%D \stoplinecorrection
 %D
 %D \startbuffer
 %D \framed[offset=.5cm]   {rule based learning}
 %D \framed[offset=0cm]    {rule based learning}
-%D \framed[offset=geen]   {rule based learning}
+%D \framed[offset=none]   {rule based learning}
 %D \framed[offset=overlay]{rule based learning}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \hbox{\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \hbox{\getbuffer}
+%D \stoplinecorrection
 %D
 %D \startbuffer
 %D \framed[strut=nee,offset=.5cm]   {rule based learning}
 %D \framed[strut=nee,offset=0cm]    {rule based learning}
-%D \framed[strut=nee,offset=geen]   {rule based learning}
+%D \framed[strut=nee,offset=none]   {rule based learning}
 %D \framed[strut=nee,offset=overlay]{rule based learning}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \hbox{\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \hbox{\getbuffer}
+%D \stoplinecorrection
 %D
 %D \startbuffer
-%D \framed[breedte=3cm,uitlijnen=links]      {rule\\based\\learning}
-%D \framed[breedte=3cm,uitlijnen=midden]     {rule\\based\\learning}
-%D \framed[breedte=3cm,uitlijnen=rechts]     {rule\\based\\learning}
-%D \framed[breedte=passend,uitlijnen=midden] {rule\\based\\learning}
+%D \framed[width=3cm,align=left]      {rule\\based\\learning}
+%D \framed[width=3cm,align=middle]     {rule\\based\\learning}
+%D \framed[width=3cm,align=right]     {rule\\based\\learning}
+%D \framed[width=fit,align=middle] {rule\\based\\learning}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \hbox{\mindermeldingen\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \hbox{\dontcomplain\getbuffer}
+%D \stoplinecorrection
 %D
 %D So now we're ready for the complicated stuff. We distinguish
 %D between borders with straight lines and those with round
@@ -1273,35 +1282,35 @@
 \def\doframedbox
   {\setbox\framebox\vbox
      {\dooutlinebox\framebox
-        \color  \framedparameter\c!kaderkleur
-        \offset \framedparameter\c!kaderoffset
-        \corner \framedparameter\c!kaderhoek
-        \radius \framedparameter\c!kaderstraal
-        \depth  \framedparameter\c!kaderdiepte
-        \toggle \framedparameter\c!kader
-          \left   \framedparameter\c!linkerkader
-          \right  \framedparameter\c!rechterkader
-          \top    \framedparameter\c!bovenkader
-          \bottom \framedparameter\c!onderkader\\}}
+        \color  \framedparameter\c!framecolor
+        \offset \framedparameter\c!frameoffset
+        \corner \framedparameter\c!framecorner
+        \radius \framedparameter\c!frameradius
+        \depth  \framedparameter\c!framedepth
+        \toggle \framedparameter\c!frame
+          \left   \framedparameter\c!leftframe
+          \right  \framedparameter\c!rightframe
+          \top    \framedparameter\c!topframe
+          \bottom \framedparameter\c!bottomframe\\}}
 
 %D Getting the backgrounds right takes less code. Again we
 %D have to take care of additional offsets.
 
 \def\dobackedbox
-  {\doifelsevalue{\@@framed\c!achtergrondoffset}\v!kader % new
-     {\dodobackedbox\c!kaderoffset}
-     {\dodobackedbox\c!achtergrondoffset}}
+  {\doifelsevalue{\@@framed\c!backgroundoffset}\v!frame % new
+     {\dodobackedbox\c!frameoffset}
+     {\dodobackedbox\c!backgroundoffset}}
 
 \def\dodobackedbox#1%
   {\setbox\framebox\vbox
      {\dobackgroundbox\framebox
-        \background \framedparameter\c!achtergrond
-        \color      \framedparameter\c!achtergrondkleur
-        \raster     \framedparameter\c!achtergrondraster
+        \background \framedparameter\c!background
+        \color      \framedparameter\c!backgroundcolor
+        \raster     \framedparameter\c!backgroundscreen
         \offset     \framedparameter{#1}%
-        \corner     \framedparameter\c!achtergrondhoek
-        \radius     \framedparameter\c!achtergrondstraal
-        \depth      \framedparameter\c!achtergronddiepte
+        \corner     \framedparameter\c!backgroundcorner
+        \radius     \framedparameter\c!backgroundradius
+        \depth      \framedparameter\c!backgrounddepth
         \component  \framedparameter\c!component\\}}
 
 %D We handle left, right or middle alignment as well as fixed
@@ -1519,52 +1528,52 @@
 
 %D On the next page we show some examples of how these macros
 %D come into action. The examples show us how
-%D \type {\v!passend}, \type {\v!ruim} dimensions influence the
-%D formatting. Watch the visualized struts. \voetnoot {Here we
+%D \type {fit}, \type {broad} dimensions influence the
+%D formatting. Watch the visualized struts. \footnote {Here we
 %D used \type {\showstruts}.}
 %D
 %D \startuitstellen
 %D \bgroup
 %D \showstruts
-%D \mindermeldingen
-%D \startregelcorrectie
+%D \dontcomplain
+%D \startlinecorrection
 %D \halign{#\enskip&#\enskip&#\enskip&#\enskip&#\enskip&#\cr
-%D   \omlijnd[breedte=.2\hsize, hoogte=.2\hsize, uitlijnen=]       {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=ruim,     uitlijnen=]       {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=passend,  uitlijnen=]       {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=.2\hsize, uitlijnen=]       {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=ruim,     uitlijnen=]       {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=passend,  uitlijnen=]       {a\par b\par c}\cr
+%D   \framed[width=.2\hsize, height=.2\hsize, align=]       {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=broad,     align=]       {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=fit,  align=]       {a\par b\par c}&
+%D   \framed[width=fit,  height=.2\hsize, align=]       {a\par b\par c}&
+%D   \framed[width=fit,  height=broad,     align=]       {a\par b\par c}&
+%D   \framed[width=fit,  height=fit,  align=]       {a\par b\par c}\cr
 %D   \noalign{\vskip1em}
-%D   \omlijnd[breedte=.2\hsize, hoogte=.2\hsize, uitlijnen=ja]     {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=ruim,     uitlijnen=ja]     {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=passend,  uitlijnen=ja]     {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=.2\hsize, uitlijnen=ja]     {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=ruim,     uitlijnen=ja]     {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=passend,  uitlijnen=ja]     {a\par b\par c}\cr
+%D   \framed[width=.2\hsize, height=.2\hsize, align=yes]     {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=broad,     align=yes]     {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=fit,  align=yes]     {a\par b\par c}&
+%D   \framed[width=fit,  height=.2\hsize, align=yes]     {a\par b\par c}&
+%D   \framed[width=fit,  height=broad,     align=yes]     {a\par b\par c}&
+%D   \framed[width=fit,  height=fit,  align=yes]     {a\par b\par c}\cr
 %D   \noalign{\vskip1em}
-%D   \omlijnd[breedte=.2\hsize, hoogte=.2\hsize, uitlijnen=rechts] {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=ruim,     uitlijnen=rechts] {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=passend,  uitlijnen=rechts] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=.2\hsize, uitlijnen=rechts] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=ruim,     uitlijnen=rechts] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=passend,  uitlijnen=rechts] {a\par b\par c}\cr
+%D   \framed[width=.2\hsize, height=.2\hsize, align=right] {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=broad,     align=right] {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=fit,  align=right] {a\par b\par c}&
+%D   \framed[width=fit,  height=.2\hsize, align=right] {a\par b\par c}&
+%D   \framed[width=fit,  height=broad,     align=right] {a\par b\par c}&
+%D   \framed[width=fit,  height=fit,  align=right] {a\par b\par c}\cr
 %D   \noalign{\vskip1em}
-%D   \omlijnd[breedte=.2\hsize, hoogte=.2\hsize, uitlijnen=links]  {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=ruim,     uitlijnen=links]  {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=passend,  uitlijnen=links]  {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=.2\hsize, uitlijnen=links]  {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=ruim,     uitlijnen=links]  {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=passend,  uitlijnen=links]  {a\par b\par c}\cr
+%D   \framed[width=.2\hsize, height=.2\hsize, align=left]  {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=broad,     align=left]  {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=fit,  align=left]  {a\par b\par c}&
+%D   \framed[width=fit,  height=.2\hsize, align=left]  {a\par b\par c}&
+%D   \framed[width=fit,  height=broad,     align=left]  {a\par b\par c}&
+%D   \framed[width=fit,  height=fit,  align=left]  {a\par b\par c}\cr
 %D   \noalign{\vskip1em}
-%D   \omlijnd[breedte=.2\hsize, hoogte=.2\hsize, uitlijnen=midden] {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=ruim,     uitlijnen=midden] {a\par b\par c}&
-%D   \omlijnd[breedte=.2\hsize, hoogte=passend,  uitlijnen=midden] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=.2\hsize, uitlijnen=midden] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=ruim,     uitlijnen=midden] {a\par b\par c}&
-%D   \omlijnd[breedte=passend,  hoogte=passend,  uitlijnen=midden] {a\par b\par c}\cr}
-%D \stopregelcorrectie
-%D \blanko[2*groot]
+%D   \framed[width=.2\hsize, height=.2\hsize, align=middle] {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=broad,     align=middle] {a\par b\par c}&
+%D   \framed[width=.2\hsize, height=fit,  align=middle] {a\par b\par c}&
+%D   \framed[width=fit,  height=.2\hsize, align=middle] {a\par b\par c}&
+%D   \framed[width=fit,  height=broad,     align=middle] {a\par b\par c}&
+%D   \framed[width=fit,  height=fit,  align=middle] {a\par b\par c}\cr}
+%D \stoplinecorrection
+%D \blank[2*groot]
 %D \egroup
 %D \stopuitstellen
 
@@ -1572,7 +1581,7 @@
 %D   {framednoflines, framedlastlength}
 %D
 %D It is possible to let the frame macro calculate the width
-%D of a centered box automatically (\type{\v!passend}). When
+%D of a centered box automatically (\type {fit}). When
 %D doing so, we need to reshape the box:
 
 \newcount\framednoflines
@@ -1636,47 +1645,47 @@
 %D \startuitstellen
 %D \bgroup
 %D \unprotect
-%D \mindermeldingen
+%D \dontcomplain
 %D
 %D \startbuffer
 %D \vbox to \vsize
 %D   \bgroup
-%D     \startuitlijnen[midden]
+%D     \startalignment[middle]
 %D     \vss
 %D     \leavevmode\vbox to .8\vsize
 %D       \bgroup
 %D         \hsize=300pt
 %D         \setupframed
-%D           [\c!achtergrond=\v!kleur,
-%D            \c!achtergrondkleur=donkerrood,
-%D            \c!breedte=300pt,
-%D            \c!hoogte=60pt,
-%D            \c!kaderkleur=DemoBlue,
-%D            \c!lijndikte=2pt]
+%D           [background=color,
+%D            backgroundcolorachtergrondkleur=darkred,
+%D            width=300pt,
+%D            height=60pt,
+%D            framecolorkaderkleur=DemoBlue,
+%D            rulethickness=2pt]
 %D         \def\status%
-%D           {\c!achtergrondoffset=\@@olachtergrondoffset\\
-%D            \c!kaderoffset=\@@olkaderoffset\\
-%D            \c!diepte=\@@oldiepte}
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=0pt,kaderoffset=0pt]{\status}}
+%D           {backgroundoffset=\framedparameter\c!backgroundoffset\\
+%D            frameoffset=\framedparameter\c!frameoffset\\
+%D            depth=\framedparameter\c!depth}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=0pt,frameoffset=0pt]{\status}}
 %D         \vss
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=5pt,kaderoffset=0pt]{\status}}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=5pt,frameoffset=0pt]{\status}}
 %D         \vss
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=0pt,kaderoffset=5pt]{\status}}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=0pt,frameoffset=5pt]{\status}}
 %D         \vss
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=2pt,kaderoffset=5pt]{\status}}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=2pt,frameoffset=5pt]{\status}}
 %D         \vss
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=5pt,kaderoffset=2pt]{\status}}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=5pt,frameoffset=2pt]{\status}}
 %D         \vss
-%D         \leavevmode \ruledhbox{\framed[achtergrondoffset=5pt,kaderoffset=5pt]{\status}}
+%D         \leavevmode \ruledhbox{\framed[backgroundoffset=5pt,frameoffset=5pt]{\status}}
 %D       \egroup
 %D     \vss
-%D     \stopuitlijnen
+%D     \stopalignment
 %D     \egroup
 %D \stopbuffer
 %D
-%D \haalbuffer \pagina
+%D \getbuffer \page
 %D
-%D {\setupframed[diepte=4pt]\haalbuffer} \pagina
+%D {\setupframed[depth=4pt]\getbuffer} \page
 %D
 %D \protect
 %D \egroup
@@ -1709,11 +1718,11 @@
 %D Hanging the content is mainly meant for cases like the
 %D following:
 %D
-%D \starttypen
+%D \starttyping
 %D \framed[strut=no]
 %D   {\framed[height=2cm,location=hanging]{test}%
 %D    \framed[height=1cm,location=hanging]{test}}
-%D \stoptypen
+%D \stoptyping
 
 \def\dohangingframedbox % best with strut=no
   {\getboxheight\scratchdimen\of\box\framebox
@@ -1725,16 +1734,16 @@
 %D need a different treatment.
 %D
 %D \startbuffer
-%D \framed[breedte=4cm]           {alfa\hairline beta\hairline gamma}
-%D \framed[hoogte=2cm]            {alfa\hairline beta\hairline gamma}
-%D \framed[breedte=4cm,hoogte=2cm]{alfa\hairline beta\hairline gamma}
+%D \framed[width=4cm]           {alfa\hairline beta\hairline gamma}
+%D \framed[height=2cm]            {alfa\hairline beta\hairline gamma}
+%D \framed[width=4cm,height=2cm]{alfa\hairline beta\hairline gamma}
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \hbox{\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \hbox{\getbuffer}
+%D \stoplinecorrection
 %D
 %D These macros try to adapt their behaviour as good as
 %D possible to the circumstances and act as natural as
@@ -1802,43 +1811,43 @@
   {\unskip\normalspace\ignorespaces}
 
 %D We can set each rule on or off. The default setting is
-%D inherited from \type{\c!kader}. An earlier implementation
+%D inherited from \type{frame}. An earlier implementation
 %D use a bit different approach, but the new one seems more
 %D natural:
 %D
 %D \bgroup
-%D \steltypenin[marge=0pt]
-%D \startregelcorrectie
+%D \setuptyping[margin=0pt]
+%D \startlinecorrection
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=aan]               {\donkerrood\blokje}
+%D \framed[offset=overlay,frame=on]               {\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
+%D \hbox{\getbuffer\vbox{\typebuffer}}
 %D
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=aan,onderkader=uit]{\donkerrood\blokje}
+%D \framed[offset=overlay,frame=on,bottomframe=off]{\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
+%D \hbox{\getbuffer\vbox{\typebuffer}}
 %D
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=aan,onderkader=aan]{\donkerrood\blokje}
+%D \framed[offset=overlay,frame=on,bottomframe=on]{\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
+%D \hbox{\getbuffer\vbox{\typebuffer}}
 %D
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=uit]               {\donkerrood\blokje}
+%D \framed[offset=overlay,frame=off]               {\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
+%D \hbox{\getbuffer\vbox{\typebuffer}}
 %D
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=uit,onderkader=uit]{\donkerrood\blokje}
+%D \framed[offset=overlay,frame=off,bottomframe=off]{\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
+%D \hbox{\getbuffer\vbox{\typebuffer}}
 %D
 %D \startbuffer
-%D \omlijnd[offset=overlay,kader=uit,onderkader=aan]{\donkerrood\blokje}
+%D \framed[offset=overlay,frame=off,bottomframe=on]{\donkerrood\blackrule}
 %D \stopbuffer
-%D \hbox{\haalbuffer\vbox{\typebuffer}}
-%D \stopregelcorrectie
+%D \hbox{\getbuffer\vbox{\typebuffer}}
+%D \stoplinecorrection
 %D \egroup
 
 %D \macros
@@ -1861,7 +1870,7 @@
 %D
 %D The simple command draws only one rule. Its optional
 %D argument can be used to specify the dimensions. By setting
-%D the width, height or depth to \type{\v!max}, one gets the
+%D the width, height or depth to \type {max}, one gets the
 %D natural dimensions.
 %D
 %D \showsetup{\y!blackrule}
@@ -1870,14 +1879,14 @@
   {\hbox\bgroup
    \getparameters[\??bj][#1]%
    \setstrut
-   \doif\@@bjbreedte\v!max{\def\@@bjbreedte{1em}}%
-   \doif\@@bjhoogte \v!max{\def\@@bjhoogte{\strutht}}%
-   \doif\@@bjdiepte \v!max{\def\@@bjdiepte{\strutdp}}%
-   \localstartcolor[\@@bjkleur]%
+   \doif\@@bjwidth\v!max{\def\@@bjwidth{1em}}%
+   \doif\@@bjheight \v!max{\def\@@bjheight{\strutht}}%
+   \doif\@@bjdepth \v!max{\def\@@bjdepth{\strutdp}}%
+   \localstartcolor[\@@bjcolor]%
      \vrule
-       \!!width \@@bjbreedte
-       \!!height\@@bjhoogte
-       \!!depth \@@bjdiepte
+       \!!width \@@bjwidth
+       \!!height\@@bjheight
+       \!!depth \@@bjdepth
    \localstopcolor
    \egroup}
 
@@ -1895,8 +1904,8 @@
 %D The two alternative calls are therefore:
 %D
 %D \startbuffer
-%D Tell me, is this according to the \blokjes[n=6]?
-%D These \blokjes[variant=b,n=10,afstand=.2em,breedte=4cm] are quite clear.
+%D Tell me, is this according to the \blackrules[n=6]?
+%D These \blackrules[alternativevariant=b,n=10,distance=.2em,width=4cm] are quite clear.
 %D \stopbuffer
 %D
 %D \typebuffer
@@ -1904,9 +1913,9 @@
 %D or:
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D We could of course have implemented this macro using
@@ -1916,9 +1925,9 @@
 \def\doblackrules[#1]%
   {\hbox\bgroup
    \getparameters[\??bj][#1]%
-   \!!widtha\@@bjbreedte
-   \!!widthb\@@bjafstand
-   \doif\@@bjvariant\c!b
+   \!!widtha\@@bjwidth
+   \!!widthb\@@bjdistance
+   \doif\@@bjalternative\c!b
      {\scratchcounter\@@bjn
       \ifnum\scratchcounter=\plusone
         \!!widthb\zeropoint
@@ -1927,18 +1936,18 @@
         \advance\!!widtha -\scratchcounter\!!widthb
         \divide \!!widtha \@@bjn
       \fi}%
-   \localstartcolor[\@@bjkleur]%
+   \localstartcolor[\@@bjcolor]%
      \dorecurse\@@bjn
        {\vrule
           \!!width \!!widtha
-          \!!height\@@bjhoogte
-          \!!depth \@@bjdiepte
+          \!!height\@@bjheight
+          \!!depth \@@bjdepth
         \hskip\!!widthb}%
      \unskip
    \localstopcolor
    \egroup}
 
-\unexpanded\def\blackrules%
+\unexpanded\def\blackrules
   {\dosingleempty\doblackrules}
 
 %D The next commands can be used to draw margin rules. We
@@ -1948,13 +1957,13 @@
 %D put text in the margin.
 
 \def\dodrawmarginrule
-  {\setbox0\hbox
-     {\vrule\!!depth\strutdepth\!!height\strutheight\!!width\@@kalijndikte}%
-   \smashbox0 % no \vsmash !!!
-   \box0}
+  {\setbox\scratchbox\hbox
+     {\vrule\!!depth\strutdepth\!!height\strutheight\!!width\@@karulethickness}%
+   \smashbox\scratchbox % no \vsmash !!!
+   \box\scratchbox}
 
 \def\drawmarginrule
-  {\strut\inlinker{\dodrawmarginrule}}
+  {\strut\inleft{\dodrawmarginrule}}
 
 %D \macros
 %D   {marginrule}
@@ -1971,7 +1980,7 @@
    \processwords}
 
 \def\complexmarginrule[#1]%
-  {\ifnum#1<\@@kaniveau\relax \else
+  {\ifnum#1<\@@kalevel\relax \else
      \def\@@kadefaultwidth{#1}%
      \expandafter\simplemarginrule
    \fi}
@@ -2011,7 +2020,7 @@
 \def\complexstartmarginrule[#1]%
   {\bgroup
    \let\drawmarginrule\relax
-   \ifnum#1<\@@kaniveau\relax
+   \ifnum#1<\@@kalevel\relax
      \let\stopmarginrule\egroup
    \else
      \def\@@kadefaultwidth{#1}%
@@ -2027,30 +2036,30 @@
    \egroup}
 
 %D \startbuffer
-%D \stelkantlijnin[niveau=5]
+%D \setupmarginrules[level=5]
 %D
-%D \startkantlijn[1]
+%D \startmarginrule[1]
 %D First we set the level at~5. Next we typeset this first
 %D paragraph as a level~1 one. As expected no rule show up.
-%D \stopkantlijn
+%D \stopmarginrule
 %D
-%D \startkantlijn[5]
+%D \startmarginrule[5]
 %D The second paragraph is a level~5 one. As we can see here,
 %D the marginal rule gets a width according to its level.
-%D \stopkantlijn
+%D \stopmarginrule
 %D
-%D \startkantlijn[8]
+%D \startmarginrule[8]
 %D It will of course be no surprise that this third paragraph
 %D has a even thicker margin rule. This behavior can be
 %D overruled by specifying the width explictly.
-%D \stopkantlijn
+%D \stopmarginrule
 %D \stopbuffer
 %D
 %D In next example we show most features. Watch the rule
 %D thickness adapting itself to the level.
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D We just said:
@@ -2123,7 +2132,7 @@
 %D becomes
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D So we've got
@@ -2181,7 +2190,7 @@
    \bgroup
    \chardef\ruletype\plusone
    \processaction
-     [\@@dlvariant]
+     [\@@dlalternative]
      [ \v!a=>\chardef\ruletype0,% no line
       %\v!b=>\chardef\ruletype1,% height/depth
        \v!c=>\chardef\ruletype2,% topheight/botdepth
@@ -2189,27 +2198,27 @@
           0=>\chardef\ruletype0,% compatible with backgrounds
       %   1=>\chardef\ruletype1,% compatible with backgrounds
           2=>\chardef\ruletype2]% compatible with backgrounds
-   \doifsomething\@@dllijndikte
-     {\linewidth\@@dllijndikte}%
+   \doifsomething\@@dlrulethickness
+     {\linewidth\@@dlrulethickness}%
    \ifdim\linewidth=\zeropoint
      \chardef\ruletype\zerocount
    \else
-     \doifnot\@@dlkader\v!aan{\chardef\ruletype=0\relax}%
+     \doifnot\@@dlframe\v!on{\chardef\ruletype=0\relax}%
    \fi
    \ifnum\ruletype=\plusone
-     \doif\@@dlhoogte\v!max{\let\@@dlhoogte\!!plusone}%
-     \doif\@@dldiepte\v!max{\let\@@dldiepte\!!plusone}%
+     \doif\@@dlheight\v!max{\let\@@dlheight\!!plusone}%
+     \doif\@@dldepth\v!max{\let\@@dldepth\!!plusone}%
    \else
-     \let\@@dlhoogte\!!plusone
-     \let\@@dldiepte\!!plusone
+     \let\@@dlheight\!!plusone
+     \let\@@dldepth\!!plusone
    \fi
-   \freezedimensionwithunit\@@dlhoogte\strutht
-   \freezedimensionwithunit\@@dldiepte\strutdp
+   \freezedimensionwithunit\@@dlheight\strutht
+   \freezedimensionwithunit\@@dldepth\strutdp
    \divide\linewidth 2
-   \doifelse\@@dlachtergrond\v!kleur
-     {\startcolor[\@@dlachtergrondkleur]%
-      \dimen0=\@@dlhoogte
-      \dimen2=\@@dldiepte
+   \doifelse\@@dlbackground\v!color
+     {\startcolor[\@@dlbackgroundcolor]%
+      \dimen0=\@@dlheight
+      \dimen2=\@@dldepth
       \ifnum\ruletype=2 % prevent overshoot due to rounding
         \advance\dimen0 -.5\linewidth
         \advance\dimen2 -.5\linewidth
@@ -2219,21 +2228,21 @@
       \ifcase\ruletype
         % no rule
       \or
-        \startcolor[\@@dlkleur]%
+        \startcolor[\@@dlcolor]%
         \hfillneg
         \leaders\hrule\!!height\linewidth\!!depth\linewidth\hfill
         \stopcolor
       \or
-        \startcolor[\@@dlkleur]%
-        \dimen2=\@@dldiepte\dimen0=-\dimen2 \advance\dimen0 \linewidth
+        \startcolor[\@@dlcolor]%
+        \dimen2=\@@dldepth\dimen0=-\dimen2 \advance\dimen0 \linewidth
         \hfillneg\leaders\hrule\!!height\dimen0\!!depth\dimen2\hfill
-        \dimen2=\@@dlhoogte\dimen0=-\dimen2 \advance\dimen0 \linewidth
+        \dimen2=\@@dlheight\dimen0=-\dimen2 \advance\dimen0 \linewidth
         \hfillneg\leaders\hrule\!!height\dimen2\!!depth\dimen0\hfill
         \stopcolor
       \fi}
      {\ifcase\ruletype \else
-        \startcolor[\@@dlkleur]%
-        \leaders\hrule\!!height\@@dlhoogte\!!depth\@@dldiepte\hfill
+        \startcolor[\@@dlcolor]%
+        \leaders\hrule\!!height\@@dlheight\!!depth\@@dldepth\hfill
         \stopcolor
       \fi}%
    \strut
@@ -2284,26 +2293,26 @@
 \def\dothinrules[#1]%
   {\bgroup
    \dosetupthinrules[#1]%
-   \@@dlvoor
-   \assignvalue\@@dlinterlinie\@@dlinterlinie{1.0}{1.5}{2.0}%
-   \spacing\@@dlinterlinie
+   \@@dlbefore
+   \assignvalue\@@dlinterlinespace\@@dlinterlinespace{1.0}{1.5}{2.0}%
+   \spacing\@@dlinterlinespace
    \dorecurse\@@dln
      {\ifnum\recurselevel=\@@dln \dothinrulesnobreak \else
       \ifnum\recurselevel=2      \dothinrulesnobreak \fi\fi
                                  \thinrule
       \ifnum\recurselevel<\@@dln\relax
         % test needed, else messed up whitespace
-        \ifx\@@dltussen\empty
+        \ifx\@@dlinbetween\empty
           \softbreak
         \else
           \endgraf
-          \geenwitruimte
-          \@@dltussen
+          \nowhitespace
+          \@@dlinbetween
         \fi
       \fi}%
-   \doifelsenothing\@@dlna
+   \doifelsenothing\@@dlafter
      {\carryoverpar\egroup}
-     {\@@dlna\egroup}}
+     {\@@dlafter\egroup}}
 
 \def\thinrules%
   {\dosingleempty\dothinrules}
@@ -2311,21 +2320,21 @@
 %D A couple of examples are given below.
 %D
 %D \startbuffer
-%D \steldunnelijnenin[n=3,tussen=,kleur=grijs]
+%D \setupthinrules[n=3,inbetween=,color=gray  ]
 %D
-%D test test \dunnelijnen\ test test \par
-%D test test \dunnelijnen [kleur=groen] test test \par
-%D test test \dunnelijnen [hoogte=max, diepte=max] test test \par
+%D test test \thinrules\ test test \par
+%D test test \thinrules [color=green] test test \par
+%D test test \thinrules [height=max, depth=max] test test \par
 %D
-%D \steldunnelijnenin[hoogte=.9,diepte=.9]
+%D \setupthinrules[height=.9,depth=.9]
 %D
-%D test test \dunnelijnen\ test test \par
-%D test test \dunnelijnen [variant=b] test test \par
-%D test test \dunnelijnen [variant=c] test test \par
-%D test test \dunnelijnen [variant=c,tussen=\vskip2ex] test test \par
+%D test test \thinrules\ test test \par
+%D test test \thinrules [alternativevariant=b] test test \par
+%D test test \thinrules [alternativevariant=c] test test \par
+%D test test \thinrules [alternativevariant=c,inbetween=\vskip2ex] test test \par
 %D \stopbuffer
 %D
-%D \typebuffer {\haalbuffer}
+%D \typebuffer {\getbuffer}
 %D
 %D There are a couple of alternative ways to visualize rules
 %D using backgrounds. At first sight these may look strange,
@@ -2334,40 +2343,40 @@
 %D advanced \METAPOST\ based implementation.
 %D
 %D \startbuffer[a]
-%D \steldunnelijnenin
+%D \setupthinrules
 %D   [n=2,
-%D    achtergrondkleur=grijs,
-%D    lijndikte=1pt,
-%D    kleur=donkerblauw,
-%D    na=\blanko,
-%D    voor=\blanko]
+%D    backgroundcolor=gray  ,
+%D    rulethickness=1pt,
+%D    colorkleur=donkerblauw,
+%D    after=\blank,
+%D    before=\blank]
 %D \stopbuffer
 %D
 %D \typebuffer[a]
 %D
 %D \startbuffer[b]
-%D \dunnelijnen[variant=a]
-%D \dunnelijnen[variant=b]
-%D \dunnelijnen[variant=c]
+%D \thinrules[alternativevariant=a]
+%D \thinrules[alternativevariant=b]
+%D \thinrules[alternativevariant=c]
 %D \stopbuffer
 %D
-%D \typebuffer[b] \haalbuffer[a,b]
+%D \typebuffer[b] \getbuffer[a,b]
 %D
 %D \startbuffer[b]
-%D \dunnelijnen[variant=a,achtergrond=kleur]
-%D \dunnelijnen[variant=b,achtergrond=kleur]
-%D \dunnelijnen[variant=c,achtergrond=kleur]
+%D \thinrules[alternativevariant=a,background=color]
+%D \thinrules[alternativevariant=b,background=color]
+%D \thinrules[alternativevariant=c,background=color]
 %D \stopbuffer
 %D
-%D \typebuffer[b] \haalbuffer[a,b]
+%D \typebuffer[b] \getbuffer[a,b]
 %D
 %D \startbuffer[b]
-%D \dunnelijnen[variant=a,hoogte=.8,diepte=.8,achtergrond=kleur]
-%D \dunnelijnen[variant=b,hoogte=.8,diepte=.8,achtergrond=kleur]
-%D \dunnelijnen[variant=c,hoogte=.8,diepte=.8,achtergrond=kleur]
+%D \thinrules[alternativevariant=a,height=.8,depth=.8,background=color]
+%D \thinrules[alternativevariant=b,height=.8,depth=.8,background=color]
+%D \thinrules[alternativevariant=c,height=.8,depth=.8,background=color]
 %D \stopbuffer
 %D
-%D \typebuffer[b] \haalbuffer[a,b]
+%D \typebuffer[b] \getbuffer[a,b]
 
 %D \macros
 %D   {optimizethinrules}
@@ -2389,25 +2398,25 @@
 %D we have in mind.
 %D
 %D \startbuffer[framed-0]
-%D \stelkadertekstenin
-%D   [kader=uit,
-%D    breedte=\hsize,
-%D    achtergrond=raster]
+%D \setupframedtexts
+%D   [frame=off,
+%D    width=\hsize,
+%D    background=screen]
 %D
 %D \startkadertekst
 %D By default the framed text is centered \dots
 %D \stopkadertekst
 %D
-%D \startkadertekst[rechts]
+%D \startkadertekst[right]
 %D \dots\ but we can also align left, middle and right.
 %D \stopkadertekst
 %D \stopbuffer
 %D
 %D \startbuffer[framed-1]
-%D \definieerkadertekst
+%D \defineframedtext
 %D   [Example]
-%D   [breedte=6cm,
-%D    hoogte=5cm]
+%D   [width=6cm,
+%D    height=5cm]
 %D
 %D \startExample
 %D \typebuffer[framed-1]
@@ -2415,9 +2424,9 @@
 %D \stopbuffer
 %D
 %D \startbuffer[framed-2]
-%D \definieerkadertekst
+%D \defineframedtext
 %D   [Example]
-%D   [breedte=6cm]
+%D   [width=6cm]
 %D
 %D \startExample
 %D \typebuffer[framed-2]
@@ -2425,9 +2434,9 @@
 %D \stopbuffer
 %D
 %D \startbuffer[framed-3]
-%D \definieerkadertekst
+%D \defineframedtext
 %D   [Example]
-%D   [hoogte=5cm]
+%D   [height=5cm]
 %D
 %D \startExample
 %D \typebuffer[framed-3]
@@ -2435,18 +2444,18 @@
 %D \stopbuffer
 %D
 %D \startbuffer[framed-4]
-%D \definieerkadertekst
+%D \defineframedtext
 %D   [Example]
-%D   [breedte=passend,hoogte=ruim]
+%D   [width=fit,height=broad]
 %D
 %D \Example{a very exciting example}
 %D \stopbuffer
 %D
-%D \bgroup \steltypenin[marge=0pt] \haalbuffer[framed-0] \egroup
-%D \bgroup \steltypenin[marge=0pt] \haalbuffer[framed-1] \egroup
-%D \bgroup \steltypenin[marge=0pt] \haalbuffer[framed-2] \egroup
-%D \bgroup \steltypenin[marge=0pt] \haalbuffer[framed-3] \egroup
-%D \bgroup \steltypenin[marge=0pt] \haalbuffer[framed-4] \egroup
+%D \bgroup \setuptyping[margin=0pt] \getbuffer[framed-0] \egroup
+%D \bgroup \setuptyping[margin=0pt] \getbuffer[framed-1] \egroup
+%D \bgroup \setuptyping[margin=0pt] \getbuffer[framed-2] \egroup
+%D \bgroup \setuptyping[margin=0pt] \getbuffer[framed-3] \egroup
+%D \bgroup \setuptyping[margin=0pt] \getbuffer[framed-4] \egroup
 %D
 %D Here we can see that we have a predefined framed text class
 %D as well as the tools for defining our own. So we have:
@@ -2467,36 +2476,36 @@
 \def\dodefineframedtext[#1][#2]%
   {\presetlocalframed[\??kd#1]%
    \getparameters[\??kd#1]
-     [\c!breedte=0.75\hsize,
-      \c!hoogte=\v!passend,
-      \c!uitlijnen=\v!ja,
-      \c!boven=,
-      \c!onder=\vfill,
+     [\c!width=0.75\hsize,
+      \c!height=\v!fit,
+      \c!align=\v!yes,
+      \c!top=,
+      \c!bottom=\vfill,
       \c!offset=1em,
-      \c!korps=,
-      \c!letter=,
-      \c!kleur=,
-      \c!links=,
-      \c!rechts=\hfill,
-      \c!voor=\blanko,
-      \c!na=\blanko,
-      \c!binnen=,
-      \c!kader=\v!aan,
-      \c!bovenkader=,
-      \c!onderkader=,
-      \c!linkerkader=,
-      \c!rechterkader=,
-      \c!straal=.5\bodyfontsize,
-      \c!hoek=\v!recht,
-      \c!voorgrondkleur=,
-      \c!voorgrondletter=,
-      \c!achtergrond=,
-      \c!achtergrondkleur=,
-      \c!achtergrondraster=\@@rsraster,
-      \c!regelcorrectie=\v!aan,
-      \c!dieptecorrectie=\v!aan,
-      \c!marge=\v!standaard,
-      \c!orientatie=,
+      \c!bodyfont=,
+      \c!style=,
+      \c!color=,
+      \c!left=,
+      \c!right=\hfill,
+      \c!before=\blank,
+      \c!after=\blank,
+      \c!inner=,
+      \c!frame=\v!on,
+      \c!topframe=,
+      \c!bottomframe=,
+      \c!leftframe=,
+      \c!rightframe=,
+      \c!radius=.5\bodyfontsize,
+      \c!corner=\v!rectangular,
+      \c!foregroundcolor=,
+      \c!foregroundstyle=,
+      \c!background=,
+      \c!backgroundcolor=,
+      \c!backgroundscreen=\@@rsscreen,
+      \c!linecorrection=\v!on,
+      \c!depthcorrection=\v!on,
+      \c!margin=\v!standard,
+      \c!orientation=,
       #2]%
    \setvalue{\e!start#1}{\dostartframedtext[#1]}%
    \setvalue{\e!stop #1}{\dostopframedtext     }%
@@ -2549,55 +2558,19 @@
      \localhsize\hsize
    \fi\fi}
 
-% \def\dododostartframedtext[#1][#2][#3]%
-%   {\doifsomething{#2}{\setvalue{\??kd#1\c!plaats}{#2}}%
-%    \processaction % \v!laag en \v!diepte are already taken !
-%      [\framedtextparameter{#1}\c!plaats]
-%      [  \v!links=>\letvalue{\??kd#1\c!links }\relax
-%                   \letvalue{\??kd#1\c!rechts}\hfill,
-%        \v!rechts=>\letvalue{\??kd#1\c!links }\hfill
-%                   \letvalue{\??kd#1\c!rechts}\relax,
-%        \v!midden=>\letvalue{\??kd#1\c!links }\hfill
-%                   \letvalue{\??kd#1\c!rechts}\hfill,
-%          \v!geen=>\letvalue{\??kd#1\c!links }\relax % new
-%                   \letvalue{\??kd#1\c!rechts}\relax]% new
-%    \letvalue{\??kd#1\c!plaats}\empty
-%    % removed 06/2001
-%    % \forgetparindent
-%    % added 06/2001 [see demo-bbv]
-%    \localhsize\hsize \checkframedtext
-%    % so far
-%    \setbox\framebox\vbox
-%      \startboxedcontent
-%        \hsize\localhsize
-%     %  \insidefloattrue % ? better
-%        \expanded{\switchtobodyfont[\framedtextparameter{#1}\c!korps]}%
-%        \startcolor[\framedtextparameter{#1}\c!kleur]%
-%        \localframed[\??kd#1][\c!strut=\v!nee,#3]%
-%        \bgroup
-%          \let\\=\endgraf
-%          \framedtextparameter{#1}\c!binnen % oud spul
-%          \doifvalue{\??kd#1\c!dieptecorrectie}\v!aan % new, inside box
-%            {\bgroup
-%             \verticalstrut
-%             \vskip-\struttotal}%
-%          \doinhibitblank % \blanko[\v!blokkeer]% plaatst signal
-%          \doconvertfont{\framedtextparameter{#1}\c!letter}\empty
-%          \def\dostopframedtext{\dodostopframedtext{#1}{#2}}}
-
 \def\dododostartframedtext[#1][#2][#3]%
-  {\doifsomething{#2}{\setvalue{\??kd#1\c!plaats}{#2}}%
-   \processaction % \v!laag en \v!diepte are already taken !
-     [\framedtextparameter{#1}\c!plaats]
-     [  \v!links=>\letvalue{\??kd#1\c!links }\relax
-                  \letvalue{\??kd#1\c!rechts}\hfill,
-       \v!rechts=>\letvalue{\??kd#1\c!links }\hfill
-                  \letvalue{\??kd#1\c!rechts}\relax,
-       \v!midden=>\letvalue{\??kd#1\c!links }\hfill
-                  \letvalue{\??kd#1\c!rechts}\hfill,
-         \v!geen=>\letvalue{\??kd#1\c!links }\relax % new
-                  \letvalue{\??kd#1\c!rechts}\relax]% new
-   \letvalue{\??kd#1\c!plaats}\empty
+  {\doifsomething{#2}{\setvalue{\??kd#1\c!location}{#2}}%
+   \processaction % \v!low en \v!depth are already taken !
+     [\framedtextparameter{#1}\c!location]
+     [  \v!left=>\letvalue{\??kd#1\c!left }\relax
+                  \letvalue{\??kd#1\c!right}\hfill,
+       \v!right=>\letvalue{\??kd#1\c!left }\hfill
+                  \letvalue{\??kd#1\c!right}\relax,
+       \v!middle=>\letvalue{\??kd#1\c!left }\hfill
+                  \letvalue{\??kd#1\c!right}\hfill,
+         \v!none=>\letvalue{\??kd#1\c!left }\relax % new
+                  \letvalue{\??kd#1\c!right}\relax]% new
+   \letvalue{\??kd#1\c!location}\empty
    % removed 06/2001
    % \forgetparindent
    % added 06/2001 [see demo-bbv]
@@ -2607,22 +2580,22 @@
      \startboxedcontent
        \hsize\localhsize
     %  \insidefloattrue % ? better
-       \expanded{\switchtobodyfont[\framedtextparameter{#1}\c!korps]}%
-       \startcolor[\framedtextparameter{#1}\c!kleur]%
-       \localframed[\??kd#1][\c!strut=\v!nee,#3]%
+       \expanded{\switchtobodyfont[\framedtextparameter{#1}\c!bodyfont]}%
+       \startcolor[\framedtextparameter{#1}\c!color]%
+       \localframed[\??kd#1][\c!strut=\v!no,#3]%
        \bgroup
          \let\\=\endgraf
-         \framedtextparameter{#1}\c!binnen % oud spul
-         \doifvalue{\??kd#1\c!dieptecorrectie}\v!aan % new, inside box
+         \framedtextparameter{#1}\c!inner % oud spul
+         \doifvalue{\??kd#1\c!depthcorrection}\v!on % new, inside box
            {\bgroup
             \verticalstrut
-            % we need \geenwitruimte in case of setups setting whitespace
+            % we need \nowhitespace in case of setups setting whitespace
             % nb, not safe, text vs \vbox as next
             \vskip-\struttotal
-            \geenwitruimte % na vskip ! new 20/05/2004, fails with next content being box (\scale{..})
+            \nowhitespace % na vskip ! new 20/05/2004, fails with next content being box (\scale{..})
             }%
-         \doinhibitblank % \blanko[\v!blokkeer]% plaatst signal
-         \doconvertfont{\framedtextparameter{#1}\c!letter}\empty
+         \doinhibitblank % \blank[\v!disable]% plaatst signal
+         \doconvertfont{\framedtextparameter{#1}\c!style}\empty
          \def\dostopframedtext{\dodostopframedtext{#1}{#2}}}
 
 %D The \type {none} option is handy for nested usage, as
@@ -2632,7 +2605,7 @@
 \def\dodostopframedtext#1#2% % no \baselinecorrection, see faq docs
   {\endgraf
    \removelastskip
-   \doifvalue{\??kd#1\c!dieptecorrectie}\v!aan % local and global
+   \doifvalue{\??kd#1\c!depthcorrection}\v!on % local and global
      {\forgetall
       \vskip-\struttotal
       \verticalstrut
@@ -2646,11 +2619,11 @@
    \stopboxedcontent
    \stopcolor
    \egroup
-   \doif{#2}\v!geen\insidefloattrue % new
+   \doif{#2}\v!none\insidefloattrue % new
    \ifinsidefloat
      \box\framebox
    \else
-     \doplacement[\??kd#1][\c!dieptecorrectie=\v!uit]{\box\framebox}%
+     \doplacement[\??kd#1][\c!depthcorrection=\v!off]{\box\framebox}%
    \fi
    \egroup}
 
@@ -2661,13 +2634,13 @@
   {\bgroup\dodoubleempty\dodoframedtext}
 
 \def\dodoframedtext[#1][#2]% beware!
-  {\expanded{\switchtobodyfont[\getvalue{\??kd#1\c!korps}]}%
-   \localframed[\??kd#1][\c!strut=\v!nee,#2]%
+  {\expanded{\switchtobodyfont[\getvalue{\??kd#1\c!bodyfont}]}%
+   \localframed[\??kd#1][\c!strut=\v!no,#2]%
      \bgroup
-       \blanko[\v!blokkeer]%
+       \blank[\v!disable]%
        \let\\=\endgraf
-       \getvalue{\??kd#1\c!binnen}%   % kleur naar outer level
-       \dostartattributes{\??kd#1}\c!letter\c!kleur\empty
+       \getvalue{\??kd#1\c!inner}%   % kleur naar outer level
+       \dostartattributes{\??kd#1}\c!style\c!color\empty
        \bgroup
        \aftergroup\docloseframedtext
        \let\next=}
@@ -2704,36 +2677,36 @@
 %D comes in two disguises:
 %D
 %D \startbuffer
-%D \textrule[boven]{fragments}
+%D \textrule[top]{fragments}
 %D   \input reich
 %D \textrule
 %D \stopbuffer
 %D
-%D \bgroup \typebuffer \haalbuffer \egroup
+%D \bgroup \typebuffer \getbuffer \egroup
 %D
 %D \startbuffer
 %D \setuptextrules
-%D   [breedte=90pt,afstand=12pt,lijnkleur=blauw,
-%D    korps=klein,letter=\sc,kleur=rood]
+%D   [width=90pt,distance=12pt,rulecolor=blue,
+%D    bodyfont=small,style=\sc,color=red]
 %D
 %D \starttextrule{Ship Building Tools}
-%D   \nl \steltolerantiein[soepel] \input materie
+%D   \nl \setuptolerance[tolerant] \input materie
 %D \stoptextrule
 %D \stopbuffer
 %D
-%D \bgroup \typebuffer \haalbuffer \egroup
+%D \bgroup \typebuffer \getbuffer \egroup
 %D
 %D \startbuffer
 %D \setuptextrules
-%D   [plaats=inmarge,
-%D    korps=klein,letter=schuinvet]
+%D   [location=inmargin,
+%D    bodyfont=small,style=slantedbold]
 %D
 %D \starttextrule{wonderful}
 %D   \input tufte
 %D \stoptextrule
 %D \stopbuffer
 %D
-%D \bgroup \typebuffer \haalbuffer \egroup
+%D \bgroup \typebuffer \getbuffer \egroup
 %D
 %D The formal definition of these commands is:
 %D
@@ -2750,8 +2723,8 @@
 \def\complextextrule[#1]%
   {\processaction
      [#1]
-     [  \v!boven=>\let\next\dotoptextrule,
-        \v!onder=>\let\next\dobottomtextrule,
+     [  \v!top=>\let\next\dotoptextrule,
+        \v!bottom=>\let\next\dobottomtextrule,
       \s!default=>\let\next\dobottomtextrule,
       \s!unknown=>\let\next\dobottomtextrule]%
    \dosinglegroupempty\next}
@@ -2770,17 +2743,17 @@
       \dimen6=-.5ex
       \advance\dimen4 .5\linewidth
       \advance\dimen6 .5\linewidth
-      \dimen8=\@@tlafstand
+      \dimen8=\@@tldistance
       \doifnothing{#1}\firstargumentfalse
       \iffirstargument
-        \doifelse\@@tlplaats\v!inmarge
-          {\llap{\doattributes\??tl\c!letter\c!kleur{#1}\hskip\linkermargeafstand}}
-          {\color[\@@tllijnkleur]
-             {\vrule\!!height\dimen4\!!depth\dimen6\!!width\@@tlbreedte}%
+        \doifelse\@@tllocation\v!inmargin
+          {\llap{\doattributes\??tl\c!style\c!color{#1}\hskip\leftmargindistance}}
+          {\color[\@@tlrulecolor]
+             {\vrule\!!height\dimen4\!!depth\dimen6\!!width\@@tlwidth}%
            \hbox spread 2\dimen8
-             {\hss\doattributes\??tl\c!letter\c!kleur{\strut#1}\hss}}%
+             {\hss\doattributes\??tl\c!style\c!color{\strut#1}\hss}}%
       \fi
-      \color[\@@tllijnkleur]
+      \color[\@@tlrulecolor]
         {\leaders\hrule\!!height\dimen4\!!depth\dimen6\hfill}}%
    \ht\scratchbox\strutht
    \dp\scratchbox\strutdp
@@ -2790,13 +2763,13 @@
    \egroup}
 
 \def\dotoptextrule#1%
-  {\pagina[\v!voorkeur] % interferes
-   %\witruimte % no
-   \@@tlvoor
+  {\page[\v!preference] % interferes
+   %\whitespace % no
+   \@@tlbefore
    \docomplextextrule{#1}%
 % todo, option: \doifnothing{#1}{\ruledvskip-.5ex}
-   \geenwitruimte
-   \@@tltussen
+   \nowhitespace
+   \@@tlinbetween
    \endgraf}
 
 \def\dodobottomtextrule#1#2%
@@ -2811,26 +2784,26 @@
    \fi
    \advance\dimen0 .5ex
    \vskip\dimen0
-   \@@tltussen
+   \@@tlinbetween
    \doifelsenothing{#2}
      {\bgroup
       \advance\hsize -\rightskip
       \advance\hsize -\leftskip
       \nointerlineskip
       \moveleft-\leftskip\vbox
-        {\color[\@@tllijnkleur]
+        {\color[\@@tlrulecolor]
            {\hrule\!!depth\linewidth\!!height\zeropoint\!!width\hsize}}%
       \egroup}
      {\docomplextextrule{#2}}%
    \ifvmode\prevdepth\zeropoint\fi
    #1%
-   \pagina[\v!voorkeur]}
+   \page[\v!preference]}
 
 \def\dobottomtextrule
-  {\dodobottomtextrule\@@tlna}
+  {\dodobottomtextrule\@@tlafter}
 
 \def\domiddletextrule
-  {\dodobottomtextrule\@@tltussen}
+  {\dodobottomtextrule\@@tlinbetween}
 
 \def\dounknowntextrule
   {\iffirstargument
@@ -2846,7 +2819,7 @@
    \def\dounknowntextrule{\domiddletextrule}
    \dotoptextrule{#1}
    \bgroup
-   \doifsomething\@@tlkorps{\switchtobodyfont[\@@tlkorps]}}
+   \doifsomething\@@tlbodyfont{\switchtobodyfont[\@@tlbodyfont]}}
 
 \def\stoptextrule
   {\par
@@ -2863,10 +2836,10 @@
 %D because they permit us to make questionaires. Let's start
 %D with some examples.
 %D
-%D \fillinrules[n=2,breedte=passend]{first}
-%D \fillinrules[n=2,breedte=ruim]{first}
-%D \fillinrules[n=2,breedte=3cm]{first}
-%D \fillinrules[n=2,breedte=3cm,afstand=.5em,scheider=:]{first}
+%D \fillinrules[n=2,width=fit]{first}
+%D \fillinrules[n=2,width=broad]{first}
+%D \fillinrules[n=2,width=3cm]{first}
+%D \fillinrules[n=2,width=3cm,distance=.5em,separator=:]{first}
 %D \fillinrules[n=2]{first}{last}
 %D \fillintext{first}{last} \input reich \par
 %D
@@ -2885,37 +2858,37 @@
 \def\complexfillinrules[#1]%
   {\def\docomplexfillinrules##1##2%
      {\dodocomplexfillinrules[#1]{##1}{##2}{\thinrules
-        [\c!n=\@@iln,\c!interlinie=\@@ilinterlinie,\c!voor=,\c!na=]}}%
+        [\c!n=\@@iln,\c!interlinespace=\@@ilinterlinespace,\c!before=,\c!after=]}}%
    \dodoublegroupempty\docomplexfillinrules}
 
 \def\dodocomplexfillinrules[#1]#2#3#4%
   {\endgraf
-   \@@ilvoor
+   \@@ilbefore
    \begingroup
    \setupfillinrules[#1]%
    \noindent
-   \doifelse\@@ilbreedte\v!passend
-     {\let\@@ilafstand\!!zeropoint
+   \doifelse\@@ilwidth\v!fit
+     {\let\@@ildistance\!!zeropoint
       \hbox}
-     {\doifelse\@@ilbreedte\v!ruim
+     {\doifelse\@@ilwidth\v!broad
         {\hbox}
-        {\hbox to \@@ilbreedte}}
+        {\hbox to \@@ilwidth}}
      \bgroup
-       \doattributes\??il\c!letter\c!kleur{\strut#2\hfill\@@ilscheider}%
-       \hskip\@@ilafstand
+       \doattributes\??il\c!style\c!color{\strut#2\hfill\@@ilseparator}%
+       \hskip\@@ildistance
      \egroup
   %\hangindent=\wd0\relax % tzt hang=yes,n
   %\parindent=\hangindent
   %\box0\relax
-   \setupwhitespace[\v!groot]%
+   \setupwhitespace[\v!big]%
    \ignorespaces
    #4%
    \doifsomething{#3}
-     {\kern\@@ilafstand
-      \doattributes\??il\c!letter\c!kleur{#3\strut}}%
+     {\kern\@@ildistance
+      \doattributes\??il\c!style\c!color{#3\strut}}%
    \endgroup
    \endgraf
-   \@@ilna}
+   \@@ilafter}
 
 %D \macros
 %D   {fillintext}
@@ -2943,11 +2916,11 @@
 %D
 %D \startbuffer
 %D \fillinline \input reich \par
-%D \fillinline[marge=0cm] \input reich \par
+%D \fillinline[margin=0cm] \input reich \par
 %D \stopbuffer
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D which was typeset by saying:
@@ -2965,19 +2938,19 @@
 \definecomplexorsimpleempty\fillinline
 
 \def\complexfillinline[#1]%
-  {%\endgraf % interferes with \doordefinieren cum suis
-   \@@ivvoor
+  {%\endgraf % interferes with \definedescription cum suis
+   \@@ivbefore
    \begingroup
    \setupfillinlines[#1]%
-   \advance\rightskip \@@ivmarge
+   \advance\rightskip \@@ivmargin
    \parfillskip\zeropoint
    \def\par % very dangerous
      {\let\par\endgraf % -)
       \unskip\hfill
-      \dimen0=\@@ivbreedte
-      \advance\dimen0 -\@@ivafstand
-      \ifdim\dimen0>\@@ivmarge\else\expandafter\rlap\fi
-        {\kern\@@ivafstand
+      \dimen0=\@@ivwidth
+      \advance\dimen0 -\@@ivdistance
+      \ifdim\dimen0>\@@ivmargin\else\expandafter\rlap\fi
+        {\kern\@@ivdistance
          \vrule
            \!!width   \dimen0
            \!!height.5\linewidth
@@ -2985,27 +2958,27 @@
       \endgraf % !
       \endgroup
       \endgraf % !
-      \@@ilna}}
+      \@@ilafter}}
 
 %D \stopdocumentation
 %D \bgroup
 %D
-%D \stelkadertekstenin
+%D \setupframedtexts
 %D   [setuptext]
-%D   [achtergrond=kleur,achtergrondkleur=wit]
+%D   [background=color,backgroundcolor=white]
 %D
 %D \startbuffer
-%D \stelachtergrondin
-%D   [achtergrondoffset=4pt,
-%D    achtergrond=raster,
-%D    kader=aan,
-%D    kaderkleur=rood,
-%D    linkeroffset=2pt]
+%D \setupbackground
+%D   [backgroundoffset=4pt,
+%D    background=screen,
+%D    frame=on,
+%D    framecolor=red,
+%D    leftoffset=2pt]
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
-%D \startachtergrond
+%D \startbackground
 %D
 %D \macros
 %D   {setupbackground,startbackground,background}
@@ -3032,7 +3005,7 @@
 
 \def\dosetupbackground[#1]%
   {\getparameters[\??ag][#1]%
-   \doifelse\@@agstatus\v!start
+   \doifelse\@@agstate\v!start
      {\let\startbackground\dostartbackground
       \let\stopbackground \dostopbackground
       \let\background     \dobackground}
@@ -3063,9 +3036,9 @@
    \bgroup
    \setbox0\vbox\bgroup
      \vbox to \lineheight{}\vskip\zeropoint
-     \blanko[\v!blokkeer]
-     \advance\hsize -\@@aglinkeroffset
-     \advance\hsize -\@@agrechteroffset}
+     \blank[\v!disable]
+     \advance\hsize -\@@agleftoffset
+     \advance\hsize -\@@agrightoffset}
 
 %D This dummy line is removed by \type{\setbox2=\vsplit0 to
 %D \lineheight}. That way \type{\topskip} takes care of the
@@ -3082,17 +3055,17 @@
    \setbox2\vsplit0 to \lineheight % get rid of fake line
    \loop
      \ifdim\pagetotal=\zeropoint % empty page
-       \scratchdimen\teksthoogte
+       \scratchdimen\textheight
        \chardef\backgroundsplit1 % split to max height
      \else
        \scratchdimen\pagegoal
-       \setbox\scratchbox\vbox{\@@agvoor}%
+       \setbox\scratchbox\vbox{\@@agbefore}%
        \advance\scratchdimen -\ht\scratchbox
        \advance\scratchdimen -\pagetotal
        \chardef\backgroundsplit2 % split to partial height
      \fi
-     \advance\scratchdimen -\@@agbovenoffset
-     \advance\scratchdimen -\@@agonderoffset \relax
+     \advance\scratchdimen -\@@agtopoffset
+     \advance\scratchdimen -\@@agbottomoffset \relax
      \ifdim\scratchdimen>2\lineheight\relax % reasonable, will be configurable
        \ifdim\ht0>\scratchdimen % larger than page
          \setbox2\vsplit0 to \scratchdimen
@@ -3100,32 +3073,32 @@
          \setbox2\box0
          \chardef\backgroundsplit0 % no split
        \fi
-       \setbox2\vbox \ifcase\backgroundsplit\or to \teksthoogte \fi % max split
-         {\vskip\@@agbovenoffset
+       \setbox2\vbox \ifcase\backgroundsplit\or to \textheight \fi % max split
+         {\vskip\@@agtopoffset
           \popsplitproperties
           \unvcopy2
           \prevdepth\dp2
           \obeydepth
-          \vskip\@@agonderoffset
+          \vskip\@@agbottomoffset
           \vfill}
-       \@@agvoor
+       \@@agbefore
        \ifcase\backgroundsplit\or\or % partial split
 \ifdim\pagegoal<\maxdimen
          \pagegoal=1.2\pagegoal % be a bit more tolerant
 \fi
        \fi
-       \startregelcorrectie
+       \startlinecorrection
          \localframed
            [\??ag][\c!offset=\v!overlay]
-           {\hskip\@@aglinkeroffset\box2\hskip\@@agrechteroffset}%
-       \stopregelcorrectie
+           {\hskip\@@agleftoffset\box2\hskip\@@agrightoffset}%
+       \stoplinecorrection
        \ifcase\backgroundsplit % no split
-         \@@agna
+         \@@agafter
        \else % some split
-         \vfill\eject % geen \pagina !
+         \vfill\eject % geen \page !
        \fi
      \else
-       \pagina
+       \page
      \fi
    \ifdim\ht0>\zeropoint \repeat
    \egroup
@@ -3143,7 +3116,7 @@
      \vbox}
 
 %D \stopdocumentation
-%D \stopachtergrond
+%D \stopbackground
 %D \egroup
 
 %D New, for the moment private; let's see when GB finds out
@@ -3181,52 +3154,21 @@
 %D
 %D \typebuffer
 
-% test this on demo-bbv/demo-bbi !
-%
-% \def\startframedcontent[#1]%
-%   {\bgroup
-%    \doifelse{#1}\v!uit
-%      {\let\stopframedcontent\egroup}
-%      {\doifdefinedelse{\??kd#1\c!kader}
-%         {\doifelsevalue{\??kd#1\c!regelcorrectie}\v!ja
-%            {\ifinsidefloat % binnen \stopframedcontent
-%               \def\stopframedcontent
-%                 {\framedtextparameter{#1}\c!rechts
-%                  \egroup
-%                  \egroup}%
-%             \else
-%               \def\stopframedcontent
-%                 {\framedtextparameter{#1}\c!rechts
-%                  \egroup
-%                  \stopbaselinecorrection
-%                  \egroup}%
-%               \startbaselinecorrection
-%             \fi}
-%            {\def\stopframedcontent
-%               {\framedtextparameter{#1}\c!rechts
-%                \egroup
-%                \egroup}}%
-%          \doifvalue{\??kd#1\c!breedte}\v!passend
-%            {\letvalue{\??kd#1\c!breedte}\v!vast}%
-%          \doframedtext[#1][]\insidefloattrue
-%          \framedtextparameter{#1}\c!links}
-%         {\let\stopframedcontent\egroup}}}
-
 \def\defineframedcontent
   {\dodoubleempty\dodefineframedcontent}
 
 \def\dodefineframedcontent[#1][#2]%
   {\presetlocalframed[\??fc#1]%
    \getparameters[\??fc#1]
-     [\c!linkeroffset=\zeropoint,
-      \c!rechteroffset=\getvalue{\??fc#1\c!linkeroffset},
-      \c!bovenoffset=\zeropoint,
-      \c!onderoffset=\getvalue{\??fc#1\c!bovenoffset},
-      \c!strut=\v!nee,
+     [\c!leftoffset=\zeropoint,
+      \c!rightoffset=\getvalue{\??fc#1\c!leftoffset},
+      \c!topoffset=\zeropoint,
+      \c!bottomoffset=\getvalue{\??fc#1\c!topoffset},
+      \c!strut=\v!no,
       \c!offset=\v!overlay,
-      \c!regelcorrectie=\v!nee,
-      \c!links=,
-      \c!rechts=,
+      \c!linecorrection=\v!no,
+      \c!left=,
+      \c!right=,
       #2]}
 
 \def\setupframedcontent
@@ -3239,8 +3181,8 @@
 \def\startframedcontent[#1]%
   {\bgroup
    \let\stopframedcontent\egroup
-   \doifnot{#1}\v!uit
-     {\doifdefined{\??fc#1\c!kader}
+   \doifnot{#1}\v!off
+     {\doifdefined{\??fc#1\c!frame}
         {\def\stopframedcontent{\dostopframedcontent{#1}}%
          \dostartframedcontent{#1}}}}
 
@@ -3248,37 +3190,37 @@
   {\setbox\framebox\hbox\bgroup
      \setlocalhsize
      \hsize\localhsize
-     \advance\hsize-\getvalue{\??fc#1\c!linkeroffset}%
-     \advance\hsize-\getvalue{\??fc#1\c!rechteroffset}%
-     \advance\vsize-\getvalue{\??fc#1\c!bovenoffset}%
-     \advance\vsize-\getvalue{\??fc#1\c!onderoffset}%
-     \hskip\getvalue{\??fc#1\c!linkeroffset}%
+     \advance\hsize-\getvalue{\??fc#1\c!leftoffset}%
+     \advance\hsize-\getvalue{\??fc#1\c!rightoffset}%
+     \advance\vsize-\getvalue{\??fc#1\c!topoffset}%
+     \advance\vsize-\getvalue{\??fc#1\c!bottomoffset}%
+     \hskip\getvalue{\??fc#1\c!leftoffset}%
      \vbox\bgroup
-     \vskip\getvalue{\??fc#1\c!bovenoffset}%
+     \vskip\getvalue{\??fc#1\c!topoffset}%
      \vbox\bgroup
      \forgetall
-     \blanko[\v!blokkeer]}
+     \blank[\v!disable]}
 
 \def\dostopframedcontent#1%
   {\removelastskip
    \egroup
-   \vskip\getvalue{\??fc#1\c!onderoffset}%
+   \vskip\getvalue{\??fc#1\c!bottomoffset}%
    \egroup
-   \hskip\getvalue{\??fc#1\c!rechteroffset}%
+   \hskip\getvalue{\??fc#1\c!rightoffset}%
    \egroup
-   \doifvalue{\??fc#1\c!breedte}\v!passend
-     {\letvalue{\??fc#1\c!breedte}\v!vast}%
+   \doifvalue{\??fc#1\c!width}\v!fit
+     {\letvalue{\??fc#1\c!width}\v!fixed}%
    \ifinsidefloat
      \donefalse
    \else
-     \doifelsevalue{\??fc#1\c!regelcorrectie}\v!ja\donetrue\donefalse
+     \doifelsevalue{\??fc#1\c!linecorrection}\v!yes\donetrue\donefalse
    \fi
    % plaats ?
-   \ifdone\startregelcorrectie\fi
-   \getvalue{\??fc#1\c!links}% new
+   \ifdone\startlinecorrection\fi
+   \getvalue{\??fc#1\c!left}% new
    \localframed[\??fc#1]{\box\framebox}%
-   \getvalue{\??fc#1\c!rechts}% new
-   \ifdone\stopregelcorrectie\fi
+   \getvalue{\??fc#1\c!right}% new
+   \ifdone\stoplinecorrection\fi
    \egroup}
 
 %D \macros
@@ -3322,118 +3264,118 @@
 %   [\c!lijndikte=\v!middel]
 
 \setuplinewidth
-  [\v!middel]
+  [\v!medium]
 
 \setupframed
-  [\c!breedte=\v!passend,
-   \c!hoogte=\v!ruim,
-   \c!regels=,
+  [\c!width=\v!fit,
+   \c!height=\v!broad,
+   \c!lines=,
    \c!offset=0.25ex,  % \defaultframeoffset
-   \c!leeg=\v!nee,
-   \c!kader=\v!aan,
-   \c!bovenkader=,
-   \c!onderkader=,
-   \c!linkerkader=,
-   \c!rechterkader=,
-   \c!straal=.5\bodyfontsize,
-   \c!lijndikte=\linewidth,
-   \c!hoek=\v!recht,
-   \c!diepte=\!!zeropoint,
-   \c!voorgrondkleur=,
-   \c!voorgrondletter=,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=,
-   \c!achtergrondoffset=\!!zeropoint,
-   \c!kaderkleur=,
-   \c!kaderoffset=\!!zeropoint,
+   \c!empty=\v!no,
+   \c!frame=\v!on,
+   \c!topframe=,
+   \c!bottomframe=,
+   \c!leftframe=,
+   \c!rightframe=,
+   \c!radius=.5\bodyfontsize,
+   \c!rulethickness=\linewidth,
+   \c!corner=\v!rectangular,
+   \c!depth=\!!zeropoint,
+   \c!foregroundcolor=,
+   \c!foregroundstyle=,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=,
+   \c!backgroundoffset=\!!zeropoint,
+   \c!framecolor=,
+   \c!frameoffset=\!!zeropoint,
    \c!component=,
-   \c!uitlijnen=,
-   \c!onder=\vss,
-   \c!boven=,
-   \c!strut=\v!ja,
-   \c!plaats=\v!normaal,
-   \c!orientatie=,
+   \c!align=,
+   \c!bottom=\vss,
+   \c!top=,
+   \c!strut=\v!yes,
+   \c!location=\v!normal,
+   \c!orientation=,
    \c!setups=]
 
 \setupscreens
   [\c!factor=1.0,
-   \c!methode=\v!extern,    % \c!methode=\v!punt
-   \c!raster=0.95]
+   \c!method=\v!external,    % \c!method=\v!dot
+   \c!screen=0.95]
 
 \setupblackrules
   [\c!n=3,
-   \c!breedte=1em,
-   \c!hoogte=1ex,
-   \c!diepte=\!!zeropoint,
-   \c!variant=\c!a,
-   \c!afstand=.25ex,
-   \c!kleur=]
+   \c!width=1em,
+   \c!height=1ex,
+   \c!depth=\!!zeropoint,
+   \c!alternative=\c!a,
+   \c!distance=.25ex,
+   \c!color=]
 
 \setupmarginrules
-  [\c!niveau=0,
-   \c!lijndikte=\@@kadefaultwidth\linewidth]
+  [\c!level=0,
+   \c!rulethickness=\@@kadefaultwidth\linewidth]
 
 \setupthinrules
-  [\c!interlinie=\v!klein,
+  [\c!interlinespace=\v!small,
    \c!n=3,
-   \c!voor=,
-   \c!tussen={\blanko[\v!wit]},
-   \c!na=,
-   \c!kleur=,
-   \c!hoogte=.5\linewidth,
-   \c!diepte=.5\linewidth,
-   \c!kader=\v!aan, % compatible with textbackgrounds
-   \c!variant=\v!b,
-   \c!achtergrondkleur=,
-   \c!achtergrond=,
-   \c!lijndikte=]
+   \c!before=,
+   \c!inbetween={\blank[\v!white]},
+   \c!after=,
+   \c!color=,
+   \c!height=.5\linewidth,
+   \c!depth=.5\linewidth,
+   \c!frame=\v!on, % compatible with textbackgrounds
+   \c!alternative=\v!b,
+   \c!backgroundcolor=,
+   \c!background=,
+   \c!rulethickness=]
 
 \setuptextrules
-  [\c!plaats=\v!links,
-   \c!voor=\blanko,
-   \c!na=\blanko,
-   \c!tussen=,
-   \c!breedte=2em,
-   \c!letter=\v!vet,
-   \c!kleur=,
-   \c!lijnkleur=,
-   \c!korps=,
-   \c!afstand=.5em]
+  [\c!location=\v!left,
+   \c!before=\blank,
+   \c!after=\blank,
+   \c!inbetween=,
+   \c!width=2em,
+   \c!style=\v!bold,
+   \c!color=,
+   \c!rulecolor=,
+   \c!bodyfont=,
+   \c!distance=.5em]
 
 \setupfillinrules
-  [\c!breedte=\v!ruim,
-   \c!afstand=1em,
-   \c!voor=\blanko,
-   \c!na=\blanko,
+  [\c!width=\v!broad,
+   \c!distance=1em,
+   \c!before=\blank,
+   \c!after=\blank,
    \c!n=1,
-   \c!interlinie=\v!klein,
-   \c!scheider=,
-   \c!letter=\v!normaal,
-   \c!kleur=]
+   \c!interlinespace=\v!small,
+   \c!separator=,
+   \c!style=\v!normal,
+   \c!color=]
 
 \setupfillinlines
-  [\c!breedte=3cm,
-   \c!marge=\@@ivbreedte,
-   \c!afstand=1em,
-   \c!voor=\blanko,
-   \c!na=\blanko]
+  [\c!width=3cm,
+   \c!margin=\@@ivwidth,
+   \c!distance=1em,
+   \c!before=\blank,
+   \c!after=\blank]
 
 \setupbackground
-  [\c!linkeroffset=.5\bodyfontsize,
-   \c!rechteroffset=\@@aglinkeroffset,
-   \c!bovenoffset=\!!zeropoint,
-   \c!onderoffset=\@@agbovenoffset,
-   \c!status=\v!start,
-   \c!straal=.5\bodyfontsize,
-   \c!hoek=\v!recht,
-   \c!kader=\v!uit,
-   \c!kleur=,
-   \c!diepte=\!!zeropoint,
-   \c!achtergrond=\v!raster,
-   \c!achtergrondkleur=\@@agkleur,
-   \c!raster=\@@rsraster,
-   \c!voor=,
-   \c!na=]
-
-\protect \endinput
\ No newline at end of file
+  [\c!leftoffset=.5\bodyfontsize,
+   \c!rightoffset=\@@agleftoffset,
+   \c!topoffset=\!!zeropoint,
+   \c!bottomoffset=\@@agtopoffset,
+   \c!state=\v!start,
+   \c!radius=.5\bodyfontsize,
+   \c!corner=\v!rectangular,
+   \c!frame=\v!off,
+   \c!color=,
+   \c!depth=\!!zeropoint,
+   \c!background=\v!screen,
+   \c!backgroundcolor=\@@agcolor,
+   \c!screen=\@@rsscreen,
+   \c!before=,
+   \c!after=]
+
+\protect \endinput
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index 649382a34..b455f8ac2 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-sec,
+%D   [       filefile=core-sec,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Sectioning,
@@ -132,32 +132,32 @@
 \def\dodochecknummer#1#2#3% will become ugly after speed up
   {\bgroup
    \doifinstringelse{.0}{.#2}
-     {\doifnot{#3}\v!per
-        {%\debuggerinfo\m!systems{number #1 #3 becomes \getnumbervariable{#1\c!wijze}}%
-         \setevalue{\@@thenumber{#1}\c!wijze}{#3}% geen \xdef, gaat mis met \subpage
+     {\doifnot{#3}\v!by
+        {%\debuggerinfo\m!systems{number #1 #3 becomes \getnumbervariable{#1\c!way}}%
+         \setevalue{\@@thenumber{#1}\c!way}{#3}% geen \xdef, gaat mis met \subpage
          \dochecknummer{#1}}} % tricky and ugly
      {\doifnotvalue{\@@thenumber{#1}\s!check}{#2}
         {\setcounter{\@@thenumber{#1}}{0\getvalue{\@@thenumber{#1}\c!start}}%
-         \setxvalue{\@@thenumber{#1}\c!wijze\c!lokaal}%
-           {\getvalue{\@@thenumber{#1}\c!wijze}}%
+         \setxvalue{\@@thenumber{#1}\c!way\c!local}%
+           {\getvalue{\@@thenumber{#1}\c!way}}%
          \setxvalue{\@@thenumber{#1}\s!check}%
            {#2}}}%
    \egroup}
 
 \def\dochecknummer#1%
-  {\edef\currentsection{\csname\??by\csname\@@thenumber{#1}\c!wijze\endcsname\endcsname}%
+  {\edef\currentsection{\csname\??by\csname\@@thenumber{#1}\c!way\endcsname\endcsname}%
    \ifx\currentsection\empty\else
      \dodochecknummer
        {#1}%
-       {\csname\currentsection\c!nummer\endcsname}%
-       {\v!per\previoussection\currentsection}%
+       {\csname\currentsection\c!number\endcsname}%
+       {\v!by\previoussection\currentsection}%
    \fi}
 
 \def\checknummer#1%
   {\bgroup
   %\ifcase\blocklevel\else
    \ifdoingblocks
-     \doifnotvalue{\@@thenumber{#1}\c!blokwijze}\v!nee\setblockcounters
+     \doifnotvalue{\@@thenumber{#1}\c!blockway}\v!no\setblockcounters
    \fi
    \dochecknummer{#1}%
    \egroup}
@@ -166,18 +166,18 @@
   {\bgroup % added
    \globallet\voorafgaandenummer\empty
    \ifsectienummer
-     \doifvalue{\??sb\@@sectieblok\c!nummer}\v!ja % added
-       {\doifelsevalue{\@@thenumber{#1}\c!sectienummer}\v!ja
+     \doifvalue{\??sb\@@sectieblok\c!number}\v!yes % added
+       {\doifelsevalue{\@@thenumber{#1}\c!sectionnumber}\v!yes
           \donetrue\donefalse
-        \doifvalue{\@@thenumber{#1}\c!sectienummer}\v!nummer
+        \doifvalue{\@@thenumber{#1}\c!sectionnumber}\v!number
           {\donetrue\let\@@sectionconversion\gobbleoneargument}%
         \ifdone
           \edef\currentsection
-            {\getvalue{\??by\getvalue{\@@thenumber{#1}\c!wijze\c!lokaal}}}%
+            {\getvalue{\??by\getvalue{\@@thenumber{#1}\c!way\c!local}}}%
           \doifnot{\currentsection}\zerosection
             {\doifnot{\@@sectionvalue{\currentsection}}{0}
                {\xdef\voorafgaandenummer%
-                  {\getvalue{\currentsection\c!nummer}.}}}%
+                  {\getvalue{\currentsection\c!number}.}}}%
         \fi}%
    \fi
    \egroup}
@@ -187,7 +187,7 @@
   %\ifnum\blocklevel>0
   %\ifcase\blocklevel\else
    \ifdoingblocks
-     \doifnotvalue{\@@thenumber{#1}\c!blokwijze}\v!nee\setblockcounters
+     \doifnotvalue{\@@thenumber{#1}\c!blockway}\v!no\setblockcounters
    \fi
    \domaakvoorafgaandenummer[#1]%
    \egroup}
@@ -195,7 +195,7 @@
 % \def\maakhetnummer[#1]%
 %   {\maakvoorafgaandenummer[#1]%
 %    \xdef\hetnummer%
-%      {\voorafgaandenummer\nummer[#1]}}%
+%      {\voorafgaandenummer\convertednumber[#1]}}%
 %
 % hack needed for chinese and oldstyle in normal tex, will change
 
@@ -204,7 +204,7 @@
    \forceunexpanded % i don't like this hack
    \maakvoorafgaandenummer[#1]%
    \xdef\hetnummer% was \xdef maar dat gaat fout met font switches
-     {\voorafgaandenummer\nummer[#1]}%
+     {\voorafgaandenummer\convertednumber[#1]}%
    \egroup}
 
 % \def\preparethenumber#1#2#3% {\??id#1} \number \result
@@ -215,96 +215,96 @@
 %       \edef#3{\@EA\separatednumber\@EA{#2}}}}  % hm, etex
 
 \def\preparethenumber#1#2#3% {\??id#1} \number \result
-  {\doifelsevaluenothing{#1\c!scheider}
+  {\doifelsevaluenothing{#1\c!separator}
      {\let\numberseparator\empty
       \let#3#2}
      {% was \unexpanded \edef, but we need it unexpanded !
-      \edef\numberseparator{\getvalue{#1\c!scheider}}%
+      \edef\numberseparator{\getvalue{#1\c!separator}}%
       \edef#3{\@EA\separatednumber\@EA{#2}}}}  % hm, etex
 
 \def\lossenummer[#1]%
   {\maakhetnummer[#1]%
    \hetnummer}
 
-%\def\huidigenummer[#1]%
+%\def\currentnumber[#1]%
 %  {%\getvalue{\getvalue{\@@thenumber{#1}\c!zetwijze}}%
 %   \getvalue{\getvalue{\@@thenumber{#1}\c!plaats}}%
 %     {\dotextprefix{\getvalue{\@@thenumber{#1}\c!tekst}}\lossenummer[#1]}}
 
-\def\huidigenummer[#1]% kan tekst hier weg ?
-  {\dotextprefix{\getvalue{\@@thenumber{#1}\c!tekst}}\lossenummer[#1]}
+\def\currentnumber[#1]% kan tekst hier weg ?
+  {\dotextprefix{\getvalue{\@@thenumber{#1}\c!text}}\lossenummer[#1]}
 
-\def\volgendenummer[#1][#2][#3]%
-  {\verhoognummer[#1]%
-   \huidigenummer[#1]%
+\def\nextnumber[#1][#2][#3]%
+  {\incrementnumber[#1]%
+   \currentnumber[#1]%
    \rawreference{#2}{#3}{\hetnummer}}
 
 % sectioning
 
 \newcount\nofsections
 
-\let\zerosection \v!tekst
+\let\zerosection \v!text
 \let\firstsection\empty
 \let\lastsection \empty
 \let\@@sectie    \empty
 \let\@@koppeling \empty
 
-\makecounter{\??se\v!tekst}
+\makecounter{\??se\v!text}
 
-\letvalueempty{\??se\v!tekst\c!voor}
-\letvalueempty{\??se\v!tekst\c!na  }
+\letvalueempty{\??se\v!text\c!before}
+\letvalueempty{\??se\v!text\c!after  }
 
-\setvalue     {\v!tekst\c!nummer}{0}
-\letvalueempty{\v!tekst\s!format}
+\setvalue     {\v!text\c!number}{0}
+\letvalueempty{\v!text\s!format}
 
-\letvalueempty{\??sk\v!tekst}
+\letvalueempty{\??sk\v!text}
 \letvalueempty{\??sk        }
 
-\letvalue{\??by               }\v!tekst
-\letvalue{\??by\v!tekst       }\v!tekst
-\letvalue{\??by\v!alles       }\v!tekst
-\letvalue{\??by\v!per         }\v!tekst
-\letvalue{\??by\v!per\v!tekst }\v!tekst
-\letvalue{\??by\v!per\v!alles }\v!tekst
-\letvalue{\??by\v!per\v!pagina}\v!tekst % see footnotes
+\letvalue{\??by               }\v!text
+\letvalue{\??by\v!text       }\v!text
+\letvalue{\??by\v!all       }\v!text
+\letvalue{\??by\v!by         }\v!text
+\letvalue{\??by\v!by\v!text }\v!text
+\letvalue{\??by\v!by\v!all }\v!text
+\letvalue{\??by\v!by\v!page}\v!text % see footnotes
 
 %%%%%%%%% old
 
-\def\dostelsectiein[#1][#2]%
+\def\dosetupsection[#1][#2]%
   {\getparameters[\??se#1][#2]%
-   \doifelsevalue{\??se#1\c!vorigenummer}\v!ja
-     {\setvalue{#1\c!nummer}{\@@longsectionnumber{#1}}}
-     {\setvalue{#1\c!nummer}{\@@shortsectionnumber{#1}}}}
+   \doifelsevalue{\??se#1\c!previousnumber}\v!yes
+     {\setvalue{#1\c!number}{\@@longsectionnumber{#1}}}
+     {\setvalue{#1\c!number}{\@@shortsectionnumber{#1}}}}
 
-\def\stelsectiein%
-  {\dodoubleargument\dostelsectiein}
+\def\setupsection%
+  {\dodoubleargument\dosetupsection}
 
 %%%%%%%%% new, multilingual
 
-\def\dostelsectiein[#1][#2][#3]%
+\def\dosetupsection[#1][#2][#3]%
   {\ifthirdargument
      \getparameters[\??se#1#2][#3]%
    \else
      \getparameters[\??se#1][#2]%
    \fi
-   \doifelsevalue{\??se#1\c!vorigenummer}\v!ja
-     {\setvalue{#1\c!nummer}{\@@longsectionnumber {#1}}}
-     {\setvalue{#1\c!nummer}{\@@shortsectionnumber{#1}}}}
+   \doifelsevalue{\??se#1\c!previousnumber}\v!yes
+     {\setvalue{#1\c!number}{\@@longsectionnumber {#1}}}
+     {\setvalue{#1\c!number}{\@@shortsectionnumber{#1}}}}
 
-\def\stelsectiein%
-  {\dotripleempty\dostelsectiein}
+\def\setupsection%
+  {\dotripleempty\dosetupsection}
 
 %%%%%%%%%
 
 \def\docouplemarking[#1][#2]%
-  {\doifdefinedelse{\??ko#2\c!sectie}
-     {\docouplemarking[#1][\getvalue{\??ko#2\c!sectie}]}
+  {\doifdefinedelse{\??ko#2\c!section}
+     {\docouplemarking[#1][\getvalue{\??ko#2\c!section}]}
      {\def\donexttrackcommando##1%
-        {\edef\coupledmarkings{\getvalue{\??se##1\c!markering}}%
+        {\edef\coupledmarkings{\getvalue{\??se##1\c!marking}}%
          \doifelse{##1}{#2}
            {\addtocommalist{#1}\coupledmarkings}
            {\removefromcommalist{#1}\coupledmarkings}%
-         \setevalue{\??se##1\c!markering}{\coupledmarkings}%
+         \setevalue{\??se##1\c!marking}{\coupledmarkings}%
          \donexttracklevel{##1}}%
       \donexttracklevel{\zerosection}}} % \firstsection
 
@@ -314,31 +314,31 @@
 \def\decouplemarking[#1]%
   {\couplemarking[#1][]}
 
-\def\definieersectie[#1]%
+\def\definesection[#1]%
   {\doifundefined{\??se#1}
      {\doifelsenothing\firstsection
         {\def\firstsection{#1}%
-         \setevalue{\??se#1\c!voor}{\v!tekst}%
-         \setevalue{\??se\v!tekst\c!na}{#1}}
-        {\setevalue{\??se\commalistelement\c!na}{#1}%
-         \setevalue{\??se#1\c!voor}{\lastsection}%
-         \setevalue{\??se\lastsection\c!na}{#1}}%
+         \setevalue{\??se#1\c!before}{\v!text}%
+         \setevalue{\??se\v!text\c!after}{#1}}
+        {\setevalue{\??se\commalistelement\c!after}{#1}%
+         \setevalue{\??se#1\c!before}{\lastsection}%
+         \setevalue{\??se\lastsection\c!after}{#1}}%
       \advance\nofsections \plusone
-      \setevalue{\??se#1\c!niveau}{\the\nofsections}%
-      \letvalue{\??se#1\c!na}\empty
-      \setvalue{\e!volgende#1}{\@@nextsectionnumber{#1}}%
-      \setvalue{#1\c!nummer}{\@@longsectionnumber{#1}}%
+      \setevalue{\??se#1\c!level}{\the\nofsections}%
+      \letvalue{\??se#1\c!after}\empty
+      \setvalue{\e!next#1}{\@@nextsectionnumber{#1}}%
+      \setvalue{#1\c!number}{\@@longsectionnumber{#1}}%
       \setvalue{#1\s!format}{\@@longformatnumber{#1}}%
       \setevalue{\??by#1}{#1}%
-      \setevalue{\??by\v!per#1}{#1}%
+      \setevalue{\??by\v!by#1}{#1}%
       \makecounter{\??se#1}%
       \edef\lastsection{#1}%
       \setvalue{\??sk#1}{#1}%
-      \letvalue{\??se#1\c!markering}\empty
-      \stelsectiein[#1][\c!vorigenummer=\v!ja]}}%
+      \letvalue{\??se#1\c!marking}\empty
+      \setupsection[#1][\c!previousnumber=\v!yes]}}%
 
-\def\previoussection#1{\csname\??se#1\c!voor\endcsname}
-\def\nextsection    #1{\csname\??se#1\c!na  \endcsname}
+\def\previoussection#1{\csname\??se#1\c!before\endcsname}
+\def\nextsection    #1{\csname\??se#1\c!after  \endcsname}
 
 \def\@@setsectionnumber#1#2%
   {\letgvalueempty{\??se#1\s!start}% signal i.p.v. boolean
@@ -375,19 +375,19 @@
 
 \def\@@sectionconversion#1#2% a doublure with \@@shortsectionnumber
   {\ifnum#2=0 0\else % else troubles with \uchar
-     \@EA\ifx\csname\??se#1\@@sectieblok\c!conversie\endcsname\relax
-       \@EA\ifx\csname\??se#1\c!conversie\endcsname\relax
+     \@EA\ifx\csname\??se#1\@@sectieblok\c!conversion\endcsname\relax
+       \@EA\ifx\csname\??se#1\c!conversion\endcsname\relax
          #2%
        \else
-         \convertnumber{\getvalue{\??se#1\c!conversie}}{#2}%
+         \convertnumber{\getvalue{\??se#1\c!conversion}}{#2}%
        \fi
      \else
-       \convertnumber{\getvalue{\??se#1\@@sectieblok\c!conversie}}{#2}%
+       \convertnumber{\getvalue{\??se#1\@@sectieblok\c!conversion}}{#2}%
      \fi
    \fi}
 
 \def\@@sectionlevel#1%
-  {\ifundefined{\??se#1\c!niveau}0\else\getvalue{\??se#1\c!niveau}\fi}
+  {\ifundefined{\??se#1\c!level}0\else\getvalue{\??se#1\c!level}\fi}
 
 % Omdat een markering kan worden herdefinieerd moeten we
 % eerst testen of er wel een keten||afhankelijkheid is.
@@ -401,8 +401,8 @@
    \fi}
 
 \def\doresetsectionmarks#1%
-  {\ifundefined{\??se#1\c!markering}\else % skip zero level
-     \fastresetmarkerlist[\csname\??se#1\c!markering\endcsname]%
+  {\ifundefined{\??se#1\c!marking}\else % skip zero level
+     \fastresetmarkerlist[\csname\??se#1\c!marking\endcsname]%
    \fi
    \donexttracklevel{#1}}
 
@@ -435,7 +435,7 @@
 
 \def\doresetsectioncounters#1%
   {\resetcounter{\??se#1}%
-   \letgvalue{\??se#1\c!eigennummer}\relax
+   \letgvalue{\??se#1\c!ownnumber}\relax
    \donexttracklevel{#1}}
 
 \def\resetsectioncounters % #1
@@ -468,7 +468,7 @@
   {\doifnot{#1}\lastsection
      {\donexttrackcommando{\nextsection{#1}}}}
 
-\chardef\alltoclevels\zerocount % \newif\ifalllevels
+\chardef\alltoclevels\zerocount
 
 \let\currentlevel\empty
 
@@ -493,8 +493,8 @@
    \globallet\currentlevel\empty}
 
 \def\dosetotherlevel#1%
-  {\doifdefinedelse{\??ko#1\c!sectie}              % beter alteratief: ook
-     {\edef\@@sectie{\getvalue{\??ko#1\c!sectie}}} % hoofdstuk\c!format
+  {\doifdefinedelse{\??ko#1\c!section}              % beter alteratief: ook
+     {\edef\@@sectie{\getvalue{\??ko#1\c!section}}} % hoofdstuk\c!format
      {\edef\@@sectie{#1}}%
    \doifdefinedelse{\??se\@@sectie}
      {\global\chardef\alltoclevels\zerocount
@@ -518,17 +518,17 @@
   {\bgroup
    \edef\askedlevel{#1}%
    \edef\askedfilter{#2}%
-   \ifx\askedlevel\v!huidige
+   \ifx\askedlevel\v!current
      \dosetcurrentlevel\askedlevel
-   \else\ifx\askedlevel\v!vorige
+   \else\ifx\askedlevel\v!previous
      \dosetpreviouslevel\askedlevel
-   \else\ifx\askedlevel\v!alles
+   \else\ifx\askedlevel\v!all
      \global\chardef\alltoclevels\plusone
-   \else\ifx\askedlevel\v!tekst
+   \else\ifx\askedlevel\v!text
      \global\chardef\alltoclevels\plusone
    \else
      \edef\byaskedlevel{\csname\??by\askedlevel\endcsname}%
-     \ifx\byaskedlevel\v!tekst
+     \ifx\byaskedlevel\v!text
        \dosettextlevel\askedlevel
      \else
        \dosetotherlevel\askedlevel
@@ -821,17 +821,15 @@
 %    \fi
 %    \@@shortsectionnumber{#1}}
 
-\newif\ifreversesectionnumbers % todo: key/val
-
 \def\@@longsectionnumber#1%
   {\ifreversesectionnumbers
      \@@shortsectionnumber{#1}%
      \ifnum\countervalue{\??se\previoussection{#1}}>\zerocount
-       .\csname\previoussection{#1}\c!nummer\endcsname
+       .\csname\previoussection{#1}\c!number\endcsname
      \fi
    \else
      \ifnum\countervalue{\??se\previoussection{#1}}>\zerocount
-       \csname\previoussection{#1}\c!nummer\endcsname.%
+       \csname\previoussection{#1}\c!number\endcsname.%
      \fi
      \@@shortsectionnumber{#1}%
    \fi}
@@ -863,9 +861,9 @@
 %   \fi}
 
 \def\@@shortsectionnumber#1%
-  {\@EA\ifx\csname\??se#1\c!eigennummer\endcsname\relax
-     \@EA\ifx\csname\??se#1\@@sectieblok\c!conversie\endcsname\relax
-       \@EA\ifx\csname\??se#1\c!conversie\endcsname\relax
+  {\@EA\ifx\csname\??se#1\c!ownnumber\endcsname\relax
+     \@EA\ifx\csname\??se#1\@@sectieblok\c!conversion\endcsname\relax
+       \@EA\ifx\csname\??se#1\c!conversion\endcsname\relax
          \@@sectionvalue{#1}%
        \else
          \@@sectionconversion{#1}{\@@sectionvalue{#1}}%
@@ -874,7 +872,7 @@
        \@@sectionconversion{#1}{\@@sectionvalue{#1}}%
      \fi
    \else
-     \csname\??se#1\c!eigennummer\endcsname
+     \csname\??se#1\c!ownnumber\endcsname
    \fi}
 
 \def\dosetlocalsectieblok#1#2#3% new \edef's
@@ -888,7 +886,7 @@
 
 % \def\doaroundsectieblok#1%
 %   {\doifvaluesomething{\??sb#1\c!pagina}
-%      {\ExpandFirstAfter\pagina[\getvalue{\??sb#1\c!pagina}]}%
+%      {\ExpandFirstAfter\page[\getvalue{\??sb#1\c!pagina}]}%
 %    \resetsectioncounters\zerosection % was firstsection
 %    \resetsectionmarks\zerosection}
 
@@ -909,38 +907,38 @@
 %    \endgroup}
 
 \def\doaroundsectieblok
-  {\doifvaluesomething{\??sb\@@sectieblok\c!pagina}
-     {\pagina[\getvalue{\??sb\@@sectieblok\c!pagina}]}%
+  {\doifvaluesomething{\??sb\@@sectieblok\c!page}
+     {\page[\getvalue{\??sb\@@sectieblok\c!page}]}%
    \resetsectioncounters\zerosection % was firstsection
    \resetsectionmarks\zerosection}
 
-\def\dostartsectieblok#1#2%
+\def\dostartsectionblock#1#2%
   {\begingroup
    \getvalue{\??sb#1}%
    \doaroundsectieblok
-%    \doifvaluesomething{\??sb\@@sectieblok\c!pagina}{\pagina[\getvalue{\??sb\@@sectieblok\c!pagina}]}%
+%    \doifvaluesomething{\??sb\@@sectieblok\c!pagina}{\page[\getvalue{\??sb\@@sectieblok\c!pagina}]}%
 %    \resetsectioncounters\zerosection % was firstsection
 %    \resetsectionmarks\zerosection
    \getsectieblokomgeving\@@sectieblok
    \setsystemmode\@@sectieblok
-   \getvalue{\??sb\@@sectieblok\c!voor}%
+   \getvalue{\??sb\@@sectieblok\c!before}%
    \showmessage\m!structures1\@@sectieblokken}
 
-\def\dostopsectieblok
+\def\dostopsectionblock
   {\showmessage\m!structures2\@@sectieblokken
-   \getvalue{\??sb\@@sectieblok\c!na}% don't move
+   \getvalue{\??sb\@@sectieblok\c!after}% don't move
    \doaroundsectieblok
-%    \doifvaluesomething{\??sb\@@sectieblok\c!pagina}{\pagina[\getvalue{\??sb\@@sectieblok\c!pagina}]}%
+%    \doifvaluesomething{\??sb\@@sectieblok\c!pagina}{\page[\getvalue{\??sb\@@sectieblok\c!pagina}]}%
 %    \resetsectioncounters\zerosection % was firstsection
 %    \resetsectionmarks\zerosection
    \endgroup}
 
 
-\def\dostelsectieblokin[#1]% [#2]
+\def\dosetupsectionblock[#1]% [#2]
   {\getparameters[\??sb#1]}
 
-\def\stelsectieblokin
-  {\dodoubleargument\dostelsectieblokin}
+\def\setupsectionblock
+  {\dodoubleargument\dosetupsectionblock}
 
 \long\def\setsectieblokomgeving#1#2%
   {\long\setvalue{\??sb\s!do#1}{\do{#2}}}
@@ -948,14 +946,14 @@
 \def\getsectieblokomgeving#1%
   {\let\do\firstofoneargument\getvalue{\??sb\s!do#1}}
 
-\setvalue{\e!start\v!sectieblokomgeving}%
+\setvalue{\e!start\v!sectionblockenvironment}%
   {\dosingleargument\dostartsectieblokomgeving}
 
 \def\dostartsectieblokomgeving[#1]% evt \pushendofline \popendofline
   {\long\def\do##1##2{\setsectieblokomgeving{#1}{##1##2}}%
-   \grabuntil{\e!stop\v!sectieblokomgeving}{\getvalue{\??sb\s!do#1}}}
+   \grabuntil{\e!stop\v!sectionblockenvironment}{\getvalue{\??sb\s!do#1}}}
 
-%D \starttypen
+%D \starttyping
 %D \startsectionblockenvironment[frontpart]
 %D   \setuppagenumbering[conversion=romannumerals]
 %D \stopsectionblockenvironment
@@ -973,7 +971,7 @@
 %D   \startbodymatter  \chapter{test} \stopbodymatter
 %D   \startappendices  \chapter{test} \stopappendices
 %D \stoptext
-%D \stoptypen
+%D \stoptyping
 
 % We used to use the first char as id, but a counter is
 % better, because in english we get a name clash.
@@ -982,13 +980,13 @@
 
 \def\currentsection{\@@sectieblok}
 
-\def\dodefinieersectieblok[#1][#2][#3]%
+\def\dodefinesectionblock[#1][#2][#3]%
   {\getparameters
      [\??sb#1]
-     [\c!nummer=\v!ja,
-      \c!pagina=\v!rechts, % anders worden marks te vroeg gereset !
-      %\c!voor=,
-      %\c!na=,
+     [\c!number=\v!yes,
+      \c!page=\v!right, % anders worden marks te vroeg gereset !
+      %\c!before=,
+      %\c!after=,
       #3]%
    \expandafter\newif\csname if#2\endcsname % better a mode
    \doglobal\increment\currentsectionblock
@@ -996,12 +994,12 @@
    \setevalue{\??sb#1}%
      {\noexpand\dosetlocalsectieblok{\currentsectionblock}{#1}{#2}}%
    \setvalue{\e!start#2}%
-     {\dostartsectieblok{#1}{#2}}%
+     {\dostartsectionblock{#1}{#2}}%
    \setvalue{\e!stop#2}%
-     {\dostopsectieblok}}
+     {\dostopsectionblock}}
 
-\def\definieersectieblok
-  {\dotripleargument\dodefinieersectieblok}
+\def\definesectionblock
+  {\dotripleargument\dodefinesectionblock}
 
 \def\sectiebloklabel#1#2%
   {\@EA\ifx\csname\??ko#1\@@sectieblok\c!label\endcsname\relax
@@ -1010,7 +1008,7 @@
      \labeltexts{\getvalue{\??ko#1\@@sectieblok\c!label}}{#2}%
    \fi}
 
-\dosetlocalsectieblok{2}{\v!hoofdtekst}{\v!hoofdteksten} % hm, dirty
+\dosetlocalsectieblok{2}{\v!bodypart}{\v!bodymatter} % hm, dirty
 
 \def\setsectiontype[#1]%
   {\getvalue{\??sb#1}}
@@ -1023,7 +1021,7 @@
      {\ifsectienummer#2\else(#2)\fi\normalspace\asciititle}%
    \egroup}
 
-\def\@@koniveau{1}        \def\kopniveau{\@@koniveau}
+\def\@@kolevel{1}        \def\headlevel{\@@kolevel}
 
 \def\dohandelpaginaafAA#1%
   {\ifnum\lastpenalty>0
@@ -1032,14 +1030,14 @@
 
 \def\dohandelpaginaafAB#1% will be replaced by a more clever (signaling) mechanism (in beta)
   {\flushsidefloats
-   \getvalue{\??ko#1\c!voor}%
-   %\witruimte vervangen door \noindent elders
+   \getvalue{\??ko#1\c!before}%
+   %\whitespace vervangen door \noindent elders
    \relax
    \ifpaginageblokkeerd
      \global\paginageblokkeerdfalse
    \else
-     \!!countb\getvalue{\??se\@@sectie\c!niveau}\relax
-     \ifnum\!!countb>\@@koniveau\relax
+     \!!countb\getvalue{\??se\@@sectie\c!level}\relax
+     \ifnum\!!countb>\@@kolevel\relax
        \!!counta20000
        \multiply\!!countb 500
        \advance\!!counta \!!countb
@@ -1048,35 +1046,34 @@
        \dosomebreak\allowbreak
      \fi
    \fi
-   \xdef\@@koniveau{\getvalue{\??se\@@sectie\c!niveau}}}
+   \xdef\@@kolevel{\getvalue{\??se\@@sectie\c!level}}}
 
 \def\dohandelpaginaafBB#1#2#3%
-%  {\doifinset{\getvalue{\??tk#2\v!tekst\c!status}}{\v!normaal,\v!start}
-  {\doifinset{\getvalue{\??tk#2\c!status}}{\v!normaal,\v!start}
+  {\doifinset{\getvalue{\??tk#2\c!state}}{\v!normal,\v!start}
      {\doifvaluesomething{\??ko#1#3}
-        {\setuplayouttext[#2][\c!status=\getvalue{\??ko#1#3}]}}}
+        {\setuplayouttext[#2][\c!state=\getvalue{\??ko#1#3}]}}}
 
 % \def\dohandelpaginaafB#1%
 %   {\doifinset{\getvalue{\??ko#1\c!pagina}}{\v!ja,\v!rechts,\v!links}
-%      {\def\resetcurrentsectionmarks% toegevoegd, zie \pagina
+%      {\def\resetcurrentsectionmarks% toegevoegd, zie \page
 %         {\resetsectionmarks{\previoussection\@@sectie}}%
-%       \pagina[\getvalue{\??ko#1\c!pagina}]%
+%       \page[\getvalue{\??ko#1\c!pagina}]%
 %       \dohandelpaginaafBB{#1}\v!hoofd\c!hoofd
 %       \dohandelpaginaafBB{#1}\v!tekst\c!tekst
 %       \dohandelpaginaafBB{#1}\v!voet \c!voet}}
 
 \def\dohandelpaginaafB#1%
-  {\doifvaluesomething{\??ko#1\c!pagina}
-     {\def\resetcurrentsectionmarks% toegevoegd, zie \pagina
+  {\doifvaluesomething{\??ko#1\c!page}
+     {\def\resetcurrentsectionmarks% toegevoegd, zie \page
         {\resetsectionmarks{\previoussection\@@sectie}}%
-      \pagina[\getvalue{\??ko#1\c!pagina}]%
-      \dohandelpaginaafBB{#1}\v!hoofd\c!hoofd
-      \dohandelpaginaafBB{#1}\v!tekst\c!tekst
-      \dohandelpaginaafBB{#1}\v!voet \c!voet}}
+      \page[\getvalue{\??ko#1\c!page}]%
+      \dohandelpaginaafBB{#1}\v!header\c!header
+      \dohandelpaginaafBB{#1}\v!text\c!text
+      \dohandelpaginaafBB{#1}\v!footer \c!footer}}
 
 \def\dohandelpaginaafX#1% zie doordefinieren / boven
   {\bgroup
-   \!!countb\@@koniveau
+   \!!countb\@@kolevel
    \advance\!!countb #1
    \multiply\!!countb 500
    \!!counta20000
@@ -1090,7 +1087,7 @@
      \ifnum\countervalue{\??se\@@sectie}>\zerocount
        \dohandelpaginaafB{#1}%
      \else
-       \doifnotvalue{\??ko#1\c!doorgaan}\v!ja
+       \doifnotvalue{\??ko#1\c!continue}\v!yes
          {\dohandelpaginaafB{#1}}%
      \fi
    \else
@@ -1099,7 +1096,7 @@
    \dohandelpaginaafAB{#1}}
 
 \def\handelpaginaafC#1%
-  {\xdef\@@koniveau{\getvalue{\??se\@@sectie\c!niveau}}%
+  {\xdef\@@kolevel{\getvalue{\??se\@@sectie\c!level}}%
    \nobreak}
 
 %\def\dolocalheadsetup#1%  koppeling met standaard kopcommando / engels
@@ -1112,35 +1109,40 @@
 
 \def\dolocalheadsetup#1%  koppeling met standaard kopcommando / engels
   {\forgetall         %  traag dus ...
-   \doifvaluesomething{\??ko#1\c!uitlijnen} % wordt al expanded in spa
-     {\expanded{\setupalign[\getvalue{\??ko#1\c!uitlijnen}]}}%
-   \doifvaluesomething{\??ko#1\c!tolerantie} % wordt al expanded in spa
-     {\expanded{\setuptolerance[\getvalue{\??ko#1\c!tolerantie}]}}%
+   \doifvaluesomething{\??ko#1\c!align} % wordt al expanded in spa
+     {\expanded{\setupalign[\getvalue{\??ko#1\c!align}]}}%
+   \doifvaluesomething{\??ko#1\c!tolerance} % wordt al expanded in spa
+     {\expanded{\setuptolerance[\getvalue{\??ko#1\c!tolerance}]}}%
    \def\\{\crlf\strut\ignorespaces}}
 
 \def\localkopsetup{\localheadsetup} % kan tzt weg
 
 % todo: make them conditionals:
 
-\newif\ifplaatskop
-\newif\iflegekop
-\newif\ifnaarlijst
-\newif\ifverhoognummer
-\newif\ifkopnummer
+\newif\ifincrementnumber
+\newif\ifreversesectionnumbers  % todo: key/val
+\newif\ifsectienummer           \sectienummertrue
+\newif\ifdisplaysectionhead     \displaysectionheadtrue
+\newif\ifplacehead
+\newif\ifemptyhead
+\newif\ifwritetolist
+\newif\ifheadnumber
+\newif\ifcontinuoushead
+\newif\ifheadnumbercontent      % niet meer wijzigen / wordt mode
+\newif\ifheadprefix
+\newif\ifsomeheadconversion
 
 % new
 
 \newconditional\@@resetsubheadnumbers
 
 \def\setsectieenkoppeling#1%
-  {\edef\@@koppeling{\getvalue{\??ko#1\c!koppeling}}%
-   \edef\@@sectie{\getvalue{\??ko#1\c!sectie}}%
+  {\edef\@@koppeling{\getvalue{\??ko#1\c!coupling}}%
+   \edef\@@sectie{\getvalue{\??ko#1\c!section}}%
    \doifnothing\@@koppeling
      {\edef\@@koppeling{#1}}%
    \doifnothing\@@sectie
-     {\edef\@@sectie{\getvalue{\??ko\@@koppeling\c!sectie}}}}
-
-\newif\ifkopprefix
+     {\edef\@@sectie{\getvalue{\??ko\@@koppeling\c!section}}}}
 
 % \handelpaginaaf komt het eerst omdat eventueel
 % subpaginanummers moeten worden afgehandeld. Vervolgens
@@ -1155,11 +1157,11 @@
 \let\finalsectionnumber\empty
 
 \def\dofinalsectionnumber
-  {\ifundefined{\@@sectie\c!nummer}\else
+  {\ifundefined{\@@sectie\c!number}\else
      \ifsomeheadconversion
        \@@shortsectionnumber\@@sectie
      \else
-       \getvalue{\@@sectie\c!nummer}%
+       \getvalue{\@@sectie\c!number}%
      \fi
    \fi}
 
@@ -1171,7 +1173,7 @@
      {\doif{##1}{#1}
         {\ConvertConstantAfter\doif{##4}{#3}
            {\global\utilitydonetrue
-            \scratchcounter=0\getvalue{\??se\@@sectie\c!niveau}%
+            \scratchcounter=0\getvalue{\??se\@@sectie\c!level}%
             %
             %\advance\scratchcounter 2
             %\@EA\def\@EA\do\@EA####\@EA1\sectionseparator####2]%
@@ -1198,10 +1200,8 @@
      {\doif\foundsectionnumber\!!zerocount
         {\globallet\foundsectionnumber\!!plusone}}
      {\globallet\foundsectionnumber\!!plusone}% an appendix or so
-   \stelkopnummerin[#1][\foundsectionnumber]%
-   \stelkopnummerin[#1][-1]}
-
-\newif\ifsomeheadconversion
+   \setupheadnumber[#1][\foundsectionnumber]%
+   \setupheadnumber[#1][-1]}
 
 % \def\setsomeheadconversion#1#2%
 %    {\someheadconversionfalse
@@ -1234,30 +1234,30 @@
 
 \def\setsomeheadconversion#1#2%
    {\someheadconversionfalse
-    \doifelsevalue{\??ko#1\c!eigennummer}\v!ja
-      {\setgvalue{\??se\@@sectie\c!eigennummer}{#2}%
+    \doifelsevalue{\??ko#1\c!ownnumber}\v!yes
+      {\setgvalue{\??se\@@sectie\c!ownnumber}{#2}%
        \def\someheadconversion{#2}}
-      {\letgvalue{\??se\@@sectie\c!eigennummer}\relax
-       \bepaalkopnummer[#1]%
-       \@EA\ifx\csname\??se\@@sectie\@@sectieblok\c!kopconversie\endcsname\relax
-         \@EA\ifx\csname\??se\@@sectie\c!kopconversie\endcsname\relax
+      {\letgvalue{\??se\@@sectie\c!ownnumber}\relax
+       \determineheadnumber[#1]%
+       \@EA\ifx\csname\??se\@@sectie\@@sectieblok\c!headconversion\endcsname\relax
+         \@EA\ifx\csname\??se\@@sectie\c!headconversion\endcsname\relax
            \def\someheadconversion{#2}%
          \else
-           \@EA\ifx\csname\??se\@@sectie\c!kopconversie\endcsname\empty
+           \@EA\ifx\csname\??se\@@sectie\c!headconversion\endcsname\empty
              \def\someheadconversion{#2}%
            \else
              \someheadconversiontrue
              \def\someheadconversion%
-               {\fullsectionnumber{#1}{\getvalue{\??se\@@sectie\c!kopconversie}}{#2}}%
+               {\fullsectionnumber{#1}{\getvalue{\??se\@@sectie\c!headconversion}}{#2}}%
            \fi
          \fi
        \else
-         \@EA\ifx\csname\??se\@@sectie\@@sectieblok\c!kopconversie\endcsname\empty
+         \@EA\ifx\csname\??se\@@sectie\@@sectieblok\c!headconversion\endcsname\empty
            \def\someheadconversion{#2}%
          \else
            \someheadconversiontrue
            \def\someheadconversion%
-             {\fullsectionnumber{#1}{\getvalue{\??se\@@sectie\@@sectieblok\c!kopconversie}}{#2}}%
+             {\fullsectionnumber{#1}{\getvalue{\??se\@@sectie\@@sectieblok\c!headconversion}}{#2}}%
          \fi
        \fi}}
 
@@ -1282,8 +1282,8 @@
   {\convertnumber{#2}{#3}}
 
 \def\setfullsectionnumber#1%
-  {\doifelsevalue{#1\c!kopconversie}\v!ja
-     {\doifelsevalue{#1\c!koplabel}\v!ja
+  {\doifelsevalue{#1\c!headconversion}\v!yes
+     {\doifelsevalue{#1\c!headlabel}\v!yes
         {\let\fullsectionnumber\naturalfullsectionnumber}
         {\let\fullsectionnumber\limitedfullsectionnumber}}
      {\let\fullsectionnumber\ignoredfullsectionnumber}}
@@ -1298,7 +1298,7 @@
 \let\currentheadtext  \empty
 
 \def\dodosomekop#1[#2]#3% [ref] {title}
-  {\doifelsevalue{\??ko#1\c!eigennummer}\v!ja
+  {\doifelsevalue{\??ko#1\c!ownnumber}\v!yes
      {\doquadruplegroupempty\dododosomekop{#1}{#2}{#3}}
      {\fourthargumentfalse  \dododosomekop{#1}{#2}{#3}{}}}
 
@@ -1319,7 +1319,7 @@
 \unexpanded\def\\{\space}
 
 \def\emptyheadcorrection % experimental, should work
-  {\iflegekop            % well with na=\blanko
+  {\ifemptyhead            % well with na=\blank
      \vskip-\lineheight
      \dosomebreak\nobreak
      \kern\zeropoint
@@ -1332,14 +1332,14 @@
   {\def\currenthead{#1}% dus #1 overal vervangen
    \let\finalsectionnumber\dofinalsectionnumber % overloaded ungrouped -)
    \unexpanded\def\\{\space}%
-   \def\numberseparator{\getvalue{\??ko\currenthead\c!scheider}}%
+   \def\numberseparator{\getvalue{\??ko\currenthead\c!separator}}%
    \flushingcolumnfloatsfalse % {number} can be \finalsectionnumber
    \someheadconversionfalse
    \let\fullsectionnumber\limitedfullsectionnumber
    \setsectieenkoppeling{#1}%
    \doifelsevaluenothing{\??ko#1\c!prefix}
-     \kopprefixfalse\kopprefixtrue
-   \ifkopprefix
+     \headprefixfalse\headprefixtrue
+   \ifheadprefix
      \doifelsevalue{\??ko#1\c!prefix}{+}
        {\doifelsenothing{#2}
           {\def\localkopprefix{+}}
@@ -1349,135 +1349,135 @@
      \let\localkoprefix\empty
    \fi
 %    \doifelsevalue{\??ko#1\c!plaatskop}\v!ja
-%      \plaatskoptrue\plaatskopfalse
+%      \placeheadtrue\placeheadfalse
 %    \processaction
 %      [\getvalue{\??ko#1\c!plaatskop}]
-%      [  \v!ja=>\plaatskoptrue \legekopfalse,
-%       \v!leeg=>\plaatskoptrue \legekoptrue,
-%        \v!nee=>\plaatskopfalse\legekoptrue]%
-   \plaatskoptrue
+%      [  \v!ja=>\placeheadtrue \emptyheadfalse,
+%       \v!leeg=>\placeheadtrue \emptyheadtrue,
+%        \v!nee=>\placeheadfalse\emptyheadtrue]%
+   \placeheadtrue
    \processaction
-     [\getvalue{\??ko#1\c!plaatskop}]
-     [  \v!ja=>\legekopfalse,
-      \v!leeg=>\legekoptrue,
-       \v!nee=>\legekoptrue\plaatskopfalse]%
+     [\getvalue{\??ko#1\c!placehead}]
+     [  \v!yes=>\emptyheadfalse,
+      \v!empty=>\emptyheadtrue,
+       \v!no=>\emptyheadtrue\placeheadfalse]%
 %
-   \doifelsevalue{\??ko#1\c!resetnummer}\v!nee
+   \doifelsevalue{\??ko#1\c!resetnumber}\v!no
      {\setfalse\@@resetsubheadnumbers}%
      {\settrue \@@resetsubheadnumbers}%
-   \naarlijstfalse
+   \writetolistfalse
    \processaction
-     [\getvalue{\??ko#1\c!verhoognummer}]
-     [     \v!ja=>\verhoognummertrue,
-          \v!nee=>\verhoognummerfalse,
-        \v!lijst=>\verhoognummerfalse
+     [\getvalue{\??ko#1\c!incrementnumber}]
+     [     \v!yes=>\incrementnumbertrue,
+          \v!no=>\incrementnumberfalse,
+        \v!list=>\incrementnumberfalse
                   % beware, since no numbers are used, no nested lists are
                   % possible here
-                  \naarlijsttrue,
+                  \writetolisttrue,
       \s!unknown=>{\ifx\currentproduct\empty
                      \findsectionnumber{#1}\commalistelement{#4}%
                    \fi
-                   \verhoognummertrue}]%
-   \edef\numberheaddistance   {\getvalue{\??ko#1\c!afstand}}%
-   \edef\numberheadalternative{\getvalue{\??ko#1\c!variant}}%
-   \doifelsevalue{\??ko:\numberheadalternative}\v!horizontaal
+                   \incrementnumbertrue}]%
+   \edef\numberheaddistance   {\getvalue{\??ko#1\c!distance}}%
+   \edef\numberheadalternative{\getvalue{\??ko#1\c!alternative}}%
+   \doifelsevalue{\??ko:\numberheadalternative}\v!horizontal
      \displaysectionheadfalse
      \displaysectionheadtrue
    \ifsectienummer
-     \doifelsevalue{\??sb\@@sectieblok\c!nummer}\v!ja
-       {\doifelsevalue{\??ko#1\c!nummer}\v!ja
-          \kopnummertrue
-          \kopnummerfalse}
-       {\kopnummerfalse}%
+     \doifelsevalue{\??sb\@@sectieblok\c!number}\v!yes
+       {\doifelsevalue{\??ko#1\c!number}\v!yes
+          \headnumbertrue
+          \headnumberfalse}
+       {\headnumberfalse}%
    \else
-     \kopnummerfalse
+     \headnumberfalse
    \fi
    \convertexpanded{\??ko#1}{#4}\asciititle
    %
    \gdef\currentheadtext{#4}% scheelt args
    \globallet\currentheadnumber\empty
    %
-   \ifverhoognummer
-     \ifplaatskop
+   \ifincrementnumber
+     \ifplacehead
        \checknexthead\handelpaginaaf{#1}%
        \setsectieenkoppeling{#1}% can be changed when [voor=\somehead{..}...]
-       \ifkopprefix
+       \ifheadprefix
         %\setupreferencing[\c!prefix=-]%
          \setupreferenceprefix[-]%
        \fi
-       \getvalue{\e!volgende\@@sectie}%
-       \ifkopnummer
+       \getvalue{\e!next\@@sectie}%
+       \ifheadnumber
          \setsomeheadconversion{#1}{#3}%
          \let\fullsectionnumber\expandablefullsectionnumber
          \xdef\currentheadnumber{\someheadconversion}%
-         \getvalue{\??ko#1\c!tussen}%
+         \getvalue{\??ko#1\c!inbetween}%
          \ifsomeheadconversion
            \let\fullsectionnumber\naturalfullsectionnumber
            \doplaatskopnummertekst
              {#1}
              {\setsectionlistreference{\@@sectie}{#1}%
-              \soortpagina[\@@koppeling]%
+              \pagetype[\@@koppeling]%
               \let\fullsectionnumber\writtenfullsectionnumber
               \rawreference\s!sec{#2}{{\someheadconversion}{\asciititle}}%
               \resetsectionmarks\@@sectie
-              \setlistparameter\@@koppeling\c!expansie{\getvalue{\??ko#1\c!expansie}}%
+              \setlistparameter\@@koppeling\c!expansion{\getvalue{\??ko#1\c!expansion}}%
               \let\fullsectionnumber\writtenfullsectionnumber
-              \doschrijfnaarlijst\@@koppeling\someheadconversion{#4}\v!kop}%
+              \dowritetolist\@@koppeling\someheadconversion{#4}\v!head}%
              {\dohandleheadnumber\someheadconversion}% handle is new
              {#4}
              {\marking[#1]{#4}%
               \let\fullsectionnumber\storedfullsectionnumber
-              \expanded{\marking[#1\v!nummer]{\someheadconversion}}}%
+              \expanded{\marking[#1\v!number]{\someheadconversion}}}%
            \let\fullsectionnumber\ignoredfullsectionnumber
            \writesection{#1}{\someheadconversion}{#4}%
          \else
            \doplaatskopnummertekst
              {#1}
              {\setsectionlistreference{\@@sectie}{#1}%
-              \soortpagina[\@@koppeling]%
+              \pagetype[\@@koppeling]%
               \rawreference\s!sec{#2}{{#3}{\asciititle}}%
               \resetsectionmarks\@@sectie
-              \setlistparameter\@@koppeling\c!expansie{\getvalue{\??ko#1\c!expansie}}%
-              \doschrijfnaarlijst\@@koppeling{#3}{#4}\v!kop}
+              \setlistparameter\@@koppeling\c!expansion{\getvalue{\??ko#1\c!expansion}}%
+              \dowritetolist\@@koppeling{#3}{#4}\v!head}
              {\sectiebloklabel{#1}{\dohandleheadnumber{#3}}}% handle is new
              {#4}
              {\marking[#1]{#4}%
-              \doifelsevalue{\??ko#1\c!eigennummer}\v!ja % rommelig omdat
+              \doifelsevalue{\??ko#1\c!ownnumber}\v!yes % rommelig omdat
                 {\edef\finalsectionnumber{#3}} % #3 al is toegekend
-                {\bepaalkopnummer[#1]}% migreert naar 3e argument
-              \expanded{\marking[#1\v!nummer]{\finalsectionnumber}}}%
+                {\determineheadnumber[#1]}% migreert naar 3e argument
+              \expanded{\marking[#1\v!number]{\finalsectionnumber}}}%
            \writesection{#1}{#3}{#4}%
          \fi
        \else
-         \getvalue{\??ko#1\c!tussen}%
-         \doplaatskoptekst
+         \getvalue{\??ko#1\c!inbetween}%
+         \doplaceheadtext
            {#1}
            {\setsectionlistreference{\@@sectie}{#1}%
-            \soortpagina[\@@koppeling]%
+            \pagetype[\@@koppeling]%
             \rawreference\s!sec{#2}{{#3}{\asciititle}}%
             \resetsectionmarks\@@sectie
-            \setlistparameter\@@koppeling\c!expansie{\getvalue{\??ko#1\c!expansie}}%
-            \doschrijfnaarlijst\@@koppeling{}{#4}\v!kop}
+            \setlistparameter\@@koppeling\c!expansion{\getvalue{\??ko#1\c!expansion}}%
+            \dowritetolist\@@koppeling{}{#4}\v!head}
            {#4}
            {\marking[#1]{#4}%
-            \doifelsevalue{\??ko#1\c!eigennummer}\v!ja % brrr
+            \doifelsevalue{\??ko#1\c!ownnumber}\v!yes % brrr
               {\edef\finalsectionnumber{#3}}
-              {\bepaalkopnummer[#1]}%
+              {\determineheadnumber[#1]}%
 % todo : geen markering (leeg maken)
-            \expanded{\marking[#1\v!nummer]{\finalsectionnumber}}}%
+            \expanded{\marking[#1\v!number]{\finalsectionnumber}}}%
          \writesection{#1}{-}{#4}%
        \fi
-       \ifkopprefix
+       \ifheadprefix
          \setupreferenceprefix[\localkopprefix]%
        \fi
        \ifdisplaysectionhead
          \dosomebreak\nobreak
          \emptyheadcorrection
-         \getvalue{\??ko#1\c!na}%
+         \getvalue{\??ko#1\c!after}%
        \fi
      \else
        % Whatever future tex's will do with nodes,
-       % we assume a node here, because other \c!na=\blanko
+       % we assume a node here, because other \c!after=\blank
        % will fail! See 'prikkels'
        %
        % so, maybe we need an explicit \kern
@@ -1486,70 +1486,70 @@
        %
        \checknexthead\dohandelpaginaafB{#1}% toegevoegd ivm subpaginanr / tug sheets
        \setsectieenkoppeling{#1}% can be changed when [voor=\somehead{..}...]
-       \ifkopprefix
+       \ifheadprefix
          \setupreferenceprefix[-]%
        \fi
-       \getvalue{\e!volgende\@@sectie}%
-       \ifkopnummer
+       \getvalue{\e!next\@@sectie}%
+       \ifheadnumber
          \setsomeheadconversion{#1}{#3}%
          \let\fullsectionnumber\expandablefullsectionnumber
          \xdef\currentheadnumber{\someheadconversion}%
        \fi
-       \getvalue{\??ko#1\c!tussen}% documenteren, is enige hook
+       \getvalue{\??ko#1\c!inbetween}% documenteren, is enige hook
        \bgroup
        \setsectionlistreference{\@@sectie}{#1}%
        \resetsectionmarks\@@sectie
        \marking[#1]{#4}%
-       \doifelsevalue{\??ko#1\c!eigennummer}\v!ja
+       \doifelsevalue{\??ko#1\c!ownnumber}\v!yes
          {\edef\finalsectionnumber{#3}}
-         {\bepaalkopnummer[#1]}%
-       \expanded{\marking[#1\v!nummer]{\finalsectionnumber}}%
-       \soortpagina[\@@koppeling]%
+         {\determineheadnumber[#1]}%
+       \expanded{\marking[#1\v!number]{\finalsectionnumber}}%
+       \pagetype[\@@koppeling]%
 %       \bgroup
-       \setlistparameter\@@koppeling\c!expansie{\getvalue{\??ko#1\c!expansie}}%
-       \ifkopnummer
+       \setlistparameter\@@koppeling\c!expansion{\getvalue{\??ko#1\c!expansion}}%
+       \ifheadnumber
          \rawreference\s!sec{#2}{{#3}{\asciititle}}%
-         \doschrijfnaarlijst\@@koppeling{#3}{#4}\v!kop
+         \dowritetolist\@@koppeling{#3}{#4}\v!head
          \writesection{#1}{#3}{#4}%
        \else
          \rawreference\s!sec{#2}{{#3}{\asciititle}}%
-         \doschrijfnaarlijst\@@koppeling{}{#4}\v!kop
+         \dowritetolist\@@koppeling{}{#4}\v!head
          \writesection{#1}{-}{#4}%
        \fi
        \egroup
-       \ifkopprefix
+       \ifheadprefix
          \setupreferenceprefix[\localkopprefix]%
        \fi
      \fi
    \else
      % todo : ref prefix
-     \ifplaatskop
+     \ifplacehead
        \checknexthead\handelpaginaaf{#1}%
        \setsectieenkoppeling{#1}% can be changed when [voor=\somehead{..}...]
-       \getvalue{\??ko#1\c!tussen}%
-       \doplaatskoptekst
+       \getvalue{\??ko#1\c!inbetween}%
+       \doplaceheadtext
          {#1}
          {\forcesectiontolist{#1}{#4}%
           \rawreference\s!sec{#2}{{#3}{\asciititle}}} % #3 ?
          {#4}
         %{}% new:
          {\marking[#1]{#4}%
-          \marking[#1\v!nummer]{}}%
+          \marking[#1\v!number]{}}%
        \writesection{#1}{-}{#4}%
        \ifdisplaysectionhead
          \dosomebreak\nobreak
          \emptyheadcorrection
-         \getvalue{\??ko#1\c!na}%
+         \getvalue{\??ko#1\c!after}%
        \fi
      \else
        % do nothing / should be vbox to 0pt
        \checknexthead\handelpaginaaf{#1}%
        \setsectieenkoppeling{#1}% can be changed when [voor=\somehead{..}...]
-       \getvalue{\??ko#1\c!tussen}%
+       \getvalue{\??ko#1\c!inbetween}%
        \forcesectiontolist{#1}{#4}%
        \rawreference\s!sec{#2}{{#3}{\asciititle}}% #3 ?
        \marking[#1]{#4}%
-       \marking[#1\v!nummer]{}%
+       \marking[#1\v!number]{}%
        \writesection{#1}{-}{#4}%
      \fi
    \fi
@@ -1559,15 +1559,15 @@
    \ifdisplaysectionhead\else\expandafter\GotoPar\fi}
 
 \def\forcesectiontolist#1#2%
-  {\ifnaarlijst
+  {\ifwritetolist
      % we need to make sure that there is a number set (non
      % zero) else the list mechanism cannot determine the
      % level
      \bgroup
-     \stelkopnummerin[#1][+1]% traag, wordt \getvalue{\c!volgende...}
-     \setlistparameter\@@koppeling\c!expansie{\getvalue{\??ko#1\c!expansie}}%
-     \doschrijfnaarlijst\@@koppeling{}{#2}\v!kop
-     \stelkopnummerin[#1][-1]% traag, wordt \getvalue{\c!vorige...}
+     \setupheadnumber[#1][+1]% traag, wordt \getvalue{\c!next...}
+     \setlistparameter\@@koppeling\c!expansion{\getvalue{\??ko#1\c!expansion}}%
+     \dowritetolist\@@koppeling{}{#2}\v!head
+     \setupheadnumber[#1][-1]% traag, wordt \getvalue{\c!previous...}
      \egroup
    \fi}
 
@@ -1589,14 +1589,14 @@
   {\thisissomeinternal{\s!lst}{#1\currentsectionformat}%
    \setxvalue{\s!lst:#1}{\realfolio}% to be sure
    \setxvalue{\s!lst:#1\currentsectionformat}{\realfolio}%
-   \setxvalue{\e!vorigelokale#1}{\s!lst:#1\previoussectionformat}%
-   \setxvalue{\e!huidigelokale#1}{\s!lst:#1\currentsectionformat}%
+   \setxvalue{\e!previouslocal#1}{\s!lst:#1\previoussectionformat}%
+   \setxvalue{\e!currentlocal#1}{\s!lst:#1\currentsectionformat}%
    \doifelse{\currentsectionformat}{}
      {\setglobalcrossreference
-        {\e!vorige#1}{}{\realfolio}{}}
+        {\e!previous#1}{}{\realfolio}{}}
 %
      {\setglobalsystemreference\rt!list
-        {\e!vorige#1}{\getvalue{\e!vorigelokale#1}}}%
+        {\e!previous#1}{\getvalue{\e!previouslocal#1}}}%
 %
 %         {\definereference[\e!vorige#1][\getvalue{\e!vorigelokale#1}]%
 %
@@ -1610,7 +1610,7 @@
        {\def\docommando####1%
 %
           {\setglobalsystemreference\rt!list
-             {\e!vorige####1}{\getvalue{\e!huidigelokale####1}}}%
+             {\e!previous####1}{\getvalue{\e!currentlocal####1}}}%
 %
 %         {\definereference[\e!vorige####1][\getvalue{\e!huidigelokale####1}]%
 %
@@ -1628,24 +1628,22 @@
 % \onderwerp{test} \strut \input tufte
 % \onderwerp{test} \plaatslijst[...]
 
-\newif\ifheadnumbercontent % niet meer wijzigen / wordt mode
-
 % todo: kap
 
 % to be documented: \placeheadtext \placeheadnumber
 
 \unexpanded\def\placeheadtext
   {\doquintupleempty\doplaceheadtextornumber
-     [\c!tekstletter][\c!tekstkleur][\empty]}
+     [\c!textstyle][\c!textcolor][\empty]}
 
 \unexpanded\def\placeheadnumber
   {\doquintupleempty\doplaceheadtextornumber
-     [\c!nummerletter][\c!nummerkleur][\v!nummer]}
+     [\c!numberstyle][\c!numbercolor][\v!number]}
 
 \def\doplaceheadtextornumber[#1][#2][#3][#4][#5]%
   {\bgroup
    \edef\@@sectie{\??ko\iffifthargument#5\else#4\fi}%
-   \dostartattributes\@@sectie\c!letter\c!kleur\empty
+   \dostartattributes\@@sectie\c!style\c!color\empty
      \dontconvertfont
      \dostartattributes\@@sectie{#1}{#2}\empty
        \setupinterlinespace
@@ -1674,30 +1672,30 @@
 
 \def\placeheadmargintexts#1%
   {\the\everyheadstart
-   \doifvalue{\??ko#1\c!margetekst}\v!ja\placemargintexts}
+   \doifvalue{\??ko#1\c!margintext}\v!yes\placemargintexts}
 
-\def\doplaatskoptekst#1#2#3#4%
+\def\doplaceheadtext#1#2#3#4%
   {\beginheadplacement{#1}%
-   \iflegekop % = needed
+   \ifemptyhead % = needed
      \setbox0=\ifvertical\vbox\else\hbox\fi to \zeropoint
        {\headnumbercontentfalse
-        \resetsystemmode\v!sectienummer
+        \resetsystemmode\v!sectionnumber
         #2}%
      \makestrutofbox0
    \else % = needed
      \setbox0=\ifvertical\vbox\else\hbox\fi % \vhbox
        {\headnumbercontentfalse
-        \resetsystemmode\v!sectienummer
+        \resetsystemmode\v!sectionnumber
         % less interfering
         \ifcase\headtimingmode\or#2\fi
         % outerside font determines distance
-        \dosetfontattribute{\??ko#1}\c!letter
+        \dosetfontattribute{\??ko#1}\c!style
         % but we don't want color to influence user commands
 % todo: get the if-else out of it
-        \getvalue{\??ko#1\c!commando}
+        \getvalue{\??ko#1\c!command}
           {} % no number
-          {\dostartattributes{\??ko#1}\c!letter\c!kleur\empty
-             \dostartattributes{\??ko#1}\c!tekstletter\c!tekstkleur\empty
+          {\dostartattributes{\??ko#1}\c!style\c!color\empty
+             \dostartattributes{\??ko#1}\c!textstyle\c!textcolor\empty
                \dontconvertfont
                \ifdisplaysectionhead
                  \setupinterlinespace
@@ -1706,17 +1704,17 @@
                \fi
 % overwegen \dontleavehmode, else unwanted cr due to #2
                \ifcase\headtimingmode#2\fi
-               \getvalue{\??ko#1\c!voorcommando}%
+               \getvalue{\??ko#1\c!commandbefore}%
                \placeheadmargintexts{#1}% binnen #3?
                \ifdisplaysectionhead
-                 \getvalue{\??ko#1\c!tekstcommando}%
+                 \getvalue{\??ko#1\c!textcommand}%
                    {\setstrut\begstrut#3\endstrut}%
                  \xdef\localheaddepth{\the\strutdp}%
                 % == \globallet\localheaddepth\strutdepth
                \else
-                 \getvalue{\??ko#1\c!tekstcommando}{#3}%
+                 \getvalue{\??ko#1\c!textcommand}{#3}%
                \fi
-               \getvalue{\??ko#1\c!nacommando}%
+               \getvalue{\??ko#1\c!commandafter}%
                \ifdisplaysectionhead\endgraf\fi
              \dostopattributes
            \dostopattributes}}%
@@ -1725,38 +1723,38 @@
 
 \def\doplaatskopnummertekst#1#2#3#4#5% maybe move modes outside box
   {\beginheadplacement{#1}%
-   \iflegekop % = needed
+   \ifemptyhead % = needed
      \setbox0=\ifvertical\vbox\else\hbox\fi to \zeropoint
        {\doiftextelse{#3}
-          {\setsystemmode  \v!sectienummer\headnumbercontenttrue }
-          {\resetsystemmode\v!sectienummer\headnumbercontentfalse}%
+          {\setsystemmode  \v!sectionnumber\headnumbercontenttrue }
+          {\resetsystemmode\v!sectionnumber\headnumbercontentfalse}%
         #2}%
      \makestrutofbox0
    \else % = needed
      \setbox0=\ifvertical\vbox\else\hbox\fi % \vhbox
        {\doiftextelse{#3}
-          {\setsystemmode  \v!sectienummer\headnumbercontenttrue }
-          {\resetsystemmode\v!sectienummer\headnumbercontentfalse}%
+          {\setsystemmode  \v!sectionnumber\headnumbercontenttrue }
+          {\resetsystemmode\v!sectionnumber\headnumbercontentfalse}%
         % less interfering
         \ifcase\headtimingmode\or#2\fi
         % outerside font determines distance
-        \dosetfontattribute{\??ko#1}\c!letter
+        \dosetfontattribute{\??ko#1}\c!style
         % but we don't want color to influence user commands
-        \getvalue{\??ko#1\c!commando}%
-          {\dostartattributes{\??ko#1}\c!letter\c!kleur\empty
-             \dostartattributes{\??ko#1}\c!nummerletter\c!nummerkleur\empty
-               \getvalue{\??ko#1\c!voorcommando}%
+        \getvalue{\??ko#1\c!command}%
+          {\dostartattributes{\??ko#1}\c!style\c!color\empty
+             \dostartattributes{\??ko#1}\c!numberstyle\c!numbercolor\empty
+               \getvalue{\??ko#1\c!commandbefore}%
                \placeheadmargintexts{#1}% binnen #3?
                \ifdisplaysectionhead
-                 \getvalue{\??ko#1\c!nummercommando}%
+                 \getvalue{\??ko#1\c!numbercommand}%
                    {\setstrut\begstrut#3\endstrut}%
                \else
-                 \getvalue{\??ko#1\c!nummercommando}{#3}%
+                 \getvalue{\??ko#1\c!numbercommand}{#3}%
                \fi
              \dostopattributes
            \dostopattributes}
-          {\dostartattributes{\??ko#1}\c!letter\c!kleur\empty
-             \dostartattributes{\??ko#1}\c!tekstletter\c!tekstkleur\empty
+          {\dostartattributes{\??ko#1}\c!style\c!color\empty
+             \dostartattributes{\??ko#1}\c!textstyle\c!textcolor\empty
                \dontconvertfont
                \ifdisplaysectionhead
                  \setupinterlinespace
@@ -1767,14 +1765,14 @@
                \ifcase\headtimingmode#2\fi
                \placeheadmargintexts{#1}% binnen #3?
                \ifdisplaysectionhead
-                 \getvalue{\??ko#1\c!tekstcommando}%
+                 \getvalue{\??ko#1\c!textcommand}%
                    {\setstrut\begstrut#4\endstrut}%
                  \xdef\localheaddepth{\the\strutdp}%
                  % == \globallet\localheaddepth\strutdepth
                \else
-                 \getvalue{\??ko#1\c!tekstcommando}{#4}%
+                 \getvalue{\??ko#1\c!textcommand}{#4}%
                \fi
-               \getvalue{\??ko#1\c!nacommando}%
+               \getvalue{\??ko#1\c!commandafter}%
                \ifdisplaysectionhead\endgraf\fi
             \dostopattributes
           \dostopattributes}}%
@@ -1783,7 +1781,6 @@
 
 \newsignal\headsignal
 \let\headlastlinewidth\!!zeropoint
-\newif\ifcontinuoushead
 
 \def\beginheadplacement#1%
   {\bgroup
@@ -1792,9 +1789,9 @@
    \gdef\localheaddepth{\strutdp}%
    % == \globallet\localheaddepth\strutdp
    \everypar\emptytoks % needed indeed
-   \noindent           % ipv \witruimte elders, na \forgetall !
+   \noindent           % ipv \whitespace elders, na \forgetall !
    \bgroup
-   \doifelsevalue{\??ko#1\c!titeluitlijnen}\v!ja % new
+   \doifelsevalue{\??ko#1\c!aligntitle}\v!yes % new
      {\skip0 1\leftskip
       \skip2 1\rightskip
       \xdef\localheadskip{\the\skip0}%
@@ -1805,18 +1802,18 @@
       \forgetbothskips}
      {\globallet\localheadskip\!!zeropoint
       \forgetall}%
-   \mindermeldingen
+   \dontcomplain
    \postponefootnotes
    \iflocation\ifdisplaysectionhead\else\noninterferingmarks\fi\fi
-   \resetinteractionparameter\c!letter
-   \resetinteractionparameter\c!kleur
-   \resetinteractionparameter\c!contrastkleur
+   \resetinteractionparameter\c!style
+   \resetinteractionparameter\c!color
+   \resetinteractionparameter\c!contrastcolor
    \strictouterreferencestrue % tzt instelling
    \def\localheadsetup{\dolocalheadsetup{#1}}%
-   \startsynchronisatie}
+   \startsynchronization}
 
 \def\endheadplacement#1#2%
-  {\doifelsevalue{\??rf#1\c!status}\v!start
+  {\doifelsevalue{\??rf#1\c!state}\v!start
      {\doifvaluenothing{\??ko#1\c!file}{\autocrossdocumentfalse}}
      {\autocrossdocumentfalse}%
    % no message needed here, should be a proper switch
@@ -1825,7 +1822,7 @@
      \let\headlastlinewidth\!!zeropoint
      \snaptogrid[\getvalue{\??ko#1\c!grid}]\hbox
        {\hskip\localheadskip
-        \hskip\getvalue{\??ko#1\c!marge}\relax
+        \hskip\getvalue{\??ko#1\c!margin}\relax
         \iflocation
           \ifautocrossdocument
             \doifreferencefoundelse{\getvalue{\??ko#1\c!file}::#1}
@@ -1849,7 +1846,7 @@
      \iflocation
        \ifautocrossdocument
          \hhboxindent=\ifcontinuoushead\headlastlinewidth\else\zeropoint\fi
-         \unhhbox0\with{\naarbox{\box\hhbox}[\getvalue{\??ko#1\c!file}::#1]}%
+         \unhhbox0\with{\gotobox{\box\hhbox}[\getvalue{\??ko#1\c!file}::#1]}%
          \advance\lasthhboxwidth by \numberheaddistance
          \xdef\headlastlinewidth{\the\lasthhboxwidth}%
        \else
@@ -1872,7 +1869,7 @@
        \prevdepth\localheaddepth
      \fi
    \fi \fi
-   \stopsynchronisatie
+   \stopsynchronization
    \egroup
    \egroup
    \ifdisplaysectionhead
@@ -1897,7 +1894,7 @@
      #1{#2}%
    \fi}
 
-\def\dostelkopnummerin[#1][#2#3]% todo: = (don't reset)
+\def\dosetupheadnumber[#1][#2#3]% todo: = (don't reset)
   {\bgroup
    \setsectieenkoppeling{#1}%
    \doifinstringelse{#2}{+-}
@@ -1909,33 +1906,33 @@
      {\@@setsectionnumber\@@sectie{#2#3}}%
    \egroup}
 
-\def\stelkopnummerin
-  {\dodoubleargument\dostelkopnummerin}
+\def\setupheadnumber
+  {\dodoubleargument\dosetupheadnumber}
 
-\def\huidigekopnummer{0}
+\def\currentheadnumber{0}
 
-\def\bepaalkopnummer[#1]%
+\def\determineheadnumber[#1]%
   {\bgroup
    \setsectieenkoppeling{#1}%
-   \xdef\huidigekopnummer{\@@sectionvalue{\@@sectie}}%
+   \xdef\currentheadnumber{\@@sectionvalue{\@@sectie}}%
    \egroup}
 
-\def\complexkopnummer[#1]%
+\def\complexheadnumber[#1]%
   {\bgroup
-   \edef\huidigekopnummer{#1}%
+   \edef\currentheadnumber{#1}%
    \doifinsetelse{-}{#1} % br undocumented
-     {\removefromcommalist{-}\huidigekopnummer % br
-      \setsectieenkoppeling\huidigekopnummer
-      \stelsectiein[\@@sectie][\c!vorigenummer=\v!nee]}%
-     {\setsectieenkoppeling\huidigekopnummer}%
-   \xdef\huidigekopnummer{\@@sectionvalue{\@@sectie}}%
-   \doifnot{\huidigekopnummer}{0}{\finalsectionnumber}%
+     {\removefromcommalist{-}\currentheadnumber % br
+      \setsectieenkoppeling\currentheadnumber
+      \setupsection[\@@sectie][\c!previousnumber=\v!no]}%
+     {\setsectieenkoppeling\currentheadnumber}%
+   \xdef\currentheadnumber{\@@sectionvalue{\@@sectie}}%
+   \doifnot{\currentheadnumber}{0}{\finalsectionnumber}%
    \egroup}
 
-\def\simplekopnummer
-  {\huidigekopnummer}
+\def\simpleheadnumber
+  {\currentheadnumber}
 
-\definecomplexorsimple\kopnummer
+\definecomplexorsimple\headnumber
 
 \def\alinea
   {\par}
@@ -1954,7 +1951,7 @@
 %   \input tufte \par
 % \stopnarrower
 
-\let\numberheadalternative\v!normaal
+\let\numberheadalternative\v!normal
 
 \def\defineheadplacement
   {\dodoubleargument\dodefineheadplacement}
@@ -1966,14 +1963,14 @@
 \def\@@placehead
   {\executeifdefined
      {\??ko::\numberheadalternative}
-     {\getvalue{\??ko::\v!normaal}}}
+     {\getvalue{\??ko::\v!normal}}}
 
-\defineheadplacement[\v!alinea][\v!vertikaal]#1#2%
+\defineheadplacement[\v!paragraph][\v!vertical]#1#2%
   {\vbox
      {\localheadsetup
       \begstrut\ifheadnumbercontent#1\hskip\numberheaddistance\fi#2}}
 
-\defineheadplacement[\v!normaal][\v!vertikaal]#1#2%
+\defineheadplacement[\v!normal][\v!vertical]#1#2%
   {\ifheadnumbercontent
      \setbox0\hbox{{#1}\hskip\numberheaddistance}%
      \vbox
@@ -2015,14 +2012,14 @@
       \begstrut % use one \strut here!
       \ifheadnumbercontent
         \llap{\hbox to 5em{\hfill{#1}%
-          \hskip\localheadskip\hskip\linkermargeafstand}}%
+          \hskip\localheadskip\hskip\leftmargindistance}}%
       \fi
       {#2}}}
 
-\defineheadplacement[\v!inmarge][\v!vertikaal]#1#2{\placeheadmargin{#1}{#2}}
-\defineheadplacement[\v!marge]  [\v!vertikaal]#1#2{\placeheadmargin{#1}{#2}}
+\defineheadplacement[\v!inmargin][\v!vertical]#1#2{\placeheadmargin{#1}{#2}}
+\defineheadplacement[\v!margin]  [\v!vertical]#1#2{\placeheadmargin{#1}{#2}}
 
-\defineheadplacement[\v!midden][\v!vertikaal]#1#2%
+\defineheadplacement[\v!middle][\v!vertical]#1#2%
   {\vbox
      {\localheadsetup
       \veryraggedcenter
@@ -2030,7 +2027,7 @@
       \let\crlf\endgraf
       \ifheadnumbercontent\strut#1\par\fi\begstrut#2}}
 
-\defineheadplacement[\v!tekst][\v!horizontaal]#1#2%
+\defineheadplacement[\v!text][\v!horizontal]#1#2%
   {\bgroup
    \localheadsetup % no stretch in distance
    \ifheadnumbercontent{#1}\kern\numberheaddistance\fi{\begstrut#2}%
@@ -2048,360 +2045,357 @@
 % onder/boven lijnt het nummer op de onderste/bovenste regel
 % uit van een meerregelige kop
 
-\defineheadplacement[\v!onder][\v!vertikaal]#1#2{\placeheadlohi\vbox{#1}{#2}}
-\defineheadplacement[\v!boven][\v!vertikaal]#1#2{\placeheadlohi\vtop{#1}{#2}}
+\defineheadplacement[\v!bottom][\v!vertical]#1#2{\placeheadlohi\vbox{#1}{#2}}
+\defineheadplacement[\v!top][\v!vertical]#1#2{\placeheadlohi\vtop{#1}{#2}}
 
 % default   == instellingen
 % koppeling == koppen, breaks, marks, enz.
 % sectie    == nummering
 
-\let\@@kolijst=\empty
+\let\@@kolist=\empty
 
-\def\dodefinieerkop[#1][#2]%   % don't preset prefix to much
+\def\dodefinehead[#1][#2]%   % don't preset prefix to much
   {\presetlabeltext[#1=]%
    \getparameters
      [\??ko#1]
-     [\c!nummerletter=\getvalue{\??ko#1\c!letter},
-      \c!tekstletter=\getvalue{\??ko#1\c!letter},
-      \c!nummerkleur=\getvalue{\??ko#1\c!kleur},
-      \c!tekstkleur=\getvalue{\??ko#1\c!kleur}]%
+     [\c!numberstyle=\getvalue{\??ko#1\c!style},
+      \c!textstyle=\getvalue{\??ko#1\c!style},
+      \c!numbercolor=\getvalue{\??ko#1\c!color},
+      \c!textcolor=\getvalue{\??ko#1\c!color}]%
    \doifassignmentelse{#2}
      {\getparameters
         [\??ko#1]
-        [\c!sectie=\getvalue{\??ko\getvalue{\??ko#1\c!koppeling}\c!sectie},
+        [\c!section=\getvalue{\??ko\getvalue{\??ko#1\c!coupling}\c!section},
          \c!default=,
-         \c!koppeling=,
+         \c!coupling=,
          \c!prefix=,
-         \c!voor=,
-         \c!na=,
-         \c!afstand=\!!zeropoint,
-         \c!pagina=,
-         \c!hoofd=,
-         \c!tekst=,
-         \c!voet=,
-         \c!letter=,
-         \c!nummercommando=,
-         \c!tekstcommando=,
-         \c!eigennummer=\v!nee,
-         \c!nummer=\v!ja,
-         \c!kleur=,
-         \c!doorgaan=\v!ja,
-         \c!plaatskop=\v!ja,
-         \c!resetnummer=\v!ja,
-         \c!verhoognummer=\v!ja,
-         \c!variant=\@@kovariant,
-         \c!commando=\@@placehead,
-         \c!scheider=\@@koscheider,
-         \c!uitlijnen=\@@kouitlijnen,
-         \c!titeluitlijnen=\@@kotiteluitlijnen,
-         \c!tolerantie=\@@kotolerantie,
-         \c!springvolgendein=\@@kospringvolgendein,
+         \c!before=,
+         \c!after=,
+         \c!distance=\!!zeropoint,
+         \c!page=,
+         \c!header=,
+         \c!text=,
+         \c!footer=,
+         \c!style=,
+         \c!numbercommand=,
+         \c!textcommand=,
+         \c!ownnumber=\v!no,
+         \c!number=\v!yes,
+         \c!color=,
+         \c!continue=\v!yes,
+         \c!placehead=\v!yes,
+         \c!resetnumber=\v!yes,
+         \c!incrementnumber=\v!yes,
+         \c!alternative=\@@koalternative,
+         \c!command=\@@placehead,
+         \c!separator=\@@koseparator,
+         \c!align=\@@koalign,
+         \c!aligntitle=\@@koaligntitle,
+         \c!tolerance=\@@kotolerance,
+         \c!indentnext=\@@koindentnext,
          \c!file=,
-         \c!expansie=,
+         \c!expansion=,
          \c!grid=,
-         \c!margetekst=,
-         \c!marge=\@@komarge,
+         \c!margintext=,
+         \c!margin=\@@komargin,
          #2]%
       \ConvertToConstant\doifnot{#1}{\getvalue{\??ko#1\c!default}}
         {\doifsomething{\getvalue{\??ko#1\c!default}}
            {\copyparameters
               [\??ko#1][\??ko\getvalue{\??ko#1\c!default}]
-              [\c!voor,\c!na,\c!commando,\c!file,\c!pagina,\c!doorgaan,
-               \c!hoofd,\c!tekst,\c!voet,\c!scheider,\c!resetnummer,
-               \c!nummer,\c!eigennummer,\c!plaatskop,\c!verhoognummer,
-               \c!letter,\c!kleur,\c!afstand,\c!variant,\c!springvolgendein,
+              [\c!before,\c!after,\c!command,\c!file,\c!page,\c!continue,
+               \c!header,\c!text,\c!footer,\c!separator,\c!resetnumber,
+               \c!number,\c!ownnumber,\c!placehead,\c!incrementnumber,
+               \c!style,\c!color,\c!distance,\c!alternative,\c!indentnext,
                % new per 20/03/3002 (o-pbu-l) / was too confusing
-               % \c!nummerletter,\c!tekstletter,\c!expansie,
+               % \c!numberstyle,\c!textstyle,\c!expansion,
                % again too confusing
-               \c!uitlijnen,\c!titeluitlijnen,\c!tolerantie,\c!grid,
-               \c!nummercommando,\c!tekstcommando,\c!margetekst,\c!marge]}}%
+               \c!align,\c!aligntitle,\c!tolerance,\c!grid,
+               \c!numbercommand,\c!textcommand,\c!margintext,\c!margin]}}%
       \getparameters[\??ko#1][#2]%
-      \doifsomething{\getvalue{\??ko#1\c!sectie}}
+      \doifsomething{\getvalue{\??ko#1\c!section}}
         {\doifelsemarking{#1}% \doifundefined{\??mk#1}
            {}% marking #1 already defined
            {\definemarking[#1]%
-            \couplemarking[#1][\getvalue{\??ko#1\c!sectie}]%
-            \definemarking[#1\v!nummer]%
+            \couplemarking[#1][\getvalue{\??ko#1\c!section}]%
+            \definemarking[#1\v!number]%
 % klopt dit wel ?
-            \couplemarking[#1\v!nummer][\getvalue{\??ko#1\c!sectie}]}}%
+            \couplemarking[#1\v!number][\getvalue{\??ko#1\c!section}]}}%
 %            \couplemarking[#1\v!nummer][\getvalue{\??ko#1\c!sectie}\v!nummer]}}%
-      \doifundefined{\??li#1}{\definieerlijst[#1]}}
+      \doifundefined{\??li#1}{\definelist[#1]}}
      {\ConvertToConstant\doifelse{#1}{#2}
-        {\doifundefined{\??li#1}{\definieerlijst[#1]}}
+        {\doifundefined{\??li#1}{\definelist[#1]}}
         {\copyparameters
            [\??ko#1][\??ko#2]
-           [\c!niveau,\c!sectie,\c!koppeling,\c!prefix,
-            \c!voor,\c!na,\c!commando,\c!file,\c!pagina,\c!doorgaan,
-            \c!scheider,
-            \c!hoofd,\c!tekst,\c!voet,\c!resetnummer,
-            \c!nummer,\c!eigennummer,\c!plaatskop,\c!verhoognummer,
-            \c!letter,\c!kleur,\c!afstand,\c!variant,\c!springvolgendein,
+           [\c!level,\c!section,\c!coupling,\c!prefix,
+            \c!before,\c!after,\c!command,\c!file,\c!page,\c!continue,
+            \c!separator,
+            \c!header,\c!text,\c!footer,\c!resetnumber,
+            \c!number,\c!ownnumber,\c!placehead,\c!incrementnumber,
+            \c!style,\c!color,\c!distance,\c!alternative,\c!indentnext,
             % new per 20/03/3002 (o-pbu-l) / was too confusing
-            % \c!nummerletter,\c!tekstletter,\c!expansie,
+            % \c!numberstyle,\c!textstyle,\c!expansion,
             % again too confusing
-            \c!uitlijnen,\c!titeluitlijnen,\c!tolerantie,\c!grid,
-            \c!nummercommando,\c!tekstcommando,\c!margetekst,\c!marge]%
-\getparameters[\??ko#1][\c!expansie=]% iig een value, rather fuzzy
+            \c!align,\c!aligntitle,\c!tolerance,\c!grid,
+            \c!numbercommand,\c!textcommand,\c!margintext,\c!margin]%
+\getparameters[\??ko#1][\c!expansion=]% iig een value, rather fuzzy
          \definemarking[#1][#2]%
-         \definemarking[#1\v!nummer][#2\v!nummer]%
-         \doifundefined{\??li#1}{\definieerlijst[#1][#2]}}}%
-   \addtocommalist{#1}\@@kolijst
+         \definemarking[#1\v!number][#2\v!number]%
+         \doifundefined{\??li#1}{\definelist[#1][#2]}}}%
+   \addtocommalist{#1}\@@kolist
    \setevalue{\??sk#1}%
-     {\getvalue{\??ko#1\c!koppeling}}%
+     {\getvalue{\??ko#1\c!coupling}}%
    \setevalue{\??by#1}%
-     {\getvalue{\??ko#1\c!sectie}}%
-   \setevalue{\??by\v!per#1}%
-     {\getvalue{\??ko#1\c!sectie}}%
+     {\getvalue{\??ko#1\c!section}}%
+   \setevalue{\??by\v!by#1}%
+     {\getvalue{\??ko#1\c!section}}%
    \setvalue{#1}%
      {\dodoubleempty\dosomekop[#1]}}
 
-\def\definieerkop
-  {\dodoubleemptywithset\dodefinieerkop}
+\def\definehead
+  {\dodoubleemptywithset\dodefinehead}
 
 \def\dosomekop[#1][#2]%
   {\dowithpargument{\dodosomekop{#1}[#2]}}
 
-\def\dostelkopin[#1][#2]%
+\def\dosetuphead[#1][#2]%
   {\getparameters[\??ko#1][#2]%
    % The next check prevents hard to trace problems. I once
-   % set \c!commando to nothing and (quite natural) got the
+   % set \c!command to nothing and (quite natural) got the
    % wrong references etc. The whole bunch should be boxed!
-   \expandafter\convertcommand\csname\??ko#1\c!commando\endcsname\to\ascii
-   \doifnothing\ascii{\setvalue{\??ko#1\c!commando}{\@@placehead}}}
-
-\def\stelkopin
-  {\dodoubleargumentwithset\dostelkopin}
+   \expandafter\convertcommand\csname\??ko#1\c!command\endcsname\to\ascii
+   \doifnothing\ascii{\setvalue{\??ko#1\c!command}{\@@placehead}}}
 
-\newif\ifsectienummer       \sectienummertrue
-\newif\ifdisplaysectionhead \displaysectionheadtrue
+\def\setuphead
+  {\dodoubleargumentwithset\dosetuphead}
 
-\def\dostelkoppenin[#1]%
+\def\dosetupheads[#1]%
   {\getparameters[\??ko][#1]%
-   \doifelse{\@@kosectienummer}\v!ja\sectienummertrue\sectienummerfalse}
+   \doifelse{\@@kosectionnumber}\v!yes\sectienummertrue\sectienummerfalse}
 
-\def\stelkoppenin
-  {\dosingleargument\dostelkoppenin}
+\def\setupheads
+  {\dosingleargument\dosetupheads}
 
-\def\systemsuppliedchapter {\getvalue{\v!hoofdstuk}}
-\def\systemsuppliedtitle   {\getvalue{\v!titel}}
+\def\systemsuppliedchapter {\getvalue{\v!chapter}}
+\def\systemsuppliedtitle   {\getvalue{\v!title}}
 
 % a left over
 
 \def\complexbijlage[#1]#2%
-  {\pagina[\v!rechts]
-   \setuppagenumbering[\c!status=\v!stop]
+  {\page[\v!right]
+   \setuppagenumbering[\c!state=\v!stop]
    \systemsuppliedchapter[#1]{#2}
-   \pagina[\v!rechts]
-   \setuppagenumbering[\c!status=\v!start]
-   \setuppagenumbering[\c!nummer=1]}
+   \page[\v!right]
+   \setuppagenumbering[\c!state=\v!start]
+   \setuppagenumbering[\c!number=1]}
 
-\setvalue{\v!bijlage}%
+\setvalue{\v!appendix}%
   {\complexorsimpleempty\bijlage}
 
-\stelkoppenin
-  [\c!variant=\v!normaal,
-   \c!sectienummer=\v!ja,
-   \c!scheider=.,
-   \c!limittext=\v!ja,
-   \c!uitlijnen=,
-   \c!titeluitlijnen=,
-   \c!tolerantie=,
-   \c!springvolgendein=\v!nee,
-   \c!marge=\zeropoint,
-   \c!commando=]
-
-\definieersectieblok [\v!hoofdtekst] [\v!hoofdteksten] [\c!nummer=\v!ja]
-\definieersectieblok [\v!bijlage]    [\v!bijlagen]     [\c!nummer=\v!ja]
-\definieersectieblok [\v!inleiding]  [\v!inleidingen]  [\c!nummer=\v!nee]
-\definieersectieblok [\v!uitleiding] [\v!uitleidingen] [\c!nummer=\v!nee]
-
-\definieersectie[\v!sectionlevel-1]   % deel
-\definieersectie[\v!sectionlevel-2]   % hoofdstuk
-\definieersectie[\v!sectionlevel-3]   % paragraaf
-\definieersectie[\v!sectionlevel-4]   % subparagraaf
-\definieersectie[\v!sectionlevel-5]   % subsubparagraaf
-\definieersectie[\v!sectionlevel-6]   % subsubsubparagraaf
-\definieersectie[\v!sectionlevel-7]   % subsubsubsubparagraaf
+\setupheads
+  [\c!alternative=\v!normal,
+   \c!sectionnumber=\v!yes,
+   \c!separator=.,
+   \c!limittext=\v!yes,
+   \c!align=,
+   \c!aligntitle=,
+   \c!tolerance=,
+   \c!indentnext=\v!no,
+   \c!margin=\zeropoint,
+   \c!command=]
+
+\definesectionblock [\v!bodypart] [\v!bodymatter] [\c!number=\v!yes]
+\definesectionblock [\v!appendix]    [\v!appendices]     [\c!number=\v!yes]
+\definesectionblock [\v!frontpart]  [\v!frontmatter]  [\c!number=\v!no]
+\definesectionblock [\v!backpart] [\v!backmatter] [\c!number=\v!no]
+
+\definesection[\v!sectionlevel-1]   % deel
+\definesection[\v!sectionlevel-2]   % hoofdstuk
+\definesection[\v!sectionlevel-3]   % paragraaf
+\definesection[\v!sectionlevel-4]   % subparagraaf
+\definesection[\v!sectionlevel-5]   % subsubparagraaf
+\definesection[\v!sectionlevel-6]   % subsubsubparagraaf
+\definesection[\v!sectionlevel-7]   % subsubsubsubparagraaf
 
 % \c!eigennummer ook hier?
 
-\definieerkop
-  [\v!deel]
-  [\c!sectie=\v!sectionlevel-1]
-
-\definieerkop
-  [\v!hoofdstuk]
-  [\c!sectie=\v!sectionlevel-2]
-
-\definieerkop
-  [\v!paragraaf]
-  [\c!sectie=\v!sectionlevel-3]
-
-\definieerkop
-  [\v!sub\v!paragraaf]
-  [\c!sectie=\v!sectionlevel-4,
-   \c!default=\v!paragraaf]
-
-\definieerkop
-  [\v!sub\v!sub\v!paragraaf]
-  [\c!sectie=\v!sectionlevel-5,
-  %\c!default=\v!paragraaf]
-   \c!default=\v!sub\v!paragraaf]             % nieuw
-
-\definieerkop
-  [\v!sub\v!sub\v!sub\v!paragraaf]
-  [\c!sectie=\v!sectionlevel-6,
-  %\c!default=\v!paragraaf]
-   \c!default=\v!sub\v!sub\v!paragraaf]       % nieuw
-
-\definieerkop
-  [\v!sub\v!sub\v!sub\v!sub\v!paragraaf]
-  [\c!sectie=\v!sectionlevel-7,
-  %\c!default=\v!paragraaf]
-   \c!default=\v!sub\v!sub\v!sub\v!paragraaf] % nieuw
-
-\definieerkop
-  [\v!titel]
-  [\c!koppeling=\v!hoofdstuk,
-   \c!default=\v!hoofdstuk,
-   \c!verhoognummer=\v!nee]
-
-\definieerkop
-  [\v!onderwerp]
-  [\c!koppeling=\v!paragraaf,
-   \c!default=\v!paragraaf,
-   \c!verhoognummer=\v!nee]
-
-\definieerkop
-  [\v!sub\v!onderwerp]
-  [\c!koppeling=\v!sub\v!paragraaf,
-   \c!default=\v!sub\v!paragraaf,
-   \c!verhoognummer=\v!nee]
-
-\definieerkop
-  [\v!sub\v!sub\v!onderwerp]
-  [\c!koppeling=\v!sub\v!sub\v!paragraaf,
-   \c!default=\v!sub\v!sub\v!paragraaf,
-   \c!verhoognummer=\v!nee]
-
-\definieerkop
-  [\v!sub\v!sub\v!sub\v!onderwerp]
-  [\c!koppeling=\v!sub\v!sub\v!sub\v!paragraaf,
-   \c!default=\v!sub\v!sub\v!sub\v!paragraaf,
-   \c!verhoognummer=\v!nee]
-
-\definieerkop
-  [\v!sub\v!sub\v!sub\v!sub\v!onderwerp]
-  [\c!koppeling=\v!sub\v!sub\v!sub\v!sub\v!paragraaf,
-   \c!default=\v!sub\v!sub\v!sub\v!sub\v!paragraaf,
-   \c!verhoognummer=\v!nee]
-
-\stelsectiein
+\definehead
+  [\v!part]
+  [\c!section=\v!sectionlevel-1]
+
+\definehead
+  [\v!chapter]
+  [\c!section=\v!sectionlevel-2]
+
+\definehead
+  [\v!section]
+  [\c!section=\v!sectionlevel-3]
+
+\definehead
+  [\v!sub\v!section]
+  [\c!section=\v!sectionlevel-4,
+   \c!default=\v!section]
+
+\definehead
+  [\v!sub\v!sub\v!section]
+  [\c!section=\v!sectionlevel-5,
+  %\c!default=\v!section]
+   \c!default=\v!sub\v!section]             % nieuw
+
+\definehead
+  [\v!sub\v!sub\v!sub\v!section]
+  [\c!section=\v!sectionlevel-6,
+  %\c!default=\v!section]
+   \c!default=\v!sub\v!sub\v!section]       % nieuw
+
+\definehead
+  [\v!sub\v!sub\v!sub\v!sub\v!section]
+  [\c!section=\v!sectionlevel-7,
+  %\c!default=\v!section]
+   \c!default=\v!sub\v!sub\v!sub\v!section] % nieuw
+
+\definehead
+  [\v!title]
+  [\c!coupling=\v!chapter,
+   \c!default=\v!chapter,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!subject]
+  [\c!coupling=\v!section,
+   \c!default=\v!section,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!sub\v!subject]
+  [\c!coupling=\v!sub\v!section,
+   \c!default=\v!sub\v!section,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!sub\v!sub\v!subject]
+  [\c!coupling=\v!sub\v!sub\v!section,
+   \c!default=\v!sub\v!sub\v!section,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!sub\v!sub\v!sub\v!subject]
+  [\c!coupling=\v!sub\v!sub\v!sub\v!section,
+   \c!default=\v!sub\v!sub\v!sub\v!section,
+   \c!incrementnumber=\v!no]
+
+\definehead
+  [\v!sub\v!sub\v!sub\v!sub\v!subject]
+  [\c!coupling=\v!sub\v!sub\v!sub\v!sub\v!section,
+   \c!default=\v!sub\v!sub\v!sub\v!sub\v!section,
+   \c!incrementnumber=\v!no]
+
+\setupsection
   [\v!sectionlevel-2]
-  [\v!bijlage\c!conversie=\v!Letter,
-   \c!vorigenummer=\v!nee]
-
-\stelkopin
-  [\v!deel]
-  [\c!plaatskop=\v!nee]
-
-\stelkopin
-  [\v!hoofdstuk]
-  [\v!bijlage\c!label=\v!bijlage,
-   \v!hoofdtekst\c!label=\v!hoofdstuk]             %   bijlageconversie=\Character
-
-\stelkopin
-  [\v!paragraaf]
-  [\v!bijlage\c!label=\v!paragraaf,
-   \v!hoofdtekst\c!label=\v!paragraaf]             %   bijlageconversie=\Character
-
-\stelkopin
-  [\v!sub\v!paragraaf]
-  [\v!bijlage\c!label=\v!sub\v!paragraaf,
-   \v!hoofdtekst\c!label=\v!sub\v!paragraaf]       %   bijlageconversie=\Character
-
-\stelkopin
-  [\v!sub\v!sub\v!paragraaf]
-  [\v!bijlage\c!label=\v!sub\v!sub\v!paragraaf,
-   \v!hoofdtekst\c!label=\v!sub\v!sub\v!paragraaf] %   bijlageconversie=\Character
-
-\stelkopin
-  [\v!deel,\v!hoofdstuk]
-  [%\c!uitlijnen=,
-   %\c!springvolgendein=\v!nee,
-   \c!doorgaan=\v!nee,
-   \c!pagina=\v!rechts,
-   \c!hoofd=,
-   \c!letter=\tfc,
-   \c!afstand=.75em,
-   \c!voor={\blanko[2*\v!groot]},
-   \c!na={\blanko[2*\v!groot]}]
-
-\stelkopin
-  [\v!paragraaf]
-  [%\c!uitlijnen=,
-   %\c!springvolgendein=\v!nee,
-   \c!letter=\tfa,
-   \c!afstand=.75em,
-   \c!voor={\blanko[2*\v!groot]},
-   \c!na=\blanko]
-
-\stelkopin                 % nieuw
-  [\v!sub\v!paragraaf]
-  [\c!pagina=]
-
-\definieersamengesteldelijst
-  [\v!inhoud]
-  [\v!deel,
-   \v!hoofdstuk,
-   \v!paragraaf,
-   \v!sub\v!paragraaf,
-   \v!sub\v!sub\v!paragraaf,
-   \v!sub\v!sub\v!sub\v!paragraaf,
-   \v!sub\v!sub\v!sub\v!sub\v!paragraaf]
-  [\c!niveau=\v!sub\v!sub\v!sub\v!sub\v!paragraaf,
-   \c!criterium=\v!lokaal]
-
-\stellijstin
-  [\v!deel]
-  [\c!voor={\blanko\pagina[\v!voorkeur]},
-   \c!na=\blanko,
-   \c!label=\v!ja,
-   \c!scheider=:,
-   \c!afstand=1em]
-
-\stellijstin
-  [\v!hoofdstuk]
-  [\c!voor={\blanko\pagina[\v!voorkeur]},
-   \c!na=]
-
-\stellijstin [\v!deel]                              [\c!breedte=0em]
-\stellijstin [\v!hoofdstuk]                         [\c!breedte=2em]
-\stellijstin [\v!paragraaf]                         [\c!breedte=3em]
-\stellijstin [\v!sub\v!paragraaf]                   [\c!breedte=4em]
-\stellijstin [\v!sub\v!sub\v!paragraaf]             [\c!breedte=5em]
-\stellijstin [\v!sub\v!sub\v!sub\v!paragraaf]       [\c!breedte=6em]
-\stellijstin [\v!sub\v!sub\v!sub\v!sub\v!paragraaf] [\c!breedte=7em]
+  [\v!appendix\c!conversion=\v!Letter,
+   \c!previousnumber=\v!no]
+
+\setuphead
+  [\v!part]
+  [\c!placehead=\v!no]
+
+\setuphead
+  [\v!chapter]
+  [\v!appendix\c!label=\v!appendix,
+   \v!bodypart\c!label=\v!chapter]             %   bijlageconversie=\Character
+
+\setuphead
+  [\v!section]
+  [\v!appendix\c!label=\v!section,
+   \v!bodypart\c!label=\v!section]             %   bijlageconversie=\Character
+
+\setuphead
+  [\v!sub\v!section]
+  [\v!appendix\c!label=\v!sub\v!section,
+   \v!bodypart\c!label=\v!sub\v!section]       %   bijlageconversie=\Character
+
+\setuphead
+  [\v!sub\v!sub\v!section]
+  [\v!appendix\c!label=\v!sub\v!sub\v!section,
+   \v!bodypart\c!label=\v!sub\v!sub\v!section] %   bijlageconversie=\Character
+
+\setuphead
+  [\v!part,\v!chapter]
+  [%\c!align=,
+   %\c!indentnext=\v!no,
+   \c!continue=\v!no,
+   \c!page=\v!right,
+   \c!header=,
+   \c!style=\tfc,
+   \c!distance=.75em,
+   \c!before={\blank[2*\v!big]},
+   \c!after={\blank[2*\v!big]}]
+
+\setuphead
+  [\v!section]
+  [%\c!align=,
+   %\c!indentnext=\v!no,
+   \c!style=\tfa,
+   \c!distance=.75em,
+   \c!before={\blank[2*\v!big]},
+   \c!after=\blank]
+
+\setuphead                 % nieuw
+  [\v!sub\v!section]
+  [\c!page=]
+
+\definecombinedlist
+  [\v!content]
+  [\v!part,
+   \v!chapter,
+   \v!section,
+   \v!sub\v!section,
+   \v!sub\v!sub\v!section,
+   \v!sub\v!sub\v!sub\v!section,
+   \v!sub\v!sub\v!sub\v!sub\v!section]
+  [\c!level=\v!sub\v!sub\v!sub\v!sub\v!section,
+   \c!criterium=\v!local]
+
+\setuplist
+  [\v!part]
+  [\c!before={\blank\page[\v!preference]},
+   \c!after=\blank,
+   \c!label=\v!yes,
+   \c!separator=:,
+   \c!distance=1em]
+
+\setuplist
+  [\v!chapter]
+  [\c!before={\blank\page[\v!preference]},
+   \c!after=]
+
+\setuplist [\v!part]                              [\c!width=0em]
+\setuplist [\v!chapter]                         [\c!width=2em]
+\setuplist [\v!section]                         [\c!width=3em]
+\setuplist [\v!sub\v!section]                   [\c!width=4em]
+\setuplist [\v!sub\v!sub\v!section]             [\c!width=5em]
+\setuplist [\v!sub\v!sub\v!sub\v!section]       [\c!width=6em]
+\setuplist [\v!sub\v!sub\v!sub\v!sub\v!section] [\c!width=7em]
 
 % hm
 
 \setuppagenumbering % na instellen hoofdteksten !
-  [\c!variant=\v!enkelzijdig,
-   \c!plaats={\v!hoofd,\v!midden},
-   \c!conversie=\v!cijfers,
-   \c!breedte=, % in geval van \v!kantlijn
-   \c!links=,
-   \c!rechts=,
-   \c!wijze=\v!per\v!deel,
-   \c!tekst=,
-   \v!hoofdstuk\v!nummer=\v!nee, % v
-   \v!deel\v!nummer=\v!ja,       % v
-   \c!nummerscheider=--,
-   \c!tekstscheider=\tfskip,
-   \c!status=\v!start,
-   \c!commando=,
-   \c!strut=\v!ja, % nieuw
-   \c!letter=, % \v!normaal, % empty, otherwise conflict
-   \c!kleur=]
-
-\protect \endinput
\ No newline at end of file
+  [\c!alternative=\v!singlesided,
+   \c!location={\v!header,\v!middle},
+   \c!conversion=\v!numbers,
+   \c!width=, % in geval van \v!marginedge
+   \c!left=,
+   \c!right=,
+   \c!way=\v!by\v!part,
+   \c!text=,
+   \v!chapter\v!number=\v!no, % v
+   \v!part\v!number=\v!yes,       % v
+   \c!numberseparator=--,
+   \c!textseparator=\tfskip,
+   \c!state=\v!start,
+   \c!command=,
+   \c!strut=\v!yes, % nieuw
+   \c!style=, % \v!normal, % empty, otherwise conflict
+   \c!color=]
+
+\protect \endinput
diff --git a/tex/context/base/core-snc.tex b/tex/context/base/core-snc.tex
index e80fd1613..2ecd1058b 100644
--- a/tex/context/base/core-snc.tex
+++ b/tex/context/base/core-snc.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-snc,
+%D   [       filefile=core-snc,
 %D        version=2003.12.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Synchronization Support,
@@ -112,24 +112,19 @@
 \def\dodoresyncposition #1#2{\dodosyncposition{#1}{#2}\s!reset}
 \def\dodopresyncposition#1#2{\dodosyncposition{#1}{#2}\s!preset}
 
-\def\doresyncposition [#1][#2]{\setxvalue{\s!reset:\s!syncpos:#1}{\noexpand\dodoresyncposition{#1}{#2}}}
+\def\doresyncposition [#1][#2]{\setxvalue{\s!reset :\s!syncpos:#1}{\noexpand\dodoresyncposition{#1}{#2}}}
 \def\dopresyncposition[#1][#2]{\setxvalue{\s!preset:\s!syncpos:#1}{\noexpand\dodopresyncposition{#1}{#2}}}
 
-% \appendtoks \the \resetsyncpositions \to \everypar
-% \appendtoks \the\presetsyncpositions \to \everypar
+\def\flushsyncpositions % this order !
+  {\the\presetsyncpositions
+   \the\resetsyncpositions}
 
-\appendtoks \the \presetsyncpositions \to \everypar
-\appendtoks \the \resetsyncpositions  \to \everypar
+% \appendtoks \flushsyncpositions \to \everypar
+% \appendtoks \flushsyncpositions \to \everyheadstart
 
 % \explicitneverypar -> in grid snapper, eerst testen
 %
-% \appendtoks \the\resetsyncpositions  \to \neverypar
-% \appendtoks \the\presetsyncpositions \to \neverypar
-
-\appendtoks
-  \the\presetsyncpositions
-  \the\resetsyncpositions
-\to \everyheadstart
+% \appendtoks \flushsyncpositions \to \neverypar
 
 \def\flushsyncxxsets#1#2%
   {\setbox\scratchbox\hbox{\the#1}%
@@ -178,4 +173,4 @@
 \syncposition[1][3] \input ward \endgraf
 \syncposition[1][4] \input ward \endgraf
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index 953e91962..aca3a84f9 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-spa,
+%D   [       filefile=core-spa,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Spacing,
@@ -86,9 +86,9 @@
 %D A quick way to determine left|/|middle|/|right states
 %D (experimental).
 
-\setvalue{\??as\v!links }{0}
-\setvalue{\??as\v!midden}{1}
-\setvalue{\??as\v!rechts}{2}
+\setvalue{\??as\v!left }{0}
+\setvalue{\??as\v!middle}{1}
+\setvalue{\??as\v!right}{2}
 
 \def\setalignmentswitch#1%
   {\chardef\alignmentswitch0\csname\??as#1\endcsname\relax}
@@ -100,23 +100,23 @@
 %D
 %D For instance
 %D
-%D \starttypen
+%D \starttyping
 %D \setupinterlinespace[line=2.8ex]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This setting adapts itself to the bodyfontsize, while for
 %D instance saying
 %D
-%D \starttypen
+%D \starttyping
 %D \setupinterlinespace[line=12pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D sets things fixed for all sizes, which is definitely not
 %D what we want. Therefore one can also say:
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfontenvironment[9pt][interlinespace=11pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D One can still use \type{\setupinterlinespace} (without
 %D arguments) to set the interline space according to the
@@ -134,7 +134,7 @@
 \fi
 
 \def\presetnormallineheight
-  {\edef\normallineheight{\@@itregel}%
+  {\edef\normallineheight{\@@itline}%
    \iflocalinterlinespace \else
      \doifdefined\bodyfontinterlinespecs
        {\doifsomething\bodyfontinterlinespace
@@ -143,31 +143,31 @@
 
 \def\setupspecifiedinterlinespace[#1]%
   {\getparameters[\??it][#1]%
-   \scratchdimen0\@@ithoogte\points
-   \advance\scratchdimen 0\@@itdiepte\points
+   \scratchdimen0\@@itheight\points
+   \advance\scratchdimen 0\@@itdepth\points
    \ifdim\scratchdimen>\onepoint
-     \showmessage\m!layouts{10}{\@@ithoogte,\@@itdiepte}%
-     \let\@@ithoogte\strutheightfactor
-     \let\@@itdiepte\strutdepthfactor
+     \showmessage\m!layouts{10}{\@@itheight,\@@itdepth}%
+     \let\@@itheight\strutheightfactor
+     \let\@@itdepth\strutdepthfactor
    \else
-     \let\strutheightfactor\@@ithoogte
-     \let\strutdepthfactor \@@itdiepte
+     \let\strutheightfactor\@@itheight
+     \let\strutdepthfactor \@@itdepth
    \fi
-   \let\minimumstrutheight\@@itminhoogte
-   \let\minimumstrutdepth \@@itmindiepte
-   \let\minimallinedistance\@@itafstand
-   \let\normallineheight\@@itregel % let ! ! ! ! ! ivm ex
-   \let\topskipfactor\@@itboven
-   \let\maxdepthfactor\@@itonder
-   \let\baselinegluefactor\@@itrek
+   \let\minimumstrutheight\@@itminheight
+   \let\minimumstrutdepth \@@itmindepth
+   \let\minimallinedistance\@@itdistance
+   \let\normallineheight\@@itline % let ! ! ! ! ! ivm ex
+   \let\topskipfactor\@@ittop
+   \let\maxdepthfactor\@@itbottom
+   \let\baselinegluefactor\@@itstretch
    \setfontparameters % redundant, can be \setstrut, test first
    \updateraggedskips} % yes indeed
 
 \def\setuprelativeinterlinespace[#1]%
   {\processallactionsinset % \regelwit = dummy !
      [#1]
-     [     \v!aan=>\oninterlineskip,
-           \v!uit=>\offinterlineskip,
+     [     \v!on=>\oninterlineskip,
+           \v!off=>\offinterlineskip,
          \v!reset=>\setfontparameters,% just \setstrut, test first
        \s!unknown=>\assignvalue{#1}\regelwit{1.00}{1.25}{1.50}%
                    \spacing\regelwit]}
@@ -232,7 +232,7 @@
   {\removelastskip}
 
 \def\currentblanko
-  {\v!groot}
+  {\v!big}
 
 \def\oldprevdepth {\prevdepth}
 \def\newprevdepth {-1001pt}
@@ -244,8 +244,8 @@
 
 %%%% pas op, wordt ook in core-pos gebruikt
 
-\def\doassignsomeskip#1\to#2% ook nog \v!halveregel+fuzzysnap
-  {\doifelse{#1}\v!regel
+\def\doassignsomeskip#1\to#2% ook nog \v!halfline+fuzzysnap
+  {\doifelse{#1}\v!line
      {#2\openlineheight}
      {\ifgridsnapping
         \assigndimension{#1}{#2}%
@@ -263,7 +263,7 @@
 %   {\doassignsomeskip#1\to\blankoskipamount
 %    \global\advance\blankoskip \blankoskipamount}
 %
-% \def\doblanko#1%
+% \def\doblank#1%
 %   {\processallactionsinset % is maar een actie
 %      [#1]
 %      [    \v!groot=>\dosingleblanko\v!groot, % happens often
@@ -283,7 +283,7 @@
 %                     \global\advance\blankoskip .5\lineheight,
 %         \s!unknown=>\doindirectblanko{#1}]}
 %
-% \def\docomplexdoblanko[#1]% pas op \relax's zijn nodig ivm volgende \if
+% \def\docomplexdoblank[#1]% pas op \relax's zijn nodig ivm volgende \if
 %   {\global\blankoresetfalse
 %    \global\blankoblokkeerfalse
 %    \global\blankogeenwitfalse
@@ -292,7 +292,7 @@
 %    \global\blankoskip\zeropoint
 %    \global\blankoforceerfalse
 %    \blankobuitenfalse
-%    \processcommalist[#1]\doblanko
+%    \processcommalist[#1]\doblank
 %    \ifdim\blankoskip=\zeropoint\relax
 %      \iflokaalblankoflexibel \dosingleblanko\currentblanko \fi
 %      \iflokaalblankovast     \dosingleblanko\currentblanko \fi
@@ -373,32 +373,32 @@
 %    \global\fuzzyvskipfalse
 %    \presetindentation}
 %
-% \def\complexdodoblanko[#1]%
+% \def\complexdodoblank[#1]%
 %   {\flushnotes
 %    \ifopelkaar
 %      \ifinpagebody
-%        \expanded{\docomplexdoblanko[#1]}% \expanded=nieuw
+%        \expanded{\docomplexdoblank[#1]}% \expanded=nieuw
 %      \else
 %        \par
 %      \fi
 %    \else
-%      \expanded{\docomplexdoblanko[#1]}% \expanded = nieuw
+%      \expanded{\docomplexdoblank[#1]}% \expanded = nieuw
 %    \fi}
 %
 % % old
 % %
 % % \def\doindirectblanko#1%
 % %   {\ifundefined{\??bo#1}% <-etex \expandafter\ifx\csname\??bo#1\endcsname\relax
-% %      \expanded{\complexdodoblanko[#1]}%
+% %      \expanded{\complexdodoblank[#1]}%
 % %    \else
-% %      \expandafter\complexdoblanko\expandafter[\csname\??bo#1\endcsname]%
+% %      \expandafter\complexdoblank\expandafter[\csname\??bo#1\endcsname]%
 % %    \fi}
 % %
-% % \def\complexdoblanko[#1]% enables [force,8\bodyfontsize]
+% % \def\complexdoblank[#1]% enables [force,8\bodyfontsize]
 % %   {\doifinstringelse{,}{#1}
-% %      {\expanded{\complexdodoblanko[#1]}}
+% %      {\expanded{\complexdodoblank[#1]}}
 % %      {\doifnumberelse{#1}
-% %         {\expanded{\complexdodoblanko[#1]}}
+% %         {\expanded{\complexdodoblank[#1]}}
 % %         {\doindirectblanko{#1}}}}
 % %
 % % new, more robust
@@ -406,9 +406,9 @@
 % % \def\doindirectblanko#1%
 % %   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
 % %    \ifundefined{\??bo\ascii}% <-etex \expandafter\ifx\csname\??bo#1\endcsname\rel
-% %      \herhaalmetcommando[#1]\dosingleblanko
+% %      \dorepeatwithcommand[#1]\dosingleblanko
 % %    \else
-% %      \expandafter\complexdoblanko\expandafter[\csname\??bo\ascii\endcsname]%
+% %      \expandafter\complexdoblank\expandafter[\csname\??bo\ascii\endcsname]%
 % %    \fi}
 % %
 % % even more robust
@@ -416,9 +416,9 @@
 % \def\doindirectblanko#1%
 %   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
 %    \ifundefined{\??bo\ascii}% <-etex \expandafter\ifx\csname\??bo#1\endcsname
-%      \expanded{\herhaalmetcommando[#1]\noexpand\dosingleblanko}%
+%      \expanded{\dorepeatwithcommand[#1]\noexpand\dosingleblanko}%
 %    \else
-%      \expandafter\complexdoblanko\expandafter[\csname\??bo\ascii\endcsname]%
+%      \expandafter\complexdoblank\expandafter[\csname\??bo\ascii\endcsname]%
 %    \fi}
 
 % \def\TestBlank[#1]%
@@ -440,59 +440,60 @@
 
 \def\defineblankmethod[#1]#2{\setvalue{\??bo\??bo#1}{#2}}
 
-\defineblankmethod   [\v!groot]{\addblankskip+\bigskipamount      \openlineheight}
-\defineblankmethod  [-\v!groot]{\addblankskip-\bigskipamount      \openlineheight}
-\defineblankmethod  [\v!middel]{\addblankskip+\medskipamount   {.5\openlineheight}}
-\defineblankmethod [-\v!middel]{\addblankskip-\medskipamount   {.5\openlineheight}}
-\defineblankmethod   [\v!klein]{\addblankskip+\smallskipamount{.25\openlineheight}}
-\defineblankmethod  [-\v!klein]{\addblankskip-\smallskipamount{.25\openlineheight}}
-\defineblankmethod     [\v!wit]{\addblankskip+\parskip            \openlineheight}
-\defineblankmethod    [-\v!wit]{\addblankskip-\parskip            \openlineheight}
-\defineblankmethod   [\v!regel]{\addblankskip+\openlineheight     \openlineheight}
-\defineblankmethod  [-\v!regel]{\addblankskip-\openlineheight     \openlineheight}
-
-\defineblankmethod [\v!formule    ]{\global\advance\blankoskip\medskipamount}
-\defineblankmethod [\v!geenwit    ]{\global\blankogeenwittrue}
-\defineblankmethod [\v!blokkeer   ]{\global\blankoblokkeertrue}
-\defineblankmethod [\v!forceer    ]{\global\blankoforceertrue}
-\defineblankmethod [\v!buiten     ]{\ifvmode\ifinner\blankobuitentrue\fi\fi}
-\defineblankmethod [\v!reset      ]{\global\blankoresettrue}
-\defineblankmethod [\v!flexibel   ]{\global\lokaalblankoflexibeltrue}
-\defineblankmethod [\v!vast       ]{\global\lokaalblankovasttrue}
-\defineblankmethod [\v!back       ]{\global\blankogobacktrue} % {\geenblanko}
-\defineblankmethod [\v!halveregel ]{\ifgridsnapping\global\fuzzyvskiptrue\fi
-                                    \global\advance\blankoskip .5\lineheight}
-
-\defineblankmethod [\v!geen       ]{\global\blankoresettrue}
-\defineblankmethod [\v!aansluitend]{\ifvmode\nointerlineskip\fi}
-
-% happens often
-
-\defineblankmethod [2*\v!groot]{\addblankskip+{2\bigskipamount}{2\openlineheight}}
+\defineblankmethod       [\v!big] {\addblankskip+\bigskipamount      \openlineheight}
+\defineblankmethod      [-\v!big] {\addblankskip-\bigskipamount      \openlineheight}
+\defineblankmethod      [\v!medium] {\addblankskip+\medskipamount   {.5\openlineheight}}
+\defineblankmethod     [-\v!medium] {\addblankskip-\medskipamount   {.5\openlineheight}}
+\defineblankmethod       [\v!small] {\addblankskip+\smallskipamount{.25\openlineheight}}
+\defineblankmethod      [-\v!small] {\addblankskip-\smallskipamount{.25\openlineheight}}
+\defineblankmethod         [\v!white] {\addblankskip+\parskip            \openlineheight}
+\defineblankmethod        [-\v!white] {\addblankskip-\parskip            \openlineheight}
+\defineblankmethod       [\v!line] {\addblankskip+\openlineheight     \openlineheight}
+\defineblankmethod      [-\v!line] {\addblankskip-\openlineheight     \openlineheight}
+
+\defineblankmethod     [\v!formula] {\global\advance\blankoskip\medskipamount}
+\defineblankmethod     [\v!nowhite] {\global\blankogeenwittrue}
+\defineblankmethod    [\v!disable] {\global\blankoblokkeertrue}
+\defineblankmethod     [\v!force] {\global\blankoforceertrue}
+\defineblankmethod      [\v!outer] {\ifvmode\ifinner\blankobuitentrue\fi\fi}
+\defineblankmethod       [\v!reset] {\global\blankoresettrue}
+\defineblankmethod    [\v!flexible] {\global\lokaalblankoflexibeltrue}
+\defineblankmethod        [\v!fixed] {\global\lokaalblankovasttrue}
+\defineblankmethod        [\v!back] {\global\blankogobacktrue} % {\geenblanko}
+\defineblankmethod  [\v!halfline] {\ifgridsnapping\global\fuzzyvskiptrue\fi
+                                     \global\advance\blankoskip .5\lineheight}
+
+\defineblankmethod        [\v!none] {\global\blankoresettrue}
+\defineblankmethod [\v!joinedup] {\ifvmode\nointerlineskip\fi}
+
+% happens often, so we speed this up:
+
+\defineblankmethod     [2*\v!line] {\addblankskip+{2\openlineheight}{2\openlineheight}}
+\defineblankmethod     [2*\v!big] {\addblankskip+{2\bigskipamount }{2\openlineheight}}
 
 % ETEX ! ! !
 
 \beginETEX \ifcsname
 
-\def\doblanko#1%
+\def\doblank#1%
   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
    \ifx\ascii\empty\else
      \ifcsname\??bo\??bo\ascii\endcsname % internal def
        \csname\??bo\??bo\ascii\endcsname
      \else\ifcsname\??bo\ascii\endcsname % user def / slow
-       \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblanko\relax
+       \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblank\relax
      \else
-       \dorepeatwithcommand[#1]\redoblanko
+       \dorepeatwithcommand[#1]\redoblank
      \fi\fi
    \fi}
 
-\def\redoblanko#1%
+\def\redoblank#1%
   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
    \ifx\ascii\empty\else
      \ifcsname\??bo\??bo\ascii\endcsname % internal def
        \csname\??bo\??bo\ascii\endcsname
      \else\ifcsname\??bo\ascii\endcsname % user def / slow
-       \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblanko\relax
+       \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblank\relax
      \else
        \global\advance\blankoskip#1\relax
      \fi\fi
@@ -502,28 +503,28 @@
 
 \beginTEX
 
-\def\doblanko#1%
+\def\doblank#1%
   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
    \ifx\ascii\empty\else
      \@EA\ifx\csname\??bo\??bo\ascii\endcsname\relax
        \@EA\ifx\csname\??bo\ascii\endcsname\relax
-         \dorepeatwithcommand[#1]\redoblanko
+         \dorepeatwithcommand[#1]\redoblank
        \else
-         \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblanko\relax
+         \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblank\relax
        \fi
      \else
        \csname\??bo\??bo\ascii\endcsname
      \fi
    \fi}
 
-\def\redoblanko#1%
+\def\redoblank#1%
   {\edef\ascii{#1}\convertcommand\ascii\to\ascii
    \ifx\ascii\empty\else
      \@EA\ifx\csname\??bo\??bo\ascii\endcsname\relax
        \@EA\ifx\csname\??bo\ascii\endcsname\relax
          \global\advance\blankoskip#1\relax
        \else
-         \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblanko\relax
+         \@EA\rawprocesscommalist\@EA[\csname\??bo\ascii\endcsname]\doblank\relax
        \fi
      \else
        \csname\??bo\??bo\ascii\endcsname
@@ -532,45 +533,45 @@
 
 \endTEX
 
-\unexpanded\def\blanko % the \relax is definitely needed due to the many \if's
-  {\relax\complexorsimple\doblanko}
+\unexpanded\def\blank % the \relax is definitely needed due to the many \if's
+  {\relax\complexorsimple\doblank}
 
-% \def\complexdoblanko
+% \def\complexdoblank
 %   {\flushnotes
 %    \ifmmode
-%      \let\next\nocomplexdoblanko
+%      \let\next\nocomplexdoblank
 %    \else
 %      \ifopelkaar
 %        \ifinpagebody
-%          \let\next\docomplexdoblanko
+%          \let\next\docomplexdoblank
 %        \else
-%          \let\next\nocomplexdoblanko
+%          \let\next\nocomplexdoblank
 %        \fi
 %      \else
-%        \let\next\docomplexdoblanko
+%        \let\next\docomplexdoblank
 %      \fi
 %    \fi
 %    \next}
 %
 % with \next removed
 
-\def\complexdoblanko
+\def\complexdoblank
   {\flushnotes
    \ifmmode
-     \@EA\nocomplexdoblanko
+     \@EA\nocomplexdoblank
    \else
      \ifopelkaar
        \ifinpagebody
-         \@EA\@EAEAEA\@EA\docomplexdoblanko
+         \@EA\@EAEAEA\@EA\docomplexdoblank
        \else
-         \@EA\@EAEAEA\@EA\nocomplexdoblanko
+         \@EA\@EAEAEA\@EA\nocomplexdoblank
        \fi
      \else
-       \@EAEAEA\docomplexdoblanko
+       \@EAEAEA\docomplexdoblank
      \fi
    \fi}
 
-\def\nocomplexdoblanko[#1]%
+\def\nocomplexdoblank[#1]%
   {% evt blokkeerfalse
    \ifmmode\else\par\fi}
 
@@ -584,7 +585,7 @@
 % \def\inhibitblank% the fast, local way
 %   {\endgraf\ifvmode\prevdepth\newprevdepth\fi}
 
-% \def\docomplexdoblanko[#1]% pas op \relax's zijn nodig ivm volgende \if
+% \def\docomplexdoblank[#1]% pas op \relax's zijn nodig ivm volgende \if
 %   {\global\blankoresetfalse
 %    \global\blankoblokkeerfalse
 %    \global\blankogeenwitfalse
@@ -594,7 +595,7 @@
 %    \global\blankoforceerfalse
 %    \global\blankogobackfalse
 %    \blankobuitenfalse
-%    \expanded{\rawprocesscommalist[#1]}\doblanko
+%    \expanded{\rawprocesscommalist[#1]}\doblank
 %    \ifdim\blankoskip=\zeropoint\relax
 %      \iflokaalblankoflexibel
 %        \doglobal\advance\blankoskip \currentblanko
@@ -792,7 +793,7 @@
 \ifx\undefined\savedlastskip    \newskip \savedlastskip    \fi
 \ifx\undefined\savedlastpenalty \newcount\savedlastpenalty \fi
 
-\def\docomplexdoblanko[#1]% pas op \relax's zijn nodig ivm volgende \if
+\def\docomplexdoblank[#1]% pas op \relax's zijn nodig ivm volgende \if
   {\global\blankoresetfalse
    \global\blankoblokkeerfalse
    \global\blankogeenwitfalse
@@ -802,7 +803,7 @@
    \global\blankoforceerfalse
    \global\blankogobackfalse
    \blankobuitenfalse
-   \expanded{\rawprocesscommalist[#1]}\doblanko
+   \expanded{\rawprocesscommalist[#1]}\doblank
    \ifdim\blankoskip=\zeropoint\relax
      \iflokaalblankoflexibel
        \doglobal\advance\blankoskip \currentblanko
@@ -879,7 +880,7 @@
        \fi
        \ifdoeblanko
          \ifdim1\savedlastskip<1\blankoskip\relax
-           % else when \blanko[2*groot] + \blanko[3*groot] with parskip
+           % else when \blank[2*groot] + \blank[3*groot] with parskip
            % equaling 1*groot, gives a groot=\parskip so adding a small
            % value makes it distinguishable; can also be done at parskip
            % setting time (better)
@@ -948,7 +949,7 @@
                % also new
                \ifdim\blankoskip=\zeropoint
                  \ifblankogeenwit
-                   \geenwitruimte
+                   \nowhitespace
                  \fi
                \fi
              \fi
@@ -962,27 +963,27 @@
 
 %D For a long time we had:
 %D
-%D \starttypen
-%D \def\simpledoblanko%
-%D   {\doifelse{\currentwitruimte}{\v!geen}
-%D      {\blanko[\currentblanko]}
-%D      {\blanko[\currentwitruimte]}}
-%D \stoptypen
+%D \starttyping
+%D \def\simpledoblank%
+%D   {\doifelse{\currentwhitespace}{\v!geen}
+%D      {\blank[\currentblanko]}
+%D      {\blank[\currentwhitespace]}}
+%D \stoptyping
 %D
 %D But Berend de Boer wanted more control, so now we have:
 
-\def\simpledoblanko % ...
-  {\doifelse\currentwitruimte\v!geen
-     {\blanko[\currentblanko]}
-     {\blanko[\s!default]}}
+\def\simpledoblank % ...
+  {\doifelse\currentwhitespace\v!none
+     {\blank[\currentblanko]}
+     {\blank[\s!default]}}
 
 %D Another useful definition would be:
 %D
-%D \starttypen
-%D \definieerblanko
+%D \starttyping
+%D \defineblank
 %D   [\s!default]
 %D   [\v!groot]
-%D \stoptypen
+%D \stoptyping
 
 \def\dosetupblank#1% amount are an plain inheritance
   {\bigskipamount#1\relax
@@ -998,40 +999,40 @@
    \else
      \ExpandFirstAfter\processallactionsinset
        [#1]
-       [ \v!flexibel=>\blankoflexibeltrue,
-             \v!vast=>\blankoflexibelfalse]%
+       [ \v!flexible=>\blankoflexibeltrue,
+             \v!fixed=>\blankoflexibelfalse]%
    \fi
    \ExpandFirstAfter\processallactionsinset
      [#1]
-     [ \v!flexibel=>\dosetupblank\deblankoskip,
-           \v!vast=>\dosetupblank\deblankoskip,
-          \v!regel=>\edef\deblankoskip{\regelafstand}%
+     [ \v!flexible=>\dosetupblank\deblankoskip,
+           \v!fixed=>\dosetupblank\deblankoskip,
+          \v!line=>\edef\deblankoskip{\regelafstand}%
                     \dosetupblank\deblankoskip
-                    \let\deblanko\v!groot,
-     \v!halveregel=>\scratchskip.5\regelafstand
+                    \let\deblanko\v!big,
+     \v!halfline=>\scratchskip.5\regelafstand
                     \edef\deblankoskip{\the\scratchskip}%
                     \dosetupblank\deblankoskip
-                    \let\deblanko\v!middel,
-          \v!groot=>\ifgridsnapping
+                    \let\deblanko\v!medium,
+          \v!big=>\ifgridsnapping
                       \edef\deblankoskip{\regelafstand}%
                       \dosetupblank\deblankoskip
                     \fi
-                    \let\currentblanko\v!groot  % was \def, why ?
-                    \let\deblanko\v!groot,
-         \v!middel=>\let\currentblanko\v!middel % was \def, why ?
-                    \let\deblanko\v!middel,
-          \v!klein=>\let\currentblanko\v!klein  % was \def, why ?
-                    \let\deblanko\v!klein,
-        \v!normaal=>\dosetupblank\deblankoskip
-                    \let\deblanko\v!groot,
-      \v!standaard=>\edef\deblankoskip{\skipfactor\regelafstand}%
+                    \let\currentblanko\v!big  % was \def, why ?
+                    \let\deblanko\v!big,
+         \v!medium=>\let\currentblanko\v!medium % was \def, why ?
+                    \let\deblanko\v!medium,
+          \v!small=>\let\currentblanko\v!small  % was \def, why ?
+                    \let\deblanko\v!small,
+        \v!normal=>\dosetupblank\deblankoskip
+                    \let\deblanko\v!big,
+      \v!standard=>\edef\deblankoskip{\skipfactor\regelafstand}%
                     \dosetupblank\deblankoskip
-                    \let\deblanko\v!groot,
+                    \let\deblanko\v!big,
         \s!default=>\dosetupblank\deblankoskip
-                    \let\deblanko\v!groot,
+                    \let\deblanko\v!big,
         \s!unknown=>\let\deblankoskip\commalistelement
                     \dosetupblank\deblankoskip
-                    \let\deblanko\v!groot]%
+                    \let\deblanko\v!big]%
    \simplesetupwhitespace}
 
 % \definecomplexorsimpleempty\setupblank
@@ -1045,20 +1046,20 @@
      \blankoflexibelfalse
    \fi
    \dosetupblank\deblankoskip
-   \let\deblanko\v!groot
+   \let\deblanko\v!big
    \simplesetupwhitespace}
 
-\def\restorestandardblank% \v!standaard
+\def\restorestandardblank% \v!standard
   {\edef\deblankoskip{\skipfactor\regelafstand}%
    \dosetupblank\deblankoskip
-   \let\deblanko\v!groot}
+   \let\deblanko\v!big}
 
-\def\dodefinieerblanko[#1][#2]%
+\def\dodefineblank[#1][#2]%
   {\def\docommando##1{\setvalue{\??bo##1}{#2}}%
    \processcommalist[#1]\docommando}
 
-\def\definieerblanko
-  {\dodoubleargument\dodefinieerblanko}
+\def\defineblank
+  {\dodoubleargument\dodefineblank}
 
 \def\savecurrentblanko
   {\edef\restorecurrentblanko
@@ -1074,13 +1075,13 @@
 
 %D Now.
 
-\definieerblanko [\s!default] [\v!wit]
-\definieerblanko [\v!hoogte]  [\strutheight]
-\definieerblanko [\v!diepte]  [\strutdepth]
+\defineblank [\s!default] [\v!white]
+\defineblank [\v!height]  [\strutheight]
+\defineblank [\v!depth]  [\strutdepth]
 
-\let\currentvoorwit=\empty
+\let\currentindentation=\empty
 
-\newdimen\voorwit
+\newdimen\ctxparindent
 
 \newif\ifindentfirstparagraph % \indentfirstparagraphtrue
 
@@ -1092,40 +1093,46 @@
 \def\complexsetupindenting[#1]%
   {\processallactionsinset
      [#1]
-     [   \v!eerste=>\indentfirstparagraphtrue,
-       \v!volgende=>\indentfirstparagraphfalse,
+     [   \v!first=>\indentfirstparagraphtrue,
+       \v!next=>\indentfirstparagraphfalse,
         \s!default=>\simplesetupindenting,
-        \s!unknown=>\edef\currentvoorwit{\commalistelement}%
+        \s!unknown=>\edef\currentindentation{\commalistelement}%
                     \simplesetupindenting]}
 
 \def\simplesetupindenting
-  {\assigndimension\currentvoorwit\voorwit{1em}{1.5em}{2em}%
-   \parindent\voorwit\relax}
+  {\assigndimension\currentindentation\ctxparindent{1em}{1.5em}{2em}%
+   \parindent\ctxparindent\relax}
 
-\def\doinspringen[#1]% too many relaxes
-  {\processallactionsinset
-     [#1]
-     [    \v!nee=>\parindent\voorwit\relax\noindent,
-         \v!niet=>\parindent\voorwit\relax\noindent,
-           \v!ja=>\parindent\voorwit\relax,            % geen \indent !
-       \v!eerste=>\indentfirstparagraphtrue,
-     \v!volgende=>\indentfirstparagraphfalse,
-       \v!altijd=>\parindent\voorwit\relax,            % geen \indent !
-        \v!nooit=>\parindent\zeropoint\relax]}
+\def\indenting % watch out: \dodo and no \do
+  {\dosingleargument\dodoindenting}
+
+\def\dodoindenting[#1]%
+  {\executeifdefined{\??in:#1}\donothing}
+
+\def\defineindentingmethod[#1]#2%
+  {\setvalue{\??in:#1}{#2}}
 
-\def\inspringen
-  {\dosingleargument\doinspringen}
+\defineindentingmethod [\v!no]      {\parindent\ctxparindent\noindent}
+\defineindentingmethod [\v!not]     {\parindent\ctxparindent\noindent}
 
-\def\nietinspringen{\inspringen[\v!nee,\v!volgende]}
-\def\welinspringen {\inspringen[\v!ja,\v!eerste]}
+\defineindentingmethod [\v!first]   {\indentfirstparagraphtrue}
+\defineindentingmethod [\v!next] {\indentfirstparagraphfalse}
+
+\defineindentingmethod [\v!yes]       {\parindent\ctxparindent\relax}   % no \indent !
+\defineindentingmethod [\v!always]   {\parindent\ctxparindent\relax}   % no \indent !
+
+\defineindentingmethod [\v!never]    {\parindent\zeropoint\relax} % no \indent !
+
+\def\noindenting{\indenting[\v!no,\v!next]} % was \nietinspringen
+\def\doindenting{\indenting[\v!yes,\v!first]}    % was \welinspringen
 
 \def\dochecknextindentation#1% internal one
-  {\checknextindentation[\getvalue{#1\c!springvolgendein}]}
+  {\checknextindentation[\getvalue{#1\c!indentnext}]}
 
 \def\checknextindentation[#1]%
-  {\processaction[#1][%\v!handhaaf=>,
-      \v!ja=>\doindentation,
-     \v!nee=>\noindentation,
+  {\processaction[#1][%\v!keep=>,
+      \v!yes=>\doindentation,
+     \v!no=>\noindentation,
     \v!auto=>\autoindentation]}
 
 \def\doindentation% too simple
@@ -1153,8 +1160,8 @@
 
 \def\definespacingmethod[#1]#2{\setvalue{\??sg\??sg#1}{#2}}
 
-\definespacingmethod[\v!opelkaar]{\newfrenchspacing}
-\definespacingmethod[\v!ruim    ]{\nonfrenchspacing}
+\definespacingmethod[\v!packed]{\newfrenchspacing}
+\definespacingmethod[\v!broad    ]{\nonfrenchspacing}
 
 \def\complexsetupspacing[#1]%
   {\executeifdefined{\??sg\??sg#1}\relax
@@ -1203,7 +1210,7 @@
 %
 % due to backward compability
 
-\let\spatie     \space
+\let\space     \space
 \let\hardespatie\fixedspace
 \let\geenspatie \nospace
 
@@ -1229,10 +1236,10 @@
 % \setupbodyfont[cmr] \getbuffer
 % \setupbodyfont[lbr] \getbuffer
 
-\def\opelkaar
+\def\packed
   {\nointerlineskip}
 
-\def\omlaag[#1]% nog eens mooier, relateren aan blanko
+\def\godown[#1]% nog eens mooier, relateren aan blanko
   {\nointerlineskip
    \vskip#1 }
 
@@ -1361,17 +1368,17 @@
 
 \fi
 
-\newskip\tussenwit \tussenwit\zeropoint
+\newskip\ctxparskip \ctxparskip\zeropoint
 
 \newif\ifwitruimteflexibel \witruimteflexibeltrue
 
 \def\blankokleinmaat  {\smallskipamount}
 \def\blankomiddelmaat {\medskipamount}
 \def\blankogrootmaat  {\bigskipamount}
-\def\currentwitruimte {\zeropoint}
+\def\currentwhitespace {\zeropoint}
 
 % \def\stelwitruimteopnieuwin
-%   {\expanded{\setupwhitespace[\currentwitruimte]}}
+%   {\expanded{\setupwhitespace[\currentwhitespace]}}
 %
 % \newif\ifwitruimteflexibel \witruimteflexibeltrue
 %
@@ -1387,81 +1394,81 @@
 %      [\v!herstel=>,
 %          \v!vast=>\witruimteflexibelfalse,
 %      \v!flexibel=>\witruimteflexibeltrue,
-%         \v!regel=>\tussenwit\baselineskip,
-%    \v!halveregel=>\tussenwit.5\baselineskip,
-%       \s!default=>\doifnot\currentwitruimte\v!geen\stelwitruimteopnieuwin,
+%         \v!regel=>\ctxparskip\baselineskip,
+%    \v!halveregel=>\ctxparskip.5\baselineskip,
+%       \s!default=>\doifnot\currentwhitespace\v!geen\stelwitruimteopnieuwin,
 %       \s!unknown=>\@EA\assigndimension\@EA{\commalistelement} % \@EA is nodig
-%                     \tussenwit\blankokleinmaat\blankomiddelmaat\blankogrootmaat]}   % te vangen
+%                     \ctxparskip\blankokleinmaat\blankomiddelmaat\blankogrootmaat]}   % te vangen
 %
 % \def\dodosetupwhitespace
-%   {\edef\currentwitruimte
-%      {\ifdim\tussenwit=\zeropoint
+%   {\edef\currentwhitespace
+%      {\ifdim\ctxparskip=\zeropoint
 %         \v!geen
 %       \else
-%         \ifgridsnapping\the\baselineskip\else\the\tussenwit\fi
+%         \ifgridsnapping\the\baselineskip\else\the\ctxparskip\fi
 %       \fi}%
 %    \ifgridsnapping
 %      \witruimteflexibelfalse
-%      \tussenwit1\tussenwit
-%      \ifdim\tussenwit>\zeropoint
-%        \tussenwit\baselineskip
+%      \ctxparskip1\ctxparskip
+%      \ifdim\ctxparskip>\zeropoint
+%        \ctxparskip\baselineskip
 %      \fi
 %    \else
-%      \ifwitruimteflexibel \else \tussenwit1\tussenwit \fi
+%      \ifwitruimteflexibel \else \ctxparskip1\ctxparskip \fi
 %    \fi
-%    \parskip\tussenwit}
+%    \parskip\ctxparskip}
 %
 % \def\simplesetupwhitespace% == snelle \setupwhitespace[\s!default]
-%   {\doifnot\currentwitruimte\v!geen\stelwitruimteopnieuwin
+%   {\doifnot\currentwhitespace\v!geen\stelwitruimteopnieuwin
 %    \dodosetupwhitespace}
 
 \definecomplexorsimple\setupwhitespace
 
 \def\simplesetupwhitespace
-  {\doifnot\currentwitruimte\v!geen\dosetupwhitespace}
+  {\doifnot\currentwhitespace\v!none\dosetupwhitespace}
 
 \def\complexsetupwhitespace[#1]%
   {\doifelsenothing{#1}
      {\simplesetupwhitespace}
-     {\edef\currentwitruimte{#1}%
+     {\edef\currentwhitespace{#1}%
       \dosetupwhitespace}}
 
 \def\dosetupwhitespace
-  {\processcommacommand[\currentwitruimte]\dowhitespacemethod
+  {\processcommacommand[\currentwhitespace]\dowhitespacemethod
    \dodosetupwhitespace}
 
 \def\dodosetupwhitespace
   {\ifgridsnapping
      \witruimteflexibelfalse
-     \tussenwit1\tussenwit
-     \ifdim\tussenwit>\zeropoint
-       \tussenwit\baselineskip
+     \ctxparskip1\ctxparskip
+     \ifdim\ctxparskip>\zeropoint
+       \ctxparskip\baselineskip
      \fi
    \else
-     \ifwitruimteflexibel \else \tussenwit1\tussenwit \fi
+     \ifwitruimteflexibel \else \ctxparskip1\ctxparskip \fi
    \fi
-   \parskip\tussenwit}
+   \parskip\ctxparskip}
 
 \definesystemvariable {ws} % whitespace
 
 \def\definewhitespacemethod[#1]#2{\setvalue{\??ws\??ws#1}{#2}}
 
-\definewhitespacemethod [\v!herstel]    {}
-\definewhitespacemethod [\v!vast]       {\witruimteflexibelfalse}
-\definewhitespacemethod [\v!flexibel]   {\witruimteflexibeltrue}
-\definewhitespacemethod [\v!regel]      {\tussenwit  \baselineskip}
-\definewhitespacemethod [\v!halveregel] {\tussenwit.5\baselineskip}
-\definewhitespacemethod [\v!geen]       {\tussenwit  \zeropoint}
-\definewhitespacemethod [\v!groot]      {\tussenwit  \blankogrootmaat}
-\definewhitespacemethod [\v!middel]     {\tussenwit  \blankomiddelmaat}
-\definewhitespacemethod [\v!klein]      {\tussenwit  \blankokleinmaat}
+\definewhitespacemethod [\v!fix]    {}
+\definewhitespacemethod [\v!fixed]       {\witruimteflexibelfalse}
+\definewhitespacemethod [\v!flexible]   {\witruimteflexibeltrue}
+\definewhitespacemethod [\v!line]      {\ctxparskip  \baselineskip}
+\definewhitespacemethod [\v!halfline] {\ctxparskip.5\baselineskip}
+\definewhitespacemethod [\v!none]       {\ctxparskip  \zeropoint}
+\definewhitespacemethod [\v!big]      {\ctxparskip  \blankogrootmaat}
+\definewhitespacemethod [\v!medium]     {\ctxparskip  \blankomiddelmaat}
+\definewhitespacemethod [\v!small]      {\ctxparskip  \blankokleinmaat}
 
 \definewhitespacemethod [\s!default]    {\stelwitruimteopnieuwin}
 
 \def\dowhitespacemethod#1%
-  {\executeifdefined{\??ws\??ws#1}{\tussenwit#1}\relax}
+  {\executeifdefined{\??ws\??ws#1}{\ctxparskip#1}\relax}
 
-\def\geenwitruimte
+\def\nowhitespace
   {\ifdim\parskip>\zeropoint\relax
      \ifdim\lastskip=-\parskip
      \else
@@ -1469,11 +1476,11 @@
      \fi
    \fi}
 
-\def\savecurrentwitruimte
-  {\edef\restorecurrentwitruimte
-     {\tussenwit\the\tussenwit
+\def\savecurrentwhitespace
+  {\edef\restorecurrentwhitespace
+     {\ctxparskip\the\ctxparskip
       \parskip\the\parskip
-      \noexpand\def\noexpand\currentwitruimte{\currentwitruimte}%
+      \noexpand\def\noexpand\currentwhitespace{\currentwhitespace}%
       \ifwitruimteflexibel
         \noexpand\witruimteflexibeltrue
       \else
@@ -1490,7 +1497,7 @@
 %
 % met/zonder witruimte
 
-\def\witruimte%
+\def\whitespace
   {\par
    \ifdim\parskip>\zeropoint\relax
     %\ifdim\lastskip>\parskip \else
@@ -1502,7 +1509,7 @@
 \def\nonoblanko[#1]%
   {\par}
 
-\def\noblanko%
+\def\noblanko
   {\dosingleempty\nonoblanko}
 
 % De onderstaande macro handelt ook de situatie dat er geen
@@ -1515,49 +1522,49 @@
 \newsignal \noparskipsignal % \def\noparskipsignal {0.00001pt}
 \def\lastdoneparskip {0pt}
 
-\def\startopelkaar
-  {\dosingleempty\dostartopelkaar}
+\def\startpacked
+  {\dosingleempty\dostartpacked}
 
-\def\dostartopelkaar[#1]% nesting afvangen
+\def\dostartpacked[#1]% nesting afvangen
   {\par
    \ifvmode
      \edef\lastdoneparskip  {\the\lastskip}%
      \edef\lastdoneprevdepth{\the\prevdepth}% zeer recent toegevoegd
      \ifdim\prevdepth=-\thousandpoint % toegevoegd omdat binnen
      \else                            % een vbox een extra skip
-       \witruimte                     % ongewenst is; dit kan
-       \baselinecorrection %% zie in \plaatsregister[n=1]
+       \whitespace                     % ongewenst is; dit kan
+       \baselinecorrection %% zie in \placeregister[n=1]
        \vskip\noparskipsignal   % waarschijnlijk ook in
      \fi                        % blanko blokkeer
      \bgroup
-     \doifelse{#1}\v!blanko
+     \doifelse{#1}\v!blank
        \opelkaarfalse
        \opelkaartrue
-     \blanko[\v!blokkeer]       % dit is nog niet ok, gaat fout
-     \setupwhitespace[\v!geen]  % bovenin vtop (dwz, baseline)
+     \blank[\v!disable]       % dit is nog niet ok, gaat fout
+     \setupwhitespace[\v!none]  % bovenin vtop (dwz, baseline)
   \fi}
 
-\def\stopopelkaar
+\def\stoppacked
   {\par
    \ifvmode
      \egroup
      \ifdim\lastskip=\noparskipsignal\relax
        \removelastskip
-       \geenwitruimte
+       \nowhitespace
        \vskip-\lastdoneparskip
        \vskip+\lastdoneparskip
-      \prevdepth-\lastdoneprevdepth % zeer recent toegevoegd
+       \prevdepth-\lastdoneprevdepth % zeer recent toegevoegd
      \fi
   \fi}
 
-\def\startvanelkaar
-  {\blanko
+\def\startunpacked
+  {\blank
    \leavevmode
    \bgroup}
 
-\def\stopvanelkaar
+\def\stopunpacked
   {\egroup
-   \blanko}
+   \blank}
 
 % De onderstaande macro's moeten nog eens nader worden uitgewerkt.
 % Ze spelen een rol bij de spatiering rond omkaderde teksten
@@ -1571,27 +1578,27 @@
 
 \let\dorondomregelcorrectie=\relax
 
-\def\startregelcorrectie
-  {\dodoubleempty\dostartregelcorrectie}
+\def\startlinecorrection
+  {\dodoubleempty\dostartlinecorrection}
 
-\def\dostartregelcorrectie[#1][#2]% #2 gobbles spaces
+\def\dostartlinecorrection[#1][#2]% #2 gobbles spaces
   {\bgroup
    \processaction
      [#1]
-     [ \v!blanko=>\let\dorondomregelcorrectie\blanko,
+     [ \v!blank=>\let\dorondomregelcorrectie\blank,
       \s!default=>\let\dorondomregelcorrectie\relax,
-      \s!unknown=>{\def\dorondomregelcorrectie{\blanko[#1]}}]%
+      \s!unknown=>{\def\dorondomregelcorrectie{\blank[#1]}}]%
    \dorondomregelcorrectie
    \startbaselinecorrection
    \offbaselinecorrection
    \ignorespaces}
 
-\def\stopregelcorrectie
+\def\stoplinecorrection
   {\stopbaselinecorrection
    \dorondomregelcorrectie
    \egroup}
 
-\def\corrigeerwitruimte
+\def\correctwhitespace
   {\dowithnextbox
      {\startbaselinecorrection
       \flushnextbox
@@ -1936,13 +1943,13 @@
 
 %D Sometimes a capstrut comes in handy
 %D
-%D \starttabulatie[|Tl|l|l|]
-%D \NC yes          \NC normal strut               \NC {\showstruts\setupstrut[ja]\strut}  \NC \NR
-%D \NC no           \NC no strut                   \NC {\showstruts\setupstrut[nee]\strut}  \NC \NR
-%D \NC kap          \NC a capital strut (i.e. Q)   \NC {\showstruts\setupstrut[kap]\strut} \NC \NR
+%D \starttabulate[|Tl|l|l|]
+%D \NC yes          \NC normal strut               \NC {\showstruts\setupstrut[yes]\strut}  \NC \NR
+%D \NC no           \NC no strut                   \NC {\showstruts\setupstrut[no]\strut}  \NC \NR
+%D \NC kap          \NC a capital strut (i.e. Q)   \NC {\showstruts\setupstrut[cap]\strut} \NC \NR
 %D \NC A B \unknown \NC a character strut (e.g. A) \NC {\showstruts\setupstrut[A]\strut}   \NC \NR
 %D \NC              \NC a normal strut             \NC {\showstruts\setupstrut\strut}      \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \def\setupstrut
   {\dosingleempty\dosetupstrut}
@@ -1950,11 +1957,11 @@
 \def\dosetupstrut[#1]% yet undocumented, todo: fontstrut
   {\processaction
      [#1]
-     [     \v!ja=>\setstrut,
-          \v!nee=>\setnostrut,
-          \v!kap=>\setcapstrut,
-      \v!passend=>\setfontstrut,
-        \v!regel=>\setstrut,
+     [     \v!yes=>\setstrut,
+          \v!no=>\setnostrut,
+          \v!cap=>\setcapstrut,
+      \v!fit=>\setfontstrut,
+        \v!line=>\setstrut,
       \s!default=>\setstrut,
       \s!unknown=>\setcharstrut\commalistelement]}
 
@@ -2118,18 +2125,30 @@
 %
 % expands to \widowpenalty \maxdimen \maxdimen \zeropoint
 
-\def\resetpenalties#1%
-  {\ifx#1\undefined\else
-      #1\minusone
-   \fi}
+\beginTEX
 
-\def\setpenalties#1#2#3%
-  {\ifx#1\undefined\else
-     #1\numexpr(#2+1)\space\doexpandedrecurse{\numexpr(#2)}{#3}\zerocount\relax
-   \fi}
+  \let\resetpenalties   \gobbleoneargument
+  \let\setpenalties     \gobblethreearguments
+  \let\doexpandedrecurse\gobbletwoarguments
+
+\endTEX
+
+\beginETEX \numexpr
+
+  \def\resetpenalties#1%
+    {\ifx#1\undefined\else
+       #1\minusone
+     \fi}
+
+  \def\setpenalties#1#2#3%
+    {\ifx#1\undefined\else % space before #3 prevents lookahead problems, needed when #3=text
+       #1\numexpr(#2+1)\space\doexpandedrecurse{\the\numexpr(#2)}{ #3}\zerocount\relax
+     \fi}
 
-\def\doexpandedrecurse#1#2%
-  {\ifnum#1>\zerocount#2\@EA\doexpandedrecurse\@EA{\the\numexpr(#1-1)}{#2}\fi}
+  \def\doexpandedrecurse#1#2%
+    {\ifnum#1>\zerocount#2\@EA\doexpandedrecurse\@EA{\the\numexpr(#1-1)}{#2}\fi}
+
+\endETEX
 
 \newif\ifgridsnapping % to be sure
 
@@ -2191,7 +2210,7 @@
 
 % as an illustration:
 
-\startsetups [\systemsetupsprefix\v!streng]
+\startsetups [\systemsetupsprefix\v!strict]
 
    \setups[\v!reset]
 
@@ -2224,47 +2243,47 @@
 \def\dotfskip#1{{\tf\hskip#1}}
 \def\dotfkern#1{{\tf\kern #1}}
 
-\newskip\linkssmaller
-\newskip\rechtssmaller
-\newskip\middensmaller
+\newskip\ctxleftskip
+\newskip\ctxrightskip
+\newskip\ctxmidskip
 
-\def\dosinglesmaller#1%
+\def\dosinglenarrower#1%
   {\processaction
      [#1]
-     [    \v!links=>\global\advance\linkssmaller  \@@sllinks,
-         \v!midden=>\global\advance\middensmaller \@@slmidden,
-         \v!rechts=>\global\advance\rechtssmaller \@@slrechts,
-           \v!geen=>,
-        \s!unknown=>\global\advance\middensmaller \commalistelement]}
+     [    \v!left=>\global\advance\ctxleftskip  \@@slleft,
+         \v!middle=>\global\advance\ctxmidskip   \@@slmiddle,
+         \v!right=>\global\advance\ctxrightskip \@@slright,
+           \v!none=>,
+        \s!unknown=>\global\advance\ctxmidskip \commalistelement]}
 
-\def\dosmaller[#1]%
+\def\donarrower[#1]%
   {\processaction
      [#1]
-     [    \v!links=>\global\advance\linkssmaller  \@@sllinks,
-         \v!midden=>\global\advance\middensmaller \@@slmidden,
-         \v!rechts=>\global\advance\rechtssmaller \@@slrechts,
-           \v!geen=>,% handy for delimitedtexts
-        \s!unknown=>{\herhaalmetcommando[#1]\dosinglesmaller}]}
+     [    \v!left=>\global\advance\ctxleftskip  \@@slleft,
+         \v!middle=>\global\advance\ctxmidskip   \@@slmiddle,
+         \v!right=>\global\advance\ctxrightskip \@@slright,
+           \v!none=>,% handy for delimitedtexts
+        \s!unknown=>{\dorepeatwithcommand[#1]\dosinglenarrower}]}
 
-\def\complexstartsmaller[#1]%
+\def\complexstartnarrower[#1]%
   {\par
    \bgroup
-   \global\linkssmaller \zeropoint
-   \global\rechtssmaller\zeropoint
-   \global\middensmaller\zeropoint
-   \processcommalistwithparameters[#1]\dosmaller
-   \advance\leftskip  \linkssmaller
-   \advance\rightskip \rechtssmaller
-   \advance\leftskip  \middensmaller
-   \advance\rightskip \middensmaller
+   \global\ctxleftskip \zeropoint
+   \global\ctxrightskip\zeropoint
+   \global\ctxmidskip\zeropoint
+   \processcommalistwithparameters[#1]\donarrower
+   \advance\leftskip  \ctxleftskip
+   \advance\rightskip \ctxrightskip
+   \advance\leftskip  \ctxmidskip
+   \advance\rightskip \ctxmidskip
    \seteffectivehsize}
 
-\def\simplestartsmaller
-  {\startsmaller[\v!midden]}
+\def\simplestartnarrower
+  {\startnarrower[\v!middle]}
 
-\definecomplexorsimple\startsmaller
+\definecomplexorsimple\startnarrower
 
-\def\stopsmaller
+\def\stopnarrower
   {\par % else skips forgotten
    \egroup}
 
@@ -2284,12 +2303,12 @@
    \let\effectiveleftskip \@@effectiveleftskip
    \let\effectiverightskip\@@effectiverightskip}
 
-\def\dodefinieerhbox[#1][#2]%
+\def\dodefinehbox[#1][#2]%
   {\setvalue{hbox#1}##1%
      {\hbox to #2{\begstrut##1\endstrut\hss}}}
 
-\def\definieerhbox%
-  {\dodoubleargument\dodefinieerhbox}
+\def\definehbox%
+  {\dodoubleargument\dodefinehbox}
 
 \def\iobox#1#2#3#% here #3# is not really needed
   {\vbox\bgroup  % we want to return a vbox like the others
@@ -2306,24 +2325,24 @@
 \def\dosetraggedvbox#1%
   {\processaction
      [#1]
-     [  \v!links=>\let\raggedbox\lbox,
-       \v!rechts=>\let\raggedbox\rbox,
-       \v!midden=>\let\raggedbox\cbox,
-       \v!binnen=>\let\raggedbox\ibox,
-       \v!buiten=>\let\raggedbox\obox,
-          \v!nee=>\def\raggedbox{\vbox\bgroup\raggedright\let\next=},
+     [  \v!left=>\let\raggedbox\lbox,
+       \v!right=>\let\raggedbox\rbox,
+       \v!middle=>\let\raggedbox\cbox,
+       \v!inner=>\let\raggedbox\ibox,
+       \v!outer=>\let\raggedbox\obox,
+          \v!no=>\def\raggedbox{\vbox\bgroup\raggedright\let\next=},
       \s!default=>\let\raggedbox\vbox,
       \s!unknown=>\let\raggedbox\vbox]}
 
 \def\dosetraggedhbox#1%
   {\processaction % slow
      [#1]
-     [  \v!links=>\def\raggedbox{\doregelplaats\v!links },
-       \v!rechts=>\def\raggedbox{\doregelplaats\v!rechts},
-       \v!midden=>\def\raggedbox{\doregelplaats\v!midden},
-       \v!binnen=>\def\raggedbox{\doregelplaats\v!binnen},
-       \v!buiten=>\def\raggedbox{\doregelplaats\v!buiten},
-      \v!normaal=>\let\raggedbox\hbox,
+     [  \v!left=>\def\raggedbox{\doregelplaats\v!left },
+       \v!right=>\def\raggedbox{\doregelplaats\v!right},
+       \v!middle=>\def\raggedbox{\doregelplaats\v!middle},
+       \v!inner=>\def\raggedbox{\doregelplaats\v!inner},
+       \v!outer=>\def\raggedbox{\doregelplaats\v!outer},
+      \v!normal=>\let\raggedbox\hbox,
       \s!default=>\let\raggedbox\hbox,
       \s!unknown=>\let\raggedbox\hbox]}
 
@@ -2384,8 +2403,8 @@
    \let\raggedbottomcommand\empty
    \chardef\raggedoneliner\zerocount
    \doifsomething{#1}
-     {\doifinsetelse\v!ruim {#1}\!!doneatrue\!!doneafalse
-      \doifinsetelse\v!breed{#1}\!!donebtrue\!!donebfalse
+     {\doifinsetelse\v!broad {#1}\!!doneatrue\!!doneafalse
+      \doifinsetelse\v!wide{#1}\!!donebtrue\!!donebfalse
       \!!donectrue
       \rawprocesscommalist[#1]\dododosetraggedcommand}}
 
@@ -2394,19 +2413,19 @@
 
 \def\@@ragged@@command{@@raggedcommand}
 
-\setvalue{\@@ragged@@command\v!links}%
+\setvalue{\@@ragged@@command\v!left}%
   {\if!!donea \def\raggedcommand{\veryraggedleft}%
    \else      \def\raggedcommand{\raggedleft}%
    \fi
    \!!donecfalse}
 
-\setvalue{\@@ragged@@command\v!rechts}%
+\setvalue{\@@ragged@@command\v!right}%
   {\if!!donea \def\raggedcommand{\veryraggedright}%
    \else      \def\raggedcommand{\raggedright}%
    \fi
    \!!donecfalse}
 
-\setvalue{\@@ragged@@command\v!midden}%
+\setvalue{\@@ragged@@command\v!middle}%
   {\if!!donec
      \if!!doneb      \def\raggedcommand{\raggedwidecenter}%
      \else\if!!donea \def\raggedcommand{\veryraggedcenter}%
@@ -2418,40 +2437,40 @@
      \let\raggedtopcommand   \vfilll % used with \framed for
    \fi}                              % instance in tables
 
-\setvalue{\@@ragged@@command\v!hoog}%
+\setvalue{\@@ragged@@command\v!high}%
   {\let\raggedbottomcommand\vfilll}  % and since we lack a
 
-\setvalue{\@@ragged@@command\v!laag}%
+\setvalue{\@@ragged@@command\v!low}%
   {\let\raggedtopcommand\vfilll}     % proper keyword, but
 
-\setvalue{\@@ragged@@command\v!laho}%
+\setvalue{\@@ragged@@command\v!lohi}%
   {\let\raggedbottomcommand\vfilll   % we do support the
    \let\raggedtopcommand\vfilll}     % ugly laho (lohi)
 
-\setvalue{\@@ragged@@command\v!nee}%
+\setvalue{\@@ragged@@command\v!no}%
   {\def\raggedcommand{\raggedright}}
 
-\setvalue{\@@ragged@@command\v!ja}%
+\setvalue{\@@ragged@@command\v!yes}%
   {\let\raggedcommand\notragged}
 
-\setvalue{\@@ragged@@command\v!normaal}%
+\setvalue{\@@ragged@@command\v!normal}%
   {\let\raggedcommand\notragged}
 
-\setvalue{\@@ragged@@command\v!binnen}% not yet perfect
+\setvalue{\@@ragged@@command\v!inner}% not yet perfect
   {\signalrightpage % may interfere
    \doifrightpageelse
-     {\getvalue{\@@ragged@@command\v!rechts}}
-     {\getvalue{\@@ragged@@command\v!links}}}
+     {\getvalue{\@@ragged@@command\v!right}}
+     {\getvalue{\@@ragged@@command\v!left}}}
 
-\setvalue{\@@ragged@@command\v!buiten}% not yet perfect
+\setvalue{\@@ragged@@command\v!outer}% not yet perfect
   {\signalrightpage % may interfere
    \doifrightpageelse
-     {\getvalue{\@@ragged@@command\v!links}}
-     {\getvalue{\@@ragged@@command\v!rechts}}}
+     {\getvalue{\@@ragged@@command\v!left}}
+     {\getvalue{\@@ragged@@command\v!right}}}
 
 \chardef\raggedoneliner\zerocount
 
-\setvalue{\@@ragged@@command\v!regel}%
+\setvalue{\@@ragged@@command\v!line}%
   {\chardef\raggedoneliner\plusone}
 
 \def\@@startraggedoneliner
@@ -2481,10 +2500,6 @@
 
 \def\explicithmode{\unhbox\voidb@x}
 
-% Nodig voor gebruikers
-
-\def\geentest{\donottest}
-
 % Nog doen:
 %
 %  \goodbreak -> \allowbreak en \dosomebreak{..} in koppen
@@ -2607,13 +2622,13 @@
 \def\forgetparindent
   {\forgeteverypar
    \indentfirstparagraphtrue % recently added
-   \let\currentvoorwit\v!geen
-   \voorwit\zeropoint
+   \let\currentindentation\v!none
+   \ctxparindent\zeropoint
    \parindent\zeropoint\relax}
 
 \def\forgetparskip
-  {\let\currentwitruimte\v!geen
-   \tussenwit\zeropoint
+  {\let\currentwhitespace\v!none
+   \ctxparskip\zeropoint
    \parskip\zeropoint\relax}
 
 \def\forgetbothskips
@@ -2835,19 +2850,19 @@
 \def\dosetleftskipadaption#1%
   {\leftskipadaption\zeropoint
    \processaction[#1]
-     [\v!standaard=>\leftskipadaption
-                    \ifdim\voorwit=\zeropoint\@@sllinks\else\voorwit\fi,
-             \v!ja=>\leftskipadaption
-                    \ifdim\voorwit=\zeropoint\@@sllinks\else\voorwit\fi,
-            \v!nee=>,
+     [\v!standard=>\leftskipadaption
+                    \ifdim\ctxparindent=\zeropoint\@@slleft\else\ctxparindent\fi,
+             \v!yes=>\leftskipadaption
+                    \ifdim\ctxparindent=\zeropoint\@@slleft\else\ctxparindent\fi,
+            \v!no=>,
         \s!unknown=>\leftskipadaption#1]}
 
 \def\dosetrightskipadaption#1%
   {\rightskipadaption\zeropoint
    \processaction[#1]
-     [\v!standaard=>\rightskipadaption\@@slrechts,
-             \v!ja=>\rightskipadaption\@@slrechts,
-            \v!nee=>,
+     [\v!standard=>\rightskipadaption\@@slright,
+             \v!yes=>\rightskipadaption\@@slright,
+            \v!no=>,
         \s!unknown=>\rightskipadaption#1]}
 
 \endTEX
@@ -2856,18 +2871,18 @@
 
 % installation
 
-\setvalue{@lsa@\v!standaard}%
-  {\ifdim\voorwit=\zeropoint\@@sllinks\else\voorwit\fi}
+\setvalue{@lsa@\v!standard}%
+  {\ifdim\ctxparindent=\zeropoint\@@slleft\else\ctxparindent\fi}
 
-\setvalue{@lsa@\v!ja}%
-  {\ifdim\voorwit=\zeropoint\@@sllinks\else\voorwit\fi}
+\setvalue{@lsa@\v!yes}%
+  {\ifdim\ctxparindent=\zeropoint\@@slleft\else\ctxparindent\fi}
 
-\letvalue{@lsa@\v!nee      }\zeropoint
+\letvalue{@lsa@\v!no      }\zeropoint
 \letvalue{@lsa@\empty      }\zeropoint
 
-\setvalue{@rsa@\v!standaard}{\@@slrechts}
-\setvalue{@rsa@\v!ja       }{\@@slrechts}
-\letvalue{@rsa@\v!nee      }\zeropoint
+\setvalue{@rsa@\v!standard}{\@@slright}
+\setvalue{@rsa@\v!yes       }{\@@slright}
+\letvalue{@rsa@\v!no      }\zeropoint
 \letvalue{@rsa@\empty      }\zeropoint
 
 % not safe for 2\parindent
@@ -2905,33 +2920,34 @@
 
 \endETEX
 
-% Dit hoort eigenlijk thuis onder het kopje boodschappen cq,
-% meldingen.
-
-\let\mindermeldingen\dontcomplain
-
-\definetwopasslist\s!paragraph
-
-\newcounter\nofraggedparagraphs
-
-\def\doparagraphreference% looks very much like domarginreference
-  {\doglobal\increment\nofraggedparagraphs\relax
-   \edef\writeparref%
-     {\writeutilitycommand%
-        {\twopassentry%
-           {\s!paragraph}%
-           {\nofraggedparagraphs}%
-           {\noexpand\realfolio}}}%
-   \writeparref}
-
-% \def\setraggedparagraphmode#1#2%
-%   {\ifinner
+% \definetwopasslist\s!paragraph
+%
+% \newcounter\nofraggedparagraphs
+%
+% \def\doparagraphreference% looks very much like domarginreference
+%   {\doglobal\increment\nofraggedparagraphs
+%    \edef\writeparref%
+%      {\writeutilitycommand%
+%         {\twopassentry%
+%            {\s!paragraph}%
+%            {\nofraggedparagraphs}%
+%            {\noexpand\realfolio}}}%
+%    \writeparref}
+%
+% \def\setraggedparagraphmode#1#2% combineren met \ifrightpage
+%   {\ifinpagebody
+%      \ifdubbelzijdig
+%        \ifodd\realpageno\relax#1\else#2\fi
+%      \else
+%        #2\relax
+%      \fi
+%    \else\ifinner
 %      \ifdubbelzijdig
-%        \gettwopassdata{\s!paragraph}%
+%        \gettwopassdata\s!paragraph
 %        \iftwopassdatafound
-%          \ifodd\twopassdata#1\else#2\fi
+%          \ifodd\twopassdata\relax#1\else#2\fi
 %        \else
-%          \ifodd\realfolio#1\else#2\fi
+%          \ifodd\realpageno\relax#1\else#2\fi
 %        \fi
 %        \doparagraphreference
 %      \else
@@ -2939,64 +2955,87 @@
 %      \fi
 %    \else
 %      #2\relax
-%    \fi}
-
-% TO BE REDONE: inset test
-
-\def\setraggedparagraphmode#1#2% combineren met \ifrightpage
-  {\ifinpagebody
-     \ifdubbelzijdig
-       \ifodd\realpageno\relax#1\else#2\fi
-     \else
-       #2\relax
-     \fi
-   \else\ifinner
-     \ifdubbelzijdig
-       \gettwopassdata\s!paragraph
-       \iftwopassdatafound
-         \ifodd\twopassdata\relax#1\else#2\fi
-       \else
-         \ifodd\realpageno\relax#1\else#2\fi
-       \fi
-       \doparagraphreference
-     \else
-       #2\relax
-     \fi
-   \else
-     #2\relax
-   \fi\fi}
-
-% \let\doifrightpageelse\setraggedparagraphmode
-
-% in both (otr) modules !
-
-% \def\doifrightpageelse#1#2%
-%   {\ifdubbelzijdig
-%      \gettwopassdata\s!paragraph
-%      \iftwopassdatafound
-%        \ifodd\twopassdata#1\else#2\fi
+%    \fi\fi}
+%
+% \def\doifrightpageelse % watch out: other default ! ! !
+%   {\ifinpagebody
+%      % optimalisation ?
+%      \ifdubbelzijdig
+%        \ifodd\realpageno\relax
+%          \twopassdatafoundtrue \else \twopassdatafoundfalse
+%        \fi
 %      \else
-%        \ifodd\realfolio#1\else#2\fi
+%        \twopassdatafoundtrue
 %      \fi
 %    \else
-%      #1% was #2
+%      \ifdubbelzijdig
+%        \gettwopassdata\s!paragraph
+%        \iftwopassdatafound
+%          \ifodd\twopassdata\relax
+%            \twopassdatafoundtrue \else \twopassdatafoundfalse
+%          \fi
+%        \else
+%          \ifodd\realpageno\relax
+%            \twopassdatafoundtrue \else \twopassdatafoundfalse
+%          \fi
+%        \fi
+%      \else
+%        \twopassdatafoundtrue
+%      \fi
+%    \fi
+%    \iftwopassdatafound
+%      \@EA\firstoftwoarguments
+%    \else
+%      \@EA\secondoftwoarguments
 %    \fi}
 %
-% better :
+% \def\signalrightpage
+%   {\ifdubbelzijdig \ifinpagebody \else
+%      \doparagraphreference
+%    \fi \fi}
 
-\def\doifrightpageelse % watch out: other default ! ! !
-  {\ifinpagebody
-     \ifdubbelzijdig
-       \ifodd\twopassdata\relax
-         \twopassdatafoundtrue \else \twopassdatafoundfalse
+% slightly adapted implementation
+
+\newcounter \noftrackedpagestates
+\newif      \ifpagestatemismatch
+\let        \realpagestateno      \realfolio
+\chardef    \frozenpagestate      \zerocount
+
+\def\dotrackpagestate#1#2%
+  {\ifdubbelzijdig \ifinpagebody \else
+     \doforcedtrackpagestate{#1}{#2}%
+   \fi \fi}
+
+\def\doforcedtrackpagestate#1#2%
+  {\ifcase\frozenpagestate
+     \doglobal\increment\noftrackedpagestates
+     \doglobal\increment#2%
+     \edef\dodotrackpagestate
+       {\writeutilitycommand
+          {\twopassentry{#1}{\noftrackedpagestates}{#2:\noexpand\realfolio}}}%
+     %\llap{\infofont\noftrackedpagestates/#2}% tracing
+     \dodotrackpagestate
+   \fi}
+
+\def\doifrightpagestateelse#1#2%
+  {\ifcase\frozenpagestate
+     \pagestatemismatchfalse
+     \let\realpagestateno\realfolio
+     \ifinpagebody
+       \ifdubbelzijdig
+         \ifodd\realpageno\relax
+           \twopassdatafoundtrue \else \twopassdatafoundfalse
+         \fi
+       \else
+         \twopassdatafoundtrue
        \fi
-     \else
-       \twopassdatafoundtrue
-     \fi
-   \else
-     \ifdubbelzijdig
-       \gettwopassdata\s!paragraph
+     \else\ifdubbelzijdig
+       \findtwopassdata{#1}{#2:}%
        \iftwopassdatafound
+         \let\realpagestateno\twopassdata
+         \ifnum\twopassdata=\realpageno \else
+           \pagestatemismatchtrue
+         \fi
          \ifodd\twopassdata\relax
            \twopassdatafoundtrue \else \twopassdatafoundfalse
          \fi
@@ -3007,6 +3046,10 @@
        \fi
      \else
        \twopassdatafoundtrue
+     \fi\fi
+   \else
+     \ifodd\realpagestateno\relax
+       \twopassdatafoundtrue \else \twopassdatafoundfalse
      \fi
    \fi
    \iftwopassdatafound
@@ -3015,11 +3058,122 @@
      \@EA\secondoftwoarguments
    \fi}
 
-\def\signalrightpage
-  {\ifdubbelzijdig
-     \doparagraphreference
+\def\doifforcedrightpagestateelse#1#2%
+  {\ifcase\frozenpagestate
+     \pagestatemismatchfalse
+     \let\realpagestateno\realfolio
+     \findtwopassdata{#1}{#2:}%
+     \iftwopassdatafound
+       \let\realpagestateno\twopassdata
+       \ifnum\twopassdata=\realpageno \else
+         \pagestatemismatchtrue
+       \fi
+       \ifodd\twopassdata\relax
+         \twopassdatafoundtrue \else \twopassdatafoundfalse
+       \fi
+     \else
+       \ifodd\realpageno\relax
+         \twopassdatafoundtrue \else \twopassdatafoundfalse
+       \fi
+     \fi
+   \else
+     \ifodd\realpagestateno\relax
+       \twopassdatafoundtrue \else \twopassdatafoundfalse
+     \fi
+   \fi
+   \iftwopassdatafound
+     \@EA\firstoftwoarguments
+   \else
+     \@EA\secondoftwoarguments
    \fi}
 
+\def\freezepagestate {\chardef\frozenpagestate\plusone  }
+\def\defrostpagestate{\chardef\frozenpagestate\zerocount}
+
+% we can make more of these on top, but how to deal with mixed frozen states
+
+\definetwopasslist\s!paragraph \newcounter\nofraggedparagraphs
+
+\def\signalrightpage  {\dotrackpagestate      \s!paragraph\nofraggedparagraphs}
+\def\doifrightpageelse{\doifrightpagestateelse\s!paragraph\nofraggedparagraphs}
+
+\newcounter\pagesignallevel
+
+\def\startsignalrightpage % one may do a \postsignalrightplace
+  {\increment\pagesignallevel
+   \presignalrightpage
+   \let\signalrightpage\relax
+   \let\presignalrightpage\relax
+   \let\startsignalrightpage\relax
+   \doifrightpageelse\donothing\donothing
+   \freezepagestate}
+
+\def\stopsignalrightpage
+  {\ifcase\pagesignallevel\or\postsignalrightpage\fi
+   \decrement\pagesignallevel}
+
+\def\setraggedparagraphmode{\signalrightpage\doifrightpageelse} % move it there
+
+\def\doifswappedrightpageelse#1#2% alleen in box construction !
+  {\doifrightpageelse
+     {#1}
+     {\scratchcounter\realpageno
+      \realpageno\realpagestateno\relax
+      \swapmargins
+      \realpageno\scratchcounter
+      #2}}
+
+\newbox\signaledrightpage % this way we can avoid interference, i.e. postpone placement
+
+\def\presignalrightpage {\global\setbox\signaledrightpage\hbox{\signalrightpage}}
+\def\postsignalrightpage{\ifvoid\signaledrightpage\else\box\signaledrightpage\fi}
+
+% The next feature is is used in:
+%
+% \definenumber[test][way=bypage]
+%
+% \def\Test
+%   {\incrementnumber[test]\rawnumber[test]/%
+%    \incrementnumber[test]\rawnumber[test]/%
+%    \incrementnumber[test]\rawnumber[test]\space
+%    \checkpagechange{oeps}\changedpage{oeps}\space
+%    \ifpagechanged TRUE\else FALSE\fi}
+%
+% \Test\page \Test\par \Test\page \Test\par \Test\page \Test\page
+%
+% (adapted from cont-new.tex:)
+
+\newif\ifpagechanged \let\lastchangedpage\empty
+
+\def\docheckpagestatechange#1#2#3%
+  {\pagechangedfalse
+   \doforcedtrackpagestate{#2}{#3}%
+   \findtwopassdata{#2}{#3:}%
+   \iftwopassdatafound
+     \ifnum\twopassdata>0\getvalue{#2:p:#1}\relax
+       \pagechangedtrue
+     \fi
+   \fi
+   \ifpagechanged
+     \letgvalue{#2:p:#1}\twopassdata
+     \globallet\lastchangedpage\twopassdata
+   \else
+     \globallet\lastchangedpage\realfolio
+   \fi}
+
+\def\changedpagestate#1#2%
+  {\executeifdefined{#2:p:#1}{0}}
+
+\def\checkpagechange#1{\docheckpagestatechange{#1}\s!paragraph\nofraggedparagraphs}
+\def\changedpage    #1{\changedpagestate{#1}\s!paragraph}
+
+% saved struts
+
+\ifx\savedstrutbox\undefined \newbox\savedstrutbox \fi
+
+\def\savestrut {\setbox\savedstrutbox\copy\strutbox}
+\def\savedstrut{\copy  \savedstrutbox}
+
 % De onderstaande macro's zijn opgenomen in Plain TeX.
 %
 % \def\raggedright%
@@ -3049,7 +3203,7 @@
 \newif\ifr@ggedbottom
 \newif\ifb@selinebottom
 
-\def\normalbottom%
+\def\normalbottom
   {% \topskip 10pt
    \r@ggedbottomfalse}
 
@@ -3174,11 +3328,11 @@
 
 %D We used to have:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\raggedright
 %D   {\setraggedness\rightraggedness
 %D    \setraggedskips{3}{0em}{\rightraggedness}{.3333em}{.5em}{0em}{\parindent}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, the next alternative, suggested by Taco, is better.
 
@@ -3193,10 +3347,10 @@
 
 %D When we want the last line to have a natural width:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\veryraggedleft%
 %D   {\setraggedskips{1}{1fil}{0em}{.3333em}{.5em}{0em}{-1fil}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D but this one is not accepted by the macros.
 
@@ -3211,7 +3365,7 @@
 \def\ttraggedright
   {\tttf
    \setraggedskips3\zeropoint\rightraggedness
-     \zeropoint\zeropoint\zeropoint\parindent} % \voorwit
+     \zeropoint\zeropoint\zeropoint\parindent} % \ctxparindent
 
 %D A bonus one:
 
@@ -3231,34 +3385,34 @@
 % \stoptext
 
 \def\dodosetupalign[#1]%
-  {\doifinsetelse\v!ruim {#1}\!!doneatrue\!!doneafalse
-   \doifinsetelse\v!breed{#1}\!!donebtrue\!!donebfalse
+  {\doifinsetelse\v!broad {#1}\!!doneatrue\!!doneafalse
+   \doifinsetelse\v!wide{#1}\!!donebtrue\!!donebfalse
    \ExpandFirstAfter\processallactionsinset
      [#1]
-     [   \v!regel=>\baselinebottom,
-         \v!onder=>\raggedbottom,
-        \v!hoogte=>\normalbottom,
-       \v!breedte=>\notragged,
-       \v!normaal=>\notragged,
-            \v!ja=>\notragged,
-           \v!nee=>\raggedright,
-\if@@asragged\v!binnen\else\v!buiten\fi
+     [   \v!line=>\baselinebottom,
+         \v!bottom=>\raggedbottom,
+        \v!height=>\normalbottom,
+       \v!width=>\notragged,
+       \v!normal=>\notragged,
+            \v!yes=>\notragged,
+           \v!no=>\raggedright,
+\if@@asragged\v!inner\else\v!outer\fi
                  =>\setraggedparagraphmode\raggedleft\raggedright,
-\if@@asragged\v!buiten\else\v!binnen\fi
+\if@@asragged\v!outer\else\v!inner\fi
                  =>\setraggedparagraphmode\raggedright\raggedleft,
-\if@@asragged\v!links\else\v!rechts\fi
+\if@@asragged\v!left\else\v!right\fi
                  =>\if!!donea\veryraggedleft  \else\raggedleft  \fi,
-\if@@asragged\v!rechts\else\v!links\fi
+\if@@asragged\v!right\else\v!left\fi
                  =>\if!!donea\veryraggedright \else\raggedright \fi,
-        \v!midden=>\if!!doneb\raggedwidecenter\else
+        \v!middle=>\if!!doneb\raggedwidecenter\else
                    \if!!donea\veryraggedcenter\else\raggedcenter\fi\fi,
-       \v!hangend=>\enableprotruding,
-   \v!niethangend=>\disableprotruding,
+       \v!hanging=>\enableprotruding,
+   \v!nothanging=>\disableprotruding,
             \v!hz=>\enableadjusting,
-        \v!geenhz=>\disableadjusting,
-    \v!afgebroken=>\dohyphens,
-\v!nietafgebroken=>\nohyphens,
-         \v!nieuw=>\@@asraggedfalse, % so new will give you consistency
+        \v!nohz=>\disableadjusting,
+    \v!hyphenated=>\dohyphens,
+\v!nothyphenated=>\nohyphens,
+         \v!new=>\@@asraggedfalse, % so new will give you consistency
          \v!reset=>\notragged\normalbottom]}
 
 \def\dosetupalign[#1]%
@@ -3267,11 +3421,11 @@
 \def\setupalign
   {\dosingleargument\dosetupalign}
 
-\def\startuitlijnen
+\def\startalignment
   {\bgroup
    \setupalign}
 
-\def\stopuitlijnen
+\def\stopalignment
   {\par
    \egroup}
 
@@ -3292,19 +3446,19 @@
 
 % directe commando's
 
-\def\regellinks {\doalignline \relax \hss  }
-\def\regelmidden{\doalignline \hss   \hss  }
-\def\regelrechts{\doalignline \hss   \relax}
+\def\leftaligned {\doalignline \relax \hss  }
+\def\midaligned{\doalignline \hss   \hss  }
+\def\rightaligned{\doalignline \hss   \relax}
 
 \def\regelbegrensd#1{\limitatetext{#1}{\hsize}{\unknown}}
 
 % indirecte commando's
 
-\setvalue{\s!do\v!regel\v!links }{\doalignline \relax \hss  }
-\setvalue{\s!do\v!regel\v!rechts}{\doalignline \hss   \relax}
-\setvalue{\s!do\v!regel\v!midden}{\doalignline \hss   \hss  }
+\setvalue{\s!do\v!line\v!left }{\doalignline \relax \hss  }
+\setvalue{\s!do\v!line\v!right}{\doalignline \hss   \relax}
+\setvalue{\s!do\v!line\v!middle}{\doalignline \hss   \hss  }
 
-\def\doregelplaats#1{\csname\s!do\v!regel#1\endcsname}
+\def\doregelplaats#1{\csname\s!do\v!line#1\endcsname}
 
 %D Experimental:
 
@@ -3345,19 +3499,19 @@
 \def\doxcheckline
   {\signalrightpage\doifrightpageelse\donetrue\donefalse}
 
-\setvalue{\s!do\v!regel\v!binnen      }{\doxalignline\doxcheckline++\zeropoint       \relax\hss  }
-\setvalue{\s!do\v!regel\v!buiten      }{\doxalignline\doxcheckline++\zeropoint       \hss  \relax}
-\setvalue{\s!do\v!regel\v!binnenmarge }{\doxalignline\doxcheckline-+\innermargintotal\relax\hss  }
-\setvalue{\s!do\v!regel\v!buitenmarge }{\doxalignline\doxcheckline+-\outermargintotal\hss  \relax}
-\setvalue{\s!do\v!regel\v!binnenrand  }{\doxalignline\doxcheckline-+\inneredgetotal  \relax\hss  }
-\setvalue{\s!do\v!regel\v!buitenrand  }{\doxalignline\doxcheckline+-\outeredgetotal  \hss  \relax}
-\setvalue{\s!do\v!regel\v!rugwit      }{\doxalignline\doxcheckline-+\rugwit          \relax\hss  }
-\setvalue{\s!do\v!regel\v!snijwit     }{\doxalignline\doxcheckline+-\snijwit         \hss  \relax}
+\setvalue{\s!do\v!line\v!inner      }{\doxalignline\doxcheckline++\zeropoint       \relax\hss  }
+\setvalue{\s!do\v!line\v!outer      }{\doxalignline\doxcheckline++\zeropoint       \hss  \relax}
+\setvalue{\s!do\v!line\v!innermargin }{\doxalignline\doxcheckline-+\innermargintotal\relax\hss  }
+\setvalue{\s!do\v!line\v!outermargin }{\doxalignline\doxcheckline+-\outermargintotal\hss  \relax}
+\setvalue{\s!do\v!line\v!inneredge  }{\doxalignline\doxcheckline-+\inneredgetotal  \relax\hss  }
+\setvalue{\s!do\v!line\v!outeredge  }{\doxalignline\doxcheckline+-\outeredgetotal  \hss  \relax}
+\setvalue{\s!do\v!line\v!backspace      }{\doxalignline\doxcheckline-+\backspace          \relax\hss  }
+\setvalue{\s!do\v!line\v!cutspace     }{\doxalignline\doxcheckline+-\cutspace         \hss  \relax}
 
-\setvalue{\s!do\v!regel\v!linkermarge }{\doxalignline\donefalse   --\leftmargintotal \hss  \relax}
-\setvalue{\s!do\v!regel\v!rechtermarge}{\doxalignline\donefalse   ++\rightmargintotal\relax\hss  }
-\setvalue{\s!do\v!regel\v!linkerrand  }{\doxalignline\donefalse   --\leftedgetotal   \hss  \relax}
-\setvalue{\s!do\v!regel\v!rechterrand }{\doxalignline\donefalse   ++\rightedgetotal  \relax\hss  }
+\setvalue{\s!do\v!line\v!leftmargin }{\doxalignline\donefalse   --\leftmargintotal \hss  \relax}
+\setvalue{\s!do\v!line\v!rightmargin}{\doxalignline\donefalse   ++\rightmargintotal\relax\hss  }
+\setvalue{\s!do\v!line\v!leftedge  }{\doxalignline\donefalse   --\leftedgetotal   \hss  \relax}
+\setvalue{\s!do\v!line\v!rightedge }{\doxalignline\donefalse   ++\rightedgetotal  \relax\hss  }
 
 % ! ! ! beware, redefining \doalignline gives the wrong results ! ! !
 %
@@ -3365,12 +3519,12 @@
 
 %D Better:
 
-\def\doregelplaats#1{\csname\s!do\v!regel#1\endcsname}
+\def\doregelplaats#1{\csname\s!do\v!line#1\endcsname}
 
 \def\alignedline#1#2% setting default
   {\csname
-     \s!do\v!regel
-     \ifundefined{\s!do\v!regel#1}#2\else#1\fi
+     \s!do\v!line
+     \ifundefined{\s!do\v!line#1}#2\else#1\fi
    \endcsname}
 
 % \def\doregelplaats#1%
@@ -3379,21 +3533,21 @@
 %D ...
 
 \def\dosetuptolerance[#1]%
-  {\doifinsetelse\v!vertikaal{#1}%
+  {\doifinsetelse\v!vertical{#1}%
      {\ExpandFirstAfter\processallactionsinset
         [#1]
-        [\v!zeerstreng=>\def\bottomtolerance{},
-             \v!streng=>\def\bottomtolerance{.050},
-             \v!soepel=>\def\bottomtolerance{.075},
-         \v!zeersoepel=>\def\bottomtolerance{.100}]}%
+        [\v!verystrict=>\def\bottomtolerance{},
+             \v!strict=>\def\bottomtolerance{.050},
+             \v!tolerant=>\def\bottomtolerance{.075},
+         \v!verytolerant=>\def\bottomtolerance{.100}]}%
      {\ExpandFirstAfter\processallactionsinset
         [#1]
-        [       \v!rek=>\emergencystretch\bodyfontsize,
-             \v!spatie=>\spaceskip.5em\!!plus.25em\!!minus.25em\relax,
-         \v!zeerstreng=>\tolerance 200,
-             \v!streng=>\tolerance1500,
-             \v!soepel=>\tolerance3000,
-         \v!zeersoepel=>\tolerance4500]}}
+        [       \v!stretch=>\emergencystretch\bodyfontsize,
+             \v!space=>\spaceskip.5em\!!plus.25em\!!minus.25em\relax,
+         \v!verystrict=>\tolerance 200,
+             \v!strict=>\tolerance1500,
+             \v!tolerant=>\tolerance3000,
+         \v!verytolerant=>\tolerance4500]}}
 
 \def\setuptolerance
   {\dosingleargument\dosetuptolerance}
@@ -3401,7 +3555,7 @@
 % \def\woordrechts
 %   {\groupedcommand{\hfill\hbox}{\parfillskip\zeropoint}}
 
-\def\woordrechts % zie naw
+\def\wordright % zie naw
   {\groupedcommand
      {\removeunwantedspaces
       \hfill
@@ -3443,10 +3597,10 @@
 %D The only complication lays in \type{\strut}. In \PLAIN\
 %D \TEX\ a \type{\strut} is defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\strut%
 %D   {\relax\ifmmode\copy\strutbox\else\unhcopy\strutbox\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But what is a \type{\strut}? Normally it's a rule of width
 %D zero, but when made visual, it's a rule and a negative skip.
@@ -3459,21 +3613,21 @@
 %D To serve our purpose a bit better, the macro \type{\strut}
 %D can be redefined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\strut
 %D   {\relax\ifmmode\else\hskip0pt\fi\copy\strutbox}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Or more compatible:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\strut
 %D   {\relax\ifmmode
 %D      \copy\strutbox
 %D    \else
 %D      \bgroup\setbox\strutbox=\normalhbox{\box\strutbox}\unhcopy\strutbox\egroup
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In \CONTEXT\ however we save some processing time by putting
 %D an extra \type{\hbox} around the \type{\strutbox}.
@@ -3504,7 +3658,7 @@
         {\strut{\infofont\kern.25em}\lohi{\infofont CR}{\infofont LF}\hss}}}
 
 %D \starttyping
-%D % \setuplayout[grid=yes] \showgrid
+%D % \setuplayout[gridgrid=yes] \showgrid
 %D
 %D \startbuffer
 %D test 1\crlf
@@ -3585,10 +3739,10 @@
 \def\emspaceamount{\fontdimen6\font}
 \def\spaceamount  {\fontdimen2\font}
 
-\definehspace [\v!klein]   [.25\emspaceamount]
-\definehspace [\v!middel]  [.5\emspaceamount]
-\definehspace [\v!groot]   [1\emspaceamount]
-\definehspace [\v!normaal] [1\spaceamount]
+\definehspace [\v!small]   [.25\emspaceamount]
+\definehspace [\v!medium]  [.5\emspaceamount]
+\definehspace [\v!big]   [1\emspaceamount]
+\definehspace [\v!normal] [1\spaceamount]
 \definehspace [\v!default] [\spaceamount]
 
 %D Taken from Taco's math module (cq. \AMS\ macros), but
@@ -3613,6 +3767,259 @@
 \definehspace[2][.2222em]
 \definehspace[3][.2777em]
 
+% this will become an alternative bunch of \blank settings
+%
+% \startlines
+% \scratchskip=.23pt plus 10pt minus 4pt \relax \number\scratchskip \space \the\scratchskip
+% \setsimplifiedskip\scratchskip1 \number\scratchskip \space \the\scratchskip
+% \setsimplifiedskip\scratchskip2 \number\scratchskip \space \the\scratchskip
+% \getsimplifiedskip\scratchskip\scratchcounter \number\scratchcounter
+% \stoplines
+%
+% \hrule width10cm \endgraf
+%   \discardedskip{10pt}
+%   \retainedskip  {4pt}
+%   \discardedskip {5pt}
+% \hrule width10cm \endgraf
+%   \blockedskip{0pt}
+%   \discardedskip{10pt}
+%   \retainedskip  {4pt}
+%   \discardedskip {5pt}
+% \hrule width10cm \endgraf
+%   \frozenskip    {4cm}
+% \hrule width10cm \endgraf
+%   \vskip10pt
+% \hrule width10cm \endgraf
+
+\newskip\simplifiedskip
+\newskip\simplifiedcounter
+
+\chardef\@@discardedskip1
+\chardef\@@retainedskip 2
+\chardef\@@forcedskip   3
+\chardef\@@blockedskip  4
+\chardef\@@frozenskip   5 % after heads, no break
+
+\def\setsimplifiedskip#1#2%
+  {#1\dimexpr(10\dimexpr(#1/10)) plus \gluestretch#1 minus \glueshrink#1\relax
+   \advance#1\numexpr(#2)sp\relax}
+
+\def\getsimplifiedskip#1#2%
+  {\simplifiedskip#1\relax
+   \ifdim\simplifiedskip=\zeropoint
+     #2\zerocount
+   \else
+     \simplifiedcounter\dimexpr(10\dimexpr(#1/10))\relax
+     \advance\simplifiedskip-\simplifiedcounter
+     #2\number\simplifiedskip\relax
+   \fi}
+
+\def\conditionalskip#1#2%
+  {\scratchskip#1\relax
+   \setsimplifiedskip\scratchskip#2\relax
+   \vskip\scratchskip\relax}
+
+\def\defrostskip
+  {\scratchskip\lastskip\penalty50000\normalvskip-\scratchskip\penalty50000\relax}
+
+\def\frozenskip#1%
+  {\endgraf
+   \ifvmode
+     \getsimplifiedskip\lastskip\scratchcounter
+     \ifdim\lastskip>#1\else
+       \defrostskip
+       \conditionalskip{#1}\@@frozenskip
+     \fi
+   \fi}
+
+\def\discardedskip#1%
+  {\endgraf
+   \ifvmode
+     \getsimplifiedskip\lastskip\scratchcounter
+     \ifcase\scratchcounter
+       \conditionalskip{#1}\@@discardedskip
+     \or % discard
+       \ifdim\lastskip>#1\else
+         \normalvskip-\lastskip
+         \conditionalskip{#1}\@@discardedskip
+       \fi
+     \or % retain
+       \ifdim\lastskip>#1\else
+         \normalvskip-\lastskip
+         \conditionalskip{#1}\@@discardedskip
+       \fi
+     \or % forced
+       \conditionalskip{#1}\@@discardedskip
+     \or % ignored
+     \or % frozen
+       \ifdim\lastskip>#1\else
+         \defrostskip
+         \conditionalskip{#1}\@@frozenskip
+       \fi
+     \else\ifdim#1=\zeropoint\else
+       \vskip#1\relax
+     \fi\fi
+   \fi}
+
+\def\retainedskip#1%
+  {\endgraf
+   \ifvmode
+     \getsimplifiedskip\lastskip\scratchcounter
+     \ifcase\scratchcounter
+       \conditionalskip{#1}\@@retainedskip
+     \or % discard
+       \normalvskip-\lastskip
+       \conditionalskip{#1}\@@retainedskip
+     \or % retain
+       \ifdim\lastskip>#1\else
+         \normalvskip-\lastskip
+         \conditionalskip{#1}\@@retainedskip
+       \fi
+     \or % forced
+       \conditionalskip{#1}\@@retainedskip
+     \or % ignored
+     \or % frozen
+       \ifdim\lastskip>#1\else
+         \defrostskip
+         \conditionalskip{#1}\@@frozenskip
+       \fi
+     \else\ifdim#1=\zeropoint\else
+       \vskip#1\relax
+     \fi\fi
+  \fi}
+
+\def\forcedskip#1%
+  {\endgraf
+   \ifvmode
+     \conditionalskip{#1}\@@forcedskip
+   \fi}
+
+\def\blockedskip#1%
+  {\endgraf
+   \ifvmode
+     \getsimplifiedskip\lastskip\scratchcounter
+     \ifcase\scratchcounter
+       \conditionalskip{#1}\@@blockedskip
+     \or % discard
+       \conditionalskip{#1}\@@blockedskip
+     \or % retain
+       \conditionalskip{#1}\@@blockedskip
+     \or % forced
+       \conditionalskip{#1}\@@blockedskip
+     \or % ignored
+     \or % frozen
+       \ifdim\lastskip>#1\else
+         \defrostskip
+         \conditionalskip{#1}\@@frozenskip
+       \fi
+     \else\ifdim#1=\zeropoint\else
+       \vskip#1\relax
+     \fi\fi
+   \fi}
+
+% beware, changing this will break some code (like pos/backgrounds)
+
+\newtoks\everyfirstparagraphintro
+\newtoks\everynextparagraphintro
+\newtoks\@@everyparagraphtoks
+
+\chardef\everyparagraphintro\zerocount
+
+\def\setupparagraphintro
+  {\dodoubleempty\dosetupparagraphintro}
+
+\def\dosetupparagraphintro[#1][#2]%
+  {\processallactionsinset
+     [#1]
+     [   \v!reset=>\global\chardef\everyparagraphintro\zerocount
+                   \global\everyfirstparagraphintro\emptytoks
+                   \global\everynextparagraphintro \emptytoks,
+        \v!first=>\global\chardef\everyparagraphintro\plusone
+                   \doglobal\appendtoks#2\to\everyfirstparagraphintro,
+      \v!next=>\ifcase\everyparagraphintro\global\chardef\everyparagraphintro\plusone\fi
+                   \doglobal\appendtoks#2\to\everynextparagraphintro,
+           \v!each=>\ifcase\everyparagraphintro\global\chardef\everyparagraphintro\plustwo\fi
+                   \doglobal\appendtoks#2\to\everyfirstparagraphintro
+                   \doglobal\appendtoks#2\to\everynextparagraphintro]}
+
+% \def\doinsertparagraphintro
+%   {\ifcase\everyparagraphintro\relax
+%      % no data
+%      \@@everyparagraphtoks\emptytoks
+%    \or
+%      % first data
+%      \global\chardef\everyparagraphintro\plustwo
+%      \@@everyparagraphtoks\everyfirstparagraphintro
+%      \global\everyfirstparagraphintro\emptytoks
+%    \or
+%      % next data
+%      \@@everyparagraphtoks\everynextparagraphintro
+%    \fi
+%    \the\@@everyparagraphtoks}
+
+\def\doinsertparagraphintro
+  {\begingroup
+   \everypar\emptytoks
+   \ifcase\everyparagraphintro\relax
+     % no data
+     \@@everyparagraphtoks\emptytoks
+   \or
+     % first data
+     \global\chardef\everyparagraphintro\plustwo
+     \@@everyparagraphtoks\everyfirstparagraphintro
+     \global\everyfirstparagraphintro\emptytoks
+   \or
+     % next data
+     \@@everyparagraphtoks\everynextparagraphintro
+   \fi
+   \the\@@everyparagraphtoks
+   \endgroup}
+
+\def\insertparagraphintro
+  {\ifcase\everyparagraphintro\else\@EA\doinsertparagraphintro\fi}
+
+%  \appendtoksonce\insertparagraphintro\to\everypar % should come last
+
+%D \starttyping
+%D \setupparagraphintro[first][\hbox to 3.5em{\tt FIRST \hss}]
+%D \setupparagraphintro[first][\hbox to 3.5em{\tt TSRIF \hss}]
+%D \setupparagraphintro[next] [\hbox to 3.5em{\tt NEXT  \hss}]
+%D \setupparagraphintro[next] [\hbox to 3.5em{\tt TXEN  \hss}]
+%D \setupparagraphintro[each] [\hbox to 3.0em{\tt EACH  \hss}]
+%D \setupparagraphintro[each] [\hbox to 3.0em{\tt HCEA  \hss}]
+%D
+%D some paragraph \par
+%D some paragraph \par
+%D some paragraph \par
+%D
+%D \definelabel[parnumber]
+%D
+%D \setupparagraphintro[reset,each][\inleft{\slxx\parnumber}]
+%D
+%D some paragraph \par
+%D some paragraph \par
+%D some paragraph \par
+%D \stoptyping
+
+%D \macros
+%D   {flushatnextpar}
+%D
+%D This macro collects data that will be flushed at the next paragraph.
+%D By using this macro you can avoid interfering nodes (writes, etc).
+
+\newbox \postponednodedata
+
+\def\flushatnextpar
+  {\bgroup
+   \dowithnextbox
+     {\global\setbox\postponednodedata\hbox{\box\postponednodedata\box\nextbox}\egroup}%
+     \hbox}
+
+\def\flushpostponednodedata
+  {\ifvoid\postponednodedata\else
+     \hbox{\smashedbox\postponednodedata}%
+   \fi}
+
 % Very nasty but needed for margin stuff inside colored
 % paragraphs.
 
@@ -3671,56 +4078,50 @@
          {#1\fontdimen2\font}
 
 \setupwhitespace
-  [\v!geen]
+  [\v!none]
 
-\inspringen
-  [\v!nooit]
+\indenting
+  [\v!never]
 
 \setupindenting
-  [\v!geen]
+  [\v!none]
 
 \setupblank
-  [\v!standaard,
-   \v!groot]
-
-\definieerblanko[\v!default] [\currentblanko]
-\definieerblanko[\v!voor]    [\v!default]
-\definieerblanko[\v!tussen]  [\v!default]
-\definieerblanko[\v!na]      [\v!voor]
-
-% doen?
+  [\v!standard,
+   \v!big]
 
-\def\@@blankovoor  {\blanko[\v!voor]}   %
-\def\@@blankotussen{\blanko[\v!tussen]} %  scheelt 5 tokens == >20 bytes
-\def\@@blankona    {\blanko[\v!na]}     %
+\defineblank[\v!default] [\currentblanko]
+\defineblank[\v!before]    [\v!default]
+\defineblank[\v!inbetween]  [\v!default]
+\defineblank[\v!after]      [\v!before]
 
 \setupinterlinespace
-  [\c!minhoogte=0pt, % only special purpose
-   \c!mindiepte=0pt, % only special purpose
-   \c!hoogte=.72,
-   \c!diepte=.28,
-   \c!boven=1.0,
-   \c!onder=0.4,
-   \c!afstand=1pt,
-   \c!regel=2.8ex,
-   \c!rek=0]
+  [\c!minheight=0pt, % only special purpose
+   \c!mindepth=0pt, % only special purpose
+   \c!height=.72,
+   \c!depth=.28,
+   \c!top=1.0,
+   \c!bottom=0.4,
+   \c!distance=1pt,
+   \c!line=2.8ex,
+   \c!stretch=0]
 
 \setupnarrower
-  [\c!links=1.5em,
-   \c!rechts=1.5em,
-   \c!midden=1.5em]
+  [\c!left=1.5em,
+   \c!right=1.5em,
+   \c!middle=1.5em]
 
 \setuptolerance
-  [\v!horizontaal,\v!zeerstreng]
+  [\v!horizontal,\v!verystrict]
 
 \setuptolerance
-  [\v!vertikaal,\v!streng]
+  [\v!vertical,\v!strict]
 
 \setupalign
-  [\v!onder,
-   \v!breedte]
+  [\v!bottom,
+   \v!width]
 
 \setupspacing
-  [\v!opelkaar]
+  [\v!packed]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-syn.tex b/tex/context/base/core-syn.tex
index 2481f8a2f..bfbad02cb 100644
--- a/tex/context/base/core-syn.tex
+++ b/tex/context/base/core-syn.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-syn,
+%D   [       filefile=core-syn,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Synonyms and Sorts,
@@ -28,11 +28,11 @@
 
 \newif\ifsynonymmeaning
 
-\def\dostelsynoniemenin[#1][#2]%
+\def\dosetupsynonyms[#1][#2]%
   {\getparameters[\??sm#1][#2]}
 
-\def\stelsynoniemenin
-  {\dodoubleargument\dostelsynoniemenin}
+\def\setupsynonyms
+  {\dodoubleargument\dosetupsynonyms}
 
 \def\doresetsynonym#1%
   {\letvalue{#1\s!entry}\gobblethreearguments}
@@ -41,7 +41,7 @@
   {\bgroup
    \global\utilitydonetrue
    \syndef
-     {\doattributes{\??sm#1}\c!tekstletter\c!tekstkleur{#3}}
+     {\doattributes{\??sm#1}\c!textstyle\c!textcolor{#3}}
      \ConvertToConstant\doifelse{#4}{}{\unknown}{#4}\par
    \egroup}
 
@@ -49,37 +49,37 @@
   {\executeifdefined{#1\s!entry}\gobblethreearguments}
 
 \def\dosetsynonym#1%
-  {\doifdefinedelse{\??sm#1\c!commando}
-     {\setvalue{#1\s!entry}{\getvalue{\??sm#1\c!commando}}} % 3 argumenten
+  {\doifdefinedelse{\??sm#1\c!command}
+     {\setvalue{#1\s!entry}{\getvalue{\??sm#1\c!command}}} % 3 argumenten
      {\setvalue{#1\s!entry}{\dohandlesynonymentry{#1}}}}
 
 \def\doplaatslijstmetsynoniemen#1#2%
-  {\witruimte
+  {\whitespace
    \begingroup
    \def\currentsynonym{#1}%
 %   \def\synplaats{\getvalue{\??sm#1\c!plaats}}%
 %   \def\synbreedte{\getvalue{\??sm#1\c!breedte}}%
 %   \def\synmonster{\getvalue{\??sm#1\c!monster}}%
 %
-   \doordefinieren  % nog eens een class van maken, net als framed
+   \definedescription  % nog eens een class van maken, net als framed
      [syndef]
-     [\c!plaats=\getvalue{\??sm#1\c!plaats},
-      \c!breedte=\getvalue{\??sm#1\c!breedte},
-      \c!afstand=\getvalue{\??sm#1\c!afstand},
-      \c!monster=\getvalue{\??sm#1\c!monster},
+     [\c!location=\getvalue{\??sm#1\c!location},
+      \c!width=\getvalue{\??sm#1\c!width},
+      \c!distance=\getvalue{\??sm#1\c!distance},
+      \c!sample=\getvalue{\??sm#1\c!sample},
       \c!hang=\getvalue{\??sm#1\c!hang},
-      \c!uitlijnen=\getvalue{\??sm#1\c!uitlijnen},
-      \c!voor=\getvalue{\??sm#1\c!voor},
-      \c!tussen=\getvalue{\??sm#1\c!tussen},
-      \c!na=\getvalue{\??sm#1\c!na},
-      \c!springvolgendein=\getvalue{\??sm#1\c!springvolgendein},
-      \c!kopletter=,
-      \c!letter=]%
+      \c!align=\getvalue{\??sm#1\c!align},
+      \c!before=\getvalue{\??sm#1\c!before},
+      \c!inbetween=\getvalue{\??sm#1\c!inbetween},
+      \c!after=\getvalue{\??sm#1\c!after},
+      \c!indentnext=\getvalue{\??sm#1\c!indentnext},
+      \c!headstyle=,
+      \c!style=]%
 %
-   \setupwhitespace[\v!geen]%
+   \setupwhitespace[\v!none]%
    \doutilities{#1}\jobname{#2}\relax\par
    \endgroup
-   \ifutilitydone\else\geenwitruimte\fi}
+   \ifutilitydone\else\nowhitespace\fi}
 
 \def\dovolledigelijstmetsynoniemen#1#2% expansion needed to avoid v! (due to french active !)
   {\expanded
@@ -93,10 +93,10 @@
   {\begingroup  % anders in mathmode lege \hbox, zie eenheden
    \ifsynonymmeaning
      \synonymmeaningfalse
-     \doattributes{\??sm#1}\c!synoniemletter\c!synoniemkleur{#3}%
+     \doattributes{\??sm#1}\c!synonymstyle\c!synonymcolor{#3}%
    \else
      \explicithmode
-     \doattributes{\??sm#1}\c!tekstletter\c!tekstkleur{#2}%
+     \doattributes{\??sm#1}\c!textstyle\c!textcolor{#2}%
    \fi
    \endgroup}
 
@@ -156,10 +156,10 @@
 \def\dodocomplexsynonym[#1][#2]#3#4%
   {\doifsomething{#2}
      {\getvalue{\s!check#1}{#2}%
-      \doifelsevalue{\??sm#1\c!conversie}\v!ja
+      \doifelsevalue{\??sm#1\c!conversion}\v!yes
         {\unexpanded\setgvalue{#2}{\expandsynonym{#1}{#2}{#3}{#4}}}
-        {\doifelsevalue{\??sm#1\c!status}\v!start
-           {\doifelsevalue{\??sm#1\c!criterium}\v!alles
+        {\doifelsevalue{\??sm#1\c!state}\v!start
+           {\doifelsevalue{\??sm#1\c!criterium}\v!all
               {\preexecutesynonym{#1}{#2}{#3}{#4}}
               {\unexpanded\setgvalue{#2}{\executesynonym{#1}{#2}{#3}{#4}}}}
            {\unexpanded\setgvalue{#2}{\processsynonym{#1}{#3}{#4}}}}}}
@@ -171,8 +171,8 @@
      \dodocomplexsynonym[#2][#1#4]{#4}{#5}%
    \fi}
 
-\def\dodefinieersynoniemen[#1][#2][#3][#4]%
-  {\setvalue{\e!stel#2\e!in}%
+\def\dodefinesynonyms[#1][#2][#3][#4]%
+  {\setvalue{\e!setup#2\e!in}%
      {\dodoubleargument\getparameters[\??sm#1]}%
    \iffourthargument
      \unexpanded\def#4##1%
@@ -191,23 +191,23 @@
      \setvalue{#1}%
        {\dotripleempty\docomplexsynonym[][#1]}%
    \fi
-   \dostelsynoniemenin
+   \dosetupsynonyms
      [#1]%
-     [\c!synoniemletter=,
-      \c!tekstletter=,
-      \c!status=\v!start,
+     [\c!synonymstyle=,
+      \c!textstyle=,
+      \c!state=\v!start,
       \c!criterium=,
-      \c!plaats=\v!links,
-      \c!breedte=5em,
-      \c!afstand=0pt,
-      \c!monster=,
+      \c!location=\v!left,
+      \c!width=5em,
+      \c!distance=0pt,
+      \c!sample=,
       \c!hang=,
-      \c!uitlijnen=,
-      \c!voor=,
-      \c!tussen=,
-      \c!na=,
-      \c!springvolgendein=\v!nee,
-      \c!expansie=]%
+      \c!align=,
+      \c!before=,
+      \c!inbetween=,
+      \c!after=,
+      \c!indentnext=\v!no,
+      \c!expansion=]%
    \presetheadtext % changes the \if...argument
      [#2=\Word{#2}]%
    \setvalue{\s!set#1}%
@@ -217,15 +217,15 @@
    \setvalue{\s!check#1}##1%
      {\checkdefined{synoniemen}{#1}{##1}}%
    \addutilityreset{#1}%
-   \setvalue{\e!laad#2}%
+   \setvalue{\e!load#2}%
      {\dolaadsynoniemen{#1}{#2}}%
-   \setvalue{\e!plaats\e!lijstmet#2}%
+   \setvalue{\e!place\e!listof#2}%
      {\doplaatslijstmetsynoniemen{#1}{#2}}%
-   \setvalue{\e!volledige\e!lijstmet#2}%
+   \setvalue{\e!complete\e!listof#2}%
      {\dovolledigelijstmetsynoniemen{#1}{#2}}}
 
-\def\definieersynoniemen
-  {\doquadrupleempty\dodefinieersynoniemen}
+\def\definesynonyms
+  {\doquadrupleempty\dodefinesynonyms}
 
 %  Formaat tex-utility-input-file <jobname.tui>:
 %
@@ -236,11 +236,11 @@
 %
 %    \synonymentry {tag} {pure} {text} {}
 
-\def\dostelsorterenin[#1][#2]%
+\def\dosetupsorting[#1][#2]%
   {\getparameters[\??so#1][#2]}
 
-\def\stelsorterenin
-  {\dodoubleargument\dostelsorterenin}
+\def\setupsorting
+  {\dodoubleargument\dosetupsorting}
 
 \def\doresetsorteren#1%
   {\letvalue{#1\s!entry}\gobblethreearguments}
@@ -250,20 +250,20 @@
      {\def\dowritesort####1####2####3{}%
       \global\utilitydonetrue
       \bgroup
-      \doifdefinedelse{\??so#1\c!commando}
-        {\getvalue{\??so#1\c!commando}{##2}}  % 1 argument
-        {\getvalue{\??so#1\c!voor}%
-         \doattributes{\??so#1}\c!letter\c!kleur{##2}%
-         \getvalue{\??so#1\c!na}}%
+      \doifdefinedelse{\??so#1\c!command}
+        {\getvalue{\??so#1\c!command}{##2}}  % 1 argument
+        {\getvalue{\??so#1\c!before}%
+         \doattributes{\??so#1}\c!style\c!color{##2}%
+         \getvalue{\??so#1\c!after}}%
       \egroup}}
 
 \def\doplaatslijstmetsorteren#1% NOG EEN RUWE VERSIE MAKEN
-  {\witruimte                  % ZONDER WITRUIMTE ETC ETC
+  {\whitespace                  % ZONDER WITRUIMTE ETC ETC
    \begingroup
-   \setupwhitespace[\v!geen]%
+   \setupwhitespace[\v!none]%
    \doutilities{#1}\jobname{#1}\relax\par
    \endgroup
-   \ifutilitydone\else\geenwitruimte\fi}
+   \ifutilitydone\else\nowhitespace\fi}
 
 \def\dovolledigelijstmetsorteren#1#2%
   {\plaatsvolledig
@@ -273,7 +273,7 @@
 \def\processsort#1#2#3%
   {\explicithmode
    \bgroup
-   \doattributes{\??so#1}\c!letter\c!kleur{#2}%
+   \doattributes{\??so#1}\c!style\c!color{#2}%
    \egroup}
 
 \def\dowritesort#1#2#3%
@@ -320,8 +320,8 @@
 \def\dodocomplexsort[#1][#2]#3%
   {\doifsomething{#2}
      {\getvalue{\s!check#1}{#2}%
-      \doifelsevalue{\??so#1\c!status}\v!start
-        {\doifelsevalue{\??so#1\c!criterium}\v!alles
+      \doifelsevalue{\??so#1\c!state}\v!start
+        {\doifelsevalue{\??so#1\c!criterium}\v!all
            {\preexecutesort{#1}{#2}{#3}}
            {\unexpanded\setgvalue{#2}{\executesort{#1}{#2}{#3}}}}
         {\unexpanded\setgvalue{#2}{\processsort{#1}{#3}{#2}}}}}
@@ -335,20 +335,20 @@
 
 % if #3=\relax or \v!geen, then no command but still protected
 
-\def\dodefinieersorteren[#1][#2][#3]%
+\def\dodefinesorting[#1][#2][#3]%
   {\getparameters[\??so#1]
-     [%\c!commando=, % we test for defined !
-      \c!status=\v!start,
+     [%\c!command=, % we test for defined !
+      \c!state=\v!start,
       \c!criterium=,
-      \c!letter=,
-      \c!voor=,
-      \c!na=\endgraf,
-      \c!expansie=]%
+      \c!style=,
+      \c!before=,
+      \c!after=\endgraf,
+      \c!expansion=]%
    \presetheadtext[#2=\Word{#2}]%
-   \setvalue{\e!stel#2\e!in}[##1]% vervalt tzt, soort oo-mode
+   \setvalue{\e!setup#2\e!in}[##1]% vervalt tzt, soort oo-mode
      {\getparameters[\??so#1][##1]}%
    \ifthirdargument
-     \ConvertConstantAfter\doifnot{#3}\v!geen
+     \ConvertConstantAfter\doifnot{#3}\v!none
        {\ifx#3\relax \else
           \def#3##1{\getvalue{\??so:#1:##1}}
         \fi}%
@@ -363,44 +363,44 @@
    \setvalue{\s!reset#1}%
      {\doresetsorteren{#1}}%
    \addutilityreset{#1}%
-   \setvalue{\e!laad#2}%
+   \setvalue{\e!load#2}%
      {\dolaadsorteren{#1}{#2}}%
    \setvalue{\s!check#1}##1%
      {\checkdefined{sorteren}{#1}{##1}}%
-   \setvalue{\e!plaats\e!lijstmet#2}%
+   \setvalue{\e!place\e!listof#2}%
      {\doplaatslijstmetsorteren{#1}}%
-   \setvalue{\e!volledige\e!lijstmet#2}%
+   \setvalue{\e!complete\e!listof#2}%
      {\dovolledigelijstmetsorteren{#1}{#2}}}
 
-\def\definieersorteren%
-  {\dotripleempty\dodefinieersorteren}
+\def\definesorting%
+  {\dotripleempty\dodefinesorting}
 
-\definieersynoniemen
-  [\v!afkorting]
-  [\v!afkortingen]
-  [\voluit]
-
-\stelsynoniemenin
-  [\v!afkorting]
-  [\c!tekstletter=\v!kapitaal,
-   \c!synoniemletter=,
-   \c!tekstkleur=,
-   \c!synoniemkleur=,
-   \c!plaats=\v!links,
-   \c!breedte=5em,
-   \c!status=\v!start]
-
-\definieersorteren
+\definesynonyms
+  [\v!abbreviation]
+  [\v!abbreviations]
+  [\infull]
+
+\setupsynonyms
+  [\v!abbreviation]
+  [\c!textstyle=\v!capital,
+   \c!synonymstyle=,
+   \c!textcolor=,
+   \c!synonymcolor=,
+   \c!location=\v!left,
+   \c!width=5em,
+   \c!state=\v!start]
+
+\definesorting
   [\v!logo]
   [\v!logos]
 
-\definieersynoniemen
-  [\v!eenheid]
-  [\v!eenheden]
-  [\betekenis]
+\definesynonyms
+  [\v!unit]
+  [\v!units]
+  [\unitmeaning]
 
-\stelsynoniemenin
-  [\v!eenheid]
-  [\c!tekstletter=\dimension]
+\setupsynonyms
+  [\v!unit]
+  [\c!textstyle=\dimension]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-sys.tex b/tex/context/base/core-sys.tex
index 5c1b12638..a2622838f 100644
--- a/tex/context/base/core-sys.tex
+++ b/tex/context/base/core-sys.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-sys, % moved from main-001
+%D   [       filefile=core-sys, % moved from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=System,
@@ -47,19 +47,19 @@
 
 \def\dosetupsystem[#1]%
   {\getparameters[\??sv][#1]%
-   \setuprandomize[\@@svwillekeur]%
-   \beforesplitstring\@@svresolutie\at dpi\to\@@svresolutie
-   \let\outputresolution\@@svresolutie
+   \setuprandomize[\@@svrandom]%
+   \beforesplitstring\@@svresolution\at dpi\to\@@svresolution
+   \let\outputresolution\@@svresolution
    \ifcase\@@svn
      %                        % 0 : unknown
    \or
-     \setsystemmode\v!eerste  % 1 : first run
+     \setsystemmode\v!first  % 1 : first run
    \or
      %                        % 2 : successive run
    \or
-     \setsystemmode\v!eerste  % 3 : first and only run
+     \setsystemmode\v!first  % 3 : first and only run
    \or
-     \setsystemmode\v!laatste % 4 : extra last run
+     \setsystemmode\v!last % 4 : extra last run
    \fi
    \splitjobfilename}
 
@@ -69,7 +69,7 @@
 %D The system modes set by the setup command can be used in
 %D situations like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startmode[*first]
 %D   \executesystemcommand{cleanupxml text.xml clean-text.xml}
 %D \stopmode
@@ -77,7 +77,7 @@
 %D \starttext
 %D   \typefile{clean-text.xml}
 %D \stoptext
-%D \stoptypen
+%D \stoptyping
 
 \def\setuprandomize[#1]%
   {\doifsomething{#1}
@@ -86,23 +86,23 @@
       % tex's time is in minutes
       \processaction
         [#1]
-        [  \v!klein=>\divide\normaltime 15, %  900,
-          \v!middel=>\divide\normaltime 30, % 1800,
-           \v!groot=>\divide\normaltime 60, % 3600,
-         \v!normaal=>,
+        [  \v!small=>\divide\normaltime 15, %  900,
+          \v!medium=>\divide\normaltime 30, % 1800,
+           \v!big=>\divide\normaltime 60, % 3600,
+         \v!normal=>,
          \s!default=>,
          \s!unknown=>\normaltime=#1]%
       \nextrandom
       \egroup}}
 
 \setupsystem
-  [\c!gebied=,
+  [\c!directory=,
    \c!n=0, % 0:unknown 1: one run 2: first 3: successive 4: final run
-   \c!resolutie=600dpi,
-   \c!willekeur=,
+   \c!resolution=600dpi,
+   \c!random=,
    \c!file=\jobname,
    \c!inputfile=\outputfilename,
-   \c!korps=\normalizedlocalbodyfontsize] % of iets anders
+   \c!bodyfont=\normalizedlocalbodyfontsize] % of iets anders
 
 %D
 
@@ -136,27 +136,27 @@
 \def\dododefinestartstop[#1][#2]% todo: use indirect commands
   {\getparameters
      [\??be#1]
-     [\c!voor=,
-      \c!na=,
-      \c!tussen=,
-      \c!commandos=,
-      \c!letter=,
+     [\c!before=,
+      \c!after=,
+      \c!inbetween=,
+      \c!commands=,
+      \c!style=,
       #2]%
    \unexpanded\setvalue{#1}%
      {\groupedcommand
-        {\getvalue{\??be#1\c!commandos}%
-         \dostartattributes{\??be#1}\c!letter\c!kleur}
+        {\getvalue{\??be#1\c!commands}%
+         \dostartattributes{\??be#1}\c!style\c!color}
         {\dostopattributes
-         \getvalue{\??be#1\c!tussen}}}%
+         \getvalue{\??be#1\c!inbetween}}}%
    \setvalue{\e!start#1}%
-     {\getvalue{\??be#1\c!voor}%
+     {\getvalue{\??be#1\c!before}%
       \bgroup
-      \getvalue{\??be#1\c!commandos}%
-      \dostartattributes{\??be#1}\c!letter\c!kleur\empty}%
+      \getvalue{\??be#1\c!commands}%
+      \dostartattributes{\??be#1}\c!style\c!color\empty}%
    \setvalue{\e!stop#1}%
      {\dostopattributes
       \egroup
-      \getvalue{\??be#1\c!na}}}
+      \getvalue{\??be#1\c!after}}}
 
 \def\dodefinestartstop[#1][#2]%
   {\def\docommando##1{\dododefinestartstop[##1][#2]}%
@@ -203,7 +203,7 @@
 %
 % \unexpanded\ziezo
 
-\def\complexdefinieer[#1]#2#3%
+\def\complexdefine[#1]#2#3%
   {\ifx#2\undefined
    \else
      \showmessage\m!systems4{\string#2}%
@@ -221,12 +221,12 @@
    \else\def#2{#3}%
    \fi}
 
-\definecomplexorsimpleempty\definieer
+\definecomplexorsimpleempty\define
 
-\unexpanded\def\naam#1% brrr
-  {\getvalue{#1}}
+\unexpanded\def\macroname#1% brrr
+  {\executeifdefined{#1}\empty}
 
-\def\gebruikcommandos#1%
+\def\usecommands#1%
   {\bgroup
    \def\docommando##1{\setbox0\hbox{\getvalue{\string##1}##1}}%
    \processcommalist[#1]\docommando
@@ -251,26 +251,26 @@
 %D XML processing, it made sense to support this faster
 %D alternative.
 
-\def\installexpander#1{\setvalue{\s!do\c!expansie#1}}
+\def\installexpander#1{\setvalue{\s!do\c!expansion#1}}
 
 \long\def\convertexpanded#1#2#3% hm, first we need to make sure
   {\csname   % that we assign all exp a value
-     \s!do\c!expansie
+     \s!do\c!expansion
      \ifforcefileexpansion
-       \v!ja
-     \else\@EA\ifx\csname\s!do\c!expansie\csname#1\c!expansie\endcsname\endcsname\relax
+       \v!yes
+     \else\@EA\ifx\csname\s!do\c!expansion\csname#1\c!expansion\endcsname\endcsname\relax
        \s!default
      \else
-       \csname#1\c!expansie\endcsname
+       \csname#1\c!expansion\endcsname
      \fi\fi
    \endcsname#2\to#3}
 
-\installexpander\v!ja      {\convertmeaning }
-\installexpander\v!ja      {\convertmeaning }
-\installexpander\v!commando{\convertcommand }
+\installexpander\v!yes      {\convertmeaning }
+\installexpander\v!yes      {\convertmeaning }
+\installexpander\v!command{\convertcommand }
 \installexpander\s!default {\convertargument}
 \installexpander\empty     {\convertargument}
-\installexpander\v!nee     {\convertargument}
+\installexpander\v!no     {\convertargument}
 
 \def\convertmeaning#1\to % watch the double expansion !
   {\bgroup
@@ -288,12 +288,15 @@
 % \setvalue{statevalue\v!geen   }{4}
 %
 % \def\setcurrentstate#1%
-%   {\chardef\currentstate=0\getvalue{statevalue\getvalue{#1\c!status}\relax}
+%   {\chardef\currentstate=0\getvalue{statevalue\getvalue{#1\c!state}\relax}
 %
 % \ifcase\currentstate ...
 
-\def\herhaal            {\dorepeat}
-\def\herhaler           {\repeater}
-\def\herhaalmetcommando {\dorepeatwithcommand}
+\def\redo{\dorepeat} % [n*10], kind of obsolete
+
+% obsolete, use \dorecurse instead
+%
+% \def\herhaler           {\repeater}
+% \def\herhaalmetcommando {\dorepeatwithcommand}
 
 \protect \endinput
diff --git a/tex/context/base/core-tab.tex b/tex/context/base/core-tab.tex
index 93e480fd0..ddec1bcef 100644
--- a/tex/context/base/core-tab.tex
+++ b/tex/context/base/core-tab.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-tab,
+%D   [       filefile=core-tab,
 %D        version=1997.10.10,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=\TABLE\ Embedding,
@@ -119,10 +119,10 @@
 %D \stoptable
 %D \stopbuffer
 %D
-%D \startcombinatie
-%D   {\tracetablesfalse\haalbuffer} {\type{\tracetablesfalse}}
-%D   {\tracetablestrue\haalbuffer}  {\type{\tracetablestrue}}
-%D \stopcombinatie
+%D \startcombination
+%D   {\tracetablesfalse\getbuffer} {\type{\tracetablesfalse}}
+%D   {\tracetablestrue\getbuffer}  {\type{\tracetablestrue}}
+%D \stopcombination
 %D
 %D This table is specified as:
 %D
@@ -149,7 +149,7 @@
 %D When we use the split table feature, we get a bit more
 %D information.
 %D
-%D {\tracetablesfalse\haalbuffer}
+%D {\tracetablesfalse\getbuffer}
 %D
 %D Sometimes in tables information shows up that is not typed
 %D in by the user. These messages give a cue in what aspect a
@@ -174,7 +174,7 @@
 %D therefore can result in two or more succesive messages, like
 %D in the last row.
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D Bringing color into tables is complicated by the mere fact
 %D that color is not part of \TEX. The main complication is
@@ -195,7 +195,7 @@
 %D \gdef\ShowExample%
 %D   {\startfiguurtekst
 %D      {geen}
-%D      {\haalbuffer}
+%D      {\getbuffer}
 %D    \typebuffer
 %D    \stopfiguurtekst}
 %D
@@ -415,9 +415,9 @@
 %D tables. If for some reason one wants to use the \TABLE\
 %D primitives, one can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \ObeyTableBarAndQuote
-%D \stoptypen
+%D \stoptyping
 %D
 %D To keep things verbose, as well as to show what \TABLE\
 %D commands we affect, we show some meanings.
@@ -441,10 +441,10 @@
 
 %D The first attemp to solve this problem was:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\normalTABLEquote%
 %D   {\unskip\TABLEhack\!ttRightGlue&\omit&\TABLEhack}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But, as usual, this interfered with \type {\omit}.
 %D
@@ -452,7 +452,7 @@
 %D This works ok, but breaks for instance the~\type{b}
 %D key handling.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\!tfAdjoinPriorColumn%
 %D   {\ifnum\!taColumnNumber=0
 %D      \!taPreamble=\!taRuleColumnTemplate
@@ -465,7 +465,7 @@
 %D    \fi
 %D    ...
 %D    \ReadFormatKeys}
-%D \stoptypen
+%D \stoptyping
 
 \newdimen\TABLEparheight
 
@@ -475,14 +475,14 @@
      \normalbaselines
      \let~\!ttTie
      \let\-\!ttDH
-     \blanko[\v!blokkeer]% % added
+     \blank[\v!disable]% % added
      \the\EveryTableParBox}
 
 \def\EndTableParBox
   {\removelastskip                                   % itemize or so
    \par
    \ifnum\prevgraf>\zerocount                        % we want at least
-     \verticalstrut \geenwitruimte \vskip-\struttotal% one line of text
+     \verticalstrut \nowhitespace \vskip-\struttotal% one line of text
      \egroup
      \ifdim\dp\scratchbox>\lineheight                % see (*) for an
        \getnoflines{\dp\scratchbox}%                 % example of where
@@ -595,9 +595,9 @@
 %D the numeric keys. The quantity keys (\type{q} and \type{Q})
 %D support the more european way of writing numbers:
 %D
-%D \startsmaller
+%D \startnarrower
 %D 100.000.000,00 instead of 100,000,000.00
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D The next table shows how to use these keys. We use braces
 %D instead of brackets because we need brackets to specify the
@@ -689,9 +689,9 @@
 
 %D \em Get argument:
 %D
-%D \starttypen
+%D \starttyping
 %D <sample left field> <optional, sample right field>
-%D \stoptypen
+%D \stoptyping
 
 \def\!tqGetArgument[#1]%
   {\!tqMakeQuantityTemplate\!tqStyle#1,,!}
@@ -725,7 +725,7 @@
 %D Here ends the Q||extension. Did you watch the clever use
 %D of aftergroup in \type{\!tqConvertCode}.
 
-% %D We also (have to) define a key for \type{\kap}:
+% %D We also (have to) define a key for \type{\cap}:
 %
 % \letvalue{!tk<\string K>}=\undefined
 %
@@ -947,7 +947,7 @@
 %D All commands that are executed between rows are to be put in
 %D \type {\noalign}. We can however not verify if we (that is
 %D \TABLE) does or did not enter this mode. A moderate dirty
-%D but useful trick is using our own alternative:\voetnoot{Once
+%D but useful trick is using our own alternative:\footnote{Once
 %D one has entered the stage of redefining \TEX\ primitives,
 %D such hacks become a second nature. However, redefining \type
 %D {\omit} and \type{\span} is not that easy.}
@@ -961,17 +961,17 @@
 %D The rest of this module is not easy to comprehend, mainly
 %D because we have to take care of:
 %D
-%D \startopsomming[opelkaar]
-%D \som  \type{\startopsomming[template]}
-%D \som  \type{\startopsomming{template}}
-%D \som  \type{\startopsomming[predefined]}
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item  \type{\startitemize[template]}
+%D \item  \type{\startitemize{template}}
+%D \item  \type{\startitemize[predefined]}
+%D \stopitemize
 %D
 %D as well as:
 %D
-%D \startopsomming[verder]
-%D \som  restart after table break
-%D \stopopsomming
+%D \startitemize[continue]
+%D \item  restart after table break
+%D \stopitemize
 %D
 %D The official specification of the start command is:
 %D
@@ -979,9 +979,9 @@
 
 \def\starttable
   {\bgroup
-   \doifelsenothing\@@tikader
+   \doifelsenothing\@@tiframe
      {\ifinsidefloat\else\startbaselinecorrection\fi}
-     {\startframedcontent[\@@tikader]}%
+     {\startframedcontent[\@@tiframe]}%
    \postponefootnotes
    \firststagestartTABLE}
 
@@ -990,7 +990,7 @@
    \globalletempty\@@TABLEhead
    \globalletempty\@@TABLEtail
    \finishTABLE
-   \doifelsenothing\@@tikader
+   \doifelsenothing\@@tiframe
      {\ifinsidefloat\else
         \stopbaselinecorrection
         \goodbreak % compensates all the nobreaks
@@ -1017,7 +1017,7 @@
 %D The complex (and main) start macro first takes care of the
 %D predefined case. Such a predefined setup looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definetabletemplate[test][|||]
 %D
 %D \starttable[test]
@@ -1025,7 +1025,7 @@
 %D \VL test \VL test \VL\AR
 %D \VL test \VL test \VL\AR
 %D \stoptable
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation of the definition macro is not that
 %D complicated:
@@ -1061,18 +1061,18 @@
 %D The optional third and fourth arguments define which table
 %D head and tail to use.
 %D
-%D \starttypen
+%D \starttyping
 %D \definetabletemplate[test][|||][before][after]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This also means that one can define table heads and tails
 %D by name!
 %D
-%D \starttypen
+%D \starttyping
 %D \starttablehead[before]
 %D \HL \VL first \VL second \VL \SR \HL
 %D \stoptablehead
-%D \stoptypen
+%D \stoptyping
 %D
 %D Templates defined this way get protected names, that cannot
 %D conflict with existing commands.
@@ -1211,7 +1211,7 @@
 %D
 %D For example:
 %D
-%D \starttypen
+%D \starttyping
 %D \starttables[|||]
 %D \HL
 %D \VL element \VL atom weight \VL\AR
@@ -1220,7 +1220,7 @@
 %D \VL ....... \VL ........... \VL\AR
 %D \HL
 %D \stoptables
-%D \stoptypen
+%D \stoptyping
 
 \def\starttables
   {\bgroup
@@ -1248,7 +1248,7 @@
 %D pages, only the first gets a head. We could have said
 %D something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \starttablekop
 %D \HL
 %D \VL element \VL atom weight \VL\AR
@@ -1263,7 +1263,7 @@
 %D \VL ....... \VL ........... \VL\AR
 %D \VL ....... \VL ........... \VL\AR
 %D \stoptables
-%D \stoptypen
+%D \stoptyping
 %D
 %D This time each split table gets a head line and ends with
 %D a rule. Keep in mind that such heads also apply to the
@@ -1306,7 +1306,7 @@
 %D and will probably be improved bit by bit.
 
 \def\docalculatemaxTABLEheight
-  {\ifbinnenkolommen
+  {\ifinsidecolumns
      \getcolumnstatus\column\scratchcounter\total\dimen0\goal\dimen2\\%
    \else
      \ifdim\pagegoal<\maxdimen
@@ -1314,7 +1314,7 @@
        \dimen2\pagegoal
      \else
        \dimen0\zeropoint
-       \dimen2\teksthoogte
+       \dimen2\textheight
      \fi
    \fi
    \advance\dimen2 -\dimen0
@@ -1326,11 +1326,11 @@
    \fi\fi}
 
 \def\nocalculatemaxTABLEheight
-  {\ifbinnenkolommen
+  {\ifinsidecolumns
      \getcolumnstatus\column\scratchcounter\total\dimen0\goal\dimen2\\%
    \else
      \dimen0\zeropoint
-     \dimen2\teksthoogte
+     \dimen2\textheight
    \fi
    \advance\dimen2 -\dimen0
    \global\TABLEmaxheight\dimen2
@@ -1340,12 +1340,12 @@
   {\ifsplittables
      #1\relax
      \ifdim\TABLEmaxheight<3\baselineskip \relax % instelbaar maken
-       \ifbinnenkolommen
+       \ifinsidecolumns
          \nobreak
          \kern\dimen2
          \goodbreak
        \else
-         \goodbreak % \pagina
+         \goodbreak % \page
        \fi
        \removeTABLEtopskip
        \nocalculatemaxTABLEheight
@@ -1453,24 +1453,24 @@
 %D switching. I won't go into much detail from now on, but just
 %D mention the general principles.
 %D
-%D \startopsomming[3*ruim]
+%D \startitemize[3*ruim]
 %D \sym{\type{\SR}} end a separate row (between rules)
 %D \sym{\type{\FR}} end a first row (after a rule)
 %D \sym{\type{\MR}} end a mid row (between text lines)
 %D \sym{\type{\LR}} end a last row (before a rule)
-%D \stopopsomming
+%D \stopitemize
 %D
 %D and best of all:
 %D
-%D \startopsomming[verder]
+%D \startitemize[continue]
 %D \sym{\type{\AR}} end a row with automatic spacing
-%D \stopopsomming
+%D \stopitemize
 %D
 %D As far as possible, we report confusing situations. In
 %D most cases one can use \type{\AR}, which transfigurates
 %D itself into one of the other types.
 %D
-%D \starttypen
+%D \starttyping
 %D \starttable[||]
 %D \HL
 %D \VL a separate row \VL\SR
@@ -1480,7 +1480,7 @@
 %D \VL a last row     \VL\LR
 %D \HL
 %D \stoptable
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this example we could have used \type{\AR} without
 %D problems.
@@ -1750,7 +1750,7 @@
 %D While defining this macro we change the \CATCODE\ of
 %D \type{|}. When counting the bars, we use a non active
 %D representation of the bar, simply because we cannot be sure
-%D if the bar is active or not.\voetnoot{Normally it is, but
+%D if the bar is active or not.\footnote{Normally it is, but
 %D \TABLE\ changes the catcode when needed.}
 
 \bgroup
@@ -1779,12 +1779,12 @@
    \span\the\!taPreamble
    \ifx \!tfRowOfWidths \empty \else \!tfRowOfWidths \cr \fi}
 
-%D \startopsomming[3*ruim]
+%D \startitemize[3*ruim]
 %D \sym{\type{\VL}} a vertical line
 %D \sym{\type{\VC}} a vertical colored line
 %D \sym{\type{\HL}} a horizontal line
 %D \sym{\type{\HC}} a horizontal colored line
-%D \stopopsomming
+%D \stopitemize
 
 % \def\defineTABLErules
 %   {\let\VL\TableVL
@@ -1946,14 +1946,14 @@
       \globallet\stopHLcommand \stopHCcommand}%
    \HL}
 
-%D \startopsomming[3*ruim]
+%D \startitemize[3*ruim]
 %D \sym{\type{\NL}} a vertical skip
 %D \sym{\type{\NR}} goto the next row
 %D \sym{\type{\NC}} goto the next column
 %D \sym{\type{\FC}} a first column
 %D \sym{\type{\MC}} a mid column
 %D \sym{\type{\LC}} a last column
-%D \stopopsomming
+%D \stopitemize
 
 % n+1 uitleggen
 
@@ -1976,7 +1976,7 @@
 \def\simpleTableNL
   {\TABLEnoalign
      {\nobreak
-      \setbox0\vbox{\blanko[\@@tiNL]}%
+      \setbox0\vbox{\blank[\@@tiNL]}%
       \global\advance\TABLEheight \ht0
       \vskip\ht0
       \nobreak}}
@@ -2013,12 +2013,12 @@
    \def"{\NC}}           % \normalTABLEquote
 \egroup
 
-%D \startopsomming[3*ruim]
+%D \startitemize[3*ruim]
 %D \sym{\type{\DL}}
 %D \sym{\type{\DV}} (\type{\VD})
 %D \sym{\type{\DC}}
 %D \sym{\type{\DR}}
-%D \stopopsomming
+%D \stopitemize
 
 \newif\ifTABLEdivision
 
@@ -2120,7 +2120,7 @@
   {\scratchdimen\LineThicknessUnit
    \global\advance\TABLEheight \@@tiHLheight\scratchdimen}
 
-%D \startopsomming[3*ruim]
+%D \startitemize[3*ruim]
 %D \sym{\type{\BC}}
 %D \sym{\type{\BR}}
 %D \sym{\type{\BACKGROUND}}
@@ -2129,7 +2129,7 @@
 %D \sym{\type{\BL}}
 %D \sym{\type{\RASTER}}
 %D \sym{\type{\COLOR}}
-%D \stopopsomming
+%D \stopitemize
 
 % definieer: \BC \BL
 % herhaal: \BR
@@ -2145,9 +2145,9 @@
    \let\RL        \TableRL
    \let\COLOR     \TableCOLOR
    \let\RASTER    \TableRASTER
-   \globallet\lastTABLEc\@@tiachtergrondkleur
-   \globallet\lastTABLEr\@@tiachtergrondraster
-   \doifinsetelse\@@tiachtergrond{c,color} % \v!kleur
+   \globallet\lastTABLEc\@@tibackgroundcolor
+   \globallet\lastTABLEr\@@tibackgroundscreen
+   \doifinsetelse\@@tibackground{c,color} % \v!color
      {\global\chardef\TABLEcr\plusone}
      {\global\chardef\TABLEcr\plustwo}}
 
@@ -2448,12 +2448,12 @@
 
 \def\defineTABLEunits
   {\processaction
-     [\@@tiafstand]
-     [  \v!geen=>\OpenUp00\def\LOW{\Lower6 },
-       \v!klein=>\OpenUp00\def\LOW{\Lower6 }, % == baseline
-      \v!middel=>\OpenUp11\def\LOW{\Lower7 },
-       \v!groot=>\OpenUp22\def\LOW{\Lower8 }]%
-   \doifelse\@@tiafstand\v!geen
+     [\@@tidistance]
+     [  \v!none=>\OpenUp00\def\LOW{\Lower6 },
+       \v!small=>\OpenUp00\def\LOW{\Lower6 }, % == baseline
+      \v!medium=>\OpenUp11\def\LOW{\Lower7 },
+       \v!big=>\OpenUp22\def\LOW{\Lower8 }]%
+   \doifelse\@@tidistance\v!none
      {\chardef\TABLErowfactor\zerocount}
      {\chardef\TABLErowfactor\plustwo  }}
 
@@ -2474,18 +2474,18 @@
 \def\dosetuptables[#1]%
   {\getparameters[\??ti][#1]%
    \processaction
-     [\@@tiuitlijnen]
-     [ \v!rechts=>\def\TABLEparalignment{\raggedright},
-        \v!links=>\def\TABLEparalignment{\raggedleft},
-       \v!midden=>\def\TABLEparalignment{\raggedcenter},
+     [\@@tialign]
+     [ \v!right=>\def\TABLEparalignment{\raggedright},
+        \v!left=>\def\TABLEparalignment{\raggedleft},
+       \v!middle=>\def\TABLEparalignment{\raggedcenter},
       \s!default=>\def\TABLEparalignment{\notragged},
       \s!unknown=>\def\TABLEparalignment{\notragged}]%
    \assignalfadimension\@@tiVL\@@tiVLwidth 246%
    \assignalfadimension\@@tiHL\@@tiHLheight246}
 
 \def\localTABLEsetup
-  {\@@ticommandos\relax
-   \expanded{\switchtobodyfont[\@@tikorps]}%
+  {\@@ticommands\relax
+   \expanded{\switchtobodyfont[\@@tibodyfont]}%
    \StrutHeightFactor  8
    \StrutDepthFactor   4
    \LineThicknessFactor4
@@ -2501,25 +2501,25 @@
 \let\stopglobalTABLEcolor \empty
 
 \def\localTABLEsetup
-  {\@@ticommandos\relax
+  {\@@ticommands\relax
    % bodyfont
-   \expanded{\switchtobodyfont[\@@tikorps]}%
+   \expanded{\switchtobodyfont[\@@tibodyfont]}%
    % linecolor
-   \doifsomething\@@tilijnkleur
-     {\def\startglobalTABLEcolor{\localstartcolor[\@@tilijnkleur]}%
+   \doifsomething\@@tirulecolor
+     {\def\startglobalTABLEcolor{\localstartcolor[\@@tirulecolor]}%
       \def\stopglobalTABLEcolor {\localstopcolor}}%
    % linethickness
    \LineThicknessFactor4
-   \scratchdimen\@@tilijndikte
+   \scratchdimen\@@tirulethickness
    \divide\scratchdimen \LineThicknessFactor
    \expanded{\NormalTLTU{\the\scratchdimen}}%
    % spacing, was depth=4 height=8 (counters, sigh, now macros)
-   \doifelse\@@tihoogte\v!strut
-     {\let\StrutHeightFactor\@@ithoogte}
-     {\let\StrutHeightFactor\@@tihoogte}%
-   \doifelse\@@tidiepte\v!strut
-     {\let\StrutDepthFactor\@@itdiepte}
-     {\let\StrutDepthFactor\@@tidiepte}%
+   \doifelse\@@tiheight\v!strut
+     {\let\StrutHeightFactor\@@itheight}
+     {\let\StrutHeightFactor\@@tiheight}%
+   \doifelse\@@tidepth\v!strut
+     {\let\StrutDepthFactor\@@itdepth}
+     {\let\StrutDepthFactor\@@tidepth}%
    \scratchdimen\StrutHeightFactor\points \multiply\scratchdimen 10%
    \edef\StrutHeightFactor{\withoutpt\the\scratchdimen}%
    \scratchdimen\StrutDepthFactor \points \multiply\scratchdimen 10%
@@ -2549,14 +2549,14 @@
 %D \stopbuffer
 %D
 %D \startbuffer[b]
-%D \starttabulatie[|c|]
+%D \starttabulate[|c|]
 %D \HL
 %D \NC test \NC \NR
 %D \NC test \NC \NR
 %D \NC test \NC \NR
 %D \NC test \NC \NR
 %D \HL
-%D \stoptabulatie
+%D \stoptabulate
 %D \stopbuffer
 %D
 %D In the next example, the first table is defined as:
@@ -2573,34 +2573,34 @@
 %D happens when we set the values to zero. The rightmost table
 %D is typeset using the tabulate environment.
 %D
-%D \startcombinatie[4*1]
-%D   {$\vcenter{\haalbuffer[a]}$}
+%D \startcombination[4*1]
+%D   {$\vcenter{\getbuffer[a]}$}
 %D     {\hbox{h=.8 d=.4}}
-%D   {\setuptables[hoogte=strut,diepte=strut]$\vcenter{\haalbuffer[a]}$}
+%D   {\setuptables[height=strut,depth=strut]$\vcenter{\getbuffer[a]}$}
 %D     {\hbox{h=d=\type{strut}}}
-%D   {\setuptables[hoogte=0,diepte=0]$\vcenter{\haalbuffer[a]}$}
+%D   {\setuptables[height=0,depth=0]$\vcenter{\getbuffer[a]}$}
 %D     {\hbox{h=d=0}}
-%D   {$\vcenter{\haalbuffer[b]}$}
+%D   {$\vcenter{\getbuffer[b]}$}
 %D     {\hbox{tabulate}}
-%D \stopcombinatie
+%D \stopcombination
 
 \setuptables
-  [HL=\v!middel,
-   VL=\v!middel,
-   NL=\v!klein,
-   \c!kader=,
-   \c!uitlijnen=\v!rechts,
-   \c!diepte=.40, % \v!strut
-   \c!hoogte=.80, % \v!strut
-   \c!lijndikte=\linewidth,
-   \c!lijnkleur=,
-   \c!afstand=\v!middel,
-   \c!korps=\the\bodyfontsize,
-   \c!commandos=,
-   \c!achtergrond=\v!raster,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=]
+  [HL=\v!medium,
+   VL=\v!medium,
+   NL=\v!small,
+   \c!frame=,
+   \c!align=\v!right,
+   \c!depth=.40, % \v!strut
+   \c!height=.80, % \v!strut
+   \c!rulethickness=\linewidth,
+   \c!rulecolor=,
+   \c!distance=\v!medium,
+   \c!bodyfont=\the\bodyfontsize,
+   \c!commands=,
+   \c!background=\v!screen,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=]
 
 \def\ifintabel{\ifintable} % upward compatible
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index b796587c5..ed027a3db 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -1,6 +1,6 @@
 %D \module
 %D \module
-%D   [       file=core-tbl,
+%D   [       filefile=core-tbl,
 %D        version=1998.11.03,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Text Flow Tabulation,
@@ -509,8 +509,8 @@
 \def\dogettabulatewidth(#1)%
   {\processallactionsinset
      [#1]%
-     [\v!passend=>\chardef\tabulatemodus\plusthree,
-         \v!vast=>\chardef\tabulatemodus\plusthree
+     [\v!fit=>\chardef\tabulatemodus\plusthree,
+         \v!fixed=>\chardef\tabulatemodus\plusthree
                   \tabulatenopbreaktrue,
       \s!unknown=>\tabulatewidth#1\relax]%
    \ifnum\tabulatedimen=\plusone
@@ -613,7 +613,7 @@
       \fi}}
 
 %D \startbuffer
-%D \starttabulatie[|c|p|p|]
+%D \starttabulate[|c|p|p|]
 %D \NC \bf Alpha \NC \bf Beta        \NC \bf Gamma          \NC\NR
 %D \NC 1         \NC right indeed    \NC definitely wrong   \NC\NR
 %D \NC 2         \NC \thinrules[n=3] \NC \thinrules[n=3]    \NC\NR
@@ -621,22 +621,22 @@
 %D \NC 4         \NC very true       \NC as false as can be \NC\NR
 %D \NC 5         \NC \thinrules[n=5] \NC \thinrules[n=5]    \NC\NR
 %D \NC 6         \NC \thinrules[n=3] \NC \thinrules[n=4]    \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D \stopbuffer
 %D
-%D \typebuffer {\tracetabulatetrue\haalbuffer}
+%D \typebuffer {\tracetabulatetrue\getbuffer}
 %D
 %D \startbuffer
-%D \starttabulatie[|c|p|p|]
+%D \starttabulate[|c|p|p|]
 %D \NC \bf Alpha \NC \bf Beta        \NC \bf Gamma          \NC\NR
 %D \NC 1         \NC right indeed    \NC definitely wrong   \NC\NR
 %D \NC 2         \NC oh yes          \NC simply no          \NC\NR
 %D \NC 3         \NC very true       \NC as false as can be \NC\NR
 %D \NC 4         \NC the whole truth \NC but the truth      \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D \stopbuffer
 %D
-%D \typebuffer {\tracetabulatetrue\haalbuffer}
+%D \typebuffer {\tracetabulatetrue\getbuffer}
 
 % \definetabulate
 % \redefinetabulate
@@ -648,21 +648,21 @@
 
 \def\dodefinetabulate[#1][#2][#3]%
   {\ifthirdargument
-     \doifundefined{\??tt#1::\c!eenheid}
+     \doifundefined{\??tt#1::\c!unit}
        {\copyparameters
           [\??tt#1::][\??tt\v!tabulate::]%
-          [\c!kader,\c!afstand,\c!eenheid,\c!voor,\c!korps,\c!na,
-           \c!binnen,\c!inspringen,\c!marge,\c!uitlijnen,\c!hoofd,\c!titel,
-           \c!lijnkleur,\c!lijndikte,\c!splitsen,EQ]}%
+          [\c!frame,\c!distance,\c!unit,\c!before,\c!bodyfont,\c!after,
+           \c!inner,\c!indenting,\c!margin,\c!align,\c!header,\c!title,
+           \c!rulecolor,\c!rulethickness,\c!split,EQ]}%
      \copyparameters
        [\??tt#1::#2][\??tt#1::]%
-       [\c!eenheid,\c!afstand,\c!voor,\c!korps,\c!na,
-        \c!binnen,\c!inspringen,\c!kader,\c!splitsen,\c!hoofd,\c!titel,
-        \c!marge,\c!uitlijnen,\c!lijnkleur,\c!lijndikte,EQ]%
+       [\c!unit,\c!distance,\c!before,\c!bodyfont,\c!after,
+        \c!inner,\c!indenting,\c!frame,\c!split,\c!header,\c!title,
+        \c!margin,\c!align,\c!rulecolor,\c!rulethickness,EQ]%
      \setvalue{\e!start#1::#2}{\dofinalstarttabulate[#1][#2][#3]}%
      \setvalue{\e!start#1}{\bgroup\dosubstarttabulate[#1]}%
-     \letvalue{\??tt#1-\v!hoofd}\empty
-     \letvalue{\??tt#1-\v!voet }\empty
+     \letvalue{\??tt#1-\v!header}\empty
+     \letvalue{\??tt#1-\v!footer }\empty
    \else\ifsecondargument
      \definetabulate[#1][][#2]%
    \else
@@ -674,21 +674,21 @@
 
 \newconditional\tabulatesomeamble
 
-\def\checkfulltabulatecontent % - needed, else confusion with \c!hoofd
-  {\ifundefined{\??tt\currenttabulate-\v!hoofd}%
+\def\checkfulltabulatecontent % - needed, else confusion with \c!header
+  {\ifundefined{\??tt\currenttabulate-\v!header}%
      \let\tabulateheadcontent\empty
    \else
      \def\tabulateheadcontent
        {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
-        \csname\??tt\currenttabulate-\v!hoofd\endcsname
+        \csname\??tt\currenttabulate-\v!header\endcsname
         \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
    \fi
-   \ifundefined{\??tt\currenttabulate-\v!voet}%
+   \ifundefined{\??tt\currenttabulate-\v!footer}%
      \let\tabulatetailcontent\empty
    \else
      \def\tabulatetailcontent
        {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
-        \csname\??tt\currenttabulate-\v!voet\endcsname
+        \csname\??tt\currenttabulate-\v!footer\endcsname
         \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
    \fi}
 
@@ -714,14 +714,14 @@
 
 \def\dostartstarttabulatehead[#1]%
   {\processcontent{\e!stop\v!tabulatehead}\next
-     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!hoofd}\next}}
+     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!header}\next}}
 
 \setvalue{\e!start\v!tabulatetail}%
   {\dosingleempty\dostartstarttabulatetail}
 
 \def\dostartstarttabulatetail[#1]%
   {\processcontent{\e!stop\v!tabulatetail}\next
-     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!voet}\next}}
+     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!footer}\next}}
 
 \def\dosubstarttabulate
   {\dodoubleempty\dodosubstarttabulate}
@@ -758,28 +758,28 @@
 \def\dofinalstarttabulate[#1][#2][#3]% identifier sub preamble
   {\edef\currenttabulate{#1::#2}%
    \ifinsidefloat \else
-     \witruimte
-     \getvalue{\??tt\currenttabulate\c!voor}%
+     \whitespace
+     \getvalue{\??tt\currenttabulate\c!before}%
    \fi
    \bgroup
    \resetcharacteralign
    % todo: spacing around tabulate when bodyfont is set
    % expansion en test needed ?
-   \doifelsevalue{\??tt\currenttabulate\c!splitsen}\v!ja
+   \doifelsevalue{\??tt\currenttabulate\c!split}\v!yes
      \splittabulatetrue\splittabulatefalse
-   \doifvaluesomething{\??tt\currenttabulate\c!korps}
+   \doifvaluesomething{\??tt\currenttabulate\c!bodyfont}
      {\expanded{\switchtobodyfont
-        [\getvalue{\??tt\currenttabulate\c!korps}]}}%
+        [\getvalue{\??tt\currenttabulate\c!bodyfont}]}}%
    \postponefootnotes % new, to be tested
    \chardef\tabulatepass\plusone
    \widowpenalty\zerocount % otherwise lines are not broken
    \clubpenalty \zerocount % but overlap in funny ways
    \the\everytabulate
-   \getvalue{\??tt\currenttabulate\c!binnen}%
+   \getvalue{\??tt\currenttabulate\c!inner}%
    \scratchdimen\leftskip
    \advance\scratchdimen \hangindent
-   \doifvalue{\??tt\currenttabulate\c!inspringen}\v!ja
-     {\advance\scratchdimen \parindent}% \voorwit
+   \doifvalue{\??tt\currenttabulate\c!indenting}\v!yes
+     {\advance\scratchdimen \parindent}% \ctxparindent
    \edef\tabulateindent{\the\scratchdimen}%
    \!!toksb\emptytoks
    \def\dorepeat*##1##2%
@@ -856,13 +856,13 @@
    \let\factor\!!plusone
    \scratchskip\strutdp
    \ExpandFirstAfter\processallactionsinset
-     [\getvalue{\??tt\currenttabulate\c!afstand}]
-     [ \v!blanko=>\scratchskip\bigskipamount,
-       \v!diepte=>\scratchskip\strutdp,
-        \v!klein=>\def\factor{.25},
-       \v!middel=>\def\factor{.5},
-        \v!groot=>,
-         \v!geen=>\scratchskip\zeropoint\def\factor{0},
+     [\getvalue{\??tt\currenttabulate\c!distance}]
+     [ \v!blank=>\scratchskip\bigskipamount,
+       \v!depth=>\scratchskip\strutdp,
+        \v!small=>\def\factor{.25},
+       \v!medium=>\def\factor{.5},
+        \v!big=>,
+         \v!none=>\scratchskip\zeropoint\def\factor{0},
          \v!grid=>\scratchskip\zeropoint\def\factor{0},
       \s!unknown=>\scratchskip\commalistelement]%
    \scratchdimen\factor\scratchskip
@@ -879,19 +879,19 @@
 
 \def\dodotabulaterule#1%
   {\color
-     [\getvalue{\??tt\currenttabulate\c!lijnkleur}]
-     {\scratchdimen\getvalue{\??tt\currenttabulate\c!lijndikte}#1}}
+     [\getvalue{\??tt\currenttabulate\c!rulecolor}]
+     {\scratchdimen\getvalue{\??tt\currenttabulate\c!rulethickness}#1}}
 
 \def\dotabulaterule
   {\dodotabulaterule
      {\hrule\!!height.5\scratchdimen\!!depth.5\scratchdimen\relax
-      \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
+      \doifvalue{\??tt\currenttabulate\c!distance}\v!grid
         {\kern-\scratchdimen}}} % experimental tm-prikkels
 
 \def\dotabulatelinerule
   {\multispan\totaltabulatecolumns % \multispan is a plain macro
    % for the moment this one
-   \strut\hskip\getvalue{\??tt\currenttabulate\c!marge}%
+   \strut\hskip\getvalue{\??tt\currenttabulate\c!margin}%
    % neg values are ok !
    \hskip\tabulateindent % new august 2003
    \dodotabulaterule
@@ -1236,16 +1236,16 @@
 \chardef\tabulaterepeathead\zerocount
 
 \def\processtabulate[|#1|]% in the process of optimizing
-  {\tabulateunit\getvalue{\??tt\currenttabulate\c!eenheid}%
+  {\tabulateunit\getvalue{\??tt\currenttabulate\c!unit}%
    \checkfulltabulatecontent
    \globallet\tabulateruledepth \!!zeropoint
    \globallet\tabulateruleheight\!!zeropoint
    \ExpandFirstAfter\processaction % use \setalignmentswitch instead
-     [\getvalue{\??tt\currenttabulate\c!uitlijnen}]
-     [\v!normaal=>\def\@@tabulatealign{0},% = default value
-       \v!rechts=>\def\@@tabulatealign{1},% chardefs gebruiken
-        \v!links=>\def\@@tabulatealign{2},%
-       \v!midden=>\def\@@tabulatealign{3},%
+     [\getvalue{\??tt\currenttabulate\c!align}]
+     [\v!normal=>\def\@@tabulatealign{0},% = default value
+       \v!right=>\def\@@tabulatealign{1},% chardefs gebruiken
+        \v!left=>\def\@@tabulatealign{2},%
+       \v!middle=>\def\@@tabulatealign{3},%
       \s!default=>\def\@@tabulatealign{0},%
       \s!unknown=>\def\@@tabulatealign{0}]%
    \let\pretabskip\!!zeropoint
@@ -1260,9 +1260,9 @@
    \resettabulatepheight
    \ifinsidefloat \else
      \processaction
-       [\getvalue{\??tt\currenttabulate\c!hoofd}]
-       [\v!herhaal=>\chardef\tabulaterepeathead\plusone,
-          \v!tekst=>\chardef\tabulaterepeathead\plustwo]%
+       [\getvalue{\??tt\currenttabulate\c!header}]
+       [\v!repeat=>\chardef\tabulaterepeathead\plusone,
+          \v!text=>\chardef\tabulaterepeathead\plustwo]%
    \fi
    \unexpanded \def\NC{\tabulatenormalcolumn0}%
    \unexpanded \def\RC{\tabulatenormalcolumn1}%
@@ -1314,9 +1314,9 @@
    \global\let\flushtabulated\empty
    \let\savedbar|\let|\nexttabulate
    \tabskip\zeropoint
-   \ifdim\getvalue{\??tt\currenttabulate\c!marge}>\zeropoint
+   \ifdim\getvalue{\??tt\currenttabulate\c!margin}>\zeropoint
      \!!toksa{&\flushtabulateindent\strut##%
-               \tabskip\getvalue{\??tt\currenttabulate\c!marge}\strut
+               \tabskip\getvalue{\??tt\currenttabulate\c!margin}\strut
               &##\tabskip\zeropoint}%
    \else
      \!!toksa{&\flushtabulateindent\strut##%
@@ -1353,7 +1353,7 @@
       \global\let\tabulatehook\dotabulatehook}%
    \let|\savedbar
    \global\let\tabulatehook\dotabulatehook
-   \doifvalue{\??tt\currenttabulate\c!inspringen}\v!nee\forgetparindent
+   \doifvalue{\??tt\currenttabulate\c!indenting}\v!no\forgetparindent
    \ifinsidefloat
      \let\tabulateindent\!!zeropoint
    \else
@@ -1502,7 +1502,7 @@
       \TABLEautoline
       \TABLEnoalign
         {\dotabulatenobreak}}%
-   \doifelsevalue{\??tt\currenttabulate\c!lijn}\v!regel
+   \doifelsevalue{\??tt\currenttabulate\c!rule}\v!line
      {\let\HL              \HR
       \let\tabulateautoline\tabulateautorule
       \let\tabulateline    \tabulaterule}%
@@ -1515,7 +1515,7 @@
       \baselinecorrection}%
    \def\FL{\TABLEnoalign
      {\ifinsidefloat\else
-        \doifemptyvalue{\??tt\currenttabulate\c!voor} % no expansion
+        \doifemptyvalue{\??tt\currenttabulate\c!before} % no expansion
           {\tablebaselinecorrection}%
       \fi
       \dotabulaterule
@@ -1529,7 +1529,7 @@
       \ifnum\noftabulatelines>\plusone
         \ifnum\noftabulatelines<\minusnoftabulatelines
           \vskip\topskip\allowbreak\vskip-\topskip
-          \vskip-\getvalue{\??tt\currenttabulate\c!lijndikte}%
+          \vskip-\getvalue{\??tt\currenttabulate\c!rulethickness}%
           \dotabulaterule
         \fi
       \fi
@@ -1540,7 +1540,7 @@
       \dotabulatenobreak
       \dotabulaterule
       \ifinsidefloat\else
-        \doifemptyvalue{\??tt\currenttabulate\c!na} % no expansion
+        \doifemptyvalue{\??tt\currenttabulate\c!after} % no expansion
           {\vskip\strutdp
            \verticalstrut
            \vskip-\struttotal}%
@@ -1548,14 +1548,14 @@
    \chardef\tabulatepass\plustwo
    %
    \ifcase\tabulaterepeathead
-     \startframedcontent[\getvalue{\??tt\currenttabulate\c!kader}]%
+     \startframedcontent[\getvalue{\??tt\currenttabulate\c!frame}]%
    \else
      \setbox\tabulatebox\vbox \bgroup
    \fi
    %
    \@EA\halign\@EA{\the\!!toksa\crcr\fulltabulatecontent\crcr}%
    \prevdepth\strutdp % nog eens beter, temporary hack
-   \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
+   \doifvalue{\??tt\currenttabulate\c!distance}\v!grid
      {\vskip-\strutdp}% experimental tm-prikkels
    %
    \ifcase\tabulaterepeathead
@@ -1566,7 +1566,7 @@
    %
    \egroup
    \ifinsidefloat \else
-     \getvalue{\??tt\currenttabulate\c!na}%
+     \getvalue{\??tt\currenttabulate\c!after}%
    \fi
    \egroup}
 
@@ -1609,16 +1609,16 @@
           \advance\dimen0\dp0
           \advance\dimen0\ht0
           \ifdim\dimen0>\pagegoal
-            \bgroup \pagina \egroup % make sure that local vars are kept
+            \bgroup \page \egroup % make sure that local vars are kept
             \ifcase\tabulaterepeathead\or
               \unvcopy2
             \or
-              \hbox{\strut\getvalue{\??tt\currenttabulate\c!titel}}%
+              \hbox{\strut\getvalue{\??tt\currenttabulate\c!title}}%
             \fi
           \fi
         \fi
         % test this on icare checklists / quite hacky ! ! !
-        \ifdim\ht0>\getvalue{\??tt\currenttabulate\c!lijndikte}\else
+        \ifdim\ht0>\getvalue{\??tt\currenttabulate\c!rulethickness}\else
           \kern-2\ht0 % brrrr
         \fi
         %
@@ -1627,7 +1627,7 @@
         \ifvoid#1 \exitloop \fi}%
    \fi}
 
-%D \startypen
+%D \starttyping
 %D \setuptabulate[split=no,rule=line]
 %D
 %D \starttabulate
@@ -1638,7 +1638,7 @@
 %D \NC tufte \NC \input tufte \NC \NR \tabulateautorule
 %D \NC tufte \NC \input tufte \NC \NR \tabulateautorule
 %D \stoptabulate
-%D \stoptypen
+%D \stoptyping
 
 % \starttabulatie[|mc|]
 % \NC \digits{100.000,00} \NC\NR
@@ -1693,22 +1693,22 @@
    \fi\fi}
 
 \setuptabulate
-  [\c!eenheid=1em,
+  [\c!unit=1em,
    EQ={:},
-   \c!kader=\v!uit,
-   \c!korps=,
-   \c!lijn=\v!normaal,
-   \c!lijnkleur=,
-   \c!lijndikte=\linewidth,
-   \c!binnen=,
-   \c!voor=\blanko,
-   \c!na=\blanko,
-   \c!afstand={\v!diepte,\v!middel},
-   \c!uitlijnen=\v!normaal,
-   \c!marge=\!!zeropoint,
-   \c!splitsen=\v!ja,
-   \c!hoofd=\v!ja,
-   \c!titel=,
-   \c!inspringen=\v!nee]
-
-\protect \endinput
\ No newline at end of file
+   \c!frame=\v!off,
+   \c!bodyfont=,
+   \c!rule=\v!normal,
+   \c!rulecolor=,
+   \c!rulethickness=\linewidth,
+   \c!inner=,
+   \c!before=\blank,
+   \c!after=\blank,
+   \c!distance={\v!depth,\v!medium},
+   \c!align=\v!normal,
+   \c!margin=\!!zeropoint,
+   \c!split=\v!yes,
+   \c!header=\v!yes,
+   \c!title=,
+   \c!indenting=\v!no]
+
+\protect \endinput
diff --git a/tex/context/base/core-uti.tex b/tex/context/base/core-uti.tex
index c8859ac64..1437ec612 100644
--- a/tex/context/base/core-uti.tex
+++ b/tex/context/base/core-uti.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-uti,
+%D   [       filefile=core-uti,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Utility File Handling,
@@ -17,6 +17,7 @@
 
 % todo : safe lan etc too
 % todo : load all commands at once (tok)
+% todo : merge status info patch into tui file (language, encoding, etc),
 
 % Utility-file
 %
@@ -299,9 +300,9 @@
      \doifsomething{#3}
        {\showmessage\m!systems9{{#3}}%
         \ifvoorlopig
-          \blanko
+          \blank
           \type{[\currentmessagetext]}%
-          \blanko
+          \blank
         \fi}%
    \fi
    \disableinitializevariables
@@ -578,7 +579,7 @@
 % left over
 
 \def\plaatsvolledig#1#2#3#4%   kop, ref, tit, do
-  {#1[#2]{#3}#4\pagina[\v!ja]}
+  {#1[#2]{#3}#4\page[\v!yes]}
 
 % Experiment
 %
@@ -640,4 +641,4 @@
    \long\setvalue{\s!reset#1}{#2}%
    \long\setvalue{\s!set  #1}{#3}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex
index b398981c3..6819f5c2d 100644
--- a/tex/context/base/core-var.tex
+++ b/tex/context/base/core-var.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-var,
+%D   [       filefile=core-var,
 %D        version=1998.02.21,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Variables,
@@ -44,6 +44,8 @@
 \newevery \everybeginofpar         \relax
 \newevery \everyendofpar           \relax
 
+% \newevery \everyparflush           \relax % collected nodes
+
 %D Experimental (used in xml <p> .. </p>
 
 \def\bpar{\the\everybeginofpar\ignorespaces} % may interfere with \everypar
@@ -85,12 +87,13 @@
 %D We disable trial typesetting in the output routine,
 %D just to be sure.
 
-\prependtoks
-  \trialtypesettingfalse
-\to \everybeforepagebody
+\prependtoks \trialtypesettingfalse \to \everybeforepagebody
 
 %D \macros
 %D   {starttextdata}
+%D
+%D This is a user macro (appending to every last shipout is not
+%D really user friendly.
 
 \newtoks \collectedtextdata
 
@@ -98,10 +101,12 @@
   {\doglobal\appendtoks#1\to\collectedtextdata}
 
 \def\flushtextdata
-  {\vsmash{\the\collectedtextdata}%
+  {\vsmashed{\the\collectedtextdata}% all dimensions zero
    \global\collectedtextdata\emptytoks
    \globallet\flushtextdata\donothing}
 
+\prependtoks \flushtextdata \to \everylastshipout
+
 %D \macros
 %D   {ifprocessingXML}
 %D
@@ -176,12 +181,12 @@
 %D   {setvariables,getvariable,getvariabledefault}
 %D
 %D \starttyping
-%D \setvariables[xx][titel=]
-%D \setvariables[xx][titel=test test]
-%D \setvariables[xx][titel=test $x=1$ test]   % fatal error reported
-%D \setvariables[xx][titel=test {$x=1$} test]
-%D \setvariables[xx][titel]                   % fatal error reported
-%D \setvariables[xx][titel=e]
+%D \setvariables[xx][title=]
+%D \setvariables[xx][title=test test]
+%D \setvariables[xx][title=test $x=1$ test]   % fatal error reported
+%D \setvariables[xx][title=test {$x=1$} test]
+%D \setvariables[xx][title]                   % fatal error reported
+%D \setvariables[xx][titletitel=e]
 %D \stoptyping
 
 \def\??vars{@@vars}
@@ -272,10 +277,15 @@
 %D We store some original meanings, maybe in \type
 %D {math-ini}.
 
+\let\normalat             \at
 \let\normalin             \in
+\let\normalfrom           \from
 \let\normalover           \over
+\let\normalabout          \about
+
 \let\normalabove          \above
 \let\normalatop           \atop
+
 \let\normaloverwithdelims \overwithdelims
 \let\normalabovewithdelims\abovewithdelims
 \let\normalatopwithdelims \atopwithdelims
@@ -285,4 +295,4 @@
 \let\startlayoutcomponent\gobbletwoarguments
 \let\stoplayoutcomponent \relax
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex
index a3ea8d1ee..170cd23ad 100644
--- a/tex/context/base/core-ver.tex
+++ b/tex/context/base/core-ver.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-ver,
+%D   [       filefile=core-ver,
 %D        version=2000.05.09,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Verbatim,
@@ -133,40 +133,40 @@
    %
    \def\prettyidentifier{TEX}%
    %
-   \doifelsevalue{#1\c!tekst}\v!ja
+   \doifelsevalue{#1\c!text}\v!yes
      \naturaltextexttrue
      \naturaltextextfalse
-   \def\prettyidentifierfont{\getvalue{#1\c!icommando}}%
-   \def\prettyvariablefont  {\getvalue{#1\c!vcommando}}%
-   \def\prettynaturalfont   {\getvalue{#1\c!ccommando}}%
+   \def\prettyidentifierfont{\getvalue{#1\c!icommand}}%
+   \def\prettyvariablefont  {\getvalue{#1\c!vcommand}}%
+   \def\prettynaturalfont   {\getvalue{#1\c!ccommand}}%
    %
-   \doifvalue{#1\c!spatie}\v!aan{\def\obeyspaces{\setcontrolspaces}}%
-   %doifvalue{#1\c!tab}   \v!aan{\def\obeytabs  {\settabskips}}%
-   \doifnotvalue{#1\c!tab}\v!uit{\def\obeytabs  {\settabskips}}%
+   \doifvalue{#1\c!space}\v!on{\def\obeyspaces{\setcontrolspaces}}%
+   %doifvalue{#1\c!tab}   \v!on{\def\obeytabs  {\settabskips}}%
+   \doifnotvalue{#1\c!tab}\v!off{\def\obeytabs  {\settabskips}}%
    \doifvalue{#1\c!tab} \s!ascii{\chardef\tabskipmode\plustwo}% quit on >127
-   \doifvalue{#1\c!pagina}\v!nee{\def\obeypages {\ignorepages}}%
+   \doifvalue{#1\c!page}\v!no{\def\obeypages {\ignorepages}}%
    %
    \ignorehyphens % default
    \ExpandFirstAfter\processaction
-     [\getvalue{#1\c!regels}]
-     [        \v!ja=>\obeybreakpoints,
-      \v!afgebroken=>\obeyhyphens]%
+     [\getvalue{#1\c!lines}]
+     [        \v!yes=>\obeybreakpoints,
+      \v!hyphenated=>\obeyhyphens]%
    %
    \ExpandFirstAfter\processaction
-     [\getvalue{#1\c!optie}]
-     [     \v!geen=>\let\obeycharacters\relax,
-          \v!kleur=>\setupprettiesintype{TEX}%
+     [\getvalue{#1\c!option}]
+     [     \v!none=>\let\obeycharacters\relax,
+          \v!color=>\setupprettiesintype{TEX}%
                     \let\obeycharacters\setupprettytype
                     \let\obeytabs\ignoretabs,
-        \v!normaal=>\let\obeycharacters\setupgroupedtype,
-      \v!commandos=>\def\obeycharacters{\setupcommandsintype{#1}}%
+        \v!normal=>\let\obeycharacters\setupgroupedtype,
+      \v!commands=>\def\obeycharacters{\setupcommandsintype{#1}}%
                     \let\obeytabs\ignoretabs,
-         \v!schuin=>\let\obeycharacters\setupslantedtype
+         \v!slanted=>\let\obeycharacters\setupslantedtype
                     \let\obeytabs\ignoretabs,
-        \s!unknown=>\setupprettiesintype{\getvalue{#1\c!optie}}%
+        \s!unknown=>\setupprettiesintype{\getvalue{#1\c!option}}%
                     \let\obeycharacters\setupprettytype
                     \let\obeytabs\ignoretabs]%
-   \def\verbatimfont{\getvalue{#1\c!letter}}%
+   \def\verbatimfont{\getvalue{#1\c!style}}%
    \setupverbatimcolor{#1}}
 
 %D The verbatim commands have a rather long and turbulent
@@ -185,7 +185,7 @@
 %D Typesetting inline verbatim can be accomplished by
 %D \type{\type}, which in this sentence was typeset by saying
 %D just \type{\type{\type}}, which in turn was typeset by
-%D \onbekend. Using the normal grouping characters \type{{}} is
+%D \unknown. Using the normal grouping characters \type{{}} is
 %D the most natural way of using this command.
 %D
 %D A second, more or less redundant, alternative is delimiting
@@ -318,7 +318,7 @@
   {\ifx\next\bgroup
      \@EA\dodotypeA
    \else\if\next<%
-     \doifelsevalue{\??ty\@@currenttype\c!optie}\v!geen
+     \doifelsevalue{\??ty\@@currenttype\c!option}\v!none
        {\@EAEAEA\dodotypeB}{\@EAEAEA\dodotypeC}%
    \else
      \@EAEAEA\dodotypeD
@@ -364,7 +364,7 @@
 %D because we think it's shows a bit better what we are
 %D doing.
 %D
-%D \starttypen
+%D \starttyping
 %D \bgroup
 %D \catcode`\<=\@@active
 %D \catcode`\>=\@@active
@@ -390,7 +390,7 @@
 %D          \next}%
 %D       \futurelet\next\do}}
 %D \egroup
-%D \stoptypen
+%D \stoptyping
 %D
 %D The final implementation looks a bit further and treats the
 %D lone \type{<<} and \type{>>} a bit different. The \type
@@ -548,13 +548,13 @@
 %D The setups for inline verbatim default to:
 
 \setuptype
-  [\c!spatie=\v!uit,
-    \c!kleur=,
-   \c!letter=\tt\tf, % \tttf gives problems with {\tx \type...}
-   \c!pagina=\v!nee,
-      \c!tab=\v!nee,
+  [\c!space=\v!off,
+    \c!color=,
+   \c!style=\tt\tf, % \tttf gives problems with {\tx \type...}
+   \c!page=\v!no,
+      \c!tab=\v!no,
     \c!palet=colorpretty,
-    \c!optie=\v!normaal]
+    \c!option=\v!normal]
 
 %D \macros
 %D   {typ,obeyhyphens,obeybreakpoints}
@@ -605,7 +605,7 @@
 
 \unexpanded\def\typ
   {\bgroup
-   \let\@@tyregels\v!afgebroken
+   \let\@@tylines\v!hyphenated
    \futurelet\next\dodotype}
 
 %D \macros
@@ -622,7 +622,7 @@
 %D The next implementation is more clear but less versatile,
 %D so we treated it for a beter one.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dospecialtype#1#2%
 %D   {\bgroup
 %D    \initializetype
@@ -640,12 +640,12 @@
 %D \unexpanded\def\arg{\dospecialtype\leftargument\rightargument}
 %D \unexpanded\def\mat{\dospecialtype\$\$}
 %D \unexpanded\def\dis{\dospecialtype{\$\$}{\$\$}}
-%D \stoptypen
+%D \stoptyping
 %D
 %  %D For sometime we used the better but less readable is
 %  %D alternative
 %  %D
-%  %D \starttypen
+%  %D \starttyping
 %  %D \def\doprocessgroup#1#2#3%
 %  %D   {\bgroup
 %  %D    #1%
@@ -666,7 +666,7 @@
 %  %D \unexpanded\def\arg{\doprocessgroup\setgroupedtype\leftargument\rightargument}
 %  %D \unexpanded\def\mat{\doprocessgroup\setgroupedtype\$\$}
 %  %D \unexpanded\def\dis{\doprocessgroup\setgroupedtype{\$\$}{\$\$}}
-%  %D \stoptypen
+%  %D \stoptyping
 %  %D
 %D
 %D But since \type{\groupedcommand} became available, we use
@@ -693,35 +693,35 @@
 
 \def\initializetyping#1%
   {%\donefalse
-   \switchtobodyfont[\getvalue{\??tp#1\c!korps}]%
+   \switchtobodyfont[\getvalue{\??tp#1\c!bodyfont}]%
    \donefalse
-   \scratchskip\getvalue{\??tp#1\c!onevenmarge}\relax
+   \scratchskip\getvalue{\??tp#1\c!oddmargin}\relax
    \ifzeropt\scratchskip\else\donetrue\fi
-   \scratchskip\getvalue{\??tp#1\c!evenmarge}\relax
+   \scratchskip\getvalue{\??tp#1\c!evenmargin}\relax
    \ifzeropt\scratchskip\else\donetrue\fi
    \ifdone
      \def\doopenupverbatimline
        {\getpagestatus
         \ifrightpage
-          \hskip\getvalue{\??tp#1\c!onevenmarge}\relax
+          \hskip\getvalue{\??tp#1\c!oddmargin}\relax
         \else
-          \hskip\getvalue{\??tp#1\c!evenmarge}\relax
+          \hskip\getvalue{\??tp#1\c!evenmargin}\relax
         \fi}%
    \else
-     \doadaptleftskip{\getvalue{\??tp#1\c!marge}}%
+     \doadaptleftskip{\getvalue{\??tp#1\c!margin}}%
    \fi
-   \doifdefinedelse{\??bo\getvalue{\??tp#1\c!blanko}}
-     {\edef\!!stringa{\csname\??bo\csname\??tp#1\c!blanko\endcsname\endcsname}}
-     {\edef\!!stringa{\csname\??tp#1\c!blanko\endcsname}}%
+   \doifdefinedelse{\??bo\getvalue{\??tp#1\c!blank}}
+     {\edef\!!stringa{\csname\??bo\csname\??tp#1\c!blank\endcsname\endcsname}}
+     {\edef\!!stringa{\csname\??tp#1\c!blank\endcsname}}%
    \processaction
      [\!!stringa]
-     [\v!standaard=>\scratchskip\tussenwit,
-          \v!klein=>\scratchskip\blankokleinmaat,
-         \v!middel=>\scratchskip\blankomiddelmaat,
-          \v!groot=>\scratchskip\blankogrootmaat,
-     \v!halveregel=>\scratchskip.5\baselineskip,
-          \v!regel=>\scratchskip\baselineskip,
-           \v!geen=>\scratchskip\zeropoint,
+     [\v!standard=>\scratchskip\ctxparskip,
+          \v!small=>\scratchskip\blankokleinmaat,
+         \v!medium=>\scratchskip\blankomiddelmaat,
+          \v!big=>\scratchskip\blankogrootmaat,
+     \v!halfline=>\scratchskip.5\baselineskip,
+          \v!line=>\scratchskip\baselineskip,
+           \v!none=>\scratchskip\zeropoint,
         \s!unknown=>\scratchskip\commalistelement]%
    \ifgridsnapping
      \ifdim\scratchskip=.5\baselineskip\relax
@@ -739,16 +739,16 @@
 %D more general mechanism.
 
 \def\dostarttyping#1%
-  {\getvalue{\??tp#1\c!voor}%
-   \startopelkaar % includes \bgroup
+  {\getvalue{\??tp#1\c!before}%
+   \startpacked % includes \bgroup
    \initializetyping{#1}%
    \startverbatimcolor
    \expandafter\processdisplayverbatim\expandafter{\s!stop#1}}
 
 \def\dostoptyping#1%
   {\stopverbatimcolor
-   \stopopelkaar  % includes \egroup
-   \getvalue{\??tp#1\c!na}%
+   \stoppacked  % includes \egroup
+   \getvalue{\??tp#1\c!after}%
    \dochecknextindentation{\??tp#1}}
 
 %D \macros
@@ -789,28 +789,28 @@
 %D alternative escape character.
 
 \setuptyping
-  [          \c!voor=\blanko,
-               \c!na=\blanko,
-            \c!korps=,
-            \c!kleur=,
-           \c!spatie=\v!uit,
-           \c!pagina=\v!nee,
+  [          \c!before=\blank,
+               \c!after=\blank,
+            \c!bodyfont=,
+            \c!color=,
+           \c!space=\v!off,
+           \c!page=\v!no,
               \c!tab=\s!ascii,
-            \c!optie=\v!geen,
+            \c!option=\v!none,
             \c!palet=colorpretty,
-            \c!tekst=\v!nee,
-           \c!letter=\tttf,
-        \c!icommando=\ttsl,
-        \c!vcommando=,
-        \c!ccommando=\tttf,
- \c!springvolgendein=\v!ja,
-            \c!marge=\!!zeropoint,
-        \c!evenmarge=\!!zeropoint,
-      \c!onevenmarge=\!!zeropoint,
-           \c!blanko=\v!regel,
+            \c!text=\v!no,
+           \c!style=\tttf,
+        \c!icommand=\ttsl,
+        \c!vcommand=,
+        \c!ccommand=\tttf,
+ \c!indentnext=\v!yes,
+            \c!margin=\!!zeropoint,
+        \c!evenmargin=\!!zeropoint,
+      \c!oddmargin=\!!zeropoint,
+           \c!blank=\v!line,
            \c!escape=/, % beware \string\ , should also be accepted
-           \c!nummeren=\v!nee,
-           \c!regels=]
+           \c!numbering=\v!no,
+           \c!lines=]
 
 %D \macros
 %D   {definetype}
@@ -825,7 +825,7 @@
   {\unexpanded\setvalue{#1}{\dotype{#1}}%
    \copyparameters
      [\??ty#1][\??ty]
-     [\c!spatie,\c!palet,\c!kleur,\c!letter,\c!pagina,\c!tab,\c!optie]%
+     [\c!space,\c!palet,\c!color,\c!style,\c!page,\c!tab,\c!option]%
    \getparameters[\??ty#1][#2]}
 
 %D \macros
@@ -835,23 +835,23 @@
 %D will suffice, but for documentation purposes the next
 %D definition command can be of use:
 %D
-%D \starttypen
+%D \starttyping
 %D \definetyping[extratyping][margin=3em]
 %D
 %D \startextratyping
 %D these extra ones are indented by 1 em
 %D \stopextratyping
-%D \stoptypen
+%D \stoptyping
 %D
 %D The definitions default to the standard typing values.
 
 \def\presettyping[#1][#2]%
   {\copyparameters
      [\??tp#1][\??tp]
-     [\c!voor,\c!na,\c!spatie,\c!pagina,\c!tab,\c!kleur,\c!letter,
-      \c!tekst,\c!icommando,\c!vcommando,\c!ccommando,\c!korps,
-      \c!optie,\c!palet,\c!marge,\c!evenmarge,\c!onevenmarge,
-      \c!springvolgendein,\c!blanko,\c!escape,\c!regels,\c!nummeren]%
+     [\c!before,\c!after,\c!space,\c!page,\c!tab,\c!color,\c!style,
+      \c!text,\c!icommand,\c!vcommand,\c!ccommand,\c!bodyfont,
+      \c!option,\c!palet,\c!margin,\c!evenmargin,\c!oddmargin,
+      \c!indentnext,\c!blank,\c!escape,\c!lines,\c!numbering]%
    \getparameters
      [\??tp#1]
      [#2]}
@@ -864,23 +864,23 @@
 \def\definetyping
   {\dodoubleempty\dodefinetyping}
 
-\definetyping[\v!typen]
-
-\definetyping[RAW]   [\c!optie=RAW]
-\definetyping[MP]    [\c!optie=MP]
-\definetyping[PL]    [\c!optie=PL]
-\definetyping[PM]    [\c!optie=PL]
-\definetyping[JS]    [\c!optie=JS]
-\definetyping[JV]    [\c!optie=JV]
-\definetyping[SQL]   [\c!optie=SQL]
-\definetyping[TEX]   [\c!optie=TEX]
-\definetyping[PAS]   [\c!optie=PAS]
-\definetyping[PASCAL][\c!optie=PAS]
-\definetyping[MOD]   [\c!optie=PAS]
-\definetyping[MODULA][\c!optie=PAS]
-\definetyping[DELPHI][\c!optie=PAS]
-\definetyping[EIFFEL][\c!optie=EIF]
-\definetyping[XML]   [\c!optie=XML]
+\definetyping[\v!typing]
+
+\definetyping[RAW]   [\c!option=RAW]
+\definetyping[MP]    [\c!option=MP]
+\definetyping[PL]    [\c!option=PL]
+\definetyping[PM]    [\c!option=PL]
+\definetyping[JS]    [\c!option=JS]
+\definetyping[JV]    [\c!option=JV]
+\definetyping[SQL]   [\c!option=SQL]
+\definetyping[TEX]   [\c!option=TEX]
+\definetyping[PAS]   [\c!option=PAS]
+\definetyping[PASCAL][\c!option=PAS]
+\definetyping[MOD]   [\c!option=PAS]
+\definetyping[MODULA][\c!option=PAS]
+\definetyping[DELPHI][\c!option=PAS]
+\definetyping[EIFFEL][\c!option=EIF]
+\definetyping[XML]   [\c!option=XML]
 
 %D We use the \CONTEXT\ color system for switching to and from
 %D color mode. We can always redefine these colors afterwards.
@@ -938,18 +938,18 @@
 %D the standard color switching ones and work ok on a line by
 %D line basis.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\setupverbatimcolor#1%
 %D   {\edef\prettypalet{\prettyidentifier\getvalue{#1\c!palet}}%
 %D    \def\beginofpretty[##1]{\startcolormode{\prettypalet:##1}}%
 %D    \def\endofpretty       {\stopcolormode}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Since we support a global color too, the folowing
 %D definition is better:
 
 \def\setupverbatimcolor#1% fast and local versus slow and global
-  {\doifelsevaluenothing{#1\c!kleur}
+  {\doifelsevaluenothing{#1\c!color}
      {\def\beginofpretty[##1]{\startcolormode{\prettypalet:##1}}%
       \let\endofpretty        \restorecolormode % \stopcolormode
       \let\startverbatimcolor \relax
@@ -957,9 +957,9 @@
       \let\verbatimcolor      \relax}
      {\def\beginofpretty[##1]{\startcolor[\prettypalet:##1]}%
       \let\endofpretty        \stopcolor
-      \def\startverbatimcolor{\startcolor[\getvalue{#1\c!kleur}]}%
+      \def\startverbatimcolor{\startcolor[\getvalue{#1\c!color}]}%
       \let\stopverbatimcolor  \stopcolor
-      \def\verbatimcolor     {\getvalue{\getvalue{#1\c!kleur}}}}%
+      \def\verbatimcolor     {\getvalue{\getvalue{#1\c!color}}}}%
    \doifelsevaluenothing{#1\c!palet}
      {\let\prettypalet\empty
       \let\endofpretty\relax
@@ -985,7 +985,7 @@
 %D
 %D This gives, as can be expected:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D When we want to see some typeset \TEX\ too, we can say:
 %D
@@ -1000,7 +1000,7 @@
 %D
 %D or:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D In a similar way:
 %D
@@ -1016,7 +1016,7 @@
 %D
 %D gives:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The next examples sow how we can directly call for natural
 %D \TEX\ comments:
@@ -1024,7 +1024,7 @@
 %D \startbuffer
 %D \setuptyping
 %D   [TEX]
-%D   [tekst=ja]
+%D   [text=yes]
 %D
 %D \startTEX
 %D \def\mathematics#1%         % usage: \type {\mathematics{x^2}}
@@ -1033,7 +1033,7 @@
 %D
 %D \setuptyping
 %D   [SQL]
-%D   [tekst=ja,palet=,icommando=\bf,vcommando=,ccommando=\it]
+%D   [text=yes,palet=,icommand=\bf,vcommand=,ccommand=\it]
 %D
 %D \startSQL
 %D select *       -- indeed, here we {\em do} select
@@ -1043,7 +1043,7 @@
 %D
 %D \setuptyping
 %D   [SQL]
-%D   [ccommando=\tf\underbar]
+%D   [ccommand=\tf\underbar]
 %D
 %D \startSQL
 %D select *       -- indeed, here we {\em do} select
@@ -1056,7 +1056,7 @@
 %D
 %D Now watch:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The natural \TEX\ typesetting was introduced when Tobias
 %D and Berend started using verbatim \JAVASCRIPT\ and \SQL.
@@ -1108,86 +1108,86 @@
    \fi\fi}
 
 \unprotected \def\dosetuptypelinenumbering#1#2%
-  {\doifundefined{\??tp#1\c!start}{\setuptyping[#1][\c!start=1,\c!stop=,\c!stap=1,\c!nregels=,#2]}%
-   \doifelsevalue{\??tp#1\c!nummeren}\v!file
-     {\stelregelnummerenin[\c!methode=\v!file]%
+  {\doifundefined{\??tp#1\c!start}{\setuptyping[#1][\c!start=1,\c!stop=,\c!step=1,\c!nlines=,#2]}%
+   \doifelsevalue{\??tp#1\c!numbering}\v!file
+     {\setuplinenumbering[\c!method=\v!file]%
       \donetrue}
-     {\doifelsevalue{\??tp#1\c!nummeren}\v!regel
-        {% \stelregelnummerenin defaults start/step to 1/1, so we need
+     {\doifelsevalue{\??tp#1\c!numbering}\v!line
+        {% \setuplinenumbering defaults start/step to 1/1, so we need
          \doifvaluenothing{\??tp#1\c!start}{\setvalue{\??tp#1\c!start}{1}}%
-         \doifvaluenothing{\??tp#1\c!stap }{\setvalue{\??tp#1\c!stap }{1}}%
-         \stelregelnummerenin
-           [\c!methode=\v!type,
+         \doifvaluenothing{\??tp#1\c!step }{\setvalue{\??tp#1\c!step }{1}}%
+         \setuplinenumbering
+           [\c!method=\v!type,
             \c!start=\getvalue{\??tp#1\c!start},
-            \c!stap=\getvalue{\??tp#1\c!stap}]%
+            \c!step=\getvalue{\??tp#1\c!step}]%
          \donetrue}
         {\donefalse}}%
    \ifdone
-     \def\beginofverbatimlines{\startregelnummeren}%
-     \def\endofverbatimlines  {\stopregelnummeren }%
+     \def\beginofverbatimlines{\startlinenumbering}%
+     \def\endofverbatimlines  {\stoplinenumbering }%
    \fi}
 
 \setuptyping
   [\v!file]
   [\c!start=1,
    \c!stop=,
-   \c!stap=1,
-   \c!nregels=]
+   \c!step=1,
+   \c!nlines=]
 
 \def\dodotypefile[#1][#2]#3%
-  {\getvalue{\??tp#1\c!voor}%
+  {\getvalue{\??tp#1\c!before}%
    \doiflocfileelse{#3}
-     {\startopelkaar % includes \bgroup
+     {\startpacked % includes \bgroup
       \dosetuptypelinenumbering{#1}{#2}%
-      \doifinset{\getvalue{\??tp#1\c!optie}}{\v!commandos,\v!schuin,\v!normaal}
-        {\setuptyping[#1][\c!optie=\v!geen]}%
-      \doifvalue{\??tp#1\c!optie}\v!kleur
+      \doifinset{\getvalue{\??tp#1\c!option}}{\v!commands,\v!slanted,\v!normal}
+        {\setuptyping[#1][\c!option=\v!none]}%
+      \doifvalue{\??tp#1\c!option}\v!color
         {\expandafter\aftersplitstring#3\at.\to\prettyidentifier
-         \letvalue{\??tp#1\c!optie}\prettyidentifier}%
+         \letvalue{\??tp#1\c!option}\prettyidentifier}%
       \initializetyping{#1}%
       \startverbatimcolor
       \makelocreadfilename{#3}%
-      \doifundefinedelse{\??tp#3\v!globaal\c!start}
+      \doifundefinedelse{\??tp#3\v!global\c!start}
         {\scratchcounter\zerocount}
-        {\scratchcounter\getvalue{\??tp#3\v!globaal\c!start}}%
+        {\scratchcounter\getvalue{\??tp#3\v!global\c!start}}%
       \advance\scratchcounter\plusone
-      \setxvalue{\??tp#3\v!globaal\c!start}{\the\scratchcounter}%
+      \setxvalue{\??tp#3\v!global\c!start}{\the\scratchcounter}%
       \doifelsevaluenothing{\??tp#1\c!start}
         {\processfileverbatim\readfilename}
-        {\doifvalue{\??tp#1\c!start}\v!verder
+        {\doifvalue{\??tp#1\c!start}\v!continue
            {\setevalue{\??tp#1\c!start}%
-              {\getvalue{\??tp#3\v!globaal\c!start}}}%
+              {\getvalue{\??tp#3\v!global\c!start}}}%
          \doifelsevaluenothing{\??tp#1\c!stop}
-           {\doifelsevaluenothing{\??tp#1\c!nregels}
+           {\doifelsevaluenothing{\??tp#1\c!nlines}
               {\processfileverbatim\readfilename}
               {\scratchcounter\getvalue{\??tp#1\c!start}%
-               \advance\scratchcounter\getvalue{\??tp#1\c!nregels}%
+               \advance\scratchcounter\getvalue{\??tp#1\c!nlines}%
                \advance\scratchcounter\minusone
-               \setxvalue{\??tp#3\v!globaal\c!start}%
+               \setxvalue{\??tp#3\v!global\c!start}%
                  {\the\scratchcounter}%
                \processfilelinesverbatim\readfilename
                  {\getvalue{\??tp#1\c!start}}
-                 {\getvalue{\??tp#3\v!globaal\c!start}}}}%
+                 {\getvalue{\??tp#3\v!global\c!start}}}}%
            {\processfilelinesverbatim\readfilename
               {\getvalue{\??tp#1\c!start}}
               {\getvalue{\??tp#1\c!stop }}}}%
       \stopverbatimcolor
-      \stopopelkaar}  % includes \egroup
+      \stoppacked}  % includes \egroup
      {\bgroup
       \expanded{\convertargument#3}\to\ascii
       \tttf[\makemessage\m!verbatims1\ascii]%
       \showmessage\m!verbatims1\ascii
       \egroup}%
-   \getvalue{\??tp#1\c!na}}
+   \getvalue{\??tp#1\c!after}}
 
 %D \macros
 %D   {filename}
 %D
 %D Typesetting filenames in monospaced fonts is possible with
 %D
-%D \starttypen
+%D \starttyping
 %D \filename{here/there/filename.suffix}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The definition is not that spectacular.
 
@@ -1202,4 +1202,4 @@
 
 \def\verbatim#1{\convertargument#1\to\ascii\ascii}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/core-vis.tex b/tex/context/base/core-vis.tex
index c4121b934..1c5335d31 100644
--- a/tex/context/base/core-vis.tex
+++ b/tex/context/base/core-vis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=core-vis,
+%D   [       filefile=core-vis,
 %D        version=1996.06.01,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Visualization,
@@ -178,11 +178,11 @@
 %D \voorbeeld \noindent
 %D \voorbeeld \leavevmode
 %D
-%D \startsmaller
+%D \startnarrower
 %D \voorbeeld \indent
 %D \voorbeeld \noindent
 %D \voorbeeld \leavevmode
-%D \stopsmaller
+%D \stopnarrower
 %D \egroup
 %D
 %D These examples also demonstrate the visualization of
@@ -260,9 +260,9 @@
 %D
 %D This marked \type{\vbox} shows up as:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D The alternative macros are used as:
 %D
@@ -274,9 +274,9 @@
 %D
 %D This is typeset as:
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D By setting the next macros one can influence the length of
 %D the marks as well as the horizontal and vertical divisions.
@@ -479,9 +479,9 @@
 %D This macro is used in the pagebody routine. No other use
 %D is advocated here.
 %D
-%D \starttypen
+%D \starttyping
 %D \colormarkbox0
-%D \stoptypen
+%D \stoptyping
 
 \def\colormarkoffset{\cutmarkoffset}
 \def\colormarklength{\cutmarklength}
@@ -658,10 +658,10 @@
 %D especially \type {\write} is often used in conjunction with
 %D \type {\edef}, we can only savely support that one in \ETEX.
 %D
-%D \bgroup \showwhatsits \stelkleurenin[status=start]
+%D \bgroup \showwhatsits \setupcolors[state=start]
 %D
 %D Whatsits show up \color[blue]{in color} and are
-%D characterized bij their first character.\voetnoot [some note]
+%D characterized bij their first character.\footnote [some note]
 %D {So we may encounter \type {w}, \type {m} and \type{s}.}
 %D They are \writestatus{dummy}{demo}\color[yellow]{stacked}.
 %D
@@ -802,7 +802,7 @@
           \startoverlay
             {\copy\scratchbox}
             {\dodotagbox{#1}\scratchbox{\framed
-               [\c!achtergrond=\v!raster,\c!achtergrondraster=1]{#2}}}
+               [\c!background=\v!screen,\c!backgroundscreen=1]{#2}}}
           \stopoverlay
         \egroup
       \nextboxwd\the\wd\scratchbox
@@ -827,9 +827,9 @@
 
 \def\coloredbox#1%
   {\dowithnextbox{#1{\hbox
-     {\blackrule[\c!breedte=\nextboxwd,\c!hoogte=\nextboxht,\c!diepte=\zeropoint,\c!kleur=boxcolor:ht]%
+     {\blackrule[\c!width=\nextboxwd,\c!height=\nextboxht,\c!depth=\zeropoint,\c!color=boxcolor:ht]%
       \hskip-\nextboxwd
-      \blackrule[\c!breedte=\nextboxwd,\c!hoogte=\zeropoint,\c!diepte=\nextboxdp,\c!kleur=boxcolor:dp]%
+      \blackrule[\c!width=\nextboxwd,\c!height=\zeropoint,\c!depth=\nextboxdp,\c!color=boxcolor:dp]%
       \hskip-\nextboxwd
       \box\nextbox}}}#1}
 
@@ -840,4 +840,4 @@
 \def\coloredstrut
   {\color[strutcolor]{\def\strutwidth{2\points}\setstrut\strut}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/enco-acc.tex b/tex/context/base/enco-acc.tex
index 1082b4501..d430cbae0 100644
--- a/tex/context/base/enco-acc.tex
+++ b/tex/context/base/enco-acc.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-acc,
+%D   [     filefile=enco-acc,
 %D      version=2000.20.12, % split from base file
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Composed Characters Commands,
@@ -130,4 +130,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/enco-ans.tex b/tex/context/base/enco-ans.tex
index a4d255202..b49a79984 100644
--- a/tex/context/base/enco-ans.tex
+++ b/tex/context/base/enco-ans.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-ans,
+%D   [     filefile=enco-ans,
 %D      version=2000.05.07, % 1995.01.01,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=\YandY\ texnansi Encoding,
diff --git a/tex/context/base/enco-cas.tex b/tex/context/base/enco-cas.tex
index 7629a4b38..1850975a5 100644
--- a/tex/context/base/enco-cas.tex
+++ b/tex/context/base/enco-cas.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-cas,
+%D   [     filefile=enco-cas,
 %D      version=2000.20.12, 
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Named Glyph Case Mapping,
diff --git a/tex/context/base/enco-chi.tex b/tex/context/base/enco-chi.tex
index 5addd57e9..eae8e8c44 100644
--- a/tex/context/base/enco-chi.tex
+++ b/tex/context/base/enco-chi.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-chi,
+%D   [     filefile=enco-chi,
 %D      version=1999.12.02,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Traditional and Simplified Chinese,
diff --git a/tex/context/base/enco-com.tex b/tex/context/base/enco-com.tex
index 42d0d4774..c898301c6 100644
--- a/tex/context/base/enco-com.tex
+++ b/tex/context/base/enco-com.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-com,
+%D   [     filefile=enco-com,
 %D      version=2000.20.12, % split from base file 
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Composed Characters Commands,
diff --git a/tex/context/base/enco-cyr.tex b/tex/context/base/enco-cyr.tex
index 8a91f0380..995e8fde8 100644
--- a/tex/context/base/enco-cyr.tex
+++ b/tex/context/base/enco-cyr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-cyr,
+%D   [       filefile=enco-cyr,
 %D        version=2003.01.24,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Cyrillic,
@@ -240,14 +240,14 @@
 \definecharacter sectionmark               159
 
 \definecharacter quotedbl                   34
-\definecharacter quoteleft                  96 
+\definecharacter quoteleft                  96
 \definecharacter upperleftsingleninequote   39
-\definecharacter quotedblleft               16 
-\definecharacter quotedblright              17 
+\definecharacter quotedblleft               16
+\definecharacter quotedblright              17
 \definecharacter lowerleftdoubleninequote  189
-\definecharacter upperrightdoublesixquote   16 
-\definecharacter upperrightdoubleninequote  17 
-\definecharacter quotedblbase              189 
+\definecharacter upperrightdoublesixquote   16
+\definecharacter upperrightdoubleninequote  17
+\definecharacter quotedblbase              189
 
 \definecharacter cyrillicpalochka           13
 \definecharacter cyrilliclangle             14
@@ -633,7 +633,7 @@
 \definecharacter textogonek                 12
 
 \definecharacter textcyrillicflex           18
-\definecharacter textdblgrave               19 
+\definecharacter textdblgrave               19
 \definecharacter textcyrillicbreve          20
 
 \definecharacter endash                     21
@@ -648,16 +648,16 @@
 \definecharacter textasciitilde            126
 \definecharacter textnumero                157
 \definecharacter textcurrency              158
-\definecharacter sectionmark               159 
-\definecharacter quotedbl                   34 
-\definecharacter quoteleft                  96 
+\definecharacter sectionmark               159
+\definecharacter quotedbl                   34
+\definecharacter quoteleft                  96
 \definecharacter upperleftsingleninequote   39
-\definecharacter quotedblleft               16 
-\definecharacter quotedblright              17 
+\definecharacter quotedblleft               16
+\definecharacter quotedblright              17
 \definecharacter lowerleftdoubleninequote  189
-\definecharacter upperrightdoublesixquote   16 
-\definecharacter upperrightdoubleninequote  17 
-\definecharacter quotedblbase              189 
+\definecharacter upperrightdoublesixquote   16
+\definecharacter upperrightdoubleninequote  17
+\definecharacter quotedblbase              189
 
 \definecharacter cyrillicpalochka           13
 \definecharacter cyrilliclangle             14
@@ -823,19 +823,19 @@
 
 \startcoding[x2]
 
-\definecharacter textgrave                    0 
-\definecharacter textacute                    1 
-\definecharacter textcircumflex               2 
-\definecharacter texttilde                    3 
-\definecharacter textdiaeresis                4 
-\definecharacter texthungarumlaut             5 
-\definecharacter textring                     6 
-\definecharacter textcaron                    7 
-\definecharacter textbreve                    8 
-\definecharacter textmacron                   9 
-\definecharacter textdotaccent               10 
-\definecharacter textcedilla                 11 
-\definecharacter textogonek                  12 
+\definecharacter textgrave                    0
+\definecharacter textacute                    1
+\definecharacter textcircumflex               2
+\definecharacter texttilde                    3
+\definecharacter textdiaeresis                4
+\definecharacter texthungarumlaut             5
+\definecharacter textring                     6
+\definecharacter textcaron                    7
+\definecharacter textbreve                    8
+\definecharacter textmacron                   9
+\definecharacter textdotaccent               10
+\definecharacter textcedilla                 11
+\definecharacter textogonek                  12
 
 \definecharacter endash                      21
 \definecharacter emdash                      22
@@ -855,7 +855,7 @@
 \definecharacter textnumero                 157
 \definecharacter textcurrency               158
 \definecharacter textsection                159
-\definecharacter sectionmark                159  
+\definecharacter sectionmark                159
 \definecharacter textquotedbl                34
 
 \definecharacter cyrillicpalochka            13
@@ -867,13 +867,13 @@
 
 \definecharacter upperleftsinglesixquote     96
 \definecharacter upperleftsingleninequote    39
-\definecharacter upperleftdoublesixquote     16 
+\definecharacter upperleftdoublesixquote     16
 \definecharacter upperleftdoubleninequote    17
 \definecharacter lowerleftdoubleninequote   189
 
 \definecharacter upperrightsinglesixquote    96
 \definecharacter upperrightsingleninequote   39
-\definecharacter upperrightdoublesixquote    16 
+\definecharacter upperrightdoublesixquote    16
 \definecharacter upperrightdoubleninequote   17
 \definecharacter lowerrightdoubleninequote  189
 
@@ -1163,7 +1163,7 @@
 \definecharacter textnumero               252
 \definecharacter leftguillemot            253
 \definecharacter rightguillemot           254
-\definecharacter quotedblbase             255 
+\definecharacter quotedblbase             255
 
 \stopcoding
 
diff --git a/tex/context/base/enco-def.tex b/tex/context/base/enco-def.tex
index a0d56c674..1f4bc8ce7 100644
--- a/tex/context/base/enco-def.tex
+++ b/tex/context/base/enco-def.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-def,
+%D   [     filefile=enco-def,
 %D      version=2000.05.07, % 2000.20.12, % split from less verbose base file
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Default Character Definitions,
@@ -458,4 +458,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/enco-ec.tex b/tex/context/base/enco-ec.tex
index a31fb6fe1..bb7e130f1 100644
--- a/tex/context/base/enco-ec.tex
+++ b/tex/context/base/enco-ec.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-ec,
+%D   [     filefile=enco-ec,
 %D      version=2000.05.07, % 1999.16.07,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=\LATEX\ EC Encoding,
@@ -45,19 +45,19 @@
 %D that is, they are normally not part of fonts, unless
 %D explicitly constructed.
 %D
-%D \startopsomming[columns,two]
-%D \som \type{\dotlessj}
-%D \som \type{\IJligature}
-%D \som \type{\ijligature}
-%D \som \type{\Ssharp}
-%D \som \type{\perthousand}
-%D \som \type{\compoundwordmark}
-% %D \som \type{\textvisiblespace}
-% %D \som \type{\tcaron}
-% %D \som \type{\tcedilla }
-% %D \som \type{\Tcedilla}
-% %D \som \type{\ydiaeresis}
-%D \stopopsomming
+%D \startitemize[columns,two]
+%D \item \type{\dotlessj}
+%D \item \type{\IJligature}
+%D \item \type{\ijligature}
+%D \item \type{\Ssharp}
+%D \item \type{\perthousand}
+%D \item \type{\compoundwordmark}
+% %D \item \type{\textvisiblespace}
+% %D \item \type{\tcaron}
+% %D \item \type{\tcedilla }
+% %D \item \type{\Tcedilla}
+% %D \item \type{\ydiaeresis}
+%D \stopitemize
 
 %D So, for the moment we nil them; we can always create
 %D another vector if needed.
diff --git a/tex/context/base/enco-ecm.tex b/tex/context/base/enco-ecm.tex
index 5fbbe1c8c..d3831567e 100644
--- a/tex/context/base/enco-ecm.tex
+++ b/tex/context/base/enco-ecm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-ec,
+%D   [     filefile=enco-ec,
 %D      version=2000.05.07, 
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Glyphs that may not be present in EC,  
@@ -14,9 +14,9 @@
 %D The next typescript removes a few problematic characters 
 %D from the ec encoding vector. So, in case of troubles, say
 %D
-%D \starttypen
+%D \starttyping
 %D \useencoding[ecm] % ec minus 
-%D \stoptypen 
+%D \stoptyping 
 
 \startencoding[ec][ec]
 
diff --git a/tex/context/base/enco-fde.tex b/tex/context/base/enco-fde.tex
index 93c395f0f..f5888c2ca 100644
--- a/tex/context/base/enco-fde.tex
+++ b/tex/context/base/enco-fde.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-fde,
+%D   [     filefile=enco-fde,
 %D      version=2000.08.20,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=German Input Filter,
@@ -120,4 +120,4 @@
   \stoplanguagespecifics
 \stopencoding
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/enco-ffr.tex b/tex/context/base/enco-ffr.tex
index 012d572ee..23f824daa 100644
--- a/tex/context/base/enco-ffr.tex
+++ b/tex/context/base/enco-ffr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-ffr,
+%D   [     filefile=enco-ffr,
 %D      version=2002.05.07,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=French Input Filter,
diff --git a/tex/context/base/enco-fpl.tex b/tex/context/base/enco-fpl.tex
index 0ae286873..8e0cd78f0 100644
--- a/tex/context/base/enco-fpl.tex
+++ b/tex/context/base/enco-fpl.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-fpl,
+%D   [     filefile=enco-fpl,
 %D      version=2000.08.20,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Polish Input Filter,
diff --git a/tex/context/base/enco-fro.tex b/tex/context/base/enco-fro.tex
index b811e207e..c13318db0 100644
--- a/tex/context/base/enco-fro.tex
+++ b/tex/context/base/enco-fro.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-fro,
+%D   [     filefile=enco-fro,
 %D      version=2000.08.20,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Romanian Input Filter,
diff --git a/tex/context/base/enco-grk.tex b/tex/context/base/enco-grk.tex
index dbab21302..2bf4b2c8a 100644
--- a/tex/context/base/enco-grk.tex
+++ b/tex/context/base/enco-grk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-grk,
+%D   [       filefile=enco-grk,
 %D        version=2003.03.01,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Greek,
diff --git a/tex/context/base/enco-il2.tex b/tex/context/base/enco-il2.tex
index 042ccf075..a56bbd451 100644
--- a/tex/context/base/enco-il2.tex
+++ b/tex/context/base/enco-il2.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-il2,
+%D   [     filefile=enco-il2,
 %D      version=2000.05.07, % 1998.12.01,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Czech and Slovak ISO Latin 2 Encoding,
diff --git a/tex/context/base/enco-ini.tex b/tex/context/base/enco-ini.tex
index e37b52118..1ab688416 100644
--- a/tex/context/base/enco-ini.tex
+++ b/tex/context/base/enco-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-ini,
+%D   [       filefile=enco-ini,
 %D        version=2000.12.27, % 1998.12.03,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Initialization,
@@ -37,26 +37,26 @@
 %D While dealing with input (the text source) and output (the
 %D glyphs), encoding comes into view. To summarize a few:
 %D
-%D \startopsomming
-%D \som  Bytes in the input file are mapped to an internal
+%D \startitemize
+%D \item  Bytes in the input file are mapped to an internal
 %D       representation. An~\type {a} often stays an~\type {a},
 %D       but~\type {\"e} can become either one code or become
 %D       two codes (ending in overlapping glyphs).
-%D \som  Characters can be made active and mapped onto another
+%D \item  Characters can be made active and mapped onto another
 %D       character.
-%D \som  When changing case, characters are mapped onto
+%D \item  When changing case, characters are mapped onto
 %D       themselves, their case||counterpart or a reasonable
 %D       alternative, like~\"e onto~e.
-%D \som  Single character representations in a \DVI\ file can
+%D \item  Single character representations in a \DVI\ file can
 %D       be mapped onto one or more characters, either of not
 %D       in more than one font file (virtual fonts).
-%D \som  In the final format, fonts collections can be
+%D \item  In the final format, fonts collections can be
 %D       partially embedded, thereby losing the one||to||one
 %D       relation between several instances of one font.
-%D \som  For special purposes, individual characters should be
+%D \item  For special purposes, individual characters should be
 %D       mapped onto a dedicated encoding vector, for instance
 %D       \PDF\ document encoding.
-%D \stopopsomming
+%D \stopitemize
 %D
 %D These and other kind of mappings are to be dealt with, and
 %D the exact way of dealing often depends on the language to be
@@ -195,13 +195,13 @@
 %D the decimal number of the character is passed as first
 %D argument.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\decimalcharacter#1{\message{#1 is now active}}
 %D
 %D \defineactivedecimal 122 {\decimalcharacter}
 %D
 %D \defineactivedecimals 128 to 255 as {\decimalcharacter}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command is typically used in coding definitions,
 %D like the \UNICODE\ one.
@@ -322,7 +322,7 @@
 %D mechanism to define mappings. The first real application
 %D of this command was:
 %D
-%D \starttypen
+%D \starttyping
 %D \startmapping [something]
 %D   \definecasemap 165 181 165
 %D   \definecasemap 171 187 171
@@ -332,7 +332,7 @@
 %D   \definelowercasecom \AE \ae
 %D   ...
 %D \stopmapping
-%D \stoptypen
+%D \stoptyping
 %D
 %D So, character 165 becomes 181 in uppercase and 165 in
 %D lowercase. A mapping is activated with \type {\enablemapping}.
@@ -369,11 +369,11 @@
 
 %D This can be used like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definecasemaps 128 to 156 lc  32 uc 0
 %D \definecasemaps 160 to 188 lc -32 uc 0
 %D \definecasemaps 192 to 255 lc  32 uc 0
-%D \stoptypen
+%D \stoptyping
 %D
 %D and saves a lot of typing (copying).
 
@@ -502,17 +502,17 @@
 %D called for by sequences like \type{\"e}. Here the \type{\"}
 %D is defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\"#1{{\accent"7F #1}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro places the accent \accent"7F {} on top of an~e
 %D gives \"e. Some fonts however can have prebuild accents and
 %D use a more direct approach like
 %D
-%D \starttypen
+%D \starttyping
 %D \def\"#1{\if#1e\char 235\else ... \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The latter approach is not used in \CONTEXT, because we
 %D store relevant combinations of accents and characters in
@@ -521,7 +521,7 @@
 %D We define character substitutes and commands with definition
 %D commands like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startcoding[texnansi]
 %D
 %D \defineaccent " a           228
@@ -535,7 +535,7 @@
 %D \definecommand c \texnansiencodedc
 %D
 %D \stopcoding
-%D \stoptypen
+%D \stoptyping
 %D
 %D The last argument of \type{\defineaccent} and
 %D \type{\definecharacter} tells \TEX\ the position of the
@@ -656,9 +656,9 @@
 %D Yet another definition concerns sorting of indexes and
 %D lists.
 %D
-%D \starttypen
+%D \starttyping
 %D \definesortkey {\'e} {e} {a} {\'e}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first argument denotes the string to be treated. The
 %D second argument is the raw replacement, while the third
@@ -814,14 +814,28 @@
   %\redefinecommand #1 % just to be sure
    \setvalue{\commandprefix\characterencoding\string#1}{#2}}
 
+% %D This one is needed in order to prevent problems with math (see \type
+% %D {\over} in dutch interface). This became a problem one when going
+% %D low level english.
+
+% \def\doifdefinedascommandelse#1%
+%   {\bgroup
+%    \convertargument\dohandlecommand{#1}\to\asciiA
+%    \@EAEAEA\convertargument\csname#1\endcsname\to\asciiB
+%    \ifx\asciiA\asciiB
+%      \egroup\expandafter\firstoftwoarguments
+%    \else
+%      \egroup\expandafter\secondoftwoarguments
+%    \fi}
+
 %D Here we see that redefining accents is characters is more
 %D or less the same as redefining commands. We also could have
 %D said:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\defineaccent#1 #2 {\definecommand#1\string#2 \char}
 %D \def\definecharacter#1 {\definecommand#1 \char}
-%D \stoptypen
+%D \stoptyping
 
 % obsolete
 %
@@ -837,12 +851,12 @@
 % %D
 % %D Accents or accent generating commands are redefined by:
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \redefineaccent  '  % grave
 % %D \redefineaccent  "  % diaeresis
 % %D \redefineaccent  ^  % circumflex
 % %D \redefineaccent  v  % caron
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D The original \PLAIN\ \TEX\ meaning of each accent generating
 % %D command is saved first. Next these commands are redefined to
@@ -871,7 +885,7 @@
 %D When needed, one can overload the default positions of the
 %D accents. The \PLAIN\ \TEX\ defaults are:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineaccentcommand `  18
 %D \defineaccentcommand '  19
 %D \defineaccentcommand v  20
@@ -882,7 +896,7 @@
 %D \defineaccentcommand H 125  % "7D
 %D \defineaccentcommand ~ 126  % "7E
 %D \defineaccentcommand " 127  % "7F
-%D \stoptypen
+%D \stoptyping
 
 \def\defineaccentcommand
   {\protectfontcharacters
@@ -961,10 +975,10 @@
 %D Redefinition of encoding dependant commands like \type{\b}
 %D and \type{\c} can be triggered by:
 %D
-%D \starttypen
+%D \starttyping
 %D \redefinecommand  b  % something math
 %D \redefinecommand  c  % something math
-%D \stoptypen
+%D \stoptyping
 %D
 %D Handling of characters is easier than handling accents
 %D because here we don't have to take care of arguments. We
@@ -1013,10 +1027,10 @@
 % %D in that they are to be presented as they are, are redefined
 % %D by
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \redefinecharacter  ae  % ae
 % %D \redefinecharacter  cc  % ccedilla
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D To keep things simple, we just copy this command:
 %
@@ -1042,19 +1056,19 @@
 %D a few macros that show most of the characters involved. The
 %D next two tables show the result of \type {\showaccents}.
 %D
-%D \plaatstabel
+%D \placetable
 %D   {The special glyphs in default encoding.}
 %D   {\showaccents}
 %D
-%D \plaatstabel
+%D \placetable
 %D   {The special glyphs in texnansi encoding.}
 %D   {\switchtobodyfont[lbr]\showaccents}
 %D
 %D The command
 %D
-%D \starttypen
+%D \starttyping
 %D \showhyphenations{doordefini\"eren}
-%D \stoptypen
+%D \stoptyping
 %D
 %D can be used to check the correct loading of hyphenation
 %D patterns.
@@ -1489,4 +1503,4 @@
 
 \setupencoding[\s!default=ec] % was: [\s!default=\s!default]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/enco-mis.tex b/tex/context/base/enco-mis.tex
index 6c312a804..0b5ddab07 100644
--- a/tex/context/base/enco-mis.tex
+++ b/tex/context/base/enco-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-mis,
+%D   [       filefile=enco-mis,
 %D        version=2000.05.07, % 1999.11.11,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Missing Glyphs,
diff --git a/tex/context/base/enco-pdf.tex b/tex/context/base/enco-pdf.tex
index 6b153351b..f4b25ff28 100644
--- a/tex/context/base/enco-pdf.tex
+++ b/tex/context/base/enco-pdf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-pdf,
+%D   [     filefile=enco-pdf,
 %D      version=1995.01.01,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=\YandY\ texnansi Encoding,
@@ -93,4 +93,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/enco-pfr.tex b/tex/context/base/enco-pfr.tex
index ab6d961e8..5ace40261 100644
--- a/tex/context/base/enco-pfr.tex
+++ b/tex/context/base/enco-pfr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-pfr,
+%D   [       filefile=enco-pfr,
 %D        version=2000.12.10,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=PDF Font Resource Inclusion,
@@ -21,7 +21,7 @@
 %D load the encoding and then the font; previous font
 %D definitions are left untouched.)
 %D
-%D \starttypen
+%D \starttyping
 %D % output=pdftex interface=en
 %D
 %D \useencoding[pfr]
@@ -31,7 +31,7 @@
 %D   test \`z \'z \bf test \sl test \bs quite funny \`z \page
 %D   test \`z \'z \bf test \sl test \bs quite funny \`z \page
 %D \stoptext
-%D \stoptypen
+%D \stoptyping
 %D
 %D We do our best to include a (often large) font resources
 %D only once. The current implementation is not that
@@ -57,11 +57,11 @@
 %D macro defined with \type {\pdffontfileresource} can have
 %D three states:
 %D
-%D \startopsomming[opelkaar]
-%D \som undefined: not yet loaded, and not yet included
-%D \som some value: loaded, but not yet included
-%D \som empty: loaded, and already included
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item undefined: not yet loaded, and not yet included
+%D \item some value: loaded, but not yet included
+%D \item empty: loaded, and already included
+%D \stopitemize
 
 \def\pdffontresource    {pdfr:\currentencoding}
 \def\pdffontfileresource{pdff:\pdffontresource}
@@ -70,7 +70,7 @@
 %D The following \PDF\ code is composed by Ondrej Koala Vacha (I
 %D probably mispelled this name).
 %D
-%D \starttypen
+%D \starttyping
 %D \startpdffontresource[il2]
 %D /CIDInit /ProcSet findresource begin
 %D 12 dict begin
@@ -95,17 +95,17 @@
 %D CMapName currentdict /CMap defineresource pop end
 %D end
 %D \stoppdffontresource
-%D \stoptypen
+%D \stoptyping
 %D
 %D We don't preload such huge definitions, and process them
 %D run||time to save memory. Therefore, in the encoding
 %D vector, we only add an entry like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startencoding [il2]
 %D   \usepdffontresource il2
 %D \stopencoding
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro is defined as follows.
 
diff --git a/tex/context/base/enco-pol.tex b/tex/context/base/enco-pol.tex
index 353b5ef7b..8dd1426dd 100644
--- a/tex/context/base/enco-pol.tex
+++ b/tex/context/base/enco-pol.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-pol,
+%D   [     filefile=enco-pol,
 %D      version=2000.05.07, % 1999.28.8,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Polish Mixed Encoding,
@@ -252,4 +252,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/enco-qx.tex b/tex/context/base/enco-qx.tex
index c58901899..0d99ac4a2 100644
--- a/tex/context/base/enco-qx.tex
+++ b/tex/context/base/enco-qx.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-qx,
+%D   [     filefile=enco-qx,
 %D      version=2004.04.03,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Polish QX Encoding,
@@ -219,4 +219,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/enco-run.tex b/tex/context/base/enco-run.tex
index b88c4111a..4330d7ba2 100644
--- a/tex/context/base/enco-run.tex
+++ b/tex/context/base/enco-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-run,
+%D   [     filefile=enco-run,
 %D      version=2000.27.12, % moved to runtime module
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Runtime Macros,
@@ -34,9 +34,9 @@
 \gdef\showaccents
   {\bgroup
    \savefont
-   \setuptextrules[\c!korps=,\c!letter=]
+   \setuptextrules[\c!bodyfont=,\c!style=]
    \starttextrule{\visualizecharacterslegend}
-   \witruimte
+   \whitespace
    \restorefont\setupinterlinespace
    \visualizecharacters
    \def\do##1%
@@ -62,9 +62,9 @@
 \gdef\showcharacters
   {\bgroup
    \savefont
-   \setuptextrules[\c!korps=,\c!letter=]
+   \setuptextrules[\c!bodyfont=,\c!style=]
    \starttextrule{\visualizecharacterslegend}
-   \witruimte
+   \whitespace
    \dontcomplain
    \forgetall
    \def\startencoding[##1]{}
@@ -84,7 +84,7 @@
    \divide \dimen0 by \dimen2 \advance\dimen0 1sp
    \edef\enccols{\number\dimen0}
    \visualizecharacters
-   \startcolumns[\c!n=\enccols,\c!afstand=2em]
+   \startcolumns[\c!n=\enccols,\c!distance=2em]
    \restorefont\setupinterlinespace
    \def\definecharacter ##1 ##2 %
      {\setbox0=\hbox to \hsize{\localcolortrue\hbox to \encwidth{\getvalue{##1}\hss}\tttf##1}%
diff --git a/tex/context/base/enco-tbo.tex b/tex/context/base/enco-tbo.tex
index 3e9719c2a..284049170 100644
--- a/tex/context/base/enco-tbo.tex
+++ b/tex/context/base/enco-tbo.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-tbo,
+%D   [     filefile=enco-tbo,
 %D      version=2000.05.07, % 2001.8.4,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=TeXBaseOne Encoding,
diff --git a/tex/context/base/enco-x5.tex b/tex/context/base/enco-x5.tex
index 32a7399ca..7c8f23b69 100644
--- a/tex/context/base/enco-x5.tex
+++ b/tex/context/base/enco-x5.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=enco-x5,
+%D   [     filefile=enco-x5,
 %D      version=1999.12.12,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Vietnamese Encoding,
diff --git a/tex/context/base/filt-bas.tex b/tex/context/base/filt-bas.tex
index ca3bc3d70..b53b8b8ab 100644
--- a/tex/context/base/filt-bas.tex
+++ b/tex/context/base/filt-bas.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=filt-bas,
+%D   [       filefile=filt-bas,
 %D        version=2000.09.19,
 %D          title=\CONTEXT\ Filter Macros,
 %D       subtitle=A Base Collection,
diff --git a/tex/context/base/filt-ini.tex b/tex/context/base/filt-ini.tex
index 6fe8a37fa..7541bd397 100644
--- a/tex/context/base/filt-ini.tex
+++ b/tex/context/base/filt-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=filt-ini,
+%D   [       filefile=filt-ini,
 %D        version=2000.09.19,
 %D          title=\CONTEXT\ Filter Macros,
 %D       subtitle=Initialization,
@@ -139,4 +139,4 @@
 \def\usefilter[#1]%
   {\processcommalist[#1]\dousefilter}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/font-arb.tex b/tex/context/base/font-arb.tex
index 239ca436e..a75858683 100644
--- a/tex/context/base/font-arb.tex
+++ b/tex/context/base/font-arb.tex
@@ -1,3 +1,16 @@
+%D \module
+%D   [       filefile=font-arb,
+%D        version=1999.11.06,
+%D          title=\CONTEXT\ Font Macros,
+%D       subtitle=Arabic,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
 % NOT YET ADAPTED TO THE NEW FONT MACROS
 
 % I still need to hook in some features into the setup
@@ -10,22 +23,10 @@
 % ......
 % \stoparabic
 
-%D \module
-%D   [       file=font-arb,
-%D        version=1999.11.06,
-%D          title=\CONTEXT\ Font Macros,
-%D       subtitle=Arabic,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
 
 \writestatus{loading}{Context Font Macros / ArabTeX support}
 
-%D At the \NTG\ 10\hoog{th} anniversary meeting Klaus Lagally
+%D At the \NTG\ 10\high{th} anniversary meeting Klaus Lagally
 %D introduced the audience to arabic typesetting, and after
 %D that I knew that some day I really had to look into his
 %D generic package. And then, sort of simultaniously Maarten
@@ -50,8 +51,8 @@
 \unexpanded\def\setarabicfont#1%
   {\scratchdimen=1.2\bodyfontsize
    \font\arbfont=\truefontname{Arabic#1} at \currentfontscale\scratchdimen
-\setx@skels
-\newfonttrue
+   \setx@skels
+   \newfonttrue
    \arbfont}
 
 %D Just to be compatible with Arab\TEX\ we define:
@@ -81,8 +82,8 @@
   {\iffirstargument % \startarab is defined but used already
      \getparameters
        [\??ARABTEX#1]
-       [\c!voor=,\c!na=,\c!binnen=\setarab,
-        \c!letter=\setarabfont{Arabic\fontstylesuffix}, % evt ArabicRegular
+       [\c!before=,\c!after=,\c!inner=\setarab,
+        \c!style=\setarabfont{Arabic\fontstylesuffix}, % evt ArabicRegular
         #2]%
      \expandafter\all@wcmd\csname\e!stop#1\endcsname
      \setvalue{\e!start#1}%
@@ -98,7 +99,7 @@
    \fi}
 
 \def\initializeARABTEXinternals#1%
-  {\getvalue{\??ARABTEX#1\c!binnen}%
+  {\getvalue{\??ARABTEX#1\c!inner}%
    \let      \\=\ARABTEXbreakA
    \let      \|=\ARABTEXbreakB
    \let    \cap=\ARABTEXcap
@@ -117,7 +118,7 @@
    \ifnum1<0\getvalue{\??ARABTEX#1\c!n}\relax
      \startcolumns
    \else
-     \getvalue{\??ARABTEX#1\c!voor}%
+     \getvalue{\??ARABTEX#1\c!before}%
    \fi
    \initializeARABTEXinternals{#1}%
    \initializeARABTEXend{#1}%
@@ -125,7 +126,7 @@
    \initializeARABTEXalternative{#1}}
 
 \def\initializeARABTEXalternative#1%
-  {\getvalue{\??ARABTEX#1\c!letter}}
+  {\getvalue{\??ARABTEX#1\c!style}}
 
 \def\initializeARABTEXend#1% \CONTEXT\ does use \end quite differently
   {\long\def\end##1%
@@ -133,7 +134,7 @@
       \ifnum1<0\getvalue{\??ARABTEX#1\c!n}\relax
         \stopcolumns
       \else
-        \getvalue{\??ARABTEX#1\c!na}%
+        \getvalue{\??ARABTEX#1\c!after}%
       \fi
       \endgroup}%
    \let\a@l@end\end
@@ -263,23 +264,23 @@
 
 \defineARABTEXalternative
   [arabic]
-  [\c!binnen=\setarab,
-   \c!letter=\setarabfont\fontstylesuffix]
+  [\c!inner=\setarab,
+   \c!style=\setarabfont\fontstylesuffix]
 
 \defineARABTEXalternative
   [farsi]
-  [\c!binnen=\setfarsi,
-   \c!letter=\setarabfont\fontstylesuffix]
+  [\c!inner=\setfarsi,
+   \c!style=\setarabfont\fontstylesuffix]
 
 \defineARABTEXalternative
   [urdu]
-  [\c!binnen=\seturdu,
-   \c!letter=\setarabfont\fontstylesuffix]
+  [\c!inner=\seturdu,
+   \c!style=\setarabfont\fontstylesuffix]
 
 \defineARABTEXalternative
   [maghribi]
-  [\c!binnen=\setmaghribi,
-   \c!letter=\setarabfont\fontstylesuffix]
+  [\c!inner=\setmaghribi,
+   \c!style=\setarabfont\fontstylesuffix]
 
 %D Apart from such definitions, one can adapt the settings
 %D using \type {\setupARABTEXalternative}.
diff --git a/tex/context/base/font-bfm.tex b/tex/context/base/font-bfm.tex
index 848f5728f..570594718 100644
--- a/tex/context/base/font-bfm.tex
+++ b/tex/context/base/font-bfm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=font-bfm,
+%D   [       filefile=font-bfm,
 %D        version=2003.11.25,
 %D          title=\CONTEXT\ Font Macros,
 %D       subtitle=Mixed Normal and Bold Math,
@@ -174,10 +174,10 @@
 %D We hook this feature into the formula mechanism.
 
 \setupformulas
-  [\c!methode=\v!normaal]
+  [\c!method=\v!normal]
 
 \appendtoks
-  \doifelse{\formulaparameter\c!methode}\v!vet
+  \doifelse{\formulaparameter\c!method}\v!bold
     {\chardef\boldfacemathmethod\plusone}
     {\chardef\boldfacemathmethod\zerocount}%
 \to \everysetupformulas
@@ -190,4 +190,4 @@
 %D   [method=bold]
 %D \stoptyping
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/font-chi.tex b/tex/context/base/font-chi.tex
index 6f5f77d3b..be9b86571 100644
--- a/tex/context/base/font-chi.tex
+++ b/tex/context/base/font-chi.tex
@@ -1,7 +1,5 @@
-% NOT YET ADAPTED TO THE NEW FONT MACROS
-
 %D \module
-%D   [       file=font-chi,
+%D   [       filefile=font-chi,
 %D        version=1999.10.10,
 %D          title=\CONTEXT\ Font Macros,
 %D       subtitle=Chinese,
@@ -14,27 +12,28 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% NOT YET ADAPTED TO THE NEW FONT MACROS
+
 \writestatus{loading}{Context Font Macros / Chinese}
 
 % much will to typo-chi.tex
 
 %D Still to be implemented:
 %D
-%D \startopsomming
-%D \som columns left right touch
-%D \som distance = (hsize-n*bodyfontsize)/(n-1)
-%D \som char grids
-%D \som char tables
-%D \som all kind of rotated combinations
-%D \som hanging puctuation
-%D \som a few more encodings
-%D \som rotation list
-%D \stopopsomming
-
-%M \stelkorpsin[chi]
+%D \startitemize
+%D \item columns left right touch
+%D \item distance = (hsize-n*bodyfontsize)/(n-1)
+%D \item char grids
+%D \item char tables
+%D \item all kind of rotated combinations
+%D \item hanging puctuation
+%D \item a few more encodings
+%D \item rotation list
+%D \stopitemize
+
+%M \setupbodyfont[chi]
 %M
-%M \def\WangLei%
-%M   {\purechinese{\uchar{205}{245}\uchar{192}{218}}}
+%M \def\WangLei{\purechinese{\uchar{205}{245}\uchar{192}{218}}}
 
 \useencoding[chi]
 
@@ -90,9 +89,9 @@
 %D Before and after the glyph we have to deal with Chinese
 %D spacing. Special attention is given to punctuation.
 %D
-%D \starttypen
+%D \starttyping
 %D [some short nice chinese text with () and english]
-%D \stoptypen
+%D \stoptyping
 %D
 %D We insert a bit of stretch and introduce a signal to
 %D keep track of previous characters. We use a similar
@@ -354,7 +353,7 @@
           \insertchineseglyph
         \else % left / right
           \setbox\scratchbox\hbox{\insertchineseglyph}%
-          \rotate[\c!rotatie=270]{\box\scratchbox}%
+          \rotate[\c!rotation=270]{\box\scratchbox}%
         \fi
         \hss}%
      \ht\scratchbox\unicodeheight\strutht
@@ -393,17 +392,17 @@
    \verticalchinesetrue
    \global\chardef\prevchineseSstatus=0
    \let\nochinese\nochineseinvertical
-   \doif\@@vtn\v!passend
+   \doif\@@vtn\v!fit
      {\dimen0=\textwidth
-      \advance\dimen0 \@@vtafstand
+      \advance\dimen0 \@@vtdistance
       \dimen2=\bodyfontsize
-      \advance\dimen2 \@@vtafstand
+      \advance\dimen2 \@@vtdistance
       \divide\dimen0 \number\dimen2
       \edef\@@vtn{\number\dimen0}}%
    \startcolumns
-     [\c!richting=\@@vtrichting,
-      \c!balanceren=\@@vtbalanceren,
-      \c!afstand=\@@vtafstand,
+     [\c!direction=\@@vtdirection,
+      \c!balance=\@@vtbalance,
+      \c!distance=\@@vtdistance,
       \c!n=\@@vtn,
       #1]}
 
@@ -412,10 +411,10 @@
    \egroup}
 
 \setupchinese
-  [\c!richting=\v!links,
-   \c!balanceren=\v!nee,
-   \c!n=\v!passend,
-   \c!afstand=1.5\bodyfontsize]
+  [\c!direction=\v!left,
+   \c!balance=\v!no,
+   \c!n=\v!fit,
+   \c!distance=1.5\bodyfontsize]
 
 %D We can set up vertical typesetting with \type
 %D {\setupchinese}.
@@ -434,7 +433,7 @@
    \hbox to \hsize
      {\hss
       \rotate
-        [\c!rotatie=270]
+        [\c!rotation=270]
         {\vbox to \ht\scratchbox{\vss\box\scratchbox\vss}}%
       \hss}
    \par}
@@ -445,9 +444,9 @@
 %D Careful reading of the previous macro learns that we
 %D treat left and right glyphs differently. When we say
 %D
-%D \starttypen
+%D \starttyping
 %D \correctchineseboundarycharstrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D For the moment correction in on by default.
 
@@ -543,17 +542,14 @@
          \hskip-\wd\scratchbox
          \hbox to \wd\scratchbox
            {\hss
-            \color[green]
-              {\ifcase\chineseSstatus\relax u\or l\or r\fi}%
+            \color[green]{\ifcase\chineseSstatus\relax u\or l\or r\fi}%
             \hss}%
          \hskip-\wd\scratchbox
          \lower\dp\scratchbox\hbox to \wd\scratchbox
            {\hss
-            \color[red]
-              {\ifcase\chineseBstatus\relax u\or l\or r\or c\or n\fi}%
+            \color[red]{\ifcase\chineseBstatus\relax u\or l\or r\or c\or n\fi}%
             \hss
-            \color[blue]
-              {\ifcase\chineseAstatus\relax u\or l\or r\or s\fi}%
+            \color[blue]{\ifcase\chineseAstatus\relax u\or l\or r\or s\fi}%
             \hss}}}}
 
 %D The following example shows how tracing works.
@@ -583,23 +579,23 @@
 %D The chinese numbering systems rather straightforward. First
 %D there are the digits:
 %D
-%D \starttabulatie[|c|c|c|c|c|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|c|c|c|c|c|]
 %D \NC 0 \NC 1 \NC 2 \NC 3 \NC 4 \NC 5 \NC 6 \NC 7 \NC 8 \NC 9 \NC\NR
 %D \NC \chinesenumber{0} \NC \chinesenumber{1} \NC \chinesenumber{2}
 %D \NC \chinesenumber{3} \NC \chinesenumber{4} \NC \chinesenumber{5}
 %D \NC \chinesenumber{6} \NC \chinesenumber{7} \NC \chinesenumber{8}
 %D \NC \chinesenumber{9} \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Apart from these numbers, we have dedicated representations
 %D of some powers of~$10$.
 %D
-%D \starttabulatie[|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|]
 %D \NC 10 \NC 100 \NC 1000 \NC 10000 \NC 100000000 \NC\NR
 %D \NC \chinesenumber{10} \NC \chinesenumber{100}
 %D \NC \chinesenumber{1000} \NC \chinesenumber{10000}
 %D \NC \chinesenumber{100000000} \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The number~12 is a combination of $1\times10+2$, or:
 %D \chinesenumber {12}, while~22 becomes \chinesenumber {22}.
@@ -609,7 +605,7 @@
 %D case the~$1$ is redundant. The same is true for the powers
 %D of~10.
 %D
-%D \starttabulatie[|r|r|r|r|r|r|]
+%D \starttabulate[|r|r|r|r|r|r|]
 %D \NC     1 \NC \chinesenumber     {1} \NC
 %D         9 \NC \chinesenumber     {9} \NC
 %D         4 \NC \chinesenumber     {4} \NC\NR
@@ -622,7 +618,7 @@
 %D \NC  1111 \NC \chinesenumber  {1111} \NC
 %D      9999 \NC \chinesenumber  {9999} \NC
 %D     65536 \NC \chinesenumber {65536} \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The implementation is rather simple. For internal purposes,
 %D we let zero expand to~0. The digits $0-9$ and numbers $10$,
@@ -657,7 +653,7 @@
 %D a derived one with capitalized characters, an extended
 %D version of the first method, and a rather Arabic method.
 %D
-%D \starttabulatie[|l|l|]
+%D \starttabulate[|l|l|]
 %D \HL
 %D \NC \bf command                      \NC \bf number 39                 \NC\NR
 %D \HL
@@ -666,7 +662,7 @@
 %D \NC \type{\arabicchinesenumber}      \NC \arabicchinesenumber     {39} \NC\NR
 %D \NC \type{\extendedchinesenumber}    \NC \extendedchinesenumber   {39} \NC\NR
 %D \HL
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D We use a dirty trick to enable Chinese Capital Digits. In
 %D the encoding vectors, we define these by appending a suffix
@@ -809,7 +805,7 @@
 %D conversion macro.
 %D
 %D \startbuffer
-%D \starttabel[|l|l|l|l|l|l|]
+%D \starttable[|l|l|l|l|l|l|]
 %D \HL
 %D \NC number     \NC converter                  \NC hard coded \NC
 %D     number     \NC converter                  \NC hard coded\NC \SR
@@ -842,10 +838,10 @@
 %D \NC 1111111111 \NC \chinesenumber{1111111111} \NC ʮһÒÚһǧһ°ÙһʮһÍòһǧһ°Ùһʮһ \NC
 %D     1000000000 \NC \chinesenumber{1000000000} \NC Ê®ÒÚ \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \stopbuffer
 %D
-%D \plaatstabel{Some Chinese number examples.}{\haalbuffer}
+%D \placetable{Some Chinese number examples.}{\getbuffer}
 
 %D Although the conversion can be hooked into most commands
 %D that deal with numbers |<|those familiar with \TEX\ macro
@@ -854,12 +850,12 @@
 %D digits. So, in practice, the change that the next example
 %D shows up, is minimal.
 %D
-%D \starttabulatie[|r|r|c|]
+%D \starttabulate[|r|r|c|]
 %D \NC  2546 \NC \chinesenumber  {2546} \NC     \NC\NR
 %D \NC  9258 \NC \chinesenumber  {9258} \NC $+$ \NC\NR
 %D \HL
 %D \NC 11804 \NC \chinesenumber {11804} \NC     \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D While in arabic arithmics addition leads to more digits, in
 %D Chinese the number of glyphs can (temporary) decrease.
@@ -881,9 +877,9 @@
 
 %D Date conversion:
 
-\defineconversion [cn] [\v!dag]   [\chinesenumber]
-\defineconversion [cn] [\v!maand] [\chinesenumber]
-\defineconversion [cn] [\v!jaar]  [\chinesenumber]
+\defineconversion [cn] [\v!day]   [\chinesenumber]
+\defineconversion [cn] [\v!month] [\chinesenumber]
+\defineconversion [cn] [\v!year]  [\chinesenumber]
 
 %D \macros
 %D   {SimChi, TraChi}
@@ -893,12 +889,12 @@
 
 \setupunicodefont
   [chinese]
-  [   \c!schaal=\chineseunicodescale,
-      \c!hoogte=\chineseunicodeheight,
-      \c!diepte=\chineseunicodedepth,
-   \c!conversie=\chinesenumber,
-   \c!commandos=\setchineseencoding, % needed for digits
-    \c!commando=\handlechineseunicodeglyph]
+  [   \c!scale=\chineseunicodescale,
+      \c!height=\chineseunicodeheight,
+      \c!depth=\chineseunicodedepth,
+   \c!conversion=\chinesenumber,
+   \c!commands=\setchineseencoding, % needed for digits
+    \c!command=\handlechineseunicodeglyph]
 
 %D For the moment, this encoding is implemented rather ugly. The
 %D trick is to move the encoding value from the current font
@@ -914,17 +910,17 @@
 
 %D We could have said:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineunicodefont
 %D   [SimChi]
 %D   [SimplifiedChinese]
-%D   [   \c!schaal=\chineseunicodescale,
-%D       \c!hoogte=\chineseunicodeheight,
-%D       \c!diepte=\chineseunicodedepth,
-%D    \c!conversie=\chinesenumber,
-%D    \c!commandos=\setchineseencoding, % needed for digits
-%D     \c!commando=\handlechineseunicodeglyph]
-%D \stoptypen
+%D   [   \c!scale=\chineseunicodescale,
+%D       \c!height=\chineseunicodeheight,
+%D       \c!depth=\chineseunicodedepth,
+%D    \c!conversion=\chinesenumber,
+%D    \c!commands=\setchineseencoding, % needed for digits
+%D     \c!command=\handlechineseunicodeglyph]
+%D \stoptyping
 %D
 %D However, the former definitions is more general. Next we
 %D map a few fonts:
@@ -1085,7 +1081,7 @@
 %D
 %D The full range of sizes is:
 %D
-%D \starttabulatie[|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|]
 %D \NC          8 \NC         7 \NC         -6 \NC         6 \NC
 %D             -5 \NC         5 \NC         -4 \NC         4 \NC
 %D             -3 \NC         3 \NC         -2 \NC         2 \NC
@@ -1094,43 +1090,43 @@
 %D    \chisize{-5}\NC\chisize{5}\NC\chisize{-4}\NC\chisize{4}\NC
 %D    \chisize{-3}\NC\chisize{3}\NC\chisize{-2}\NC\chisize{2}\NC
 %D    \chisize{-1}\NC\chisize{1}\NC\chisize{-0}\NC\chisize{0}\NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 
 %D Now it's time for some real Chinese. This example
 %D also shows that font switching is supported.
 %D
-%D \startsmaller
-%D \regelmidden{\tfd Ë®µ÷¸èÍ·}
-%D \blanko
-%D \regelmidden{\tfb ±û³½ÖÐÇ»¶Òû´ïµ©£¬´ó×í×÷´Ëƪ£¬¼æ»³×ÓÓÉ¡£}
-%D \blanko
-%D \regelmidden{\tfb ËÕéø}
-%D \blanko
+%D \startnarrower
+%D \midaligned{\tfd Ë®µ÷¸èÍ·}
+%D \blank
+%D \midaligned{\tfb ±û³½ÖÐÇ»¶Òû´ïµ©£¬´ó×í×÷´Ëƪ£¬¼æ»³×ÓÓÉ¡£}
+%D \blank
+%D \midaligned{\tfb ËÕéø}
+%D \blank
 %D Ã÷Ô¼¸Ê±ÓУ¿°Ñ¾ÆÎÊÇàÌì¡£²»ÖªÌìÉϹ¬ãÚ£¬½ñϦÊǺÎÄꣿÎÒÓû³Ë·ç¹éÈ¥
 %D £¬ÓÖ¿ÖÇíÂ¥ÓñÓ¸ß´¦²»Ê¤º®¡£ÆðÎèŪÇåÓ°£¬ºÎËÆÔÚÈ˼䣿
-%D \blanko
+%D \blank
 %D תÖì¸ó£¬µÍ»§£¬ÕÕÎÞÃß¡£²»Ó¦Óкޣ¬ºÎÊÂÆ«Ïò±ðʱԲ£¿ÈËÓб¯»¶ÀëºÏ£¬
 %D ÔÂÓÐÒõÇçԲȱ£¬´ËʹÅÄÑÈ«¡£µ«Ô¸È˳¤¾Ã£¬Ç§Àﹲ濾ꡣ
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D The english translation is:
 %D
-%D \startsmaller
-%D \regelmidden{\tfd Tune: Prelude to the Melody of Water}
-%D \blanko
-%D \regelmidden{\tfb On the night of the Mid||Autumn Festival of
+%D \startnarrower
+%D \midaligned{\tfd Tune: Prelude to the Melody of Water}
+%D \blank
+%D \midaligned{\tfb On the night of the Mid||Autumn Festival of
 %D 1076, I drank happily till dawn and wrote this in my cups
 %D while thinking of Zi||you.}
-%D \blanko
-%D \regelmidden{\tfb Su Shi}
-%D \blanko
+%D \blank
+%D \midaligned{\tfb Su Shi}
+%D \blank
 %D How long will the bright moon appear? Wine||cup in hand, I
 %D ask the sky. I do not know waht time of year it would be
 %D tonight in the palace on high. Riding the wind, there I
 %D would fly, yet I fear the crystal palace would be far too
 %D high and cold for me. I rise and dance, with my shadow I
 %D play. On high as on earth, would it be as gay?
-%D \blanko
+%D \blank
 %D The moon goes round the mansion red though gauze||draped
 %D windows soft to shed her light upon the sleepless bed.
 %D Against man she should have no spite. Why then when people
@@ -1140,7 +1136,7 @@
 %D olden days. So let us wish that man will live long as he
 %D can! Though miles apart, we'll share the beauty she
 %D displays.
-%D \stopsmaller
+%D \stopnarrower
 
 %D This package is written in the city of Hasselt, a pretty
 %D small town in the |<|compare to China real small|>|
@@ -1154,6 +1150,6 @@
 
 %D To make our lives more easy, we put it here (too):
 
-\setuptyping[\c!tab=\v!nee]
+\setuptyping[\c!tab=\v!no]
 
 \protect \endinput
diff --git a/tex/context/base/font-heb.tex b/tex/context/base/font-heb.tex
index 2982b3dfc..9a7b7c4a1 100644
--- a/tex/context/base/font-heb.tex
+++ b/tex/context/base/font-heb.tex
@@ -1,28 +1,41 @@
-% NOT YET ADAPTED TO THE NEW FONT MACROS 
+%D \module
+%D   [       filefile=font-heb,
+%D        version=1999.11.06,
+%D          title=\CONTEXT\ Font Macros,
+%D       subtitle=Hebrew,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \input font-arb.tex
 
 \writestatus{loading}{Context Font Macros / Hebrew (ArabTeX) support}
 
-%D This module is build on top of \ARABTEX\ and arabic 
-%D support. I dedicate this module to my father Hein Hagen, 
-%D who did not live long enough to become a user. His huge  
-%D library contains math, science, history, english literature, 
-%D philisophy and theology books, but his most favoured ones 
-%D were those traditional hebrew printings. I must admit 
-%D that some of those make clear that traditonal typesetting 
-%D can still beat \TEX. Those nested multicolumn documents with 
-%D complicated can give even the experienced macro writer a 
+% NOT YET ADAPTED TO THE NEW FONT MACROS
+
+%D This module is build on top of \ARABTEX\ and arabic
+%D support. I dedicate this module to my father Hein Hagen,
+%D who did not live long enough to become a user. His huge
+%D library contains math, science, history, english literature,
+%D philisophy and theology books, but his most favoured ones
+%D were those traditional hebrew printings. I must admit
+%D that some of those make clear that traditonal typesetting
+%D can still beat \TEX. Those nested multicolumn documents with
+%D complicated can give even the experienced macro writer a
 %D rather persistent headache.
 
-\unprotect 
+\unprotect
 
 %D A few fonts.
 
 \unexpanded\def\sethebrewfont#1% strange font dimensions / scale
   {\scratchdimen=10\bodyfontsize
    \font\hebfont=\truefontname{Hebrew#1} at \currentfontscale\scratchdimen
-   \fontdimen5\hebfont=.8\fontdimen2\hebfont 
+   \fontdimen5\hebfont=.8\fontdimen2\hebfont
    \fontdimen6\hebfont=3\fontdimen5\hebfont
    \hebfont}
 
@@ -33,20 +46,20 @@
 
 \startloadingARABTEX
 
-\input hebtex.sty 
-\input apatch.sty 
+\input hebtex.sty
+\input apatch.sty
 \input hepatch.sty
 
 \stoploadingARABTEX
 
-%D The main definition is: 
+%D The main definition is:
 
 \definefontsynonym [HebrewRegular] [hclassic]
 \definefontsynonym [HebrewBold]    [hcaption]
 
 \defineARABTEXalternative
   [hebrew]
-  [\c!binnen=\sethebrew,
-   \c!letter=\sethebrewfont{\fontstylesuffix}]
+  [\c!inner=\sethebrew,
+   \c!style=\sethebrewfont{\fontstylesuffix}]
 
 \protect \endinput
diff --git a/tex/context/base/font-ini.tex b/tex/context/base/font-ini.tex
index 4e5ead1f6..2ec942c34 100644
--- a/tex/context/base/font-ini.tex
+++ b/tex/context/base/font-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=font-ini,
+%D   [       filefile=font-ini,
 %D        version=1998.09.11, % (second)
 %D        version=2001.02.20, % (third)
 %D          title=\CONTEXT\ Font Macros,
@@ -255,7 +255,7 @@
 %D means one doesn't have to take care of all kind of relations
 %D between fonts.
 %D
-%D \pagina[grotevoorkeur]
+%D \page[bigpreference]
 
 %D \macros
 %D   {rm,ss,tt,hw,cg}
@@ -264,73 +264,73 @@
 %D we distinguish between several styles. In most cases we will
 %D use:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC roman regular serif    \NC \type{\rm} \NC\FR
 %D \NC sansserif sans support \NC \type{\ss} \NC\MR
 %D \NC type teletype mono     \NC \type{\tt} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D The number of styles is not limited to these three. When
 %D using Lucida Bright we can for instance also define:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC handwritten  \NC \type{\hw} \NC\FR
 %D \NC calligraphic \NC \type{\cg} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D Anyone who feels the need, can define additional ones, like
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC faxfont    \NC \type{\ff} \NC\FR
 %D \NC blackboard \NC \type{\bb} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D Or even
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC hebrew \NC \type{\hb} \NC\SR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D Styles are grouped in font sets. At the moment there are
 %D three main sets defined:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l|l||]
+%D \startlinecorrection
+%D \starttable[|l|l||]
 %D \HL
 %D \NC Computer Modern Roman     \NC Knuth             \NC \type{cmr} \NC\FR
 %D \NC Lucida Bright             \NC Bigelow \& Holmes \NC \type{lbr} \NC\MR
 %D \NC Standard Postscript Fonts \NC Adobe             \NC \type{pos} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D There are also some Computer Modern Roman alternatives:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l|l||]
+%D \startlinecorrection
+%D \starttable[|l|l||]
 %D \HL
 %D \NC Computer Modern Roman    \NC Knuth \& Sauter \NC \type{sau} \NC\FR
 %D \NC Euler fonts              \NC Zapf            \NC \type{eul} \NC\MR
 %D \NC Computer Modern Concrete \NC Knuth \& Zapf   \NC \type{con} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D All these definitions are ordered in files with names like
 %D \type{font-cmr} and \type{font-pos}, where the last three
@@ -339,8 +339,8 @@
 %D Within such a font set (\type{cmr}) and style (\type{\rm})
 %D we can define a number of text font alternatives:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC typeface    \NC \type{\tf} \NC\FR
 %D \NC boldface    \NC \type{\bf} \NC\MR
@@ -350,18 +350,18 @@
 %D \NC bolditalic  \NC \type{\bi} \NC\MR
 %D \NC smallcaps   \NC \type{\sc} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 
 %D For old stylish Frans Goddijn we have:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC oldstyle \NC \type{\os} \NC\SR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D The availability of these alternatives depends on the
 %D completeness of a font family and of course the definitions
@@ -370,8 +370,8 @@
 %D But let's not forget math. In addition to the previous \TEX\
 %D families (the mysterious \type{\fam}'s) we've got some more:
 %D
-%D \startregelcorrectie
-%D \starttabel[|l||]
+%D \startlinecorrection
+%D \starttable[|l||]
 %D \HL
 %D \NC Math Roman  \NC \type{\mr} \NC\FR
 %D \NC Math Italic \NC \type{\mi} \NC\MR
@@ -381,8 +381,8 @@
 %D \NC Math B      \NC \type{\mb} \NC\MR
 %D \NC Math C      \NC \type{\mc} \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D Users can call for specific fonts in many ways. Switches to
 %D other typefaces, like the switch from normal to bold, are as
@@ -398,20 +398,20 @@
 %D During the definition of a bodyfont one can also declare the
 %D available larger alternatives:
 %D
-%D \starttypen
+%D \starttyping
 %D \tf \tfa \tfb \tfc ...
 %D \bf \bfa \bfb \bfc ...
 %D \sl \sla \slb \slc ...
-%D \stoptypen
+%D \stoptyping
 %D
 %D The smaller ones are automatically supplied and derived from
 %D the the bodyfont environment.
 %D
-%D \starttypen
+%D \starttyping
 %D \tfx \tfxx
 %D \bfx \bfxx
 %D \slx \slxx
-%D \stoptypen
+%D \stoptyping
 %D
 %D There are only two smaller alternatives per style. The
 %D larger alternatives on the other hand have no limitations.
@@ -425,14 +425,14 @@
 %D \tfd Hi \bf there\sl, here \tfb I \bf am
 %D \stopbuffer
 %D
-%S \startsmaller
+%S \startnarrower
 %D \typebuffer
-%S \stopsmaller
+%S \stopnarrower
 %D
 %D therefore becomes:
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D Maybe this mechanism isn't always as logic, but as said
@@ -440,9 +440,9 @@
 %D
 %D So a specific kind of glyph can be characterized by:
 %D
-%D \startsmaller
+%D \startnarrower
 %D family (cmr) + bodyfont (12pt) + style (rm) + alternative (bf) + size (a)
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D The last component (the size) is optional.
 %D
@@ -454,9 +454,9 @@
 %D workaround for this: we can call fonts directly by means of
 %D commands like:
 %D
-%D \starttypen
+%D \starttyping
 %D \rmtf \sssl \tttf \rmbsa
-%D \stoptypen
+%D \stoptyping
 %D
 %D One should realize that this fast calls have limitations,
 %D they lack for instance automatic super- and subscript
@@ -476,16 +476,16 @@
 %D lays in the fact that we often want a bit bigger characters
 %D than in math mode. In \CONTEXT\ for instance the \type{\tx}
 %D and \type{\txx} commands are used for surrogate
-%D \kap{smallcaps} which support both nesting and alternatives,
-%D like in {\bf\kap{a \kap{small} world}}, which was typeset by
+%D \cap{smallcaps} which support both nesting and alternatives,
+%D like in {\bf\cap{a \cap{small} world}}, which was typeset by
 %D
-%D \starttypen
-%D \bf\kap{a \kap{small} world}
-%D \stoptypen
+%D \starttyping
+%D \bf\cap{a \cap{small} world}
+%D \stoptyping
 %D
 %D And compare $\rm \scriptstyle THIS$ with the slightly larger
-%D \kap{THIS}: \ruledhbox{$\rm \scriptstyle scriptstyle: THIS$}
-%D or \ruledhbox{\kap{x style: THIS}} makes a big difference.
+%D \cap{THIS}: \ruledhbox{$\rm \scriptstyle scriptstyle: THIS$}
+%D or \ruledhbox{\cap{x style: THIS}} makes a big difference.
 
 %D The \type{x..d} sizes should be used grouped. If you
 %D don't group them, i.e. call them in a row, \CONTEXT\ will
@@ -495,7 +495,7 @@
 %D
 %D \def\FontState{\setstrut\ruledhbox{\strut Hello}}
 %D
-%D \starttabulatie[|||||]
+%D \starttabulate[|||||]
 %D \HL
 %D \NC \rlap{\quad\bf grouped} \NC \NC \type {\tx} \NC \type {\txx} \NC \NR
 %D \HL
@@ -509,11 +509,11 @@
 %D \NC \type{\tfx}  \NC \tfx  \FontState \NC \tfx \tx \FontState \NC \tfx \txx \FontState  \NC \NR
 %D \NC \type{\tfxx} \NC \tfxx \FontState \NC \tfxx\tx \FontState \NC \tfxx\txx \FontState  \NC \NR
 %D \HL
-%D \stoptabulatie
+%D \stoptabulate
 %D
-%D \blanko
+%D \blank
 %D
-%D \starttabulatie[|||||]
+%D \starttabulate[|||||]
 %D \HL
 %D \NC \rlap{\quad\bf stacked} \NC \NC \type {\tx} \NC \type {\txx} \NC \NR
 %D \HL
@@ -563,7 +563,7 @@
 %D \NC \tfx\tfxx\tf\tfa\tfb\tfc\tfx\tfxx \txx \FontState
 %D \NC \NR
 %D \HL
-%D \stoptabulatie
+%D \stoptabulate
 
 %D \macros
 %D   {mf}
@@ -589,9 +589,9 @@
 %D Gives both an expected and unexpected result:
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D We see here that the character shapes change accordingly to
@@ -608,9 +608,9 @@
 %D \stopbuffer
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D In this example we see a new command \type{\mf} surface
@@ -656,14 +656,14 @@
 %D It won't!
 %D
 %D \startvoorbeeld
-%D \let\mathop=\normalmathop \haalbuffer
+%D \let\mathop=\normalmathop \getbuffer
 %D \stopvoorbeeld
 %D
 %D The reason for this is that \type{\sin} is defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\sin{\mathop{\rm sin}\nolimits}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can fix this by defining
 
@@ -678,27 +678,27 @@
 %D We can fix arbitrary horizontal boxes by redefining the
 %D \TEX\ primitive \type{\hbox}:
 %D
-%D \starttypen
+%D \starttyping
 %D \let\normalhbox=\hbox
 %D
 %D \def\hbox{\ifmmode\mbox\else\normalhbox\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D with
 %D
-%D \starttypen
+%D \starttyping
 %D \def\mbox#1#%
 %D   {\normalhbox#1\bgroup\mf\let\next=}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or more robust, that is, also accepting \type{\hbox\bgroup}:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\mbox%
 %D   {\normalhbox\bgroup\mf
 %D    \dowithnextbox{\flushnextbox\egroup}%
 %D    \normalhbox}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And now:
 %D
@@ -711,7 +711,7 @@
 %D Indeed gives:
 %D
 %D \startvoorbeeld
-%D \enablembox\haalbuffer
+%D \enablembox\getbuffer
 %D \stopvoorbeeld
 %D
 %D But, do we want this kind of trickery to be activated? No,
@@ -1162,12 +1162,12 @@
 %D There are several ways to specify a font. Three of them are
 %D pure \TeX\ ones, the fourth one is new:
 %D
-%D \starttypen
+%D \starttyping
 %D \font\name=cmr12
 %D \font\name=cmr12 at 10pt
 %D \font\name=cmr12 scaled \magstep2
 %D \font\name=cmr12 sa 1.440
-%D \stoptypen
+%D \stoptyping
 %D
 %D The non||\TEX\ alternative \type{sa} stands for {\em scaled
 %D at}. This means as much as: scale the bodyfontsize with this
@@ -1176,9 +1176,9 @@
 %D \in{table}[tab:magstep]. We therefore introduce
 %D \type{\magfactor} as an alternative for \type{\magstep}.
 %D
-%D \plaatstabel[hier][tab:magstep]
+%D \placetable[here][tab:magstep]
 %D   {Factors to be used with \type{sa.}}
-%D \starttabel[|c|c|c|]
+%D \starttable[|c|c|c|]
 %D \HL
 %D \NC \bf magstep \NC \bf equivalent     \NC \bf factor \NC\SR
 %D \HL
@@ -1188,7 +1188,7 @@
 %D \NC 4           \NC \type{\magfactor4} \NC 2.074      \NC\MR
 %D \NC 5           \NC \type{\magfactor5} \NC 2.488      \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 
 \def\magstep#1% \relax removed, otherwise space after it sticks, else added
   {\ifcase#1 \@m\or1200\or1440\or1728\or2074\or2488\or\@m\fi}
@@ -1395,9 +1395,9 @@
 %D An additional the second \type {\font} definition can
 %D prevent fuzzy font refs
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\font\csname\dummyfontname\endcsname\lastfontname
-%D \stoptypen
+%D \stoptyping
 %D
 %D but somehow they changed \TEX\ so that it does not matter
 %D any more.
@@ -1462,17 +1462,17 @@
 %D While looking for fonts, fontsynonyms are used for accessing
 %D the files!
 %D
-%D \starttypen
+%D \starttyping
 %D \definefontsynonym[Serif][Lucida-Bright]
 %D \definefontsynonym[Lucida-Bright][lbr][encoding=texnansi]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The definitions can be accessed by:
 %D
-%D \startregels
+%D \startlines
 %D name: \type {\truefontname{Lucida-Bright}}
 %D data: \type {\truefontdata{\truefontname{Lucida-Bright}}}
-%D \stopregels
+%D \stoplines
 
 \def\definefontsynonym
   {\dotripleempty\dodefinefontsynonym}
@@ -1650,15 +1650,15 @@
 %D For special purposes, one can use the next macro to
 %D access font file characteristics, for instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \getfontfileparameters{Regular}
-%D \stoptypen
+%D \stoptyping
 %D
 %D can result in:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\currentfontfileencoding{texnansi}
-%D \stoptypen
+%D \stoptyping
 
 % \def\@@currentfontfile{currentfontfile}
 %
@@ -1678,12 +1678,12 @@
 %D Before we implement the main definition macro, we first show
 %D one for local use:
 %D
-%D \starttypen
+%D \starttyping
 %D \definefont[Some][LucidaBright at 100pt]    \Some some
 %D \definefont[More][LucidaBright scaled 3000] \More more
 %D \definefont[Nice][LucidaBright mp 2]        \Nice nice
 %D \definefont[Text][LucidaBright sa 5.4]      \Text last
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation one looks familiar:
 
@@ -1827,9 +1827,9 @@
 %D
 %D \typebuffer
 %D
-%D \startopelkaar
-%D \haalbuffer
-%D \stopopelkaar
+%D \startpacked
+%D \getbuffer
+%D \stoppacked
 
 \def\mapfontsize
   {\dodoubleargument\domapfontsize}
@@ -1953,20 +1953,20 @@
 %D A typical use of this command is in commands that switch
 %D to another font bypassing the font mechanism:
 %D
-%D \starttypen
+%D \starttyping
 %D \font\myfont=\truefontname{MyFont} at \currentfontscale\bodyfontsize
-%D \stoptypen
+%D \stoptyping
 
 %D Now we enter the area of font switching. The switching
 %D mechanism has to take care of several situations, like:
 %D
-%D \startopsomming[opelkaar]
-%D \som  changing the overal document fonts (including margins,
+%D \startitemize[packed]
+%D \item  changing the overal document fonts (including margins,
 %D       headers and footers)
-%D \som  changing local fonts (only the running text)
-%D \som  smaller and even more smaller alternatives (super-
+%D \item  changing local fonts (only the running text)
+%D \item  smaller and even more smaller alternatives (super-
 %D       and subscripts)
-%D \stopopsomming
+%D \stopitemize
 %D
 %D \TEX\ offers a powerfull family mechanism for super- and
 %D subscripts in math mode. In text mode however, we don't use
@@ -1984,7 +1984,7 @@
 %D Later on we will see how these parameters are used, so for
 %D the moment we stick with an example:
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfontenvironment
 %D   [12pt]
 %D   [        text=12pt,
@@ -1994,7 +1994,7 @@
 %D              xx=8pt,
 %D             big=12pt,
 %D           small=10pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first argument specifies the bodyfont size to which the
 %D settings apply. All second parameters are specified in
@@ -2061,11 +2061,11 @@
          \normalizebodyfontsize\scratchdimen\to\tempbodyfontsize
          \setevalue{\??ft#2#1##1}{\tempbodyfontsize}}%
      \processcommalist
-       [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!groot,\c!klein]
+       [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
        \docommando
      \copyparameters
        [\??ft#2#1][\??ft\s!default]
-       [\c!interlinie,\c!em]}%
+       [\c!interlinespace,\c!em]}%
    \getparameters[\??ft#2#1][#3]%
    \@@endfontdef
    % new code, see remark
@@ -2080,7 +2080,7 @@
 %D {\bf Remark:} We need to cover the following cases,
 %D otherwise users can get confused:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbodyfont[23pt]
 %D
 %D \definebodyfontenvironment[23pt]
@@ -2089,7 +2089,7 @@
 %D \definebodyfontenvironment[23pt]
 %D \definebodyfont[23pt][rm,ss,tt][default]
 %D \setupbodyfont[23pt]
-%D \stoptypen
+%D \stoptyping
 
 %D Beware: while some font defs can be global, the bodyfont
 %D environment checks local. This means that multiple local
@@ -2155,7 +2155,7 @@
   {\csname\bodyfontvariable}
 
 \def\bodyfontinterlinespecs
-  {\bodyfontvariable{\normalizedbodyfontsize\c!interlinie}}
+  {\bodyfontvariable{\normalizedbodyfontsize\c!interlinespace}}
 
 \def\bodyfontinterlinespace
   {\csname\bodyfontinterlinespecs\endcsname}
@@ -2163,9 +2163,9 @@
 %D We default all parameters to the main bodyfont size (begin
 %D \type{#1}), so the next setup is valid too:
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfontenvironment[24pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D All parameters can be redefined when needed, so one does
 %D not have to stick to the default ones.
@@ -2190,7 +2190,7 @@
 %D extended with \type{\bfa}, \type{\slb}, etc. or even
 %D \type{e} and higher alternatives.
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfont [12pt] [rm]
 %D   [tf=cmr12,
 %D    bf=cmbx12,
@@ -2216,7 +2216,7 @@
 %D   tfc=lbr  sa 1.728,
 %D   tfd=lbr  sa 2.074,
 %D    sc=lbr  sa 0.833]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second example shows that we can define more sizes at
 %D once. The main difference between these examples is that the
@@ -2370,7 +2370,7 @@
          \normalizebodyfontsize\scratchdimen\to\!!stringa
          \letvalue{\??ft#1##1}\!!stringa}}%
    \processcommalist
-     [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!groot,\c!klein]
+     [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
      \docommando
    \let\c!text\c!savedtext
    \ifdone
@@ -2391,7 +2391,7 @@
            {\doifundefined{\@size@\getvalue{\??ft#1##1}}
               {\defineunknownfont{\getvalue{\??ft#1##1}}}}%
          \processcommalist
-           [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!groot,\c!klein]
+           [\s!text,\s!script,\s!scriptscript,\c!x,\c!xx,\c!big,\c!small]
            \defineunknownsubfont
          \definingunknownfontfalse
        \fi
@@ -2412,15 +2412,15 @@
 
 %D A previous implementation used:
 %D
-%D \starttypen
+%D \starttyping
 %D \type {\setvalue{name}{\donottest...}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D instead of the more memory hungry:
 %D
-%D \starttypen
+%D \starttyping
 %D \unexpanded\setvalue{name}{...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first alternative saves about 500 hash entries (about
 %D 2.5\% of the total number of entries used. The second
@@ -2441,15 +2441,15 @@
 
 %D At the system level one can initialize thing like:
 %D
-%D \starttypen
+%D \starttyping
 %D \appendtoks \setupspacing \to \everybodyfont
-%D \stoptypen
+%D \stoptyping
 %D
 %D While users can add their own non standard commands like:
 %D
-%D \starttypen
+%D \starttyping
 %D \Everybodyfont{\message{changing to bodyfont \the\bodyfontsize}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Personnaly I never felt the need for such extensions, but
 %D at least its possible.
@@ -2621,9 +2621,9 @@
 %D loaded, but not accessible yet by name. This is accomplished
 %D by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \font\preloaded=cmr10 at 11pt
-%D \stoptypen
+%D \stoptyping
 %D
 %D and using the name \type{\preloaded} again and again, so
 %D fonts are indeed loaded, but unnamed, and therefore
@@ -2679,7 +2679,7 @@
 %D bodyfont size.
 
 \def\dosetfont#1#2%  #1 = set/switch state
-  {\doifelse{#2}\v!globaal
+  {\doifelse{#2}\v!global
      {\restoreglobalbodyfont}
      {\processcommacommand[#2]{\dodosetfont{#1}}% ##1 get also passed
       \ifloadingfonts\else
@@ -3057,9 +3057,9 @@
 %D result in:
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D Setting the main size involves the style list and therefore
@@ -3080,10 +3080,10 @@
 %D also use more verbose names like roman or sansserif. Such
 %D names are defined by:
 %D
-%D \starttypen
-%D \definefontstyle [serif, rm] [rm]
-%D \definefontstyle [sansserif, ss] [ss]
-%D \stoptypen
+%D \starttyping
+%D \definefontstyle [serif,rm] [rm]
+%D \definefontstyle [sansserif,ss] [ss]
+%D \stoptyping
 
 \def\dodefinefontstyle[#1][#2]%
   {\rawdoifinsetelse{#2}{\stylelist}
@@ -3115,7 +3115,7 @@
 %D neccessary to define the whole bunch of fonts, take for
 %D instance the sequence:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbodyfont
 %D   [ams]
 %D
@@ -3127,7 +3127,7 @@
 %D   [24pt]
 %D
 %D This is a 24pt $\blacktriangleleft$
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here we didn't define the 24 point bodyfont environment, so
 %D it's defined automatically. Of course one can always use the
@@ -3163,16 +3163,16 @@
 %D one can set the document bodyfont size, font family, style
 %D and/or options defined in files, for example:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbodyfont[cmr,ams,12pt,roman]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command affects the document as a whole: text, headers
 %D and footers. The second macro however affects only the text:
 %D
-%D \starttypen
+%D \starttyping
 %D \switchtobodyfont[10pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D So we've got:
 %D
@@ -3317,11 +3317,11 @@
 %D For switching a style but keeping the alternative, there
 %D is:
 %D
-%D \starttypen
+%D \starttyping
 %D {\bf text \switchstyleonly\ss text}
 %D {\bf text \switchstyleonly[ss]text}
 %D {\sl text \switchstyleonly[sansserif]text}
-%D \stoptypen
+%D \stoptyping
 
 \definecomplexorsimple\switchstyleonly
 
@@ -3384,9 +3384,9 @@
 %D to switch to a specific bodyfontsize. Just for the sake of
 %D compatibility we can define them like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfontswitch [twelvepoint] [12pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D We don't support language specific synonyms here, mainly
 %D because \PLAIN\ \TEX\ is english anyway.
@@ -3415,8 +3415,8 @@
    \doswitchpoints[\fontstep]%
    \doswitchstyle[\fontstyle]}
 
-\unexpanded\def\setsmallbodyfont{\setbodyfontstep\v!klein\the\everybodyfont}
-\unexpanded\def\setbigbodyfont  {\setbodyfontstep\v!groot\the\everybodyfont}
+\unexpanded\def\setsmallbodyfont{\setbodyfontstep\v!small\the\everybodyfont}
+\unexpanded\def\setbigbodyfont  {\setbodyfontstep\v!big\the\everybodyfont}
 
 \unexpanded\def\setmainbodyfont
   {\doswitchpoints[\normalizedbodyfontsize]%
@@ -3509,24 +3509,24 @@
 %D here implement a mechanism for defining the keywords that
 %D present a particular style or alternative.
 %D
-%D \starttypen
+%D \starttyping
 %D \definealternativestyle [keywords] [\style] [\nostyle]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first command is used in the normal textflow, while the
 %D second command takes care of headings and alike. Consider
 %D the next two definitions:
 %D
-%D \starttypen
+%D \starttyping
 %D \definealternativestyle [bold] [\bf]  []
-%D \definealternativestyle [cap]  [\kap] [\kap]
-%D \stoptypen
+%D \definealternativestyle [cap]  [\cap] [\cap]
+%D \stoptyping
 %D
 %D A change \type{\bf} in a heading which is to be set in
 %D \type{\tfd} does not look that well, so therefore we leave
 %D the second argument of \type{\definealternativestyle} empty.
 %D When we capatalize characters using the pseudo small cap
-%D command \type{\kap}, we want this to take effect in both
+%D command \type{\cap}, we want this to take effect in both
 %D text and headings, which is accomplished by assigning both
 %D arguments.
 
@@ -3556,10 +3556,10 @@
 %D or
 %D
 %D \startvoorbeeld
-%D \definealternativestyle[bold][\bf][]\haalbuffer
+%D \definealternativestyle[bold][\bf][]\getbuffer
 %D \stopvoorbeeld
 %D
-%D Such definitions are of course unwanted for \type{\kap}
+%D Such definitions are of course unwanted for \type{\cap}
 %D because this would result in an endless recursive call.
 %D Therefore we check on the existance of both the command and
 %D the substitution. The latter is needed because for instance
@@ -3575,13 +3575,13 @@
 %D After having defined such keywords, we can call for them by
 %D using
 %D
-%D \starttypen
+%D \starttyping
 %D \doconvertfont{keyword}{text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We deliberately pass an argument. This enables us to
 %D assign converters that handle one agrument, like
-%D \type{\kap}.
+%D \type{\cap}.
 %D
 %D By default the first specification is used to set the style,
 %D exept when we say \type{\dontconvertfont}, after which the
@@ -3629,10 +3629,10 @@
 %D {\sl slanted} type over {\it italic}, we made the emphasis
 %D adaptable, for instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\emphasistypeface {\it}
 %D \def\emphasisboldface {\bi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But we prefer:
 
@@ -3642,9 +3642,9 @@
 %D or even better:
 
 \def\doemphasistypeface#1#2%
-  {\doifelsevalue{\??ft\fontclass\normalizedbodyfontsize\c!em}\v!schuin#1%
+  {\doifelsevalue{\??ft\fontclass\normalizedbodyfontsize\c!em}\v!slanted#1%
   {\doifelsevalue{\??ft\fontclass\normalizedbodyfontsize\c!em}\v!italic#2%
-  {\doifelsevalue{\??ft          \normalizedbodyfontsize\c!em}\v!schuin#1%
+  {\doifelsevalue{\??ft          \normalizedbodyfontsize\c!em}\v!slanted#1%
   {\doifvalue    {\??ft          \normalizedbodyfontsize\c!em}\v!italic#2}}}}
 
 \def\emphasistypeface{\doemphasistypeface\sl\it}
@@ -3768,9 +3768,9 @@
 %D We get:
 %D
 %D \startvoorbeeld
-%D \startopelkaar
-%D \haalbuffer
-%D \stopopelkaar
+%D \startpacked
+%D \getbuffer
+%D \stoppacked
 %D \stopvoorbeeld
 
 %D \macros
@@ -3790,9 +3790,9 @@
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 
 %D \macros
 %D   {setfont}
@@ -3807,9 +3807,9 @@
 
 %D One can call this macro as:
 %D
-%D \starttypen
+%D \starttyping
 %D \setfont cmr10 at 60pt
-%D \stoptypen
+%D \stoptyping
 %D
 %D After which the font is active and the baselines and
 %D struts are set.
@@ -3838,7 +3838,7 @@
 %D different fonts into a collection (typeface) and
 %D determining optimal baseline distances.
 %D
-%D \showfontstrip \blanko \showminimalbaseline
+%D \showfontstrip \blank \showminimalbaseline
 
 \fetchruntimecommand \showfontstrip       {\f!fontprefix\s!run}
 \fetchruntimecommand \testminimalbaseline {\f!fontprefix\s!run}
@@ -3881,7 +3881,7 @@
 %D shown. Special characters like the \type {\skewchar} and
 %D \type {\hyphenchar} als marked.
 %D
-%D \haalbuffer
+%D \getbuffer
 
 % to be internationalized
 
@@ -3896,9 +3896,9 @@
 %D
 %D Individual glyphs can be accessed by using
 %D
-%D \starttypen
+%D \starttyping
 %D \getglyph{fontname}{character}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro is used in for instance the symbol modules and
 %D as one can see, it does obey the small and even smaller
@@ -3972,10 +3972,10 @@
 %D For an example of usage of the following command,
 %D see \type {cont-log.tex}.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\symbolicfont#1%
 %D   {\definedfont[\glyphfontfile{#1} sa *]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Since we know what scaling it to be applied, we can
 %D implement a much faster alternative:
@@ -4008,7 +4008,7 @@
 %D The last implementation of \type {\getglyph} permits
 %D definitions like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definefontsynonym [EuroSans]            [eurose]
 %D \definefontsynonym [EuroSansBold]        [euroseb]
 %D \definefontsynonym [EuroSansItalic]      [eurosei]
@@ -4019,13 +4019,13 @@
 %D \definesymbol [euro] [\getglyph{Euro}{\char160}]
 %D
 %D \def\euro{\symbol[euro]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These definitions guarantee that the next calls work okay:
 %D
-%D \starttypen
+%D \starttyping
 %D \ss \tf\euro \bf\euro \sla\euro \itd\euro \bs\euro \bic\euro
-%D \stoptypen
+%D \stoptyping
 %D
 %D The shape as well as the size is adapted to the current
 %D environment.
@@ -4117,9 +4117,9 @@
 
 %D For instance we can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \smashaccent{\"Uberhaupt}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But normally one will use it as a prefix in definitions.
 %D The difference is in the height:
@@ -4127,16 +4127,16 @@
 %D \leavevmode\ruledhbox
 %D   {\ruledhbox{\smashaccent{\"U}berhaupt}\quad
 %D    oder\quad
-%D    \ruledhbox{\"Uberhaupt}
+%D    \ruledhbox{\"Uberhaupt}}
 
 %D \macros
 %D   {moveaccent}
 %D
 %D Exact positioning of accents can be realized by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \moveaccent{-.1ex}{\"u}berhaupt
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again, this one will mostly used as a prefix in definitions.
 %D Here the difference is in the position:
@@ -4160,15 +4160,15 @@
 %D also deal with different naming schemes. Confronted with
 %D this problem, I decided to change the definitions into:
 %D
-%D \starttypen
+%D \starttyping
 %D \definebodyfont [12pt] [rm] [tf=Times-Roman at 12pt]
-%D \stoptypen
+%D \stoptyping
 %D
 %D combined with for instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \definefontsynonym [Times-Roman] [tir]
-%D \stoptypen
+%D \stoptyping
 
 %D Now we're up to some definitions.
 
@@ -4184,10 +4184,10 @@
                  *=\currentfontscale, % wildcard
               \c!x=0.8,
              \c!xx=0.6,
-          \c!groot=1.2,
-          \c!klein=0.8,
-     \c!interlinie=,
-             \c!em=\v!schuin]
+          \c!big=1.2,
+          \c!small=0.8,
+     \c!interlinespace=,
+             \c!em=\v!slanted]
 
 \definebodyfontenvironment
   [20.7pt]
@@ -4196,8 +4196,8 @@
    \s!scriptscript=\!!twelvepoint,
               \c!x=17.3pt,
              \c!xx=\!!fourteenpointfour,
-          \c!groot=20.7pt,    % !!!!
-          \c!klein=17.3pt]
+          \c!big=20.7pt,    % !!!!
+          \c!small=17.3pt]
 
 \definebodyfontenvironment
   [17.3pt]
@@ -4206,8 +4206,8 @@
    \s!scriptscript=\!!tenpoint,
               \c!x=\!!fourteenpointfour,
              \c!xx=\!!twelvepoint,
-          \c!groot=20.7pt,
-          \c!klein=\!!fourteenpointfour]
+          \c!big=20.7pt,
+          \c!small=\!!fourteenpointfour]
 
 \definebodyfontenvironment
   [\!!fourteenpointfour]
@@ -4216,8 +4216,8 @@
    \s!scriptscript=\!!ninepoint,
               \c!x=\!!twelvepoint,
              \c!xx=\!!tenpoint,
-          \c!groot=17.3pt,
-          \c!klein=\!!twelvepoint]
+          \c!big=17.3pt,
+          \c!small=\!!twelvepoint]
 
 \definebodyfontenvironment
   [\!!twelvepoint]
@@ -4226,8 +4226,8 @@
    \s!scriptscript=\!!sevenpoint,
               \c!x=\!!tenpoint,
              \c!xx=\!!eightpoint,
-          \c!groot=\!!fourteenpointfour,
-          \c!klein=\!!tenpoint]
+          \c!big=\!!fourteenpointfour,
+          \c!small=\!!tenpoint]
 
 \definebodyfontenvironment
   [\!!elevenpoint]
@@ -4236,8 +4236,8 @@
    \s!scriptscript=\!!sixpoint,
               \c!x=\!!ninepoint,
              \c!xx=\!!sevenpoint,
-          \c!groot=\!!twelvepoint,
-          \c!klein=\!!ninepoint]
+          \c!big=\!!twelvepoint,
+          \c!small=\!!ninepoint]
 
 \definebodyfontenvironment
   [\!!tenpoint]
@@ -4246,8 +4246,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!eightpoint,
              \c!xx=\!!sixpoint,
-          \c!groot=\!!twelvepoint,
-          \c!klein=\!!eightpoint]
+          \c!big=\!!twelvepoint,
+          \c!small=\!!eightpoint]
 
 \definebodyfontenvironment
   [\!!ninepoint]
@@ -4256,8 +4256,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sevenpoint,
              \c!xx=\!!fivepoint,
-          \c!groot=\!!elevenpoint,
-          \c!klein=\!!sevenpoint]
+          \c!big=\!!elevenpoint,
+          \c!small=\!!sevenpoint]
 
 \definebodyfontenvironment
   [\!!eightpoint]
@@ -4266,8 +4266,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sixpoint,
              \c!xx=\!!fivepoint,
-          \c!groot=\!!tenpoint,
-          \c!klein=\!!sixpoint]
+          \c!big=\!!tenpoint,
+          \c!small=\!!sixpoint]
 
 \definebodyfontenvironment
   [\!!sevenpoint]
@@ -4276,8 +4276,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!sixpoint,
              \c!xx=\!!fivepoint,
-          \c!groot=\!!ninepoint,
-          \c!klein=\!!fivepoint]
+          \c!big=\!!ninepoint,
+          \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
   [\!!sixpoint]
@@ -4286,8 +4286,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!fivepoint,
              \c!xx=\!!fivepoint,
-          \c!groot=\!!eightpoint,
-          \c!klein=\!!fivepoint]
+          \c!big=\!!eightpoint,
+          \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
   [\!!fivepoint]
@@ -4296,8 +4296,8 @@
    \s!scriptscript=\!!fivepoint,
               \c!x=\!!fivepoint,
              \c!xx=\!!fivepoint,
-          \c!groot=\!!sevenpoint,
-          \c!klein=\!!fivepoint]
+          \c!big=\!!sevenpoint,
+          \c!small=\!!fivepoint]
 
 \definebodyfontenvironment
   [\!!fourpoint]
@@ -4306,8 +4306,8 @@
    \s!scriptscript=\!!fourpoint,
               \c!x=\!!fourpoint,
              \c!xx=\!!fourpoint,
-          \c!groot=\!!sixpoint,
-          \c!klein=\!!fourpoint]
+          \c!big=\!!sixpoint,
+          \c!small=\!!fourpoint]
 
 \definebodyfontswitch [fourteenpointfour] [\!!fourteenpointfour]
 \definebodyfontswitch [twelvepoint]       [\!!twelvepoint]
@@ -4340,29 +4340,31 @@
 \definefontsize[\c!c] \definefontsize[\c!d]
 
 \definealternativestyle [\v!mediaeval]                        [\os]  []
-\definealternativestyle [\v!normaal]                          [\tf]  []
-\definealternativestyle [\v!vet]                              [\bf]  []
+\definealternativestyle [\v!normal]                          [\tf]  []
+\definealternativestyle [\v!bold]                              [\bf]  []
 \definealternativestyle [\v!type]                             [\tt]  []
-\definealternativestyle [\v!schuin]                           [\sl]  []
+\definealternativestyle [\v!slanted]                           [\sl]  []
 \definealternativestyle [\v!italic]                           [\it]  []
-\definealternativestyle [\v!vetschuin,\v!schuinvet]           [\bs]  []
-\definealternativestyle [\v!vetitalic,\v!italicvet]           [\bi]  []
-\definealternativestyle [\v!klein,\v!kleinnormaal]            [\tfx] []
-\definealternativestyle [\v!kleinvet]                         [\bfx] []
-\definealternativestyle [\v!kleintype]                        [\ttx] []
-\definealternativestyle [\v!kleinschuin]                      [\slx] []
-\definealternativestyle [\v!kleinvetschuin,\v!kleinschuinvet] [\bsx] []
-\definealternativestyle [\v!kleinvetitalic,\v!kleinitalicvet] [\bix] []
+\definealternativestyle [\v!boldslanted,\v!slantedbold]           [\bs]  []
+\definealternativestyle [\v!bolditalic,\v!italicbold]           [\bi]  []
+\definealternativestyle [\v!small,\v!smallnormal]            [\tfx] []
+\definealternativestyle [\v!smallbold]                         [\bfx] []
+\definealternativestyle [\v!smalltype]                        [\ttx] []
+\definealternativestyle [\v!smallslanted]                      [\slx] []
+\definealternativestyle [\v!smallboldslanted,\v!smallslantedbold] [\bsx] []
+\definealternativestyle [\v!smallbolditalic,\v!smallitalicbold] [\bix] []
+
+%D Slow but handy:
 
-\definealternativestyle [\v!kleinkorps] [\setsmallbodyfont] []
-\definealternativestyle [\v!grootkorps] [\setbigbodyfont]   []
+\definealternativestyle [\v!smallbodyfont] [\setsmallbodyfont] []
+\definealternativestyle [\v!bigbodyfont] [\setbigbodyfont]   []
 
-%D We treat {\sc Small Caps} and \kap {Pseudo Caps} a bit
-%D different. We also provide an \WOORD {uppercase} style.
+%D We treat {\sc Small Caps} and \cap {Pseudo Caps} a bit
+%D different. We also provide an \WORD {uppercase} style.
 
-\definealternativestyle [\v!kap,\v!kapitaal] [\normalkap] [\normalkap]
-\definealternativestyle [\v!smallcaps]       [\sc]        [\sc]
-\definealternativestyle [\v!WOORD]           [\WORD]      [\WORD]
+\definealternativestyle [\v!cap,\v!capital] [\smallcapped] [\smallcapped]
+\definealternativestyle [\v!smallcaps]       [\sc]          [\sc]
+\definealternativestyle [\v!WOORD]           [\WORD]        [\WORD]
 
 %D \macros
 %D   {...math}
@@ -4428,7 +4430,7 @@
 
 %D Some unused left||overs:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doiffontpresentelse#1#2#3%
 %D   {\bgroup
 %D    \batchmode\font\dummy=\truefontname{#1}\errorstopmode
@@ -4437,4 +4439,4 @@
 %D
 %D \def\abortiffontnotfound#1%
 %D   {\doiffontpresentelse{#1}{}{\showmessage{\m!fonts}{10}{\truefontname{#1}}\endinput}}
-%D \stoptypen
\ No newline at end of file
+%D \stoptyping
diff --git a/tex/context/base/font-map.tex b/tex/context/base/font-map.tex
index 4d4362009..8dbe8d24f 100644
--- a/tex/context/base/font-map.tex
+++ b/tex/context/base/font-map.tex
@@ -1,7 +1,7 @@
 % NOT YET ADAPTED TO THE NEW FONT MACROS 
 
 %D \module
-%D   [     file=font-map,
+%D   [     filefile=font-map,
 %D      version=1998.03.13,
 %D        title=\CONTEXT\ Font Macros,
 %D     subtitle=Postscript for Maps,
diff --git a/tex/context/base/font-run.tex b/tex/context/base/font-run.tex
index 1b2471a59..36559206b 100644
--- a/tex/context/base/font-run.tex
+++ b/tex/context/base/font-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=font-run,
+%D   [       filefile=font-run,
 %D        version=1998.09.11, % (second)
 %D        version=2001.02.20, % (third)
 %D          title=\CONTEXT\ Font Macros,
@@ -58,11 +58,11 @@
          \tabskip=\!!zeropoint\cr
          \noalign{\hrule}
          &\multispan{29}{\vrule\hfil\tttf\strut\title\hfil
-          \llap{\string\mr\hbox to 1em{\hss:\hss}$\mr \languageparameter\c!tekst$\quad}\vrule}\cr
+          \llap{\string\mr\hbox to 1em{\hss:\hss}$\mr \languageparameter\c!text$\quad}\vrule}\cr
          \noalign{\hrule}\next{}{\tt\string}{}
-         \noalign{\hrule}\next{\tt\string\rm}\rm{\languageparameter\c!tekst}
-         \noalign{\hrule}\next{\tt\string\ss}\ss{\languageparameter\c!tekst}
-         \noalign{\hrule}\next{\tt\string\tt}\tt{\languageparameter\c!tekst}
+         \noalign{\hrule}\next{\tt\string\rm}\rm{\languageparameter\c!text}
+         \noalign{\hrule}\next{\tt\string\ss}\ss{\languageparameter\c!text}
+         \noalign{\hrule}\next{\tt\string\tt}\tt{\languageparameter\c!text}
          \noalign{\hrule}}}
    \ifinsidefloat\else\stopbaselinecorrection\fi}
 
@@ -79,9 +79,9 @@
          &&\getvalue{\bodyfontvariable{##1\s!scriptscript}}%
          &&\getvalue{\bodyfontvariable{##1\c!x}}%
          &&\getvalue{\bodyfontvariable{##1\c!xx}}%
-         &&\getvalue{\bodyfontvariable{##1\interfaced\v!klein}}%
-         &&\getvalue{\bodyfontvariable{##1\interfaced\v!groot}}%
-         &&\getvalue{\bodyfontvariable{##1\c!interlinie}}&\cr
+         &&\getvalue{\bodyfontvariable{##1\interfaced\v!small}}%
+         &&\getvalue{\bodyfontvariable{##1\interfaced\v!big}}%
+         &&\getvalue{\bodyfontvariable{##1\c!interlinespace}}&\cr
          \noalign{\hrule}}
       \halign to \localhsize
         {##&\vrule##\strut
@@ -94,8 +94,8 @@
          &\multispan{17}{\vrule\hfil\tttf\strut\title\hfil}\vrule\cr
          \noalign{\hrule}
          &&\tttf\tx\s!text&&\tttf\tx\s!script&&\tttf\tx\s!scriptscript
-         &&\tttf\tx\c!x&&\tttf\tx\c!xx&&\tttf\tx\v!klein&&\tttf\tx\v!groot
-         &&\tttf\tx\c!interlinie&\cr
+         &&\tttf\tx\c!x&&\tttf\tx\c!xx&&\tttf\tx\v!small&&\tttf\tx\v!big
+         &&\tttf\tx\c!interlinespace&\cr
          \noalign{\hrule}
          \@EA\globalprocesscommalist\@EA[\bodyfontenvironmentlist]\next}}
    \ifinsidefloat\else\stopbaselinecorrection\fi}
@@ -111,7 +111,7 @@
 
 \gdef\doshowfont[#1]%
   {\bgroup
-   \setupcolors[\c!status=\v!lokaal]%
+   \setupcolors[\c!state=\v!local]%
    \iffirstargument
      \definefont[\s!dummy][#1]\dummy
    \else\ifdim2.5em>.05\hsize \tx
@@ -175,7 +175,7 @@
                         \fi}}
                   \stopoverlay}}}
           \par}}
-     {\tf\basegrid[\c!nx=16,\c!ny=16,\c!dx=2.5,\c!dy=2.5,\c!eenheid=em]}
+     {\tf\basegrid[\c!nx=16,\c!ny=16,\c!dx=2.5,\c!dy=2.5,\c!unit=em]}
    \stopoverlay
    \nointerlineskip
    \vskip2pt
@@ -224,10 +224,10 @@
 
 \gdef\showligatures[#1]%
   {\ifx\starttabulate\undefined
-     \blanko{\tttf \type {\showligatures} is only available in thr english interface}\blanko
+     \blank{\tttf \type {\showligatures} is only available in thr english interface}\blank
    \else
      \bgroup
-     \setupcolors[\c!status=\v!lokaal]%
+     \setupcolors[\c!state=\v!local]%
      \def\show##1{\hbox{\red\ruledhbox{\black##1}}}%
      \definefont[\s!dummy][#1]\dummy
      \starttabulate[|*{9}{c|}]
@@ -244,7 +244,7 @@
 
 \gdef\doshowfontstrip[#1]%
   {\ifx\starttabulate\undefined
-     \blanko{\tttf \type {\showfontstrip} is only available in thr english interface}\blanko
+     \blank{\tttf \type {\showfontstrip} is only available in thr english interface}\blank
    \else
      \bgroup
      \def\dofontstripa##1##2%
@@ -300,7 +300,7 @@
 
 \gdef\showminimalbaseline
   {\ifx\starttabulate\undefined
-     \blanko{\tttf \type {\showminimalbaseline} is only available in thr english interface}\blanko
+     \blank{\tttf \type {\showminimalbaseline} is only available in thr english interface}\blank
    \else
      \starttabulate[||T|T|T|T|T|T|T|T|T|]
      \testminimalbaseline{\hbox to 1em{\hss\showstruts\strut\hss}}%
@@ -323,4 +323,4 @@
        \expanded{\withoutpt\the\nextboxdp})}%
      \hbox}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex
index a9f87e28c..9112373f6 100644
--- a/tex/context/base/font-uni.tex
+++ b/tex/context/base/font-uni.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=font-uni,
+%D   [       filefile=font-uni,
 %D        version=1999.10.10,
 %D          title=\CONTEXT\ Font Macros,
 %D       subtitle=\UNICODE\ Initialization,
@@ -13,7 +13,7 @@
 
 \writestatus{loading}{Context Font Macros / UNICODE Support}
 
-%D I wrote this module when \WangLei\ asked me how to use
+%D I wrote this module when Wang Lei asked me how to use
 %D Chinese in \CONTEXT. From the samples he sent me, I deduced
 %D that some mixture of one and two byte encoding was used,
 %D which he confirmed. Since \TEX\ normally does not use the
@@ -71,10 +71,10 @@
 %D
 %D There are two commands to handle unicode characters:
 %D
-%D \starttypen
+%D \starttyping
 %D \handleunicodeflowglyph{number}{character}
 %D \uchar{number}{number}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first one can be assigned to an active character, the
 %D second one can be used to directly access a glyph. Both
@@ -252,9 +252,9 @@
 %D access the glyph in that font. This means that a particular
 %D font is split up in subfonts with names in the range:
 %D
-%D \starttypen
+%D \starttyping
 %D <filename>80 ... <filename>ff
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type {<filename>} as well as the composed name are
 %D mapped ones. The next macros take care of this mapping.
@@ -325,7 +325,7 @@
 
 %D An example of a remapping is the following:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineucharmapping{GBK}#1#2%
 %D   {\unicodeposition=#1
 %D    \advance\unicodeposition -129
@@ -333,7 +333,7 @@
 %D    \advance\unicodeposition #2
 %D    \advance\unicodeposition-\ifnum#2>127 65\else64\fi
 %D    \dorepositionunicode}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This maps the GBK vector onto a compact GBK one. The
 %D auxiliary macro is defined here as a goody.
@@ -354,14 +354,14 @@
 %D A careful analysis of the previous macros, learns that the
 %D process of mapping comes down to:
 %D
-%D \startopsomming[opelkaar,n]
-%D \som  taking care of preceding material (and spacing)
-%D \som  defining the font at \type {\currentfontscale} $\times$
+%D \startitemize[packed,n]
+%D \item  taking care of preceding material (and spacing)
+%D \item  defining the font at \type {\currentfontscale} $\times$
 %D       \type {\unicodescale} $\times$ \type {\bodyfontsize}
-%D \som  inserting a \type {\unicodestrut}
-%D \som  inserting the character (glyph)
-%D \som  executing some actions afterwards
-%D \stopopsomming
+%D \item  inserting a \type {\unicodestrut}
+%D \item  inserting the character (glyph)
+%D \item  executing some actions afterwards
+%D \stopitemize
 %D
 %D The actions before and after placing the glyph, is up to
 %D the user supplied handler. This handler (\type
@@ -405,30 +405,30 @@
 %D provide a more user friendly alternative. Given that one
 %D has defined:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineunicodefont
 %D   [SimChi] [SimplifiedChinese]
-%D   [   \c!schaal=0.85,
-%D       \c!hoogte=1.25,
-%D       \c!diepte=1.00,
-%D   \c!interlinie=yes,
-%D    \c!conversie=\chinesenumber,
-%D     \c!commando=\handlechineseunicodeglyph]
-%D \stoptypen
+%D   [   \c!scale=0.85,
+%D       \c!height=1.25,
+%D       \c!depth=1.00,
+%D   \c!interlinespaceinterlinie=yes,
+%D    \c!conversion=\chinesenumber,
+%D     \c!command=\handlechineseunicodeglyph]
+%D \stoptyping
 %D
 %D Together with:
 %D
-%D \starttypen
+%D \starttyping
 %D \definefontsynonym [SimplifiedChineseRegular] [gbsong]
 %D \definefontsynonym [SimplifiedChineseSlanted] [gbsongsl]
-%D \stoptypen
+%D \stoptyping
 %D
 %D we can now switch to Simplified Chinese by saying \type
 %D {SimChi}. Some values can be changed afterwards with
 %D
-%D \starttypen
+%D \starttyping
 %D \setupunicodefont[SimChi][...=...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Specific initializations can be assigned to \type
 %D {commands}.
@@ -459,8 +459,8 @@
         {\setupunicodefont[#1][#3]}
         {\copyparameters
            [\??uc#1][\??uc#3]
-           [\c!hoogte,\c!diepte,\c!schaal,\c!commandos,
-            \c!interlinie,\c!commando,\c!conversie]}}%
+           [\c!height,\c!depth,\c!scale,\c!commands,
+            \c!interlinespace,\c!command,\c!conversion]}}%
    \doifelsenothing{#2}
      {\setvalue{#1}{[uc font #1 undefined]}}
      {\setvalue{\??uc#1\c!file}{#2}%
@@ -476,23 +476,23 @@
   {\dodoubleempty\dosetupunicodefont}
 
 \def\dosetupunicodefont[#1][#2]% also predefines
-  {\doifundefined{\??uc#1\c!commando}
+  {\doifundefined{\??uc#1\c!command}
      {\copyparameters
         [\??uc#1][\??uc\s!default]
-        [\c!hoogte,\c!diepte,\c!schaal,\c!commandos,
-         \c!interlinie,\c!commando,\c!conversie]}%
+        [\c!height,\c!depth,\c!scale,\c!commands,
+         \c!interlinespace,\c!command,\c!conversion]}%
    \getparameters[\??uc#1][#2]}
 
 \def\enableunicodefont#1%
   {\definefontsynonym[\s!Unicode][\getvalue{\??uc#1\c!file}]%
-   \def\unicodescale             {\getvalue{\??uc#1\c!schaal}}%
-   \def\unicodeheight            {\getvalue{\??uc#1\c!hoogte}}%
-   \def\unicodedepth             {\getvalue{\??uc#1\c!diepte}}%
-   \def\unicodedigits            {\getvalue{\??uc#1\c!conversie}}%
-   \def\handleunicodeglyph       {\getvalue{\??uc#1\c!commando}}%
+   \def\unicodescale             {\getvalue{\??uc#1\c!scale}}%
+   \def\unicodeheight            {\getvalue{\??uc#1\c!height}}%
+   \def\unicodedepth             {\getvalue{\??uc#1\c!depth}}%
+   \def\unicodedigits            {\getvalue{\??uc#1\c!conversion}}%
+   \def\handleunicodeglyph       {\getvalue{\??uc#1\c!command}}%
    \enableregime[unicode]% the following \relax's are realy needed
-   \doifvalue{\??uc#1\c!interlinie}\v!ja\setupinterlinespace\relax
-   \getvalue{\??uc#1\c!commandos}\relax}
+   \doifvalue{\??uc#1\c!interlinespace}\v!yes\setupinterlinespace\relax
+   \getvalue{\??uc#1\c!commands}\relax}
 
 %D \macros
 %D   {unicodedigits}
@@ -513,11 +513,11 @@
 
 \setupunicodefont
   [\s!default]
-  [\c!hoogte=1,
-   \c!diepte=1,
-   \c!schaal=1,
-   \c!interlinie=\v!ja,
-   \c!commando=\insertunicodeglyph,
-   \c!conversie=\number]
+  [\c!height=1,
+   \c!depth=1,
+   \c!scale=1,
+   \c!interlinespace=\v!yes,
+   \c!command=\insertunicodeglyph,
+   \c!conversion=\number]
 
 \protect \endinput
diff --git a/tex/context/base/font-unk.tex b/tex/context/base/font-unk.tex
index 66c5b92c5..9f1251fc7 100644
--- a/tex/context/base/font-unk.tex
+++ b/tex/context/base/font-unk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=font-unk,
+%D   [       filefile=font-unk,
 %D        version=1998.09.10,
 %D          title=\CONTEXT\ Font Macros,
 %D       subtitle=Unknown Defaults,
@@ -160,4 +160,4 @@
 %D mapped onto real file names (or names that themselves are
 %D mapped).
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/font-vnr.tex b/tex/context/base/font-vnr.tex
index d9e4a3b67..5a2160c81 100644
--- a/tex/context/base/font-vnr.tex
+++ b/tex/context/base/font-vnr.tex
@@ -1,7 +1,7 @@
 % NOT YET ADAPTED TO THE NEW FONT MACROS 
 
 %D \module
-%D   [       file=font-vnr,
+%D   [       filefile=font-vnr,
 %D        version=1999.12.12,
 %D          title=\CONTEXT\ Font Macros,
 %D       subtitle=Computer Modern Vietnamese,
diff --git a/tex/context/base/hand-def.tex b/tex/context/base/hand-def.tex
index ac1c8566a..0a758e713 100644
--- a/tex/context/base/hand-def.tex
+++ b/tex/context/base/hand-def.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=hand-def, % was enco-pro
+%D   [     filefile=hand-def, % was enco-pro
 %D      version=2000.29.09,
 %D        title=\CONTEXT\ Handling Macros,
 %D     subtitle=Default Protruding Factors,
@@ -362,13 +362,13 @@
 
 % protruding variants -- slanted/italic is yet incomplete
 
-\definefonthandling [pure]        [pure]                       [\c!type=\v!hangend]
-\definefonthandling [normal]      [punctuation,alpha,extended] [\c!type=\v!hangend]
-\definefonthandling [bold]        [punctuation,alpha,extended] [\c!type=\v!hangend]
-\definefonthandling [slanted]     [punctuation]                [\c!type=\v!hangend,\c!rechts=1.5]
-\definefonthandling [italic]      [punctuation]                [\c!type=\v!hangend,\c!rechts=1.5]
-\definefonthandling [boldslanted] [punctuation]                [\c!type=\v!hangend,\c!rechts=1.5]
-\definefonthandling [bolditalic]  [punctuation]                [\c!type=\v!hangend,\c!rechts=1.5]
+\definefonthandling [pure]        [pure]                       [\c!type=\v!hanging]
+\definefonthandling [normal]      [punctuation,alpha,extended] [\c!type=\v!hanging]
+\definefonthandling [bold]        [punctuation,alpha,extended] [\c!type=\v!hanging]
+\definefonthandling [slanted]     [punctuation]                [\c!type=\v!hanging,\c!right=1.5]
+\definefonthandling [italic]      [punctuation]                [\c!type=\v!hanging,\c!right=1.5]
+\definefonthandling [boldslanted] [punctuation]                [\c!type=\v!hanging,\c!right=1.5]
+\definefonthandling [bolditalic]  [punctuation]                [\c!type=\v!hanging,\c!right=1.5]
 
 % hz variants
 
@@ -393,4 +393,4 @@
 
 \definefonthandling [glm] [glm]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex
index d9a2edddc..4efe41a26 100644
--- a/tex/context/base/hand-ini.tex
+++ b/tex/context/base/hand-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=hand-ini, % moved from enco-ini / pro
+%D   [       filefile=hand-ini, % moved from enco-ini / pro
 %D        version=2000.12.27, % 1998.12.03,
 %D          title=\CONTEXT\ Handling Macros,
 %D       subtitle=Initialization,
@@ -143,14 +143,14 @@
      \pdffontexpand\handledfont
        \csname\@fha@\@fha@#1\c!min \endcsname\space
        \csname\@fha@\@fha@#1\c!max \endcsname\space
-       \csname\@fha@\@fha@#1\c!stap\endcsname\space
+       \csname\@fha@\@fha@#1\c!step\endcsname\space
        \@@pdfexpandbonus\relax}
 
   \def\showfontadjusting#1%
     {\writestatus\m!handlings{[adjust]\space#1\space
        \csname\@fha@\@fha@#1\c!min \endcsname/%
        \csname\@fha@\@fha@#1\c!max \endcsname/%
-       \csname\@fha@\@fha@#1\c!stap\endcsname\space
+       \csname\@fha@\@fha@#1\c!step\endcsname\space
        \fontname\handledfont}}
 \fi
 
@@ -178,19 +178,19 @@
   \rproddimen1000\onepoint \divide\rproddimen\maxcard
 
   \def\setprotrudingfactor#1%
-    {\doifvalue{\@fha@\@fha@#1\c!type}\v!hangend{\dosetprotrudingfactor{#1}}}
+    {\doifvalue{\@fha@\@fha@#1\c!type}\v!hanging{\dosetprotrudingfactor{#1}}}
 
   \def\dosetprotrudingfactor#1% mo \onepoint instead of pt
-    {\lproddimen\csname\@fha@\@fha@#1\c!links\endcsname\s!pt
+    {\lproddimen\csname\@fha@\@fha@#1\c!left\endcsname\s!pt
      \multiply\lproddimen\plusthousand\divide\lproddimen\maxcard\relax
-     \rproddimen\csname\@fha@\@fha@#1\c!rechts\endcsname\s!pt
+     \rproddimen\csname\@fha@\@fha@#1\c!right\endcsname\s!pt
      \multiply\rproddimen\plusthousand\divide\rproddimen\maxcard\relax
      \iftracefonthandling\showprotrudingfactor{#1}\fi}
 
   \def\showprotrudingfactor#1%
     {\writestatus\m!handlings{[protrude]\space#1\space
-       \csname\@fha@\@fha@#1\c!links \endcsname\space
-       \csname\@fha@\@fha@#1\c!rechts\endcsname\space
+       \csname\@fha@\@fha@#1\c!left \endcsname\space
+       \csname\@fha@\@fha@#1\c!right\endcsname\space
        \fontname\handledfont}}
 
   \def\dodefineprotrudefactor#1#2 #3 #4 %
@@ -250,7 +250,7 @@
 
     \def\protrudethreshold{36\onepoint}
 
-    \def\redodefineprotrudefactor
+    \def\redodefineprotrudefactor#1%
       {\ifdim\fontdimen6\font>\protrudethreshold
          \divide\scratchdimen\fontdimen6\font
          \multiply\scratchdimen\wd\charbox
@@ -325,7 +325,7 @@
 \def\dodefinefonthandling[#1][#2][#3]%
   {\ifthirdargument
      \setvalue{\@fha@\@fha@#1}{#2}%
-     \getparameters[\@fha@\@fha@#1][\c!type=\v!hangend,\c!links=1,\c!rechts=1,\c!min=20,\c!max=20,\c!stap=5,#3]%
+     \getparameters[\@fha@\@fha@#1][\c!type=\v!hanging,\c!left=1,\c!right=1,\c!min=20,\c!max=20,\c!step=5,#3]%
    \else
      \setvalue{\@fha@\@fha@\@fha@#1}{#2}%
    \fi}
@@ -344,8 +344,9 @@
 
 \beginTEX
 
-\def\fastenablehandling#1%
+\def\fastenablehandling#1#2%
   {\edef\askedfonthandling{#1}%
+   \edef\filoffonthandling{#2}%
    \@EA\ifx\csname\@fha@\@fha@\@fha@\askedfonthandling\endcsname\relax
      \@EA\ifx\csname\@fha@\@fha@\askedfonthandling\endcsname\relax
        \@EAEAEA\nofastenablehandling
@@ -493,4 +494,4 @@
 
 \usehandling [def]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/java-ans.tex b/tex/context/base/java-ans.tex
index 636c894f9..89d3330b9 100644
--- a/tex/context/base/java-ans.tex
+++ b/tex/context/base/java-ans.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-ans,
+%D   [       filefile=java-ans,
 %D        version=1998.06.01,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Answer Analization,
diff --git a/tex/context/base/java-exa.tex b/tex/context/base/java-exa.tex
index 52c26bf10..896b79149 100644
--- a/tex/context/base/java-exa.tex
+++ b/tex/context/base/java-exa.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-exa,
+%D   [       filefile=java-exa,
 %D        version=2002.??.??,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Example Support,
@@ -376,4 +376,4 @@
 
 \stopJSpreamble
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/java-fil.tex b/tex/context/base/java-fil.tex
index 02f32dffc..e4d156920 100644
--- a/tex/context/base/java-fil.tex
+++ b/tex/context/base/java-fil.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-fil,
+%D   [       filefile=java-fil,
 %D        version=1998.06.01,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Filing and Printing,
@@ -45,4 +45,4 @@
   [PrintThisPage]
   [JS(Print_This_Page)]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/java-fld.tex b/tex/context/base/java-fld.tex
index aa563c1a4..e2b304083 100644
--- a/tex/context/base/java-fld.tex
+++ b/tex/context/base/java-fld.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-fld,
+%D   [       filefile=java-fld,
 %D        version=1998.05.20,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Field Support,
@@ -301,4 +301,4 @@ function Walk_Field ( FieldSet )
 
 \stopJSpreamble
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/java-ini.tex b/tex/context/base/java-ini.tex
index 495b86a41..b6da3b54f 100644
--- a/tex/context/base/java-ini.tex
+++ b/tex/context/base/java-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-ini,
+%D   [       filefile=java-ini,
 %D        version=1998.01.30,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Initialization,
@@ -102,59 +102,59 @@
 %D related to the referencing mechanism. Integration takes
 %D place by
 %D
-%D \starttypen
-%D \naar{calculate total}[Sum()]
-%D \stoptypen
+%D \starttyping
+%D \goto{calculate total}[Sum()]
+%D \stoptyping
 %D
 %D The \type{()} classify this as a script. If they are absent,
 %D the keyword is treated as a normal reference.
 %D
 %D One can pass arguments to such a script by saying:
 %D
-%D \starttypen
-%D \naar{calculate total}[Sum(1.5,2.3)]
-%D \stoptypen
+%D \starttyping
+%D \goto{calculate total}[Sum(1.5,2.3)]
+%D \stoptyping
 %D
 %D References are passed by using the \type{R{}} classifier.
 %D
-%D \starttypen
-%D \naar{calculate total}[Sum(1.5,2.3,R{overflow})]
-%D \stoptypen
+%D \starttyping
+%D \goto{calculate total}[Sum(1.5,2.3,R{overflow})]
+%D \stoptyping
 %D
 %D The last call calls the script \type{Sum} and passes the
 %D next set of variables:
 %D
-%D \starttypen
+%D \starttyping
 %D JS_S_1="1.5";
 %D JS_S_2="2.3";
 %D JS_R_3="overflow";
 %D JS_P_3=3;
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first two parameters are just strings, the third one
 %D however is treated as a reference and results in passing the
 %D reference (if needed this references is prefixed) and the
 %D (real) page number. The alternative:
 %D
-%D \starttypen
-%D \naar{calculate total}[JS(Sum{V{1.5},V{2.3},R{overflow}})]
-%D \stoptypen
+%D \starttyping
+%D \goto{calculate total}[JS(Sum{V{1.5},V{2.3},R{overflow}})]
+%D \stoptyping
 %D
 %D does a verbose passing:
 %D
-%D \starttypen
+%D \starttyping
 %D JS_V_1=1.5;
 %D JS_V_2=2.3;
 %D JS_R_3="overflow";
 %D JS_P_3=3;
-%D \stoptypen
+%D \stoptyping
 % %D
 % %D Finally we have a counter that tells\JAVA\ how many
 % %D arguments were passed,
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D JS_N
-% %D \stoptypen
+% %D \stoptyping
 
 %D We will also support direct function calls. In that case
 %D no intermediate variables are used.
@@ -164,7 +164,7 @@
 %D
 %D A piece of \JAVASCRIPT\ code is defined by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \startJScode{SomeScript}
 %D   var Item=this.getField("item");
 %D          N=Item.getArray();
@@ -176,7 +176,7 @@
 %D   if ((JS_N>0) && (JS_R_1!=""))
 %D     { gotoNamedDest(JS_R_1) };
 %D \stopJScode
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such a piece of code is closely related to the interpreter
 %D used. Watch the last two lines, here the script adapts
@@ -184,21 +184,21 @@
 %D
 %D While
 %D
-%D \starttypen
+%D \starttyping
 %D \startJScode{name}
 %D   name = 4 ;
 %D \stopJScode
-%D \stoptypen
+%D \stoptyping
 %D
 %D assumes uses no preamble or presumes that the preamble is
 %D always loaded, the next definition also tells \CONTEXT\ to
 %D actually include the preamble needed.
 %D
-%D \starttypen
+%D \starttyping
 %D \startJScode{uses} uses {later}
 %D   uses = 6 ;
 %D \stopJScode
-%D \stoptypen
+%D \stoptyping
 
 \long\def\startJScode#1 #2
   {\doifelse{#2}{uses}
@@ -218,9 +218,9 @@
 %D
 %D The code can be retrieved by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \presetJScode{SomeScript}{template}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such a template is a comma separated list, where
 %D individual entries can optionally be transformed by
@@ -324,28 +324,28 @@
 %D One can define insert \JAVASCRIPT\ code at the document level
 %D by using:
 %D
-%D \starttypen
+%D \starttyping
 %D \startJSpreamble{oeps}
 %D   oeps = 1 ;
 %D \stopJSpreamble
-%D \stoptypen
+%D \stoptyping
 %D
 %D which is the same as:
 %D
-%D \starttypen
+%D \starttyping
 %D \startJSpreamble{now} used now
 %D   now = 2 ;
 %D \stopJSpreamble
-%D \stoptypen
+%D \stoptyping
 %D
 %D while the next definition is only included when actually
 %D used.
 %D
-%D \starttypen
+%D \starttyping
 %D \startJSpreamble{later} used later
 %D   later = 3 ;
 %D \stopJSpreamble
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command may be used more that once, but always before
 %D the first page is shipped out.
@@ -381,7 +381,7 @@
 %D   {setJSpreamble, addtoJSpreamble}
 %D
 %D In addition to the previous preamble definitions, we can
-%D set a preamble \citeer {in||line} and add tokens to a
+%D set a preamble \quote {in||line} and add tokens to a
 %D preamble.
 
 \def\setJSpreamble#1#2%
@@ -493,7 +493,7 @@
 
 %D I started with:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dodoPSsanitizeJScode#1%
 %D   {\aftergroup\string
 %D    \if#1(%
@@ -509,7 +509,7 @@
 %D    \ifnum\scratchcounter=500
 %D      \expandafter\dododoPSsanitizeJScode
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D For pretty printing purposes, we need some way to signal
 %D \TEX\ macros. Therefore we introduce a special keyword
@@ -653,9 +653,9 @@
 %D collected in files with names like \type{java-...}. One can
 %D load these scripts with \type{\useJSscripts}, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \useJSscripts[fld]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The not so complicated implementation of this macro is:
 
@@ -679,4 +679,4 @@
 \def\useJSscripts
   {\dodoubleempty\douseJSscripts}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/java-stp.tex b/tex/context/base/java-stp.tex
index 2417a61e0..ccf85547c 100644
--- a/tex/context/base/java-stp.tex
+++ b/tex/context/base/java-stp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-stp,
+%D   [       filefile=java-stp,
 %D        version=2004.03.15,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Stepping,
@@ -124,4 +124,4 @@
 % \definereference [CheckStepper]  [JS(CheckStepper{\StepCounter})]
 % \definereference [InvokeStepper] [JS(InvokeStepper)]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/lang-alt.tex b/tex/context/base/lang-alt.tex
index f2192936e..aec7f7e89 100644
--- a/tex/context/base/lang-alt.tex
+++ b/tex/context/base/lang-alt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-alt,
+%D   [       file=tall-alt,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Altaic Languages,
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Altaic Languages}
 
@@ -17,7 +17,7 @@
 %D many of the first translations were done by Tobias. Later
 %D on, corrections were made by users. If you have suggestions,
 %D or feel that your name missing here, don't hesitate to send
-%D us an email. 
+%D us an email.
 
 %  Uigur, Uzbek
 %  Azeri/Azerbaijani, Chuvash, Turkish, Turkmen
@@ -28,7 +28,7 @@
 
 \installlanguage
   [\s!tr]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -37,34 +37,34 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-   \c!status=\v!stop]
+   \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+   \c!state=\v!stop]
 
 \installlanguage [turkish] [\s!tr]
 
-\setupheadtext [\s!tr] [\v!inhoud=Fihrist]
-\setupheadtext [\s!tr] [\v!tabellen=Tablolar]
-\setupheadtext [\s!tr] [\v!figuren=\Scedilla ekiller]
-\setupheadtext [\s!tr] [\v!grafieken=Grafikler]
-\setupheadtext [\s!tr] [\v!intermezzos=...]
+\setupheadtext [\s!tr] [\v!content=Fihrist]
+\setupheadtext [\s!tr] [\v!tables=Tablolar]
+\setupheadtext [\s!tr] [\v!figures=\Scedilla ekiller]
+\setupheadtext [\s!tr] [\v!graphics=Grafikler]
+\setupheadtext [\s!tr] [\v!intermezzi=...]
 \setupheadtext [\s!tr] [\v!index=\Idotaccent ndex]
-\setupheadtext [\s!tr] [\v!afkortingen=K\dotlessi saltmalar]
+\setupheadtext [\s!tr] [\v!abbreviations=K\dotlessi saltmalar]
 \setupheadtext [\s!tr] [\v!logos=Logolar]
-\setupheadtext [\s!tr] [\v!eenheden=Birimler]
+\setupheadtext [\s!tr] [\v!units=Birimler]
 
-\setuplabeltext [\s!tr] [\v!tabel=Tablo ]
-\setuplabeltext [\s!tr] [\v!figuur=\Scedilla ekil ]
+\setuplabeltext [\s!tr] [\v!table=Tablo ]
+\setuplabeltext [\s!tr] [\v!figure=\Scedilla ekil ]
 \setuplabeltext [\s!tr] [\v!intermezzo=... ]
-\setuplabeltext [\s!tr] [\v!grafiek=Grafik ]
-\setuplabeltext [\s!tr] [\v!hoofdstuk=]          % [\v!hoofdstuk=Konu ] 
-\setuplabeltext [\s!tr] [\v!paragraaf=]          % [\v!paragraaf=Paragraf ]
-\setuplabeltext [\s!tr] [\v!sub\v!paragraaf=]    % [\c!sub\v!paragraaf=Altparagraf ]
-\setuplabeltext [\s!tr] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!tr] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!tr] [\v!bijlage=]            % [\v!bijlage=Ek ]
-\setuplabeltext [\s!tr] [\v!deel=Cilt ]
-\setuplabeltext [\s!tr] [\v!regel=sat\dotlessi r ]
-\setuplabeltext [\s!tr] [\v!regels=sat\dotlessi rlar ]
+\setuplabeltext [\s!tr] [\v!graphic=Grafik ]
+\setuplabeltext [\s!tr] [\v!chapter=]          % [\v!chapter=Konu ]
+\setuplabeltext [\s!tr] [\v!section=]          % [\v!section=Paragraf ]
+\setuplabeltext [\s!tr] [\v!sub\v!section=]    % [\c!sub\v!section=Altparagraf ]
+\setuplabeltext [\s!tr] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!tr] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!tr] [\v!appendix=]            % [\v!appendix=Ek ]
+\setuplabeltext [\s!tr] [\v!part=Cilt ]
+\setuplabeltext [\s!tr] [\v!line=sat\dotlessi r ]
+\setuplabeltext [\s!tr] [\v!lines=sat\dotlessi rlar ]
 
 \setuplabeltext [\s!tr]   [\v!january=ocak]
 \setuplabeltext [\s!tr]  [\v!february=\Scedilla ubat]
diff --git a/tex/context/base/lang-ana.tex b/tex/context/base/lang-ana.tex
index 8f14082c4..fe4543e65 100644
--- a/tex/context/base/lang-ana.tex
+++ b/tex/context/base/lang-ana.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-ana,
+%D   [       file=tall-ana,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Anatolian Languages,
diff --git a/tex/context/base/lang-art.tex b/tex/context/base/lang-art.tex
index 0c1c775b2..aa537a521 100644
--- a/tex/context/base/lang-art.tex
+++ b/tex/context/base/lang-art.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-art,
+%D   [       file=tall-art,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Artificial Languages,
diff --git a/tex/context/base/lang-bal.tex b/tex/context/base/lang-bal.tex
index 4c5907320..5ba751703 100644
--- a/tex/context/base/lang-bal.tex
+++ b/tex/context/base/lang-bal.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-bal,
+%D   [       file=tall-bal,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Baltic Languages,
diff --git a/tex/context/base/lang-cel.tex b/tex/context/base/lang-cel.tex
index d22705804..922310eba 100644
--- a/tex/context/base/lang-cel.tex
+++ b/tex/context/base/lang-cel.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-cel,
+%D   [       file=tall-cel,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Celtic Languages,
diff --git a/tex/context/base/lang-chi.tex b/tex/context/base/lang-chi.tex
index 51a018e9b..e7cb8fdb1 100644
--- a/tex/context/base/lang-chi.tex
+++ b/tex/context/base/lang-chi.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-chi,
+%D   [       file=tall-chi,
 %D        version=2002.06.25, % 1998.10.10,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Chinese,
@@ -31,33 +31,33 @@
    \c!rightquote=\cnencoding\cnupperrightsinglequote,
    \c!leftquotation=\cnencoding\cnupperleftdoublequote,
    \c!rightquotation=\cnencoding\cnupperrightdoublequote,
-   \c!datum={\v!maand,\ ,\v!dag,{,\ },\v!jaar},
-   \c!status=\v!start]
-
-\setupheadtext [\s!cn]      [\v!inhoud={\cnencoding\cnencodedcontents}]
-\setupheadtext [\s!cn]    [\v!tabellen={\cnencoding\cnencodedtables}]
-\setupheadtext [\s!cn]     [\v!figuren={\cnencoding\cnencodedfigures}]
-\setupheadtext [\s!cn]   [\v!grafieken=Graphics]
-\setupheadtext [\s!cn] [\v!intermezzos=Intermezzos]
+   \c!date={\v!month,\ ,\v!day,{,\ },\v!year},
+   \c!state=\v!stop]
+
+\setupheadtext [\s!cn]      [\v!content={\cnencoding\cnencodedcontents}]
+\setupheadtext [\s!cn]    [\v!tables={\cnencoding\cnencodedtables}]
+\setupheadtext [\s!cn]     [\v!figures={\cnencoding\cnencodedfigures}]
+\setupheadtext [\s!cn]   [\v!graphics=Graphics]
+\setupheadtext [\s!cn] [\v!intermezzi=Intermezzos]
 \setupheadtext [\s!cn]       [\v!index={\cnencoding\cnencodedindex}]
-\setupheadtext [\s!cn] [\v!afkortingen={\cnencoding\cnencodedabbreviations}]
+\setupheadtext [\s!cn] [\v!abbreviations={\cnencoding\cnencodedabbreviations}]
 \setupheadtext [\s!cn]       [\v!logos={\cnencoding\cnencodedlogos}]
-\setupheadtext [\s!cn]    [\v!eenheden={\cnencoding\cnencodedunits}]
+\setupheadtext [\s!cn]    [\v!units={\cnencoding\cnencodedunits}]
 
-\setuplabeltext [\s!cn]      [\v!tabel={\cnencoding\cnencodedtable}]
-\setuplabeltext [\s!cn]     [\v!figuur={\cnencoding\cnencodedfigure}]
+\setuplabeltext [\s!cn]      [\v!table={\cnencoding\cnencodedtable}]
+\setuplabeltext [\s!cn]     [\v!figure={\cnencoding\cnencodedfigure}]
 \setuplabeltext [\s!cn] [\v!intermezzo=Intermezzo ]
-\setuplabeltext [\s!cn]    [\v!grafiek=Illustration ]
-\setuplabeltext [\s!cn]    [\v!bijlage=]
-\setuplabeltext [\s!cn]       [\v!deel={\cnencoding\cnencodedintro,\cnencoding\cnencodedpart}]
-\setuplabeltext [\s!cn]  [\v!hoofdstuk={\cnencoding\cnencodedintro,\cnencoding\cnencodedchapter}]
-\setuplabeltext [\s!cn]  [\v!paragraaf={\cnencoding\cnencodedintro,\cnencoding\cnencodedsection}]
-\setuplabeltext [\s!cn]      [\v!regel=line ]
-\setuplabeltext [\s!cn]     [\v!regels=lines ]
-
-\setuplabeltext [\s!cn]             [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!cn]       [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!cn] [\v!sub\v!sub\v!sub\v!paragraaf=]
+\setuplabeltext [\s!cn]    [\v!graphic=Illustration ]
+\setuplabeltext [\s!cn]    [\v!appendix=]
+\setuplabeltext [\s!cn]       [\v!part={\cnencoding\cnencodedintro,\cnencoding\cnencodedpart}]
+\setuplabeltext [\s!cn]  [\v!chapter={\cnencoding\cnencodedintro,\cnencoding\cnencodedchapter}]
+\setuplabeltext [\s!cn]  [\v!section={\cnencoding\cnencodedintro,\cnencoding\cnencodedsection}]
+\setuplabeltext [\s!cn]      [\v!line=line ]
+\setuplabeltext [\s!cn]     [\v!lines=lines ]
+
+\setuplabeltext [\s!cn]             [\v!sub\v!section=]
+\setuplabeltext [\s!cn]       [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!cn] [\v!sub\v!sub\v!sub\v!section=]
 
 %D From this definition one can deduce that language, input
 %D encoding, font encoding, and glyph meaning form a pretty
diff --git a/tex/context/base/lang-cyr.tex b/tex/context/base/lang-cyr.tex
index 20567e1e1..59725498b 100644
--- a/tex/context/base/lang-cyr.tex
+++ b/tex/context/base/lang-cyr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-cyr,
+%D   [       file=tall-cyr,
 %D        version=2003.01.24,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Cyrillic Languages,
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Cyrillic Languages}
 
@@ -17,9 +17,9 @@
 %D Therefore we define the labels using symbolic names.
 %D Support for cyrillic is initiated by Olga Briginets who
 %D also layed the base for the language, encoding and font
-%D definition. Later Alexander Bokovoy and Victor Figurnov 
-%D improved things. I (Hans Hagen) mainly cleaned things up 
-%D a bit. 
+%D definition. Later Alexander Bokovoy and Victor Figurnov
+%D improved things. I (Hans Hagen) mainly cleaned things up
+%D a bit.
 
 \unprotect
 
@@ -27,7 +27,7 @@
   [\s!ru]
   [\s!lefthyphenmin=2,
    \s!righthyphenmin=2,
-   \c!spatiering=\v!opelkaar,
+   \c!spacing=\v!packed,
    \c!leftsentence=\leftguillemot,
    \c!rightsentence=\rightguillemot,
    \c!leftsubsentence=\lowerleftdoubleninequote,
@@ -36,14 +36,14 @@
    \c!rightquote=\upperrightdoubleninequote,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!ua]
   [\s!lefthyphenmin=2,
    \s!righthyphenmin=2,
-   \c!spatiering=\v!opelkaar,
+   \c!spacing=\v!packed,
    \c!leftsentence=\leftguillemot,
    \c!rightsentence=\rightguillemot,
    \c!leftsubsentence=\lowerleftdoubleninequote,
@@ -52,8 +52,8 @@
    \c!rightquote=\upperrightdoubleninequote,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage [russian]      [\s!ru]
 \installlanguage [ukrainian]    [\s!ua]
@@ -61,55 +61,55 @@
 
 %D Labels and header texts.
 
-\setupheadtext [\s!ru]     [ \v!inhoud=\cyrillicS \cyrillico \cyrillicd
+\setupheadtext [\s!ru]     [ \v!content=\cyrillicS \cyrillico \cyrillicd
                                        \cyrillice \cyrillicr \cyrilliczh
                                        \cyrillica \cyrillicn \cyrillici
                                        \cyrillice]
-\setupheadtext [\s!ua]      [\v!inhoud=\cyrillicZ \cyrillicm \cyrillicii
+\setupheadtext [\s!ua]      [\v!content=\cyrillicZ \cyrillicm \cyrillicii
                                        \cyrillics \cyrillict]
 
-\setupheadtext [\s!ru]    [\v!tabellen=\cyrillicS \cyrillicp \cyrillici
+\setupheadtext [\s!ru]    [\v!tables=\cyrillicS \cyrillicp \cyrillici
                                        \cyrillics \cyrillico \cyrillick
                                        \space     \cyrillict \cyrillica
                                        \cyrillicb \cyrillicl \cyrillici
                                        \cyrillicc]
-\setupheadtext [\s!ua]    [\v!tabellen=\cyrillicP \cyrillice \cyrillicr
+\setupheadtext [\s!ua]    [\v!tables=\cyrillicP \cyrillice \cyrillicr
                                        \cyrillice \cyrillicl \cyrillicii
                                        \cyrillick \space     \cyrillict
                                        \cyrillica \cyrillicb \cyrillicl
                                        \cyrillici \cyrillicc \cyrillicsftsn]
 
-\setupheadtext [\s!ru]     [\v!figuren=\cyrillicS \cyrillicp \cyrillici
+\setupheadtext [\s!ru]     [\v!figures=\cyrillicS \cyrillicp \cyrillici
                                        \cyrillics \cyrillico \cyrillick
                                        \space     \cyrillici \cyrillicl
                                        \cyrillicl \cyrillicyu\cyrillics
                                        \cyrillict \cyrillicr \cyrillica
                                        \cyrillicc \cyrillici \cyrillicishrt]
-\setupheadtext [\s!ua]     [\v!figuren=\cyrillicP \cyrillice \cyrillicr
+\setupheadtext [\s!ua]     [\v!figures=\cyrillicP \cyrillice \cyrillicr
                                        \cyrillice \cyrillicl \cyrillicii
                                        \cyrillick \space     \cyrillicii
                                        \cyrillicl \cyrillicyu\cyrillics
                                        \cyrillict \cyrillicr \cyrillica
                                        \cyrillicc \cyrillicii\cyrillicishrt]
 
-\setupheadtext [\s!ru]   [\v!grafieken=\cyrillicS \cyrillicp \cyrillici
+\setupheadtext [\s!ru]   [\v!graphics=\cyrillicS \cyrillicp \cyrillici
                                        \cyrillics \cyrillico \cyrillick
                                        \space     \cyrillicg \cyrillicr
                                        \cyrillica \cyrillicf \cyrillici
                                        \cyrillick \cyrillico \cyrillicv]
-\setupheadtext [\s!ua]   [\v!grafieken=\cyrillicP \cyrillice \cyrillicr
+\setupheadtext [\s!ua]   [\v!graphics=\cyrillicP \cyrillice \cyrillicr
                                        \cyrillice \cyrillicl \cyrillicii
                                        \cyrillick \space     \cyrillicg
                                        \cyrillicr \cyrillica \cyrillicf
                                        \cyrillicii\cyrillick \cyrillico
                                        \cyrillicv]
 
-\setupheadtext [\s!ru] [\v!intermezzos=\cyrillicS \cyrillicp \cyrillici
+\setupheadtext [\s!ru] [\v!intermezzi=\cyrillicS \cyrillicp \cyrillici
                                        \cyrillics \cyrillico \cyrillick
                                        \space     \cyrillicv \cyrillics
                                        \cyrillict \cyrillica \cyrillicv
                                        \cyrillico \cyrillick]
-\setupheadtext [\s!ua] [\v!intermezzos=\cyrillicP \cyrillice \cyrillicr
+\setupheadtext [\s!ua] [\v!intermezzi=\cyrillicP \cyrillice \cyrillicr
                                        \cyrillice \cyrillicl \cyrillicii
                                        \cyrillick \space     \cyrillicv
                                        \cyrillics \cyrillict \cyrillica
@@ -126,14 +126,14 @@
                                        \cyrillica  \cyrilliczh\cyrillicch
                                        \cyrillici  \cyrillick]
 
-\setupheadtext [\s!ru] [\v!afkortingen=\cyrillicS \cyrillicp \cyrillici
+\setupheadtext [\s!ru] [\v!abbreviations=\cyrillicS \cyrillicp \cyrillici
                                        \cyrillics \cyrillico \cyrillick
                                        \space     \cyrillics \cyrillico
                                        \cyrillick \cyrillicr \cyrillica
                                        \cyrillicshch         \cyrillice
                                        \cyrillicn
                                        \cyrillici \cyrillicishrt]
-\setupheadtext [\s!ua] [\v!afkortingen=\cyrillicP \cyrillice \cyrillicr
+\setupheadtext [\s!ua] [\v!abbreviations=\cyrillicP \cyrillice \cyrillicr
                                        \cyrillice \cyrillicl \cyrillicii
                                        \cyrillick \space     \cyrillics
                                        \cyrillick \cyrillico \cyrillicr
@@ -147,29 +147,29 @@
                                        \cyrillico \cyrillict \cyrillici
                                        \cyrillicp \cyrillici]
 
-\setupheadtext [\s!ru]    [\v!eenheden=\cyrillicE \cyrillicd \cyrillici
+\setupheadtext [\s!ru]    [\v!units=\cyrillicE \cyrillicd \cyrillici
                                        \cyrillicn \cyrillici \cyrillicc
                                        \cyrillicery \space   \cyrillici
                                        \cyrillicz \cyrillicm \cyrillice
                                        \cyrillicr \cyrillice \cyrillicn
                                        \cyrillici \cyrillicya]
-\setupheadtext [\s!ua]    [\v!eenheden=\cyrillicO \cyrillicd \cyrillici
+\setupheadtext [\s!ua]    [\v!units=\cyrillicO \cyrillicd \cyrillici
                                        \cyrillicn \cyrillici \cyrillicc
                                        \cyrillicii\space     \cyrillicv
                                        \cyrillici \cyrillicm \cyrillicii
                                        \cyrillicr \cyrillicu]
 
-\setuplabeltext [\s!ru]      [\v!tabel=\cyrillicT \cyrillica \cyrillicb
+\setuplabeltext [\s!ru]      [\v!table=\cyrillicT \cyrillica \cyrillicb
                                        \cyrillicl \cyrillici \cyrillicc
                                        \cyrillica \space]
-\setuplabeltext [\s!ua]      [\v!tabel=\cyrillicT \cyrillica \cyrillicb
+\setuplabeltext [\s!ua]      [\v!table=\cyrillicT \cyrillica \cyrillicb
                                        \cyrillicl \cyrillici \cyrillicc
                                        \cyrillicya\space]
 
-\setuplabeltext [\s!ru]     [\v!figuur=\cyrillicR \cyrillici \cyrillics
+\setuplabeltext [\s!ru]     [\v!figure=\cyrillicR \cyrillici \cyrillics
                                        \cyrillicu \cyrillicn \cyrillico
                                        \cyrillick \space]
-\setuplabeltext [\s!ua]     [\v!figuur=\cyrillicM \cyrillica \cyrillicl
+\setuplabeltext [\s!ua]     [\v!figure=\cyrillicM \cyrillica \cyrillicl
                                        \cyrillicyu\cyrillicn \cyrillico
                                        \cyrillick \space]
 
@@ -180,88 +180,88 @@
                                        \cyrillica \cyrillicv \cyrillick
                                        \cyrillica \space]
 
-\setuplabeltext [\s!ru]    [\v!grafiek=\cyrillicG \cyrillicr \cyrillica
+\setuplabeltext [\s!ru]    [\v!graphic=\cyrillicG \cyrillicr \cyrillica
                                        \cyrillicf \cyrillici \cyrillick
                                        \space]
-\setuplabeltext [\s!ua]    [\v!grafiek=\cyrillicG \cyrillicr \cyrillica
+\setuplabeltext [\s!ua]    [\v!graphic=\cyrillicG \cyrillicr \cyrillica
                                        \cyrillicf \cyrillici \cyrillick
                                        \space]
 
-\setuplabeltext [\s!ru]                    [\v!hoofdstuk=]
-\setuplabeltext [\s!ua]                    [\v!hoofdstuk=]
+\setuplabeltext [\s!ru]                    [\v!chapter=]
+\setuplabeltext [\s!ua]                    [\v!chapter=]
 
-\setuplabeltext [\s!ru]                    [\v!paragraaf=]
-\setuplabeltext [\s!ua]                    [\v!paragraaf=]
+\setuplabeltext [\s!ru]                    [\v!section=]
+\setuplabeltext [\s!ua]                    [\v!section=]
 
-\setuplabeltext [\s!ru]              [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ua]              [\v!sub\v!paragraaf=]
+\setuplabeltext [\s!ru]              [\v!sub\v!section=]
+\setuplabeltext [\s!ua]              [\v!sub\v!section=]
 
-\setuplabeltext [\s!ru]        [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ua]        [\v!sub\v!sub\v!paragraaf=]
+\setuplabeltext [\s!ru]        [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!ua]        [\v!sub\v!sub\v!section=]
 
-\setuplabeltext [\s!ru]  [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ua]  [\v!sub\v!sub\v!sub\v!paragraaf=]
+\setuplabeltext [\s!ru]  [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!ua]  [\v!sub\v!sub\v!sub\v!section=]
 
-\setuplabeltext [\s!ru]                      [\v!bijlage=]
-\setuplabeltext [\s!ua]                      [\v!bijlage=]
+\setuplabeltext [\s!ru]                      [\v!appendix=]
+\setuplabeltext [\s!ua]                      [\v!appendix=]
 
-\setuplabeltext [\s!ru]      [\v!deel=\cyrillicCH\cyrillica \cyrillics
+\setuplabeltext [\s!ru]      [\v!part=\cyrillicCH\cyrillica \cyrillics
                                       \cyrillict \cyrillicsftsn
                                       \space]
-\setuplabeltext [\s!ua]      [\v!deel=\cyrillicCH\cyrillica \cyrillics
+\setuplabeltext [\s!ua]      [\v!part=\cyrillicCH\cyrillica \cyrillics
                                       \cyrillict \cyrillici \cyrillicn
                                       \cyrillica \space]
 
-\setuplabeltext [\s!ru]     [\v!regel=\cyrillics \cyrillict \cyrillicr
+\setuplabeltext [\s!ru]     [\v!line=\cyrillics \cyrillict \cyrillicr
                                       \cyrillico \cyrillick \cyrillica
                                       \space]
-\setuplabeltext [\s!ua]     [\v!regel=\cyrillicr \cyrillicya\cyrillicd
+\setuplabeltext [\s!ua]     [\v!line=\cyrillicr \cyrillicya\cyrillicd
                                       \cyrillico \cyrillick \space]
 
-\setuplabeltext [\s!ru]    [\v!regels=\cyrillics \cyrillict \cyrillicr
+\setuplabeltext [\s!ru]    [\v!lines=\cyrillics \cyrillict \cyrillicr
                                       \cyrillico \cyrillick \cyrillici
                                       \space]
-\setuplabeltext [\s!ua]    [\v!regels=\cyrillicr \cyrillicya\cyrillicd
+\setuplabeltext [\s!ua]    [\v!lines=\cyrillicr \cyrillicya\cyrillicd
                                       \cyrillick \cyrillici \space]
 
-\setuplabeltext [\s!ru]    [\v!pagina=\cyrillics \cyrillict \cyrillicr
+\setuplabeltext [\s!ru]    [\v!page=\cyrillics \cyrillict \cyrillicr
                                       \cyrillica \cyrillicn \cyrillici
                                       \cyrillicc \cyrillica \space]
-\setuplabeltext [\s!ua]    [\v!pagina=\cyrillics \cyrillict \cyrillico
+\setuplabeltext [\s!ua]    [\v!page=\cyrillics \cyrillict \cyrillico
                                       \cyrillicr \cyrillicii\cyrillicn
                                       \cyrillick \cyrillica \space ]
 
-\setuplabeltext [\s!ru]  [\v!oppagina=\cyrillicn \cyrillica \space
+\setuplabeltext [\s!ru]  [\v!atpage=\cyrillicn \cyrillica \space
                                       \cyrillics \cyrillict \cyrillicr
                                       \cyrillica \cyrillicn \cyrillici
                                       \cyrillicc \cyrillice \space]
-\setuplabeltext [\s!ua]  [\v!oppagina=\cyrillicn \cyrillica \space
+\setuplabeltext [\s!ua]  [\v!atpage=\cyrillicn \cyrillica \space
                                       \cyrillics \cyrillict \cyrillico
                                       \cyrillicr \cyrillicii\cyrillicn
                                       \cyrillicc \cyrillicii\space ]
 
-\setuplabeltext [\s!ru] [\v!hierboven=\cyrillics \cyrillicm.\space
+\setuplabeltext [\s!ru] [\v!hencefore=\cyrillics \cyrillicm.\space
                                       \cyrillicv \cyrillicery \cyrillicsh
                                       \cyrillice]
-\setuplabeltext [\s!ua] [\v!hierboven=\cyrillicya\cyrillick \space
+\setuplabeltext [\s!ua] [\v!hencefore=\cyrillicya\cyrillick \space
                                       \cyrillicp \cyrillico \cyrillick
                                       \cyrillica \cyrillicz \cyrillica
                                       \cyrillicn \cyrillico \space
                                       \cyrillicv \cyrillici \cyrillicshch
                                       \cyrillice]
 
-\setuplabeltext [\s!ru] [\v!hieronder=\cyrillics \cyrillicm.\space
+\setuplabeltext [\s!ru] [\v!hereafter=\cyrillics \cyrillicm.\space
                                       \cyrillicn \cyrillici \cyrilliczh
                                       \cyrillice]
-\setuplabeltext [\s!ua] [\v!hieronder=\cyrillicya\cyrillick \space
+\setuplabeltext [\s!ua] [\v!hereafter=\cyrillicya\cyrillick \space
                                       \cyrillicp \cyrillico \cyrillick
                                       \cyrillica \cyrillicz \cyrillica
                                       \cyrillicn \cyrillico \space
                                       \cyrillicn \cyrillici \cyrilliczh
                                       \cyrillicch\cyrillice]
 
-\setuplabeltext [\s!ru]       [\v!zie=\cyrillics \cyrillicm.\space]
-\setuplabeltext [\s!ua]       [\v!zie=\cyrillicd \cyrillici 
+\setuplabeltext [\s!ru]       [\v!see=\cyrillics \cyrillicm.\space]
+\setuplabeltext [\s!ua]       [\v!see=\cyrillicd \cyrillici
                                       \cyrillicv.\space ]
 
 \setuplabeltext [\s!ru]   [\v!january=\cyrillicya\cyrillicn \cyrillicv
diff --git a/tex/context/base/lang-frd.tex b/tex/context/base/lang-frd.tex
index e5b42f481..d41651713 100644
--- a/tex/context/base/lang-frd.tex
+++ b/tex/context/base/lang-frd.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-frd,
+%D   [       file=tall-frd,
 %D        version=2004.01.15,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Language Frequency Table Data,
@@ -137,4 +137,4 @@
   \charfreq z  1.14
 \stopcharactertable
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/lang-frq.tex b/tex/context/base/lang-frq.tex
index 5240f9370..34ce24f1b 100644
--- a/tex/context/base/lang-frq.tex
+++ b/tex/context/base/lang-frq.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-frq,
+%D   [       file=tall-frq,
 %D        version=2004.01.15,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Language Frequency Table Support,
@@ -18,7 +18,7 @@
 \ifx\s!en\undefined \def\v!en{en}   \fi
 \ifx\??lg\undefined \def\??lg{@@lg} \fi
 
-%M \usemodule[frqlay]
+%M \usemodule[layout]
 
 %D \macros
 %D   {charwidthmethod}
@@ -31,7 +31,7 @@
 %D   {\chardef\charwidthmethod#1\relax
 %D    \mainlanguage[#2#3]\the\dimexpr(\averagecharwidth)}
 %D
-%D \starttabulatie[|c|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|c|]
 %D \HL
 %D \NC      \NC\bf0=amount\NC\bf1=.5em\NC2=ex\NC\bf3=frequency\NC\bf4=list\NC\NR
 %D \HL
@@ -39,7 +39,7 @@
 %D \NC\bf nl\NC\ShwChrWd0nl\NC\ShwChrWd1nl\NC\ShwChrWd2nl\NC\ShwChrWd3nl\NC\ShwChrWd4nl\NC\NR
 %D \NC\bf de\NC\ShwChrWd0de\NC\ShwChrWd1de\NC\ShwChrWd2de\NC\ShwChrWd3de\NC\ShwChrWd4de\NC\NR
 %D \HL
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Method~1 ignores the widths and assumes that each character has a
 %D width of .5em, which is true for most monospaced fonts. Method~2
@@ -107,9 +107,9 @@
 
 %D Although it is of hardly any use, you can inherit a character table:
 %D
-%D \starttypen
+%D \starttyping
 %D \startcharactertable[cz] \charactertable{en} \stopcharactertable
-%D \stoptypen
+%D \stoptyping
 %D
 %D We define a default vector with 100\% x's.
 
@@ -184,7 +184,7 @@
 %D \MPdrawingdonetrue \getMPdrawing \resetMPdrawing
 %D \stopbuffer
 %D
-%D \plaatsfiguur
+%D \placefigure
 %D   [here]
 %D   [fig:charfreq]
 %D   {The character distributions for English, Dutch and German.}
@@ -193,9 +193,9 @@
 %D A few samples of usage of this mechanism are shown below:
 %D
 %D \startbuffer
-%D {\mainlanguage[en]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blanko}
-%D {\mainlanguage[nl]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blanko}
-%D {\mainlanguage[de]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blanko}
+%D {\mainlanguage[en]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blank}
+%D {\mainlanguage[nl]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blank}
+%D {\mainlanguage[de]\hsize65\averagecharwidth\mainlanguage[en]\input ward \blank}
 %D \stopbuffer
 %D
 %D \typebuffer \getbuffer
@@ -214,4 +214,4 @@
 \def\freezeaveragecharacterwidth % global
   {\xdef\averagecharacterwidth{\dimexpr(\the\normalaveragecharacterwidth)}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/lang-ger.tex b/tex/context/base/lang-ger.tex
index 7e95f5936..4ab2f440d 100644
--- a/tex/context/base/lang-ger.tex
+++ b/tex/context/base/lang-ger.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-ger,
+%D   [       file=tall-ger,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Germanic Languages,
@@ -32,7 +32,7 @@
 
 \installlanguage
   [\s!nl]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -41,12 +41,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!en]
-  [\c!spatiering=\v!ruim,
+  [\c!spacing=\v!broad,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -55,12 +55,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!maand,\ ,\v!dag,{,\ },\v!jaar},
-   \c!status=\v!stop] % elders always preloaded!
+   \c!date={\v!month,\ ,\v!day,{,\ },\v!year},
+   \c!state=\v!stop] % elders always preloaded!
 
 \installlanguage
   [\s!de]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence={\hbox{--~}},
    \c!rightsentence={\hbox{~--}},
    \c!leftsubsentence={--},
@@ -69,12 +69,12 @@
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!datum={\v!dag,{.},\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!da]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence={\hbox{--\hskip.5em}},
    \c!rightsentence={\hbox{\hskip.5em--}},
    \c!leftsubsentence={--},
@@ -83,12 +83,12 @@
    \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!datum={\v!dag,{.},\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!sv]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence={\hbox{--~}},
    \c!rightsentence={\hbox{~--}},
    \c!leftsubsentence={--},
@@ -97,12 +97,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperrightdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!af]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -111,12 +111,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-   \c!status=\v!stop]
+   \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!no]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -125,34 +125,29 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,{.},\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
+   \c!default=\s!nl, % patterns
+   \c!state=\v!stop]
 
-%D Hey look, some experiment:
-
-\installlanguage % eight bit dutch
-  [nlx]
-  [\c!spatiering=\v!opelkaar,
-   \c!default=\s!nl,
-   \c!status=\v!stop]
+%D Extra:
 
 \installlanguage % old german
   [deo]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!default=\s!de,
-   \c!status=\v!stop]
+   \c!state=\v!stop]
 
 %D And some alternative (but very real) english patterns:
 
 \installlanguage
   [uk]
   [\c!default=\s!en,
-   \c!status=\v!stop]
+   \c!state=\v!stop]
 
 \installlanguage
   [us]
   [\c!default=\s!en,
-   \c!status=\v!stop]
+   \c!state=\v!stop]
 
 %D For compatibility reasons we also define:
 
@@ -307,45 +302,45 @@
 %   \stoplanguagespecifics
 % \stopencoding
 
-\setupheadtext [\s!en] [\v!inhoud=Contents]
-\setupheadtext [\s!nl] [\v!inhoud=Inhoud]
-\setupheadtext [\s!de] [\v!inhoud=Inhalt]
-\setupheadtext [\s!da] [\v!inhoud=Indhold]
-\setupheadtext [\s!sv] [\v!inhoud=Inneh\aring ll]
-\setupheadtext [\s!af] [\v!inhoud=Inhoud]
-\setupheadtext [\s!no] [\v!inhoud=Innhold]
-
-\setupheadtext [\s!en] [\v!tabellen=Tables]
-\setupheadtext [\s!nl] [\v!tabellen=Tabellen]
-\setupheadtext [\s!de] [\v!tabellen=Tabellen]
-\setupheadtext [\s!da] [\v!tabellen=Tabeller]
-\setupheadtext [\s!sv] [\v!tabellen=Tabeller]
-\setupheadtext [\s!af] [\v!tabellen=Tabelle]
-\setupheadtext [\s!no] [\v!tabellen=Tabeller]
-
-\setupheadtext [\s!en] [\v!figuren=Figures]
-\setupheadtext [\s!nl] [\v!figuren=Figuren]
-\setupheadtext [\s!de] [\v!figuren=Abbildungen]
-\setupheadtext [\s!da] [\v!figuren=Figurer]
-\setupheadtext [\s!sv] [\v!figuren=Figurer]
-\setupheadtext [\s!af] [\v!figuren=Figure]
-\setupheadtext [\s!no] [\v!figuren=Figurer]
-
-\setupheadtext [\s!en] [\v!grafieken=Graphics]
-\setupheadtext [\s!nl] [\v!grafieken=Grafieken]
-\setupheadtext [\s!de] [\v!grafieken=Graphiken]
-\setupheadtext [\s!da] [\v!grafieken=Grafik]
-\setupheadtext [\s!sv] [\v!grafieken=Grafik]
-\setupheadtext [\s!af] [\v!grafieken=Grafieke]
-\setupheadtext [\s!no] [\v!grafieken=Grafikk]
-
-\setupheadtext [\s!en] [\v!intermezzos=Intermezzos]
-\setupheadtext [\s!nl] [\v!intermezzos=Intermezzo's]
-\setupheadtext [\s!de] [\v!intermezzos=Intermezzi]
-\setupheadtext [\s!da] [\v!intermezzos=Intermezzoer]
-\setupheadtext [\s!sv] [\v!intermezzos=Intermezzon]
-\setupheadtext [\s!af] [\v!intermezzos=Intermezzos]
-\setupheadtext [\s!no] [\v!intermezzos=Intermesso]
+\setupheadtext [\s!en] [\v!content=Contents]
+\setupheadtext [\s!nl] [\v!content=Inhoud]
+\setupheadtext [\s!de] [\v!content=Inhalt]
+\setupheadtext [\s!da] [\v!content=Indhold]
+\setupheadtext [\s!sv] [\v!content=Inneh\aring ll]
+\setupheadtext [\s!af] [\v!content=Inhoud]
+\setupheadtext [\s!no] [\v!content=Innhold]
+
+\setupheadtext [\s!en] [\v!tables=Tables]
+\setupheadtext [\s!nl] [\v!tables=Tabellen]
+\setupheadtext [\s!de] [\v!tables=Tabellen]
+\setupheadtext [\s!da] [\v!tables=Tabeller]
+\setupheadtext [\s!sv] [\v!tables=Tabeller]
+\setupheadtext [\s!af] [\v!tables=Tabelle]
+\setupheadtext [\s!no] [\v!tables=Tabeller]
+
+\setupheadtext [\s!en] [\v!figures=Figures]
+\setupheadtext [\s!nl] [\v!figures=Figuren]
+\setupheadtext [\s!de] [\v!figures=Abbildungen]
+\setupheadtext [\s!da] [\v!figures=Figurer]
+\setupheadtext [\s!sv] [\v!figures=Figurer]
+\setupheadtext [\s!af] [\v!figures=Figure]
+\setupheadtext [\s!no] [\v!figures=Figurer]
+
+\setupheadtext [\s!en] [\v!graphics=Graphics]
+\setupheadtext [\s!nl] [\v!graphics=Grafieken]
+\setupheadtext [\s!de] [\v!graphics=Graphiken]
+\setupheadtext [\s!da] [\v!graphics=Grafik]
+\setupheadtext [\s!sv] [\v!graphics=Grafik]
+\setupheadtext [\s!af] [\v!graphics=Grafieke]
+\setupheadtext [\s!no] [\v!graphics=Grafikk]
+
+\setupheadtext [\s!en] [\v!intermezzi=Intermezzos]
+\setupheadtext [\s!nl] [\v!intermezzi=Intermezzo's]
+\setupheadtext [\s!de] [\v!intermezzi=Intermezzi]
+\setupheadtext [\s!da] [\v!intermezzi=Intermezzoer]
+\setupheadtext [\s!sv] [\v!intermezzi=Intermezzon]
+\setupheadtext [\s!af] [\v!intermezzi=Intermezzos]
+\setupheadtext [\s!no] [\v!intermezzi=Intermesso]
 
 \setupheadtext [\s!en] [\v!index=Index]
 \setupheadtext [\s!nl] [\v!index=Index]
@@ -355,13 +350,13 @@
 \setupheadtext [\s!af] [\v!index=Indeks]
 \setupheadtext [\s!no] [\v!index=Indeks]
 
-\setupheadtext [\s!en] [\v!afkortingen=Abbreviations]
-\setupheadtext [\s!nl] [\v!afkortingen=Afkortingen]
-\setupheadtext [\s!de] [\v!afkortingen=Abk\uumlaut rzungen]
-\setupheadtext [\s!da] [\v!afkortingen=Forkortelser]
-\setupheadtext [\s!sv] [\v!afkortingen=F\oumlaut rkortningar]
-\setupheadtext [\s!af] [\v!afkortingen=Afkortings]
-\setupheadtext [\s!no] [\v!afkortingen=Forkortelser]
+\setupheadtext [\s!en] [\v!abbreviations=Abbreviations]
+\setupheadtext [\s!nl] [\v!abbreviations=Afkortingen]
+\setupheadtext [\s!de] [\v!abbreviations=Abk\uumlaut rzungen]
+\setupheadtext [\s!da] [\v!abbreviations=Forkortelser]
+\setupheadtext [\s!sv] [\v!abbreviations=F\oumlaut rkortningar]
+\setupheadtext [\s!af] [\v!abbreviations=Afkortings]
+\setupheadtext [\s!no] [\v!abbreviations=Forkortelser]
 
 \setupheadtext [\s!en] [\v!logos=Logos]
 \setupheadtext [\s!nl] [\v!logos=Logo's]
@@ -371,29 +366,29 @@
 \setupheadtext [\s!af] [\v!logos=Logos]
 \setupheadtext [\s!no] [\v!logos=Logoer]
 
-\setupheadtext [\s!en] [\v!eenheden=Units]
-\setupheadtext [\s!nl] [\v!eenheden=Eenheden]
-\setupheadtext [\s!de] [\v!eenheden=Einheiten]
-\setupheadtext [\s!da] [\v!eenheden=Enheder]
-\setupheadtext [\s!sv] [\v!eenheden=Enheter]
-\setupheadtext [\s!af] [\v!eenheden=Eenhede]
-\setupheadtext [\s!no] [\v!eenheden=Enheter]
-
-\setuplabeltext [\s!en] [\v!tabel=Table ]
-\setuplabeltext [\s!nl] [\v!tabel=Tabel ]
-\setuplabeltext [\s!de] [\v!tabel=Tabelle ]
-\setuplabeltext [\s!da] [\v!tabel=Tabel ]
-\setuplabeltext [\s!sv] [\v!tabel=Tabell ]
-\setuplabeltext [\s!af] [\v!tabel=Tabel]
-\setuplabeltext [\s!no] [\v!tabel=Tabell ]
-
-\setuplabeltext [\s!en] [\v!figuur=Figure ]
-\setuplabeltext [\s!nl] [\v!figuur=Figuur ]
-\setuplabeltext [\s!de] [\v!figuur=Abbildung ]
-\setuplabeltext [\s!da] [\v!figuur=Figur ]
-\setuplabeltext [\s!sv] [\v!figuur=Figur ]
-\setuplabeltext [\s!af] [\v!figuur=Figuur ]
-\setuplabeltext [\s!no] [\v!figuur=Figur ]
+\setupheadtext [\s!en] [\v!units=Units]
+\setupheadtext [\s!nl] [\v!units=Eenheden]
+\setupheadtext [\s!de] [\v!units=Einheiten]
+\setupheadtext [\s!da] [\v!units=Enheder]
+\setupheadtext [\s!sv] [\v!units=Enheter]
+\setupheadtext [\s!af] [\v!units=Eenhede]
+\setupheadtext [\s!no] [\v!units=Enheter]
+
+\setuplabeltext [\s!en] [\v!table=Table ]
+\setuplabeltext [\s!nl] [\v!table=Tabel ]
+\setuplabeltext [\s!de] [\v!table=Tabelle ]
+\setuplabeltext [\s!da] [\v!table=Tabel ]
+\setuplabeltext [\s!sv] [\v!table=Tabell ]
+\setuplabeltext [\s!af] [\v!table=Tabel]
+\setuplabeltext [\s!no] [\v!table=Tabell ]
+
+\setuplabeltext [\s!en] [\v!figure=Figure ]
+\setuplabeltext [\s!nl] [\v!figure=Figuur ]
+\setuplabeltext [\s!de] [\v!figure=Abbildung ]
+\setuplabeltext [\s!da] [\v!figure=Figur ]
+\setuplabeltext [\s!sv] [\v!figure=Figur ]
+\setuplabeltext [\s!af] [\v!figure=Figuur ]
+\setuplabeltext [\s!no] [\v!figure=Figur ]
 
 \setuplabeltext [\s!en] [\v!intermezzo=Intermezzo ]
 \setuplabeltext [\s!nl] [\v!intermezzo=Intermezzo ]
@@ -403,85 +398,85 @@
 \setuplabeltext [\s!af] [\v!intermezzo=Intermezzo ]
 \setuplabeltext [\s!no] [\v!intermezzo=Intermesso ]
 
-\setuplabeltext [\s!en] [\v!grafiek=Graphic ]
-\setuplabeltext [\s!nl] [\v!grafiek=Grafiek ]
-\setuplabeltext [\s!de] [\v!grafiek=Graphik ]
-\setuplabeltext [\s!da] [\v!grafiek=Grafik ]
-\setuplabeltext [\s!sv] [\v!grafiek=Grafik ]
-\setuplabeltext [\s!af] [\v!grafiek=Grafiek ]
-\setuplabeltext [\s!no] [\v!grafiek=Grafikk ]
-
-\setuplabeltext [\s!en] [\v!hoofdstuk=]
-\setuplabeltext [\s!nl] [\v!hoofdstuk=]
-\setuplabeltext [\s!de] [\v!hoofdstuk=]
-\setuplabeltext [\s!da] [\v!hoofdstuk=]
-\setuplabeltext [\s!sv] [\v!hoofdstuk=]
-\setuplabeltext [\s!af] [\v!hoofdstuk=] % [\v!hoofdstuk=hoofstuk]
-\setuplabeltext [\s!no] [\v!hoofdstuk=]
-
-\setuplabeltext [\s!en] [\v!paragraaf=]
-\setuplabeltext [\s!nl] [\v!paragraaf=]
-\setuplabeltext [\s!de] [\v!paragraaf=]
-\setuplabeltext [\s!da] [\v!paragraaf=]
-\setuplabeltext [\s!sv] [\v!paragraaf=]
-\setuplabeltext [\s!af] [\v!paragraaf=] % [\v!paragraaf=paragraaf]
-\setuplabeltext [\s!no] [\v!paragraaf=]
-
-\setuplabeltext [\s!en] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!nl] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!de] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!da] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sv] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!af] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!no] [\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!en] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!nl] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!de] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!da] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sv] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!af] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!no] [\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!en] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!nl] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!de] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!da] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sv] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!af] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!no] [\v!sub\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!en] [\v!bijlage=]
-\setuplabeltext [\s!nl] [\v!bijlage=]
-\setuplabeltext [\s!de] [\v!bijlage=]
-\setuplabeltext [\s!da] [\v!bijlage=] % [\v!bijlage=bilag]
-\setuplabeltext [\s!sv] [\v!bijlage=]
-\setuplabeltext [\s!af] [\v!bijlage=] % [\v!bijlage=bylae]
-\setuplabeltext [\s!no] [\v!bijlage=]
-
-\setuplabeltext [\s!en] [\v!deel=Part ]
-\setuplabeltext [\s!nl] [\v!deel=Deel ]
-\setuplabeltext [\s!de] [\v!deel=Teil ]
-\setuplabeltext [\s!da] [\v!deel=Del ]
-\setuplabeltext [\s!sv] [\v!deel=Del ]
-\setuplabeltext [\s!af] [\v!deel=Deel ]
-\setuplabeltext [\s!no] [\v!deel=Del ]
-
-\setuplabeltext [\s!en] [\v!regel=line ]
-\setuplabeltext [\s!nl] [\v!regel=regel ]
-\setuplabeltext [\s!de] [\v!regel=Zeile ]
-\setuplabeltext [\s!da] [\v!regel=linie ] % or linje
-\setuplabeltext [\s!sv] [\v!regel=rad ]
-\setuplabeltext [\s!af] [\v!regel=re\ediaeresis l ]
-\setuplabeltext [\s!no] [\v!regel=linje ]
-
-\setuplabeltext [\s!en] [\v!regels=lines ]
-\setuplabeltext [\s!nl] [\v!regels=regels ]
-\setuplabeltext [\s!de] [\v!regels=Zeilen ]
-\setuplabeltext [\s!da] [\v!regels=linier ] % or linjer
-\setuplabeltext [\s!sv] [\v!regels=rader ]
-\setuplabeltext [\s!af] [\v!regels=re\ediaeresis ls ]
-\setuplabeltext [\s!no] [\v!regels=linjer ]
+\setuplabeltext [\s!en] [\v!graphic=Graphic ]
+\setuplabeltext [\s!nl] [\v!graphic=Grafiek ]
+\setuplabeltext [\s!de] [\v!graphic=Graphik ]
+\setuplabeltext [\s!da] [\v!graphic=Grafik ]
+\setuplabeltext [\s!sv] [\v!graphic=Grafik ]
+\setuplabeltext [\s!af] [\v!graphic=Grafiek ]
+\setuplabeltext [\s!no] [\v!graphic=Grafikk ]
+
+\setuplabeltext [\s!en] [\v!chapter=]
+\setuplabeltext [\s!nl] [\v!chapter=]
+\setuplabeltext [\s!de] [\v!chapter=]
+\setuplabeltext [\s!da] [\v!chapter=]
+\setuplabeltext [\s!sv] [\v!chapter=]
+\setuplabeltext [\s!af] [\v!chapter=] % [\v!chapter=hoofstuk]
+\setuplabeltext [\s!no] [\v!chapter=]
+
+\setuplabeltext [\s!en] [\v!section=]
+\setuplabeltext [\s!nl] [\v!section=]
+\setuplabeltext [\s!de] [\v!section=]
+\setuplabeltext [\s!da] [\v!section=]
+\setuplabeltext [\s!sv] [\v!section=]
+\setuplabeltext [\s!af] [\v!section=] % [\v!section=paragraaf]
+\setuplabeltext [\s!no] [\v!section=]
+
+\setuplabeltext [\s!en] [\v!sub\v!section=]
+\setuplabeltext [\s!nl] [\v!sub\v!section=]
+\setuplabeltext [\s!de] [\v!sub\v!section=]
+\setuplabeltext [\s!da] [\v!sub\v!section=]
+\setuplabeltext [\s!sv] [\v!sub\v!section=]
+\setuplabeltext [\s!af] [\v!sub\v!section=]
+\setuplabeltext [\s!no] [\v!sub\v!section=]
+
+\setuplabeltext [\s!en] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!nl] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!de] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!da] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sv] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!af] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!no] [\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!en] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!nl] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!de] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!da] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sv] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!af] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!no] [\v!sub\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!en] [\v!appendix=]
+\setuplabeltext [\s!nl] [\v!appendix=]
+\setuplabeltext [\s!de] [\v!appendix=]
+\setuplabeltext [\s!da] [\v!appendix=] % [\v!appendix=bilag]
+\setuplabeltext [\s!sv] [\v!appendix=]
+\setuplabeltext [\s!af] [\v!appendix=] % [\v!appendix=bylae]
+\setuplabeltext [\s!no] [\v!appendix=]
+
+\setuplabeltext [\s!en] [\v!part=Part ]
+\setuplabeltext [\s!nl] [\v!part=Deel ]
+\setuplabeltext [\s!de] [\v!part=Teil ]
+\setuplabeltext [\s!da] [\v!part=Del ]
+\setuplabeltext [\s!sv] [\v!part=Del ]
+\setuplabeltext [\s!af] [\v!part=Deel ]
+\setuplabeltext [\s!no] [\v!part=Del ]
+
+\setuplabeltext [\s!en] [\v!line=line ]
+\setuplabeltext [\s!nl] [\v!line=regel ]
+\setuplabeltext [\s!de] [\v!line=Zeile ]
+\setuplabeltext [\s!da] [\v!line=linie ] % or linje
+\setuplabeltext [\s!sv] [\v!line=rad ]
+\setuplabeltext [\s!af] [\v!line=re\ediaeresis l ]
+\setuplabeltext [\s!no] [\v!line=linje ]
+
+\setuplabeltext [\s!en] [\v!lines=lines ]
+\setuplabeltext [\s!nl] [\v!lines=regels ]
+\setuplabeltext [\s!de] [\v!lines=Zeilen ]
+\setuplabeltext [\s!da] [\v!lines=linier ] % or linjer
+\setuplabeltext [\s!sv] [\v!lines=rader ]
+\setuplabeltext [\s!af] [\v!lines=re\ediaeresis ls ]
+\setuplabeltext [\s!no] [\v!lines=linjer ]
 
 \setuplabeltext [\s!en]   [\v!january=January]
 \setuplabeltext [\s!en]  [\v!february=February]
@@ -632,41 +627,41 @@
 
 %D Rather new ...
 
-\setuplabeltext [\s!nl]    [\v!pagina=pagina ]
-\setuplabeltext [\s!nl]  [\v!oppagina=op pagina ]
-\setuplabeltext [\s!nl] [\v!hierboven=hierboven]
-\setuplabeltext [\s!nl] [\v!hieronder=hieronder]
-\setuplabeltext [\s!nl]       [\v!zie=zie ]
-
-\setuplabeltext [\s!en]    [\v!pagina=page ]
-\setuplabeltext [\s!en]  [\v!oppagina=at page ]
-\setuplabeltext [\s!en] [\v!hierboven=as we show above]
-\setuplabeltext [\s!en] [\v!hieronder=as we show below]
-\setuplabeltext [\s!en]       [\v!zie=see ]
-
-\setuplabeltext [\s!de]    [\v!pagina=Seite ]
-\setuplabeltext [\s!de]  [\v!oppagina=auf Seite ]
-\setuplabeltext [\s!de] [\v!hierboven=siehe oben]
-\setuplabeltext [\s!de] [\v!hieronder=siehe unten]
-\setuplabeltext [\s!de]       [\v!zie=siehe ]
-
-\setuplabeltext [\s!da]    [\v!pagina=Side ]
-\setuplabeltext [\s!da]  [\v!oppagina=p\aring\ side ]
-\setuplabeltext [\s!da] [\v!hierboven=se foroven]
-\setuplabeltext [\s!da] [\v!hieronder=se forneden]
-\setuplabeltext [\s!da]       [\v!zie=se ]
-
-\setuplabeltext [\s!sv]    [\v!pagina=Sida ]
-\setuplabeltext [\s!sv]  [\v!oppagina=p\aring\ sida ]
-\setuplabeltext [\s!sv] [\v!hierboven=se ovan]
-\setuplabeltext [\s!sv] [\v!hieronder=se nedan]
-\setuplabeltext [\s!sv]       [\v!zie=se ]
-
-\setuplabeltext [\s!no]    [\v!pagina=Side ]
-\setuplabeltext [\s!no]  [\v!oppagina=p\aring\ side ]
-\setuplabeltext [\s!no] [\v!hierboven=se foroven]
-\setuplabeltext [\s!no] [\v!hieronder=se forneden]
-\setuplabeltext [\s!no]       [\v!zie=se ]
+\setuplabeltext [\s!nl]    [\v!page=pagina ]
+\setuplabeltext [\s!nl]  [\v!atpage=op pagina ]
+\setuplabeltext [\s!nl] [\v!hencefore=hierboven]
+\setuplabeltext [\s!nl] [\v!hereafter=hieronder]
+\setuplabeltext [\s!nl]       [\v!see=zie ]
+
+\setuplabeltext [\s!en]    [\v!page=page ]
+\setuplabeltext [\s!en]  [\v!atpage=at page ]
+\setuplabeltext [\s!en] [\v!hencefore=as we show above]
+\setuplabeltext [\s!en] [\v!hereafter=as we show below]
+\setuplabeltext [\s!en]       [\v!see=see ]
+
+\setuplabeltext [\s!de]    [\v!page=Seite ]
+\setuplabeltext [\s!de]  [\v!atpage=auf Seite ]
+\setuplabeltext [\s!de] [\v!hencefore=siehe oben]
+\setuplabeltext [\s!de] [\v!hereafter=siehe unten]
+\setuplabeltext [\s!de]       [\v!see=siehe ]
+
+\setuplabeltext [\s!da]    [\v!page=Side ]
+\setuplabeltext [\s!da]  [\v!atpage=p\aring\ side ]
+\setuplabeltext [\s!da] [\v!hencefore=se foroven]
+\setuplabeltext [\s!da] [\v!hereafter=se forneden]
+\setuplabeltext [\s!da]       [\v!see=se ]
+
+\setuplabeltext [\s!sv]    [\v!page=Sida ]
+\setuplabeltext [\s!sv]  [\v!atpage=p\aring\ sida ]
+\setuplabeltext [\s!sv] [\v!hencefore=se ovan]
+\setuplabeltext [\s!sv] [\v!hereafter=se nedan]
+\setuplabeltext [\s!sv]       [\v!see=se ]
+
+\setuplabeltext [\s!no]    [\v!page=Side ]
+\setuplabeltext [\s!no]  [\v!atpage=p\aring\ side ]
+\setuplabeltext [\s!no] [\v!hencefore=se foroven]
+\setuplabeltext [\s!no] [\v!hereafter=se forneden]
+\setuplabeltext [\s!no]       [\v!see=se ]
 
 %D ... and to be completed!
 
@@ -698,4 +693,4 @@
 %D \ShowAllLanguageValues [\s!af] [afrikaans] afrikaanse gasvryheid
 %D \ShowAllLanguageValues [\s!no] [norwegian] noorse ...
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/lang-grk.tex b/tex/context/base/lang-grk.tex
index 0b000e8a1..c96edc2d3 100644
--- a/tex/context/base/lang-grk.tex
+++ b/tex/context/base/lang-grk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-grk,
+%D   [       file=tall-grk,
 %D        version=2003.04.01,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Uralic Languages,
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 
 \writestatus{loading}{Greek Language}
@@ -21,7 +21,7 @@
 
 \installlanguage
   [\s!gr]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -30,35 +30,35 @@
    \c!rightquote=\Greekrightquot,
    \c!leftquotation=\Greekleftquot,
    \c!rightquotation=\Greekrightquot,
-   \c!datum={\v!dag\ \v!maand\ \v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day\ \v!month\ \v!year},
+   \c!state=\v!stop]
 
 \installlanguage [greek]    [\s!gr]
 
-\setupheadtext  [\s!fi] [\v!inhoud=\GreekPi\Greekepsilon\Greekrho\Greekiota\Greekepsilon\Greekchi\Greekomicrontonos\Greekmu\Greekepsilon\Greeknu\Greekalpha]
-\setupheadtext  [\s!fi] [\v!tabellen=\GreekPi\Greekiotatonos\Greeknu\Greekalpha\Greekkappa\Greekepsilon\Greekfinalsigma]
-\setupheadtext  [\s!fi] [\v!figuren=\GreekSigma\Greekchi\Greeketatonos\Greekmu\Greekalpha\Greektau\Greekalpha]
-\setupheadtext  [\s!fi] [\v!grafieken=\GreekGamma\Greekrho\Greekalpha\Greekphi\Greekiota\Greekkappa\Greekalphatonos]
-\setupheadtext  [\s!fi] [\v!intermezzos=\GreekPi\Greekalpha\Greekupsilontonos\Greeksigma\Greekepsilon\Greekiota\Greekfinalsigma]
+\setupheadtext  [\s!fi] [\v!content=\GreekPi\Greekepsilon\Greekrho\Greekiota\Greekepsilon\Greekchi\Greekomicrontonos\Greekmu\Greekepsilon\Greeknu\Greekalpha]
+\setupheadtext  [\s!fi] [\v!tables=\GreekPi\Greekiotatonos\Greeknu\Greekalpha\Greekkappa\Greekepsilon\Greekfinalsigma]
+\setupheadtext  [\s!fi] [\v!figures=\GreekSigma\Greekchi\Greeketatonos\Greekmu\Greekalpha\Greektau\Greekalpha]
+\setupheadtext  [\s!fi] [\v!graphics=\GreekGamma\Greekrho\Greekalpha\Greekphi\Greekiota\Greekkappa\Greekalphatonos]
+\setupheadtext  [\s!fi] [\v!intermezzi=\GreekPi\Greekalpha\Greekupsilontonos\Greeksigma\Greekepsilon\Greekiota\Greekfinalsigma]
 \setupheadtext  [\s!fi] [\v!index=\GreekEpsilon\Greekupsilon\Greekrho\Greekepsilon\Greektau\Greeketatonos\Greekrho\Greekiota\Greekomicron]
-\setupheadtext  [\s!fi] [\v!afkortingen=\GreekSigma\Greekupsilon\Greeknu\Greektau\Greekomicron\Greekmu\Greekomicron\Greekgamma\Greekrho\Greekalpha\Greekphi\Greekiotatonos\Greekepsilon\Greekfinalsigma]
+\setupheadtext  [\s!fi] [\v!abbreviations=\GreekSigma\Greekupsilon\Greeknu\Greektau\Greekomicron\Greekmu\Greekomicron\Greekgamma\Greekrho\Greekalpha\Greekphi\Greekiotatonos\Greekepsilon\Greekfinalsigma]
 \setupheadtext  [\s!fi] [\v!logos=\GreekLamda\Greekomicron\Greekgamma\Greekomicrontonos\Greektau\Greekupsilon\Greekpi\Greekalpha]
-\setupheadtext  [\s!fi] [\v!eenheden=\GreekMu\Greekomicron\Greeknu\Greekalphatonos\Greekdelta\Greekepsilon\Greekfinalsigma]
+\setupheadtext  [\s!fi] [\v!units=\GreekMu\Greekomicron\Greeknu\Greekalphatonos\Greekdelta\Greekepsilon\Greekfinalsigma]
 
 
-\setuplabeltext [\s!fi] [\v!tabel=\GreekPi\Greekiotatonos\Greeknu\Greekalpha\Greekkappa\Greekalpha\Greekfinalsigma]
-\setuplabeltext [\s!fi] [\v!figuur=\GreekSigma\Greekchi\Greeketatonos\Greekmu\Greekalpha]
+\setuplabeltext [\s!fi] [\v!table=\GreekPi\Greekiotatonos\Greeknu\Greekalpha\Greekkappa\Greekalpha\Greekfinalsigma]
+\setuplabeltext [\s!fi] [\v!figure=\GreekSigma\Greekchi\Greeketatonos\Greekmu\Greekalpha]
 \setuplabeltext [\s!fi] [\v!intermezzo=\GreekPi\Greekalpha\Greekupsilontonos\Greeksigma\Greeketa]
-\setuplabeltext [\s!fi] [\v!grafiek=\GreekGamma\Greekrho\Greekalpha\Greekphi\Greekiota\Greekkappa\Greekomicrontonos]
-\setuplabeltext [\s!fi] [\v!hoofdstuk=\GreekKappa\Greekepsilon\Greekphi\Greekalphatonos\Greeklamda\Greekalpha\Greekiota\Greekomicron]
-\setuplabeltext [\s!fi] [\v!paragraaf=\GreekEpsilon\Greeknu\Greekomicrontonos\Greektau\Greeketa\Greektau\Greekalpha]
-\setuplabeltext [\s!fi] [\v!sub\v!paragraaf=\GreekUpsilon\Greekpi\Greekomicrontonos\Greekepsilon\Greeknu\Greekomicrontonos\Greektau\Greeketa\Greektau\Greekalpha]
-\setuplabeltext [\s!fi] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!bijlage=\GreekPi\Greekalpha\Greekrho\Greekalphatonos\Greekrho\Greektau\Greeketa\Greekmu\Greekalpha]
-\setuplabeltext [\s!fi] [\v!deel=\GreekMu\Greekepsilontonos\Greekrho\Greekomicron\Greekfinalsigma]
-\setuplabeltext [\s!fi] [\v!regel=\GreekGamma\Greekrho\Greekalpha\Greekmu\Greekmu\Greeketatonos]
-\setuplabeltext [\s!fi] [\v!regels=\GreekGamma\Greekrho\Greekalpha\Greekmu\Greekmu\Greekepsilontonos\Greekfinalsigma]
+\setuplabeltext [\s!fi] [\v!graphic=\GreekGamma\Greekrho\Greekalpha\Greekphi\Greekiota\Greekkappa\Greekomicrontonos]
+\setuplabeltext [\s!fi] [\v!chapter=\GreekKappa\Greekepsilon\Greekphi\Greekalphatonos\Greeklamda\Greekalpha\Greekiota\Greekomicron]
+\setuplabeltext [\s!fi] [\v!section=\GreekEpsilon\Greeknu\Greekomicrontonos\Greektau\Greeketa\Greektau\Greekalpha]
+\setuplabeltext [\s!fi] [\v!sub\v!section=\GreekUpsilon\Greekpi\Greekomicrontonos\Greekepsilon\Greeknu\Greekomicrontonos\Greektau\Greeketa\Greektau\Greekalpha]
+\setuplabeltext [\s!fi] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!fi] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!fi] [\v!appendix=\GreekPi\Greekalpha\Greekrho\Greekalphatonos\Greekrho\Greektau\Greeketa\Greekmu\Greekalpha]
+\setuplabeltext [\s!fi] [\v!part=\GreekMu\Greekepsilontonos\Greekrho\Greekomicron\Greekfinalsigma]
+\setuplabeltext [\s!fi] [\v!line=\GreekGamma\Greekrho\Greekalpha\Greekmu\Greekmu\Greeketatonos]
+\setuplabeltext [\s!fi] [\v!lines=\GreekGamma\Greekrho\Greekalpha\Greekmu\Greekmu\Greekepsilontonos\Greekfinalsigma]
 
 \setuplabeltext [\s!fi] [\v!january=\GreekIota\Greekalpha\Greeknu\Greekomicron\Greekupsilon\Greekalphatonos\Greekrho\Greekiota\Greekomicron\Greekfinalsigma]
 \setuplabeltext [\s!fi] [\v!february=\GreekPhi\Greekepsilon\Greekbeta\Greekrho\Greekomicron\Greekupsilon\Greekalphatonos\Greekrho\Greekiota\Greekomicron\Greekfinalsigma]
@@ -82,8 +82,6 @@
 \setuplabeltext [\s!fi] [\v!friday=\GreekPi\Greekalpha\Greekrho\Greekalpha\Greeksigma\Greekkappa\Greekepsilon\Greekupsilon\Greeketatonos]
 \setuplabeltext [\s!fi] [\v!saturday=\GreekSigma\Greekalphatonos\Greekbeta\Greekbeta\Greekalpha\Greektau\Greekomicron]
 
-%D \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos]
+%D % \ShowAllLanguageValues [\s!gr] [\GreekEpsilon\Greeklamda\Greeklamda\Greeketa\Greeknu\Greekiota\Greekkappa\Greekalphatonos] Greek ...
 
-\protect 
-
-\endinput 
+\protect \endinput
diff --git a/tex/context/base/lang-ind.tex b/tex/context/base/lang-ind.tex
index 1a92b355e..046204b5a 100644
--- a/tex/context/base/lang-ind.tex
+++ b/tex/context/base/lang-ind.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-ind,
+%D   [       file=tall-ind,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Indo||Iranian Languages,
diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex
index 7c40e1552..dca2ef032 100644
--- a/tex/context/base/lang-ini.tex
+++ b/tex/context/base/lang-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-ini,
+%D   [       file=tall-ini,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Initialization,
@@ -25,7 +25,7 @@
 \startmessages  dutch  library: linguals
   title: taal
       1: afbreekpatronen -- voor -- geladen (n=--)
-      2: geen afbreekpatronen -- voor -- (n=--)
+      2: geen afbreekpatronen -- voor -- (n=--) (--,--)
       3: afbreekdefinities -- voor -- geladen (n=--)
       4: geen afbreekdefinities -- voor -- (n=--)
       5: afbreekpatronen voor -- niet geladen
@@ -39,7 +39,7 @@
 \startmessages  english  library: linguals
   title: language
       1: patterns -- for -- loaded (n=--)
-      2: no patterns -- for -- (n=--)
+      2: no patterns -- for -- (n=--) (--,--)
       3: hyphenations -- for -- loaded (n=--)
       4: no hyphenations -- for -- (n=--)
       5: patterns for -- not loaded
@@ -53,7 +53,7 @@
 \startmessages  german  library: linguals
   title: Sprache
       1: Trennmuster -- fuer -- geladen (n=--)
-      2: Keine Trennmuster -- fuer -- (n=--)
+      2: Keine Trennmuster -- fuer -- (n=--) (--,--)
       3: Trenndefinitionen -- fuer -- geladen (n=--)
       4: Keine Trenndefinitionen -- fuer -- (n=--)
       5: Trennmuster fuer -- nicht geladen
@@ -69,7 +69,7 @@
 \startmessages  czech  library: linguals
   title: jazyky
       1: vzory -- pro -- nacteny (n=--)
-      2: zadne vzory -- pro -- (n=--)
+      2: zadne vzory -- pro -- (n=--) (--,--)
       3: deleni slov -- pro -- nacteno (n=--)
       4: zadne deleni slov -- pro -- (n=--)
       5: vzory pro -- nenacteny
@@ -83,7 +83,7 @@
 \startmessages  italian  library: linguals
   title: lingua
       1: schemi -- per -- caricati (n=--)
-      2: niente schemi -- per -- (n=--)
+      2: niente schemi -- per -- (n=--) (--,--)
       3: sillabazione -- per -- caricata (n=--)
       4: niente sillabazione -- per -- (n=--)
       5: schemi per -- non caricati
@@ -97,7 +97,7 @@
 \startmessages  norwegian  library: linguals
   title: språk
       1: orddelingsmønster -- for -- er lest inn (n=--)
-      2: ingen orddelingsmønster -- for -- (n=--)
+      2: ingen orddelingsmønster -- for -- (n=--) (--,--)
       3: orddelingsdefinisjon -- for -- er lest inn (n=--)
       4: ingen orddelingsdefinisjon -- for -- (n=--)
       5: orddelingsmønster for -- er ikke lest inn
@@ -111,7 +111,7 @@
 \startmessages  romanian  library: linguals
   title: limbi
       1: sablonul -- pentru -- s-a incarcat (n=--)
-      2: nu exista sabloane -- pentru -- (n=--)
+      2: nu exista sabloane -- pentru -- (n=--) (--,--)
       3: despartirea in silabe -- pentru -- s-a incarcat (n=--)
       4: nu exista despartire in silabe -- pentru -- (n=--)
       5: sabloanele pentru -- nu sunt incarcate
@@ -134,9 +134,11 @@
 
 %D We keep track of the last loaded patterns by means of a
 %D pseudo \COUNTER. This just one of those situations in which
-%D we don't want to spent a real one.
+%D we don't want to spent a real one. Language zero has no
+%D patterns, first of all because I like to start numbering
+%D at one. It may come in handy for special purposes as well.
 
-\newcounter\loadedlanguage
+\normallanguage\zerocount \patterns{} \def\loadedlanguage{1}
 
 %D Let's start with setting the lowercase code of quotes, so
 %D that we get proper hyphenation in languages like Dutch,
@@ -168,24 +170,24 @@
 %D
 %D \showsetup{\y!installlanguage}
 %D
-%D When \type{\c!status} equals \type{\v!start}, both patterns
+%D When \type {state} equals \type {start}, both patterns
 %D and additional hyphenation specifications are loaded. These
 %D files are seached for on the system path and are to be
 %D named:
 %D
-%D \starttypen
+%D \starttyping
 %D \f!languageprefix-identifier.\f!patternsextension
 %D \f!languageprefix-identifier.\f!hyhensextension
-%D \stoptypen
+%D \stoptyping
 %D
-%D The \type{\c!spatiering} specifies how the spaces after
+%D The \type{spacing} variable specifies how the spaces after
 %D punctuation has to be handled. English is by tradition more
 %D tolerant to inter||sentence spacing than other languages.
 %D
-%D This macro also defines \type{\identifier} as a shortcut
+%D This macro also defines \type {\identifier} as a shortcut
 %D switch to the language. Furthermore the command defined as
 %D being language specific, are executed. With
-%D \type{\c!default} we can default to another language
+%D \type {default} we can default to another language
 %D (patterns) at format generation time. This default language
 %D is overruled when the appropriate patterns are loaded (some
 %D implementations support run time addition of patterns to a
@@ -208,22 +210,18 @@
 \let\preloadedpatterns\empty
 \let\preloadedpmessage\empty
 
-\def\showpatterns#1%
-  {\getvalue{\??la#1\s!lefthyphenmin}%
-   -#1-%
-   \getvalue{\??la#1\s!righthyphenmin}%
-   \space}
+\def\showpatterns#1#2#3#4% language number encoding mapping
+  {#1->#3:#4->#2->\getvalue{\??la#1\s!lefthyphenmin}:\getvalue{\??la#1\s!righthyphenmin}\space}
 
 \def\preloadlanguages
-  {\doifsomething\preloadedpmessage
-     {\showmessage\m!linguals{10}\preloadedpmessage}}
+  {\doifsomething\preloadedpmessage{\showmessage\m!linguals{10}\preloadedpmessage}}
 
 \let\installedlanguages\empty
 
 \def\doinstalllanguage[#1][#2]%
   {%\ConvertConstantAfter\doifinstringelse{=}{#2}
    \doifassignmentelse{#2}
-     {\doifdefinedelse{\??la#1\c!status}
+     {\doifdefinedelse{\??la#1\c!state}
         {\getparameters[\??la#1][#2]}
         {\setvalue{\l!prefix!#1}{#1}%
          \addtocommalist{#1}\installedlanguages
@@ -232,7 +230,7 @@
            [\??la#1]
            [\s!lefthyphenmin=2,
             \s!righthyphenmin=2,
-            \c!spatiering=\v!opelkaar,
+            \c!spacing=\v!packed,
             \c!midsentence=---,
             \c!leftsentence=---,
             \c!rightsentence=---,
@@ -246,13 +244,13 @@
             \c!middlespeech=,
             \c!rightspeech=\getvalue{\??la#1\c!rightquotation},
             \c!limittext=\unknown,
-            \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-            \c!status=\v!stop,
+            \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+            \c!state=\v!stop,
             \c!default=,
             \s!patterns=,
             \s!mapping=,
             \s!encoding=,
-            \c!tekst=Ag,
+            \c!text=Ag,
             #2]%
          \doifvaluesomething{\??la#1\c!default}
            {\doifnotvalue{\??la#1\c!default}{#1}
@@ -260,7 +258,7 @@
                  [\??la#1]
                  [\s!lefthyphenmin=\languagedefault{#1}\s!lefthyphenmin,
                   \s!righthyphenmin=\languagedefault{#1}\s!righthyphenmin,
-                  \c!spatiering=\languagedefault{#1}\c!spatiering,
+                  \c!spacing=\languagedefault{#1}\c!spacing,
                   \c!leftsentence=\languagedefault{#1}\c!leftsentence,
                   \c!rightsentence=\languagedefault{#1}\c!rightsentence,
                   \c!leftsubsentence=\languagedefault{#1}\c!leftsubsentence,
@@ -272,21 +270,21 @@
                   \c!leftspeech=\languagedefault{#1}\c!leftspeech,
                   \c!middlespeech=\languagedefault{#1}\c!middlespeech,
                   \c!rightspeech=\languagedefault{#1}\c!rightspeech,
-                  \c!datum=\languagedefault{#1}\c!datum,
+                  \c!date=\languagedefault{#1}\c!date,
                   \s!mapping=\languagedefault{#1}\s!mapping,
                   \s!encoding=\languagedefault{#1}\s!encoding,
-                  \c!tekst=\languagedefault{#1}\c!tekst,
+                  \c!text=\languagedefault{#1}\c!text,
                   #2]}}}%
       \doifvalue{\??la#1\c!default}{#1}{\letvalue{\??la#1\c!default}\empty}%
        % loop in deo
        % \doifvalue{\??la#1\s!patterns}{#1}{\letvalue{\??la#1\c!default}\empty}%
        %
-      \doifelsevalue{\??la#1\c!status}\v!start
+      \doifelsevalue{\??la#1\c!state}\v!start
         {\doifelsevaluenothing{\??la#1\s!patterns}
            {\edef\languagesuffix{#1}}
            {\edef\languagesuffix{\getvalue{\??la#1\s!patterns}}}%
          \doifundefinedelse{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}
-           {\doloadpatterns{#1}{\languagesuffix}}
+           {\doloadpatterns{#1}\languagesuffix}
            {\bgroup
             \edef\loadedlanguage{\getvalue{\??la\??la:\currentencoding:\currentmapping:\languagesuffix}}%
             \showmessage\m!linguals1{\languagesuffix,#1,\loadedlanguage}%
@@ -304,8 +302,7 @@
 %D Handy
 
 \def\preloadallpatterns
-  {\gdef\preloadallpatterns##1%
-     {\installlanguage[##1][\c!status=\v!start]}%
+  {\gdef\preloadallpatterns##1{\installlanguage[##1][\c!state=\v!start]}%
    \processcommacommand[\installedlanguages]\preloadallpatterns
    \global\let\preloadallpatterns\relax}
 
@@ -337,42 +334,56 @@
 
 \def\dodoloadpatterns#1#2#3#4% beware, loaded language also incr
   {\normallanguage\loadedlanguage % when not really needed
-  %\letvalue{\??la\??la#2}\loadedlanguage
    \bgroup
-   \scratchtoks\everyjob % we don't want additional junk put there
-   \let\showpatterns\relax
    \startencoding[#3]%
    \enablemapping[#4]%
    \doifnothing\currentencoding{\let\currentencoding\s!default}%
    \doifnothing\currentmapping {\let\currentmapping \s!default}%
-   \letgvalue{\??la\??la:\currentencoding:\currentmapping:#2}\loadedlanguage
-   \startreadingfile
-   \startpatternaccents
-  %\def\patterns##1{\message{#1/#2/#3/#4/##1}\normalpatterns{##1}}%
-   \readsysfile{\truefilename{\f!languageprefix#2.\f!patternsextension}}
-     {\setxvalue{\??la#1\s!patterns}{#2}%
-      \xdef\preloadedpmessage
-        {\preloadedpmessage
-         \number\normallanguage:\showpatterns{#2}}%
-      \doglobal\addtocommalist{#2}\preloadedpatterns
-      \showmessage\m!linguals1{#2,#1,\loadedlanguage}}
-     {\readsysfile{\f!languageprefix#2.\f!patternsextension}
-        {\setxvalue{\??la#1\s!patterns}{#2}%
-         \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}}%
-         \doglobal\addtocommalist{#2}\preloadedpatterns
-         \showmessage\m!linguals1{#2,#1,\loadedlanguage}}
-        {\showmessage\m!linguals2{#2,#1,\loadedlanguage}}}%
-      \readsysfile{\truefilename{\f!languageprefix#2.\f!hyphensextension}}
-        {\showmessage\m!linguals3{#2,#1,\loadedlanguage}}
-        {\readsysfile{\f!languageprefix#2.\f!hyphensextension}
-           {\showmessage\m!linguals3{#2,#1,\loadedlanguage}}
-           {\showmessage\m!linguals4{#2,#1,\loadedlanguage}}}%
-   \stoppatternaccents
-   \stopreadingfile
-   \stopencoding
-   \global\everyjob\scratchtoks
-   \egroup
-   \increment\loadedlanguage}
+   \ifundefined{\??la\??la:\currentencoding:\currentmapping:#2}%
+     \let\showpatterns\relax
+     \scratchtoks\everyjob % we don't want additional junk put there, is saving needed?
+     \edef\alreadyloadedlanguage
+       {\executeifdefined{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}\empty}%
+     \edef\alreadyloadedlanguage
+       {\executeifdefined{\??la\??la:\currentencoding:\currentmapping:\f!languageprefix#2.\f!patternsextension}\alreadyloadedlanguage}%
+     \ifx\alreadyloadedlanguage\empty
+       \letgvalue{\??la\??la:\currentencoding:\currentmapping:#2}\loadedlanguage
+       \doifundefined{\??la\??la:\s!default:\s!default:#2}{\letgvalue{\??la\??la:\s!default:\s!default:#2}\loadedlanguage}% fall back
+       \startreadingfile
+       \startpatternaccents
+       \readsysfile{\truefilename{\f!languageprefix#2.\f!patternsextension}}
+         {\setxvalue{\??la#1\s!patterns}{#2}%
+          \setxvalue{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}{\number\loadedlanguage}%
+          \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}%
+          \doglobal\addtocommalist{#2}\preloadedpatterns
+          \showmessage\m!linguals1{#2,#1,\loadedlanguage}}
+         {\readsysfile{\f!languageprefix#2.\f!patternsextension}
+            {\setxvalue{\??la#1\s!patterns}{#2}%
+             \setxvalue{\??la\??la:\currentencoding:\currentmapping:\f!languageprefix#2.\f!patternsextension}{\number\loadedlanguage}%
+             \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}%
+             \doglobal\addtocommalist{#2}\preloadedpatterns
+             \showmessage\m!linguals1{#2,#1,\loadedlanguage}}
+            {\showmessage\m!linguals2{#2,#1,\loadedlanguage,\f!languageprefix#2.\f!patternsextension,\truefilename{\f!languageprefix#2.\f!patternsextension}}}}%
+          \readsysfile{\truefilename{\f!languageprefix#2.\f!hyphensextension}}
+            {\showmessage\m!linguals3{#2,#1,\loadedlanguage}}
+            {\readsysfile{\f!languageprefix#2.\f!hyphensextension}
+               {\showmessage\m!linguals3{#2,#1,\loadedlanguage}}
+               {\showmessage\m!linguals4{#2,#1,\loadedlanguage}}}%
+       \doglobal\increment\loadedlanguage
+       \stoppatternaccents
+       \stopreadingfile
+       \stopencoding
+     \else % optimization, introduced 2004.08.24, while sorting out changes in tl
+       \letgvalue{\??la\??la:\currentencoding:\currentmapping:#2}\alreadyloadedlanguage
+       \doifundefined{\??la\??la:\s!default:\s!default:#2}{\letgvalue{\??la\??la:\s!default:\s!default:#2}\loadedlanguage}% fall back
+       \setxvalue{\??la#1\s!patterns}{#2}%
+       \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{[\number\alreadyloadedlanguage]}{\currentencoding}{\currentmapping}}%
+       \doglobal\addtocommalist{#2}\preloadedpatterns
+       \showmessage\m!linguals1{#2,#1,[\alreadyloadedlanguage]}%
+     \fi
+     \global\everyjob\scratchtoks
+   \fi
+   \egroup}
 
 \def\doifpatternselse#1%
   {\expanded{\doifinsetelse{#1}{\preloadedpatterns}}}
@@ -382,7 +393,7 @@
 %D strangely enough not in the format).
 
 \appendtoks
-  \gdef\doloadpatterns{\increment\loadedlanguage\gobbletwoarguments}%
+  \gdef\doloadpatterns{\doglobal\increment\loadedlanguage\gobbletwoarguments}%
   \globallet\dodoloadpatterns\gobblefourarguments
 \to \everydump
 
@@ -412,13 +423,13 @@
      \docomplexlanguage
    \fi}
 
-%D The values \type {\c!leftsentence} and \type
-%D {\c!rightsentence} can be (and are) used to implement
+%D The values \type {leftsentence} and \type
+%D {rightsentence} can be (and are) used to implement
 %D automatic subsentence boundary glyphs, like in {\fr
 %D |<|french guillemots|>|} or {\de |<|german guillemots|>|} or
 %D {\nl |<|dutch dashes|>|} like situations. Furthermore \type
-%D {\c!leftquotation} and \type {\c!leftquote} come into view
-%D \citaat {when we quote} or \citeer {quote} something.
+%D {leftquotation} and \type {leftquote} come into view
+%D \quotation {when we quote} or \quote {quote} something.
 
 %D \macros
 %D  {currentdatespecification}
@@ -427,16 +438,16 @@
 %D specification by saying:
 
 \def\currentdatespecification
-  {\csname\??la\currentlanguage\c!datum\endcsname}
+  {\csname\??la\currentlanguage\c!date\endcsname}
 
 %D This command is not meant for users.
 
 %D Carefull reading of these macros shows that it's legal to
 %D say
 %D
-%D \starttypen
+%D \starttyping
 %D \installlanguage [du] [de]
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {language,mainlanguage}
@@ -444,16 +455,16 @@
 %D Switching to another language (actually another hyphenation
 %D pattern) is done with:
 %D
-%D \starttypen
+%D \starttyping
 %D \language[identifier]
-%D \stoptypen
+%D \stoptyping
 %D
 %D or with \type{\identifier}. Just to be compatible with
 %D \PLAIN\ \TEX, we still support the original meaning, so
 %D
-%D \starttypen
+%D \starttyping
 %D \language=1
-%D \stoptypen
+%D \stoptyping
 %D
 %D is a valid operation, where the relation between number
 %D and language depends on the order in installing languages.
@@ -566,7 +577,7 @@
    \lefthyphenmin 0\csname\??la\currentlanguage\s!lefthyphenmin \endcsname
    \righthyphenmin0\csname\??la\currentlanguage\s!righthyphenmin\endcsname\relax
    % will be definable and move to core-spa !
-   \doifelsevalue{\??la\currentlanguage\c!spatiering}\v!ruim
+   \doifelsevalue{\??la\currentlanguage\c!spacing}\v!broad
      \nonfrenchspacing\frenchspacing}
 
 \ifx\enablelanguagespecifics\undefined
@@ -689,7 +700,7 @@
 % %D When using Computer Modern Roman, the next definitions
 % %D looks a bit better than the default ligatures.
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \def\lowerleftsingleninequote  {,}
 % %D \def\lowerleftdoubleninequote  {,\kern-.1em,}
 % %D \def\upperleftsingleninequote  {'}
@@ -703,7 +714,7 @@
 % %D \def\upperrightdoubleninequote {''}
 % %D \def\upperrightsinglesixquote  {`}
 % %D \def\upperrightdoublesixquote  {\kern-.125em``}
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D But in other fonts, these definitions can give problems, so
 % %D we just say:
@@ -739,7 +750,7 @@
 %D New (see nomarking and nolist):
 
 \def\splitsequence#1#2%
-  {\doifelse{#1}\v!nee{#2}{\doifelse{#1}\v!ja{\languageparameter\c!limittext}{#1}}}
+  {\doifelse{#1}\v!no{#2}{\doifelse{#1}\v!yes{\languageparameter\c!limittext}{#1}}}
 
 \def\splitsymbol#1%
   {\splitsequence{#1}{\languageparameter\c!limittext}}
@@ -749,8 +760,8 @@
 %D the defaults here.
 %D
 %D \def\ShowLanguageValues [#1] [#2] #3 #4
-%D   {\blanko
-%D    \startregelcorrectie
+%D   {\blank
+%D    \startlinecorrection
 %D    \vbox\bgroup
 %D    \language[#1]%
 %D    \setbox0=\hbox to \hsize{\hss\bf#2 subsentence symbol and quotes\hss}
@@ -761,13 +772,13 @@
 %D    \vskip.5em
 %D    \let\normalbar=|
 %D    \hbox to \hsize
-%D      {\hfil\citaat{#3 #4}\hfil\citeer{#2}\hfil
+%D      {\hfil\quotation{#3 #4}\hfil\quote{#2}\hfil
 %D       \let|=\normalbar\strut|<||<|#3|>|#4|>|\hfil}
 %D    \vskip.5em
 %D    \hrule
 %D    \egroup
-%D    \stopregelcorrectie
-%D    \blanko}
+%D    \stoplinecorrection
+%D    \blank}
 %D
 %D \ShowLanguageValues [af] [afrikaans]  afrikaanse ...
 %D \ShowLanguageValues [cz] [czech]      tjechisch tex
@@ -793,8 +804,8 @@
 %D language.
 %D
 %D \unprotect
-%D \plaatstabel{The germanic languages (\type{lang-ger})}
-%D \starttabel[||||]
+%D \placetable{The germanic languages (\type{lang-ger})}
+%D \starttable[||||]
 %D \HL
 %D \NC \bf mnemonic \NC \bf language \NC \bf group \NC\SR
 %D \HL
@@ -806,12 +817,12 @@
 %D \NC \s!af        \NC afrikaans    \NC germanic  \NC\MR
 %D \NC \s!no        \NC norwegian    \NC germanic  \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \protect
 %D
 %D \unprotect
-%D \plaatstabel{The italic languages (\type{lang-ita})}
-%D \starttabel[||||]
+%D \placetable{The italic languages (\type{lang-ita})}
+%D \starttable[||||]
 %D \HL
 %D \NC \bf mnemonic \NC \bf language \NC \bf group \NC\SR
 %D \HL
@@ -821,12 +832,12 @@
 %D \NC \s!la        \NC latin        \NC italic    \NC\MR
 %D \NC \s!pt        \NC portuguese   \NC italic    \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \protect
 %D
 %D \unprotect
-%D \plaatstabel{The slavic languages (\type{lang-sla})}
-%D \starttabel[||||]
+%D \placetable{The slavic languages (\type{lang-sla})}
+%D \starttable[||||]
 %D \HL
 %D \NC \bf mnemonic \NC \bf language \NC \bf group \NC\SR
 %D \HL
@@ -834,27 +845,27 @@
 %D \NC \s!cz        \NC czech        \NC slavic    \NC\MR
 %D \NC \s!sk        \NC slavik       \NC slavic    \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \protect
 %D \unprotect
 %D
-%D \plaatstabel{The altaic languages (\type{lang-alt})}
-%D \starttabel[||||]
+%D \placetable{The altaic languages (\type{lang-alt})}
+%D \starttable[||||]
 %D \HL
 %D \NC \bf mnemonic \NC \bf language \NC \bf group \NC\SR
 %D \HL
 %D \NC \s!tr        \NC turkish      \NC altaic    \NC\SR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D
-%D \plaatstabel{The uralic languages (\type{lang-ura})}
-%D \starttabel[||||]
+%D \placetable{The uralic languages (\type{lang-ura})}
+%D \starttable[||||]
 %D \HL
 %D \NC \bf mnemonic \NC \bf language \NC \bf group \NC\SR
 %D \HL
 %D \NC \s!fi        \NC finnish      \NC uralic    \NC\SR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \protect
 
 % \bgroup \normallanguage255 \patterns{} \egroup
@@ -877,4 +888,4 @@
 
 \appendtoks\showmessage\m!linguals9\currentlanguage\to\everyjob
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/lang-ita.tex b/tex/context/base/lang-ita.tex
index 57c0e88a3..2f77f5ef7 100644
--- a/tex/context/base/lang-ita.tex
+++ b/tex/context/base/lang-ita.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-ita,
+%D   [       file=tall-ita,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Italic Languages,
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D Todo: replace \'.. by \namedglyph
+% Todo: replace \'.. by \namedglyph
 
 \writestatus{loading}{Italic Languages}
 
@@ -37,7 +37,7 @@
 
 \installlanguage
   [\s!fr]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=\emdash,
    \c!rightsentence=\emdash,
    \c!leftsubsentence=\emdash,
@@ -46,12 +46,12 @@
    \c!rightquote=\rightguillemot,
    \c!leftquotation=\leftguillemot,
    \c!rightquotation=\rightguillemot,
-   \c!datum={\v!dag+,\v!spatie,\v!maand,\v!spatie,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day+,\v!space,\v!month,\v!space,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!es]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -60,8 +60,8 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage [sp] [\s!es] % old times context
 
@@ -69,7 +69,7 @@
 
 \installlanguage
   [\s!it]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=--,
@@ -81,12 +81,12 @@
    \c!leftspeech=\leftguillemot,
    \c!middlespeech=\leftguillemot,
    \c!rightspeech=\rightguillemot,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage % the same as italian
   [\s!la]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -95,12 +95,12 @@
    \c!rightquote=\lowerrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\lowerrightdoubleninequote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!pt]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -109,12 +109,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-   \c!status=\v!stop]
+   \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!ro]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -123,8 +123,8 @@
    \c!rightquote=\rightguillemot,
    \c!leftquotation=\lowerrightdoubleninequote,
    \c!rightquotation=\upperleftdoublesixquote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 %D For compatibility reasons we also define:
 
@@ -139,40 +139,40 @@
 
 %D Labels and header texts.
 
-\setupheadtext [\s!fr] [\v!inhoud=Table des mati\`eres]
-\setupheadtext [\s!es] [\v!inhoud=\'Indice]
-\setupheadtext [\s!it] [\v!inhoud=Indice]
-\setupheadtext [\s!la] [\v!inhoud=Quod in libro continetur] %Argumentum
-\setupheadtext [\s!pt] [\v!inhoud=Conte\'udo]
-\setupheadtext [\s!ro] [\v!inhoud=Cuprins]
-
-\setupheadtext [\s!fr] [\v!tabellen=Tables]
-\setupheadtext [\s!es] [\v!tabellen=Tablas]
-\setupheadtext [\s!it] [\v!tabellen=Tabelle]
-\setupheadtext [\s!la] [\v!tabellen=Tabulae]
-\setupheadtext [\s!pt] [\v!tabellen=Tabelas]
-\setupheadtext [\s!ro] [\v!tabellen=Tabele]
-
-\setupheadtext [\s!fr] [\v!figuren=Figures]
-\setupheadtext [\s!es] [\v!figuren=Ilustraci\'ons]
-\setupheadtext [\s!it] [\v!figuren=Figure]
-\setupheadtext [\s!la] [\v!figuren=Imagines]
-\setupheadtext [\s!pt] [\v!figuren=Figuras]
-\setupheadtext [\s!ro] [\v!figuren=Figuri]
-
-\setupheadtext [\s!fr] [\v!grafieken=Graphiques]
-\setupheadtext [\s!es] [\v!grafieken=Gr\'aficos]
-\setupheadtext [\s!it] [\v!grafieken=Grafici]
-\setupheadtext [\s!la] [\v!grafieken=Typi]
-\setupheadtext [\s!pt] [\v!grafieken=Gr\'aficos]
-\setupheadtext [\s!ro] [\v!grafieken=Grafice]
-
-\setupheadtext [\s!fr] [\v!intermezzos=Interm\`edes]
-\setupheadtext [\s!es] [\v!intermezzos=intermedios]
-\setupheadtext [\s!it] [\v!intermezzos=Intermezzi]
-\setupheadtext [\s!la] [\v!intermezzos=Intermissa]
-\setupheadtext [\s!pt] [\v!intermezzos=Interm\'edios]
-\setupheadtext [\s!ro] [\v!intermezzos=Intermzzo]
+\setupheadtext [\s!fr] [\v!content=Table des mati\`eres]
+\setupheadtext [\s!es] [\v!content=\'Indice]
+\setupheadtext [\s!it] [\v!content=Indice]
+\setupheadtext [\s!la] [\v!content=Quod in libro continetur] %Argumentum
+\setupheadtext [\s!pt] [\v!content=Conte\'udo]
+\setupheadtext [\s!ro] [\v!content=Cuprins]
+
+\setupheadtext [\s!fr] [\v!tables=Tables]
+\setupheadtext [\s!es] [\v!tables=Tablas]
+\setupheadtext [\s!it] [\v!tables=Tabelle]
+\setupheadtext [\s!la] [\v!tables=Tabulae]
+\setupheadtext [\s!pt] [\v!tables=Tabelas]
+\setupheadtext [\s!ro] [\v!tables=Tabele]
+
+\setupheadtext [\s!fr] [\v!figures=Figures]
+\setupheadtext [\s!es] [\v!figures=Ilustraci\'ons]
+\setupheadtext [\s!it] [\v!figures=Figure]
+\setupheadtext [\s!la] [\v!figures=Imagines]
+\setupheadtext [\s!pt] [\v!figures=Figuras]
+\setupheadtext [\s!ro] [\v!figures=Figuri]
+
+\setupheadtext [\s!fr] [\v!graphics=Graphiques]
+\setupheadtext [\s!es] [\v!graphics=Gr\'aficos]
+\setupheadtext [\s!it] [\v!graphics=Grafici]
+\setupheadtext [\s!la] [\v!graphics=Typi]
+\setupheadtext [\s!pt] [\v!graphics=Gr\'aficos]
+\setupheadtext [\s!ro] [\v!graphics=Grafice]
+
+\setupheadtext [\s!fr] [\v!intermezzi=Interm\`edes]
+\setupheadtext [\s!es] [\v!intermezzi=intermedios]
+\setupheadtext [\s!it] [\v!intermezzi=Intermezzi]
+\setupheadtext [\s!la] [\v!intermezzi=Intermissa]
+\setupheadtext [\s!pt] [\v!intermezzi=Interm\'edios]
+\setupheadtext [\s!ro] [\v!intermezzi=Intermzzo]
 
 \setupheadtext [\s!fr] [\v!index=Index]
 \setupheadtext [\s!es] [\v!index=\'Indice]
@@ -181,12 +181,12 @@
 \setupheadtext [\s!pt] [\v!index=\'Indice]
 \setupheadtext [\s!ro] [\v!index=Index]
 
-\setupheadtext [\s!fr] [\v!afkortingen=Abr\'eviations]
-\setupheadtext [\s!es] [\v!afkortingen=Abreviaci\'ons]
-\setupheadtext [\s!it] [\v!afkortingen=Abbreviazioni]
-\setupheadtext [\s!la] [\v!afkortingen=Notae]
-\setupheadtext [\s!pt] [\v!afkortingen=Abreviaturas]
-\setupheadtext [\s!ro] [\v!afkortingen=Abrevieri]
+\setupheadtext [\s!fr] [\v!abbreviations=Abr\'eviations]
+\setupheadtext [\s!es] [\v!abbreviations=Abreviaci\'ons]
+\setupheadtext [\s!it] [\v!abbreviations=Abbreviazioni]
+\setupheadtext [\s!la] [\v!abbreviations=Notae]
+\setupheadtext [\s!pt] [\v!abbreviations=Abreviaturas]
+\setupheadtext [\s!ro] [\v!abbreviations=Abrevieri]
 
 \setupheadtext [\s!fr] [\v!logos=Logos]
 \setupheadtext [\s!es] [\v!logos=Logotipos]
@@ -195,26 +195,26 @@
 \setupheadtext [\s!pt] [\v!logos=Logotipos]
 \setupheadtext [\s!ro] [\v!logos=Logo-uri]
 
-\setupheadtext [\s!fr] [\v!eenheden=Unit\'es]
-\setupheadtext [\s!es] [\v!eenheden=Unidads]
-\setupheadtext [\s!it] [\v!eenheden=Unit\`a]
-\setupheadtext [\s!la] [\v!eenheden=Modi]
-\setupheadtext [\s!pt] [\v!eenheden=Unidades]
-\setupheadtext [\s!ro] [\v!eenheden=Unit\u{a}\c{t}i]
-
-\setuplabeltext [\s!fr] [\v!tabel=Table ]
-\setuplabeltext [\s!es] [\v!tabel=Tablas ]
-\setuplabeltext [\s!it] [\v!tabel=Tabella ]
-\setuplabeltext [\s!la] [\v!tabel=Tabula ]
-\setuplabeltext [\s!pt] [\v!tabel=Tabela ]
-\setuplabeltext [\s!ro] [\v!tabel=Tabelul ]
-
-\setuplabeltext [\s!fr] [\v!figuur=Figure ]
-\setuplabeltext [\s!es] [\v!figuur=Ilustraci\'on ]
-\setuplabeltext [\s!it] [\v!figuur=Fig. ]
-\setuplabeltext [\s!la] [\v!figuur=Imago ]
-\setuplabeltext [\s!pt] [\v!figuur=Figura ]
-\setuplabeltext [\s!ro] [\v!figuur=Figura ]
+\setupheadtext [\s!fr] [\v!units=Unit\'es]
+\setupheadtext [\s!es] [\v!units=Unidads]
+\setupheadtext [\s!it] [\v!units=Unit\`a]
+\setupheadtext [\s!la] [\v!units=Modi]
+\setupheadtext [\s!pt] [\v!units=Unidades]
+\setupheadtext [\s!ro] [\v!units=Unit\u{a}\c{t}i]
+
+\setuplabeltext [\s!fr] [\v!table=Table ]
+\setuplabeltext [\s!es] [\v!table=Tablas ]
+\setuplabeltext [\s!it] [\v!table=Tabella ]
+\setuplabeltext [\s!la] [\v!table=Tabula ]
+\setuplabeltext [\s!pt] [\v!table=Tabela ]
+\setuplabeltext [\s!ro] [\v!table=Tabelul ]
+
+\setuplabeltext [\s!fr] [\v!figure=Figure ]
+\setuplabeltext [\s!es] [\v!figure=Ilustraci\'on ]
+\setuplabeltext [\s!it] [\v!figure=Fig. ]
+\setuplabeltext [\s!la] [\v!figure=Imago ]
+\setuplabeltext [\s!pt] [\v!figure=Figura ]
+\setuplabeltext [\s!ro] [\v!figure=Figura ]
 
 \setuplabeltext [\s!fr] [\v!intermezzo=Interm\`ede ]
 \setuplabeltext [\s!es] [\v!intermezzo=intermedio ]
@@ -223,75 +223,75 @@
 \setuplabeltext [\s!pt] [\v!intermezzo=Interm\'edio ]
 \setuplabeltext [\s!ro] [\v!intermezzo=Intermezzo ]
 
-\setuplabeltext [\s!fr] [\v!grafiek=Illustration ]
-\setuplabeltext [\s!es] [\v!grafiek=Gr\'afico ]
-\setuplabeltext [\s!it] [\v!grafiek=Grafico ]
-\setuplabeltext [\s!la] [\v!grafiek=Typus ]
-\setuplabeltext [\s!pt] [\v!grafiek=Gr\'afico ]
-\setuplabeltext [\s!ro] [\v!grafiek=Graficul ]
-
-\setuplabeltext [\s!fr] [\v!hoofdstuk=]
-\setuplabeltext [\s!es] [\v!hoofdstuk=]
-\setuplabeltext [\s!it] [\v!hoofdstuk=]
-\setuplabeltext [\s!la] [\v!hoofdstuk=]
-\setuplabeltext [\s!pt] [\v!hoofdstuk=]
-\setuplabeltext [\s!ro] [\v!hoofdstuk=]
-
-\setuplabeltext [\s!fr] [\v!paragraaf=]
-\setuplabeltext [\s!es] [\v!paragraaf=]
-\setuplabeltext [\s!it] [\v!paragraaf=]
-\setuplabeltext [\s!la] [\v!paragraaf=]
-\setuplabeltext [\s!pt] [\v!paragraaf=]
-\setuplabeltext [\s!ro] [\v!paragraaf=]
-
-\setuplabeltext [\s!fr] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!es] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!it] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!la] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!pt] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ro] [\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!fr] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!es] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!it] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!la] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!pt] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ro] [\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!fr] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!es] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!it] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!la] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!pt] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!ro] [\v!sub\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!fr] [\v!bijlage=]
-\setuplabeltext [\s!es] [\v!bijlage=]
-\setuplabeltext [\s!it] [\v!bijlage=]
-\setuplabeltext [\s!la] [\v!bijlage=]
-\setuplabeltext [\s!pt] [\v!bijlage=]
-\setuplabeltext [\s!ro] [\v!bijlage=]
-
-\setuplabeltext [\s!fr] [\v!deel=Partie ]
-\setuplabeltext [\s!es] [\v!deel=Parte ]
-\setuplabeltext [\s!it] [\v!deel=Parte ]
-\setuplabeltext [\s!la] [\v!deel=Pars ]
-\setuplabeltext [\s!pt] [\v!deel=Parte ]
-\setuplabeltext [\s!ro] [\v!deel=Partea ]
-
-\setuplabeltext [\s!fr] [\v!regel=ligne ]
-\setuplabeltext [\s!es] [\v!regel=l\'\i nea ]
-\setuplabeltext [\s!it] [\v!regel=riga ]
-\setuplabeltext [\s!la] [\v!regel=versus ]
-\setuplabeltext [\s!pt] [\v!regel=linha ]
-\setuplabeltext [\s!ro] [\v!regel=linia ]
-
-\setuplabeltext [\s!fr] [\v!regels=lignes ]
-\setuplabeltext [\s!es] [\v!regels=l\'\i neas ]
-\setuplabeltext [\s!it] [\v!regels=righe ]
-\setuplabeltext [\s!la] [\v!regels=versus ]
-\setuplabeltext [\s!pt] [\v!regels=linhas ]
-\setuplabeltext [\s!ro] [\v!regels=liniile ]
+\setuplabeltext [\s!fr] [\v!graphic=Illustration ]
+\setuplabeltext [\s!es] [\v!graphic=Gr\'afico ]
+\setuplabeltext [\s!it] [\v!graphic=Grafico ]
+\setuplabeltext [\s!la] [\v!graphic=Typus ]
+\setuplabeltext [\s!pt] [\v!graphic=Gr\'afico ]
+\setuplabeltext [\s!ro] [\v!graphic=Graficul ]
+
+\setuplabeltext [\s!fr] [\v!chapter=]
+\setuplabeltext [\s!es] [\v!chapter=]
+\setuplabeltext [\s!it] [\v!chapter=]
+\setuplabeltext [\s!la] [\v!chapter=]
+\setuplabeltext [\s!pt] [\v!chapter=]
+\setuplabeltext [\s!ro] [\v!chapter=]
+
+\setuplabeltext [\s!fr] [\v!section=]
+\setuplabeltext [\s!es] [\v!section=]
+\setuplabeltext [\s!it] [\v!section=]
+\setuplabeltext [\s!la] [\v!section=]
+\setuplabeltext [\s!pt] [\v!section=]
+\setuplabeltext [\s!ro] [\v!section=]
+
+\setuplabeltext [\s!fr] [\v!sub\v!section=]
+\setuplabeltext [\s!es] [\v!sub\v!section=]
+\setuplabeltext [\s!it] [\v!sub\v!section=]
+\setuplabeltext [\s!la] [\v!sub\v!section=]
+\setuplabeltext [\s!pt] [\v!sub\v!section=]
+\setuplabeltext [\s!ro] [\v!sub\v!section=]
+
+\setuplabeltext [\s!fr] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!es] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!it] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!la] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!pt] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!ro] [\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!fr] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!es] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!it] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!la] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!pt] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!ro] [\v!sub\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!fr] [\v!appendix=]
+\setuplabeltext [\s!es] [\v!appendix=]
+\setuplabeltext [\s!it] [\v!appendix=]
+\setuplabeltext [\s!la] [\v!appendix=]
+\setuplabeltext [\s!pt] [\v!appendix=]
+\setuplabeltext [\s!ro] [\v!appendix=]
+
+\setuplabeltext [\s!fr] [\v!part=Partie ]
+\setuplabeltext [\s!es] [\v!part=Parte ]
+\setuplabeltext [\s!it] [\v!part=Parte ]
+\setuplabeltext [\s!la] [\v!part=Pars ]
+\setuplabeltext [\s!pt] [\v!part=Parte ]
+\setuplabeltext [\s!ro] [\v!part=Partea ]
+
+\setuplabeltext [\s!fr] [\v!line=ligne ]
+\setuplabeltext [\s!es] [\v!line=l\'\i nea ]
+\setuplabeltext [\s!it] [\v!line=riga ]
+\setuplabeltext [\s!la] [\v!line=versus ]
+\setuplabeltext [\s!pt] [\v!line=linha ]
+\setuplabeltext [\s!ro] [\v!line=linia ]
+
+\setuplabeltext [\s!fr] [\v!lines=lignes ]
+\setuplabeltext [\s!es] [\v!lines=l\'\i neas ]
+\setuplabeltext [\s!it] [\v!lines=righe ]
+\setuplabeltext [\s!la] [\v!lines=versus ]
+\setuplabeltext [\s!pt] [\v!lines=linhas ]
+\setuplabeltext [\s!ro] [\v!lines=liniile ]
 
 \setuplabeltext [\s!fr]   [\v!january=janvier]
 \setuplabeltext [\s!fr]  [\v!february=f\'evrier]
@@ -436,11 +436,11 @@
 
 %D Rather new \unknown
 
-\setuplabeltext [\s!it]    [\v!pagina=pagina ]
-\setuplabeltext [\s!it]  [\v!oppagina=a pagina ]
-\setuplabeltext [\s!it] [\v!hierboven=come mostrato sopra]
-\setuplabeltext [\s!it] [\v!hieronder=come mostrato sotto]
-\setuplabeltext [\s!it]       [\v!zie=cf. ]
+\setuplabeltext [\s!it]    [\v!page=pagina ]
+\setuplabeltext [\s!it]  [\v!atpage=a pagina ]
+\setuplabeltext [\s!it] [\v!hencefore=come mostrato sopra]
+\setuplabeltext [\s!it] [\v!hereafter=come mostrato sotto]
+\setuplabeltext [\s!it]       [\v!see=cf. ]
 
 %D Ordinal converters:
 
@@ -449,7 +449,7 @@
      \highordinalstr{er}%
    \fi}
 
-\defineconversion [\s!fr] [\v!dag+] [\frordinaldaynumber]
+\defineconversion [\s!fr] [\v!day+] [\frordinaldaynumber]
 
 %D \ShowAllLanguageValues [\s!fr] [french]     franse slag
 %D \ShowAllLanguageValues [\s!es] [spanish]    spaans benauwd
@@ -458,4 +458,4 @@
 %D \ShowAllLanguageValues [\s!pt] [portuguese] portugese ...
 %D \ShowAllLanguageValues [\s!ro] [romanian]   romanian ...
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/lang-lab.tex b/tex/context/base/lang-lab.tex
index 47913874c..b1e811bda 100644
--- a/tex/context/base/lang-lab.tex
+++ b/tex/context/base/lang-lab.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-lab,
+%D   [       file=tall-lab,
 %D        version=1997.08.27,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Language Head and Label Texts,
@@ -44,7 +44,7 @@
 
 \let\handletextprefix\relax
 
-\def\setupheadtext {\dosetupsometextprefix[\c!titel]}
+\def\setupheadtext {\dosetupsometextprefix[\c!title]}
 \def\setuplabeltext{\dosetupsometextprefix[\c!label]}
 
 \def\dosetupsometextprefix
@@ -72,12 +72,12 @@
 %D
 %D These commands accept all kind of inputs:
 %D
-%D \starttypen
-%D \setuplabeltext [language] [label=text]
-%D \setuplabeltext [language] [label=text,label=text,...]
-%D \setuplabeltext            [label=text]
-%D \setuplabeltext            [label=text,label=text,...]
-%D \stoptypen
+%D \starttyping
+%D \setuplabeltext [language] [labellabel=text]
+%D \setuplabeltext [language] [labellabel=text,labellabel=text,...]
+%D \setuplabeltext            [labellabel=text]
+%D \setuplabeltext            [labellabel=text,labellabel=text,...]
+%D \stoptyping
 %D
 %D The last two cases concern the current language.
 
@@ -103,7 +103,7 @@
   {\let\handletextprefix\firstoftwoarguments
    \let\reporttextprefixerror\doreporttextprefixerror
    \global\labeltextdonetrue
-   \dogetupsometextprefix\headlanguage\c!titel}
+   \dogetupsometextprefix\headlanguage\c!title}
 
 \unexpanded\def\leftlabeltext
   {\let\handletextprefix\firstoftwoarguments
@@ -153,7 +153,7 @@
      {\egroup\noexpand\def\noexpand#2% watch out, no \edef
         {\dogetupsometextprefix{\headlanguage}{#1}{#3}}}}
 
-\def\setexpandedheadtext {\dosetexpandedheadlabeltext\c!titel}
+\def\setexpandedheadtext {\dosetexpandedheadlabeltext\c!title}
 \def\setexpandedlabeltext{\dosetexpandedheadlabeltext\c!label}
 
 \beginETEX \ifcsname
@@ -219,7 +219,7 @@
   {\let\dodocommando\xdopresetsometextprefix
    \dotripleempty\dodosetupsometextprefix}
 
-\def\presetheadtext {\dopresetsometextprefix[\c!titel]}
+\def\presetheadtext {\dopresetsometextprefix[\c!title]}
 \def\presetlabeltext{\dopresetsometextprefix[\c!label]}
 
 %D \macros
@@ -233,9 +233,9 @@
 %D
 %D like for instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \translate[en=something,nl=iets]
-%D \stoptypen
+%D \stoptyping
 %D
 %D which expands to {\em something} or {\em iets}, depending on
 %D de current language.
@@ -256,9 +256,9 @@
 %D When used without argument, the last defined values are
 %D used. This enables repetitive use like
 %D
-%D \starttypen
+%D \starttyping
 %D \en \translate\ means \nl \translate
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {assigntranslation}
@@ -266,12 +266,12 @@
 %D This macro is a system macro, and can be used to assign a
 %D translation to a macro. Its form is:
 %D
-%D \starttypen
+%D \starttyping
 %D \assigntranslation[en=something,nl=iets]\to\command
-%D \stoptypen
+%D \stoptyping
 
 \def\assigntranslation[#1]\to#2%
   {\getparameters[\??lg][#1]%
    \edef#2{\csname\??lg\currentlanguage\endcsname}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex
index fa9eb9605..b896b465e 100644
--- a/tex/context/base/lang-sla.tex
+++ b/tex/context/base/lang-sla.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-sla,
+%D   [       file=tall-sla,
 %D        version=1999.09.13, % 1997.09.03
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Slavic Languages,
@@ -8,26 +8,27 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-%D Todo: replace \'.. by \namedglyph 
+% Todo: replace \'.. by \namedglyph
 
 %D The framework of this module is set up by Hans Hagen while
 %D many of the first translations were done by Tobias. Later
 %D on, corrections were made by users. If you have suggestions,
 %D or feel that your name missing here, don't hesitate to send
-%D us an email. 
+%D us an email.
 %D
 %D \starttabulate[|lB|l|]
-%D \NC Czech    \NC Tom Hidec, Petr Sojka \NC \NR
-%D \NC Polish   \NC Grzegorz Sapijaszko   \NC \NR
-%D \NC Croatian \NC Zeljko Vrba           \NC \NR
+%D \NC Czech     \NC Tom Hidec, Petr Sojka \NC \NR
+%D \NC Polish    \NC Grzegorz Sapijaszko   \NC \NR
+%D \NC Croatian  \NC Zeljko Vrba           \NC \NR
+%D \NC Slovenian \NC Mojca Miklavec        \NC \NR
 %D \stoptabulate
- 
-%  Belarussian, Russian, Ukrainian, Bulgarian, Macedonian, 
-%  Serbo-Croatian, Slovenian, Czech, Kushubian, 
-%  Lusatian/Sorbian/Wendish, Polish, Slovak, Albanian, 
+
+%  Belarussian, Russian, Ukrainian, Bulgarian, Macedonian,
+%  Serbo-Croatian, Slovenian, Czech, Kushubian,
+%  Lusatian/Sorbian/Wendish, Polish, Slovak, Albanian,
 %  Illyrian, Armenian
 
 \writestatus{loading}{Slavic Languages}
@@ -36,7 +37,7 @@
 
 \installlanguage
   [\s!pl]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -45,26 +46,26 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,{.},\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!cz]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
    \c!rightsubsentence=---,
    \c!leftquote=\lowerleftsingleninequote,
-   \c!rightquote=\upperrightsinglesixquote, 
+   \c!rightquote=\upperrightsinglesixquote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoublesixquote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
-\installlanguage 
+\installlanguage
   [\s!sk]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -73,14 +74,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-   \c!status=\v!stop,
-   \s!encoding=il2,
-   \s!mapping=il2]
+   \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!hr]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -89,18 +88,34 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!dag,\ ,\v!maand,\ ,\v!jaar},
-   \c!status=\v!stop]
+   \c!date={\v!day,\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
+
+\installlanguage
+  [\s!sl]
+  [\c!spacing=\v!packed, % ? copied from german - don't know what this means
+   \c!leftsentence={\hbox{--~}}, % ?
+   \c!rightsentence={\hbox{~--}}, % ?
+   \c!leftsubsentence={--}, % ?
+   \c!rightsubsentence={--}, % ?
+   \c!leftquote=\lowerleftsingleninequote,
+   \c!rightquote=\upperrightsinglesixquote,
+   \c!leftquotation=\lowerleftdoubleninequote,
+   \c!rightquotation=\upperrightdoublesixquote,
+   \c!date={\v!day,{.},\ ,\v!month,\ ,\v!year},
+   \c!state=\v!stop]
 
-\installlanguage [polish]   [\s!pl]
-\installlanguage [czech]    [\s!cz]
-\installlanguage [slovak]   [\s!sk]
-\installlanguage [croatian] [\s!hr]
+\installlanguage [polish]    [\s!pl]
+\installlanguage [czech]     [\s!cz]
+\installlanguage [slovak]    [\s!sk]
+\installlanguage [croatian]  [\s!hr]
+\installlanguage [slovenian] [\s!sl]
+\installlanguage [slovene]   [\s!sl] % both possible
 
 % specifics
-% 
-% \startlanguagespecifics[\s!pl] 
-% 
+%
+% \startlanguagespecifics[\s!pl]
+%
 %   \installcompoundcharacter /a {\k a}
 %   \installcompoundcharacter /c {\'c}
 %   \installcompoundcharacter /e {\k e}
@@ -119,14 +134,14 @@
 %   \installcompoundcharacter /S {\'S}
 %   \installcompoundcharacter /X {\'Z}
 %   \installcompoundcharacter /Z {\.Z}
-% 
+%
 % \stoplanguagespecifics
-% 
-% \startlanguagespecifics[\s!pl] 
-% 
+%
+% \startlanguagespecifics[\s!pl]
+%
 %   \installcompoundcharacter /, {\handlequotation\c!leftquotation}
 %   \installcompoundcharacter /' {\handlequotation\c!rightquotation}
-% 
+%
 %   \def\setupPLlanguage%
 %     {\setuplanguage
 %        [\s!pl]
@@ -134,16 +149,16 @@
 %         \c!rightsentence=\rightguillemot,
 %         \c!leftsubsentence=\leftsubguillemot,
 %         \c!rightsubsentence=\rightsubguillemot]}
-%  
+%
 %   \installcompoundcharacter /< {{\setupPLlanguage|<|}}
 %   \installcompoundcharacter /> {{\setupPLlanguage|>|}}
-% 
-%   \installcompoundcharacter /- {|-|} 
-% 
+%
+%   \installcompoundcharacter /- {|-|}
+%
 % \stoplanguagespecifics
-% 
-% \startlanguagespecifics[\s!pl] 
-% 
+%
+% \startlanguagespecifics[\s!pl]
+%
 %   \definesortkey {/a}{a}{a}{\k a}
 %   \definesortkey {/A}{a}{a}{\k a}
 %   \definesortkey {/c}{c}{a}{\'c}
@@ -162,22 +177,22 @@
 %   \definesortkey {/X}{z}{a}{\'x}
 %   \definesortkey {/z}{z}{b}{\.z}
 %   \definesortkey {/Z}{z}{b}{\.z}
-% 
+%
 % \stoplanguagespecifics
-% 
+%
 % \startencoding[pdfdoc]
-%   \startlanguagespecifics[pl]% hm 
+%   \startlanguagespecifics[pl]% hm
 %     \defineactivecharacter / {\simplifiedcompoundcharacter/}
 %   \stoplanguagespecifics
 % \stopencoding
-% 
-% this can best be handled by \quotation and || 
-% 
-% \startlanguagespecifics[\s!hr] 
-% 
+%
+% this can best be handled by \quotation and ||
+%
+% \startlanguagespecifics[\s!hr]
+%
 %   %\installcompoundcharacter /, {\handlequotation\c!leftquotation}
 %   %\installcompoundcharacter /' {\handlequotation\c!rightquotation}
-% 
+%
 %   \def\setupHRlanguage%
 %     {\setuplanguage
 %        [\s!hr]
@@ -185,126 +200,148 @@
 %         \c!rightsentence=\rightguillemot,
 %         \c!leftsubsentence=\leftsubguillemot,
 %         \c!rightsubsentence=\rightsubguillemot]}
-%  
+%
 %   \installcompoundcharacter /< {{\setupHRlanguage|<|}}
 %   \installcompoundcharacter /> {{\setupHRlanguage|>|}}
-% 
-%   \installcompoundcharacter /- {|-|} 
-% 
+%
+%   \installcompoundcharacter /- {|-|}
+%
 % \stoplanguagespecifics
 
-% labels 
-
-\setupheadtext [\s!pl] [\v!inhoud=Spis tre\'sci]
-\setupheadtext [\s!cz] [\v!inhoud=Obsah]
-\setupheadtext [\s!sk] [\v!inhoud=Obsah]
-\setupheadtext [\s!hr] [\v!inhoud=Sadr\v{z}aj]
-
-\setupheadtext [\s!pl] [\v!tabellen=Tabele]
-\setupheadtext [\s!cz] [\v!tabellen=Tabulek]
-\setupheadtext [\s!sk] [\v!tabellen=Tabuliek]
-\setupheadtext [\s!hr] [\v!tabellen=Tablice]
-
-\setupheadtext [\s!pl] [\v!figuren=Ilustracje]
-\setupheadtext [\s!cz] [\v!figuren=Obr\'azk\r{u}]
-\setupheadtext [\s!sk] [\v!figuren=Obr\'azkov]
-\setupheadtext [\s!hr] [\v!figuren=Slike]
-
-\setupheadtext [\s!pl] [\v!grafieken=Grafika]
-\setupheadtext [\s!cz] [\v!grafieken=...]
-\setupheadtext [\s!sk] [\v!grafieken=...]
-\setupheadtext [\s!hr] [\v!grafieken=Slike]
-
-\setupheadtext [\s!pl] [\v!intermezzos=Intermezza]
-\setupheadtext [\s!cz] [\v!intermezzos=...]
-\setupheadtext [\s!sk] [\v!intermezzos=...]
-\setupheadtext [\s!hr] [\v!intermezzos=Intermezza]
+% labels
+
+\setupheadtext [\s!pl] [\v!content=Spis tre\'sci]
+\setupheadtext [\s!cz] [\v!content=Obsah]
+\setupheadtext [\s!sk] [\v!content=Obsah]
+\setupheadtext [\s!hr] [\v!content=Sadr\v{z}aj]
+\setupheadtext [\s!sl] [\v!content=Vsebina]
+
+\setupheadtext [\s!pl] [\v!tables=Tabele]
+\setupheadtext [\s!cz] [\v!tables=Tabulek]
+\setupheadtext [\s!sk] [\v!tables=Tabuliek]
+\setupheadtext [\s!hr] [\v!tables=Tablice]
+\setupheadtext [\s!sl] [\v!tables=Tabele]
+
+\setupheadtext [\s!pl] [\v!figures=Ilustracje]
+\setupheadtext [\s!cz] [\v!figures=Obr\'azk\r{u}]
+\setupheadtext [\s!sk] [\v!figures=Obr\'azkov]
+\setupheadtext [\s!hr] [\v!figures=Slike]
+\setupheadtext [\s!sl] [\v!figures=Slike]
+
+\setupheadtext [\s!pl] [\v!graphics=Grafika]
+\setupheadtext [\s!cz] [\v!graphics=...]
+\setupheadtext [\s!sk] [\v!graphics=...]
+\setupheadtext [\s!hr] [\v!graphics=Slike]
+\setupheadtext [\s!sl] [\v!graphics=Slike]
+
+\setupheadtext [\s!pl] [\v!intermezzi=Intermezza]
+\setupheadtext [\s!cz] [\v!intermezzi=...]
+\setupheadtext [\s!sk] [\v!intermezzi=...]
+\setupheadtext [\s!hr] [\v!intermezzi=Intermezza]
+\setupheadtext [\s!sl] [\v!intermezzi=Intermezzi]
 
 \setupheadtext [\s!pl] [\v!index=Indeks]
 \setupheadtext [\s!cz] [\v!index=Rejst\v{r}\'{\i}k]
 \setupheadtext [\s!sk] [\v!index=Zoznam]
 \setupheadtext [\s!hr] [\v!index=Indeks]
+\setupheadtext [\s!sl] [\v!index=Kazalo]
 
-\setupheadtext [\s!pl] [\v!afkortingen=Skr\'ocenie]
-\setupheadtext [\s!cz] [\v!afkortingen=...]
-\setupheadtext [\s!sk] [\v!afkortingen=...]
-\setupheadtext [\s!hr] [\v!afkortingen=Kratice]
+\setupheadtext [\s!pl] [\v!abbreviations=Skr\'ocenie]
+\setupheadtext [\s!cz] [\v!abbreviations=...]
+\setupheadtext [\s!sk] [\v!abbreviations=...]
+\setupheadtext [\s!hr] [\v!abbreviations=Kratice]
+\setupheadtext [\s!sl] [\v!abbreviations=Kratice]
 
 \setupheadtext [\s!pl] [\v!logos=Znaki]
 \setupheadtext [\s!cz] [\v!logos=...]
 \setupheadtext [\s!sk] [\v!logos=...]
 \setupheadtext [\s!hr] [\v!logos=Znakovi]
-
-\setupheadtext [\s!pl] [\v!eenheden=Jednostki]
-\setupheadtext [\s!cz] [\v!eenheden=...]
-\setupheadtext [\s!sk] [\v!eenheden=...]
-\setupheadtext [\s!hr] [\v!eenheden=Jednostki]
-
-\setuplabeltext [\s!pl] [\v!tabel=Tabela ]
-\setuplabeltext [\s!cz] [\v!tabel=Tabulka ]
-\setuplabeltext [\s!sk] [\v!tabel=Tabu\v{l}ka ]
-\setuplabeltext [\s!hr] [\v!tabel=T\'abl\'azat ] % [\v!tabel=Tablica ]
-
-\setuplabeltext [\s!pl] [\v!figuur=Ilustracja ]
-\setuplabeltext [\s!cz] [\v!figuur=Obr\'azek ]
-\setuplabeltext [\s!sk] [\v!figuur=... ]
-\setuplabeltext [\s!hr] [\v!figuur=Slika ]
+\setupheadtext [\s!sl] [\v!logos=Logotipi]
+
+\setupheadtext [\s!pl] [\v!units=Jednostki]
+\setupheadtext [\s!cz] [\v!units=...]
+\setupheadtext [\s!sk] [\v!units=...]
+\setupheadtext [\s!hr] [\v!units=Jednostki]
+\setupheadtext [\s!sl] [\v!units=Enote]
+
+\setuplabeltext [\s!pl] [\v!table=Tabela ]
+\setuplabeltext [\s!cz] [\v!table=Tabulka ]
+\setuplabeltext [\s!sk] [\v!table=Tabu\v{l}ka ]
+\setuplabeltext [\s!hr] [\v!table=T\'abl\'azat ] % [\v!table=Tablica ]
+\setuplabeltext [\s!sl] [\v!table=Tabela ]
+
+\setuplabeltext [\s!pl] [\v!figure=Ilustracja ]
+\setuplabeltext [\s!cz] [\v!figure=Obr\'azek ]
+\setuplabeltext [\s!sk] [\v!figure=... ]
+\setuplabeltext [\s!hr] [\v!figure=Slika ]
+\setuplabeltext [\s!sl] [\v!figure=Slika ]
 
 \setuplabeltext [\s!pl] [\v!intermezzo=Intermezzo ]
 \setuplabeltext [\s!cz] [\v!intermezzo=... ]
 \setuplabeltext [\s!sk] [\v!intermezzo=... ]
 \setuplabeltext [\s!hr] [\v!intermezzo=Intermezzo ]
+\setuplabeltext [\s!sl] [\v!intermezzo=Intermezzo ]
+
+\setuplabeltext [\s!pl] [\v!graphic=Grafika ]
+\setuplabeltext [\s!cz] [\v!graphic=... ]
+\setuplabeltext [\s!sk] [\v!graphic=... ]
+\setuplabeltext [\s!hr] [\v!graphic=Slika ]
+\setuplabeltext [\s!sl] [\v!graphic=Slika ]
+
+\setuplabeltext [\s!pl] [\v!chapter=] % Rozdzia\l
+\setuplabeltext [\s!cz] [\v!chapter=] % Kapitola
+\setuplabeltext [\s!sk] [\v!chapter=] % Kapitola
+\setuplabeltext [\s!hr] [\v!chapter=] % Rozdzia\l
+\setuplabeltext [\s!sl] [\v!chapter=]
+
+\setuplabeltext [\s!pl] [\v!section=] % Podrozdzia\l
+\setuplabeltext [\s!cz] [\v!section=]
+\setuplabeltext [\s!sk] [\v!section=]
+\setuplabeltext [\s!hr] [\v!section=] % Podrozdzia\l
+\setuplabeltext [\s!sl] [\v!section=] % Odstavek
+
+\setuplabeltext [\s!pl] [\v!sub\v!section=]
+\setuplabeltext [\s!cz] [\v!sub\v!section=]
+\setuplabeltext [\s!sk] [\v!sub\v!section=]
+\setuplabeltext [\s!hr] [\v!sub\v!section=]
+\setuplabeltext [\s!sl] [\v!sub\v!section=]
+
+\setuplabeltext [\s!pl] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!cz] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sk] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!hr] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sl] [\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!pl] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!cz] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sk] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!hr] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!sl] [\v!sub\v!sub\v!sub\v!section=]
+
+\setuplabeltext [\s!pl] [\v!appendix=] % Dodatek
+\setuplabeltext [\s!cz] [\v!appendix=]
+\setuplabeltext [\s!sk] [\v!appendix=]
+\setuplabeltext [\s!hr] [\v!appendix=Dodatak ]
+\setuplabeltext [\s!sl] [\v!appendix=Dodatek ]
+
+\setuplabeltext [\s!pl] [\v!part=Ust\c{e}p]
+\setuplabeltext [\s!cz] [\v!part=\v{C}\'ast]
+\setuplabeltext [\s!sk] [\v!part=\v{C}as\v{t}]
+\setuplabeltext [\s!hr] [\v!part=Dio]
+\setuplabeltext [\s!sl] [\v!part=Del ]
+
+\setuplabeltext [\s!pl] [\v!line=wiersz ]
+\setuplabeltext [\s!cz] [\v!line=... ]
+\setuplabeltext [\s!sk] [\v!line=... ]
+\setuplabeltext [\s!hr] [\v!line=red ]
+\setuplabeltext [\s!sl] [\v!line=vrstica ]
+
+\setuplabeltext [\s!pl] [\v!lines=wiersze ]
+\setuplabeltext [\s!cz] [\v!lines=... ]
+\setuplabeltext [\s!sk] [\v!lines=... ]
+\setuplabeltext [\s!hr] [\v!lines=redovi ]
+\setuplabeltext [\s!sl] [\v!lines=vrstice ]
 
-\setuplabeltext [\s!pl] [\v!grafiek=Grafika ]
-\setuplabeltext [\s!cz] [\v!grafiek=... ]
-\setuplabeltext [\s!sk] [\v!grafiek=... ]
-\setuplabeltext [\s!hr] [\v!grafiek=Slika ]
-
-\setuplabeltext [\s!pl] [\v!hoofdstuk=] % Rozdzia\l
-\setuplabeltext [\s!cz] [\v!hoofdstuk=] % Kapitola
-\setuplabeltext [\s!sk] [\v!hoofdstuk=] % Kapitola
-\setuplabeltext [\s!hr] [\v!hoofdstuk=] % Rozdzia\l
-
-\setuplabeltext [\s!pl] [\v!paragraaf=] % Podrozdzia\l
-\setuplabeltext [\s!cz] [\v!paragraaf=]
-\setuplabeltext [\s!sk] [\v!paragraaf=]
-\setuplabeltext [\s!hr] [\v!paragraaf=] % Podrozdzia\l
-
-\setuplabeltext [\s!pl] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!cz] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sk] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!hr] [\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!pl] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!cz] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sk] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!hr] [\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!pl] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!cz] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!sk] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!hr] [\v!sub\v!sub\v!sub\v!paragraaf=]
-
-\setuplabeltext [\s!pl] [\v!bijlage=] % Dodatek
-\setuplabeltext [\s!cz] [\v!bijlage=]
-\setuplabeltext [\s!sk] [\v!bijlage=]
-\setuplabeltext [\s!hr] [\v!bijlage=Dodatak ] 
-
-\setuplabeltext [\s!pl] [\v!deel=Ust\c{e}p] 
-\setuplabeltext [\s!cz] [\v!deel=\v{C}\'ast]
-\setuplabeltext [\s!sk] [\v!deel=\v{C}as\v{t}]
-\setuplabeltext [\s!hr] [\v!deel=Dio] 
-
-\setuplabeltext [\s!pl] [\v!regel=wiersz ]
-\setuplabeltext [\s!cz] [\v!regel=... ]
-\setuplabeltext [\s!sk] [\v!regel=... ]
-\setuplabeltext [\s!hr] [\v!regel=red ]  
-
-\setuplabeltext [\s!pl] [\v!regels=wiersze ]
-\setuplabeltext [\s!cz] [\v!regels=... ]
-\setuplabeltext [\s!sk] [\v!regels=... ]
-\setuplabeltext [\s!hr] [\v!regels=redovi ] 
- 
 \setuplabeltext [\s!pl]   [\v!january=stycznia]
 \setuplabeltext [\s!pl]  [\v!february=lutego]
 \setuplabeltext [\s!pl]     [\v!march=marca]
@@ -325,7 +362,7 @@
 \setuplabeltext [\s!cz]       [\v!may=kv\v{e}tna]
 \setuplabeltext [\s!cz]      [\v!june=\v{c}ervna]
 \setuplabeltext [\s!cz]      [\v!july=\v{c}ervence]
-\setuplabeltext [\s!cz]    [\v!august=srpna] 
+\setuplabeltext [\s!cz]    [\v!august=srpna]
 \setuplabeltext [\s!cz] [\v!september=z\'a\v{r}\'\i]
 \setuplabeltext [\s!cz]   [\v!october=\v{r}\'{\i}jna]
 \setuplabeltext [\s!cz]  [\v!november=listopadu]
@@ -337,11 +374,11 @@
 \setuplabeltext [\s!sk]     [\v!april=apr\'{\i}la]
 \setuplabeltext [\s!sk]       [\v!may=m\'aja]
 \setuplabeltext [\s!sk]      [\v!june=j\'una]
-\setuplabeltext [\s!sk]      [\v!july=j\'ula] 
-\setuplabeltext [\s!sk]    [\v!august=augusta] 
-\setuplabeltext [\s!sk] [\v!september=septembra] 
+\setuplabeltext [\s!sk]      [\v!july=j\'ula]
+\setuplabeltext [\s!sk]    [\v!august=augusta]
+\setuplabeltext [\s!sk] [\v!september=septembra]
 \setuplabeltext [\s!sk]   [\v!october=okt\'obra]
-\setuplabeltext [\s!sk]  [\v!november=novembra] 
+\setuplabeltext [\s!sk]  [\v!november=novembra]
 \setuplabeltext [\s!sk]  [\v!december=decembra]
 
 \setuplabeltext [\s!hr]   [\v!january=sije\v{c}anj]
@@ -357,12 +394,25 @@
 \setuplabeltext [\s!hr]  [\v!november=studeni]
 \setuplabeltext [\s!hr]  [\v!december=prosinac]
 
+\setuplabeltext [\s!sl]   [\v!january=januar]
+\setuplabeltext [\s!sl]  [\v!february=februar]
+\setuplabeltext [\s!sl]     [\v!march=marec]
+\setuplabeltext [\s!sl]     [\v!april=april]
+\setuplabeltext [\s!sl]       [\v!may=maj]
+\setuplabeltext [\s!sl]      [\v!june=junij]
+\setuplabeltext [\s!sl]      [\v!july=julij]
+\setuplabeltext [\s!sl]    [\v!august=avgust]
+\setuplabeltext [\s!sl] [\v!september=september]
+\setuplabeltext [\s!sl]   [\v!october=oktober]
+\setuplabeltext [\s!sl]  [\v!november=november]
+\setuplabeltext [\s!sl]  [\v!december=december]
+
 \setuplabeltext [\s!pl]    [\v!sunday=niedziela]
 \setuplabeltext [\s!pl]    [\v!monday=poniedzia\l ek]
 \setuplabeltext [\s!pl]   [\v!tuesday=wtorek]
 \setuplabeltext [\s!pl] [\v!wednesday=\'sroda]
 \setuplabeltext [\s!pl]  [\v!thursday=czwartek]
-\setuplabeltext [\s!pl]    [\v!friday=pi\k{a}tek] 
+\setuplabeltext [\s!pl]    [\v!friday=pi\k{a}tek]
 \setuplabeltext [\s!pl]  [\v!saturday=sobota]
 
 \setuplabeltext [\s!hr]    [\v!sunday=nedjelja]
@@ -370,14 +420,29 @@
 \setuplabeltext [\s!hr]   [\v!tuesday=utorak]
 \setuplabeltext [\s!hr] [\v!wednesday=srijeda]
 \setuplabeltext [\s!hr]  [\v!thursday=\v{c}etvrtak]
-\setuplabeltext [\s!hr]    [\v!friday=petak] 
+\setuplabeltext [\s!hr]    [\v!friday=petak]
 \setuplabeltext [\s!hr]  [\v!saturday=subota]
 
+\setuplabeltext [\s!sl]    [\v!sunday=nedelja]
+\setuplabeltext [\s!sl]    [\v!monday=ponedeljek]
+\setuplabeltext [\s!sl]   [\v!tuesday=torek]
+\setuplabeltext [\s!sl] [\v!wednesday=sreda]
+\setuplabeltext [\s!sl]  [\v!thursday=\v{c}etrtek]
+\setuplabeltext [\s!sl]    [\v!friday=petek]
+\setuplabeltext [\s!sl]  [\v!saturday=sobota]
+
+%D Rather new ...
+
+\setuplabeltext [\s!sl]    [\v!page=stran ]
+\setuplabeltext [\s!sl]  [\v!atpage=na strani ]
+\setuplabeltext [\s!sl] [\v!hencefore=glej zgoraj]
+\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 ...
 
-\protect
-
-\endinput
+\protect \endinput
diff --git a/tex/context/base/lang-spa.tex b/tex/context/base/lang-spa.tex
index f2ec7916e..36112525f 100644
--- a/tex/context/base/lang-spa.tex
+++ b/tex/context/base/lang-spa.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-spa,
+%D   [       file=tall-spa,
 %D        version=2002.04.17,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Spacing,
diff --git a/tex/context/base/lang-spe.tex b/tex/context/base/lang-spe.tex
index 30180e671..94c252417 100644
--- a/tex/context/base/lang-spe.tex
+++ b/tex/context/base/lang-spe.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-spe,
+%D   [       file=tall-spe,
 %D        version=2002.05.07, % 1996.01.25,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Specifics,
@@ -11,24 +11,40 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D This code was originally placed in the language 
-%D initialization module, but isolating it is clearer.
+%D This code was originally placed in the language
+%D initialization module, but isolating it is clearer. Language
+%D specifics evolved out of user demands for special features,
+%D like the german active quote. After a while I decided to
+%D associate them to languages in a more general way so that we
+%D could associate all kind of things with language switching.
+%D
+%D This is a typical example of functionality that occasionally
+%D gets improved based on user input and experience. Much of the
+%D code is pretty old and could probabbly be done in better ways.
+%D It's probably also the kind of code that has been and will be
+%D written over and over again by \TEX\ users around the world,
+%D so there are probably better implementations of similar
+%D functionality around. Therefore, users are invited to pop in
+%D their own handling as long as it does not interfere with
+%D existing code. Writing the more obscure macros that deal with
+%D this is a good learning experience (catcodes, lccodes, token
+%D lists, expansion, \unknown).
 
 \writestatus{loading}{Context Language Macros / Specifics}
 
 \unprotect
 
-%D \macros 
+%D \macros
 %D   {everyresetlanguagespecifics,resetlanguagespecifics}
-%D 
-%D Cleanup macros. 
+%D
+%D Cleanup macros.
 
 \newevery \everyresetlanguagespecifics \relax
 
 \def\resetlanguagespecifics
   {\ifcase\protectionlevel
      \the\everyresetlanguagespecifics
-   \else % to be translated 
+   \else % to be translated
      \writestatus\m!systems{don't change language in unprotected mode!}%
    \fi}
 
@@ -47,13 +63,13 @@
 %D macro in return calls for the setup of language specific
 %D macros. Such specifics are defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \startlanguagespecifics[de]
 %D   \installcompoundcharacter "a {\"a}
 %D   \installcompoundcharacter "e {\"e}
 %D   \installcompoundcharacter "s {\SS}
 %D \stoplanguagespecifics
-%D \stoptypen
+%D \stoptyping
 %D
 %D Instead of \type{[du]} we can pass a comma separated
 %D list, like \type{[du,nl]}. Next calls to this macro add the
@@ -76,7 +92,7 @@
 %D be sure, we check on spurious spaces. The second dummy
 %D argument gobbles spaces.
 
-\def\languageencoding%
+\def\languageencoding
   {\ifx\characterencoding\nocharacterencoding \else
      \characterencoding-%
    \fi}
@@ -103,26 +119,45 @@
 
 % This saves 3K in the fmt file.
 
-\long\def\dostartlanguagespecifics[#1][#2]#3\stoplanguagespecifics%
+% This should be a token register, but alas, we run out of them and
+% \ETEX\ has a bug.
+
+\long\def\dostartlanguagespecifics[#1][#2]#3\stoplanguagespecifics
   {\egroup
    \processcommalist[#1]{\dosetlanguagespecifics{#3}}}
 
+% \long\def\dosetlanguagespecifics#1#2%
+%   {\doifdefinedelse{\??la\languageencoding#2\??la}
+%      {\long\def\do##1##2##3{\setvalue{\??la\languageencoding##1\??la}{\do{##1}{##2##3}}}%
+%       \getvalue{\??la\languageencoding#2\??la}{#1}}
+%      {\setvalue{\??la\languageencoding#2\??la}{\do{#2}{#1}}}%
+%    \bgroup
+%    \setbox\scratchbox\hbox{\enablelanguagespecifics[#2]}%
+%    \ifdim\wd\scratchbox>\zeropoint
+%      \showmessage\m!linguals7{\currentencoding-#2,\the\wd\scratchbox\space}\wait
+%    \else
+%      \showmessage\m!linguals8{\currentencoding-#2}%
+%    \fi
+%    \egroup
+%    \doif{#2}\currentmainlanguage
+%      {\enablelanguagespecifics[#2]}}
+
 \long\def\dosetlanguagespecifics#1#2%
-  {\doifdefinedelse{\??la\languageencoding#2\??la}
-     {\long\def\do##1##2##3%
-        {\setvalue{\??la\languageencoding##1\??la}{\do{##1}{##2##3}}}%
-      \getvalue{\??la\languageencoding#2\??la}{#1}}
-     {\setvalue{\??la\languageencoding#2\??la}{\do{#2}{#1}}}%
+  {%ifundefined{\??la\languageencoding#2\??la}\letvalue{\??la\languageencoding#2\??la}\empty\fi
+   \ifundefined{\??la\languageencoding#2\??la}\forgetlanguagespecifics[#2]\fi
+   \appendvalue{\??la\languageencoding#2\??la}{#1}%
    \bgroup
-   \setbox0=\hbox{\enablelanguagespecifics[#2]}%
-   \ifdim\wd0>\zeropoint
-     \showmessage{\m!linguals}{7}{\currentencoding-#2,\the\wd0\space}\wait
+   \setbox\scratchbox\hbox{\enablelanguagespecifics[#2]}%
+   \ifdim\wd\scratchbox>\zeropoint
+     \showmessage\m!linguals7{\currentencoding-#2,\the\wd\scratchbox\space}\wait
    \else
-     \showmessage{\m!linguals}{8}{\currentencoding-#2}%
+     \showmessage\m!linguals8{\currentencoding-#2}%
    \fi
    \egroup
-   \doif{#2}{\currentmainlanguage}
-     {\enablelanguagespecifics[#2]}}
+   \doif{#2}\currentmainlanguage{\enablelanguagespecifics[#2]}}
+
+\def\forgetlanguagespecifics[#1]%
+  {\letvalue{\??la\languageencoding#1\??la}\empty}
 
 %D Enabling them is rather straightforward. We only have to
 %D define \type{\do} in such a way that \type{{ }} is removed
@@ -139,7 +174,7 @@
 % sped up since used often:
 
 \def\enablelanguagespecifics[#1]%
-  {\let\do\secondoftwoarguments
+  {%\let\do\secondoftwoarguments
    \csname
      \??la
      \@EA\ifx\csname\??la#1\c!default\endcsname\relax
@@ -152,14 +187,14 @@
    \csname\??la#1\??la\endcsname
    \csname\??la\languageencoding#1\??la\endcsname} % dup ?
 
-%D \macros 
+%D \macros
 %D   {deactivatelanguagespecific}
-%D 
+%D
 %D The next code makes it possible to disable the specifics.
 
 \def\deactivatelanguagespecific#1%
   {\ifundefined{l g s \string#1}%
-     \letgvalueempty{l g s \string#1}% signal to prevent dup def 
+     \letgvalueempty{l g s \string#1}% signal to prevent dup def
      \bgroup
      \catcode`#1=\@@active
      \uccode`~=`#1
@@ -171,18 +206,18 @@
 % \def\dodeactivatetoken#1#2#3%
 %   {\def#1{#2}\catcode`#2=#3\relax}
 
-\def\dodeactivatetoken#1#2#3% tets needed to avoid clash with \unprotect 
+\def\dodeactivatetoken#1#2#3% test needed to avoid clash with \unprotect
   {\def#1{#2}\ifnum\catcode`#2=\@@active\catcode`#2=#3\relax\fi}
 
-%D We cannot hook this into the installer since language 
-%D specifics can be anything. So far, we have the following 
-%D potentially active characters. 
+%D We cannot hook this into the installer since language
+%D specifics can be anything. So far, we have the following
+%D potentially active characters.
 
-%D Beware, this should happen under an unprotected regime; 
-%D thanks to Giuseppe Oblomov Bilotta, who first noticed 
-%D that something was wrong. 
+%D Beware, this should happen under an unprotected regime;
+%D thanks to Giuseppe Oblomov Bilotta, who first noticed
+%D that something was wrong.
 
-\protect 
+\protect
 
 \deactivatelanguagespecific "
 \deactivatelanguagespecific /
@@ -191,13 +226,13 @@
 \deactivatelanguagespecific ?
 \deactivatelanguagespecific !
 
-\unprotect 
+\unprotect
 
-%D \macros 
-%D   {ordinaldaynumber, highordinalstr, ordinalstr}    
-%D 
-%D Efficient general ordinal number converters are sometimes 
-%D difficult to implement. Fortunately dates never exceed the 
+%D \macros
+%D   {ordinaldaynumber, highordinalstr, ordinalstr}
+%D
+%D Efficient general ordinal number converters are sometimes
+%D difficult to implement. Fortunately dates never exceed the
 %D number~31.
 
 \def\highordinalstr#1{\high{\nocap{#1}}}
@@ -208,17 +243,17 @@
      \noexpand\firstofoneargument{\number#1}}}
 
 %D Language specific converters have definitions like:
-%D 
-%D \starttypen
-%D \def\enordinaldaynumber#1{...} 
-%D \stoptypen
-%D 
+%D
+%D \starttyping
+%D \def\enordinaldaynumber#1{...}
+%D \stoptyping
+%D
 %D Examples can be found in the other \type {lang} modules.
 
-% \ifprocessingXML is a nasty dependency 
+% \ifprocessingXML is a nasty dependency
 
 \appendtoks
   \ifprocessingXML \else \resetlanguagespecifics \fi
 \to \everylanguage
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/lang-ura.tex b/tex/context/base/lang-ura.tex
index 6c7f84960..57832bd8b 100644
--- a/tex/context/base/lang-ura.tex
+++ b/tex/context/base/lang-ura.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=lang-sla,
+%D   [       file=tall-sla,
 %D        version=1997.09.03,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Uralic Languages,
@@ -8,10 +8,10 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-%D Todo: replace \'.. by \namedglyph 
+% Todo: replace \'.. by \namedglyph
 
 \writestatus{loading}{Uralic Languages}
 
@@ -19,21 +19,21 @@
 %D many of the first translations were done by Tobias. Later
 %D on, corrections were made by users. If you have suggestions,
 %D or feel that your name missing here, don't hesitate to send
-%D us an email. 
+%D us an email.
 %D
 %D \starttabulate[|lB|l|]
 %D \NC Finnish    \NC             \NC \NR
 %D \NC Hungarian  \NC Balazs Nagy \NC \NR
 %D \stoptabulate
 
-%  Cheremiss, Estonian, Finnish, Karelian, Laap, Mordvinian, 
+%  Cheremiss, Estonian, Finnish, Karelian, Laap, Mordvinian,
 %  Permian tongues, Hungarian, Ostyak, Vogul, Samoyed
 
 \unprotect
 
 \installlanguage
   [\s!fi]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -42,12 +42,12 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\upperleftdoublesixquote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,\ ,\v!maand,\ ,\v!dag},
-   \c!status=\v!stop]
+   \c!date={\v!year,\ ,\v!month,\ ,\v!day},
+   \c!state=\v!stop]
 
 \installlanguage
   [\s!hu]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -56,61 +56,61 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={\v!jaar,.,\ ,\v!maand,\ ,\v!dag,.},
-   \c!status=\v!stop,
+   \c!date={\v!year,.,\ ,\v!month,\ ,\v!day,.},
+   \c!state=\v!stop,
    \s!mapping=ec,
    \s!encoding=ec]
 
 \installlanguage [finish]    [\s!fi]
 \installlanguage [hungarian] [\s!hu]
 
-\setupheadtext  [\s!fi] [\v!inhoud=Sis\"allys]
-\setupheadtext  [\s!fi] [\v!tabellen=Taulukkoj]
-\setupheadtext  [\s!fi] [\v!figuren=Kuvi]
-\setupheadtext  [\s!fi] [\v!grafieken=Grafiikkaoi]
-\setupheadtext  [\s!fi] [\v!intermezzos=Intermezzos]
+\setupheadtext  [\s!fi] [\v!content=Sis\"allys]
+\setupheadtext  [\s!fi] [\v!tables=Taulukkoj]
+\setupheadtext  [\s!fi] [\v!figures=Kuvi]
+\setupheadtext  [\s!fi] [\v!graphics=Grafiikkaoi]
+\setupheadtext  [\s!fi] [\v!intermezzi=Intermezzos]
 \setupheadtext  [\s!fi] [\v!index=Indeksiluku]
-\setupheadtext  [\s!fi] [\v!afkortingen=Lyhennyksi]
+\setupheadtext  [\s!fi] [\v!abbreviations=Lyhennyksi]
 \setupheadtext  [\s!fi] [\v!logos=Vertauskuva]
-\setupheadtext  [\s!fi] [\v!eenheden=Yksik\"ot]
+\setupheadtext  [\s!fi] [\v!units=Yksik\"ot]
 
-\setupheadtext  [\s!hu] [\v!inhoud=Tartalom]
-\setupheadtext  [\s!hu] [\v!tabellen=T\'abl\'azatok]
-\setupheadtext  [\s!hu] [\v!figuren=\'Abr\'ak]
-\setupheadtext  [\s!hu] [\v!grafieken=Grafik\'ak]
-\setupheadtext  [\s!hu] [\v!intermezzos=Intermezzok]
+\setupheadtext  [\s!hu] [\v!content=Tartalom]
+\setupheadtext  [\s!hu] [\v!tables=T\'abl\'azatok]
+\setupheadtext  [\s!hu] [\v!figures=\'Abr\'ak]
+\setupheadtext  [\s!hu] [\v!graphics=Grafik\'ak]
+\setupheadtext  [\s!hu] [\v!intermezzi=Intermezzok]
 \setupheadtext  [\s!hu] [\v!index=Index]
-\setupheadtext  [\s!hu] [\v!afkortingen=R\"ovid\'\it\'esek]
+\setupheadtext  [\s!hu] [\v!abbreviations=R\"ovid\'\it\'esek]
 \setupheadtext  [\s!hu] [\v!logos=Fejl\'ecek]
-\setupheadtext  [\s!hu] [\v!eenheden=M\'ert\'ekegys\'egek]
+\setupheadtext  [\s!hu] [\v!units=M\'ert\'ekegys\'egek]
 
-\setuplabeltext [\s!fi] [\v!tabel=Taulukko ]
-\setuplabeltext [\s!fi] [\v!figuur=Kuva ]
+\setuplabeltext [\s!fi] [\v!table=Taulukko ]
+\setuplabeltext [\s!fi] [\v!figure=Kuva ]
 \setuplabeltext [\s!fi] [\v!intermezzo=Intermezzo ]
-\setuplabeltext [\s!fi] [\v!grafiek=Grafiikka ]
-\setuplabeltext [\s!fi] [\v!hoofdstuk=]
-\setuplabeltext [\s!fi] [\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!sub\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!sub\v!sub\v!sub\v!paragraaf=]
-\setuplabeltext [\s!fi] [\v!bijlage=]
-\setuplabeltext [\s!fi] [\v!deel=Osa ]
-\setuplabeltext [\s!fi] [\v!regel=rivi ]
-\setuplabeltext [\s!fi] [\v!regels=rivie ]
-
-\setuplabeltext [\s!hu] [\v!tabel={,.~t\'abl\'azat:}]
-\setuplabeltext [\s!hu] [\v!figuur={,.~\'abra:}]
+\setuplabeltext [\s!fi] [\v!graphic=Grafiikka ]
+\setuplabeltext [\s!fi] [\v!chapter=]
+\setuplabeltext [\s!fi] [\v!section=]
+\setuplabeltext [\s!fi] [\v!sub\v!section=]
+\setuplabeltext [\s!fi] [\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!fi] [\v!sub\v!sub\v!sub\v!section=]
+\setuplabeltext [\s!fi] [\v!appendix=]
+\setuplabeltext [\s!fi] [\v!part=Osa ]
+\setuplabeltext [\s!fi] [\v!line=rivi ]
+\setuplabeltext [\s!fi] [\v!lines=rivie ]
+
+\setuplabeltext [\s!hu] [\v!table={,.~t\'abl\'azat:}]
+\setuplabeltext [\s!hu] [\v!figure={,.~\'abra:}]
 \setuplabeltext [\s!hu] [\v!intermezzo={,.~intermezzo:}]
-\setuplabeltext [\s!hu] [\v!grafiek={,.~k\'ep:}]
-\setuplabeltext [\s!hu] [\v!hoofdstuk={,.~fejezet:}]
-\setuplabeltext [\s!hu] [\v!paragraaf={,.}]
-\setuplabeltext [\s!hu] [\v!sub\v!paragraaf={,.}]
-\setuplabeltext [\s!hu] [\v!sub\v!sub\v!paragraaf={,.}]
-\setuplabeltext [\s!hu] [\v!sub\v!sub\v!sub\v!paragraaf={,.}]
-\setuplabeltext [\s!hu] [\v!bijlage=]
-\setuplabeltext [\s!hu] [\v!deel={,.~r\'esz:}]
-\setuplabeltext [\s!hu] [\v!regel={,.~sor:}]  
-\setuplabeltext [\s!hu] [\v!regels=sorok]
+\setuplabeltext [\s!hu] [\v!graphic={,.~k\'ep:}]
+\setuplabeltext [\s!hu] [\v!chapter={,.~fejezet:}]
+\setuplabeltext [\s!hu] [\v!section={,.}]
+\setuplabeltext [\s!hu] [\v!sub\v!section={,.}]
+\setuplabeltext [\s!hu] [\v!sub\v!sub\v!section={,.}]
+\setuplabeltext [\s!hu] [\v!sub\v!sub\v!sub\v!section={,.}]
+\setuplabeltext [\s!hu] [\v!appendix=]
+\setuplabeltext [\s!hu] [\v!part={,.~r\'esz:}]
+\setuplabeltext [\s!hu] [\v!line={,.~sor:}]
+\setuplabeltext [\s!hu] [\v!lines=sorok]
 
 \setuplabeltext [\s!fi]   [\v!january=tammikuu]
 \setuplabeltext [\s!fi]  [\v!february=helmikuu]
@@ -155,8 +155,6 @@
 \setuplabeltext [\s!hu]  [\v!saturday=szombat]
 
 %D \ShowAllLanguageValues [\s!fi] [finnish] finse ...
-%D \ShowAllLanguageValues [\s!hu] [hungarian] magyar.
+%D \ShowAllLanguageValues [\s!hu] [hungarian] magyar ...
 
-\protect 
-
-\endinput 
+\protect \endinput
diff --git a/tex/context/base/lang-vn.tex b/tex/context/base/lang-vn.tex
index d249bfff9..01b1806a4 100644
--- a/tex/context/base/lang-vn.tex
+++ b/tex/context/base/lang-vn.tex
@@ -1,6 +1,6 @@
 %D \module
-%D   [       file=lang-vn,
-%D        version=1999.12.12, 
+%D   [       file=tall-vn,
+%D        version=1999.12.12,
 %D          title=\CONTEXT\ Language Macros,
 %D       subtitle=Vietnamese,
 %D         author={Hans Hagen \& Han The Thanh},
@@ -8,8 +8,8 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Vietnamese Language}
 
@@ -17,19 +17,19 @@
 %D many of the first translations were done by Tobias. Later
 %D on, corrections were made by users. If you have suggestions,
 %D or feel that your name missing here, don't hesitate to send
-%D us an email. 
+%D us an email.
 %D
 %D \starttabulate[|lB|l|]
 %D \NC Vietnamese \NC \THANH\ \NC \NR
 %D \stoptabulate
 
-\unprotect 
+\unprotect
 
 \definesystemconstant {vietnamese} \definesystemconstant {vn}
 
 \installlanguage
   [\s!vn]
-  [\c!spatiering=\v!opelkaar,
+  [\c!spacing=\v!packed,
    \c!leftsentence=---,
    \c!rightsentence=---,
    \c!leftsubsentence=---,
@@ -38,36 +38,34 @@
    \c!rightquote=\upperrightsingleninequote,
    \c!leftquotation=\lowerleftdoubleninequote,
    \c!rightquotation=\upperrightdoubleninequote,
-   \c!datum={{Ng\`ay },dd,{ th\'ang },\v!maand,{ n\u a m },yy},
-   \c!status=\v!stop]
+   \c!date={{Ng\`ay },dd,{ th\'ang },\v!month,{ n\u a m },yy},
+   \c!state=\v!stop]
 
 \installlanguage [vietnamese] [\s!vn]
 
-\installlanguage [\s!vn] [\c!status=\v!start]
-
-\setupheadtext [\s!vn] [\v!inhoud=M\d{u}c l\d{u}c]
-\setupheadtext [\s!vn] [\v!tabellen=Danh s\'ach b\h{a}ng]
-\setupheadtext [\s!vn] [\v!figuren=Danh s\'ach h\`inh v\~e]
-\setupheadtext [\s!vn] [\v!grafieken=Graphics]
-\setupheadtext [\s!vn] [\v!intermezzos=Intermezzos]
+\setupheadtext [\s!vn] [\v!content=M\d{u}c l\d{u}c]
+\setupheadtext [\s!vn] [\v!tables=Danh s\'ach b\h{a}ng]
+\setupheadtext [\s!vn] [\v!figures=Danh s\'ach h\`inh v\~e]
+\setupheadtext [\s!vn] [\v!graphics=Graphics]
+\setupheadtext [\s!vn] [\v!intermezzi=Intermezzos]
 \setupheadtext [\s!vn] [\v!index=Ch\h{i} s\'{^o}]
-\setupheadtext [\s!vn] [\v!afkortingen=Abbreviations]
+\setupheadtext [\s!vn] [\v!abbreviations=Abbreviations]
 \setupheadtext [\s!vn] [\v!logos=Logos]
-\setupheadtext [\s!vn] [\v!eenheden=Units]
+\setupheadtext [\s!vn] [\v!units=Units]
 
-\setuplabeltext [\s!vn] [\v!tabel=B\h{a}ng]
-\setuplabeltext [\s!vn] [\v!figuur=H\`inh]
+\setuplabeltext [\s!vn] [\v!table=B\h{a}ng]
+\setuplabeltext [\s!vn] [\v!figure=H\`inh]
 \setuplabeltext [\s!vn] [\v!intermezzo=intermezzo]
-\setuplabeltext [\s!vn] [\v!grafiek=graphic]
-\setuplabeltext [\s!vn] [\v!hoofdstuk=chapter]
-\setuplabeltext [\s!vn] [\v!paragraaf=] % not set 
-\setuplabeltext [\s!vn] [\v!sub\v!paragraaf=] % not set 
-\setuplabeltext [\s!vn] [\v!sub\v!sub\v!paragraaf=] % not set 
-\setuplabeltext [\s!vn] [\v!sub\v!sub\v!sub\v!paragraaf=] % not set 
-\setuplabeltext [\s!vn] [\v!bijlage=] % not set 
-\setuplabeltext [\s!vn] [\v!deel=Ph\`{^a} n ]
-\setuplabeltext [\s!vn] [\v!regel=line ]
-\setuplabeltext [\s!vn] [\v!regels=lines ]
+\setuplabeltext [\s!vn] [\v!graphic=graphic]
+\setuplabeltext [\s!vn] [\v!chapter=chapter]
+\setuplabeltext [\s!vn] [\v!section=] % not set
+\setuplabeltext [\s!vn] [\v!sub\v!section=] % not set
+\setuplabeltext [\s!vn] [\v!sub\v!sub\v!section=] % not set
+\setuplabeltext [\s!vn] [\v!sub\v!sub\v!sub\v!section=] % not set
+\setuplabeltext [\s!vn] [\v!appendix=] % not set
+\setuplabeltext [\s!vn] [\v!part=Ph\`{^a} n ]
+\setuplabeltext [\s!vn] [\v!line=line ]
+\setuplabeltext [\s!vn] [\v!lines=lines ]
 
 \setuplabeltext [\s!vn]    [\v!sunday=Sunday]
 \setuplabeltext [\s!vn]    [\v!monday=Monday]
@@ -85,11 +83,11 @@
 \setuplabeltext [\s!vn]      [\v!june=s\'au]
 \setuplabeltext [\s!vn]      [\v!july=b\h{a}y]
 \setuplabeltext [\s!vn]    [\v!august=t\'am]
-\setuplabeltext [\s!vn] [\v!september=ch\'in] 
+\setuplabeltext [\s!vn] [\v!september=ch\'in]
 \setuplabeltext [\s!vn]   [\v!october=m\h{u}\`{ho}i]
 \setuplabeltext [\s!vn]  [\v!november=m\h{u}\`{ho}im\d{^o}t]
 \setuplabeltext [\s!vn]  [\v!december=m\h{u}\`{ho}ihai]
 
-\protect 
+\protect
 
-\endinput 
+\endinput
diff --git a/tex/context/base/m-chart.tex b/tex/context/base/m-chart.tex
index 17c2e16f0..24f4f52fd 100644
--- a/tex/context/base/m-chart.tex
+++ b/tex/context/base/m-chart.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-chart,
+%D   [       filefile=m-chart,
 %D        version=1998.10.10,
 %D          title=\CONTEXT\ Modules,
 %D       subtitle=Flow Charts,
@@ -60,8 +60,8 @@
 
 \unprotect
 
-\definieersorteren [flowchart] [flowcharts] [\v!geen] % no access
-\stelsorterenin    [flowchart] [\c!status=\v!stop]    % off by default
+\definesorting [flowchart] [flowcharts] [\v!none] % no access
+\setupsorting    [flowchart] [\c!state=\v!stop]    % off by default
 
 \def\@FLOW@{@FLOW@}
 \def\@FLOC@{@FLOC@}
@@ -79,7 +79,7 @@
 
 \def\FLOWbufferprefix{flw-}
 
-\def\processFLOWbuffer#1{\haalbuffer[\FLOWbufferprefix#1]}
+\def\processFLOWbuffer#1{\getbuffer[\FLOWbufferprefix#1]}
 \def\typeFLOWbuffer   #1{\typebuffer[\FLOWbufferprefix#1]}
 
 \def\setFLOWname#1#2% funny hack that makes sure that we get
@@ -157,8 +157,8 @@
      [\s!dummy]
      [{\externalfigure
          [#1]
-         [\c!breedte=\overlaywidth,
-          \c!hoogte=\overlayheight]}]%
+         [\c!width=\overlaywidth,
+          \c!height=\overlayheight]}]%
    \overlay{\s!dummy}}
 
 \def\doFLOWtext
@@ -221,14 +221,14 @@
 \def\setupFLOWsets  {\dodoubleargument\getparameters[\@@FLOX]}
 
 \setupFLOWcharts
-  [\c!optie=,
-   \c!korps=,
-   \c!punt=,  % private option
-   \c!breedte=12\bodyfontsize,
-   \c!hoogte=7\bodyfontsize,
-   \c!maxbreedte=,
-   \c!maxhoogte=,
-   \c!offset=\v!standaard, % == auto offset
+  [\c!option=,
+   \c!bodyfont=,
+   \c!dot=,  % private option
+   \c!width=12\bodyfontsize,
+   \c!height=7\bodyfontsize,
+   \c!maxwidth=,
+   \c!maxheight=,
+   \c!offset=\v!standard, % == auto offset
    \c!dx=2\bodyfontsize,
    \c!dy=2\bodyfontsize,
    \c!nx=0, % 1,
@@ -237,36 +237,36 @@
    \c!y=1,
    \c!autofocus=,
    \c!focus=,
-   \c!achtergrond=,      % \v!kleur,
-   \c!achtergrondkleur=\s!white,
-   \c!lijndikte=\linewidth,
-   \c!kader=\v!uit,
-   \c!kaderkleur=]
+   \c!background=,      % \v!color,
+   \c!backgroundcolor=\s!white,
+   \c!rulethickness=\linewidth,
+   \c!frame=\v!off,
+   \c!framecolor=]
 
 \setupFLOWlines
-  [\c!hoek=\v!rond,
-   \c!pijl=\v!ja,
-   \c!streep=\v!nee,
-   \c!straal=.375\bodyfontsize,      % 2.5\c!lijndikte
-   \c!kleur=FLOWlinecolor,
-   \c!lijndikte=.15\bodyfontsize,  % 2pt,
-   \c!offset=\v!geen]
+  [\c!corner=\v!round,
+   \c!arrow=\v!yes,
+   \c!dash=\v!no,
+   \c!radius=.375\bodyfontsize,      % 2.5\c!rulethickness
+   \c!color=FLOWlinecolor,
+   \c!rulethickness=.15\bodyfontsize,  % 2pt,
+   \c!offset=\v!none]
 
 \setupFLOWshapes
   [\c!default=action,
-   \c!kaderkleur=FLOWframecolor,
-   \c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=FLOWbackgroundcolor,
-   \c!achtergrondraster=\@@rsraster,
-   \c!lijndikte=.15\bodyfontsize,  % 2pt,
+   \c!framecolor=FLOWframecolor,
+   \c!background=\v!color,
+   \c!backgroundcolor=FLOWbackgroundcolor,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!rulethickness=.15\bodyfontsize,  % 2pt,
    \c!offset=.5\bodyfontsize]
 
 \setupFLOWfocus
-  [\c!kaderkleur=FLOWfocuscolor,
-   \c!achtergrond=\@@FLOSachtergrond,
-   \c!achtergrondkleur=\@@FLOSachtergrondkleur,
-   \c!achtergrondraster=\@@FLOSachtergrondraster,
-   \c!lijndikte=\@@FLOSlijndikte,
+  [\c!framecolor=FLOWfocuscolor,
+   \c!background=\@@FLOSbackground,
+   \c!backgroundcolor=\@@FLOSbackgroundcolor,
+   \c!backgroundscreen=\@@FLOSbackgroundscreen,
+   \c!rulethickness=\@@FLOSrulethickness,
    \c!offset=\@@FLOSoffset]
 
 \definecolor [FLOWfocuscolor]      [s=.2]
@@ -373,7 +373,7 @@
   {\doifundefinedelse{\@FLOW@-#1}
      {\writestatus{FLOW}{unknown chart #1}%
       \framed
-        [\c!breedte=12\bodyfontsize,\c!hoogte=8\bodyfontsize]
+        [\c!width=12\bodyfontsize,\c!height=8\bodyfontsize]
         {\tttf [chart #1]}}
      {\dodogetFLOWchart[#1][#2]}}
 
@@ -398,16 +398,16 @@
    \processFLOWbuffer\currentFLOWnumber
    \ifcase\@@FLOWnx\relax \let\@@FLOWnx\FLOWwidth  \fi
    \ifcase\@@FLOWny\relax \let\@@FLOWny\FLOWheight \fi
-   \doifnothing{\@@FLOWmaxbreedte\@@FLOWmaxhoogte}{\FLOWscalingfalse}%
+   \doifnothing{\@@FLOWmaxwidth\@@FLOWmaxheight}{\FLOWscalingfalse}%
    \ifFLOWscaling
-     \doifnothing{\@@FLOWmaxbreedte}{\let\@@FLOWmaxbreedte\maxdimen}%
-     \doifnothing{\@@FLOWmaxhoogte} {\let\@@FLOWmaxhoogte \maxdimen}%
+     \doifnothing{\@@FLOWmaxwidth}{\let\@@FLOWmaxwidth\maxdimen}%
+     \doifnothing{\@@FLOWmaxheight} {\let\@@FLOWmaxheight \maxdimen}%
      \scratchcounter=\bodyfontpoints
      \doloop  % NOG FONTSWITCH OM EX EN EM TE LATEN WERKEN
        {\ifnum\scratchcounter>1 % NU DIMENSIONS IN TERMS OF BODYFONTSIZE
           \bodyfontsize=\the\scratchcounter pt
-          \dimen0=\@@FLOWmaxbreedte
-          \dimen2=\@@FLOWbreedte
+          \dimen0=\@@FLOWmaxwidth
+          \dimen2=\@@FLOWwidth
           \dimen4=\@@FLOWdx
           \advance\dimen2 2\dimen4
           \dimen2=\@@FLOWnx\dimen2
@@ -415,8 +415,8 @@
           \ifdim\dimen2>\dimen0
             \advance\scratchcounter \minusone
           \else
-            \dimen0=\@@FLOWmaxhoogte
-            \dimen2=\@@FLOWhoogte
+            \dimen0=\@@FLOWmaxheight
+            \dimen2=\@@FLOWheight
             \dimen4=\@@FLOWdy
             \advance\dimen2 2\dimen4
             \dimen2=\@@FLOWny\dimen2
@@ -433,46 +433,46 @@
      \expanded{\switchtobodyfont[\the\scratchcounter pt]}%
      \forgetall
      \offinterlineskip
-   \else\ifx\@@FLOWkorps\empty\else
-     \expanded{\switchtobodyfont[\@@FLOWkorps]}% \expanded ?
+   \else\ifx\@@FLOWbodyfont\empty\else
+     \expanded{\switchtobodyfont[\@@FLOWbodyfont]}% \expanded ?
    \fi\fi
    \global\let\FLOWcells\empty
-   \dimen0=\@@FLOWbreedte
+   \dimen0=\@@FLOWwidth
    \edef\FLOWshapewidth{\the\dimen0}%
    \dimen2=\@@FLOWdx
    \advance\dimen0 2\dimen2
    \edef\FLOWgridwidth{\the\dimen0}%
-   \dimen0=\@@FLOWhoogte
+   \dimen0=\@@FLOWheight
    \edef\FLOWshapeheight{\the\dimen0}%
    \dimen2=\@@FLOWdy
    \advance\dimen0 2\dimen2
    \edef\FLOWgridheight{\the\dimen0}%
-   \scratchdimen=\@@FLOSlijndikte
-   \edef\@@FLOSlijndikte{\the\scratchdimen}%
-   \scratchdimen=\@@FLOFlijndikte
-   \edef\@@FLOFlijndikte{\the\scratchdimen}%
-   \scratchdimen=\@@FLOLlijndikte
-   \edef\@@FLOLlijndikte{\the\scratchdimen}%
-   \ifdim\@@FLOLstraal<2.5\scratchdimen
+   \scratchdimen=\@@FLOSrulethickness
+   \edef\@@FLOSrulethickness{\the\scratchdimen}%
+   \scratchdimen=\@@FLOFrulethickness
+   \edef\@@FLOFrulethickness{\the\scratchdimen}%
+   \scratchdimen=\@@FLOLrulethickness
+   \edef\@@FLOLrulethickness{\the\scratchdimen}%
+   \ifdim\@@FLOLradius<2.5\scratchdimen
      \scratchdimen=2.5\scratchdimen
-     \edef\@@FLOLstraal{\the\scratchdimen}%
-     \ifdim\@@FLOLstraal>\@@FLOWdx
+     \edef\@@FLOLradius{\the\scratchdimen}%
+     \ifdim\@@FLOLradius>\@@FLOWdx
        \scratchdimen=\@@FLOWdx
-       \edef\@@FLOLstraal{\the\scratchdimen}%
+       \edef\@@FLOLradius{\the\scratchdimen}%
      \fi
-     \ifdim\@@FLOLstraal>\@@FLOWdy
+     \ifdim\@@FLOLradius>\@@FLOWdy
        \scratchdimen=\@@FLOWdy
-       \edef\@@FLOLstraal{\the\scratchdimen}%
+       \edef\@@FLOLradius{\the\scratchdimen}%
      \fi
    \else
-     \scratchdimen=\@@FLOLstraal
-     \edef\@@FLOLstraal{\the\scratchdimen}%
+     \scratchdimen=\@@FLOLradius
+     \edef\@@FLOLradius{\the\scratchdimen}%
    \fi
    \processaction % magic 2.5
      [\@@FLOWoffset]
-     [      \v!geen=>\scratchdimen=-2.5\scratchdimen,
+     [      \v!none=>\scratchdimen=-2.5\scratchdimen,
          \v!overlay=>\scratchdimen=-2.5\scratchdimen,
-       \v!standaard=>\scratchdimen=\scratchdimen,
+       \v!standard=>\scratchdimen=\scratchdimen,
          \s!unknown=>\scratchdimen=\@@FLOWoffset,
          \s!default=>\scratchdimen=-2.5\scratchdimen]%
    \edef\@@FLOW@@offset{\the\scratchdimen}%
@@ -486,10 +486,10 @@
      grid_height            := \FLOWgridheight ;
      shape_width            := \FLOWshapewidth ;
      shape_height           := \FLOWshapeheight ;
-     connection_line_width  := \@@FLOLlijndikte ;
-     connection_smooth_size := \@@FLOLstraal ;
-     connection_arrow_size  := \@@FLOLstraal ;
-     connection_dash_size   := \@@FLOLstraal ;
+     connection_line_width  := \@@FLOLrulethickness ;
+     connection_smooth_size := \@@FLOLradius ;
+     connection_arrow_size  := \@@FLOLradius ;
+     connection_dash_size   := \@@FLOLradius ;
 %  \stopMPdrawing
 %  \def\getFLOWlocationX##1,##2\end%
 %    {\ifnum0##1>\FLOWwidth \xdef\FLOWwidth {##1}\fi
@@ -511,28 +511,28 @@
      reverse_y := true ;
      chart_offset := \@@FLOW@@offset ;
    \stopMPdrawing
-   \doifelsenothing\@@FLOWachtergrondkleur
+   \doifelsenothing\@@FLOWbackgroundcolor
      {\startMPdrawing
       chart_background_color := white ;
       \stopMPdrawing}
      {\startMPdrawing
-      chart_background_color := \MPcolor{\@@FLOWachtergrondkleur} ;
+      chart_background_color := \MPcolor{\@@FLOWbackgroundcolor} ;
       \stopMPdrawing}%
-   \doif\@@FLOWoptie\v!test
+   \doif\@@FLOWoption\v!test
      {\startMPdrawing
         show_con_points := true ;
         show_mid_points := true ;
         show_all_points := true ;
       \stopMPdrawing}%
    \processaction % private
-     [\@@FLOWpunt]
-     [     \v!ja=>\startMPdrawing
+     [\@@FLOWdot]
+     [     \v!yes=>\startMPdrawing
                     show_con_points := true ;
                     show_mid_points := true ;
                     show_all_points := true ;
                   \stopMPdrawing,
       \s!unknown=>\startMPdrawing
-                    show_\@@FLOWpunt_points := true ;
+                    show_\@@FLOWdot_points := true ;
                   \stopMPdrawing]%
    \let\startFLOWcell\startFLOWcellB
    \resetFLOWlocation
@@ -577,7 +577,7 @@
    \setbox4\hbox
      {\hskip\@@FLOW@@offset\lower\@@FLOW@@offset\box4}%
    \wd4\wd0\ht4\ht0\dp4\dp0
-   \doifelse\@@FLOWoptie\v!test
+   \doifelse\@@FLOWoption\v!test
      {\setbox6\vbox
         {\forgetall
          \vskip\@@FLOW@@offset
@@ -585,8 +585,8 @@
          \basegrid
            [\c!x=\@@FLOWx,\c!nx=\@@FLOWnx,\c!dx=\withoutpt\FLOWgridwidth,
             \c!y=\@@FLOWy,\c!ny=\@@FLOWny,\c!dy=\withoutpt\FLOWgridheight,
-            \c!xstap=1,\c!ystap=1,
-            \c!eenheid=pt,\c!plaats=\v!midden]}%
+            \c!xstep=1,\c!ystep=1,
+            \c!unit=pt,\c!location=\v!middle]}%
       \wd6\wd0\ht6\ht0\dp6\dp0
       \setbox8\vbox
         {\forgetall\offinterlineskip
@@ -600,23 +600,23 @@
                     {\hbox to \FLOWgridwidth
                        {\hfill
                         \framed
-                          [\c!kaderkleur=red,
-                           \c!breedte=\FLOWshapewidth,
-                           \c!hoogte=\FLOWshapeheight]
+                          [\c!framecolor=red,
+                           \c!width=\FLOWshapewidth,
+                           \c!height=\FLOWshapeheight]
                           {}%
                         \hfill}}}
                \vfill}}}%
       \wd8\wd0\ht8\ht0\dp8\dp0
       \framed
-        [\c!offset=\v!overlay,\c!kaderkleur=green]
+        [\c!offset=\v!overlay,\c!framecolor=green]
         {\hbox{\box4\hskip-\wd0\box0\hskip-\wd2\box2\hskip-\wd6\box6\hskip-\wd8\box8}}}
      {\framed
         [\c!offset=\v!overlay,
-         \c!kader=\@@FLOWkader,
-         \c!lijndikte=\@@FLOWlijndikte,
-         \c!kaderkleur=\@@FLOWkaderkleur,
-         \c!achtergrond=\@@FLOWachtergrond,
-         \c!achtergrondkleur=\@@FLOWachtergrondkleur]
+         \c!frame=\@@FLOWframe,
+         \c!rulethickness=\@@FLOWrulethickness,
+         \c!framecolor=\@@FLOWframecolor,
+         \c!background=\@@FLOWbackground,
+         \c!backgroundcolor=\@@FLOWbackgroundcolor]
         {\hbox{\box4\hskip-\wd0\box0\hskip-\wd2\box2}}}%
   %\message{[\FLOWcells]}\wait
    \egroup}
@@ -645,7 +645,7 @@
    \ifx\FLOWshape\empty
      \global\let\FLOWshape\@@FLOSdefault
    \fi
-   \doifnot\FLOWshape{none} % {\v!geen}
+   \doifnot\FLOWshape{none} % {\v!none}
      {\ExpandBothAfter\doifinsetelse{\FLOWshape}{\FLOWshapes}
         {\edef\FLOWshapetag{shape_\FLOWshape}% beter \expanded
          \@EA\setFLOWname\@EA\FLOWshapetag\@EA{\FLOWshapetag}}
@@ -661,17 +661,17 @@
         \startMPdrawing
           begin_sub_chart ;
           \ifcase\FLOWstate
-            shape_line_color := \MPcolor{\@@FLOLkleur} ;
-            shape_fill_color := \MPcolor{\@@FLOLkleur} ;
-            shape_line_width := \@@FLOLlijndikte ;
+            shape_line_color := \MPcolor{\@@FLOLcolor} ;
+            shape_fill_color := \MPcolor{\@@FLOLcolor} ;
+            shape_line_width := \@@FLOLrulethickness ;
           \or
-            shape_line_color := \MPcolor{\@@FLOFkaderkleur} ;
-            shape_fill_color := \MPcolor{\@@FLOFachtergrondkleur} ;
-            shape_line_width := \@@FLOFlijndikte ;
+            shape_line_color := \MPcolor{\@@FLOFframecolor} ;
+            shape_fill_color := \MPcolor{\@@FLOFbackgroundcolor} ;
+            shape_line_width := \@@FLOFrulethickness ;
           \or
-            shape_line_color := \MPcolor{\@@FLOSkaderkleur} ;
-            shape_fill_color := \MPcolor{\@@FLOSachtergrondkleur} ;
-            shape_line_width := \@@FLOSlijndikte ;
+            shape_line_color := \MPcolor{\@@FLOSframecolor} ;
+            shape_fill_color := \MPcolor{\@@FLOSbackgroundcolor} ;
+            shape_line_width := \@@FLOSrulethickness ;
           \fi
          %\ifx\FLOWoverlay\empty
          %  peepshape := false ;
@@ -718,16 +718,16 @@
      \ifx\FLOWto\FLOWorigin \else
        \FLOWsetconnect{#1}%
        \ifx\cFLOWfrom\empty \else
-         \doifelse\@@FLOLhoek\v!rond
+         \doifelse\@@FLOLcorner\v!round
            {\startMPdrawing smooth     := true  ; \stopMPdrawing}
            {\startMPdrawing smooth     := false ; \stopMPdrawing}%
-         \doifelse\@@FLOLstreep\v!ja
+         \doifelse\@@FLOLdash\v!yes
            {\startMPdrawing dashline   := true  ; \stopMPdrawing}
            {\startMPdrawing dashline   := false ; \stopMPdrawing}%
-         \doifelse\@@FLOLpijl\v!ja
+         \doifelse\@@FLOLarrow\v!yes
            {\startMPdrawing arrowtip   := true  ; \stopMPdrawing}
            {\startMPdrawing arrowtip   := false ; \stopMPdrawing}%
-         \doifelse\@@FLOLoffset\v!geen
+         \doifelse\@@FLOLoffset\v!none
            {\startMPdrawing touchshape := true  ; \stopMPdrawing}
            {\startMPdrawing touchshape := false ; \stopMPdrawing}%
 %\doifsomething{#2}
@@ -736,8 +736,8 @@
 %   \stopMPdrawing}%
          \startMPdrawing
 \doFLOWdisplace[0#2,0,0]%
-           connection_line_color := \MPcolor{\@@FLOLkleur} ;
-           connection_line_width := \@@FLOLlijndikte ;
+           connection_line_color := \MPcolor{\@@FLOLcolor} ;
+           connection_line_width := \@@FLOLrulethickness ;
            connect_\cFLOWfrom_\cFLOWto (\FLOWfrom,\zFLOWfrom) (\FLOWto,\zFLOWto) ;
 \doFLOWdisplace[0,0,0]%
          \stopMPdrawing
@@ -839,29 +839,29 @@
      \setbox0=\hbox
        {\ifx\FLOWalign\empty\else
           \setupframed
-            [\c!uitlijnen=\v!normaal,\c!onder=\vfill,\c!boven=\vfill]%
+            [\c!align=\v!normal,\c!bottom=\vfill,\c!top=\vfill]%
           \@EA\processallactionsinset\@EA
             [\FLOWalign]
-            [t=>{\setupframed[\c!onder=\vfill,\c!boven=]},
-             b=>{\setupframed[\c!onder=,\c!boven=\vfill]},
-             l=>{\setupframed[\c!uitlijnen=\v!rechts]},
-             r=>{\setupframed[\c!uitlijnen=\v!links]},
-             m=>{\setupframed[\c!uitlijnen=\v!midden]},
-             c=>{\setupframed[\c!uitlijnen=\v!midden]}]%
+            [t=>{\setupframed[\c!bottom=\vfill,\c!top=]},
+             b=>{\setupframed[\c!bottom=,\c!top=\vfill]},
+             l=>{\setupframed[\c!align=\v!right]},
+             r=>{\setupframed[\c!align=\v!left]},
+             m=>{\setupframed[\c!align=\v!middle]},
+             c=>{\setupframed[\c!align=\v!middle]}]%
         \fi
-        \doifelse\FLOWshape{none} % {\v!geen}
+        \doifelse\FLOWshape{none} % {\v!none}
           {\setupframed[\c!offset=\v!overlay]}
          %{\setupframed[\c!offset=.5\bodyfontsize]}%
           {\setupframed[\c!offset=\@@FLOSoffset]}%
         \framed
-          [\c!kader=\v!uit,
-           \c!breedte=\FLOWshapewidth,\c!hoogte=\FLOWshapeheight]
+          [\c!frame=\v!off,
+           \c!width=\FLOWshapewidth,\c!height=\FLOWshapeheight]
           {\FLOWtext}}%
      \showFLOWhelp0
      \ifx\FLOWdestination\empty\else
        \setbox0=\hbox
-         {\setupinteraction[\c!kleur=,\c!contrastkleur=]%
-          \naarbox{\box0}[\FLOWdestination]}%
+         {\setupinteraction[\c!color=,\c!contrastcolor=]%
+          \gotobox{\box0}[\FLOWdestination]}%
      \fi
      \edef\FLOWdx{\the\dimen0}%
      \edef\FLOWdy{\the\dimen2}%
@@ -949,10 +949,10 @@
      \edef\FLOWdy{\the\dimen2}%
      \setbox0=\hbox
        {\framed
-          [\c!kader=\v!uit,
-           \c!achtergrond={\@@FLOWachtergrond,\FLOWoverlay},
-           \c!achtergrondkleur=\@@FLOSachtergrondkleur,
-           \c!breedte=\FLOWshapewidth,\c!hoogte=\FLOWshapeheight]
+          [\c!frame=\v!off,
+           \c!background={\@@FLOWbackground,\FLOWoverlay},
+           \c!backgroundcolor=\@@FLOSbackgroundcolor,
+           \c!width=\FLOWshapewidth,\c!height=\FLOWshapeheight]
           {}}%
      \setbox0=\hbox{\hskip\FLOWdx\lower\FLOWdy\box0}%
      \smashbox0
@@ -1055,7 +1055,7 @@
      {\setbox#1=\hbox
         {\setbox\scratchbox=\hbox{\lower\@@FLOWdy\hbox
            {\helpbutton
-              [\c!breedte=\wd0,\c!kleur=,\c!hoogte=\@@FLOWdy,\c!kader=\v!nee]%
+              [\c!width=\wd0,\c!color=,\c!height=\@@FLOWdy,\c!frame=\v!no]%
               [\FLOWhelp]}}%
          \smashbox\scratchbox
          \setbox#1=\vbox
@@ -1088,9 +1088,9 @@
 \setupFLOWsplit%
   [\c!nx=3,\c!ny=3,
    \c!dx=1,\c!dy=1,
-   \c!commando=,
-   \c!markering=\v!aan,
-   \c!voor=,\c!na=]
+   \c!command=,
+   \c!marking=\v!on,
+   \c!before=,\c!after=]
 
 \def\FLOWsplitx {1}
 \def\FLOWsplity {1}
@@ -1102,9 +1102,9 @@
 
 %D While splitting, the following variables are available:
 %D
-%D \starttypen
+%D \starttyping
 %D \FLOWsplitnx \FLOWsplitny \FLOWsplitx \FLOWsplity
-%D \stoptypen
+%D \stoptyping
 
 \def\doFLOWcharts[#1][#2]%
   {\bgroup
@@ -1150,35 +1150,35 @@
 
 \def\dododoFLOWcharts[#1][#2]%
   {\bgroup
-   \@@FLOTvoor
-   \doifnot\@@FLOTmarkering\v!aan{\let\cuthbox\hbox}%
+   \@@FLOTbefore
+   \doifnot\@@FLOTmarking\v!on{\let\cuthbox\hbox}%
    \cuthbox
-     {\@@FLOTcommando
+     {\@@FLOTcommand
         {\FLOWchart[#1][#2,
            \c!x=\@@FLOTx,\c!nx=\@@FLOTnx,
            \c!y=\@@FLOTy,\c!ny=\@@FLOTny]}}%
-   \@@FLOTna
+   \@@FLOTafter
    \egroup}
 
 %D An example of splitting is given below:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupFLOWsplit
 %D   [nx=5,ny=10,
 %D    dx=0,dy=0,
 %D    before=,
-%D    after=\pagina]
+%D    after=\page]
 %D
 %D \FLOWcharts[mybigflow]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Or, one can say:
 %D
-%D \starttypen
-%D \splitsplaatsblok
-%D   {\plaatsfiguur{What a big flowchart this is!}}
+%D \starttyping
+%D \splitfloat
+%D   {\placefigure{What a big flowchart this is!}}
 %D   {\FLOWcharts[mybigflow]}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {typeFLOWchart}
@@ -1198,7 +1198,7 @@
 
 %D New:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupFLOWcharts[command=\Whow]
 %D
 %D \startFLOWset[convert-en] % [tag][convert-en]
@@ -1213,13 +1213,13 @@
 %D \FLOWset[convert-en] % [tag]
 %D
 %D \def\Whow#1%
-%D   {\setuphead[status=hoog]
+%D   {\setuphead[state=high]
 %D    \startstandardmakeup
 %D    \centerbox{#1}
 %D    \stopstandardmakeup}
 %D
 %D \FLOWset[convert-en] % [tag]
-%D \stoptypen
+%D \stoptyping
 
 \def\startFLOWset
   {\dodoubleempty\dostartFLOWset}
@@ -1247,7 +1247,7 @@
 \def\dodohandleFLOWset#1#2#3#4% tag subtag name settings
   {\increment\currentFLOWset
    \bgroup
-   \@@FLOXcommando
+   \@@FLOXcommand
      {\ifnum\currentFLOWset=1 \pagereference[#1]\fi
       \doifsomething{#2}
         {\setupreferencing[\c!prefix=]%
@@ -1265,7 +1265,7 @@
 \newcounter\currentFLOWset
 
 \setupFLOWsets
-  [\c!commando=]
+  [\c!command=]
 
 %D This will be an option:
 
diff --git a/tex/context/base/m-chemic.tex b/tex/context/base/m-chemic.tex
index cfefdf83f..ad6c10e73 100644
--- a/tex/context/base/m-chemic.tex
+++ b/tex/context/base/m-chemic.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=ppchtex (m-chemic),
+%D   [       filefile=ppchtex (m-chemic),
 %D        version=1997.03.19,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\PPCHTEX\ (Plain Pictex Context cHemie \TEX),
diff --git a/tex/context/base/m-cweb.tex b/tex/context/base/m-cweb.tex
index 19f6a8375..82ce2b311 100644
--- a/tex/context/base/m-cweb.tex
+++ b/tex/context/base/m-cweb.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-cweb,
+%D   [       filefile=m-cweb,
 %D        version=1997.01.15,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\CWEB\ Pretty Printing Macros,
@@ -71,10 +71,10 @@
 %D Instead of using \type{\def} and \type{\let} for defining
 %D macros, we use:
 %D
-%D \starttypen
+%D \starttyping
 %D \defCEBmacro arguments {meaning}
 %D \letCEBmacro arguments {meaning}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \CWEB files contain implicit calls to macros that generate
 %D the table of contents, the lists of sections and the index.
@@ -83,9 +83,9 @@
 %D ones. The next macro is used for defining these obsolete
 %D \CWEB\ macros. The dummies take care of arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \defCEBdummy arguments {meaning}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The list of \CWEB\ specific macro names is saved in a
 %D \TOKENLIST. This serves two purposes. First it enables us to
@@ -98,10 +98,10 @@
 
 %D Activating and deactivating is done by means of:
 %D
-%D \starttypen
+%D \starttyping
 %D \activateCWEB
 %D \deactivateCWEB
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which are implemented as:
 
@@ -638,8 +638,8 @@
 
 \unprotect
 
-\def\theCWEByskip {\blanko[\v!klein]}
-\def\theCWEBvskip {\blanko[\v!groot]}
+\def\theCWEByskip {\blank[\v!small]}
+\def\theCWEBvskip {\blank[\v!big]}
 
 \protect
 
@@ -1043,7 +1043,7 @@
       \def\[####1]{####1}%
       \xdef\CWEBreference{##1}%
       \egroup
-      \CWEBcomma{\localcolortrue\naar{\donottest{##1}}[web:\CWEBreference]}}%
+      \CWEBcomma{\localcolortrue\goto{\donottest{##1}}[web:\CWEBreference]}}%
    \processlist{(}{)}{,}\docommando(#1)
    \egroup}
 
@@ -1056,13 +1056,13 @@
      \def\next##1\ET##2##3.%
        {\processCWEBsectionnumbers[##1]%
         \if##2s%
-          {, and~\naar{##3}[web:##3]}%
+          {, and~\goto{##3}[web:##3]}%
         \else
-          { and~\naar{##2##3}[web:##2##3]}%
+          { and~\goto{##2##3}[web:##2##3]}%
         \fi}%
       \next#1.%
    \else
-     \naar{#1}[web:#1]%
+     \goto{#1}[web:#1]%
    \fi
    \afterCWEBnote % inside group!
    \egroup}
@@ -1172,10 +1172,10 @@
 \def\gotoCWEBsection#1[#2]%
   {\iflinktoCWEBfile
      \bgroup
-       \setupinteraction[\c!kleur=,\c!letter=]%
+       \setupinteraction[\c!color=,\c!style=]%
        \let\savedreferenceprefix=\referenceprefix
        \localcolortrue
-       \naar{#1}[\otherCWEBfile::\savedreferenceprefix web:#2]%
+       \goto{#1}[\otherCWEBfile::\savedreferenceprefix web:#2]%
      \egroup
    \else
      #1%
@@ -1355,11 +1355,11 @@
    \line{\consetup{#2}#1
    \rm
    \leaders\hbox to .5em{.\hfil}\hfil\
-   {\localcolortrue\naar{#3}[web:#3]}%  below: \gotorealpage ? should be changed
+   {\localcolortrue\goto{#3}[web:#3]}%  below: \gotorealpage ? should be changed
    \hbox to3em{\localcolortrue\hss\gotorealpage{}{}{#5}{\translatednumber[#4]\presetgoto}}}}
 
 %D A last hack, needed because a file can overload of the
-%D above. (Some day: a check like \ifx#1\CWEBdefined.)
+%D above. (Some day: a check like \type{\ifx#1\CWEBdefined}.)
 
 \def\outer#1#2%
   {\ifx#2\undefined
diff --git a/tex/context/base/m-edtsnc.tex b/tex/context/base/m-edtsnc.tex
index 504dd7c8e..8bbe7f072 100644
--- a/tex/context/base/m-edtsnc.tex
+++ b/tex/context/base/m-edtsnc.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-editsnc,
+%D   [       filefile=m-editsnc,
 %D        version=2003.12.23,
 %D          title=\CONTEXT\ Modules,
 %D       subtitle=Editor Synchronization
@@ -203,4 +203,4 @@ some local \editsync sync and \editsynctext{here}a marked point
 some local \editsync sync and \editsyncnode{here}a marked point
 \stoplines
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/m-educat.tex b/tex/context/base/m-educat.tex
index 0951ee055..e79619232 100644
--- a/tex/context/base/m-educat.tex
+++ b/tex/context/base/m-educat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-educat,
+%D   [       filefile=m-educat,
 %D        version=2003.03.05,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Educational Extras,
@@ -58,14 +58,14 @@
 
 \definetextbackground
   [\v!answerarea]
-  [\c!plaats=\v!tekst,
+  [\c!location=\v!text,
    \c!n=0,
-   \c!kader=\v!uit,
-   \c!kaderkleur=answerlinecolor,       
-   \c!lijndikte=2pt,
-   \c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=answerareacolor, 
-   \c!variant=2] % betweenline
+   \c!frame=\v!off,
+   \c!framecolor=answerlinecolor,       
+   \c!rulethickness=2pt,
+   \c!background=\v!color,
+   \c!backgroundcolor=answerareacolor, 
+   \c!alternative=2] % betweenline
 
 % n=gedwongen
 % m=extra auto
@@ -80,7 +80,7 @@
   {\begingroup
    \dontcomplain
    \setupanswerarea
-     [\c!n=0,\c!m=,#1,\c!plaats=\v!tekst]%
+     [\c!n=0,\c!m=,#1,\c!location=\v!text]%
    \doifelsenothing{\backgroundvariable\c!m}
      {\expandafter\donoanswerspace}
      {\expandafter\dodoanswerspace}%
@@ -88,11 +88,11 @@
 
 \def\donoanswerspace[#1]#2%
   {\setupthinrules
-     [\c!variant=\backgroundvariable\c!variant,
-      \c!kleur=\backgroundvariable\c!kaderkleur,
-      \c!achtergrond=\backgroundvariable\c!achtergrond,
-      \c!achtergrondkleur=\backgroundvariable\c!achtergrondkleur,
-      \c!lijndikte=\backgroundvariable\c!lijndikte]%
+     [\c!alternative=\backgroundvariable\c!alternative,
+      \c!color=\backgroundvariable\c!framecolor,
+      \c!background=\backgroundvariable\c!background,
+      \c!backgroundcolor=\backgroundvariable\c!backgroundcolor,
+      \c!rulethickness=\backgroundvariable\c!rulethickness]%
    \doifelse{\backgroundvariable\c!n}{*}
      {\thinrule
       \par}
@@ -142,8 +142,8 @@
   {\begingroup
    \dontcomplain
    \setupanswerarea
-     [\c!n=0,\c!m=,#1,\c!plaats=\v!tekst]%
-   \doifnot{\backgroundvariable\c!optie}\v!aansluitend\softbreak
+     [\c!n=0,\c!m=,#1,\c!location=\v!text]%
+   \doifnot{\backgroundvariable\c!option}\v!joinedup\softbreak
    \doifelsenothing{\backgroundvariable\c!m}
      {\expandafter\donostartanswerlines}
      {\expandafter\dodostartanswerlines}%
@@ -151,11 +151,11 @@
 
 \def\donostartanswerlines[#1]%
   {\setupthinrules
-     [\c!variant=\backgroundvariable\c!variant,
-      \c!kleur=\backgroundvariable\c!kaderkleur,
-      \c!achtergrond=\backgroundvariable\c!achtergrond,
-      \c!achtergrondkleur=\backgroundvariable\c!achtergrondkleur,
-      \c!lijndikte=\backgroundvariable\c!lijndikte]%
+     [\c!alternative=\backgroundvariable\c!alternative,
+      \c!color=\backgroundvariable\c!framecolor,
+      \c!background=\backgroundvariable\c!background,
+      \c!backgroundcolor=\backgroundvariable\c!backgroundcolor,
+      \c!rulethickness=\backgroundvariable\c!rulethickness]%
    \thinrules[\c!n=\backgroundvariable\c!n]\par
    \endgroup
    \grabuntil{\e!stop\e!answerlines}}
diff --git a/tex/context/base/m-gamma.tex b/tex/context/base/m-gamma.tex
index 698613db9..098d33795 100644
--- a/tex/context/base/m-gamma.tex
+++ b/tex/context/base/m-gamma.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-gamma,
+%D   [       filefile=m-gamma,
 %D        version=2002.05.15,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Basic \OMEGA\ Support, 
diff --git a/tex/context/base/m-graph.tex b/tex/context/base/m-graph.tex
index 0be24eee2..9254208bd 100644
--- a/tex/context/base/m-graph.tex
+++ b/tex/context/base/m-graph.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-graph,
+%D   [       filefile=m-graph,
 %D        version=2000.08.06,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\METAPOST\ graph module support,
@@ -41,22 +41,22 @@
    
 %D If you run into troubles, try: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \forceMPTEXgraphictrue 
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D A demo can be run with:
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --mode=demo --pdf m-graph
-%D \stoptypen 
+%D \stoptyping 
 
 % No longer needed, since John will fix it. 
 % 
 % %D For the moment we need the following patch. Adam T. Lindsay 
 % %D found out that the following code produced an error: 
 % %D 
-% %D \starttypen 
+% %D \starttyping 
 % %D \startMPcode
 % %D draw begingraph(130mm,35mm);
 % %D   setrange(0,0,10,22000);
@@ -80,15 +80,15 @@
 % %D    autogrid(itick.bot,grid.lft) withcolor .75white ;
 % %D   endgraph;
 % %D \stopMPcode
-% %D \stoptypen 
+% %D \stoptyping 
 % %D
 % %D The bug is a rather nasty one and needs some tweaking in 
 % %D the low level graph code. John Hobby suggested for the 
 % %D moment to initialize \type {setrange} as follows: 
 % %D 
-% %D \starttypen  
+% %D \starttyping  
 % %D  setrange(0,0,"22000","22000")
-% %D \stoptypen 
+% %D \stoptyping 
 % %D 
 % %D Folowing this suggesion, I provide the following 
 % %D extension: 
diff --git a/tex/context/base/m-layout.tex b/tex/context/base/m-layout.tex
index 6bc5c8c55..41ea7a670 100644
--- a/tex/context/base/m-layout.tex
+++ b/tex/context/base/m-layout.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-layout,
+%D   [       filefile=m-layout,
 %D        version=2004.01.16,
 %D          title=\CONTEXT\ Modules,
 %D       subtitle=Additional Layouts,
@@ -28,12 +28,12 @@
   {\withoutpt\the\dimexpr(2\paperheight/(\paperwidth/32768))}
 
 \def\layouthfheight
-  {\dimexpr(\layoutparameter\c!hoofd+\layoutparameter\c!hoofdafstand+
-            \layoutparameter\c!voet +\layoutparameter\c!voetafstand )}
+  {\dimexpr(\layoutparameter\c!header+\layoutparameter\c!headerdistance+
+            \layoutparameter\c!footer +\layoutparameter\c!footerdistance )}
 
 \startsetups[preset-1]
 
-  \xdef\layoutwidth {\dimexpr(\layoutparameter\c!breedte)}
+  \xdef\layoutwidth {\dimexpr(\layoutparameter\c!width)}
   \gdef\layoutheight{\dimexpr(\layouthwratio\dimexpr(\layoutwidth)+\layouthfheight)}
 
 \stopsetups
@@ -41,56 +41,56 @@
 \definelayout
   [preset-1-1]
   [\c!preset=preset-1,
-   \c!rugwit=\dimexpr((\paperwidth-\layoutwidth)/2),
-   \c!breedte=\dimexpr(2\paperwidth/3),
-   \c!snijwit=\dimexpr((\paperwidth-\layoutwidth)/2),
-   \c!marge=\dimexpr((\paperwidth-\layoutwidth)/3),
-   \c!hoofd=2\lineheight,
-   \c!hoofdafstand=\lineheight,
-   \c!hoogte=\v!midden, % \layoutheight
-   \c!voetafstand=\layoutparameter\c!hoofdafstand, % \lineheight,
-   \c!voet=\layoutparameter\c!hoofd, % 2\lineheight,
-   \c!kopwit=\dimexpr(1\dimexpr(\paperheight-(\layoutheight+\layouthfheight))/3),
-   \c!bodemwit=\dimexpr(2\dimexpr(\paperheight-(\layoutheight+\layouthfheight))/3)]
+   \c!backspace=\dimexpr((\paperwidth-\layoutwidth)/2),
+   \c!width=\dimexpr(2\paperwidth/3),
+   \c!cutspace=\dimexpr((\paperwidth-\layoutwidth)/2),
+   \c!margin=\dimexpr((\paperwidth-\layoutwidth)/3),
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance, % \lineheight,
+   \c!footer=\layoutparameter\c!header, % 2\lineheight,
+   \c!topspace=\dimexpr(1\dimexpr(\paperheight-(\layoutheight+\layouthfheight))/3),
+   \c!bottomspace=\dimexpr(2\dimexpr(\paperheight-(\layoutheight+\layouthfheight))/3)]
 
 \startsetups[preset-2]
 
-  \gdef\layouthstep{\dimexpr(\paperwidth /\layoutparameter\c!kolommen)}
-  \gdef\layoutvstep{\dimexpr(\paperheight/\layoutparameter\c!kolommen)}
+  \gdef\layouthstep{\dimexpr(\paperwidth /\layoutparameter\c!columns)}
+  \gdef\layoutvstep{\dimexpr(\paperheight/\layoutparameter\c!columns)}
 
 \stopsetups
 
 \definelayout
   [preset-2-1]
   [\c!preset=preset-2,
-   \c!kolommen=12,
-   \c!rugwit=\layouthstep,
-   \c!breedte=\v!midden,
-   \c!snijwit=2\layouthstep,
-   \c!marge=\layouthstep,
-   \c!hoofd=2\lineheight,
-   \c!hoofdafstand=\lineheight,
-   \c!hoogte=\v!midden, % \layoutheight
-   \c!voetafstand=\layoutparameter\c!hoofdafstand,
-   \c!voet=\layoutparameter\c!hoofd,
-   \c!kopwit=\dimexpr(\layoutvstep-\layoutparameter\c!hoofd-\layoutparameter\c!hoofdafstand),
-   \c!bodemwit=\dimexpr(2\layoutvstep-\layoutparameter\c!hoofd-\layoutparameter\c!hoofdafstand)]
+   \c!columns=12,
+   \c!backspace=\layouthstep,
+   \c!width=\v!middle,
+   \c!cutspace=2\layouthstep,
+   \c!margin=\layouthstep,
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance,
+   \c!footer=\layoutparameter\c!header,
+   \c!topspace=\dimexpr(\layoutvstep-\layoutparameter\c!header-\layoutparameter\c!headerdistance),
+   \c!bottomspace=\dimexpr(2\layoutvstep-\layoutparameter\c!header-\layoutparameter\c!headerdistance)]
 
 \definelayout
   [preset-2-2]
   [\c!preset=preset-2,
-   \c!kolommen=12,
-   \c!rugwit=\layouthstep,
-   \c!breedte=\v!midden,
-   \c!snijwit=2\layouthstep,
-   \c!marge=\layouthstep,
-   \c!hoofd=2\lineheight,
-   \c!hoofdafstand=\lineheight,
-   \c!hoogte=\v!midden, % \layoutheight
-   \c!voetafstand=\layoutparameter\c!hoofdafstand,
-   \c!voet=\layoutparameter\c!hoofd,
-   \c!kopwit=\layoutvstep,
-   \c!bodemwit=\layoutvstep] % maybe 1.5
+   \c!columns=12,
+   \c!backspace=\layouthstep,
+   \c!width=\v!middle,
+   \c!cutspace=2\layouthstep,
+   \c!margin=\layouthstep,
+   \c!header=2\lineheight,
+   \c!headerdistance=\lineheight,
+   \c!height=\v!middle, % \layoutheight
+   \c!footerdistance=\layoutparameter\c!headerdistance,
+   \c!footer=\layoutparameter\c!header,
+   \c!topspace=\layoutvstep,
+   \c!bottomspace=\layoutvstep] % maybe 1.5
 
 %                                                     \setuplayout[preset-1-1] test \showframe \page
 % \setuplayout[preset-1-1][width=65\averagecharwidth] \setuplayout[preset-1-1] test \showframe \page
@@ -99,4 +99,4 @@
 %                                                     \setuplayout[preset-2-2] test \showframe \page
 % \setuplayout[preset-2-2][columns=10]                \setuplayout[preset-2-2] test \showframe \page
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/m-level.tex b/tex/context/base/m-level.tex
index 67d598733..11c60626a 100644
--- a/tex/context/base/m-level.tex
+++ b/tex/context/base/m-level.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=level,
+%D   [       filefile=level,
 %D        version=2002.10.20,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Catching Nesting Errors,
diff --git a/tex/context/base/m-newmat.tex b/tex/context/base/m-newmat.tex
index 32aa7783b..b2c831578 100644
--- a/tex/context/base/m-newmat.tex
+++ b/tex/context/base/m-newmat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-newmat,
+%D   [       filefile=m-newmat,
 %D        version=2000.11.16,
 %D          title=\CONTEXT\ Math Module,
 %D       subtitle=AMS-like math extensions,
@@ -140,7 +140,7 @@
 %D [HH] This macro is now also moved to the core, but we
 %D keep it here as well for completeness.
 %D
-%D \startypen
+%D \starttyping
 %D \unexpanded\def\mathtext
 %D   {\mathortext\domathtext\hbox} % {\ifmmode\@EA\dotext\else\@EA\hbox\fi}
 %D
@@ -154,15 +154,15 @@
 %D \def\dodomathtext#1#2#3% no \everymath !
 %D  %{\hbox{\everymath{#1}\switchtobodyfont  [#2]#3}} % 15 sec
 %D   {\hbox{\everymath{#1}\setcurrentfontbody{#2}#3}} %  3 sec (no math)
-%D \stoptypen
+%D \stoptyping
 
 %D [HH] We use the following indirectness because \type {\text}
 %D is a natural candidate for user macros (actually, it is
 %D used in some modules).
 %D
-%D \starttypen
+%D \starttyping
 %D \let\text\mathtext
-%D \stoptypen
+%D \stoptyping
 
 %D [HH] Actually, the font switch is not that slow when
 %D typefaces are used. If needed this macro can be sped up.
diff --git a/tex/context/base/m-pdfsnc.tex b/tex/context/base/m-pdfsnc.tex
index 263596e6a..20a7fcc61 100644
--- a/tex/context/base/m-pdfsnc.tex
+++ b/tex/context/base/m-pdfsnc.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-pdfsnc,
+%D   [       filefile=m-pdfsnc,
 %D        version=2003.12.23,
 %D          title=\CONTEXT\ Modules,
 %D       subtitle=Editor Synchronization
@@ -197,4 +197,4 @@ some local \pdfsync sync and \pdfsynctext{here}a marked point
 some local \pdfsync sync and \pdfsyncnode{here}a marked point
 \stoplines
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/m-pictex.tex b/tex/context/base/m-pictex.tex
index 85ae90118..cfd1bc1ef 100644
--- a/tex/context/base/m-pictex.tex
+++ b/tex/context/base/m-pictex.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-pictex,
+%D   [       filefile=m-pictex,
 %D        version=1997.01.15,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\PICTEX\ Loading Macros,
@@ -70,9 +70,9 @@
 %D Therefore we can use \SKIPS\ as \DIMENSIONS. However, some
 %D incompatibility can result from assignments that look like:
 %D
-%D \starttypen
+%D \starttyping
 %D \somedimen=\someskip
-%D \stoptypen
+%D \stoptyping
 %D
 %D In such cases the \DIMENSION\ equals the fixed part of the
 %D \SKIP\ or in other words: this assignment strips off the
@@ -101,7 +101,7 @@
 %D and 71 \SKIPS\ are allocated. Indeed, \PICTEX\ needs 110
 %D \DIMENSIONS !
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \def\newdimen
 %D   {\ifnum\count11>\count12
 %D      \let\next\temporarynewskip
@@ -109,7 +109,7 @@
 %D      \let\next\temporarynewdimen
 %D    \fi
 %D    \next}
-%D \stoptypen
+%D \stoptyping
 %D 
 %D When I was testing a new version of \PPCHTEX\ in \PLAIN\
 %D \TEX\ I had to find out that this exchange of registers
@@ -117,23 +117,23 @@
 %D to find out that the source of errors originated in
 %D constructions like:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifdim\DimenOne<\DimenTwo whatever you want \else or not \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D When \type{\DimenOne} is a \SKIP\ and \type{\DimenTwo} is a
 %D \DIMENSION, \TEX\ scans for some optional glue component,
 %D like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \skip0=\dimen0 plus 10pt minus 5pt
-%D \stoptypen
+%D \stoptyping
 %D
 %D The most robust solution to this problem is:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifdim\DimenOne<\DimenTwo\relax right \else wrong \fi
-%D \stoptypen
+%D \stoptyping
 %D 
 %D Some close reading of the \PICTEX\ source however learned me
 %D that this problem could be solved best by just honoring the
diff --git a/tex/context/base/m-plus.tex b/tex/context/base/m-plus.tex
index 93e2521cb..1bc44495b 100644
--- a/tex/context/base/m-plus.tex
+++ b/tex/context/base/m-plus.tex
@@ -1,29 +1,29 @@
 %D \module
-%D   [       file=m-plus,
+%D   [       filefile=m-plus,
 %D        version=2003.03.16,
 %D          title=\CONTEXT\ Extra Modules,
-%D       subtitle=Loading extra features, 
+%D       subtitle=Loading extra features,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright=PRAGMA-ADE]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-%D Somewhere in 2001 I started collecting new functionality 
-%D in a module \type {m-yesno}. As the name suggests, I was 
-%D not entirely sure if this functionality belonged in the 
-%D kernel. When (again) on the \CONTEXT\ list a request for 
-%D side bars was posted, I decided to move such code to plus 
+%D Somewhere in 2001 I started collecting new functionality
+%D in a module \type {m-yesno}. As the name suggests, I was
+%D not entirely sure if this functionality belonged in the
+%D kernel. When (again) on the \CONTEXT\ list a request for
+%D side bars was posted, I decided to move such code to plus
 %D modules. Users who want this additional functionality can
-%D put the following call in their \type {cont-sys.tex} file: 
-%D 
+%D put the following call in their \type {cont-sys.tex} file:
+%D
 %D \starttyping
 %D \usemodule[plus]
-%D \stoptyping 
+%D \stoptyping
 
-\readfile {plus-rul} \donothing \donothing 
-\readfile {plus-pag} \donothing \donothing 
+\readfile {plus-rul} \donothing \donothing
+\readfile {plus-pag} \donothing \donothing
 
-\endinput 
+\endinput
diff --git a/tex/context/base/m-pstric.tex b/tex/context/base/m-pstric.tex
index bd87e9f13..4c78f9a94 100644
--- a/tex/context/base/m-pstric.tex
+++ b/tex/context/base/m-pstric.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-pstricks,
+%D   [       filefile=m-pstricks,
 %D        version=1997.01.15,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\PSTRICKS\ Connections,
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%M \usemodule[pstric]
+
 \chardef\oldbarcode\the\catcode`\|  \catcode`\|=12
 
 \def\loadpstrickscolors#1%
@@ -92,7 +94,7 @@
       % Since the graphic is put on a page (sigh) by dvips/gs
       % we need to shift it around a bit.
       \setbox\scratchbox\hbox
-        {\externalfigure[\bufferprefix pstricks.pdf][\c!object=\v!nee]}%
+        {\externalfigure[\bufferprefix pstricks.pdf][\c!object=\v!no]}%
       \setbox\scratchbox\hbox
         {\lower\ht\scratchbox\hbox{\raise\dimen2\box\scratchbox}}%
       \wd\scratchbox\dimen0
diff --git a/tex/context/base/m-quest.tex b/tex/context/base/m-quest.tex
index 5ea34164b..f1ebd1d9f 100644
--- a/tex/context/base/m-quest.tex
+++ b/tex/context/base/m-quest.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-invull,
+%D   [       filefile=m-invull,
 %D        version=1995.01.10,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Exercise,
@@ -153,10 +153,10 @@
 
 \def\dostelinvullenin[#1]%
   {\getparameters[\??iv][#1]%
-   \doif\@@ivstatus\v!reset
+   \doif\@@ivstate\v!reset
      {\global\invulput\zerocount
       \global\invulget\zerocount
-      \let\@@ivstatus\empty}}
+      \let\@@ivstate\empty}}
 
 \def\definieerinvulwoord
   {\dosingleempty\dodefinieerinvulwoord}
@@ -175,21 +175,21 @@
    \fi \fi}
 
 \def\dosimpleinvulwoord#1%
-  {\ifnum\@@ivnummer>0 \advance\invulteller \plusone \fi
-   \ifnum\invulteller=\@@ivnummer\relax
+  {\ifnum\@@ivnumber>0 \advance\invulteller \plusone \fi
+   \ifnum\invulteller=\@@ivnumber\relax
      \bgroup
-     \doconvertfont\@@ivletter
-       {\@@ivlinks
-        \doifelse\@@ivstatus\v!leeg
-          {\doifelse\@@ivlijn\v!aan\leeginvulwoord\geeninvulwoord}
-          {\doifelse\@@ivlijn\v!aan\underbar      \firstofoneargument}%
+     \doconvertfont\@@ivstyle
+       {\@@ivleft
+        \doifelse\@@ivstate\v!empty
+          {\doifelse\@@ivrule\v!on\leeginvulwoord\geeninvulwoord}
+          {\doifelse\@@ivrule\v!on\underbar      \firstofoneargument}%
         {#1}%
-        \@@ivrechts}%
+        \@@ivright}%
      \egroup
    \fi}%
 
 \def\simpleinvulwoord#1%
-  {\ifnum\@@ivnummer>0
+  {\ifnum\@@ivnumber>0
      \invulteller\zerocount
      \processcommalist[#1]\dosimpleinvulwoord
    \else
@@ -200,10 +200,10 @@
   {\bgroup
    \doifsomething{#1}
      {\global\advance\invulget \plusone
-      \doconvertfont\@@ivletter
-        {\@@ivlinks\getvalue{\r!fillin\the\invulget}\@@ivrechts}}
-     {\doconvertfont\@@ivletter
-        {\@@ivlinks\getvalue{\r!fillin           #1}\@@ivrechts}}%
+      \doconvertfont\@@ivstyle
+        {\@@ivleft\getvalue{\r!fillin\the\invulget}\@@ivright}}
+     {\doconvertfont\@@ivstyle
+        {\@@ivleft\getvalue{\r!fillin           #1}\@@ivright}}%
    \egroup}
 
 \definecomplexorsimple\invulwoord
@@ -220,11 +220,11 @@
 % when nummer > 0, then commalist processing; beware of $(1,2)$, use { } there
 
 \stelinvullenin
-  [\c!nummer=0,
-   \c!letter=\v!vet,
-   \c!lijn=\v!aan,
-   \c!links=,
-   \c!rechts=,
-   \c!status=]
-
-\protect \endinput
\ No newline at end of file
+  [\c!number=0,
+   \c!style=\v!bold,
+   \c!rule=\v!on,
+   \c!left=,
+   \c!right=,
+   \c!state=]
+
+\protect \endinput
diff --git a/tex/context/base/m-steps.tex b/tex/context/base/m-steps.tex
index b69aa7ecc..ce3cd4652 100644
--- a/tex/context/base/m-steps.tex
+++ b/tex/context/base/m-steps.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-steps,
+%D   [       filefile=m-steps,
 %D        version=2001.05.28,
 %D          title=\CONTEXT\ Modules,
 %D       subtitle=Step Charts \& Tables,
@@ -39,49 +39,49 @@
 \def\setupSTEPlines {\dodoubleargument\getparameters[\@@STEL]}
 
 \setupSTEPcharts
-  [\c!voor=\blanko,
-   \c!na=\blanko,
-  %\c!afstand=.25em, % nvt 
+  [\c!before=\blank,
+   \c!after=\blank,
+  %\c!distance=.25em, % nvt 
    \c!hoffset=1em,
    \c!voffset=1ex,
-   \c!methode=1,
-   \c!hoogte=2ex,
+   \c!method=1,
+   \c!height=2ex,
    \c!offset=.15\bodyfontsize]
 
 \setupSTEPtables
-  [\c!voor=\blanko,
-   \c!na=\blanko,
-   \c!afstand=.25em,
+  [\c!before=\blank,
+   \c!after=\blank,
+   \c!distance=.25em,
   %\c!hoffset=1em, % nvt 
    \c!voffset=1ex,
-   \c!methode=1,
-   \c!breedte=4em,
+   \c!method=1,
+   \c!width=4em,
    \c!offset=.15\bodyfontsize]
 
 \setupSTEPcells
-  [\c!variant=24,
-   \c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=STEPbackgroundcolor,
-   \c!lijndikte=.1\bodyfontsize,
-   \c!kaderkleur=STEPframecolor,
+  [\c!alternative=24,
+   \c!background=\v!color,
+   \c!backgroundcolor=STEPbackgroundcolor,
+   \c!rulethickness=.1\bodyfontsize,
+   \c!framecolor=STEPframecolor,
    \c!offset=.25\bodyfontsize,
-   \c!letter=,
-   \c!kleur=]
+   \c!style=,
+   \c!color=]
 
 \setupSTEPtexts
-  [\c!variant=24,
-   \c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=STEPbackgroundcolor,
-   \c!lijndikte=.1\bodyfontsize,
-   \c!kaderkleur=STEPframecolor,
+  [\c!alternative=24,
+   \c!background=\v!color,
+   \c!backgroundcolor=STEPbackgroundcolor,
+   \c!rulethickness=.1\bodyfontsize,
+   \c!framecolor=STEPframecolor,
    \c!offset=.25\bodyfontsize,
-   \c!letter=\v!kleinkorps,
-   \c!kleur=]
+   \c!style=\v!smallbodyfont,
+   \c!color=]
 
 \setupSTEPlines
-  [\c!variant=1,
-   \c!lijndikte=.15\bodyfontsize,
-   \c!kleur=STEPlinecolor]
+  [\c!alternative=1,
+   \c!rulethickness=.15\bodyfontsize,
+   \c!color=STEPlinecolor]
 
 \def\initializeSTEP
   {\initializeSTET \initializeSTEC \initializeSTEL}
@@ -90,26 +90,26 @@
   {\freezedimenmacro\@@STPCoffset
    \startMPdrawing
      line_v_offset := \@@STPCoffset  ;
-     line_method   := \@@STPCmethode ; % only charts 
+     line_method   := \@@STPCmethod ; % only charts 
    \stopMPdrawing}
 
 \def\initializeSTPT
   {\freezedimenmacro\@@STPToffset  
    \startMPdrawing
      line_h_offset := \@@STPToffset  ;
-     line_method   := \@@STPTmethode ; % only charts 
+     line_method   := \@@STPTmethod ; % only charts 
    \stopMPdrawing}
 
 \def\initializeSTET
-  {\freezedimenmacro\@@STETlijndikte
+  {\freezedimenmacro\@@STETrulethickness
    \freezedimenmacro\@@STEToffset}
 
 \def\initializeSTEC
-  {\freezedimenmacro\@@STEClijndikte
+  {\freezedimenmacro\@@STECrulethickness
    \freezedimenmacro\@@STECoffset}
 
 \def\initializeSTEL
-  {\freezedimenmacro\@@STELlijndikte}
+  {\freezedimenmacro\@@STELrulethickness}
 
 %D ... 
 
@@ -128,19 +128,19 @@
 \presetlocalframed[\@@STPF]
 
 \def\@@stepcell#1%
-  {\doattributes\@@STEC\c!letter\c!kleur
+  {\doattributes\@@STEC\c!style\c!color
      {\localframed
-         [\@@STPF][\c!offset=\@@STECoffset,\c!kader=\v!uit]
+         [\@@STPF][\c!offset=\@@STECoffset,\c!frame=\v!off]
          {\ignorespaces#1\unskip}}}
 
 \def\@@stepfake#1%
-  {\doattributes\@@STEC\c!letter\c!kleur
+  {\doattributes\@@STEC\c!style\c!color
      {\ignorespaces#1\unskip}}
 
 \def\@@steptext#1%
-  {\doattributes\@@STET\c!letter\c!kleur
+  {\doattributes\@@STET\c!style\c!color
      {\localframed
-         [\@@STPF][\c!offset=\@@STEToffset,\c!kader=\v!uit]
+         [\@@STPF][\c!offset=\@@STEToffset,\c!frame=\v!off]
          {\ignorespaces#1\unskip}}}
 
 %D The first attempt was purely \METAPOST\ based and spawned
@@ -151,7 +151,7 @@
 %D dependent definitions in the cells. The implementation
 %D roughly looks as follows: 
 %D 
-%D \starttypen
+%D \starttyping
 %D \def\startSTEPchart%
 %D   {\bgroup
 %D    \startMPdrawing
@@ -183,7 +183,7 @@
 %D    \getMPdrawing
 %D    \resetMPdrawing
 %D    \egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This method has the advantage that it does the job in
 %D (virtually) one pass, while the next methods need multiple
@@ -203,15 +203,15 @@
 %D typesetting. We show this alternative too because it
 %D demonstrates how to apply backgrounds to table cells. 
 %D 
-%D \starttypen
+%D \starttyping
 %D \newtoks\stepsonetop \newtoks\stepstwotop
 %D \newtoks\stepsonebot \newtoks\stepstwobot
-%D \stoptypen
+%D \stoptyping
 %D
 %D During the collecting phase, we temporarily have to
 %D increment the name space counter.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\startSTEPchart%
 %D   {\bgroup
 %D    \resetMPdrawing
@@ -228,7 +228,7 @@
 %D    \stepstwobot\emptytoks \chardef\somesteptwobot=1
 %D    \let\cells\stepchartcells \def\cell{\cells{}}%
 %D    \let\texts\stepcharttexts \def\text{\texts{}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Now we collect the steps and texts, and in the process the
 %D graphic is built. Then we continue with building the table.
@@ -239,7 +239,7 @@
 %D digest, even with the right tools (anchors) already in
 %D place.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\stopSTEPchart
 %D   {\splittabulatefalse
 %D    \insidefloattrue
@@ -270,13 +270,13 @@
 %D       \hskip-\scratchdimen
 %D       \hpos{\tbPOSprefix origin}{\box2}}
 %D    \egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The steps and texts fill the (at most 4) lines that make up
 %D the table. We also feed the (automatically registerd) cell
 %D dimensions to the graphic backend.
 %D
-%D \starttypen
+%D \starttyping
 %D \newcounter\cellcounter
 %D \newcounter\textcounter
 %D
@@ -343,15 +343,15 @@
 %D         texts[b][\cellcounter][\textcounter] := pxy ;
 %D       \stopMPdrawing
 %D       \@EA\appendtoks\@EA\NC\@EA\textcellposition\@EA{\stepidentifier}#2\to\stepstwobot}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here are the hooks that take care of calculating the cell
 %D dimensions.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\textcellposition#1{\GSC[#1:text]}
 %D \def\stepidentifierposition#1{\GSC[#1:step]}
-%D \stoptypen
+%D \stoptyping
 %D 
 %D We abandoned this method after some testing and went for 
 %D a third one. It was this third method that evolved into the 
@@ -360,7 +360,7 @@
 %D Since this method was not that efficient, a third one was
 %D implemented, which used one position per cell. So, 
 %D
-%D \blanko {\bf Here starts the real implementation!} \blanko
+%D \blank {\bf Here starts the real implementation!} \blank
 %D
 %D Because we want to build one graphic only we need to store
 %D the graphic directives. We also need to collect the cells,
@@ -397,8 +397,8 @@
 \long\def\dostartSTEPchart[#1]#2\stopSTEPchart
   {\ifinsidefloat 
    \else 
-     \witruimte 
-     \@@STPCvoor 
+     \whitespace 
+     \@@STPCbefore 
      \startbaselinecorrection 
      \setlocalhsize
      \noindent
@@ -450,13 +450,13 @@
      anchor_box(\MPpos{\stepchartprefix origin}) ;
    \stopMPdrawing
    \MPdrawingdonetrue
-   \doifelse\@@STPCmethode{0}
+   \doifelse\@@STPCmethod{0}
      {\setbox0\null}
      {\setbox0\vbox{\MPstaticgraphictrue\getMPdrawing}}%
    \resetMPdrawing
    \setbox2\vbox
      {\offinterlineskip
-      \scratchdimen\@@STPChoogte
+      \scratchdimen\@@STPCheight
       \advance\scratchdimen\@@STPCoffset 
       \advance\scratchdimen\@@STPCoffset
       \ifcase\sometextboxone \box\textboxone \vskip\scratchdimen  \fi
@@ -475,7 +475,7 @@
       \hpos{\stepchartprefix origin}{\box2}}%
    \popMPdrawing
    \egroup
-   \ifinsidefloat \else \stopbaselinecorrection \@@STPCna \fi}
+   \ifinsidefloat \else \stopbaselinecorrection \@@STPCafter \fi}
 
 %D The next macro looks more complicated than it is. We collect
 %D the cells in boxes. Before adding a new step cell, we padd
@@ -556,9 +556,9 @@
 
 \def\MPcellsgraphic
   {image ( drawshape (
-     \@@STECvariant, pxy enlarged (-.5*\@@STECoffset),
-     \@@STEClijndikte, \MPcolor{\@@STECkaderkleur},
-     \MPcolor{\@@STECachtergrondkleur} ) )}
+     \@@STECalternative, pxy enlarged (-.5*\@@STECoffset),
+     \@@STECrulethickness, \MPcolor{\@@STECframecolor},
+     \MPcolor{\@@STECbackgroundcolor} ) )}
 
 %D Although each step can have only one associated text, the
 %D place where the text is defined determines the starting
@@ -647,19 +647,19 @@
 
 \def\MPtextsgraphic
   {image(drawshape(
-     \@@STETvariant, pxy enlarged (-.5*\@@STEToffset),
-     \@@STETlijndikte, \MPcolor{\@@STETkaderkleur},
-     \MPcolor{\@@STETachtergrondkleur} ) )}
+     \@@STETalternative, pxy enlarged (-.5*\@@STEToffset),
+     \@@STETrulethickness, \MPcolor{\@@STETframecolor},
+     \MPcolor{\@@STETbackgroundcolor} ) )}
 
 \def\MPcharttoplinesgraphic#1#2%
   {image(drawline(
-     \@@STELvariant, get_step_chart_top_line(#1,#2),  
-     \@@STELlijndikte, \MPcolor{\@@STELkleur} ) )}
+     \@@STELalternative, get_step_chart_top_line(#1,#2),  
+     \@@STELrulethickness, \MPcolor{\@@STELcolor} ) )}
 
 \def\MPchartbotlinesgraphic#1#2%
   {image(drawline( 
-     \@@STELvariant, get_step_chart_bot_line(#1,#2), 
-     \@@STELlijndikte, \MPcolor{\@@STELkleur} ) )}
+     \@@STELalternative, get_step_chart_bot_line(#1,#2), 
+     \@@STELrulethickness, \MPcolor{\@@STELcolor} ) )}
 
 %D \XML\ coupling. 
 
@@ -704,8 +704,8 @@
 \def\dostartSTEPaligntable[#1][#2]#3\stopSTEPaligntable % flag settings data
   {\ifinsidefloat 
    \else 
-     \witruimte    
-     \@@STPTvoor 
+     \whitespace    
+     \@@STPTbefore 
      \startbaselinecorrection 
      \setlocalhsize
      \noindent
@@ -779,12 +779,12 @@
      anchor_box(\MPpos{\steptableprefix origin}) ;
    \stopMPdrawing
    \MPdrawingdonetrue
-   \doifelse\@@STPTmethode{0}
+   \doifelse\@@STPTmethod{0}
      {\setbox0\null}
      {\setbox0\vbox{\MPstaticgraphictrue\getMPdrawing}}%
    \resetMPdrawing
    % typesetting pass 
-   \dimen6=\@@STPTafstand \dimen6=2\dimen6
+   \dimen6=\@@STPTdistance \dimen6=2\dimen6
    % cell width
    \dimen8=\dimen1
    \advance\dimen8\dimen3
@@ -792,7 +792,7 @@
    % offset width
    \ifcase#1\else \advance\dimen8 \dimen6 \fi
    % arrow width
-   \advance\dimen8 \@@STPTbreedte
+   \advance\dimen8 \@@STPTwidth
    \advance\dimen8 \@@STPToffset
    \advance\dimen8 \@@STPToffset
    \def\docells[##1]##2##3##4%
@@ -801,8 +801,8 @@
         {\hbox to \dimen####1{####2\@@stepfake{####3}\strut####4}}%
       \setbox8\hbox
         {\ifcase#1\else
-           \do1\hss{##2}\relax \hskip\@@STPTafstand 
-           \do3\hss{##3}\hss   \hskip\@@STPTafstand 
+           \do1\hss{##2}\relax \hskip\@@STPTdistance 
+           \do3\hss{##3}\hss   \hskip\@@STPTdistance 
          \fi
          \do5\relax{##4}\hss}%
      \hpos{\steptableprefix\cellcounter-c}{\@@stepcell{\box8}}
@@ -836,12 +836,12 @@
       \hpos{\steptableprefix origin}{\box2}}
   \popMPdrawing
   \egroup
-  \ifinsidefloat \else \stopbaselinecorrection \@@STPTna \fi}
+  \ifinsidefloat \else \stopbaselinecorrection \@@STPTafter \fi}
 
 \def\MPtablelinesgraphic
   {image ( drawline ( 
-     \@@STELvariant, get_step_table_line(\cellcounter), 
-     \@@STELlijndikte, \MPcolor{\@@STELkleur} ) )}
+     \@@STELalternative, get_step_table_line(\cellcounter), 
+     \@@STELrulethickness, \MPcolor{\@@STELcolor} ) )}
 
 \defineXMLpickup[steptable][@@STPT]
   {\bgroup
diff --git a/tex/context/base/m-tryout.tex b/tex/context/base/m-tryout.tex
index 23fc56c8c..b50525e6b 100644
--- a/tex/context/base/m-tryout.tex
+++ b/tex/context/base/m-tryout.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-tryout,
+%D   [       filefile=m-tryout,
 %D        version=2002.05.10,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Tryout Features,
@@ -16,9 +16,9 @@
 %D The following macros make sure that active colons work well
 %D in French, a feature enabled with:
 %D
-%D \starttypen
+%D \starttyping
 %D \useencoding[ffr] \mainlanguage[fr]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This trick will disappear when proved robust.
 
@@ -48,4 +48,4 @@
 
 \stopmode
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/m-units.tex b/tex/context/base/m-units.tex
index c0b0222d8..851560418 100644
--- a/tex/context/base/m-units.tex
+++ b/tex/context/base/m-units.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-units,
+%D   [       filefile=m-units,
 %D        version=1997.03.19,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Scientific Units,
@@ -17,9 +17,9 @@
 %D wanted. Therefore this module presents a more natural way of
 %D doing things, like:
 %D
-%D \starttypen
+%D \starttyping
 %D 1.23 \Cubic \Meter \Per \Second
-%D \stoptypen
+%D \stoptyping
 %D
 %D This example shows that we use the order in which we say
 %D things, instead of typeset things. There is a separate
@@ -70,7 +70,7 @@
 %D some 10 \Square \Meter \Per \Second or more
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D as:
 %D
@@ -78,10 +78,10 @@
 %D
 %D The units itself are implemented as synonyms.
 %D
-%D \starttypen
+%D \starttyping
 %D \definesynonyms [unit] [units] [\unitmeaning]
-%D \stelsynoniemenin [unit] [textstyle=\dimension]
-%D \stoptypen
+%D \setupsynonyms [unit] [textstyle=\dimension]
+%D \stoptyping
 %D
 %D This definition means that we can ask for the meaning of a
 %D unit using \type {\unitmeaning} and get a list of used
@@ -119,7 +119,7 @@
 %D
 %D Becomes:
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D \macros
 %D   {mathematicstypeface, dimensiontypeface,
@@ -165,19 +165,19 @@
 \newif\ifspaceddimensions \spaceddimensionsfalse % user switch
 \newif\iftextdimensions   \textdimensionsfalse   % user switch
 
-%D You can see the consequence of forcing text dimensions 
-%D when you compare the following code: 
+%D You can see the consequence of forcing text dimensions
+%D when you compare the following code:
 %D
 %D \starttyping
-%D {\rm test \Square \Meter \Per \Second\ ziezo\Degrees} \par 
-%D {\ss test \Square \Meter \Per \Second\ ziezo} \par 
-%D {\tt test \Square \Meter \Per \Second\ ziezo}  
-%D 
+%D {\rm test \Square \Meter \Per \Second\ ziezo\Degrees} \par
+%D {\ss test \Square \Meter \Per \Second\ ziezo} \par
+%D {\tt test \Square \Meter \Per \Second\ ziezo}
+%D
 %D \textdimensionstrue
-%D 
-%D {\rm test \Square \Meter \Per \Second\ ziezo} \par 
-%D {\ss test \Square \Meter \Per \Second\ ziezo} \par 
-%D {\tt test \Square \Meter \Per \Second\ ziezo}  
+%D
+%D {\rm test \Square \Meter \Per \Second\ ziezo} \par
+%D {\ss test \Square \Meter \Per \Second\ ziezo} \par
+%D {\tt test \Square \Meter \Per \Second\ ziezo}
 %D \stoptyping
 
 \newif\ifnesteddimension  \nesteddimensionfalse  % local switch
@@ -194,8 +194,8 @@
 \def\udimensionhalfspace {\dodimensionspace\dimensionhalfspace}
 \def\udimensionbackspace {\dodimensionspace\dimensionbackspace}
 
-\def\dodimensionspace 
-  {\iftextdimensions 
+\def\dodimensionspace
+  {\iftextdimensions
      \begingroup
      \setbox0=\hbox{i}%
      \setbox2=\hbox{m}%
@@ -263,7 +263,7 @@
    \global\let\thedimensionprefix\empty
    \global\let\thedimensionpower\empty}
 
-%D \macro
+%D \macros
 %D   {dontbreakdimension,
 %D    dimensionprefix, dimensionaddfix,
 %D    dimensionnopfix, dimensionmidfix,
@@ -319,7 +319,7 @@
 \def\dimensionpower#1%
   {\gdef\thedimensionpower{#1}}
 
-%D \macro
+%D \macros
 %D   {SIunits, noSI, doSI}
 %D
 %D Some low level unit switching macros:
@@ -336,7 +336,7 @@
 
 \def\Degrees{\dimensionaddfix{\mathematics{^\circ}}}
 
-%D \macro
+%D \macros
 %D   {Unit, NoUnit}
 %D
 %D When a dimension has no leading number, we can use \type
@@ -362,7 +362,7 @@
 \def\Kilo    {\dimensionprefix{k}}
 \def\Mega    {\dimensionprefix{M}}
 \def\Giga    {\dimensionprefix{G}}
-\def\Terra   {\dimensionprefix{T}} % for old times sake 
+\def\Terra   {\dimensionprefix{T}} % for old times sake
 \def\Tera    {\dimensionprefix{T}}
 \def\Peta    {\dimensionprefix{P}}
 \def\Exa     {\dimensionprefix{E}}
@@ -389,39 +389,39 @@
 %D defined using the synonym mechanism. First we define some
 %D length and volume related units.
 
-\getvalue{\v!eenheid} [Meter]  {m}             {meter}
-\getvalue{\v!eenheid} [pMeter] {\Pico  \Meter} {picometer}
-\getvalue{\v!eenheid} [nMeter] {\Nano  \Meter} {nanometer}
-\getvalue{\v!eenheid} [uMeter] {\Micro \Meter} {micrometer}
-\getvalue{\v!eenheid} [mMeter] {\Milli \Meter} {millimeter}
-\getvalue{\v!eenheid} [cMeter] {\Centi \Meter} {centimeter}
-\getvalue{\v!eenheid} [dMeter] {\Deci  \Meter} {decimeter}
-\getvalue{\v!eenheid} [hMeter] {\Hecto \Meter} {hectometer}
-\getvalue{\v!eenheid} [kMeter] {\Kilo  \Meter} {kilometer}
+\getvalue{\v!unit} [Meter]  {m}             {meter}
+\getvalue{\v!unit} [pMeter] {\Pico  \Meter} {picometer}
+\getvalue{\v!unit} [nMeter] {\Nano  \Meter} {nanometer}
+\getvalue{\v!unit} [uMeter] {\Micro \Meter} {micrometer}
+\getvalue{\v!unit} [mMeter] {\Milli \Meter} {millimeter}
+\getvalue{\v!unit} [cMeter] {\Centi \Meter} {centimeter}
+\getvalue{\v!unit} [dMeter] {\Deci  \Meter} {decimeter}
+\getvalue{\v!unit} [hMeter] {\Hecto \Meter} {hectometer}
+\getvalue{\v!unit} [kMeter] {\Kilo  \Meter} {kilometer}
 
 %D After some discussion on the \CONTEXT\ mailing list in
 %D february 2002 it was decided to go from L to l for liters
 %D (Karel Wesselings alternative: \mathematics{\ell}).
 
-\getvalue{\v!eenheid} [Liter]  {l}             {liter}
-\getvalue{\v!eenheid} [mLiter] {\Milli \Liter} {milliliter}
-\getvalue{\v!eenheid} [cLiter] {\Centi \Liter} {centiliter}
-\getvalue{\v!eenheid} [dLiter] {\Deci  \Liter} {deciliter}
+\getvalue{\v!unit} [Liter]  {l}             {liter}
+\getvalue{\v!unit} [mLiter] {\Milli \Liter} {milliliter}
+\getvalue{\v!unit} [cLiter] {\Centi \Liter} {centiliter}
+\getvalue{\v!unit} [dLiter] {\Deci  \Liter} {deciliter}
 
 %D Next we define time related units (\type {\ifSI} still dutch only).
 
-\getvalue{\v!eenheid} [Sec]   {s}                       {\labeltext{u:sec}}
-\getvalue{\v!eenheid} [fSec]  {\Femto \Sec}             {\labeltext{u:fsec}}
-\getvalue{\v!eenheid} [pSec]  {\Pico \Sec}              {\labeltext{u:psec}}
-\getvalue{\v!eenheid} [nSec]  {\Nano \Sec}              {\labeltext{u:nsec}}
-\getvalue{\v!eenheid} [uSec]  {\Micro \Sec}             {\labeltext{u:usec}}
-\getvalue{\v!eenheid} [mSec]  {\Milli \Sec}             {\labeltext{u:msec}}
-\getvalue{\v!eenheid} [Year]  {\ifSIunits a \else j\fi} {\labeltext{u:year}}
-\getvalue{\v!eenheid} [Month] {m}                       {\labeltext{u:month}}
-\getvalue{\v!eenheid} [Week]  {w}                       {\labeltext{u:week}}
-\getvalue{\v!eenheid} [Day]   {d}                       {\labeltext{u:day}}
-\getvalue{\v!eenheid} [Hour]  {\ifSIunits h \else u\fi} {\labeltext{u:hour}}
-\getvalue{\v!eenheid} [Min]   {min}                     {\labeltext{u:min}}
+\getvalue{\v!unit} [Sec]   {s}                       {\labeltext{u:sec}}
+\getvalue{\v!unit} [fSec]  {\Femto \Sec}             {\labeltext{u:fsec}}
+\getvalue{\v!unit} [pSec]  {\Pico \Sec}              {\labeltext{u:psec}}
+\getvalue{\v!unit} [nSec]  {\Nano \Sec}              {\labeltext{u:nsec}}
+\getvalue{\v!unit} [uSec]  {\Micro \Sec}             {\labeltext{u:usec}}
+\getvalue{\v!unit} [mSec]  {\Milli \Sec}             {\labeltext{u:msec}}
+\getvalue{\v!unit} [Year]  {\ifSIunits a \else j\fi} {\labeltext{u:year}}
+\getvalue{\v!unit} [Month] {m}                       {\labeltext{u:month}}
+\getvalue{\v!unit} [Week]  {w}                       {\labeltext{u:week}}
+\getvalue{\v!unit} [Day]   {d}                       {\labeltext{u:day}}
+\getvalue{\v!unit} [Hour]  {\ifSIunits h \else u\fi} {\labeltext{u:hour}}
+\getvalue{\v!unit} [Min]   {min}                     {\labeltext{u:min}}
 
 \setuplabeltext
   [\s!nl]
@@ -485,8 +485,8 @@
 
 %D Then we define some angles.
 
-\getvalue{\v!eenheid} [Rad] {rad}                    {\labeltext{u:rad}}
-\getvalue{\v!eenheid} [Deg] {{\mathematics{^\circ}}} {\labeltext{u:deg}}
+\getvalue{\v!unit} [Rad] {rad}                    {\labeltext{u:rad}}
+\getvalue{\v!unit} [Deg] {{\mathematics{^\circ}}} {\labeltext{u:deg}}
 
 \setuplabeltext
   [\s!nl]
@@ -510,15 +510,15 @@
 
 %D Rotation and frequency related units are defined by:
 
-\getvalue{\v!eenheid} [Hertz]     {Hz}            {Hertz}
-\getvalue{\v!eenheid} [kHertz]    {\Kilo  \Hertz} {kilo Hertz}
-\getvalue{\v!eenheid} [MHertz]    {\Mega  \Hertz} {mega Hertz}
-\getvalue{\v!eenheid} [GHertz]    {\Giga  \Hertz} {giga Hertz}
-\getvalue{\v!eenheid} [THertz]    {\Tera  \Hertz} {tera Hertz}
-\getvalue{\v!eenheid} [mHertz]    {\Milli \Hertz} {milli Hertz}
+\getvalue{\v!unit} [Hertz]     {Hz}            {Hertz}
+\getvalue{\v!unit} [kHertz]    {\Kilo  \Hertz} {kilo Hertz}
+\getvalue{\v!unit} [MHertz]    {\Mega  \Hertz} {mega Hertz}
+\getvalue{\v!unit} [GHertz]    {\Giga  \Hertz} {giga Hertz}
+\getvalue{\v!unit} [THertz]    {\Tera  \Hertz} {tera Hertz}
+\getvalue{\v!unit} [mHertz]    {\Milli \Hertz} {milli Hertz}
 
-\getvalue{\v!eenheid} [RevPerSec] {RPS} {\labeltext{u:rps}}
-\getvalue{\v!eenheid} [RevPerMin] {RPM} {\labeltext{u:rpm}}
+\getvalue{\v!unit} [RevPerSec] {RPS} {\labeltext{u:rps}}
+\getvalue{\v!unit} [RevPerMin] {RPM} {\labeltext{u:rpm}}
 
 \setuplabeltext
   [\s!nl]
@@ -542,18 +542,18 @@
 
 %D Mass and force:
 
-\getvalue{\v!eenheid} [Gram]    {g}              {gram}
-\getvalue{\v!eenheid} [uGram]   {\Micro \Gram}   {microgram}
-\getvalue{\v!eenheid} [mGram]   {\Milli \Gram}   {milligram}
-\getvalue{\v!eenheid} [kGram]   {\Kilo  \Gram}   {kilogram}
-\getvalue{\v!eenheid} [Atom]    {u}              {\labeltext{u:u}}
+\getvalue{\v!unit} [Gram]    {g}              {gram}
+\getvalue{\v!unit} [uGram]   {\Micro \Gram}   {microgram}
+\getvalue{\v!unit} [mGram]   {\Milli \Gram}   {milligram}
+\getvalue{\v!unit} [kGram]   {\Kilo  \Gram}   {kilogram}
+\getvalue{\v!unit} [Atom]    {u}              {\labeltext{u:u}}
 
-\getvalue{\v!eenheid} [Newton]  {N}              {Newton}
-\getvalue{\v!eenheid} [kNewton] {\Kilo \Newton}  {kilo Newton}
+\getvalue{\v!unit} [Newton]  {N}              {Newton}
+\getvalue{\v!unit} [kNewton] {\Kilo \Newton}  {kilo Newton}
 
-\getvalue{\v!eenheid} [Pascal]  {Pa}             {Pascal}
-\getvalue{\v!eenheid} [mPascal] {\Milli \Pascal} {milli Pascal}
-\getvalue{\v!eenheid} [kPascal] {\Kilo  \Pascal} {kilo Pascal}
+\getvalue{\v!unit} [Pascal]  {Pa}             {Pascal}
+\getvalue{\v!unit} [mPascal] {\Milli \Pascal} {milli Pascal}
+\getvalue{\v!unit} [kPascal] {\Kilo  \Pascal} {kilo Pascal}
 
 \setuplabeltext
   [\s!nl]
@@ -573,65 +573,65 @@
 
 %D Energy units comes in two alternatives:
 
-\getvalue{\v!eenheid} [Joule]  {J}             {Joule}
-\getvalue{\v!eenheid} [mJoule] {\Milli \Joule} {milli Joule}
-\getvalue{\v!eenheid} [kJoule] {\Kilo  \Joule} {kilo Joule}
-\getvalue{\v!eenheid} [MJoule] {\Mega  \Joule} {mega Joule}
-\getvalue{\v!eenheid} [GJoule] {\Giga  \Joule} {giga Joule}
+\getvalue{\v!unit} [Joule]  {J}             {Joule}
+\getvalue{\v!unit} [mJoule] {\Milli \Joule} {milli Joule}
+\getvalue{\v!unit} [kJoule] {\Kilo  \Joule} {kilo Joule}
+\getvalue{\v!unit} [MJoule] {\Mega  \Joule} {mega Joule}
+\getvalue{\v!unit} [GJoule] {\Giga  \Joule} {giga Joule}
 
-\getvalue{\v!eenheid} [Watt]  {W}              {Watt}
-\getvalue{\v!eenheid} [mWatt] {\Milli \Watt}   {milli Watt}
-\getvalue{\v!eenheid} [kWatt] {\Kilo  \Watt}   {kilo Watt}
-\getvalue{\v!eenheid} [MWatt] {\Mega  \Watt}   {mega Watt}
-\getvalue{\v!eenheid} [GWatt] {\Giga  \Watt}   {giga Watt}
-\getvalue{\v!eenheid} [TWatt] {\Tera  \Watt}   {tera Watt}
+\getvalue{\v!unit} [Watt]  {W}              {Watt}
+\getvalue{\v!unit} [mWatt] {\Milli \Watt}   {milli Watt}
+\getvalue{\v!unit} [kWatt] {\Kilo  \Watt}   {kilo Watt}
+\getvalue{\v!unit} [MWatt] {\Mega  \Watt}   {mega Watt}
+\getvalue{\v!unit} [GWatt] {\Giga  \Watt}   {giga Watt}
+\getvalue{\v!unit} [TWatt] {\Tera  \Watt}   {tera Watt}
 
 %D Although Celsius is no longer permitted, we define it by
 %D saying:
 
-\getvalue{\v!eenheid} [Celsius]    {C} {Celsius}
-\getvalue{\v!eenheid} [Kelvin]     {K} {Kelvin}
-\getvalue{\v!eenheid} [Fahrenheit] {F} {Fahrenheit}
+\getvalue{\v!unit} [Celsius]    {C} {Celsius}
+\getvalue{\v!unit} [Kelvin]     {K} {Kelvin}
+\getvalue{\v!unit} [Fahrenheit] {F} {Fahrenheit}
 
 %D Some chemic related units are:
 
-\getvalue{\v!eenheid} [Mol]         {mol}                {mol}
-\getvalue{\v!eenheid} [mMol]        {\Milli \Mol}        {millimol}
-\getvalue{\v!eenheid} [kMol]        {\Kilo  \Mol}        {kilomol}
-\getvalue{\v!eenheid} [Molair]      {M}                  {molair (\Mol \Per \Liter)}
-\getvalue{\v!eenheid} [Equivalent]  {eq}                 {equivalent}
-\getvalue{\v!eenheid} [mEquivalent] {\Milli \Equivalent} {milli equivalent}
+\getvalue{\v!unit} [Mol]         {mol}                {mol}
+\getvalue{\v!unit} [mMol]        {\Milli \Mol}        {millimol}
+\getvalue{\v!unit} [kMol]        {\Kilo  \Mol}        {kilomol}
+\getvalue{\v!unit} [Molair]      {M}                  {molair (\Mol \Per \Liter)}
+\getvalue{\v!unit} [Equivalent]  {eq}                 {equivalent}
+\getvalue{\v!unit} [mEquivalent] {\Milli \Equivalent} {milli equivalent}
 
 %D There are quite a lot units related to electricity and
 %D magnetism:
 
-\getvalue{\v!eenheid} [Farad]   {F}             {Farad}
-\getvalue{\v!eenheid} [pFarad]  {\Pico  \Farad} {pico Farad}
-\getvalue{\v!eenheid} [nFarad]  {\Nano  \Farad} {nano Farad}
-\getvalue{\v!eenheid} [uFarad]  {\Micro \Farad} {micro Farad}
-\getvalue{\v!eenheid} [mFarad]  {\Milli \Farad} {milli Farad}
+\getvalue{\v!unit} [Farad]   {F}             {Farad}
+\getvalue{\v!unit} [pFarad]  {\Pico  \Farad} {pico Farad}
+\getvalue{\v!unit} [nFarad]  {\Nano  \Farad} {nano Farad}
+\getvalue{\v!unit} [uFarad]  {\Micro \Farad} {micro Farad}
+\getvalue{\v!unit} [mFarad]  {\Milli \Farad} {milli Farad}
 
-\getvalue{\v!eenheid} [Ohm]     {\Omega}        {Ohm}
-\getvalue{\v!eenheid} [kOhm]    {\Kilo \Ohm}    {kilo Ohm}
+\getvalue{\v!unit} [Ohm]     {\Omega}        {Ohm}
+\getvalue{\v!unit} [kOhm]    {\Kilo \Ohm}    {kilo Ohm}
 
-\getvalue{\v!eenheid} [Siemens] {S}              {Siemens}
+\getvalue{\v!unit} [Siemens] {S}              {Siemens}
 
-\getvalue{\v!eenheid} [Ampere]  {A}              {Amp\`ere}
-\getvalue{\v!eenheid} [mAmpere] {\Milli \Ampere} {milli Amp\`ere}
+\getvalue{\v!unit} [Ampere]  {A}              {Amp\`ere}
+\getvalue{\v!unit} [mAmpere] {\Milli \Ampere} {milli Amp\`ere}
 
-\getvalue{\v!eenheid} [Coulomb] {C}              {Coulomb}
+\getvalue{\v!unit} [Coulomb] {C}              {Coulomb}
 
-\getvalue{\v!eenheid} [Volt]    {V}              {Volt}
-\getvalue{\v!eenheid} [mVolt]   {\Milli \Volt}   {milli Volt}
-\getvalue{\v!eenheid} [kVolt]   {\Kilo  \Volt}   {kilo Volt}
-\getvalue{\v!eenheid} [eVolt]   {eV}             {electronvolt}
-\getvalue{\v!eenheid} [keVolt]  {\Kilo \eVolt}   {kilo electronvolt}
-\getvalue{\v!eenheid} [MeVolt]  {\Mega \eVolt}   {mega electronvolt}
+\getvalue{\v!unit} [Volt]    {V}              {Volt}
+\getvalue{\v!unit} [mVolt]   {\Milli \Volt}   {milli Volt}
+\getvalue{\v!unit} [kVolt]   {\Kilo  \Volt}   {kilo Volt}
+\getvalue{\v!unit} [eVolt]   {eV}             {electronvolt}
+\getvalue{\v!unit} [keVolt]  {\Kilo \eVolt}   {kilo electronvolt}
+\getvalue{\v!unit} [MeVolt]  {\Mega \eVolt}   {mega electronvolt}
 
-\getvalue{\v!eenheid} [Tesla]   {T}              {Tesla}
+\getvalue{\v!unit} [Tesla]   {T}              {Tesla}
 
-\getvalue{\v!eenheid} [VoltAC]  {V_{\xbox{ac}}}  {\labeltext{u:vac}}
-\getvalue{\v!eenheid} [VoltDC]  {V_{\xbox{dc}}}  {\labeltext{u:vdc}}
+\getvalue{\v!unit} [VoltAC]  {V_{\xbox{ac}}}  {\labeltext{u:vac}}
+\getvalue{\v!unit} [VoltDC]  {V_{\xbox{dc}}}  {\labeltext{u:vdc}}
 
 \setuplabeltext
   [\s!nl]
@@ -655,61 +655,61 @@
 
 %D Computer memory is specified in Bytes:
 
-\getvalue{\v!eenheid} [Baud]  {Baud}        {Baud (Bit/s)}
-\getvalue{\v!eenheid} [Bit]   {Bit}         {Bit}
+\getvalue{\v!unit} [Baud]  {Baud}        {Baud (Bit/s)}
+\getvalue{\v!unit} [Bit]   {Bit}         {Bit}
 
-\getvalue{\v!eenheid} [Byte]  {Byte}        {Byte}
-\getvalue{\v!eenheid} [kByte] {\Kilo \Byte} {kilo Byte}
-\getvalue{\v!eenheid} [MByte] {\Mega \Byte} {mega Byte}
-\getvalue{\v!eenheid} [GByte] {\Giga \Byte} {giga Byte}
-\getvalue{\v!eenheid} [TByte] {\Tera \Byte} {tera Byte}
+\getvalue{\v!unit} [Byte]  {Byte}        {Byte}
+\getvalue{\v!unit} [kByte] {\Kilo \Byte} {kilo Byte}
+\getvalue{\v!unit} [MByte] {\Mega \Byte} {mega Byte}
+\getvalue{\v!unit} [GByte] {\Giga \Byte} {giga Byte}
+\getvalue{\v!unit} [TByte] {\Tera \Byte} {tera Byte}
 
 %D Some radiation related units:
 
-\getvalue{\v!eenheid} [Bequerel]  {Bq}              {Bequerel}
-\getvalue{\v!eenheid} [MBequerel] {\Mega \Bequerel} {Bequerel}
-\getvalue{\v!eenheid} [Sievert]   {Sv}              {Sievert}
-\getvalue{\v!eenheid} [mSievert]  {\Milli \Sievert} {milli Sievert}
+\getvalue{\v!unit} [Bequerel]  {Bq}              {Bequerel}
+\getvalue{\v!unit} [MBequerel] {\Mega \Bequerel} {Bequerel}
+\getvalue{\v!unit} [Sievert]   {Sv}              {Sievert}
+\getvalue{\v!unit} [mSievert]  {\Milli \Sievert} {milli Sievert}
 
 %D Light:
 
-\getvalue{\v!eenheid} [Candela] {cd} {Candela}
+\getvalue{\v!unit} [Candela] {cd} {Candela}
 
 %D and some sound ones:
 
-\getvalue{\v!eenheid} [Bell]  {B}           {Bell}
-\getvalue{\v!eenheid} [dBell] {\Deci \Bell} {decibel}
+\getvalue{\v!unit} [Bell]  {B}           {Bell}
+\getvalue{\v!unit} [dBell] {\Deci \Bell} {decibel}
 
 %D We also define some non||regular, sometimes even forbidden,
 %D units:
 
-\getvalue{\v!eenheid} [At]    {at}         {\labeltext{u:at}}
-\getvalue{\v!eenheid} [Atm]   {atm}        {\labeltext{u:atm}}
-\getvalue{\v!eenheid} [Bar]   {bar}        {bar (100 \Kilo \Pascal)}
-\getvalue{\v!eenheid} [EVolt] {eV}         {electronvolt}
-\getvalue{\v!eenheid} [Foot]  {ft}         {\labeltext{u:ft}}
-\getvalue{\v!eenheid} [Inch]  {inch}       {inch}
-\getvalue{\v!eenheid} [Cal]   {cal}        {\labeltext{u:cal}}
-\getvalue{\v!eenheid} [Force] {f}          {\labeltext{u:f}}
-\getvalue{\v!eenheid} [kCal]  {\Kilo \Cal} {\labeltext{u:kcal}}
-\getvalue{\v!eenheid} [Lux]   {lux}        {lux}
+\getvalue{\v!unit} [At]    {at}         {\labeltext{u:at}}
+\getvalue{\v!unit} [Atm]   {atm}        {\labeltext{u:atm}}
+\getvalue{\v!unit} [Bar]   {bar}        {bar (100 \Kilo \Pascal)}
+\getvalue{\v!unit} [EVolt] {eV}         {electronvolt}
+\getvalue{\v!unit} [Foot]  {ft}         {\labeltext{u:ft}}
+\getvalue{\v!unit} [Inch]  {inch}       {inch}
+\getvalue{\v!unit} [Cal]   {cal}        {\labeltext{u:cal}}
+\getvalue{\v!unit} [Force] {f}          {\labeltext{u:f}}
+\getvalue{\v!unit} [kCal]  {\Kilo \Cal} {\labeltext{u:kcal}}
+\getvalue{\v!unit} [Lux]   {lux}        {lux}
 
 
 \def\xPercent {\dimensionaddfix{\percent }}
 \def\xPromille{\dimensionaddfix{\promille}}
 
-\getvalue{\v!eenheid} [Percent]  {\xPercent } {percent}
-\getvalue{\v!eenheid} [Permille] {\xPromille} {promille}
-\getvalue{\v!eenheid} [Promille] {\xPromille} {promille}
+\getvalue{\v!unit} [Percent]  {\xPercent } {percent}
+\getvalue{\v!unit} [Permille] {\xPromille} {promille}
+\getvalue{\v!unit} [Promille] {\xPromille} {promille}
 
 %D Some more, thanks to Tobias:
 
-\getvalue{\v!eenheid} [Gray]     {Gr}  {Gray}
-\getvalue{\v!eenheid} [Weber]    {Wb}  {Weber}
-\getvalue{\v!eenheid} [Henry]    {H}   {Henry}
-\getvalue{\v!eenheid} [Sterant]  {sr}  {Sterant}
-\getvalue{\v!eenheid} [Angstrom] {\hbox{\Aring}} {\Aring ngstr\"om}
-\getvalue{\v!eenheid} [Gauss]    {G}   {Gauss}
+\getvalue{\v!unit} [Gray]     {Gr}  {Gray}
+\getvalue{\v!unit} [Weber]    {Wb}  {Weber}
+\getvalue{\v!unit} [Henry]    {H}   {Henry}
+\getvalue{\v!unit} [Sterant]  {sr}  {Sterant}
+\getvalue{\v!unit} [Angstrom] {\hbox{\Aring}} {\Aring ngstr\"om}
+\getvalue{\v!unit} [Gauss]    {G}   {Gauss}
 
 \setuplabeltext
   [\s!nl]
@@ -771,20 +771,20 @@
 
 \startinterface dutch
 
-  \getvalue{\v!eenheid} [PaardenKracht] {pk}                 {paardenkracht}
-  \getvalue{\v!eenheid} [Duits]         {D}                  {duits}
-  \getvalue{\v!eenheid} [Kwik]          {Hg}                 {kwikkolom}
-  \getvalue{\v!eenheid} [Hectare]       {ha}                 {hectare}
-  \getvalue{\v!eenheid} [kGramForce]    {\Kilo \Gram \Force} {kilogramforce}
-  \getvalue{\v!eenheid} [kWattUur]      {\Kilo \Watt \Uur}   {kilowattuur}
-  \getvalue{\v!eenheid} [MeterKwik]     {\Meter \Kwik}       {meter kwikkolom}
-  \getvalue{\v!eenheid} [Waterkolom]    {WK}                 {waterkolom}
-  \getvalue{\v!eenheid} [MeterWater]    {\Meter \Waterkolom} {meter waterkolom}
-  \getvalue{\v!eenheid} [DrogeStof]     {ds}                 {droge stof}
-  \getvalue{\v!eenheid} [Normaal]       {N}                  {normaal}
-
-  \getvalue{\v!eenheid} [Ton]           {t}                  {ton}
-  \getvalue{\v!eenheid} [kTon]          {\Kilo \Ton}         {kiloton}
+  \getvalue{\v!unit} [PaardenKracht] {pk}                 {paardenkracht}
+  \getvalue{\v!unit} [Duits]         {D}                  {duits}
+  \getvalue{\v!unit} [Kwik]          {Hg}                 {kwikkolom}
+  \getvalue{\v!unit} [Hectare]       {ha}                 {hectare}
+  \getvalue{\v!unit} [kGramForce]    {\Kilo \Gram \Force} {kilogramforce}
+  \getvalue{\v!unit} [kWattUur]      {\Kilo \Watt \Uur}   {kilowattuur}
+  \getvalue{\v!unit} [MeterKwik]     {\Meter \Kwik}       {meter kwikkolom}
+  \getvalue{\v!unit} [Waterkolom]    {WK}                 {waterkolom}
+  \getvalue{\v!unit} [MeterWater]    {\Meter \Waterkolom} {meter waterkolom}
+  \getvalue{\v!unit} [DrogeStof]     {ds}                 {droge stof}
+  \getvalue{\v!unit} [Normaal]       {N}                  {normaal}
+
+  \getvalue{\v!unit} [Ton]           {t}                  {ton}
+  \getvalue{\v!unit} [kTon]          {\Kilo \Ton}         {kiloton}
 
   \let \OmwPerSec    \RevPerSec
   \let \OmwPerMin    \RevPerMin
@@ -807,7 +807,7 @@
 \let \Kubic  \Cubic
 \let \IKubic \ICubic
 
-%D Option: 
+%D Option:
 
 % \def\Micro{\dimensionprefix{\iftextdimensions\mathematics\mu  \else\mu  \fi}}
 % \def\Times{\dimensionnopfix{\iftextdimensions\mathematics\cdot\else\cdot\fi}}
diff --git a/tex/context/base/m-visual.tex b/tex/context/base/m-visual.tex
index 30daf3405..b8a6b5734 100644
--- a/tex/context/base/m-visual.tex
+++ b/tex/context/base/m-visual.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-visual,
+%D   [       filefile=m-visual,
 %D        version=2000.01.10,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=Visualization and Faking,
@@ -162,26 +162,26 @@
        \hss}
      \endgraf
    \fi
-   \getvalue{\e!plaats\v!figuur}
+   \getvalue{\e!place\v!figure}
      [#1][#2]%
      {\freezerandomseed
       \let\endstrut\relax
       \let\begstrut\relax
-      \doifinsetelse{#1}{\v!links,\v!rechts}
+      \doifinsetelse{#1}{\v!left,\v!right}
         {\fakewords{2}{4}}
         {\fakewords{4}{10}}}%
      {\getrandomdimen{\dimen0}{#3}{#4}%
       \getrandomdimen{\dimen2}{#5}{#6}%
-      \doifinset{#1}{\v!links,\v!rechts}
+      \doifinset{#1}{\v!left,\v!right}
         {\dimen0=.75\dimen0
          \ifdim\dimen0>.6\hsize \dimen0=.5\hsize\fi
          \ifdim\dimen0<.3\hsize \dimen0=.3\hsize\fi}%
       \framed
-        [\c!breedte=\dimen0,
-         \c!hoogte=\dimen2,
-         \c!kader=\ifincolor\v!uit\else\v!aan\fi,
-         \c!achtergrond=\v!kleur,
-         \c!achtergrondkleur=fakeparindentcolor]
+        [\c!width=\dimen0,
+         \c!height=\dimen2,
+         \c!frame=\ifincolor\v!off\else\v!on\fi,
+         \c!background=\v!color,
+         \c!backgroundcolor=fakeparindentcolor]
         {\bf\white#1}}%
    \defrostrandomseed}
 
@@ -209,7 +209,7 @@
      {\setbox\scratchbox=\hbox
         {\basegrid
            [\c!nx=10,\c!ny=10,\c!dx=1,\c!dy=1,
-            \c!eenheid=\bodyfontsize,#1]}%
+            \c!unit=\bodyfontsize,#1]}%
       \hbox to \zeropoint
         {\hss\lower.5\ht\scratchbox\box\scratchbox\hss}%
       \hbox to \zeropoint
@@ -219,14 +219,14 @@
 
 \def\bodyfontgrid
   {\hbox
-     {{\linewidth.1pt\yellow\smashedgrid[\c!nx=30,\c!ny=30,\c!schaal=.3333]}%
-      {\linewidth.2pt\green \smashedgrid[\c!nx=20,\c!ny=20,\c!schaal=.5]}%
-      {\linewidth.3pt\red   \smashedgrid[\c!nx=10,\c!ny=10,\c!schaal=1]}}}
+     {{\linewidth.1pt\yellow\smashedgrid[\c!nx=30,\c!ny=30,\c!scale=.3333]}%
+      {\linewidth.2pt\green \smashedgrid[\c!nx=20,\c!ny=20,\c!scale=.5]}%
+      {\linewidth.3pt\red   \smashedgrid[\c!nx=10,\c!ny=10,\c!scale=1]}}}
 
 \def\emexgrid
   {\hbox
-     {{\linewidth.15pt\green\smashedgrid[\c!nx=20,\c!ny=20,\c!eenheid=ex]}%
-      {\linewidth.15pt\red  \smashedgrid[\c!nx=10,\c!ny=10,\c!eenheid=em]}}}
+     {{\linewidth.15pt\green\smashedgrid[\c!nx=20,\c!ny=20,\c!unit=ex]}%
+      {\linewidth.15pt\red  \smashedgrid[\c!nx=10,\c!ny=10,\c!unit=em]}}}
 
 %D The next few macros are not really public and kind of low
 %D level. They are obscure and a bit perverse.
@@ -284,4 +284,4 @@
    \let\dostartcmykcolormode\traceddostartcmykcolormode
    \let\dostartspotcolormode\traceddostartspotcolormode}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/math-ams.tex b/tex/context/base/math-ams.tex
index ebcef5678..b3f8244e2 100644
--- a/tex/context/base/math-ams.tex
+++ b/tex/context/base/math-ams.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-ams,
+%D   [       filefile=math-ams,
 %D        version=2001.04.12,
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=AMS Specials,
@@ -327,4 +327,4 @@
 
 \stopmathcollection
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/math-eul.tex b/tex/context/base/math-eul.tex
index 75dec7156..cd68998a1 100644
--- a/tex/context/base/math-eul.tex
+++ b/tex/context/base/math-eul.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-eul,
+%D   [       filefile=math-eul,
 %D        version=2003.02.03, 
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Virtual Euler Specials,
diff --git a/tex/context/base/math-fou.tex b/tex/context/base/math-fou.tex
index 57368bb19..0b87bcfb6 100644
--- a/tex/context/base/math-fou.tex
+++ b/tex/context/base/math-fou.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-fou,
+%D   [       filefile=math-fou,
 %D        version=2001.04.12,
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Fourier Specials,
@@ -193,4 +193,4 @@
 % \definemathsymbol [othergamma]   [ord] [otherletters] ["0D]
 % \definemathsymbol [otherdelta]   [ord] [otherletters] ["0E]
 % \definemathsymbol [otherepsilon] [ord] [otherletters] ["0F]
-% \definemathsymbol [otherzeta]    [ord] [otherletters] ["10]
\ No newline at end of file
+% \definemathsymbol [otherzeta]    [ord] [otherletters] ["10]
diff --git a/tex/context/base/math-ini.tex b/tex/context/base/math-ini.tex
index a18309c74..13ef0e183 100644
--- a/tex/context/base/math-ini.tex
+++ b/tex/context/base/math-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-ini,
+%D   [       filefile=math-ini,
 %D        version=2001.04.12,
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Basic Macros,
@@ -367,10 +367,10 @@
 %D   {ifmathpunctuation, enablemathpunctuation,
 %D    definemathpunctuation}
 %D
-%D \starttypen
+%D \starttyping
 %D \definemathpunctuation . mathperiod textperiod
 %D \definemathpunctuation , mathcomma  textcomma
-%D \stoptypen
+%D \stoptyping
 
 \newif\ifmathpunctuation
 
@@ -392,12 +392,12 @@
    \futurelet\nexttoken\next}
 
 %D \startbuffer
-%D \enablemathpunctuationtrue$(1,2) (1, 2) (1{,}2) \hbox{foo, not bar}$
+%D \enablemathpunctuation$(1,2) (1, 2) (1{,}2) \hbox{foo, not bar}$
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \blanko{\getbuffer}\blanko
+%D \blank{\getbuffer}\blank
 
 %D needed for sin, cos etc
 
@@ -435,7 +435,7 @@
 
 %D Bold math:
 %D
-%D \starttypen
+%D \starttyping
 %D \usetypescript [lucida] [texnansi]
 %D
 %D \definetypeface [boldmath] [rm] [serif]
@@ -454,7 +454,7 @@
 %D \switchtobodyfont[boldmath,10pt]
 %D
 %D \showmathtoken{Gamma} $\Gamma \Delta \alpha \delta \zeta$
-%D \stoptypen
+%D \stoptyping
 
 \protect \endinput
 
diff --git a/tex/context/base/math-lbr.tex b/tex/context/base/math-lbr.tex
index c3c463254..a46228595 100644
--- a/tex/context/base/math-lbr.tex
+++ b/tex/context/base/math-lbr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-lbr,
+%D   [       filefile=math-lbr,
 %D        version=2001.04.12, 
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Lucida Specials,
diff --git a/tex/context/base/math-pln.tex b/tex/context/base/math-pln.tex
index 73c12c973..c3127c3c9 100644
--- a/tex/context/base/math-pln.tex
+++ b/tex/context/base/math-pln.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-pln,
+%D   [       filefile=math-pln,
 %D        version=2001.11.16, 
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Efficient \PLAIN\ \TEX\ loading,
diff --git a/tex/context/base/math-run.tex b/tex/context/base/math-run.tex
index e24acb4d5..9d35e3299 100644
--- a/tex/context/base/math-run.tex
+++ b/tex/context/base/math-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=math-run,
+%D   [     filefile=math-run,
 %D      version=2001.23.04,
 %D        title=\CONTEXT\ Math Macros,
 %D     subtitle=Runtime Macros,
@@ -16,9 +16,9 @@
 \gdef\showmathcharacters% nearly \showcharacters
   {\par
    \bgroup
-   \setuptextrules[\c!korps=,\c!letter=]
+   \setuptextrules[\c!bodyfont=,\c!style=]
    \starttextrule{math characters}
-   \witruimte
+   \whitespace
    \dontcomplain
    \forgetall
    \def\startmathcollection[##1]{}
@@ -48,7 +48,7 @@
    \advance\dimen2 2em
    \divide \dimen0 by \dimen2 \advance\dimen0 1sp
    \edef\enccols{\number\dimen0}
-   \startcolumns[\c!n=\enccols,\c!afstand=2em]
+   \startcolumns[\c!n=\enccols,\c!distance=2em]
    \def\dodefinemathsymbol[##1][##2][##3][##4][##5][##6]%
      {%\localcolortrue
       %\color
diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex
index 5112cdf0b..f047e6771 100644
--- a/tex/context/base/math-tex.tex
+++ b/tex/context/base/math-tex.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-tex,
+%D   [       filefile=math-tex,
 %D        version=2001.04.12,
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Plain Specials,
@@ -532,4 +532,4 @@
 \definemathpunctuation . mathperiod textperiod
 \definemathpunctuation , mathcomma  textcomma
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/math-tim.tex b/tex/context/base/math-tim.tex
index 9069b2f89..453ade72c 100644
--- a/tex/context/base/math-tim.tex
+++ b/tex/context/base/math-tim.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=math-tim,
+%D   [       filefile=math-tim,
 %D        version=2001.04.12, 
 %D          title=\CONTEXT\ Math Macros,
 %D       subtitle=Mathtime Specials,
@@ -64,12 +64,12 @@
 %D surprise that the Math Times fonts have different specs 
 %D than the Computer Modern Roman fonts. 
 %D
-%D \starttabulatie[|Bl|c|c|c|c|c|c|c|c|c|c|]
+%D \starttabulate[|Bl|c|c|c|c|c|c|c|c|c|c|]
 %D \NC Computer Modern\NC
 %D     5  \NC6  \NC7  \NC8  \NC9  \NC10  \NC11  \NC12  \NC14  \NC18\NC\NR
 %D \NC Math Times     \NC
 %D     6.0\NC6.8\NC7.6\NC8.4\NC9.2\NC10.0\NC10.8\NC11.6\NC13.2\NC--\NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The following definitions presume the existence of \type 
 %D {tio} and \type {tibio} font alternatives. Definitions for 
@@ -106,11 +106,11 @@
 %D The following definitions are mostly copied from the file 
 %D \type {mtmacs.tex}, which banner said:
 %D
-%D \starttypen
+%D \starttyping
 %D MTMACS.TEX VERSION 1.1.1 (1996 Dec 8)
 %D COPYRIGHT (C) 1992, 1993, 1996 BY THE TEXPLORATORS CORPORATION
 %D ALL RIGHTS RESERVED
-%D \stoptypen
+%D \stoptyping
 %D
 %D We reformatted the macros and changed a few bits and 
 %D pieces. A further cleanup with regards to the scratch 
diff --git a/tex/context/base/meta-clp.tex b/tex/context/base/meta-clp.tex
index a160e7661..2884061bb 100644
--- a/tex/context/base/meta-clp.tex
+++ b/tex/context/base/meta-clp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-clp,
+%D   [       filefile=meta-clp,
 %D        version=2000.07.06,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Clipping,
@@ -127,14 +127,14 @@
 %D predefined. When applied to a whole picture, their usage
 %D is:
 %D
-%D \starttypen
+%D \starttyping
 %D \clip[nx=1,ny=1,mp=ellipse]{some clippable content}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \startbuffer
 %D \setupclipping  [nx=1,ny=1,x=1,y=1]
 %D \setupblackrules[width=2cm,height=1cm]
-%D \startcombinatie[6*3] % \startcombination[6*3]
+%D \startcombination[6*3] % \startcombination[6*3]
 %D   {\clip[mp=urellipse] {\blackrule}} {urellipse}
 %D   {\clip[mp=ulellipse] {\blackrule}} {ulellipse}
 %D   {\clip[mp=llellipse] {\blackrule}} {llellipse}
@@ -153,12 +153,12 @@
 %D   {\clip[mp=lrtriangle]{\blackrule}} {lrtriangle}
 %D   {\clip[mp=diamond]   {\blackrule}} {diamond}
 %D   {\clip[mp=negdiamond]{\blackrule}} {negdiamond}
-%D \stopcombinatie % \stopcombination
+%D \stopcombination % \stopcombination
 %D \stopbuffer
 %D
-%D \plaatsfiguur % \placefigure
+%D \placefigure % \placefigure
 %D   [here][fig:clipping paths]
 %D   {The predefined clipping paths.}
-%D   {\haalbuffer} % {\getbuffer}
+%D   {\getbuffer} % {\getbuffer}
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/meta-dum.tex b/tex/context/base/meta-dum.tex
index 4f0de21f8..8d583ff2b 100644
--- a/tex/context/base/meta-dum.tex
+++ b/tex/context/base/meta-dum.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-dum,
+%D   [       filefile=meta-dum,
 %D        version=2003.03.21,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Dummy (External) Graphics,
@@ -20,14 +20,6 @@
 %D \useMPlibrary[dum]
 %D
 %D \startlinecorrection
-%D \useMPgraphic{placeholder}{width=3cm,height=4cm,color=red}
-%D \stoplinecorrection
-%D
-%D \startlinecorrection
-%D \useMPgraphic{placeholder}{width=8cm,height=10cm,color=green}
-%D \stoplinecorrection
-%D
-%D \startlinecorrection
 %D \externalfigure[unknown-a][width=3cm,height=1cm]
 %D \stoplinecorrection
 %D
@@ -75,8 +67,8 @@
 \let\figurereplacementcycle\relax
 
 \setupexternalfigures
-  [\c!reductie=0,
-   \c!tekst=\v!ja]
+  [\c!reduction=0,
+   \c!text=\v!yes]
 
 \def\externalfigurereplacement#1#2#3%
   {\getpaletsize[placeholder]%
@@ -96,17 +88,17 @@
         {placeholder}%
         {width=\figurewidth,
          height=\figureheight,
-         reduction=\@@efreductie,
+         reduction=\@@efreduction,
          color=placeholder:\figurereplacementcycle}]%
    \expanded{\localframed
      [\??ef]
-     [\c!breedte=\figurewidth,
-      \c!hoogte=\figureheight,
-      \c!kader=\v!uit,
-      \c!strut=\v!nee,
-      \c!achtergrond=\s!dummy,
-      \c!voorgrondkleur=\s!white]}%
-     {\doif\@@eftekst\v!ja
+     [\c!width=\figurewidth,
+      \c!height=\figureheight,
+      \c!frame=\v!off,
+      \c!strut=\v!no,
+      \c!background=\s!dummy,
+      \c!foregroundcolor=\s!white]}%
+     {\doif\@@eftext\v!yes
         {\infofont \setupinterlinespace \dohyphens % \nohyphens
          \doifelse{#1}\s!dummy  \!!doneafalse\!!doneatrue
          \doifelse{#2}\s!dummy  \!!donebfalse\!!donebtrue
@@ -124,4 +116,4 @@
 
 \def\dummyfigure{\externalfigure[placeholder]}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/meta-fig.tex b/tex/context/base/meta-fig.tex
index 6094e4ca1..c7b411626 100644
--- a/tex/context/base/meta-fig.tex
+++ b/tex/context/base/meta-fig.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-fig,
+%D   [       filefile=meta-fig,
 %D        version=2000.09.07,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Stand Alone Graphics,
@@ -22,7 +22,7 @@
 %D whole \CONTEXT\ machinery is available, you can also add
 %D page backgrounds.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupMPpage
 %D   [offset=1pt,
 %D    background=color,
@@ -35,7 +35,7 @@
 %D \startMPpage
 %D   fill fullsquare rotated 45 scaled 8cm withcolor blue ;
 %D \stopMPpage
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although this is hardly of any use, you can mix these
 %D definitions with the text flow, since all settings are
@@ -55,13 +55,13 @@
    \dostopfittingpage}
 
 \setupMPpage
-  [\c!schaal=1000,
-   \c!strut=\v!nee,
-   \c!uitlijnen=,
+  [\c!scale=1000,
+   \c!strut=\v!no,
+   \c!align=,
    \c!offset=\v!overlay,
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!passend,
-   \c!kader=\v!uit]
+   \c!width=\v!fit,
+   \c!height=\v!fit,
+   \c!frame=\v!off]
 
 %D \macros 
 %D  {MPfigure}
@@ -70,7 +70,7 @@
 
 \def\MPfigure#1#2% test for dup figure
   {\bgroup
-   \getfiguredimensionsonly[#1]% [\c!object=\v!nee] already set 
+   \getfiguredimensionsonly[#1]% [\c!object=\v!no] already set 
    \freezedimenmacro\naturalfigurewidth
    \freezedimenmacro\naturalfigureheight
    \startMPcode
diff --git a/tex/context/base/meta-ini.tex b/tex/context/base/meta-ini.tex
index f348b2ffd..e30ed3b79 100644
--- a/tex/context/base/meta-ini.tex
+++ b/tex/context/base/meta-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-ini,
+%D   [       filefile=meta-ini,
 %D        version=1999.07.10,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Initialization,
@@ -126,9 +126,9 @@
 %D backgrounds. To prevent conflicts, we will use the \type
 %D {-} in \METAPOST\ specific variables, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupMPvariables[meta:button][size=20pt]
-%D \stoptypen
+%D \stoptyping
 
 \def\@@meta{meta:}
 
@@ -178,19 +178,19 @@
 %D to use graphics that adapt themselves. The next \METAPOST\
 %D kind of graphic is both unique and reused when possible.
 %D
-%D \starttypen
+%D \starttyping
 %D \defineoverlay[example][\uniqueMPgraphic{test}]
 %D
 %D \startuniqueMPgraphic {test}
 %D   draw unitsquare xscaled \overlaywidth yscaled \overlayheight ;
 %D \stopuniqueMPgraphic
-%D \stoptypen
+%D \stoptyping
 
 %D For educational purposes, we show the original version
 %D first. This one used a rather simple method for determining
 %D the uniqueness.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\startuniqueMPgraphic#1#2\stopuniqueMPgraphic%
 %D   {\setvalue{\@@MPG#1}%
 %D      {\startreusableMPgraphic{\overlaystamp:#1}#2\stopreusableMPgraphic
@@ -198,7 +198,7 @@
 %D
 %D \def\uniqueMPgraphic#1%
 %D   {\getvalue{\@@MPG#1}}
-%D \stoptypen
+%D \stoptyping
 
 %\def\overlaystamp % watch the \MPcolor, since colors can be redefined
 %  {\overlaywidth:\overlayheight:\overlaydepth
@@ -214,17 +214,17 @@
 %D uniqueness, as well as prepare variables for passing them to
 %D \METAPOST.
 %D
-%D \starttypen
+%D \starttyping
 %D \startuniqueMPgraphic{meta:hash}{gap,angle,...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The calling macro also accepts a second argument. For
 %D convenient use in overlay definitions, we use \type {{}}
 %D instead of \type {[]}.
 %D
-%D \starttypen
+%D \starttyping
 %D \uniqueMPgraphic{meta:hash}{gap=10pt,angle=30}
-%D \stoptypen
+%D \stoptyping
 
 \long\def\handleuniqueMPgraphic#1#2#3%
   {\blabelgroup
@@ -373,12 +373,12 @@
 
 %D One way of defining a stamp is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\extendMPoverlaystamp#1%
 %D   {\def\docommando##1%
 %D      {\edef\overlaystamp{\overlaystamp:\MPvariable{##1}}}%
 %D    \processcommalist[#1]\docommando}
-%D \stoptypen
+%D \stoptyping
 
 %D Since we need to feed \METAPOST\ with expanded dimensions,
 %D we introduce a dedicated expansion engine.
@@ -544,7 +544,7 @@
 \long\def\dostartMPenvironment[#1][#2]#3\stopMPenvironment
   {\egroup
    \doif{#1}\s!reset\resetMPenvironment % reset mp toks
-   \doif{#1}\v!globaal{#3}%             % use in main doc too
+   \doif{#1}\v!global{#3}%             % use in main doc too
    \doif{#1}+{#3}%                      % use in main doc too
    \convertargument#3\to\ascii
    \expandafter\appendtoks\ascii\to\everyMPTEXgraphic}
@@ -560,7 +560,7 @@
 %D This command takes \type {[reset]} as optional
 %D argument.
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPenvironment
 %D   \setupbodyfont[pos,14.4pt]
 %D \stopMPenvironment
@@ -568,7 +568,7 @@
 %D \startMPcode
 %D   draw btex \sl Hans Hagen etex scaled 5 ;
 %D \stopMPcode
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type {\resetMPenvironment} is a quick way to erase
 %D the token list.
@@ -771,7 +771,7 @@
 %D First we present the reasonable fast alternative that we
 %D happily used for some time.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\insertMPfile#1#2%
 %D   {\ifx\undefined\externalfigure
 %D      \message{[insert file #1 here]}%
@@ -780,14 +780,14 @@
 %D      \the\everyinsertMPfile
 %D      \externalfigure
 %D        [#1]
-%D        [\c!type=\c!mps,\c!object=\v!nee,%
-%D         \c!symbool=\v!ja,\c!reset=\v!ja,%
-%D         \c!maxbreedte=,\c!maxhoogte=,%
-%D         \c!kader=\v!uit,\c!achtergrond=,%
+%D        [\c!type=\c!mps,\c!object=\v!no,%
+%D         \c!symbol=\v!yes,\c!reset=\v!yes,%
+%D         \c!maxwidth=,\c!maxheight=,%
+%D         \c!frame=\v!off,\c!background=,%
 %D         #2]%
 %D      \egroup
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, on a 1 Gig Pentium, the next alternative saves
 %D us 20 seconds run time for the 300 page \METAFUN\ manual:
@@ -912,7 +912,7 @@
   [mp]
   [\c!y=-\MPury bp,
    \c!x=\MPllx bp,
-   \c!methode=\v!passend]
+   \c!method=\v!fit]
 
 \definelayer
   [mp]
@@ -920,7 +920,7 @@
 
 %D Usage:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineproperty[one][layer][state=start]
 %D \defineproperty[two][layer][state=stop]
 %D
@@ -936,7 +936,7 @@
 %D \setlayer[mp]{\property[two]{\useMPgraphic{step-2}}}
 %D
 %D \ruledhbox{\flushlayer[mp]}
-%D \stoptypen
+%D \stoptyping
 
 %D New:
 
@@ -948,4 +948,4 @@
 %
 % linecap  := rounded ;
 % linejoin := rounded ;
-% drawoptions () ;
\ No newline at end of file
+% drawoptions () ;
diff --git a/tex/context/base/meta-nav.tex b/tex/context/base/meta-nav.tex
index bb409f7fc..0bd564587 100644
--- a/tex/context/base/meta-nav.tex
+++ b/tex/context/base/meta-nav.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-nav,
+%D   [       filefile=meta-nav,
 %D        version=2003.03.28,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Navigational Graphics,
@@ -59,7 +59,7 @@
 
 \unprotect
 
-\setupcomment    [\c!symbool={comment-normal,comment-down}]
-\setupattachments[\c!symbool={attach-normal,attach-down}]
+\setupcomment    [\c!symbol={comment-normal,comment-down}]
+\setupattachments[\c!symbol={attach-normal,attach-down}]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/meta-pag.tex b/tex/context/base/meta-pag.tex
index d82a3d500..73c9e6f6a 100644
--- a/tex/context/base/meta-pag.tex
+++ b/tex/context/base/meta-pag.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-pag,
+%D   [       filefile=meta-pag,
 %D        version=1999.07.10,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Initialization,
@@ -43,41 +43,41 @@
     RealPageNumber:=\the\realpageno;
     PageNumber:=\the\pageno;
     NOfPages:=\lastpage;
-    PaperHeight:=\the\papierhoogte;
-    PaperWidth:=\the\papierbreedte;
-    PrintPaperHeight:=\the\printpapierhoogte;
-    PrintPaperWidth:=\the\printpapierbreedte;
-    TopSpace:=\the\kopwit;
-    BottomSpace:=\the\bodemwit;
-    BackSpace:=\the\rugwit;
-    CutSpace:=\the\snijwit;
-    MakeupHeight:=\the\zethoogte;
-    MakeupWidth:=\the\zetbreedte;
-    TopHeight:=\the\bovenhoogte;
-    TopDistance:=\@the\bovenafstand;
-    HeaderHeight:=\the\hoofdhoogte;
-    HeaderDistance:=\@the\hoofdafstand;
-    TextHeight:=\the\teksthoogte;
-    FooterDistance:=\@the\voetafstand;
-    FooterHeight:=\the\voethoogte;
-    BottomDistance:=\@the\onderafstand;
-    BottomHeight:=\the\onderhoogte;
-    LeftEdgeWidth:=\the\linkerrandbreedte;
-    LeftEdgeDistance:=\@the\linkerrandafstand;
-    LeftMarginWidth:=\the\linkermargebreedte;
-    LeftMarginDistance:=\@the\linkermargeafstand;
-    TextWidth:=\the\tekstbreedte ;
-    RightMarginDistance:=\@the\rechtermargeafstand;
-    RightMarginWidth:=\the\rechtermargebreedte;
-    RightEdgeDistance:=\@the\rechterrandafstand;
-    RightEdgeWidth:=\the\rechterrandbreedte;
-    InnerMarginDistance:=\@the\innermargindistance;
+    PaperHeight:=\the\paperheight;
+    PaperWidth:=\the\paperwidth;
+    PrintPaperHeight:=\the\printpaperheight;
+    PrintPaperWidth:=\the\printpaperwidth;
+    TopSpace:=\the\topspace;
+    BottomSpace:=\the\bottomspace;
+    BackSpace:=\the\backspace;
+    CutSpace:=\the\cutspace;
+    MakeupHeight:=\the\makeupheight;
+    MakeupWidth:=\the\makeupwidth;
+    TopHeight:=\the\topheight;
+    TopDistance:=\the\topdistance;
+    HeaderHeight:=\the\headerheight;
+    HeaderDistance:=\the\headerdistance;
+    TextHeight:=\the\textheight;
+    FooterDistance:=\the\footerdistance;
+    FooterHeight:=\the\footerheight;
+    BottomDistance:=\the\bottomdistance;
+    BottomHeight:=\the\bottomheight;
+    LeftEdgeWidth:=\the\leftedgewidth;
+    LeftEdgeDistance:=\the\leftedgedistance;
+    LeftMarginWidth:=\the\leftmarginwidth;
+    LeftMarginDistance:=\the\leftmargindistance;
+    TextWidth:=\the\textwidth ;
+    RightMarginDistance:=\the\rightmargindistance;
+    RightMarginWidth:=\the\rightmarginwidth;
+    RightEdgeDistance:=\the\rightedgedistance;
+    RightEdgeWidth:=\the\rightedgewidth;
+    InnerMarginDistance:=\the\innermargindistance;
     InnerMarginWidth:=\the\innermarginwidth;
-    OuterMarginDistance:=\@the\outermargindistance;
+    OuterMarginDistance:=\the\outermargindistance;
     OuterMarginWidth:=\the\outermarginwidth;
-    InnerEdgeDistance:=\@the\inneredgedistance;
+    InnerEdgeDistance:=\the\inneredgedistance;
     InnerEdgeWidth:=\the\inneredgewidth;
-    OuterEdgeDistance:=\@the\outeredgedistance;
+    OuterEdgeDistance:=\the\outeredgedistance;
     OuterEdgeWidth:=\the\outeredgewidth;
     PageOffset:=\the\pageoffset;
     PageDepth:=\the\pagedepth;
@@ -100,23 +100,7 @@
    \od
    \edef\MPonoddpage{\doifoddpageelse{true}{false}}}
 
-\iffixedlayoutdimensions
-
-  \let\freezeMPlayout\relax
-
-\else
-
-  \def\freezeMPlayout% must be done more efficient
-    {\freezedimenmacro\bovenafstand
-     \freezedimenmacro\hoofdafstand
-     \freezedimenmacro\voetafstand
-     \freezedimenmacro\onderafstand
-     \freezedimenmacro\linkerrandafstand
-     \freezedimenmacro\linkermargeafstand
-     \freezedimenmacro\rechtermargeafstand
-     \freezedimenmacro\rechterrandafstand}
-
-\fi
+\let\freezeMPlayout\relax % obsolete
 
 %D We need to freeze the pagelayout before the backgrounds
 %D are build, because the overlay will temporarily become
@@ -143,14 +127,14 @@
 %D
 %D See \type {mp-page.mp} for the definition of the macros:
 %D
-%D \startabulatie[|tl|l|p|]
+%D \starttabulate[|tl|l|p|]
 %D \NC ResetTextAreas        \NC no arguments \NC
 %D     reset areas on page                    \NC \NR
 %D \NC RegisterTextArea      \NC x, y, w, h   \NC
 %D     adds area to the list                  \NC \NR
 %D \NC TextAreaX,Y,W,H,XY,WH \NC x and/or y   \NC
 %D     reports offsets and dimensions         \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The \type {TextArea*} macros can be used to determine
 %D overlap.
@@ -221,4 +205,4 @@
   \global\MPlocaltextareadata\emptytoks
 \to \everyshipout
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/meta-pre.tex b/tex/context/base/meta-pre.tex
index cb861ff20..1d0a39001 100644
--- a/tex/context/base/meta-pre.tex
+++ b/tex/context/base/meta-pre.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-pre,
+%D   [       filefile=meta-pre,
 %D        version=2001.03.21,
 %D          title=\METAPOST\ Graphics, 
 %D       subtitle=Predefined Goodies, 
diff --git a/tex/context/base/meta-txt.tex b/tex/context/base/meta-txt.tex
index 1d75a96d6..133d8e79a 100644
--- a/tex/context/base/meta-txt.tex
+++ b/tex/context/base/meta-txt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=meta-txt,
+%D   [       filefile=meta-txt,
 %D        version=2000.07.06,
 %D          title=\METAPOST\ Graphics,
 %D       subtitle=Text Tricks,
@@ -47,10 +47,10 @@
 \def\startshapetext[#1]%
   {\global\newcounter\currentshapetext
    \global\setbox\shapetextbox=\vbox\bgroup
-     \expanded{\switchtobodyfont[\@@shkorps]}%
+     \expanded{\switchtobodyfont[\@@shbodyfont]}%
      \dontcomplain
      \hsize\parwidth
-     \setuptolerance[\v!zeersoepel,\v!rek]%
+     \setuptolerance[\v!verytolerant,\v!stretch]%
      \!!counta=0
      \!!toksa=\emptytoks
      \def\docommando##1%
@@ -124,7 +124,7 @@
   {\vbox\bgroup
    \forgetall
    \setbox\scratchbox\vbox to \parheight
-     {\expanded{\switchtobodyfont[\@@shkorps]}% evt strutheight en
+     {\expanded{\switchtobodyfont[\@@shbodyfont]}% evt strutheight en
       \splittopskip\strutheight               % lineheight opslaan
       \vskip\parvoffset                       % scheelt switch en
       \ifcase\parfirst\or\vskip\lineheight\fi % is ook veiliger
@@ -141,7 +141,7 @@
   {\dodoubleempty\getparameters[\??sh]}
 
 \setupshapetexts%
-  [\c!korps=]
+  [\c!bodyfont=]
 
 %%%%%%% rotfont nog definieren
 
@@ -263,7 +263,7 @@
    width=\the\localhsize, % without \the, problems in non e-tex
    color=darkgray]
 
-\definieerblanko
+\defineblank
   [EnglishRule]
   [medium]
 
@@ -282,6 +282,8 @@
 %D The following macro returns a tight bound character
 %D sequence.
 %D
+%D \useMPlibrary[txt]
+%D
 %D \startlinecorrection
 %D \TightText{\ss\bf 123}{0cm}{3cm}{red}
 %D \stoplinecorrection
diff --git a/tex/context/base/meta-xml.tex b/tex/context/base/meta-xml.tex
index 5024165d7..dfc932df8 100644
--- a/tex/context/base/meta-xml.tex
+++ b/tex/context/base/meta-xml.tex
@@ -1,30 +1,29 @@
 %D \module
-%D   [       file=meta-xml,
+%D   [       filefile=meta-xml,
 %D        version=2002.11.27,
-%D          title=\METAPOST\ Graphics, 
-%D       subtitle=XML Hacks, 
+%D          title=\METAPOST\ Graphics,
+%D       subtitle=XML Hacks,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{MetaPost Graphics / XML Hacks}
 
 %D When we are dealing with XML, we need to make sure that
 %D \METAPOST\ knows about it. The next macro expands its
 %D argument (think of widget XFDF) into \type {\getXMLentity}
-%D calls. 
+%D calls.
 
-\unprotect 
+\unprotect
 
 \def\setMPtextXML#1#2%
   {\bgroup
-   \enableXML 
+   \enableXML
    \expanded{\convertcommand#2}\to\ascii
-   \expanded{\egroup
-     \noexpand\dodoglobal\noexpand\setvalue{\@@MPT#1}{\ascii}}}
+   \expanded{\egroup\noexpand\dodoglobal\noexpand\setvalue{\@@MPT#1}{\ascii}}}
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/mult-com.tex b/tex/context/base/mult-com.tex
index db1435ab1..c1a2a539e 100644
--- a/tex/context/base/mult-com.tex
+++ b/tex/context/base/mult-com.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=mult-com,
+%D   [       filefile=mult-com,
 %D        version=1996.06.01,
 %D          title=\CONTEXT\ Multilingual Macros,
 %D       subtitle=Commands,
@@ -24,7 +24,7 @@
 %D the Czech ones by Tom Hudec, and the Italian ones
 %D by Giuseppe Bilotta. Here we include their comments.
 
-%D Giuseppe Bilotta: \citaat {Having to choose between a
+%D Giuseppe Bilotta: \quotation {Having to choose between a
 %D full|-|length name and a shortcut, I decided to resort to the
 %D latter, especially in the case of commonly used commands, or
 %D when shortened commands become too short. This led to one
@@ -253,19 +253,19 @@
                    setupcapitals: stelkapitalenin                  setupcapitals
                                   stelleversalienein               nastavkapitalky
                                   impostamaiuscole                 seteazamajuscule
-                             kap: kap                              kap
+                     smallcapped: kap                              cap
                                   kap                              kap
                                   cap                              kap
-                             KAP: KAP                              CAP
-                                  KAP                              KAP
-                                  CAP                              KAP
-                           nokap: nokap                            nocap
+                  notsmallcapped: nokap                            nocap
                                   nokap                            nokap
                                   nocap                            nokap
-                             Kap: Kap                              Cap
+                          CAPPED: KAP                              CAP
+                                  KAP                              KAP
+                                  CAP                              KAP
+                     SmallCapped: Kap                              Cap
                                   Kap                              Kap
                                   Cap                              Kap
-                            Kaps: Kaps                             Caps
+                       SmallCaps: Kaps                             Caps
                                   Kaps                             Kaps
                                   Caps                             Kaps
                             WORD: WOORD                            WORD
@@ -451,46 +451,55 @@
                       usemodules: gebruikmodules                   usemodules
                                   verwendemodule                   uzijmoduly
                                   usamoduli                        folosestemodule
-                      starttekst: starttekst                       starttext
+                       starttext: starttekst                       starttext
                                   starttext                        starttext
                                   iniziatesto                      starttext
-                       stoptekst: stoptekst                        stoptext
+                        stoptext: stoptekst                        stoptext
                                   stoptext                         stoptext
                                   terminatesto                     stoptext
-                      margetitel: margetitel                       margintitle
+                     margintitle: margetitel                       margintitle
                                   marginaltitel                    marginalninadpis
                                   titoloinmargine                  titlumarginal
-                      margewoord: margewoord                       marginword
+                      marginword: margewoord                       marginword
                                   marginalwort                     marginalnislovo
                                   parolainmargine                  cuvantmarginal
-                      margetekst: margetekst                       margintext
+                      margintext: margetekst                       margintext
                                   marginaltext                     marginalnitext
                                   testoinmargine                   textmarginal
-                        inlinker: inlinker                         inleft
+                          inleft: inlinker                         inleft
                                   imlinken                         vlevo
                                   insinistra                       instanga
-                         inmarge: inmarge                          inmargin
+                        inmargin: inmarge                          inmargin
                                   inmarginalie                     naokraj
                                   inmargine                        marginal
-                   inanderemarge: inanderemarge                    inothermargin
+                   inothermargin: inanderemarge                    inothermargin
                                   inanderermarginale               nadruhyokraj
                                   inaltromargine                   inaltamargine
-                       inrechter: inrechter                        inright
+                         inright: inrechter                        inright
                                   imrechten                        vpravo
                                   indestra                         indreapta
-                  startmargeblok: startmargeblok                   startmarginblock
+ininner: inbinnen ininner
+         ininner  ininner
+         ininner  ininner
+inouter: inbuiten inouter
+         inouter  inouter
+         inouter  inouter
+                startmarginblock: startmargeblok                   startmarginblock
                                   startmarginalblock               startmarginalniblok
                                   iniziabloccomargine              startblocmarginal
-                   stopmargeblok: stopmargeblok                    stopmarginblock
+                 stopmarginblock: stopmargeblok                    stopmarginblock
                                   stopmarginalblock                stopmarginalniblok
                                   terminabloccomargine             stopblocmarginal
-                   stelinmargein: stelinmargein                    setupinmargin
+defineinmargin: definieerinmarge defineinmargin
+                defineinmargin   defineinmargin
+                defineinmargin   defineinmargin
+                   setupinmargin: stelinmargein                    setupinmargin
                                   stelleinmarginalieein            nastavmarginalie
                                   impostainmargine                 seteazamarginal
-              stelmargeblokkenin: stelmargeblokkenin               setupmarginblocks
+               setupmarginblocks: stelmargeblokkenin               setupmarginblocks
                                   stellemarginalblockein           nastavmarginalniblok
                                   impostablocchimargine            seteazablocurimarginale
-                      inleftside: inlinkerrand                     inleftside
+                      inleftedge: inlinkerrand                     inleftedge
                                   imlinkenrand                     nalevo
                                   inlatosinistro                   inparteastanga
                     inleftmargin: inlinkermarge                    inleftmargin
@@ -499,7 +508,7 @@
                    inrightmargin: inrechtermarge                   inrightmargin
                                   inrechtermarginale               napravyokraj
                                   inmarginedestro                  inmargineadreapta
-                     inrightside: inrechterrand                    inrightside
+                     inrightedge: inrechterrand                    inrightedge
                                   imrechtenrand                    napravo
                                   inlatodestro                     inparteadreapta
  atleftmargin: oplinkermarge                    atleftmargin
@@ -509,19 +518,19 @@ atrightmargin: oprechtermarge                   atrightmargin
                atrightmargin                    atrightmargin
                atrightmargin                    atrightmargin
 
-                     woordrechts: woordrechts                      wordright
+                       wordright: woordrechts                      wordright
                                   wortrechts                       slovovpravo
                                   paroladestra                     cuvantdreapta
-                 definieerblanko: definieerblanko                  defineblank
+                     defineblank: definieerblanko                  defineblank
                                   definiereblanko                  definujpreskok
                                   definiscirigovuoto               definesteblanc
-                          blanko: blanko                           blank
+                           blank: blanko                           blank
                                   blanko                           preskoc
                                   rigovuoto                        blanc
                       setupblank: stelblankoin                     setupblank
                                   stelleblankoein                  nastavpreskok
                                   impostarigovuoto                 seteazablanc
-              corrigeerwitruimte: corrigeerwitruimte               correctwhitespace
+               correctwhitespace: corrigeerwitruimte               correctwhitespace
                                   korrigierezwischenraum           korekcebilehomista
                                   correggispaziobianco             corecteazaspatiualb
                      fixedspaces: vastespaties                     fixedspaces
@@ -536,79 +545,79 @@ atrightmargin: oprechtermarge                   atrightmargin
                            space: spatie                           space
                                   spatium                          mezera
                                   spazio                           spatiu
-                   geenwitruimte: geenwitruimte                    nowhitespace
+                    nowhitespace: geenwitruimte                    nowhitespace
                                   keinzwischenraum                 zadnebilemisto
                                   nientespaziobianco               faraspatiualb
-                        opelkaar: opelkaar                         packed
+                          packed: opelkaar                         packed
                                   kleinerdurchschuss               zhustene
                                   impaccato                        impachetat
-                   startopelkaar: startopelkaar                    startpacked
+                     startpacked: startopelkaar                    startpacked
                                   startkleinerdurchschuss          startzhustene
                                   iniziaimpaccato                  startimpachetat
-                    stopopelkaar: stopopelkaar                     stoppacked
+                      stoppacked: stopopelkaar                     stoppacked
                                   stopkleinerdurchschuss           stopzhustene
                                   terminaimpaccato                 stopimpachetat
-                  startvanelkaar: startvanelkaar                   startunpacked
+                   startunpacked: startvanelkaar                   startunpacked
                                   startgrosserdurchschuss          startnezhustene
                                   iniziaunpacked                   startneimpachetat
-                   stopvanelkaar: stopvanelkaar                    stopunpacked
+                    stopunpacked: stopvanelkaar                    stopunpacked
                                   stopgrosserdurchschuss           stopnezhustene
                                   terminaunpacked                  stopneimpachetat
-             startregelcorrectie: startregelcorrectie              startlinecorrection
+             startlinecorrection: startregelcorrectie              startlinecorrection
                                   startzeilenkorrektur             startkorekceradku
                                   iniziacorrezioneriga             startcorectielinie
-              stopregelcorrectie: stopregelcorrectie               stoplinecorrection
+              stoplinecorrection: stopregelcorrectie               stoplinecorrection
                                   stopzeilenkorrektur              stopkorekceradku
                                   terminacorrezioneriga            stopcorectielinie
-                          omlaag: omlaag                           godown
+                          godown: omlaag                           godown
                                   nachunten                        jdidolu
                                   vaigiu                           injos
-                       witruimte: witruimte                        whitespace
+                      whitespace: witruimte                        whitespace
                                   zwischenraum                     bilemisto
                                   spaziobianco                     spatiualb
-                  nietinspringen: nietinspringen                   noindenting
+                     noindenting: nietinspringen                   noindenting
                                   nichteinziehen                   zadneodsazovani
                                   nienterientro                    faraaliniat
-                      inspringen: inspringen                       indenting
+                       indenting: inspringen                       indenting
                                   einziehen                        odsazovani
                                   rientro                          aliniat
                   setupindenting: stelinspringenin                 setupindenting
                                   stelleeinziehenein               nastavodsazovani
                                   impostarientro                   seteazaaliniat
-                  startuitlijnen: startuitlijnen                   startalignment
+                  startalignment: startuitlijnen                   startalignment
                                   startausrichtung                 startzarovnavani
                                   iniziaallineamento               startaliniere
-                   stopuitlijnen: stopuitlijnen                    stopalignment
+                   stopalignment: stopuitlijnen                    stopalignment
                                   stopausrichtung                  stopzarovnavani
                                   terminaallineamento              stopaliniere
-                     startregels: startregels                      startlines
+                      startlines: startregels                      startlines
                                   startzeilen                      startradky
                                   iniziarighe                      startlinii
-                      stopregels: stopregels                       stoplines
+                       stoplines: stopregels                       stoplines
                                   stopzeilen                       stopradky
                                   terminarighe                     stoplinii
-         stelparagraafnummerenin: stelparagraafnummerenin          setupparagraphnumbering
+         setupparagraphnumbering: stelparagraafnummerenin          setupparagraphnumbering
                                   stelleabsatznummerierungein      nastavcislovaniodstavcu
                                   impostanumerazionecapoversi      seteazanumerotareparagrafe
-             stelregelnummerenin: stelregelnummerenin              setuplinenumbering
+              setuplinenumbering: stelregelnummerenin              setuplinenumbering
                                   stellezeilennumerierungein       nastavcislovaniradku
                                   impostanumerazionerighe          seteazanumerotarelinii
-              startregelnummeren: startregelnummeren               startlinenumbering
+              startlinenumbering: startregelnummeren               startlinenumbering
                                   startzeilennumerierung           startcislovaniradku
                                   inizianumerazionerighe           startnumerotarelinii
-               stopregelnummeren: stopregelnummeren                stoplinenumbering
+               stoplinenumbering: stopregelnummeren                stoplinenumbering
                                   stopzeilennumerierung            stopcislovaniradku
                                   terminanumerazionerighe          stopnumerotarelinii
-                      startregel: startregel                       startline
+                       startline: startregel                       startline
                                   startzeile                       startradek
                                   iniziariga                       startlinie
-                       stopregel: stopregel                        stopline
+                        stopline: stopregel                        stopline
                                   stopzeile                        stopradek
                                   terminariga                      stoplinie
-                        eenregel: eenregel                         someline
+                        someline: eenregel                         someline
                                   einezeile                        nejakyradek
                                   qualcheriga                      olinie
-                         inregel: inregel                          inline
+                          inline: inregel                          inline
                                   inzeile                          vradku
                                   inriga                           inlinie
                             crlf: crlf                             crlf
@@ -617,13 +626,13 @@ atrightmargin: oprechtermarge                   atrightmargin
 emptylines: legeregels emptylines
             emptylines emptylines
             emptylines emptylines
-                    stelregelsin: stelregelsin                     setuplines
+                      setuplines: stelregelsin                     setuplines
                                   stellezeilenein                  nastavradky
                                   impostarighe                     seteazalinii
-                    startsmaller: startsmaller                     startnarrower
+                   startnarrower: startsmaller                     startnarrower
                                   startenger                       startzuzeni
                                   iniziapiustretto                 startingust
-                     stopsmaller: stopsmaller                      stopnarrower
+                    stopnarrower: stopsmaller                      stopnarrower
                                   stopenger                        stopzuzeni
                                   terminapiustretto                stopingust
                    setupnarrower: stelsmallerin                    setupnarrower
@@ -662,34 +671,34 @@ emptylines: legeregels emptylines
                         testpage: testpagina                       testpage
                                   testpage                         testpage
                                   testpage                         testpage
-                    koppelpagina: koppelpagina                     couplepage
+                     couplepage: koppelpagina                     couplepage
                                   doppelseite                      parovastrana
                                   accoppiapagina                   paginadubla
-                     soortpagina: soortpagina                      pagetype
+                        pagetype: soortpagina                      pagetype
                                   seitentyp                        typstrany
                                   tipopagina                       tippagina
-                   verwerkpagina: verwerkpagina                    processpage
+                     processpage: verwerkpagina                    processpage
                                   bearbeiteseite                   zpracujstranu
                                   elaborapagina                    proceseazapagina
-                    koppelpapier: koppelpapier                     couplepaper
+                     couplepaper: koppelpapier                     couplepaper
                                   doppelseitigespapier             dvoustrannypapir
                                   accoppiacarta                    hartiedubla
-                 selecteerpapier: selecteerpapier                  selectpaper
+                     selectpaper: selecteerpapier                  selectpaper
                                   waehlepapieraus                  vyberpapir
                                   selezionacarta                   selecteazahartie
-                          scherm: scherm                           screen
+                          screen: scherm                           screen
                                   bildschirm                       obrazovka
                                   schermo                          ecran
-                 definieersectie: definieersectie                  definesection
+                   definesection: definieersectie                  definesection
                                   definiereabschnitt               definujsekci
                                   definiscisezione                 definestesectiune
-             definieersectieblok: definieersectieblok              definesectionblock
+              definesectionblock: definieersectieblok              definesectionblock
                                   definiereabschnittsblock         definujbloksekce
                                   definiscibloccosezione           definesteblocsectiune
-                stelsectieblokin: stelsectieblokin                 setupsectionblock
+               setupsectionblock: stelsectieblokin                 setupsectionblock
                                   stelleabschnittsblockein         nastavbloksekce
                                   impostabloccosezione             seteazablocsectiune
-                    stelsectiein: stelsectiein                     setupsection
+                    setupsection: stelsectiein                     setupsection
                                   stelleabschnittein               nastavsekci
                                   impostasezione                   seteazasectiune
              notopandbottomlines: geenbovenenonderregels           notopandbottomlines
@@ -713,15 +722,24 @@ emptylines: legeregels emptylines
               setuppagenumbering: stelpaginanummeringin            setuppagenumbering
                                   stelleseitennummeriernungein     nastavcislovanistran
                                   impostanumerazionepagina         seteazanumerotarepagina
- resetnumber: resetnummer  resetnumber
-              resetnumber  resetnumber
-              resetnumber  resetnumber
-   setnumber: setnummer    setnumber
-              setnumber    setnumber
-              setnumber    setnumber
-stelnummerin: stelnummerin setupnumber
-              setupnumber  setupnumber
-              impostanumerazione  setupnumber
+      getnumber: haalnummer          getnumber
+                 getnumber           getnumber
+                 getnumber           getnumber
+incrementnumber: verhoognummer       incrementnumber
+                 nummererhoehen      zvysujicicislo
+                 incrementanumero    numarincrement
+decrementnumber: verlaagnummer       decrementnumber
+                 decrementnumber     decrementnumber
+                 decrementnumber     decrementnumber
+    resetnumber: resetnummer         resetnumber
+                 resetnumber         resetnumber
+                 resetnumber         resetnumber
+      setnumber: setnummer           setnumber
+                 setnumber           setnumber
+                 setnumber           setnumber
+    setupnumber: stelnummerin        setupnumber
+                 setupnumber         setupnumber
+                 impostanumerazione  setupnumber
                      setupbottom: stelonderin                      setupbottom
                                   stelleuntenein                   nastavspodek
                                   impostafondo                     seteazajos
@@ -740,6 +758,9 @@ stelnummerin: stelnummerin setupnumber
               setupsubpagenumber: stelsubpaginanummerin            setupsubpagenumber
                                   stelleunterseitennummerein       nastavpodcislostrany
                                   impostanumerosottopagina         seteazanumarsubpagina
+subpagenumber: subpaginanummer              subpagenumber
+               subpagenumber                subpagenumber
+               subpagenumber                subpagenumber
                        setuptext: steltekstin                      setuptext
                                   stelletextein                    nastavtext
                                   impostatesto                     seteazatext
@@ -761,16 +782,16 @@ stelnummerin: stelnummerin setupnumber
                            items: items                            items
                                   posten                           polozky
                                   elementi                         element
-                     stelitemsin: stelitemsin                      setupitems
+                      setupitems: stelitemsin                      setupitems
                                   stellepostenein                  nastavpolozky
                                   impostaelementi                  seteazaelemente
-                      regellinks: regellinks                       leftaligned
+                     leftaligned: regellinks                       leftaligned
                                   linksbuendig                     zarovnanovlevo
                                   allineasinistra                  aliniatstanga
-                     regelmidden: regelmidden                      midaligned
+                      midaligned: regelmidden                      midaligned
                                   zentriert                        zarovnanonastred
                                   allineacentro                    aliniatcentru
-                     regelrechts: regelrechts                      rightaligned
+                    rightaligned: regelrechts                      rightaligned
                                   rechtsbuendig                    zarovnanovpravo
                                   allineadestra                    aliniatdreapta
                     startcolumns: startkolommen                    startcolumns
@@ -836,25 +857,25 @@ stelnummerin: stelnummerin setupnumber
 
                                   % so far
 
-                    definieerkop: definieerkop                     definehead
+                      definehead: definieerkop                     definehead
                                   definiereueberschrift            definujnadpis
                                   definiscitesta                   definesteantet
-                       stelkopin: stelkopin                        setuphead
+                       setuphead: stelkopin                        setuphead
                                   stelleueberschriftein            nastavnadpis
                                   impostatesta                     seteazatitlu
-                    stelkoppenin: stelkoppenin                     setupheads
+                      setupheads: stelkoppenin                     setupheads
                                   stelleueberschriftenein          nastavnadpisy
                                   impostateste                     seteazatitluri
-                 stelkopnummerin: stelkopnummerin                  setupheadnumber
+                 setupheadnumber: stelkopnummerin                  setupheadnumber
                                   stellekopfzahlein                nastavcislonadpisu
                                   impostanumerotesta               seteazanumartitlu
-                       kopnummer: kopnummer                        headnumber
+                      headnumber: kopnummer                        headnumber
                                   kopfnummer                       cislonadpisu
                                   numerotesta                      numartitlu
-                huidigekopnummer: huidigekopnummer                 currentheadnumber
+               currentheadnumber: huidigekopnummer                 currentheadnumber
                                   heutigeskopfnummer               aktualnicislonadpisu
                                   numerotestacorrente              numartitlucurent
-                 bepaalkopnummer: bepaalkopnummer                  determineheadnumber
+             determineheadnumber: bepaalkopnummer                  determineheadnumber
                                   bestimmekopfnummer               stanovcislonadpisu
                                   determinanumerotesta             determinanumartitlu
                     resetmarking: resetmarkering                   resetmarking
@@ -887,16 +908,16 @@ stelnummerin: stelnummerin setupnumber
                      setuplayout: stellayoutin                     setuplayout
                                   stellelayoutein                  nastavvzhled
                                   impostalayout                    seteazaaspect
-                    paslayoutaan: paslayoutaan                     adaptlayout
+                     adaptlayout: paslayoutaan                     adaptlayout
                                   passelayoutan                    prizpusobvzhled
                                   adattalayout                     adapteazaaspect
                     steloffsetin: steloffsetin                     setupoffset
                                   stelleoffsetein                  nastavoffset
                                   impostaoffest                    seteazaoffset
-                    plaatsopgrid: plaatsopgrid                     placeongrid
+                     placeongrid: plaatsopgrid                     placeongrid
                                   amgitterausrichten               umistinamrizku
                                   mettiingriglia                   plaseazapegrid
-                 verplaatsopgrid: verplaatsopgrid                  moveongrid
+                      moveongrid: verplaatsopgrid                  moveongrid
                                   amgitterneuausrichten            premistinamrizku
                                   spostaagriglia                   mutapegrid
                       showsetups: tooninstellingen                 showsetups
@@ -932,7 +953,7 @@ setuppaper: stelpapierin  setuppaper
                   setuparranging: stelarrangerenin                 setuparranging
                                   stelleanordnenein                nastavusporadani
                                   impostaparranging                seteazaaranjareapag
-                          versie: versie                           version
+                         version: versie                           version
                                   version                          verze
                                   versione                         versiune
                 setupbackgrounds: stelachtergrondenin              setupbackgrounds
@@ -947,28 +968,28 @@ setuppaper: stelpapierin  setuppaper
                 setupinteraction: stelinteractiein                 setupinteraction
                                   stelleinteraktionein             nastavinterakci
                                   impostainterazione               seteazainteractiunea
-            stelinteractiemenuin: stelinteractiemenuin             setupinteractionmenu
+            setupinteractionmenu: stelinteractiemenuin             setupinteractionmenu
                                   stelleinteraktionsmenueein       nastavinterakcnimenu
                                   impostamenuinterazione           seteazameniuinteractiune
-         definieerinteractiemenu: definieerinteractiemenu          defineinteractionmenu
+           defineinteractionmenu: definieerinteractiemenu          defineinteractionmenu
                                   definiereinteraktionsmenue       definujinterakcnimenu
                                   definiscimenuinterazione         definestemeniuinteractiune
-          blokkeerinteractiemenu: blokkeerinteractiemenu           disableinteractionmenu
+          disableinteractionmenu: blokkeerinteractiemenu           disableinteractionmenu
                                   inaktiviereinteraktionsmenue     zablokujinterakcnimenu
                                   disabilitamenuinterazione        dezactiveazameniuinteractiune
-                  interactiemenu: interactiemenu                   interactionmenu
+                 interactionmenu: interactiemenu                   interactionmenu
                                   interaktionsmenue                interaktivnimenu
                                   menuinterattivo                  meniuinteractiune
-               interactiebuttons: interactiebuttons                interactionbuttons
+              interactionbuttons: interactiebuttons                interactionbuttons
                                   interaktionsknopfe               interakcnitlacitka
                                   pulsantinterazione               butoaneinteractiune
-                  interactiebalk: interactiebalk                   interactionbar
+                  interactionbar: interactiebalk                   interactionbar
                                   interaktionsbalken               interakcnilista
                                   barrainterazione                 barainteractiune
-            stelinteractiebalkin: stelinteractiebalkin             setupinteractionbar
+             setupinteractionbar: stelinteractiebalkin             setupinteractionbar
                                   stelleinteraktionsbalkenein      nastavinterakcnilistu
                                   impostabarrainterazione          seteazabarainteractiune
-          stelinteractieschermin: stelinteractieschermin           setupinteractionscreen
+          setupinteractionscreen: stelinteractieschermin           setupinteractionscreen
                                   stelleinteraktionsbildschirmein  nastavinterakcniobrazovku
                                   impostaschermointerazione        seteazaecraninteractiune
                   placebookmarks: plaatsbookmarks                  placebookmarks
@@ -1043,58 +1064,58 @@ setuppaper: stelpapierin  setuppaper
                      stopraster:  stopraster                       stopraster
                                   stopraster                       stoprastr
                                   terminaraster                    stopraster
-                  definieerblok:  definieerblok                    defineblock
+                    defineblock:  definieerblok                    defineblock
                                   definiereblock                   definujblok
                                   definisciblocco                  definestebloc
-                     stelblokin:  stelblokin                       setupblock
+                     setupblock:  stelblokin                       setupblock
                                   stelleblockein                   nastavblok
                                   impostablocco                    seteazabloc
-                 gebruikblokken:  gebruikblokken                   useblocks
+                      useblocks:  gebruikblokken                   useblocks
                                   verwendebloecke                  uzijbloky
                                   usablocco                        folosestebloc
-                 verwerkblokken:  verwerkblokken                   processblocks
+                  processblocks:  verwerkblokken                   processblocks
                                   bearbeitebloecke                 zpracujbloky
                                   elaborablocchi                   proceseazabloc
-                handhaafblokken:  handhaafblokken                  keepblocks
+                     keepblocks:  handhaafblokken                  keepblocks
                                   behaltebloecke                   zachovejbloky
                                   tieniblocchi                     pastreazablocuri
-               selecteerblokken:  selecteerblokken                 selectblocks
+                   selectblocks:  selecteerblokken                 selectblocks
                                   waehlebloeckeaus                 vyberbloky
                                   selezionablocchi                 selecteazablocuri
-                 verbergblokken:  verbergblokken                   hideblocks
+                     hideblocks:  verbergblokken                   hideblocks
                                   verbergebloecke                  schovejbloky
                                   nascondiblocchi                  ascundeblocuri
-                 passeerblokken:  passeerblokken                   bypassblocks
+                   bypassblocks:  passeerblokken                   bypassblocks
                                   bypassblocks                     bypassblocks
                                   saltablocchi                     saripesteblocuri
-                 forceerblokken:  forceerblokken                   forceblocks
+                    forceblocks:  forceerblokken                   forceblocks
                                   forceblocks                      forceblocks
                                   forzablocchi                     forteazablocuri
-                geenblokkenmeer:  geenblokkenmeer                  nomoreblocks
+                   nomoreblocks:  geenblokkenmeer                  nomoreblocks
                                   keinebloeckemehr                 zadnedalsibloky
                                   bastablocchi                     gatablocuri
-                 definieerlijst:  definieerlijst                   definelist
+                     definelist:  definieerlijst                   definelist
                                   definiereliste                   definujseznam
                                   definiscielenco                  definestelista
-    definieersamengesteldelijst:  definieersamengesteldelijst      definecombinedlist
+             definecombinedlist:  definieersamengesteldelijst      definecombinedlist
                                   definierezusammengestellteliste  definujkombinovanyseznam
                                   definiscielencocombinato         definestelistacombinata
 listsymbol: lijstsymbool listsymbol
             listsymbol   listsymbol
             listsymbol   listsymbol
-                    plaatslijst:  plaatslijst                      placelist
+                      placelist:  plaatslijst                      placelist
                                   platziereliste                   umistiseznam
                                   mettielenco                      punelista
                 plaatsruwelijst:  plaatslruweijst                  placerawlist
                                   placerawlist                     placerawlist
                                   placerawlist                     placerawlist
-       plaatssamengesteldelijst:  plaatssamengesteldelijst         placecombinedlist
+              placecombinedlist:  plaatssamengesteldelijst         placecombinedlist
                                   platzierezusammengestellteliste  umistikombinovanyseznam
                                   mettielencocombinato             punelistacombinata
-               schrijfnaarlijst:  schrijfnaarlijst                 writetolist
+                    writetolist:  schrijfnaarlijst                 writetolist
                                   schreibezurliste                 zapisdoseznamu
                                   scriviinelenco                   scrieinlista
-             schrijftussenlijst:  schrijftussenlijst               writebetweenlist
+               writebetweenlist:  schrijftussenlijst               writebetweenlist
                                   schreibezwischenliste            zapismeziseznam
                                   scrividentroelenco               scrieintreliste
 
@@ -1108,52 +1129,52 @@ listsymbol: lijstsymbool listsymbol
                                   immediatebetweenlist             immediatebetweenlist
                                   immediatebetweenlist             immediatebetweenlist
 
-                    stellijstin:  stellijstin                      setuplist
+                       setuplist: stellijstin                      setuplist
                                   stellelisteein                   nastavseznam
                                   impostaelenco                    seteazalista
-       stelsamengesteldelijstin:  stelsamengesteldelijstin         setupcombinedlist
+               setupcombinedlist: stelsamengesteldelijstin         setupcombinedlist
                                   stellezusammengestelltelisteein  nastavkombinovanyseznam
                                   impostaelencocombinato           seteazalistacombinata
-           bepaallijstkenmerken:  bepaallijstkenmerken             determinelistcharacteristics
+    determinelistcharacteristics: bepaallijstkenmerken             determinelistcharacteristics
                                   bestimmelistencharakeristika     stanovcharakteristickuseznamu
                                   determinacarattersticheelenco    determinacaracteristicilelistei
-                    lijstlengte:  lijstlengte                      listlength
+                      listlength: lijstlengte                      listlength
                                   listenlaenge                     delkaseznamu
                                   lunghezzaelenco                  lungimelista
-                   lijstbreedte:  lijstbreedte                     listwidth
+                       listwidth: lijstbreedte                     listwidth
                                   listenbreite                     sirkaseznamu
                                   ampiezzaelenco                   latimelista
-                    lijsthoogte:  lijsthoogte                      listheight
+                      listheight: lijsthoogte                      listheight
                                   listenhoehe                      vyskaseznamu
                                   altezzaelenco                    inaltimelista
-                      geenlijst:  geenlijst                        nolist
+                          nolist: geenlijst                        nolist
                                   keineliste                       zadnyseznam
                                   nienteelenco                     faralista
-        definieerreferentielijst: definieerreferentielijst         definereferencelist
+             definereferencelist: definieerreferentielijst         definereferencelist
                                   definierereferenzliste           definujseznamodkazu
                                   definiscilistariferimenti        definestelistareferinte
-           plaatsreferentielijst: plaatsreferentielijst            placereferencelist
+              placereferencelist: plaatsreferentielijst            placereferencelist
                                   platzierereferenzliste           umistiseznamodkazu
                                   mettilistariferimenti            punelistareferinte
-      schrijfnaarreferentielijst: schrijfnaarreferentielijst       writetoreferencelist
+            writetoreferencelist: schrijfnaarreferentielijst       writetoreferencelist
                                   schreibezurreferenzliste         zapisdoseznamuodkazu
                                   scriviinlistariferimenti         scrieinlistareferinte
-           stelreferentielijstin: stelreferentielijstin            setupreferencelist
+              setupreferencelist: stelreferentielijstin            setupreferencelist
                                   stellereferenzlisteein           nastavseznamodkazu
                                   impostalistariferimenti          seteazalistareferinte
-             definieerplaatsblok: definieerplaatsblok              definefloat
+                     definefloat: definieerplaatsblok              definefloat
                                   definieregleitobjekt             definujplvouciobjekt
                                   definiscioggettomobile           definestefloat
-                stelplaatsblokin: stelplaatsblokin                 setupfloat
+                      setupfloat: stelplaatsblokin                 setupfloat
                                   stellegleitobjektein             nastavplvouciobjekt
                                   impostaoggettomobile             seteazafloat
-             stelplaatsblokkenin: stelplaatsblokkenin              setupfloats
+                     setupfloats: stelplaatsblokkenin              setupfloats
                                   stellegleitobjekteein            nastavplvouciobjekty
                                   impostaoggettimobili             seteazafloats
-                splitsplaatsblok: splitsplaatsblok                 splitfloat
+                      splitfloat: splitsplaatsblok                 splitfloat
                                   teilegleitobjekt                 rozdelplvouciobjekt
                                   spezzaoggettomobile              impartefloat
-     stelplaatsblokkensplitsenin: stelplaatsblokkensplitsenin      setupfloatsplitting
+             setupfloatsplitting: stelplaatsbloksplitsenin         setupfloatsplitting
                                   stelleplatziegeteiltegleitobjekt nastavdeleniplvoucichobjektu
                                   impostaspezzamentooggettomobile  seteazaimpartireafloat
                       placefloat: plaatsplaatsblok                 placefloat
@@ -1183,10 +1204,10 @@ defineplacement: definieerplaats                  defineplacement
            placeontopofeachother: plaatsonderelkaar                placeontopofeachother
                                   platziereuntereinander           umistinadsebe
                                   mettiunosullaltro                punedeasuprafiecareia
-                 stelblokkopjein: stelblokkopjein                  setupcaption
+                    setupcaption: stelblokkopjein                  setupcaption
                                   stellebildunterschriftein        nastavpopisek
                                   impostacaption                   seteazalegenda % GB
-                stelblokkopjesin: stelblokkopjesin                 setupcaptions
+                   setupcaptions: stelblokkopjesin                 setupcaptions
                                   stellebilderunterschriftein      nastavpopisky
                                   impostacaptions                  seteazalegendele % GB
                setupcombinations: stelcombinatiesin                setupcombinations
@@ -1198,61 +1219,64 @@ defineplacement: definieerplaats                  defineplacement
                      stopoverlay: stopoverlay                      stopoverlay
                                   stopoverlay                      stopprekryv
                                   terminasovrapposizione           stopoverlay
-               definieerregister: definieerregister                defineregister
+                  defineregister: definieerregister                defineregister
                                   definiereregister                definujrejstrik
                                   definisciregistro                definesteregistru
-                  koppelregister: koppelregister                   coupleregister
+                  coupleregister: koppelregister                   coupleregister
                                   verknuepfregister                propojenyrejstrik
                                   accoppiaregistro                 cupleazaregistru
-                  stelregisterin: stelregisterin                   setupregister
+                   setupregister: stelregisterin                   setupregister
                                   stelleregisterein                nastavrejstrik
                                   impostaregistro                  seteazaregistru
-             schrijfnaarregister: schrijfnaarregister              writetoregister
+                 writetoregister: schrijfnaarregister              writetoregister
                                   schreibezumregister              zapisdorejstriku
                                   scriviinregistro                 scrieinregistru
-                  plaatsregister: plaatsregister                   placeregister
+completeregister: volledigregister              completeregister
+                  completeregister              completeregister
+                  completeregister              completeregister
+                   placeregister: plaatsregister                   placeregister
                                   platziereregister                umistirejstrik
                                   mettiregistro                    puneregistru
-         bepaalregisterkenmerken: bepaalregisterkenmerken          determineregistercharacteristics
+determineregistercharacteristics: bepaalregisterkenmerken          determineregistercharacteristics
                                   bestimmeregistercharakteristika  urcicharakteristikurejstriku
                                   determinacaratteristicheregistro determinacaracteristiciregistru
-               definieersorteren: definieersorteren                definesorting
+                   definesorting: definieersorteren                definesorting
                                   definieresortieren               definujtrideni
                                   definisciordinamento             definestesortare
-             definieersynoniemen: definieersynoniemen              definesynonyms
+                  definesynonyms: definieersynoniemen              definesynonyms
                                   definieresynonyme                definujsynonyma
                                   definiscisinonimi                definestesinonim
-                  stelsorterenin: stelsorterenin                   setupsorting
+                    setupsorting: stelsorterenin                   setupsorting
                                   stellesortierenein               nastavtrideni
                                   impostaordinamento               seteazasortare
-                stelsynoniemenin: stelsynoniemenin                 setupsynonyms
+                   setupsynonyms: stelsynoniemenin                 setupsynonyms
                                   stellesynonymein                 nastavsynonyma
                                   impostasinonimi                  seteazasinonime
-             startsynchronisatie: startsynchronisatie              startsynchronization
+            startsynchronization: startsynchronisatie              startsynchronization
                                   startsynchronisation             startsynchronizace
                                   iniziasincronizzazione           startsincronizare
-              stopsynchronisatie: stopsynchronisatie               stopsynchronization
+             stopsynchronization: stopsynchronisatie               stopsynchronization
                                   stopsynchronisation              stopsynchronizace
                                   terminasincronizzazione          stopsincronizare
-        stelsynchronisatiebalkin: stelsynchronisatiebalkin         setupsynchronizationbar
+         setupsynchronizationbar: stelsynchronisatiebalkin         setupsynchronizationbar
                                   stellesynchronisationsbalkenein  nastavsynchronizacnilistu
                                   impostabarrasincronizzazione     setarebarasincronizare
-            stelsynchronisatiein: stelsynchronisatiein             setupsynchronization
+            setupsynchronization: stelsynchronisatiein             setupsynchronization
                                   stellesynchronisationein         nastavsynchronizaci
                                   impostasincronizzazione          setaresincronizare
-              synchronisatiebalk: synchronisatiebalk               synchronizationbar
+              synchronizationbar: synchronisatiebalk               synchronizationbar
                                   synchronisationsbalken           synchronizacnilista
                                   barrasincronizzazione            barasincronizare
-                   synchroniseer: synchroniseer                    synchronize
+                     synchronize: synchroniseer                    synchronize
                                   synchronisieren                  synchronizovat
                                   sincronizza                      sincronizeaza
-           gebruikexterndocument: gebruikexterndocument            useexternaldocument
+             useexternaldocument: gebruikexterndocument            useexternaldocument
                                   verwendeexteresdokument          uzijexternidokument
                                   usadocumentoesterno              folosestedocumentextern
-                      gebruikURL: gebruikURL                       useURL
+                          useURL: gebruikURL                       useURL
                                   verwendeURL                      uzijURL
                                   usaURL                           folosesteURL
-                      gebruikurl: gebruikurl                       useurl
+                          useurl: gebruikurl                       useurl
                                   verwendeurl                      uzijurl
                                   usaurl                           folosesteurl
                         setupurl: stelurlin                        setupurl
@@ -1261,79 +1285,79 @@ defineplacement: definieerplaats                  defineplacement
                   coupledocument: koppeldocument                   coupledocument
                                   verknuepfedokument               propojenydokument
                                   accoppiadocumento                cupleazadocument
-                stelprogrammasin: stelprogrammasin                 setupprograms
+                   setupprograms: stelprogrammasin                 setupprograms
                                   stelleprogrammein                nastavprogramy
                                   impostaprogrammi                 seteazaprograme
-              definieerprogramma: definieerprogramma               defineprogram
+                   defineprogram: definieerprogramma               defineprogram
                                   definiereprogramme               definujprogram
                                   definisciprogramma               definesteprogram
-                       programma: programma                        program
+                         program: programma                        program
                                   programm                         program
                                   programma                        program
-          stelpaginaovergangenin: stelpaginaovergangenin           setuppagetransitions
+            setuppagetransitions: stelpaginaovergangenin           setuppagetransitions
                                   stelleseitenuebergangein         nastavprechodstrany
                                   impostatransizionepagina         seteazatranzitiepagina
-                definieerprofiel: definieerprofiel                 defineprofile
+                   defineprofile: definieerprofiel                 defineprofile
                                   definiereprofil                  definujprofil
                                   definisciprofilo                 definesteprofil
-                 definieerversie: definieerversie                  defineversion
+                   defineversion: definieerversie                  defineversion
                                   definiereversion                 definujverzi
                                   definisciversion                 definesteversiune
-                   markeerversie: markeerversie                    markversion
+                     markversion: markeerversie                    markversion
                                   beschrifteversion                oznacverzi
                                   marcaversione                    marcheazaversiune % GB
-                 selecteerversie: selecteerversie                  selectversion
+                   selectversion: selecteerversie                  selectversion
                                   waehleversionaus                 vyberverzi
                                   selezionaversione                selecteazaversiune % GB
-                    startprofiel: startprofiel                     startprofile
+                    startprofile: startprofiel                     startprofile
                                   startprofil                      startprofil
                                   iniziaprofilo                    startprofil
-                     startversie: startversie                      startversion
+                    startversion: startversie                      startversion
                                   startversion                     startverze
                                   iniziaversione                   startversiune
-                 stelprofielenin: stelprofielenin                  setupprofiles
+                   setupprofiles: stelprofielenin                  setupprofiles
                                   stelleprofilein                  nastavprofily
                                   impostaprofili                   seteazaprofile
-                   stelversiesin: stelversiesin                    setupversions
+                   setupversions: stelversiesin                    setupversions
                                   stelleversionein                 nastavverze
                                   impostaversioni                  seteazaversiuni
-                     stopprofiel: stopprofiel                      stopprofile
+                     stopprofile: stopprofiel                      stopprofile
                                   stopprofil                       stopprofil
                                   terminaprofili                   stopprofil
-                      stopversie: stopversie                       stopversion
+                     stopversion: stopversie                       stopversion
                                   stopversion                      stopverze
                                   terminaversioni                  stopversiune
-                     volgprofiel: volgprofiel                      followprofile
+                   followprofile: volgprofiel                      followprofile
                                   folgeprofil                      dodrzujprofil
                                   seguiprofilo                     urmeazaprofil
-               volgprofielversie: volgprofielversie                followprofileversion
+            followprofileversion: volgprofielversie                followprofileversion
                                   folgeprofilversion               dodrzujverziprofilu
                                   seguiversioneprofilo             urmeazaversiuneprofil
-                      volgversie: volgversie                       followversion
+                   followversion: volgversie                       followversion
                                   folgeversion                     dodrzujverzi
                                   seguiversione                    urmeazaversiune
-                  doordefinieren: doordefinieren                   definedescription
+               definedescription: doordefinieren                   definedescription
                                   definierebeschreibung            definujpopis
                                   definiscidescrizione             definestedescriere
-                     doorlabelen: doorlabelen                      definelabel
+                     definelabel: doorlabelen                      definelabel
                                   definierelabel                   definujpopisek
                                   definiscietichetta               definesteeticheta
-                    doornummeren: doornummeren                     defineenumeration
+               defineenumeration: doornummeren                     defineenumeration
                                   definierenummerierung            definujvycet
                                   definiscienumerazione            definesteenumerare
-                    doorspringen: doorspringen                     defineindenting
+                 defineindenting: doorspringen                     defineindenting
                                   definiereeinzug                  definujodsazovani
                                   definiscirientro                 definestealiat
-            steldoordefinierenin: steldoordefinierenin             setupdescriptions
+               setupdescriptions: steldoordefinierenin             setupdescriptions
                                   definierebeschreibungen          nastavpopisy
                                   impostadescrizioni               seteazadescriere
-              steldoornummerenin: steldoornummerenin               setupenumerations
+               setupenumerations: steldoornummerenin               setupenumerations
                                   stellebeschreibungein            nastavvycty
                                   impostaenumerazioni              seteazaenumerare
-              steldoorspringenin: steldoorspringenin               setupindentations
+               setupindentations: steldoorspringenin               setupindentations
                                   stelleeinzuegein                 nastavodsazovani
                                   impostarientri                   seteazaaliniate
-                       steltabin: steltabin                        setuptab
+                        setuptab: steltabin                        setuptab
                                   stelletabein                     nastavtab
                                   impostatab                       seteazatab
                              tab: tab                              tab
@@ -1372,7 +1396,7 @@ defineplacement: definieerplaats                  defineplacement
                       menubutton: menubutton                       menubutton
                                   menueknopf                       tlacitkomenu
                                   pulsantemenu                     butonmeniu
-                   stelbuttonsin: stelbuttonsin                    setupbuttons
+                    setupbuttons: stelbuttonsin                    setupbuttons
                                   stelleknopfein                   nastavtlacitka
                                   impostapulsanti                  seteazabutoane
                    usereferences: gebruikreferenties               usereferences
@@ -1405,19 +1429,19 @@ defineplacement: definieerplaats                  defineplacement
                     useJSscripts: gebruikJSscripts                 useJSscripts
                                   verwendeJSscript                 uzijJSscripts
                                   usaJSscripts                     folosestescriptJS
-                             uit: uit                              from
+                            from: uit                              from
                                   von                              zref
                                   da                               din
                               in: in                               in
                                   in                               tref
                                   in                               in
-                              op: op                               at
+                              at: op                               at
                                   bei                              pref
                                   al                               la % GB
-                            over: over                             about
+                           about: -                                about
                                   ueber                            oref
                                   intorno                          despre
-                            naar: naar                             goto
+                            goto: naar                             goto
                                   zu                               jdina
                                   vaia                             dute
                           atpage: oppagina                         atpage
@@ -1432,16 +1456,16 @@ navigating: navigerend navigating
                              ref: ref                              ref
                                   ref                              ref
                                   rif                              ref
-                         naarbox: naarbox                          gotobox
+                         gotobox: naarbox                          gotobox
                                   zurbox                           jdinabox
                                   vaiabox                          dutebox  % GB
-                      naarpagina: naarpagina                       gotopage
+                        gotopage: naarpagina                       gotopage
                                   zurseite                         jdinastranu
                                   vaiapagina                       dutepagina
-                   plaatsformule: plaatsformule                    placeformula
+                    placeformula: plaatsformule                    placeformula
                                   platziereformel                  umistirovnici
                                   mettiformula                     puneformula
-                plaatssubformule: plaatssubformule                 placesubformula
+                 placesubformula: plaatssubformule                 placesubformula
                                   platziereunterformel             umistipodrovnici
                                   mettisottoformula                punesubformula
 moveformula: verplaatsformule  moveformula
@@ -1450,16 +1474,16 @@ moveformula: verplaatsformule  moveformula
                    setupformulas: stelformulesin                   setupformulae
                                   stelleformelnein                 nastavrovnice
                                   impostaformule                   seteazaformule
-                   formulenummer: formulenummer                    formulanumber
+                   formulanumber: formulenummer                    formulanumber
                                   formelnummer                     cislorovnice
                                   numeroformula                    numarformula
-                subformulenummer: subformulenummer                 subformulanumber
+                subformulanumber: subformulenummer                 subformulanumber
                                   unterformelnummer                cislopodrovnice
                                   numerosottoformula               numarsubformula
                              leg: leg                              leg
                                   leg                              leg
                                   leg                              leg
-                             geg: geg                              fact
+                            fact: geg                              fact
                                   geg                              fakt
                                   fatto                            fact
                      mathematics: wiskunde                         mathematics
@@ -1471,28 +1495,22 @@ moveformula: verplaatsformule  moveformula
                      nodimension: geendimensie                     nodimension
                                   keindimension                    zadnyrozmer
                                   nientedimensioni                 faradimensiune
-                   startomgeving: startomgeving                    startenvironment
+                startenvironment: startomgeving                    startenvironment
                                   startumgebung                    startprostredi
                                   iniziaambiente                   startmediu
-                    stopomgeving: stopomgeving                     stopenvironment
+                 stopenvironment: stopomgeving                     stopenvironment
                                   stopumgebung                     stopprostredi
                                   terminaambiente                  stopmediu
-               startdeelomgeving: startdeelomgeving                startlocalenvironment
-                                  startlokaleumgebung              startlokalnihoprostredi
-                                  iniziaambientelocale             startmediulocal
-                    deelomgeving: deelomgeving                     localenvironment
-                                  lokaleumgebung                   lokalnihoprostredi
-                                  ambientelocale                   mediulocal
-                  startonderdeel: startonderdeel                   startcomponent
+                  startcomponent: startonderdeel                   startcomponent
                                   startkomponente                  startkomponenta
                                   iniziacomponente                 startcomponenta
-                   stoponderdeel: stoponderdeel                    stopcomponent
+                   stopcomponent: stoponderdeel                    stopcomponent
                                   stopkomponente                   stopkomponenta
                                   terminacomponente                stopcomponenta
-                    startprodukt: startprodukt                     startproduct
+                    startproduct: startprodukt                     startproduct
                                   startprodukt                     startprodukt
                                   iniziaprodotto                   startprodus
-                     stopprodukt: stopprodukt                      stopproduct
+                     stopproduct: stopprodukt                      stopproduct
                                   stopprodukt                      stopprodukt
                                   terminaprodotto                  stopprodus
                     startproject: startproject                     startproject
@@ -1507,58 +1525,58 @@ moveformula: verplaatsformule  moveformula
                          project: project                          project
                                   projekt                          projekt
                                   progetto                         proiect
-                       onderdeel: onderdeel                        component
+                       component: onderdeel                        component
                                   komponente                       komponenta
                                   componenet                       componenta
-                         produkt: produkt                          product
+                         produxt: produkt                          product
                                   produkt                          produkt
                                   prodotto                         produs
-                        omgeving: omgeving                         environment
+                     environment: omgeving                         environment
                                   umgebung                         prostredi
                                   ambiente                         mediu
-                   geenfilesmeer: geenfilesmeer                    nomorefiles
+                     nomorefiles: geenfilesmeer                    nomorefiles
                                   keinedateienmehr                 zadnedalsisoubory
                                   bastafile                        farafisiere
-                      haalbuffer: haalbuffer                       getbuffer
+                       getbuffer: haalbuffer                       getbuffer
                                   holepuffer                       ziskejbuffer
                                   prendibuffer                     adubuffer
-                    stelbufferin: stelbufferin                     setupbuffer
+                     setupbuffer: stelbufferin                     setupbuffer
                                   stellepufferein                  nastavbuffer
                                   impostabuffer                    seteazabuffer
                       typebuffer: typebuffer                       typebuffer
                                   tippepuffer                      typebuffer
                                   typebuffer                       scriebuffer % GB
-                 definieerbuffer: definieerbuffer                  definebuffer
+                    definebuffer: definieerbuffer                  definebuffer
                                   definierepuffer                  definujbuffer
                                   definiscibuffer                  definestebuffer
-                       betekenis: betekenis                        unitmeaning
+                     unitmeaning: betekenis                        unitmeaning
                                   bedeutung                        vyznam
                                   nomeunita                        numeunitate % GB
-                          voluit: voluit                           infull
+                          infull: voluit                           infull
                                   volleswort                       plnezneni
                                   perlungo                         pelung
-                          citaat: citaat                           quotation
+                       quotation: citaat                           quotation
                                   zitat                            citace
                                   citazione                        citat
-                          citeer: citeer                           quote
+                           quote: citeer                           quote
                                   zitieren                         citovat
                                   menzione                         minicitat
-                     startcitaat: startcitaat                      startquotation
+                  startquotation: startcitaat                      startquotation
                                   startzitat                       startcitace
                                   iniziacitazione                  startcitat
-                      stopcitaat: stopcitaat                       stopquotation
+                   stopquotation: stopcitaat                       stopquotation
                                   stopzitat                        stopcitace
                                   terminacitazione                 stopcitat
-                   stelciterenin: stelciterenin                    setupquote
+                      setupquote: stelciterenin                    setupquote
                                   stellezitierenein                nastavcitaci
                                   impostamenzione                  seteazaminicitat
-                       definieer: definieer                        define
+                          define: definieer                        define
                                   definieren                       definuj
                                   definisci                        defineste
-                         herhaal: herhaal                          redo
+                            redo: herhaal                          redo
                                   wiederholen                      opakovat
                                   rifai                            refa
-                gebruikcommandos: gebruikcommandos                 usecommands
+                     usecommands: gebruikcommandos                 usecommands
                                   verwendebefehl                   uzijprikazy
                                   usacomandi                       folosestecomenzi
                  definestartstop: definieerstartstop               definestartstop
@@ -1579,7 +1597,7 @@ moveformula: verplaatsformule  moveformula
                       stopglobal: stopglobaal                      stopglobal
                                   stopglobal                       stopglobalni
                                   terminaglobale                   stopblobal
-                            naam: naam                             name
+                       macroname: naam                             name
                                   name                             jmeno
                                   nome                             nume
                     definemakeup: definieeropmaak                  definemakeup
@@ -1597,16 +1615,16 @@ moveformula: verplaatsformule  moveformula
            useexternalsoundtrack: gebruikexterngeluidsfragment     useexternalsoundtrack
                                   verwendeexternestonstueck        uzijexternizvuk
                                   usacolonnasonoraesterna          folosestemuzicaexterna
-              gebruikexternefile: gebruikexternefile               useexternalfile
+                 useexternalfile: gebruikexternefile               useexternalfile
                                   verwendeexternedatei             uzijexternisoubor
                                   usafileesterno                   folosestefisierextern
-             gebruikexternefiles: gebruikexternefiles              useexternalfiles
+                useexternalfiles: gebruikexternefiles              useexternalfiles
                                   verwendeexternedateien           uzijexternisoubory
                                   usafileesterni                   folosestefisiereexterne
-                         kenmerk: kenmerk                          referral
+                        referral: kenmerk                          referral
                                   verweis                          odkaz
                                   referral                         referit % GB
-                    kenmerkdatum: kenmerkdatum                     referraldate
+                    referraldate: kenmerkdatum                     referraldate
                                   verweisdatum                     odkaznadatum
                                   datareferral                     datareferit
                             high: hoog                             high
@@ -1618,19 +1636,19 @@ moveformula: verplaatsformule  moveformula
                              low: laag                             low
                                   tief                             nizky
                                   ped                              jos
-                           breuk: breuk                            fraction
+                        fraction: breuk                            fraction
                                   bruch                            zlomek
                                   frazione                         fractie
                             chem: chem                             chem
                                   chem                             chem
                                   chim                             chem
-                      startnaast: startnaast                       startopposite
+                   startopposite: startnaast                       startopposite
                                   startgegenueber                  startprotejsek
                                   iniziaopposto                    startopozit
-                       stopnaast: stopnaast                        stopopposite
+                    stopopposite: stopnaast                        stopopposite
                                   stopgegenueber                   stopprotejsek
                                   terminaopposto                   stopopozit
-             stelnaastplaatsenin: stelnaastplaatsenin              setupoppositeplacing
+            setupoppositeplacing: stelnaastplaatsenin              setupoppositeplacing
                                   stellegegenueberplatzierenein    nastavumisteniprotejsku
                                   impostaposizionamentoopposti     seteazaplasareaopozita
                 startpositioning: startpositioneren                startpositioning
@@ -1651,34 +1669,34 @@ moveformula: verplaatsformule  moveformula
                      setuprotate: stelroterenin                    setuprotate
                                   stelledrehenein                  nastavotoceni
                                   impostarotazione                 seteazarotare
-                         spiegel: spiegel                          mirror
+                          mirror: spiegel                          mirror
                                   spiegeln                         zrcadlit
                                   riflessione                      reflexie
-                          schaal: schaal                           scale
+                           scale: schaal                           scale
                                   format                           meritko
                                   scala                            scala % GB
-                  stelnummerenin: stelnummerenin                   setupnumbering
+                  setupnumbering: stelnummerenin                   setupnumbering
                                   stellenummerierungein            nastavcislovani
                                   impostanumerazione               seteazanumerotare
                            reset: reset                            reset
                                   ruecksetzten                     reset
                                   reimposta                        reset
-               stelpublicatiesin: stelpublicatiesin                setuppublications
+               setuppublications: stelpublicatiesin                setuppublications
                                   stellepublikationein             nastavpublikace
                                   impostapubblicazioni             seteazapublicatii
-                      publicatie: publicatie                       publication
+                     publication: publicatie                       publication
                                   publikation                      publikace
                                   pubblicazione                    publicatie
-                   definieerhbox: definieerhbox                    definehbox
+                      definehbox: definieerhbox                    definehbox
                                   definierehbox                    definujhbox
                                   definiscihbox                    definestehbox
-                       toevoegen: toevoegen                        adding
+                          adding: toevoegen                        adding
                                   zusatz                           scitani
                                   adding                           adauga % GB
-                          punten: punten                           periods
+                         periods: punten                           periods
                                   punkt                            tecky
                                   punti                            puncte
-               stelkoppeltekenin: stelkoppeltekenin                setuphyphenmark
+                 setuphyphenmark: stelkoppeltekenin                setuphyphenmark
                                   stellebindestrichein             nastavdelitko
                                   impostasegnosillabazione         seteazaliniesilabe % GB
              setupinterlinespace: stelinterliniein                 setupinterlinespace
@@ -1696,19 +1714,19 @@ moveformula: verplaatsformule  moveformula
                          usepath: gebruikgebied                    usedirectory
                                   benutzeverzeichnis               uzijadresar % TOBIAS
                                   usacartella                      folosestedirector % GB
-                definieeralineas: definieeralineas                 defineparagraphs
+                defineparagraphs: definieeralineas                 defineparagraphs
                                   definiereabsaetze                definujodstavce
                                   definiscicapoversi               definesteparagraf
-                   stelalineasin: stelalineasin                    setupparagraphs
+                 setupparagraphs: stelalineasin                    setupparagraphs
                                   stelleabsaetzeein                nastavodstavce
                                   impostacapoversi                 seteazaparagrafe
-                        geentest: geentest                         donttest
+                        donttest: geentest                         donttest
                                   keintest                         zadnytest
                                   notest                           nutesta
                     setupcomment: stelcommentaarin                 setupcomment
                                   stellekommentarein               nastavkomentar
                                   impostacommento                  seteazacomentariu
-                      commentaar: commentaar                       comment
+                         comment: commentaar                       comment
                                   kommentar                        komentar
                                   commento                         comentariu
                      definefield: definieerveld                    definefield
@@ -1861,67 +1879,67 @@ definecolumnbreak: definieerkolomovergang  definecolumnbreak
                                   german                           czech
                                   italian                          romanian
 
-                     bovenhoogte: bovenhoogte                      topheight
+                       topheight: bovenhoogte                      topheight
                                   hoeheoben                        vyskahorejsku
                                   altezzacima                      inaltimesus
-                    bovenafstand: bovenafstand                     topdistance
+                     topdistance: bovenafstand                     topdistance
                                   abstandoben                      vzdalenosthorejsku
                                   distanzacima                     distantasus
-                     hoofdhoogte: hoofdhoogte                      headerheight
+                    headerheight: hoofdhoogte                      headerheight
                                   kopfzeilenhoehe                  vyskazahlavi
                                   altezzaintestazione              inaltimeantet
-                    hoofdafstand: hoofdafstand                     headerdistance
+                  headerdistance: hoofdafstand                     headerdistance
                                   kopfzeilenabstand                vzdalenostzahlavi
                                   distanzaintestazione             distantaantet
-                     teksthoogte: teksthoogte                      textheight
+                      textheight: teksthoogte                      textheight
                                   texthoehe                        vyskatextu
                                   altezzatesto                     inaltimetext
-                     voetafstand: voetafstand                      footerdistance
+                  footerdistance: voetafstand                      footerdistance
                                   fusszeileabstand                 vzdalenostupati
                                   distanzapdp                      distantasubsol
-                      voethoogte: voethoogte                       footerheight
+                    footerheight: voethoogte                       footerheight
                                   fusszeilenhoehe                  vyskaupati
                                   altezzapdp                       inaltimesubsol
-                    onderafstand: onderafstand                     bottomdistance
+                  bottomdistance: onderafstand                     bottomdistance
                                   abstandunten                     vzdalenostspodku
                                   distanzafondo                    distantajos
-                     onderhoogte: onderhoogte                      bottomheight
+                    bottomheight: onderhoogte                      bottomheight
                                   hoeheunten                       vyskaspodku
                                   altezzafondo                     inaltimejos
-                    margebreedte: margebreedte                     marginwidth
+                     marginwidth: margebreedte                     marginwidth
                                   marginalbreite                   sirkamarginalie
                                   ampiezzamargine                  latimemargine % GB
-              linkermargebreedte: linkermargebreedte               leftmarginwidth
+                 leftmarginwidth: linkermargebreedte               leftmarginwidth
                                   linkemarginalbreite              sirkalevemarginalie
                                   ampiezzamarginesinistro          latimemarginestanga
-             rechtermargebreedte: rechtermargebreedte              rightmarginwidth
+                rightmarginwidth: rechtermargebreedte              rightmarginwidth
                                   rechtemarginalbreite             sirkapravemarginalie
                                   ampiezzamarginedestro            latimemarginedreapta
-                    margeafstand: margeafstand                     margindistance
+                  margindistance: margeafstand                     margindistance
                                   marginalafstand                  vzdalenostmarginalie
                                   distanzamargine                  distantamargine
-              linkermargeafstand: linkermargeafstand               leftmargindistance
+              leftmargindistance: linkermargeafstand               leftmargindistance
                                   linkemarginalafstand             vzdalenostlevemarginalie
                                   distanzamarginesinistro          distantamarginestanga
-             rechtermargeafstand: rechtermargeafstand              rightmargindistance
+             rightmargindistance: rechtermargeafstand              rightmargindistance
                                   rechtemarginalafstand            vzdalenostpravemarginalie
                                   distanzamarginedestro            distantamarginedreapta
-                     randbreedte: randbreedte                      edgewidth
+                       edgewidth: randbreedte                      edgewidth
                                   randbreite                       sirkaokraje
                                   ampiezzabordo                    latimecolturi
-               linkerrandbreedte: linkerrandbreedte                leftedgewidth
+                   leftedgewidth: linkerrandbreedte                leftedgewidth
                                   breitelinkerrand                 sirkalevehookraje
                                   ampiezzabordosinistro            latimecoltstanga
-              rechterrandbreedte: rechterrandbreedte               rightedgewidth
+                  rightedgewidth: rechterrandbreedte               rightedgewidth
                                   breiterechterrand                sirkapravehookraje
                                   ampiezzabordodestro              latimecoltdreapta
-                     randafstand: randafstand                      edgedistance
+                    edgedistance: randafstand                      edgedistance
                                   randabstand                      vzdalenostokraje
                                   distanzabordo                    distantacolt
-               linkerrandafstand: linkerrandafstand                leftedgedistance
+                leftedgedistance: linkerrandafstand                leftedgedistance
                                   abstandlinkerrand                vzdalenostlevehookraje
                                   distanzabordosinistro            distantacoltstanga
-              rechterrandafstand: rechterrandafstand               rightedgedistance
+               rightedgedistance: rechterrandafstand               rightedgedistance
                                   abstandrechterrand               vzdalenostpravehookraje
                                   distanzabordodestro              distantacoltdreapta
  innermarginwidth:   binnenmargebreedte  innermarginwidth
@@ -1948,37 +1966,37 @@ outermargindistance: buitenmargeafstand  outermargindistance
   outeredgedistance: buitenrandafstand  outeredgedistance
                      outeredgedistance  outeredgedistance
                      outeredgedistance  outeredgedistance
-                    tekstbreedte: tekstbreedte                     textwidth
+                       textwidth: tekstbreedte                     textwidth
                                   textbreite                       sirkatextu
                                   ampiezzatesto                    latimetext
-                      zetbreedte: zetbreedte                       makeupwidth
+                     makeupwidth: zetbreedte                       makeupwidth
                                   satzbreite                       sirkasazby
                                   ampiezzamakeup                   latimemakeup % GB
-                       zethoogte: zethoogte                        makeupheight
+                    makeupheight: zethoogte                        makeupheight
                                   satzhoehe                        vyskasazby
                                   altezzamakeup                    inaltimemakeup
-                          kopwit: kopwit                           topspace
+                        topspace: kopwit                           topspace
                                   kopfweite                        odsazenishora
                                   spaziocima                       spatiusus
-                        bodemwit: bodemwit                         bottomspace
+                     bottomspace: bodemwit                         bottomspace
                                   bottomspace                      bottomspace
                                   spaziofondo                      spatiujos
-                          rugwit: rugwit                           backspace
+                       backspace: rugwit                           backspace
                                   rumpfweite                       odsazenizleva
                                   spaziodietro                     spatiuspate % GB
-                         snijwit: snijwit                          cutspace
+                        cutspace: snijwit                          cutspace
                                   cutspace                         cutspace
                                   cutspace                         cutspace % GB
-                   papierbreedte: papierbreedte                    paperwidth
+                      paperwidth: papierbreedte                    paperwidth
                                   papierbreite                     sirkapapiru
                                   ampiezzacarta                    latimehartie
-                    papierhoogte: papierhoogte                     paperheight
+                     paperheight: papierhoogte                     paperheight
                                   papierhoehe                      vyskapapiru
                                   altezzacarta                     inaltimehartie
-              printpapierbreedte: printpapierbreedte               printpaperwidth
+                 printpaperwidth: printpapierbreedte               printpaperwidth
                                   printpapierbreite                sirkatiskpapiru
                                   ampiezzacartastampa              latimehartieimprimanta % GB
-               printpapierhoogte: printpapierhoogte                printpaperheight
+                printpaperheight: printpapierhoogte                printpaperheight
                                   printpapierhoehe                 vyskatiskpapiru
                                   altezzacartastampa               inaltimehartieimprimanta  % GB
                       pageoffset: paginaoffset                     pageoffset
@@ -1987,16 +2005,18 @@ outermargindistance: buitenmargeafstand  outermargindistance
                        pagedepth: paginadiepte                     pagedepth
                                   pagedepth                        pagedepth
                                   pagedepth                        pagedepth
-                       kopniveau: kopniveau                        headlevel
+                       headlevel: kopniveau                        headlevel
                                   kopfniveau                       hlavniuroven
                                   livellotesta                     niveltitlu % GB
                        linewidth: lijndikte                        linethickness
                                   liniendicke                      tloustkacary
                                   spessoreriga                     grosimelinie
-             totaalaantalpaginas: totaalaantalpaginas              totalnumberofpages
+              totalnumberofpages: totaalaantalpaginas              totalnumberofpages
                                   gesamtseitenanzahl               celkovypocetstran
                                   numerototaledipagine             numartotalpagini
-
+numberofsubpages: aantalsubpaginas             numberofsubpages
+                  numberofsubpages             numberofsubpages
+                  numberofsubpages             numberofsubpages
                     useXMLfilter: gebruikXMLfilter                 useXMLfilter
                                   useXMLfilter                     useXMLfilter
                                   useXMLfilter                     useXMLfilter
@@ -2059,31 +2079,35 @@ startcolumnmakeup: startkolomopmaak  startcolumnmakeup
                    stopoverzicht: stopoverzicht                    stopoverview
                                   stopueberblick                   stopprehled
                                   terminaoverview                  stopoverview
-                   stelbrievenin: stelbrievenin                    setupcorrespondence
-                                  stellekorrespondenzein           nastavkorespondenci
-                                  impostacorrispondenza            seteazacorespondenta
-                         brieven: brieven                          letters
-                                  briefe                           dopisy
-                                  lettere                          litere
-                           brief: brief                            letter
-                                  brief                            dopis
-                                  lettera                          litera
                            label: label                            label
                                   label                            poppisek
                                   etichetta                        eticheta
-                           sheet: sheet                            sheet
-                                  blatt                            list
-                                  foglio                           sheet
-                  stelstickersin: stelstickersin                   setupstickers
-                                  stellestickerein                 nastavetikety
-                                  impostafrancobolli               seteazastickers % GB
-                    stelsheetsin: stelsheetsin                     setupsheets
-                                  stelleblattein                   nastavlisty
-                                  impostafogli                     seteazasheets
+%
+% obsolete
+%
+%                    stelbrievenin: stelbrievenin                    setupcorrespondence
+%                                   stellekorrespondenzein           nastavkorespondenci
+%                                   impostacorrispondenza            seteazacorespondenta
+%                          brieven: brieven                          letters
+%                                   briefe                           dopisy
+%                                   lettere                          litere
+%                            brief: brief                            letter
+%                                   brief                            dopis
+%                                   lettera                          litera
+%                            sheet: sheet                            sheet
+%                                   blatt                            list
+%                                   foglio                           sheet
+%                   stelstickersin: stelstickersin                   setupstickers
+%                                   stellestickerein                 nastavetikety
+%                                   impostafrancobolli               seteazastickers % GB
+%                     stelsheetsin: stelsheetsin                     setupsheets
+%                                   stelleblattein                   nastavlisty
+%                                   impostafogli                     seteazasheets
+%
                           labels: labels                           labels
                                   labels                           popisky
                                   etichette                        etichete
-                      woonplaats: woonplaats                       domicile
+                        domicile: woonplaats                       domicile
                                   wohnort                          bydliste
                                   domicilio                        domiciliu
 
diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex
index a4e24f508..29f6af93d 100644
--- a/tex/context/base/mult-con.tex
+++ b/tex/context/base/mult-con.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=mult-con,
+%D   [       filefile=mult-con,
 %D        version=2000.09.12,
 %D          title=\CONTEXT\ Multilingual Macros,
 %D       subtitle=Constants,
@@ -33,19 +33,19 @@
                            german                    czech
                            italian                   romanian
 
-                      een: een                       one
+                      one: een                       one
                            eins                      jedna
                            uno                       unu
-                     twee: twee                      two
+                      two: twee                      two
                            zwei                      dve
                            due                       doi
-                     drie: drie                      three
+                    three: drie                      three
                            drei                      tri
                            tre                       trei
-                     vier: vier                      four
+                     four: vier                      four
                            vier                      ctyri
                            quattro                   patru
-                     vijf: vijf                      five
+                     five: vijf                      five
                            fuenf                     pet
                            cinque                    cinci
 \stopvariables
@@ -131,13 +131,13 @@
                            german                    czech
                            italian                   romanian
 
-                 oppagina: oppagina                  atpage
+                 atpage: oppagina                  atpage
                            aufseite                  nastrance
                            apagina                   lapagina
-                hierboven: hierboven                 hencefore
+                hencefore: hierboven                 hencefore
                            vorher                    vyse
                            precedente                precedent
-                hieronder: hieronder                 hereafter
+                hereafter: hieronder                 hereafter
                            nachher                   nize
                            seguente                  urmator
 
@@ -158,58 +158,58 @@
              sectionlevel: sectie                    section
                            abschnitt                 oddil
                            paragrafo                 sectiune
-                     deel: deel                      part
+                     part: deel                      part
                            teil                      cast
                            parte                     parte
-                hoofdstuk: hoofdstuk                 chapter
+                  chapter: hoofdstuk                 chapter
                            kapitel                   kapitola
                            capitolo                  capitol
-                onderwerp: onderwerp                 subject
+                  subject: onderwerp                 subject
                            thema                     tema
                            argomento                 subiect
-                paragraaf: paragraaf                 section
+                  section: paragraaf                 section
                            absatz                    sekce
                            capoverso                 sectiune
-                    titel: titel                     title
+                    title: titel                     title
                            titel                     titul
                            titolo                    titlu
-               margetitel: margetitel                margintitle
+              margintitle: margetitel                margintitle
                            marginaltitel             titulmarginalie
                            titoloinmargine           titlumarginal
-                   inhoud: inhoud                    content
+                  content: inhoud                    content
                            inhalt                    obsah
                            indice                    cuprins
-                 inhouden: inhouden                  contents
+                 contents: inhouden                  contents
                            inhalte                   obsah
                            indici                    cuprinsuri
-                  bijlage: bijlage                   appendix
+                 appendix: bijlage                   appendix
                            anhang                    dodatek
                            appendice                 apendix
-                 bijlagen: bijlagen                  appendices
+               appendices: bijlagen                  appendices
                            anhaenge                  dodatky
                            appendici                 apendixuri
-               hoofdtekst: hoofdtekst                bodypart
+                 bodypart: hoofdtekst                bodypart
                            haupttext                 hlavnicast
                            testoprincipale           principal % GB
-             hoofdteksten: hoofdteksten              bodymatter
+               bodymatter: hoofdteksten              bodymatter
                            haupttexte                hlavnicasti
                            testiprincipali           principalul % GB
-                inleiding: inleiding                 frontpart
+                frontpart: inleiding                 frontpart
                            einleitung                prednicast
                            prefazione                prolog
-              inleidingen: inleidingen               frontmatter
+              frontmatter: inleidingen               frontmatter
                            einleitungen              prednicasti
                            preambolo                 prologul
-               uitleiding: uitleiding                backpart
+                 backpart: uitleiding                backpart
                            epilog                    epilog
                            postfazione               epilog % GB
-             uitleidingen: uitleidingen              backmatter
+               backmatter: uitleidingen              backmatter
                            epiloge                   epilogy
                            postambolo                epilogul % GB
-                 voetnoot: voetnoot                  footnote
+                 footnote: voetnoot                  footnote
                            fussnote                  poznamkapodcarou
                            notapdp                   notasubsol
-                  systeem: systeem                   system
+                   system: systeem                   system
                            systeme                   system
                            sistema                   sistem
 
@@ -219,7 +219,7 @@
                            german                    czech
                            italian                   romanian
 
-                    typen: typen                     typing
+                   typing: typen                     typing
                            tippen                    typing
                            typing                    typing % GB
                      file: file                      file
@@ -240,34 +240,34 @@
                            german                    czech
                            italian                   romanian
 
-                  formule: formule                   formula
+                  formula: formule                   formula
                            formel                    rovnice
                            formula                   formula
-                 formules: formules                  formulae
+                 formulae: formules                  formulae
                            formeln                   rovnice
                            formule                   formule
-                   figuur: figuur                    figure
+                   figure: figuur                    figure
                            abbildung                 obrazek
                            figura                    figura
-                  figuren: figuren                   figures
+                  figures: figuren                   figures
                            abbildungen               obrazky
                            figure                    figure
-                    tabel: tabel                     table
+                    table: tabel                     table
                            tabelle                   tabulka
                            tabella                   tabelul
-                 tabellen: tabellen                  tables
+                   tables: tabellen                  tables
                            tabellen                  tabulky
                            tabelle                   tabelele
-                  grafiek: grafiek                   graphic
+                  graphic: grafiek                   graphic
                            grafik                    graf
                            grafico                   graficul
-                grafieken: grafieken                 graphics
+                 graphics: grafieken                 graphics
                            grafiken                  grafy
                            grafici                   graficele
                intermezzo: intermezzo                intermezzo
                            intermezzo                intermezzo
                            intermezzo                intermezzo
-              intermezzos: intermezzos               intermezzi
+               intermezzi: intermezzos               intermezzi
                            intermezzi                intermezzi
                            intermezzi                intermezzi
                     index: index                     index
@@ -276,10 +276,10 @@
                   indices: indices                   indices
                            indizies                  rejstriky
                            indicianalitici           indexuri
-                afkorting: afkorting                 abbreviation
+             abbreviation: afkorting                 abbreviation
                            abkuerzung                zkratka
                            abbreviazione             abreviere
-              afkortingen: afkortingen               abbreviations
+            abbreviations: afkortingen               abbreviations
                            abkuerzungen              zkratky
                            abbreviazioni             abrevieri
                      logo: logo                      logo
@@ -288,31 +288,28 @@
                     logos: logos                     logos
                            logos                     loga
                            loghi                     logos
-                  eenheid: eenheid                   unit
+                     unit: eenheid                   unit
                            einheit                   jednotka
                            unita                     unitate
-                 eenheden: eenheden                  units
+                    units: eenheden                  units
                            einheiten                 jednotky
                            unita                     unitati
-                    regel: regel                     line
+                     line: regel                     line
                            zeile                     radek
                            riga                      linia
-                   regels: regels                    lines
+                    lines: regels                    lines
                            zeilen                    radky
                            righe                     linii
                framedtext: kadertekst                framedtext
                            umrahmtertext             oramovanytext
                            testoincorniciato         textinconjurat
-
-                   citaat: citaat                    quotation
+                quotation: citaat                    quotation
                            zitat                     citace
                            citazione                 citat
-
-                   citeer: citeer                    quote
+                    quote: citeer                    quote
                            zitieren                  citovat
                            menzione                  minicitat
-
-                   spraak: spraak                    speech
+                   speech: spraak                    speech
                            speech                    speech
                            speech                    speech
                   itemize: opsomming                 itemize
@@ -376,79 +373,79 @@ midsentence: middenzin                 midsentence
                            limittext                 limittext
                            limittext                 limittext
 
-                    datum: datum                     date
+                     date: datum                     date
                            datum                     datum
                            data                      data
-                  voorwit: voorwit                   spacebefore
+              spacebefore: voorwit                   spacebefore
                            vorspatium                mezerapred
                            spazioprima               spatiuinainte
-                tussenwit: tussenwit                 spaceinbetween
+           spaceinbetween: tussenwit                 spaceinbetween
                            spaceinbetween            spaceinbetween
                            spaceinbetween            spaceinbetween
-                    nawit: nawit                     spaceafter
+               spaceafter: nawit                     spaceafter
                            nachspatium               mezeraza
                            spaziodopo                spatiudupa
-               zijvoorwit: zijvoorwit                sidespacebefore
+          sidespacebefore: zijvoorwit                sidespacebefore
                            nebenvorspatium           bocnimezerapred
                            spaziolateraleprima       spatiulateralinainte
-                 zijnawit: zijnawit                  sidespaceafter
+           sidespaceafter: zijnawit                  sidespaceafter
                            nebennachspatium          bocnimezeraza
                            spaziolateraledopo        spatiulateraldupa
-                      aan: aan                       to
+                       to: aan                       to
                            zu                        na
                            verso                     catre
-               aanduiding: aanduiding                indicator
+                indicator: aanduiding                indicator
                            indikator                 indikator
                            indicatore                indicator
-              achtergrond: achtergrond               background
+               background: achtergrond               background
                            hintergrund               pozadi
                            sfondo                    fundal
-        achtergronddiepte: achtergronddiepte         backgrounddepth
+          backgrounddepth: achtergronddiepte         backgrounddepth
                            hintergrundtiefe          hloubkapozadi
                            profonditasfondo          adancimefundal
-          achtergrondhoek: achtergrondhoek           backgroundcorner
+         backgroundcorner: achtergrondhoek           backgroundcorner
                            hintergrundwinkel         rohpozadi
                            angolosfondo              coltfundal
-splitskleur: splitskleur splitcolor
+ splitcolor: splitskleur splitcolor
              splitcolor  splitcolor
              splitcolor  splitcolor
-         achtergrondkleur: achtergrondkleur          backgroundcolor
+          backgroundcolor: achtergrondkleur          backgroundcolor
                            hintergrundfarbe          barvapozadi
                            coloresfondo              culoarefundal
-           voorgrondkleur: voorgrondkleur            foregroundcolor
+          foregroundcolor: voorgrondkleur            foregroundcolor
                            foregroundcolor           foregroundcolor
                            coloreprimopiano          foregroundcolor
-          voorgrondletter: voorgrondletter           foregroundstyle
+          foregroundstyle: voorgrondletter           foregroundstyle
                            foregroundstyle           foregroundstyle
                            foregroundstyle           foregroundstyle
 clipoffset: clipoffset   clipoffset
             clipoffset   clipoffset
             clipoffset   clipoffset
-        achtergrondoffset: achtergrondoffset         backgroundoffset
+         backgroundoffset: achtergrondoffset         backgroundoffset
                            hintergrundoffset         offsetpozadi
                            offsetsfondo              offsetfundal
-        achtergrondraster: achtergrondraster         backgroundscreen
+         backgroundscreen: achtergrondraster         backgroundscreen
                            hintergrundraster         rastrpozadi
                            schermosfondo             ecranfundal
-        achtergrondstraal: achtergrondstraal         backgroundradius
+         backgroundradius: achtergrondstraal         backgroundradius
                            hintergrundradius         polomerpozadi
                            raggiosfondo              razafundal
-                    adres: adres                     address
+                  address: adres                     address
                            adresse                   adresa
                            indirizzo                 adresa
-                afsluiter: afsluiter                 stopper
+                  stopper: afsluiter                 stopper
                            abschnitttrenner          predel
                            stopper                   stopper
-                  afstand: afstand                   distance
+                 distance: afstand                   distance
                            abstand                   vzdalenost
                            distanza                  distanta
-                   alinea: alinea                    paragraph
+                paragraph: alinea                    paragraph
                            absatz                    odstavec
                            capoverso                 paragraf
-             assenstelsel: assenstelsel              axis
+                     axis: assenstelsel              axis
                            achsen                    osa
                            asse                      axa
-                   auteur: auteur                    author
+                   author: auteur                    author
                            autor                     autor
                            autore                    autor
                      auto: auto                      auto
@@ -457,122 +454,122 @@ clipoffset: clipoffset   clipoffset
                  autofile: autofile                  autofile
                            autofile                  autofile
                            autofile                  autofile % TB TH
-               balanceren: balanceren                balance
+                  balance: balanceren                balance
                            ausgleichen               rovnovaha
                            bilanciamento             balanta
-                  bfactor: bfactor                   wfactor
+                  wfactor: bfactor                   wfactor
                            bfaktor                   sfaktor
                            wfactor                   factorw % GB
-                   binnen: binnen                    inner
+                    inner: binnen                    inner
                            innen                     vnitrni
                            interno                   intern
-                   blanko: blanko                    blank
+                    blank: blanko                    blank
                            blanko                    prazdny
                            rigovuoto                 blanc
-                 blokkade: blokkade                  obstruction
+              obstruction: blokkade                  obstruction
                            gesperrt                  prekazka
                            ostruzione                obstructie
-                blokwijze: blokwijze                 blockway
+                 blockway: blokwijze                 blockway
                            blockauf                  dobloku
                            blockway                  blockway % GB
-                 bodemwit: bodemwit                  bottomspace
+              bottomspace: bodemwit                  bottomspace
                            bottomspace               bottomspace
                            spaziofondo               spatiujos
-                    boven: boven                     top
+                      top: boven                     top
                            oben                      vrsek
                            cima                      sus
-             bovenafstand: bovenafstand              topdistance
+              topdistance: bovenafstand              topdistance
                            obenabstand               vzdalenostvrsku
                            distanzacima              distantasus
-               bovenkader: bovenkader                topframe
+                 topframe: bovenkader                topframe
                            obenrahmen                rameceknahore
                            cornicecima               framesus
-              bovenoffset: bovenoffset               topoffset
+                topoffset: bovenoffset               topoffset
                            obenoffset                offsetvrsku
                            offsetcima                offsetsus
-              bovenstatus: bovenstatus               topstate
+                 topstate: bovenstatus               topstate
                            statusoben                statusvrsku
                            statocima                 staresus
-                  breedte: breedte                   width
+                    width: breedte                   width
                            breite                    sirka
                            ampiezza                  latime
-               maxbreedte: maxbreedte                maxwidth
+                 maxwidth: maxbreedte                maxwidth
                            maxbreite                 maxsirka
                            ampiezzamax               latimemaxima
-               minbreedte: minbreedte                minwidth
+                 minwidth: minbreedte                minwidth
                            minbreite                 minsirka
                            ampiezzamin               latimeminima % TB TH
-                     bron: bron                      source
+                   source: bron                      source
                            quelle                    zdroj
                            origine                   sursa
-                 commando: commando                  command
+                  command: commando                  command
                            befehl                    prikaz
                            comando                   comanda
-                commandos: commandos                 commands
+                 commands: commandos                 commands
                            befehle                   prikazy
                            comandi                   comenzi
 component: component                 component
            component                 component
            component                 component
-            contrastkleur: contrastkleur             contrastcolor
+            contrastcolor: contrastkleur             contrastcolor
                            kontrastfarbe             kontrastnibarva
                            colorecontrasto           culoarecontrast
-                conversie: conversie                 conversion
+               conversion: conversie                 conversion
                            konversion                konverze
                            conversione               conversie
-             kopconversie: kopconversie              headconversion
+           headconversion: kopconversie              headconversion
                            headconversion            konverzehlavicky
                            conversionetesta          conversietitlu % TB
-                 koplabel: koplabel                  headlabel
+                headlabel: koplabel                  headlabel
                            headlabel                 popisekhlavicky
                            etichettatesta            etichetatitlu % TB
                 criterium: criterium                 criterium
                            kriterium                 kriterium
                            criterio                  criteriu
-                    datum: datum                     date
+                     date: datum                     date
                            datum                     datum
                            data                      data
                   default: default                   default
                            default                   implicitni
                            implicito                 implicit
-                   diepte: diepte                    depth
+                    depth: diepte                    depth
                            tiefe                     hloubka
                            profondita                inaltime
-          dieptecorrectie: dieptecorrectie           depthcorrection
+          depthcorrection: dieptecorrectie           depthcorrection
                            tiefekorrektur            korekcehloubky
                            correzioneprofondita      corectieadancime
 %                    dikte: dikte                     thickness
 %                           dicke                     tloustka
 %                           spessore                  grosime
-                 doorgaan: doorgaan                  continue
+                 continue: doorgaan                  continue
                            fortsetzen                pokracovat
                            continua                  continua
-             dubbelzijdig: dubbelzijdig              doublesided
+              doublesided: dubbelzijdig              doublesided
                            doppelseitig              oboustranne
                            doppiafaccia              douafete
                     dummy: dummy                     dummy
                            dummy                     dummy
                            dummy                     dummy
-                  eenheid: eenheid                   unit
+                     unit: eenheid                   unit
                            einheit                   jednotka
                            unita                     unitate
-              eigennummer: eigennummer               ownnumber
+                ownnumber: eigennummer               ownnumber
                            eigenenummer              vlastnicislo
                            numeroproprio             numarpropriu
 % new
 %                eigenschap: eigenschap                property
 %                            property                  property
 %                            property                  property
-                evenmarge: evenmarge                 evenmargin
+               evenmargin: evenmarge                 evenmargin
                            geraderand                sudamarginalie
                            marginepari               marginepara
-                 expansie: expansie                  expansion
+                expansion: expansie                  expansion
                            expansion                 expanzen
                            espansione                expansiune
                    factor: factor                    factor
                            faktor                    faktor
                            fattore                   factor
-           converteerfile: converteerfile            convertfile
+              convertfile: converteerfile            convertfile
                            konvertieredatei          konverzesouboru
                            convertifile              convertestefisier
                      file: file                      file
@@ -581,7 +578,7 @@ component: component                 component
                 inputfile: inputfile                 inputfile
                            inputfile                 inputfile
                            inputfile                 inputfile % !!
-                  formaat: formaat                   size
+                     size: formaat                   size
                            groesse                   velikost
                            dimensione                dimensiune
                 autofocus: autofocus                 autofocus
@@ -590,202 +587,205 @@ component: component                 component
                     focus: focus                     focus
                            focus                     zaostreni
                            focus                     focus % GB
-                   gebied: gebied                    directory
+                directory: gebied                    directory
                            verzeichnis               adresar
                            directory                 director
                      grid: grid                      grid
                            gritter                   mrizka
                            griglia                   grid
-                    groot: groot                     big
+                      big: groot                     big
                            gross                     velky
                            grande                    mare
-                     haal: haal                      get
+                      get: haal                      get
                            hole                      ziskat
                            prendi                    adu
                      hang: hang                      hang
                            haengend                  zaveseni
                            sospendi                  suspenda
-                  herhaal: herhaal                   repeat
+                   repeat: herhaal                   repeat
                            wiederholen               opakovat
                            ripeti                    repeta
                   hfactor: hfactor                   hfactor
                            hfaktor                   vfaktor
                            hfactor                   hfactor  % GB
-                     hoek: hoek                      corner
+                   corner: hoek                      corner
                            winkel                    roh
                            angolo                    colt
                   hoffset: hoffset                   hoffset
                            hoffset                   hoffset
                            hoffset                   hoffset % GB
-                   hokjes: hokjes                    frames
+                   frames: hokjes                    frames
                            umrahmen                  ramecky
                            cornici                   frames
-                    hoofd: hoofd                     header
+                   header: hoofd                     header
                            kopfzeile                 zahlavi
                            intestazione              antet
-             hoofdafstand: hoofdafstand              headerdistance
+           headerdistance: hoofdafstand              headerdistance
                            kopfzeilenabstand         vzdalenostzahlavi
                            distanzaintestazione      distantaantet
-              hoofdstatus: hoofdstatus               headerstate
+              headerstate: hoofdstatus               headerstate
                            kopfzeilenstatus          statuszahlavi
                            statointestazione         stareantet
-                   hoogte: hoogte                    height
+                   height: hoogte                    height
                            hoehe                     vyska
                            altezza                   inaltime
-                maxhoogte: maxhoogte                 maxheight
+                maxheight: maxhoogte                 maxheight
                            maxhoehe                  maxvyska
                            altezzamax                inaltimemaxima
-                minhoogte: minhoogte                 minheight
+                minheight: minhoogte                 minheight
                            minhoehe                  minvyska
                            altezzamin                inaltimeminima
-                mindiepte: mindiepte                 mindepth
+                 mindepth: mindiepte                 mindepth
                            mindepth                  mindepth
                            mindeoth                  mindepth % new GB
-                  huidige: huidige                   current
+                  current: huidige                   current
                            aktuell                   aktualni
                            corrente                  curent
                        in: in                        in
                            in                        v
                            in                        in
-               inspringen: inspringen                indenting
+                indenting: inspringen                indenting
                            einziehen                 odsazovani
                            rientro                   aliniat
-               interactie: interactie                interaction
+              interaction: interactie                interaction
                            interaktion               interakce
                            interazione               interactiune
-               interlinie: interlinie                interlinespace
+           interlinespace: interlinie                interlinespace
                            zeilenabstande            meziradkovamezera
                            interlinea                spatiereinterliniara
                     items: items                     items
                            posten                    polozky
                            elementi                  elemente
-                    kader: kader                     frame
+                    frame: kader                     frame
                            rahmen                    ramecek
                            cornice                   frame
-              kaderdiepte: kaderdiepte               framedepth
+               framedepth: kaderdiepte               framedepth
                            rahmentiefe               hloubkaramecku
                            profonditacornice         adancimeframe
-                kaderhoek: kaderhoek                 framecorner
+              framecorner: kaderhoek                 framecorner
                            rahmenwinkel              rohramecku
                            angolocornice             coltframe
-               kaderkleur: kaderkleur                framecolor
+               framecolor: kaderkleur                framecolor
                            rahmenfarbe               barvaramecku
                            colorecornice             culoareframe
-              kaderoffset: kaderoffset               frameoffset
+              frameoffset: kaderoffset               frameoffset
                            rahmenoffset              offsetramecku
                            offsetcornice             offsetframe
-              kaderstraal: kaderstraal               frameradius
+              frameradius: kaderstraal               frameradius
                            rahmenradius              polomerramecku
                            raggiocornice             razaframe
-                 kantlijn: kantlijn                  marginedge
+               marginedge: kantlijn                  marginedge
                            marginalkante             textovahrana
                            bordomargine              coltbordura
-            kantlijntekst: kantlijntekst             marginedgetext
+           marginedgetext: kantlijntekst             marginedgetext
                            marginalkantetext         textmarginalnihookraje
                            testobordomargine         textcoltbordura
-        karakteruitlijnen: karakteruitlijnen         aligncharacter
+           aligncharacter: karakteruitlijnen         aligncharacter
                            aligncharacter            aligncharacter
                            allineacarattere          aliniazacaracter % TB TH
-          uitlijnkarakter: uitlijnkarakter           alignmentcharacter
+       alignmentcharacter: uitlijnkarakter           alignmentcharacter
                            alignmentcharacter        alignmentcharacter
                            carattereallineamento     alierecaracter % TB TH
-                    klein: klein                     small
+                    small: klein                     small
                            klein                     male
                            piccolo                   mic
-                    kleur: kleur                     color
+                    color: kleur                     color
                            farbe                     barva
                            colore                    culoare
-                    kolom: kolom                     column
+                   column: kolom                     column
                            spalte                    sloupec
                            colonna                   coloana
-                 kolommen: kolommen                  columns
+                  columns: kolommen                  columns
                            spalten                   sloupce
                            colonne                   coloane
-             kolomafstand: kolomafstand              columndistance
+           columndistance: kolomafstand              columndistance
                            spaltenabstand            vzdalenostsloupcu
                            distanzacolonne           distantacoloane
-                 kopkleur: kopkleur                  headcolor
+              headcommand: kopcommando               headcommand
+                           headcommand               headcommand
+                           headcommand               headcommand
+                headcolor: kopkleur                  headcolor
                            kopffarbe                 barvahlavicky
                            coloretesta               culoaretitlu
-                kopletter: kopletter                 headstyle
+                headstyle: kopletter                 headstyle
                            kopfstil                  stylhlavicky
                            stiletesta                stiltitlu
-                    kopna: kopna                     afterhead
+                afterhead: kopna                     afterhead
                            nachkopf                  pohlavicce
                            dopotesta                 dupatitlu
-                kopoffset: kopoffset                 veroffset
+                veroffset: kopoffset                 veroffset
                            kopfoffset                offsethlavicky
                            veroffset                 veroffset % GB
-                koppeling: koppeling                 coupling
+                 coupling: koppeling                 coupling
                            verknuepfung              propojeni
                            accoppiamento             cuplare
-              koppelwijze: koppelwijze               couplingway
+              couplingway: koppelwijze               couplingway
                            verkopplungsart           zpusobpropojeni
                            modoaccoppiamento         modcuplare
-                  kopvoor: kopvoor                   beforehead
+               beforehead: kopvoor                   beforehead
                            vorkopf                   predhlavickou
                            primaditesta              inaintetitlu
-                   kopwit: kopwit                    topspace
+                 topspace: kopwit                    topspace
                            kopfspatium               svrchnimezera
                            spaziocima                spatiusus
-                    korps: korps                     bodyfont
+                 bodyfont: korps                     bodyfont
                            fliesstext                zakladnifont
                            fonttesto                 fonttext
                     label: label                     label
                            label                     popisek
                            etichetta                 eticheta
-                     leeg: leeg                      empty
+                    empty: leeg                      empty
                            leer                      prazdne
                            vuoto                     gol
-                   letter: letter                    style
+                    style: letter                    style
                            stil                      pismeno
                            stile                     stil
-                     lijn: lijn                      rule
+                     rule: lijn                      rule
                            linie                     linka
                            linea                     rigla
-                lijndikte: lijndikte                 rulethickness
+            rulethickness: lijndikte                 rulethickness
                            liniendicke               tloustkalinky
                            spessorelinea             grosimerigla
-                lijnkleur: lijnkleur                 rulecolor
+                rulecolor: lijnkleur                 rulecolor
                            linienfarbe               barvalinky
                            colorelinea               culoarerigla
-                    lijst: lijst                     list
+                     list: lijst                     list
                            liste                     seznam
                            elenco                    lista
-            linkerbreedte: linkerbreedte             leftwidth
+                leftwidth: linkerbreedte             leftwidth
                            linkerbreite              sirkavlevo
                            ampiezzasinistra          latimestanga
-              linkerkader: linkerkader               leftframe
+                leftframe: linkerkader               leftframe
                            linkerrahmen              ramecekvlevo
                            cornicesinistra           framestanga
-              linkerkleur: linkerkleur               leftcolor
+                leftcolor: linkerkleur               leftcolor
                            linkerfarbe               barvavlevo
                            coloresinistra            culoarestanga
-             linkerletter: linkerletter              leftstyle
+                leftstyle: linkerletter              leftstyle
                            linkerstil                stylvlevo
                            stilesinistra             stilstanga
-              linkermarge: linkermarge               leftmargin
+               leftmargin: linkermarge               leftmargin
                            linkerrand                levyokraj
                            marginesinistro           marginestanga
-       linkermargeafstand: linkermargeafstand        leftmargindistance
+       leftmargindistance: linkermargeafstand        leftmargindistance
                            linkerrandabstand         vzdalenostlevehookraje
                            distanzamarginesinistro   distantamarginestanga
-             linkeroffset: linkeroffset              leftoffset
+               leftoffset: linkeroffset              leftoffset
                            linkeroffset              levyoffset
                            offsetsinistro            offsetstanga
-               linkerrand: linkerrand                leftedge
+                 leftedge: linkerrand                leftedge
                            linkekante                levahrana
                            bordosinistro             bordurastanga
-        linkerrandafstand: linkerrandafstand         leftedgedistance
+         leftedgedistance: linkerrandafstand         leftedgedistance
                            linkerkantenabstand       vzdalenostlevehrany
                            distanzabordosinistro     distantabordurastanga
-              linkertekst: linkertekst               lefttext
+                 lefttext: linkertekst               lefttext
                            linkertext                textvlevo
                            testosinistro             textstanga % GB
-                    links: links                     left
+                     left: links                     left
                            links                     vlevo
                            sinistra                  stanga
-                   nlinks: nlinks                    nleft
+                    nleft: nlinks                    nleft
                            nlinks                    nvlevo
                            nsinistra                 nstanga
                      logo: logo                      logo
@@ -794,46 +794,46 @@ component: component                 component
                     logos: logos                     logos
                            logos                     loga
                            loghi                     logos
-                   lokaal: lokaal                    local
+                    local: lokaal                    local
                            lokal                     lokalne
                            locale                    local
-                    marge: marge                     margin
+                   margin: marge                     margin
                            marginalie                marginalie
                            margine                   margine
-             margeafstand: margeafstand              margindistance
+           margindistance: margeafstand              margindistance
                            marginalabstand           vzdalenostokraje
                            distanzamargine           distantamargine
-               margetekst: margetekst                margintext
+               margintext: margetekst                margintext
                            marginaltext              textmarginalie
                            testomargine              textmargine
-                markering: markering                 marking
+                  marking: markering                 marking
                            beschriftung              znaceni
                            marcatura                 marcaje
-                 markleur: markleur                  marcolor
+                 marcolor: markleur                  marcolor
                            beschrfarbe               barvaznacky
                            coloremarcatura           culoaremarcaj
-                marletter: marletter                 marstyle
+                 marstyle: marletter                 marstyle
                            beschrstil                stylsnacky
                            stilemarcatura            stilmarcaj
                      menu: menu                      menu
                            menue                     menu
                            menu                      meniu
-            splitsmethode: splitsmethode             splitmethod
+              splitmethod: splitsmethode             splitmethod
                            splitmethod               splitmethod
                            splitmethod               splitmethod
-             tekstmethode: tekstmethode              textmethod
+               textmethod: tekstmethode              textmethod
                            textmethod                textmethod
                            textmethod                textmethod
-               zijmethode: zijmethode                sidemethod
+               sidemethod: zijmethode                sidemethod
                            sidemethod                sidemethod
                            sidemethod                sidemethod
-                  methode: methode                   method
+                   method: methode                   method
                            methode                   metoda
                            metodo                    metoda
-                   midden: midden                    middle
+                   middle: midden                    middle
                            mittig                    stredni
                            centro                    mijloc % GB
-              middentekst: middentekst               middletext
+               middletext: middentekst               middletext
                            mittigertext              strednitext
                            testocentro               textmijloc % GB
                       max: max                       max
@@ -842,52 +842,52 @@ component: component                 component
                       min: min                       min
                            min                       min
                            min                       min
-                  monster: monster                   sample
+                   sample: monster                   sample
                            muster                    vzor
                            campione                  exemplu
-                       na: na                        after
+                    after: na                        after
                            nach                      po
                            dopo                      dupa
-                     naam: naam                      name
+                     name: naam                      name
                            name                      jmeno
                            nome                      nume
-               nacommando: nacommando                commandafter
+             commandafter: nacommando                commandafter
                            zumbefehl                 prikazpo
                            comdandodopo              comandadupa
-                   nboven: nboven                    ntop
+                     ntop: nboven                    ntop
                            noben                     nvrsek
                            ncima                     nsus
-                   niveau: niveau                    level
+                    level: niveau                    level
                            niveau                    uroven
                            livello                   nivel
-                  niveaus: niveaus                   levels
+                   levels: niveaus                   levels
                            niveaus                   urovne
                            livelli                   nivele
-                   nonder: nonder                    nbottom
+                  nbottom: nonder                    nbottom
                            nunten                    nspodek
                            nfondo                    njos
                      norm: norm                      norm
                            norm                      norm
                            norma                     norm
-                  nregels: nregels                   nlines
+                   nlines: nregels                   nlines
                            zzeile                    nradky
                            nrighe                    nlinii
-                   nummer: nummer                    number
+                   number: nummer                    number
                            nummer                    cislo
                            numero                    numar
-           nummercommando: nummercommando            numbercommand
+            numbercommand: nummercommando            numbercommand
                            nummerbefehl              ciselnyprikaz
                            comandonumero             comandanumar
-                 nummeren: nummeren                  numbering
+                numbering: nummeren                  numbering
                            nummerierung              cislovani
                            numerazione               numerotare
-              nummerkleur: nummerkleur               numbercolor
+              numbercolor: nummerkleur               numbercolor
                            nummernfarbe              barvacisla
                            colorenumero              culoarenumar
-             nummerletter: nummerletter              numberstyle
+              numberstyle: nummerletter              numberstyle
                            nummernstil               stylcisla
                            stilenumero               stilnumar
-           nummerscheider: nummerscheider            numberseparator
+          numberseparator: nummerscheider            numberseparator
                            nummernseperator          oddelovaccisla
                            separatorenumero          separatornumar
                    object: object                    object
@@ -896,70 +896,70 @@ component: component                 component
                    offset: offset                    offset
                            offset                    offset
                            offset                    offset
-                    onder: onder                     bottom
+                   bottom: onder                     bottom
                            unten                     spodek
                            fondo                     jos
-             onderafstand: onderafstand              bottomdistance
+           bottomdistance: onderafstand              bottomdistance
                            abstandunten              vzdalenostspodku
                            distanzafondo             distantajos
-               onderkader: onderkader                bottomframe
+              bottomframe: onderkader                bottomframe
                            untenrahmen               ramecekdole
                            cornicefondo              framejos
-              onderoffset: onderoffset               bottomoffset
+             bottomoffset: onderoffset               bottomoffset
                            untenoffset               offsetspodku
                            offsetfondo               offsetjos
-              onderstatus: onderstatus               bottomstate
+              bottomstate: onderstatus               bottomstate
                            untenstatus               statusspodku
                            statofondo                starejos
-              onevenmarge: onevenmarge               oddmargin
+                oddmargin: onevenmarge               oddmargin
                            ungeraderand              lichyokraj
                            marginedispari            margineimpara
-                       op: op                        at
+                       at: op                        at
                            bei                       u
                            ad                        la
-                    optie: optie                     option
+                   option: optie                     option
                            option                    volba
                            opzione                   optiune
-                   pagina: pagina                    page
+                     page: pagina                    page
                            seite                     stranka
                            pagina                    pagina
-           paginacommando: paginacommando            pagecommand
+              pagecommand: paginacommando            pagecommand
                            seitenbefehl              strankovyprikaz
                            comandopagina             comandapagina
-              paginakleur: paginakleur               pagecolor
+                pagecolor: paginakleur               pagecolor
                            seitenfarbe               barvastranky
                            colorepagina              culoarepagina
-             paginaletter: paginaletter              pagestyle
+                pagestyle: paginaletter              pagestyle
                            seitenstil                stylstranky
                            stilepagina               stilpagina
-             paginanummer: paginanummer              pagenumber
+               pagenumber: paginanummer              pagenumber
                            seitennummer              cislostranky
                            numeropagina              numarpagina
-         paginaovergangen: paginaovergangen          pageboundaries
+           pageboundaries: paginaovergangen          pageboundaries
                            seitenbegrenzung          hranicestranky
                            limitipagina              marginipagina
-             paginastatus: paginastatus              pagestate
+                pagestate: paginastatus              pagestate
                            pagestate                 pagestate
                            statopagina               pagestate % TODO
                     palet: palet                     palet
                            palette                   paleta
                            tavolozza                 paleta
-                   papier: papier                    paper
+                    paper: papier                    paper
                            papier                    papir
                            carta                     hartie
-                   plaats: plaats                    location
+                 location: plaats                    location
                            platz                     misto
                            luogo                     locatie
-          plaatsafsluiter: plaatsafsluiter           placestopper
+             placestopper: plaatsafsluiter           placestopper
                            setzetrenner              predelmista
                            mettistopper              punestopper % GB
-                 plaatsen: plaatsen                  place
+                    place: plaatsen                  place
                            platziere                 umistit
                            metti                     pune % GB
-                plaatskop: plaatskop                 placehead
+                placehead: plaatskop                 placehead
                            setzekopf                 umistihlavicku
                            mettitesta                punetitlu % GB
-                  positie: positie                   position
+                 position: positie                   position
                            position                  position
                            posizione                 pozitie % TB TH
                    prefix: prefix                    prefix
@@ -971,300 +971,300 @@ component: component                 component
                   preview: preview                   preview
                            vorschau                  nahled
                            anteprima                 previzualizare
-proces: proces   process
-        process  process
-        process  process
-  spot: spot spot
-        spot spot
-        spot spot
-                     punt: punt                      dot
+process: proces   process
+         process  process
+         process  process
+   spot: spot spot
+         spot spot
+         spot spot
+                      dot: punt                      dot
                            punkt                     tecka
                            punto                     punct
-                     pijl: pijl                      arrow
+                    arrow: pijl                      arrow
                            pfeil                     sipka
                            freccia                   sageata
-                     rand: rand                      edge
+                     edge: rand                      edge
                            kante                     hrana
                            bordo                     bordura
-              randafstand: randafstand               edgedistance
+             edgedistance: randafstand               edgedistance
                            kantenabstand             vzdalenosthrany
                            distanzabordo             distantabordura
-                   raster: raster                    screen
+                   screen: raster                    screen
                            raster                    rastr
                            schermo                   ecran
-           rechterbreedte: rechterbreedte            rightwidth
+               rightwidth: rechterbreedte            rightwidth
                            rechterbreite             sirkavpravo
                            ampiezzadestra            marginedreapta
-             rechterkader: rechterkader              rightframe
+               rightframe: rechterkader              rightframe
                            rechterrahmen             ramecekvpravo
                            cornicedestra             framedreapta
-             rechterkleur: rechterkleur              rightcolor
+               rightcolor: rechterkleur              rightcolor
                            rechterfarbe              barvavpravo
                            coloredestra              culoaredreapta
-            rechterletter: rechterletter             rightstyle
+               rightstyle: rechterletter             rightstyle
                            rechterstil               stylvpravo
                            stiledestra               stildreapta
-             rechtermarge: rechtermarge              rightmargin
+              rightmargin: rechtermarge              rightmargin
                            rechterrand               pravyokraj
                            marginedestro             marginedreapta
-      rechtermargeafstand: rechtermargeafstand       rightmargindistance
+      rightmargindistance: rechtermargeafstand       rightmargindistance
                            rechterrandabstand        vzdalenostpravehookraje
                            distanzamarginedestro     distantamarginedreapta
-            rechteroffset: rechteroffset             rightoffset
+              rightoffset: rechteroffset             rightoffset
                            rechterabstand            pravyoffset
                            offsetdestro              offsetdreapta
-              rechterrand: rechterrand               rightedge
+                rightedge: rechterrand               rightedge
                            rechtekante               pravahrana
                            bordodestro               borduradreapta
-       rechterrandafstand: rechterrandafstand        rightedgedistance
+        rightedgedistance: rechterrandafstand        rightedgedistance
                            rechterkantenabstand      vzdalenostpravehrany
                            distanzabordodestro       distantacoltdreapta
-             rechtertekst: rechtertekst              righttext
+                righttext: rechtertekst              righttext
                            rechtertext               textvpravo
                            testodestro               textdreapta % GB
-                   rechts: rechts                    right
+                    right: rechts                    right
                            rechts                    vpravo
                            destra                    dreapta
-                  nrechts: nrechts                   nright
+                   nright: nrechts                   nright
                            nrechts                   nvpravo
                            ndestra                   ndreapta
-                 reductie: reductie                  reduction
+                reduction: reductie                  reduction
                            reduktion                 redukce
                            riduzione                 reducere
-                refereren: refereren                 referencing
+              referencing: refereren                 referencing
                            referieren                odkazujici
                            referencing               referinta % GB
-                    regel: regel                     line
+                     line: regel                     line
                            zeile                     radek
                            riga                      linie
-           regelcorrectie: regelcorrectie            linecorrection
+           linecorrection: regelcorrectie            linecorrection
                            zeilekorrektur            korekceradku
                            correzioneriga            corectielinie
-                   regels: regels                    lines
+                    lines: regels                    lines
                            zeilen                    radky
                            righe                     linii
-                      rek: rek                       stretch
+                  stretch: rek                       stretch
                            strecken                  natahnout
                            dilata                    dilatat % CHECK
-                resolutie: resolutie                 resolution
+               resolution: resolutie                 resolution
                            aufloesung                rozliseni
                            risoluzione               rezolutie
-                  rotatie: rotatie                   rotation
+                 rotation: rotatie                   rotation
                            rotation                  rotace
                            rotazione                 rotatie
 % new
-               orientatie: orientatie                orientation
+              orientation: orientatie                orientation
                            orientation               orientation
                            orientation               orientation
 
-                rugoffset: rugoffset                 horoffset
+                horoffset: rugoffset                 horoffset
                            rumpfabstand              horoffset
                            horoffset                 offsetoriz % GB
-                   rugwit: rugwit                    backspace
+                backspace: rugwit                    backspace
                            rumpfspatium              zpetnamezera
                            backspace                 spatiuspate % GB
-                 richting: richting                  direction
+                direction: richting                  direction
                            richtung                  smer
                            direzione                 directie
-                   schaal: schaal                    scale
+                    scale: schaal                    scale
                            format                    meritko
                            scala                     scala
-                 scheider: scheider                  separator
+                separator: scheider                  separator
                            seperator                 oddelovac
                            separatore                separator
-                   scherm: scherm                    display
+                  display: scherm                    display
                            bildschirm                obrazovka
                            display                   display % GB
                     scope: scope                     scope
                            bereich                   rozsah
                            scope                     scop % GB
-                   sectie: sectie                    section
+                  section: sectie                    section
                            abschnitt                 oddil
                            sezione                   sectiune
-             sectienummer: sectienummer              sectionnumber
+            sectionnumber: sectienummer              sectionnumber
                            abschnittsnummer          cislooddilu
                            numerosezione             numarsectiune
 setups: setups setups
         setups setups
         setups setups
-                  snijwit: snijwit                   cutspace
+                 cutspace: snijwit                   cutspace
                            cutspace                  cutspace
                            cutspace                  cutspace % GB
-                    soort: soort                     family
+                   family: soort                     family
                            familie                   rodina
                            famiglia                  familie
-                   spatie: spatie                    space
+                    space: spatie                    space
                            spatium                   mezera
                            spazio                    spatiu
-               spatiering: spatiering                spacing
+                  spacing: spatiering                spacing
                            spatiumausgleich          mezerovani
                            spaziatura                spatiere
-                 splitsen: splitsen                  split
+                    split: splitsen                  split
                            split                     split
                            separa                    split % TB TH
-         springvolgendein: springvolgendein          indentnext
+               indentnext: springvolgendein          indentnext
                            ziehefolgendeein          odsadpristi
                            rientrasuccessivo         aliniaturmator
-                     stap: stap                      step
+                     step: stap                      step
                            schritt                   krok
                            passo                     pas
-                   stapel: stapel                    stack
+                    stack: stapel                    stack
                            stack                     stack
                            stack                     stack % TB GB
                     start: start                     start
                            start                     start
                            inizia                    start
-                   status: status                    state
+                    state: status                    state
                            status                    status
                            stato                     stare
                      stop: stop                      stop
                            stop                      stop
                            termina                   stop
-                   straal: straal                    radius
+                   radius: straal                    radius
                            radius                    polomer
                            raggio                    raza
-                   streep: streep                    dash
+                     dash: streep                    dash
                            strich                    pomlcka
                            dash                      dash % GB
                       sub: sub                       sub
                            unter                     pod
                            sotto                     sub
-                 subtitel: subtitel                  subtitle
+                 subtitle: subtitel                  subtitle
                            untertitel                podtitulek
                            sottotitolo               subtitlu
-                  symbool: symbool                   symbol
+                   symbol: symbool                   symbol
                            symbol                    symbol
                            simbolo                   simbol
-               symboolset: symboolset                symbolset
+                symbolset: symboolset                symbolset
                            symbolset                 sadasymbolu
                            setsimboli                setsimbol
-                 symkleur: symkleur                  symcolor
+                 symcolor: symkleur                  symcolor
                            symfarbe                  barvasymbolu
                            coloresimbolo             culoaresimbol
-                symletter: symletter                 symstyle
+                 symstyle: symletter                 symstyle
                            symstil                   stylsymboly
                            stilesimbolo              stilsimbol
-                 synoniem: synoniem                  synonym
+                  synonym: synoniem                  synonym
                            synonym                   synonymum
                            sinonimo                  sinonim
-            synoniemkleur: synoniemkleur             synonymcolor
+             synonymcolor: synoniemkleur             synonymcolor
                            synonymfarbe              barvasynonyma
                            coloresinonimi            culoaresinonim
-           synoniemletter: synoniemletter            synonymstyle
+             synonymstyle: synoniemletter            synonymstyle
                            synonymstil               stylsynonyma
                            stilesinonimi             stilsinonim
                       tab: tab                       tab
                            tab                       tab
                            tab                       tab
-                    teken: teken                     sign
+                     sign: teken                     sign
                            zeichen                   znak
                            segno                     semn
-                    tekst: tekst                     text
+                     text: tekst                     text
                            text                      text
                            testo                     text
-             tekstbreedte: tekstbreedte              textwidth
+                textwidth: tekstbreedte              textwidth
                            textbreite                sirkatextu
                            ampiezzatesto             latimetext
-            tekstcommando: tekstcommando             textcommand
+              textcommand: tekstcommando             textcommand
                            textbefehl                textovyprikaz
                            comandotesto              comandatext
-             tekstformaat: tekstformaat              textsize
+                 textsize: tekstformaat              textsize
                            textgroesse               velikosttextu
                            dimensionetesto           dimensiunetext
-               tekstkleur: tekstkleur                textcolor
+                textcolor: tekstkleur                textcolor
                            textfarbe                 barvatextu
                            coloretesto               culoaretext
-              tekstletter: tekstletter               textstyle
+                textstyle: tekstletter               textstyle
                            textstil                  styltextu
                            stiletesto                stiltext
-            tekstscheider: tekstscheider             textseparator
+            textseparator: tekstscheider             textseparator
                            textseparator             oddelovactextu
                            separatoretesto           separatortext
-              tekststatus: tekststatus               textstate
+                textstate: tekststatus               textstate
                            textstatus                statustextu
                            statotesto                staretext
-                    titel: titel                     title
+                    title: titel                     title
                            titel                     titul
                            titolo                    titlu
-           titeluitlijnen: titeluitlijnen            aligntitle
+               aligntitle: titeluitlijnen            aligntitle
                            titelausrichten           zarovnejtitul
                            allineatitolo             alinieretitlu
-               tolerantie: tolerantie                tolerance
+                tolerance: tolerantie                tolerance
                            toleranz                  tolerance
                            tolleranza                toleranta
-                   tussen: tussen                    inbetween
+                inbetween: tussen                    inbetween
                            zwischen                  mezi
                            tra                       intre
                      type: type                      type
                            typ                       typ
                            type                      type % GB
-                uitlijnen: uitlijnen                 align
+                    align: uitlijnen                 align
                            ausrichtung               zarovnani
                            allinea                   aliniere
-                urlspatie: urlspatie                 urlspace
+                 urlspace: urlspatie                 urlspace
                            urlspatium                prostorurl
                            spaziourl                 spatiuurl
-               urlvariant: urlvariant                urlalternative
+           urlalternative: urlvariant                urlalternative
                            urlalternative            urlalternativa
                            alternativaurl            urlalternativ
-                      van: van                       from
+                     from: van                       from
                            von                       z
                            da                        dela
-                  variant: variant                   alternative
+              alternative: variant                   alternative
                            alternative               alternativa
                            alternativa               alternativ
-                  verhoog: verhoog                   increment
+                increment: verhoog                   increment
                            erhoehen                  zvysit
                            incremento                increment % GB
-            verhoognummer: verhoognummer             incrementnumber
+          incrementnumber: verhoognummer             incrementnumber
                            nummererhoehen            zvysujicicislo
                            incrementanumero          numarincrement
-resetnummer: resetnummer             resetnumber
+resetnumber: resetnummer             resetnumber
              resetnumber             resetnumber
              resetnumber             resetnumber
-               verwijzing: verwijzing                reference
+                reference: verwijzing                reference
                            referenz                  odkaz
                            riferimento               referinta
-      onbekendeverwijzing: onbekendeverwijzing       unknownreference
+         unknownreference: onbekendeverwijzing       unknownreference
                            unbekantereferenz         neznamyodkaz
                            riferimentoingoto         referintanecunoscuta
-                     voet: voet                      footer
+                   footer: voet                      footer
                            fusszeile                 upati
                            piedipagina               subsol
-              voetafstand: voetafstand               footerdistance
+           footerdistance: voetafstand               footerdistance
                            fusszeilenabstand         vzdalenostupati
                            distanzapdp               distantasubsol
-               voetstatus: voetstatus                footerstate
+              footerstate: voetstatus                footerstate
                            fusszeilenstatus          statusupati
                            statopdp                  staresubsol
                   voffset: voffset                   voffset
                            voffset                   voffset
                            voffset                   voffset
-                 volgende: volgende                  next
+                     next: volgende                  next
                            folgende                  dalsi
                            successivo                urmatorul
-                     voor: voor                      before
+                   before: voor                      before
                            vor                       pred
                            prima                     inainte
-             voorcommando: voorcommando              commandbefore
+            commandbefore: voorcommando              commandbefore
                            vorbefehl                 predchoziprikaz
                            comandoprima              comandainainte
-                   vorige: vorige                    previous
+                 previous: vorige                    previous
                            vorige                    predchozi
                            precedente                precendent
-             vorigenummer: vorigenummer              previousnumber
+           previousnumber: vorigenummer              previousnumber
                            vorigenummer              predchozicislo
                            numeroprecedente          numarprecedent
-                wachttijd: wachttijd                 delay
+                    delay: wachttijd                 delay
                            wartezeit                 prodleva
                            attesa                    intarziere
-                    wijze: wijze                     way
+                      way: wijze                     way
                            art                       zpusob
                            modo                      mod
-                willekeur: willekeur                 random
+                   random: willekeur                 random
                            zufaellig                 nahodne
                            casuale                   aleator
-                      wit: wit                       white
+                    white: wit                       white
                            weiss                     bily
                            bianco                    alb
                   xfactor: xfactor                   xfactor
@@ -1276,10 +1276,10 @@ resetnummer: resetnummer             resetnumber
                   xoffset: xoffset                   xoffset
                            xoffset                   xoffset
                            xoffset                   xoffset % GB
-                  xschaal: xschaal                   xscale
+                   xscale: xschaal                   xscale
                            xformat                   xmeritko
                            xscale                    xscala % GB
-                    xstap: xstap                     xstep
+                    xstep: xstap                     xstep
                            xschritt                  xkrok
                            xstep                     xstep % GB
                   yfactor: yfactor                   yfactor
@@ -1291,100 +1291,100 @@ resetnummer: resetnummer             resetnumber
                   yoffset: yoffset                   yoffset
                            yoffset                   yoffset
                            yoffset                   yoffset % GB
-                  yschaal: yschaal                   yscale
+                   yscale: yschaal                   yscale
                            yformat                   ymeritko
                            yscale                    yscala % GB
-                    ystap: ystap                     ystep
+                    ystep: ystap                     ystep
                            yschritt                  ykrok
                            ystep                     ystep % GB
-             zelfdepagina: zelfdepagina              samepage
+                 samepage: zelfdepagina              samepage
                            selbeseite                stejnastranka
                            stessapagina              aceeasipagina
-zijuitlijnen: zijuitlijnen sidealign
+   sidealign: zijuitlijnen sidealign
               sidealign    sidealign
               sidealign    sidealign
-                      zij: zij                       side
+                     side: zij                       side
                            objektabstand             pocitat
                            lato                      parte
 % new
- veldlaag: veldlaag                  fieldlayer
-           fieldlayer                fieldlayer
-           fieldlayer                fieldlayer
-tekstlaag: tekstlaag                 textlayer
+ fieldlayer: veldlaag                  fieldlayer
+             fieldlayer                fieldlayer
+             fieldlayer                fieldlayer
+textlayer: tekstlaag                 textlayer
            textlayer                 textlayer
            textlayer                 textlayer
-     veldachtergrondkleur: veldachtergrondkleur      fieldbackgroundcolor
+     fieldbackgroundcolor: veldachtergrondkleur      fieldbackgroundcolor
                            feldhintergrundfarbe      barvapozadipole
                            coloresfondocampo         culoarefundalcamp
-           veldkaderkleur: veldkaderkleur            fieldframecolor
+          fieldframecolor: veldkaderkleur            fieldframecolor
                            feldrahmenfarbe           barvarameckupole
                            colorecornicecampo        culoareframecamp
-               veldoffset: veldoffset                fieldoffset
+              fieldoffset: veldoffset                fieldoffset
                            feldoffset                offsetpole
                            offsetcampo               offsetcamp
-                openactie: openactie                 openaction
+               openaction: openactie                 openaction
                            oeffenaktion              otevriakci
                            azioneapri                actiunedeschidere
-               sluitactie: sluitactie                closeaction
+              closeaction: sluitactie                closeaction
                            schliessenaktion          zavriakci
                            azionechiudi              actiuneinchidere
-          openpaginaactie: openpaginaactie           openpageaction
+           openpageaction: openpaginaactie           openpageaction
                            openpageaction            akceotevrenistranky
                            azioneapripagina          actiunedeschiderepagina % TB
-         sluitpaginaactie: sluitpaginaactie          closepageaction
+          closepageaction: sluitpaginaactie          closepageaction
                            closepageaction           akcezavrenistranky
                            azionechiudipagina        actiuneinchiderepagina % TB
-                   klikin: klikin                    clickin
+                  clickin: klikin                    clickin
                            klickin                   klikuvnitr
                            clickdentro               clickintru
-                  klikuit: klikuit                   clickout
+                 clickout: klikuit                   clickout
                            klickaus                  klikvne
                            clickfuori                clickies
-                 gebiedin: gebiedin                  regionin
+                 regionin: gebiedin                  regionin
                            regionin                  oblastuvnitr
                            entraregione              regiuneintrare
-                gebieduit: gebieduit                 regionout
+                regionout: gebieduit                 regionout
                            regionaus                 oblastvne
                            esciregione               regiuneiesire
                   focusin: focusin                   focusin
                            focusin                   focusin
                            focusin                   focusin
-                 focusuit: focusuit                  focusout
+                 focusout: focusuit                  focusout
                            focusout                  focusout
                            focusout                  focusout
-                  natoets: natoets                   afterkey
+                 afterkey: natoets                   afterkey
                            nachtaste                 klavesapo
                            dopotasto                 dupatasta
-               formatteer: formatteer                format
+                   format: formatteer                format
                            formatieren               formatovat
                            format                    format % GB
-                 valideer: valideer                  validate
+                 validate: valideer                  validate
                            validieren                validovat
                            verifica                  verifica
-                  bereken: bereken                   calculate
+                calculate: bereken                   calculate
                            berechnen                 pocitat
                            calcola                   calculeaza
-                     klik: klik                      click
+                    click: klik                      click
                            klick                     klik
                            click                     click
-                vcommando: vcommando                 vcommand
+                 vcommand: vcommando                 vcommand
                            vbefehl                   vprikaz
                            vcomando                  comandav
-                icommando: icommando                 icommand
+                 icommand: icommando                 icommand
                            ibefehl                   iprikaz
                            icomando                  comandai
-                ccommando: ccommando                 ccommand
+                 ccommand: ccommando                 ccommand
                            cbefehl                   cprikaz
                            ccomando                  comandac
 
-             tekstafstand: tekstafstand              textdistance
+             textdistance: tekstafstand              textdistance
                            textdistance              textdistance
                            distanzatesto             textdistance % TB TH
-               tekstmarge: tekstmarge                textmargin
+               textmargin: tekstmarge                textmargin
                            textmargin                textmargin
                            textmargin                textmargin   % TB TH
 
-trefwoord: trefwoord keyword
+  keyword: trefwoord keyword
            keyword keyword
            parolachiave keyword
 
@@ -1402,37 +1402,37 @@ trefwoord: trefwoord keyword
                            german                    czech
                            italian                   romanian
 
-                      aan: aan                       on
+                       on: aan                       on
                            an                        zap
                            attivo                    on
-                aanelkaar: aanelkaar                 serried
+                  serried: aanelkaar                 serried
                            kleinerabstand            semknuto
                            vicino                    serried
-              aansluitend: aansluitend               joinedup
+                 joinedup: aansluitend               joinedup
                            keinabstand               spojeno
                            unito                     unit
-                 absoluut: absoluut                  absolute
+                 absolute: absoluut                  absolute
                            absolut                   absolutni
                            assoluto                  absolut
-              achtergrond: achtergrond               background
+               background: achtergrond               background
                            hintergrund               pozadi
                            sfondo                    fundal
-                achteruit: achteruit                 backward
+                 backward: achteruit                 backward
                            rueckwaerts               zpet
                            indietro                  inapoi
-                    actie: actie                     action
+                   action: actie                     action
                            aktion                    akce
                            azione                    actiune
-                afsluiter: afsluiter                 stopper
+                  stopper: afsluiter                 stopper
                            trenner                   predel
                            stopper                   stopper
-                   alinea: alinea                    paragraph
+                paragraph: alinea                    paragraph
                            absatz                    odstavec
                            capoverso                 paragraf
-                    alles: alles                     all
+                      all: alles                     all
                            alles                     vse
                            tutti                     tot
-                   altijd: altijd                    always
+                   always: altijd                    always
                            immer                     vzdy
                            sempre                    totdeauna
                      auto: auto                      auto
@@ -1441,190 +1441,190 @@ trefwoord: trefwoord keyword
                 autointro: autointro                 autointro
                            autointro                 autouvod
                            autointro                 autointro
-                    beide: beide                     both
+                     both: beide                     both
                            beide                     obe
                            entrambi                  ambele
-                   binnen: binnen                    inner
+                    inner: binnen                    inner
                            innen                     uvnitr
                            interno                   intern
-                   blanko: blanko                    blank
+                    blank: blanko                    blank
                            blanko                    prazdny
                            rigovuoto                 blank
-                 blokkeer: blokkeer                  disable
+                  disable: blokkeer                  disable
                            sperren                   zablokovat
                            disattiva                 dezactivat
-                    boven: boven                     top
+                      top: boven                     top
                            oben                      vrsek
                            cima                      sus
-                    breed: breed                     wide
+                     wide: breed                     wide
                            breit                     siroce
                            ampio                     larg
-                  breedte: breedte                   width
+                    width: breedte                   width
                            breite                    sirka
                            ampiezza                  latime
-                   buiten: buiten                    outer
+                    outer: buiten                    outer
                            aussen                    vnejsi
                            esterno                   extern
-                  cijfers: cijfers                   numbers
+                  numbers: cijfers                   numbers
                            ziffern                   cisla
                            numeri                    numere
                   Cijfers: Cijfers                   Numbers
                            Ziffern                   Cisla
                            Numeri                    Numere
-                 commando: commando                  command
+                  command: commando                  command
                            befehl                    prikaz
                            comando                   comanda
-                commandos: commandos                 commands
+                 commands: commandos                 commands
                            befehle                   prikazy
                            comandi                   comenzi
                   concept: concept                   concept
                            konzept                   koncept
                            concetto                  concept
-                      dag: dag                       day
+                      day: dag                       day
                            tag                       den
                            giorno                    zi
-                    datum: datum                     date
+                     date: datum                     date
                            datum                     datum
                            data                      data
                   default: default                   default
                            default                   implicitni
                            implicito                 implicit
-               definitief: definitief                final
+                    final: definitief                final
                            endfassung                finalni
                            finale                    final
-                   diepte: diepte                    depth
+                    depth: diepte                    depth
                            tiefe                     podlehloubky
                            profondita                adancime
-             dubbelzijdig: dubbelzijdig              doublesided
+              doublesided: dubbelzijdig              doublesided
                            doppelseitig              dvoustranny
                            doppiafaccia              douafete
-                   eerste: eerste                    first
+                    first: eerste                    first
                            erste                     prvni
                            primo                     primul
-                      elk: elk                       each
+                     each: elk                       each
                            jede                      kazdy
                            ogni                      fiecare
-              enkelzijdig: enkelzijdig               singlesided
+              singlesided: enkelzijdig               singlesided
                            einzelseitig              jednostranne
                            facciasingola             ofata
-                   ergens: ergens                    somewhere
+                somewhere: ergens                    somewhere
                            irgendwo                  nekde
                            daqualcheparte            undeva
-                  nergens: nergens                   nowhere
+                  nowhere: nergens                   nowhere
                            nirgens                   nikde
                            danessunaparte            niciunde
                      even: even                      even
                            gerade                    sude
                            pari                      par
-                   extern: extern                    external
+                 external: extern                    external
                            extern                    externi
                            esterno                   extern
                      file: file                      file
                            datei                     soubor
                            file                      fisier
-                 flexibel: flexibel                  flexible
+                 flexible: flexibel                  flexible
                            flexibel                  prizpusobive
                            flessibile                flexibil
-                  forceer: forceer                   force
+                    force: forceer                   force
                            zwinge                    sila
                            forza                     fortat
-                 gebruikt: gebruikt                  used
+                     used: gebruikt                  used
                            verwende                  uzito
                            usato                     folosit
-                     geen: geen                      none
+                     none: geen                      none
                            kein                      zadny
                            nessuno                   niciunul
-            geenmarkering: geenmarkering             nomarking
+                nomarking: geenmarkering             nomarking
                            keinebeschriftung         zadneznaceni
                            nomarcature               faramarcare
-               geennummer: geennummer                nonumber
+                 nonumber: geennummer                nonumber
                            nonumber                  nonumber
                            nonumber                  nonumber % GB ETC NEW
-%                geentekst: geentekst                 notext
-%                           notext                    notext
-%                           notext                    notext % GB ETC NEW
-                  geenwit: geenwit                   nowhite
+%               geentekst: geentekst                 notext
+%                          notext                    notext
+%                          notext                    notext % GB ETC NEW
+                  nowhite: geenwit                   nowhite
                            keinweiss                 zadnabila
                            nobianco                  faraalb
-                geroteerd: geroteerd                 rotated
+                  rotated: geroteerd                 rotated
                            gedreht                   otoceno
                            ruotato                   rotat
-               gespiegeld: gespiegeld                mirrored
+                 mirrored: gespiegeld                mirrored
                            gespiegelt                zrcadleno
                            riflesso                  oglindit
-                  globaal: globaal                   global
+                   global: globaal                   global
                            global                    globalne
                            globale                   global
                      grid: grid                      grid
                            gritter                   mrizka
                            griglia                   grila
-                    groot: groot                     big
+                      big: groot                     big
                            gross                     velke
                            grande                    mare
-               grootkorps: grootkorps                bigbodyfont
+              bigbodyfont: grootkorps                bigbodyfont
                            bigbodyfont               bigbodyfont
                            grossofontdeltesto        bigbodyfont %%
-            grotevoorkeur: grotevoorkeur             bigpreference
+            bigpreference: grotevoorkeur             bigpreference
                            grosszuegig               vysokapriorita
                            grandepreferenza          preferintamare
-                    grijs: grijs                     gray
+                     gray: grijs                     gray
                            grau                      seda
                            grigio                    gri
-               halveregel: halveregel                halfline
+                 halfline: halveregel                halfline
                            halbezeile                pulradku
                            mezzariga                 jumatatelinie
-                 handhaaf: handhaaf                  keep
+                     keep: handhaaf                  keep
                            behalte                   drzet
                            mantieni                  mentine
-                  hangend: hangend                   hanging
+                  hanging: hangend                   hanging
                            haengend                  visici
                            sospeso                   suspendat
-                  herhaal: herhaal                   repeat
+                   repeat: herhaal                   repeat
                            wiederholen               opakovat
                            ripeti                    repetat
-                  herstel: herstel                   fix
+                      fix: herstel                   fix
                            stellewiederher           fixuj
                            fisso                     fix
-                     hier: hier                      here
+                     here: hier                      here
                            hier                      zde
                            qui                       aici
-                    hoofd: hoofd                     header
+                   header: hoofd                     header
                            kopfzeile                 zahlavi
                            intestazione              antet
-                     hoog: hoog                      high
+                     high: hoog                      high
                            hoch                      vysoko
                            alto                      inalt
-                   hoogte: hoogte                    height
+                   height: hoogte                    height
                            hoehe                     vyska
                            altezza                   inaltime
-              horizontaal: horizontaal               horizontal
+               horizontal: horizontaal               horizontal
                            horizontal                horizontalne
                            orizzontale               orizontal
-                  huidige: huidige                   current
+                  current: huidige                   current
                            aktuell                   aktualni
                            corrente                  curent
                        hz: hz                        hz
                            hz                        hz
                            hz                        hz
-                   geenhz: geenhz                    nohz
+                     nohz: geenhz                    nohz
                            nohz                      nohz
                            nohz                      nohz
                    italic: italic                    italic
                            italic                    kurziva
                            corsivo                   italic
-                 inlinker: inlinker                  inleft
+                   inleft: inlinker                  inleft
                            imlinken                  vlevo
                            insinistra                instanga
-                  inmarge: inmarge                   inmargin
+                 inmargin: inmarge                   inmargin
                            imrand                    naokraji
                            inmargine                 inmargine
-                inrechter: inrechter                 inright
+                  inright: inrechter                 inright
                            imrechten                 vpravo
                            indestra                  indreapta
-               interactie: interactie                interaction
+              interaction: interactie                interaction
                            interaktion               interakce
                            interazione               interactiune
-                  intekst: intekst                   intext
+                   intext: intekst                   intext
                            imtext                    dotextu
                            intesto                   intext
                     intro: intro                     intro
@@ -1633,139 +1633,139 @@ trefwoord: trefwoord keyword
                       its: its                       its
                            its                       pol
                            its                       propriu % GB
-                       ja: ja                        yes
+                      yes: ja                        yes
                            ja                        ano
                            si                        da
-                     jaar: jaar                      year
+                     year: jaar                      year
                            jahr                      rok
                            anno                      an
-                    kader: kader                     frame
+                    frame: kader                     frame
                            rahmen                    ramecek
                            cornice                   incadrat
-                 kantlijn: kantlijn                  marginedge
+               marginedge: kantlijn                  marginedge
                            marginalkante             textovahrana
                            bordomargine              marginebordura
-                      kap: kap                       cap
+                      cap: kap                       cap
                            kap                       kap
                            cap                       cap
-                 kapitaal: kapitaal                  capital
+                  capital: kapitaal                  capital
                            versalien                 kapitalky
                            maiuscolo                 majuscula
-                  kenmerk: kenmerk                   referral
+                 referral: kenmerk                   referral
                            merkmal                   znacka
                            referral                  referinta
-                    klein: klein                     small
+                    small: klein                     small
                            klein                     male
                            piccolo                   mic
-             kleinnormaal: kleinnormaal              smallnormal
+              smallnormal: kleinnormaal              smallnormal
                            kleinnormal               malenormalni
                            piccolonormale            micnormal
-              kleinschuin: kleinschuin               smallslanted
+             smallslanted: kleinschuin               smallslanted
                            kleingeneigt              malesklonene
                            piccoloinclinato          micinclinat
-           kleinschuinvet: kleinschuinvet            smallslantedbold
+         smallslantedbold: kleinschuinvet            smallslantedbold
                            kleingeneigtfett          malesklonenetucne
                            piccoloinclinatograssetto micinclinataldin
-              kleinitalic: kleinitalic               smallitalic
+              smallitalic: kleinitalic               smallitalic
                            kleinitalic               malekurzivni
                            piccolocorsivo            micitalic
-           kleinitalicvet: kleinitalicvet            smallitalicbold
+          smallitalicbold: kleinitalicvet            smallitalicbold
                            kleinitalicfett           malekurzivnitucne
                            piccolocorsivograssetto   micitalicaldin
-                kleintype: kleintype                 smalltype
+                smalltype: kleintype                 smalltype
                            kleintippen               maletype
                            piccolotype               mictype
-                 kleinvet: kleinvet                  smallbold
+                smallbold: kleinvet                  smallbold
                            kleinfett                 maletucne
                            piccolograssetto          micaldin
-           kleinvetschuin: kleinvetschuin            smallboldslanted
+         smallboldslanted: kleinvetschuin            smallboldslanted
                            kleinfettgeneigt          maletucnesklonene
                            piccolograssettoinclinato micaldininclinat
-           kleinvetitalic: kleinvetitalic            smallbolditalic
+          smallbolditalic: kleinvetitalic            smallbolditalic
                            kleinfettitalic           maletucnekurzivni
                            piccolograssettocorsivo   micaldininclinat
-               kleinkorps: kleinkorps                smallbodyfont
+            smallbodyfont: kleinkorps                smallbodyfont
                            smallbodyfont             smallbodyfont
                            piccolofontdelcorpo       smallbodyfont %%
-                    kleur: kleur                     color
+                    color: kleur                     color
                            farbe                     barevne
                            colore                    culoare
-                    kolom: kolom                     column
+                   column: kolom                     column
                            column                    column
                            colonna                   coloana % TB TH
-                 kolommen: kolommen                  columns
+                  columns: kolommen                  columns
                            spalten                   sloupce
                            colonne                   coloane
-                      kop: kop                       head
+                     head: kop                       head
                            kopf                      hlavicka
                            testa                     antet % GB
-                     laag: laag                      low
+                      low: laag                      low
                            tief                      nizko
                            basso                     jos
-                  laatste: laatste                   last
+                     last: laatste                   last
                            letzte                    posledni
                            ultimo                    ultim
                     label: label                     label
                            label                     popisek
                            etichetta                 eticheta
-                     laho: laho                      lohi
+                     lohi: laho                      lohi
                            hoti                      nivy
                            pedap                     lohi % TB TH
-                     lang: lang                      tall
+                     tall: lang                      tall
                            lang                      vysoko
                            alto                      inalt % GB
-                     leeg: leeg                      empty
+                    empty: leeg                      empty
                            leer                      prazdne
                            vuoto                     gol
                    Letter: Letter                    Character
                            Buchstabe                 Pismeno
                            Lettera                   Caracter
-                   letter: letter                    character
+                character: letter                    character
                            buchstabe                 pismeno
                            lettera                   caracter
                   Letters: Letters                   Characters
                            Buchstaben                Pismena
                            Lettere                   Caractere
-                  letters: letters                   characters
+               characters: letters                   characters
                            buchstaben                pismena
                            lettere                   caractere
-                  liggend: liggend                   landscape
+                landscape: liggend                   landscape
                            querformat                nasirku
                            orizzontale               vedere
-                     lijn: lijn                      rule
+                     rule: lijn                      rule
                            linie                     linka
                            linea                     rigla
-                    lijst: lijst                     list
+                     list: lijst                     list
                            liste                     seznam
                            elenco                    lista
-              linkermarge: linkermarge               leftmargin
+               leftmargin: linkermarge               leftmargin
                            linkerrand                levyokraj
                            marginesinistro           marginestanga
-             linkerpagina: linkerpagina              leftpage
+                 leftpage: linkerpagina              leftpage
                            linkerseite               levastranka
                            paginasinistra            paginastanga
-               linkerrand: linkerrand                leftedge
+                 leftedge: linkerrand                leftedge
                            linkekante                levahrana
                            bordosinistro             bordurastanga
-                    links: links                     left
+                     left: links                     left
                            links                     vlevo
                            sinistra                  stanga
-                   lokaal: lokaal                    local
+                    local: lokaal                    local
                            lokal                     lokalne
                            locale                    local
-                    nieuw: nieuw                     new
+                      new: nieuw                     new
                            neu                       novy
                            nuovo                     nou
                     MAAND: MAAND                     MONTH
                            MONAT                     MESIC
                            MESE                      LUNA
-                    maand: maand                     month
+                    month: maand                     month
                            monat                     mesic
                            mese                      luna
                       mar: mar                       mar
                            mar                       mar
                            mar                       mar
-                    marge: marge                     margin
+                   margin: marge                     margin
                            marginalie                marginalie
                            margine                   margine
                       max: max                       max
@@ -1777,85 +1777,85 @@ trefwoord: trefwoord keyword
                 mediaeval: mediaeval                 mediaeval
                            mittelalterlich           stredoveky
                            medievale                 medieval
-                   middel: middel                    medium
+                   medium: middel                    medium
                            mittel                    stredni
                            medio                     mediu
-                   midden: midden                    middle
+                   middle: midden                    middle
                            mittig                    nastred
                            centro                    centru
-                       na: na                        after
+                    after: na                        after
                            nach                      po
                            dopo                      dupa
-                     naam: naam                      name
+                     name: naam                      name
                            name                      jmeno
                            nome                      nume
-                    naast: naast                     opposite
+                 opposite: naast                     opposite
                            gegenueber                naproti
                            opposto                   opus
-                      nee: nee                       no
+                       no: nee                       no
                            nein                      ne
                            no                        nu
-                 negatief: negatief                  negative
+                 negative: negatief                  negative
                            negativ                   negativ
                            negativo                  negativ
-                 positief: positief                  positive
+                 positive: positief                  positive
                            positiv                   positiv
                            positivo                  positiv
-                     niet: niet                      not
+                      not: niet                      not
                            nicht                     ne
                            non                       nu
-                    nooit: nooit                     never
+                    never: nooit                     never
                            nie                       nikdy
                            mai                       niciodata
-                  normaal: normaal                   normal
+                   normal: normaal                   normal
                            normal                    normalni
                            normale                   normal
-                   nummer: nummer                    number
+                   number: nummer                    number
                            nummer                    cislo
                            numero                    numar
                    offset: offset                    offset
                            offset                    offset
                            offset                    offset
-                 onbekend: onbekend                  unknown
+                  unknown: onbekend                  unknown
                            unbekannt                 neznamy
                            ignoto                    necunoscut
-                    onder: onder                     bottom
+                   bottom: onder                     bottom
                            unten                     spodek
                            fondo                     subsol
-                   oneven: oneven                    odd
+                      odd: oneven                    odd
                            ungerade                  liche
                            dispari                   impar
-                 opelkaar: opelkaar                  packed
+                   packed: opelkaar                  packed
                            gepackt                   zhustene
                            impaccato                 impachetat
-                vanelkaar: vanelkaar                 unpacked
+                 unpacked: vanelkaar                 unpacked
                            ungepackt                 rozbalene
                            unpacked                  despachetat
-                   opmaak: opmaak                    makeup
+                   makeup: opmaak                    makeup
                            umbruch                   zlom
                            makeup                    marcaj
-                  opmarge: opmarge                   atmargin
+                 atmargin: opmarge                   atmargin
                            amrand                    naokraji
                            almargine                 lamargine
                   overlay: overlay                   overlay
                            overlay                   prekryv
                            sovrapponi                overlay
-                   pagina: pagina                    page
+                     page: pagina                    page
                            seite                     stranka
                            pagina                    pagina
-             paginanummer: paginanummer              pagenumber
+               pagenumber: paginanummer              pagenumber
                            seitennummer              cislostranky
                            numeropagina              numarpagina
-                   papier: papier                    paper
+                    paper: papier                    paper
                            papier                    papir
                            carta                     foaie
-                   scherm: scherm                    display
+                  display: scherm                    display
                            bildschirm                obrazovka
                            schermo                   display % new
-                omgekeerd: omgekeerd                 reverse
+                  reverse: omgekeerd                 reverse
                            reverse                   reverse
                            invertito                 reverse % new
-                  passend: passend                   fit
+                      fit: passend                   fit
                            passend                   prizpusobive
                            adatta                    ajustat
                postscript: postscript                postscript
@@ -1864,49 +1864,49 @@ trefwoord: trefwoord keyword
                   preview: preview                   preview
                            vorschau                  nahled
                            anteprima                 previzualizare
-                programma: programma                 program
+                  program: programma                 program
                            programm                  program
                            programma                 program
-proces: proces   process
-        process  process
-        process  process
-  spot: spot spot
-        spot spot
-        spot spot
-                     punt: punt                      dot
+process: proces   process
+         process  process
+         process  process
+   spot: spot spot
+         spot spot
+         spot spot
+                      dot: punt                      dot
                            punkt                     tecka
                            punto                     punct
                       ran: ran                       ran
                            ran                       rozsah
                            corse                     rulat
-                     rand: rand                      edge
+                     edge: rand                      edge
                            kante                     hrana
                            bordo                     bordura
-                   raster: raster                    screen
+                   screen: raster                    screen
                            raster                    rastr
                            schermo                   ecran
-                    recht: recht                     rectangular
+              rectangular: recht                     rectangular
                            rechteckig                pravouhly
                            rettangolare              rectangular
-             rechtermarge: rechtermarge              rightmargin
+              rightmargin: rechtermarge              rightmargin
                            rechterrand               pravyokraj
                            marginedestro             marginedreapta
-            rechterpagina: rechterpagina             rightpage
+                rightpage: rechterpagina             rightpage
                            rechterseite              pravastranka
                            paginadestra              paginadreapta
-              rechterrand: rechterrand               rightedge
+                rightedge: rechterrand               rightedge
                            rechterkante              pravahrana
                            bordodestro               borduradreapta
-                   rechts: rechts                    right
+                    right: rechts                    right
                            rechts                    vpravo
                            destra                    dreapta
-                    regel: regel                     line
+                     line: regel                     line
                            zeile                     radek
                            riga                      linie
                  register: register                  register
                            register                  rejstrik
                            registro                  registru
-                 relatief: relatief                  relative
+                 relative: relatief                  relative
                            relativ                   relativni
                            relativo                  relativ
                     reset: reset                     reset
@@ -1915,61 +1915,61 @@ proces: proces   process
                   Romeins: Romeins                   Romannumerals
                            Roemischezahlen           Rimskecislice
                            Numeriromani              Numereromane
-                  romeins: romeins                   romannumerals
+            romannumerals: romeins                   romannumerals
                            roemischezahlen           rimskecislice
                            numeriromani              numereromane
-                   grieks: grieks                    greek
+                    greek: grieks                    greek
                            griechisch                recky
                            greco                     grec
                    Grieks: Grieks                    Greek
                            Griechisch                Recky
                            Greco                     Grec
-                     rond: rond                      round
+                    round: rond                      round
                            rund                      zaobleny
                            rotondo                   rotund
-                   roteer: roteer                    rotate
+                   rotate: roteer                    rotate
                            drehe                     otoc
                            ruota                     rotit
-                      rek: rek                       stretch
+                  stretch: rek                       stretch
                            strecken                  natahnout
                            dilata                    dilatat
-                   rugwit: rugwit                    backspace
+                backspace: rugwit                    backspace
                            rumpfspatium              zpetnamezera
                            backspace                 spatiuspate % GB
-                     ruim: ruim                      broad
+                    broad: ruim                      broad
                            breit                     siroky
                            ampio                     broad
-                      rij: rij                       row
+                      row: rij                       row
                            row                       row
                            row                       rand
-                   schuin: schuin                    slanted
+                  slanted: schuin                    slanted
                            geneigt                   sklonene
                            inclinato                 inclinat
-                schuinvet: schuinvet                 slantedbold
+              slantedbold: schuinvet                 slantedbold
                            geneigtfett               sklonenetucne
                            inclinatograssetto        inclinataldin
-            synchroniseer: synchroniseer             synchronize
+              synchronize: synchroniseer             synchronize
                            synchronize               synchronize
                            synchronize               synchronize
-                italicvet: italicvet                 italicbold
+               italicbold: italicvet                 italicbold
                            italicfett                kurzivnitucne
                            corsivograssetto          italicaldin
-             sectienummer: sectienummer              sectionnumber
+            sectionnumber: sectienummer              sectionnumber
                            abschnittsnummer          cislooddilu
                            numerosezione             numarsetiune
-                     smal: smal                      narrow
+                   narrow: smal                      narrow
                            schmall                   uzky
                            stretto                   ingust
-                  snijwit: snijwit                   cutspace
+                 cutspace: snijwit                   cutspace
                            cutspace                  cutspace
                            cutspace                  cutspace % GB
-                   soepel: soepel                    tolerant
+                 tolerant: soepel                    tolerant
                            tolerant                  tolerantni
                            tollerante                tolerant
-                   spatie: spatie                    space
+                    space: spatie                    space
                            spatium                   mezera
                            spazio                    spatiu %% check
-                standaard: standaard                 standard
+                 standard: standaard                 standard
                            standard                  standardni
                            standard                  standard
                     start: start                     start
@@ -1978,7 +1978,7 @@ proces: proces   process
                      stop: stop                      stop
                            stop                      stop
                            termina                   stop
-                   streng: streng                    strict
+                   strict: streng                    strict
                            streng                    striktni
                            rigido                    strict
                     strut: strut                     strut
@@ -1990,10 +1990,10 @@ proces: proces   process
                       sym: sym                       sym
                            sym                       sym
                            sim                       sym
-                  symbool: symbool                   symbol
+                   symbol: symbool                   symbol
                            symbol                    symbol
                            simbolo                   simbol
-                    tekst: tekst                     text
+                     text: tekst                     text
                            text                      text
                            testo                     text
                      back: terug                     back
@@ -2002,13 +2002,13 @@ proces: proces   process
                      test: test                      test
                            test                      test
                            test                      text
-                   tussen: tussen                    inbetween
+                inbetween: tussen                    inbetween
                            zwischen                  mezi
                            tra                       intre
                      type: type                      type
                            tippen                    type
                            type                      type % GB
-                      uit: uit                       off
+                      off: uit                       off
                            aus                       vyp
                            disattivo                 dezactivat
                       url: url                       url
@@ -2017,82 +2017,82 @@ proces: proces   process
                       URL: URL                       URL
                            URL                       URL
                            URL                       URL
-                     vast: vast                      fixed
+                    fixed: vast                      fixed
                            fest                      fixne
                            fisso                     fixat
-                      los: los                       loose
+                    loose: los                       loose
                            lose                      uvolnene
                            lento                     larg
-                   verder: verder                    continue
+                 continue: verder                    continue
                            fortsetzten               pokracovat
                            continua                  continuu
-                vertikaal: vertikaal                 vertical
+                 vertical: vertikaal                 vertical
                            vertikal                  vertikalne
                            verticale                 vertical
-                      vet: vet                       bold
+                     bold: vet                       bold
                            fett                      tucne
                            grassetto                 aldin
-                vetschuin: vetschuin                 boldslanted
+              boldslanted: vetschuin                 boldslanted
                            fettgeneigt               tucnesklonene
                            grassettoinclinato        aldininclinat
-                vetitalic: vetitalic                 bolditalic
+               bolditalic: vetitalic                 bolditalic
                            fettitalic                tucnekurzivni
                            grassettocorsivo          aldinitalic
-                  viertal: viertal                   quadruple
+                quadruple: viertal                   quadruple
                            viertel                   ctyrnasobny
                            quadruplo                 cvadrupul
-                     voet: voet                      footer
+                   footer: voet                      footer
                            fusszeile                 upati
                            piedipagina               subsol
-                 volgende: volgende                  next
+                     next: volgende                  next
                            folgende                  dalsi
                            successivo                urmatorul
-                     voor: voor                      before
+                   before: voor                      before
                            vor                       pred
                            prima                     inainte
-                voorgrond: voorgrond                 foreground
+               foreground: voorgrond                 foreground
                            vordergrund               popredi
                            foreground                primplan
-                 voorkeur: voorkeur                  preference
+               preference: voorkeur                  preference
                            einstellung               nastaveni
                            preferenza                preferinta
-                voorlopig: voorlopig                 temporary
+                temporary: voorlopig                 temporary
                            temporaer                 docasne
                            temporaneo                temporar
-                  vooruit: vooruit                   forward
+                  forward: vooruit                   forward
                            vorwaerts                 vpred
                            avanti                    avans
-                   vorige: vorige                    previous
+                 previous: vorige                    previous
                            vorig                     predchozi
                            precedente                precedent
-                   waarde: waarde                    value
+                    value: waarde                    value
                            wert                      hodnota
                            valore                    valoare
                      week: week                      week
                            woche                     tyden
                            settimana                 saptamana
-                  weekdag: weekdag                   weekday
+                  weekday: weekdag                   weekday
                            wochentag                 vsedniden
                            giornosettimana           zisaptamana
                   WEEKDAG: WEEKDAG                   WEEKDAY
                            WOCHENTAG                 VSEDNIDEN
                            GIORNOSETTIMANA           ZISAPTAMANA
-              willekeurig: willekeurig               random
+                   random: willekeurig               random
                            zufaellig                 nahodny
                            casuale                   aleator
-                      wit: wit                       white
+                    white: wit                       white
                            weiss                     bily
                            bianco                    alb
-                     zeer: zeer                      very
+                     very: zeer                      very
                            sehr                      velmi
                            molto                     foarte
-               zeersoepel: zeersoepel                verytolerant
+             verytolerant: zeersoepel                verytolerant
                            sehrtolerant              velmitolerantni
                            moltotollerante           foartetolerant
-               zeerstreng: zeerstreng                verystrict
+               verystrict: zeerstreng                verystrict
                            sehrstreng                velmistriktni
                            moltorigido               foartestrict % GB
-                      zie: zie                       see
+                      see: zie                       see
                            sieh                      viz
                            vedi                      vezi
                 smallcaps: smallcaps                 smallcaps
@@ -2101,113 +2101,111 @@ proces: proces   process
                     WOORD: WOORD                     WORD
                            WORT                      SLOVO
                            PAROLA                    CUVANT
-             eerstepagina: eerstepagina              firstpage
+                firstpage: eerstepagina              firstpage
                            ersteseite                prvnistranka
                            primapagina               primapagina
-              eerstekolom: eerstekolom               firstcolumn
+              firstcolumn: eerstekolom               firstcolumn
                            firstcolumn               firstcolumn
                            firstcolumn               firstcolumn
-             vorigepagina: vorigepagina              previouspage
+             previouspage: vorigepagina              previouspage
                            vorigeseite               predchozistranka
                            paginaprecedente          paginaanterioara
-           volgendepagina: volgendepagina            nextpage
+                 nextpage: volgendepagina            nextpage
                            folgendeseite             dalsistranka
                            paginasuccessiva          paginaurmatoare
-            laatstepagina: laatstepagina             lastpage
+                 lastpage: laatstepagina             lastpage
                            letzteseite               poslednistrana
                            ultimapagina              ultimapagina
-             laatstekolom: laatstekolom              lastcolumn
+               lastcolumn: laatstekolom              lastcolumn
                            lastcolumn                lastcolumn
                            lastcolumn                lastcolumn
            lastpagenumber: laatstepaginanummer       lastpagenumber
                            lastpagenumber            lastpagenumber
                            lastpagenumber            lastpagenumber
-          eerstesubpagina: eerstesubpagina           firstsubpage
+             firstsubpage: eerstesubpagina           firstsubpage
                            ersteunterseite           prvnipodstranka
                            primasottopagina          primasubpagina
-          vorigesubpagina: vorigesubpagina           previoussubpage
+          previoussubpage: vorigesubpagina           previoussubpage
                            vorigeunterseite          predchozipodstranka
                            sottopaginaprecedente     subpaginaanterioara
-        volgendesubpagina: volgendesubpagina         nextsubpage
+              nextsubpage: volgendesubpagina         nextsubpage
                            folgendeunterseite        dalsipodstranka
                            sottopaginasuccessiva     urmatoareasubpagina
-         laatstesubpagina: laatstesubpagina          lastsubpage
+              lastsubpage: laatstesubpagina          lastsubpage
                            letzteunterseite          poslaednipodstranka
                            ultimasottopagina         ultimasubpagina
-       volgendeevenpagina: volgendeevenpagina        nextevenpage
+             nextevenpage: volgendeevenpagina        nextevenpage
                            naechstegeradeseite       dalsisudastranka
                            paginaparisuccessiva      paginaparaurmatoarea
-     volgendeonevenpagina: volgendeonevenpagina      nextoddpage
+              nextoddpage: volgendeonevenpagina      nextoddpage
                            naechsteungeradeseite     dalsilichastranka
                            paginadisparisuccessiva   paginaimparaurmatoarea
-         vorigeevenpagina: vorigeevenpagina          previousevenpage
+         previousevenpage: vorigeevenpagina          previousevenpage
                            vorigegeradeseite         predchozisudastranka
                            paginapariprecedente      paginaparaprecedenta
-       vorigeonevenpagina: vorigeonevenpagina        previousoddpage
+          previousoddpage: vorigeonevenpagina        previousoddpage
                            vorigeungeradeseite       predchozilichastranka
                            paginadispariprecedente   paginaimparaprecedenta
-
-           alleenleesbaar: alleenleesbaar            readonly
+                 readonly: alleenleesbaar            readonly
                            nurlesbar                 pouzeprocteni
                            solalettura               readonly
-                verplicht: verplicht                 required
+                 required: verplicht                 required
                            obligatorisch             pozadovane
                            richiestp                 obligatoriu
-                beschermd: beschermd                 protected
+                protected: beschermd                 protected
                            geschuetzt                chranene
                            protetto                  protejat
-               gesorteerd: gesorteerd                sorted
+                   sorted: gesorteerd                sorted
                            sortiert                  tridene
                            ordinato                  sortat
-          nietbeschikbaar: nietbeschikbaar           unavailable
+              unavailable: nietbeschikbaar           unavailable
                            nichtverfuegbar           nedostupne
                            nondisponibile            nedisponibil
-                verborgen: verborgen                 hidden
+                   hidden: verborgen                 hidden
                            versteckt                 skryte
                            nascosto                  ascuns
-                printbaar: printbaar                 printable
+                printable: printbaar                 printable
                            druckbar                  tisknutelne
                            stampabile                tiparibil
                  bookmark: bookmark                  bookmark
                            bookmark                  zalozka
                            segnalibro                semncarte
 
-geencontrole: geencontrole  nocheck
+     nocheck: geencontrole  nocheck
               nocheck       nocheck
               nocheck       nocheck
 
 % GB TB TH :
 
-              binnenmarge: binnenmarge               innermargin
+              innermargin: binnenmarge               innermargin
                            innermargin               innermargin
                            margineinterno            innermargin
-              buitenmarge: buitenmarge               outermargin
+              outermargin: buitenmarge               outermargin
                            outermargin               outermargin
                            margineesterno            outermargin
-               binnenrand: binnenrand                inneredge
+                inneredge: binnenrand                inneredge
                            inneredge                 inneredge
                            bordointerno              inneredge
-               buitenrand: buitenrand                outeredge
+                outeredge: buitenrand                outeredge
                            outeredge                 outeredge
                            bordoesterno              outeredge
 
-                  sturing: sturing                   controls
+                 controls: sturing                   controls
                            controls                  controls
                            controlli                 controale
-              niethangend: niethangend               nothanging
+               nothanging: niethangend               nothanging
                            nothanging                nothanging
                            nonsospeso                nothanging
-               afgebroken: afgebroken                hyphenated
+               hyphenated: afgebroken                hyphenated
                            hyphenate                 hyphenated
                            sillabato                 despsilabe
-           nietafgebroken: nietafgebroken            nothyphenated
+            nothyphenated: nietafgebroken            nothyphenated
                            nothyphenated             nothyphenated
                            nonsillabato              nedespsilabe
 
                 overprint: overprint                 overprint
                            overprint                 overprint
                            overprint                 overprint % new
-
                  knockout: knockout                  knockout
                            knockout                  knockout
                            knockout                  knockout % new
@@ -2218,10 +2216,10 @@ geencontrole: geencontrole  nocheck
                            german                    czech
                            italian                   romanian
 
-                  sturing: sturing                   controls
+                 controls: sturing                   controls
                            controls                  controls
                            controlli                 controale
-                  globaal: globaal                   global
+                   global: globaal                   global
                            global                    globalne
                            globale                   global
 
@@ -2245,10 +2243,10 @@ geencontrole: geencontrole  nocheck
                            german                    czech
                            italian                   romanian
 
-                conversie: conversie                 conversion
+               conversion: conversie                 conversion
                            konversion                konverze
                            coversione                conversie
-                      per: per                       by
+                       by: per                       by
                            pro                       skrz
                            da                        de
 
@@ -2344,52 +2342,52 @@ geencontrole: geencontrole  nocheck
                            german                    czech
                            italian                   romanian
 
-            doornummering: doornummering             enumeration
+              enumeration: doornummering             enumeration
                            nummerierung              vycet
                            enumerazione              enumerare
-            doordefinitie: doordefinitie             description
+              description: doordefinitie             description
                            beschreibung              popis
                            descrizione               descriere
-               doorsprong: doorsprong                indentation
+              indentation: doorsprong                indentation
                            einzug                    odsazovani
                            rientro                   indentare
-                doorlabel: doorlabel                 labeling
+                 labeling: doorlabel                 labeling
                            beschriften               oznacovani
                            etichettatura             etichetare
-       samengesteldelijst: samengesteldelijst        combinedlist
+             combinedlist: samengesteldelijst        combinedlist
                            kombiniereliste           kombinovanyseznam
                            elencocombinato           listacombinata
-                   sectie: sectie                    section
+                  section: sectie                    section
                            abschnitt                 oddil
                            sezione                   sectiune
                  register: register                  register
                            register                  rejstrik
                            registro                  registru
-               interactie: interactie                interaction
+              interaction: interactie                interaction
                            interaktion               interakce
                            interazione               interactiune
-                 synoniem: synoniem                  synonym
+                  synonym: synoniem                  synonym
                            synonym                   synonymum
                            sinonimo                  sinonim
-               synoniemen: synoniemen                synonyms
+                 synonyms: synoniemen                synonyms
                            synonyme                  synonyma
                            sinonimi                  sinonime
-                  sorteer: sorteer                   sort
+                     sort: sorteer                   sort
                            sortiere                  trid
                            sort                      sortare % GB
-                 sorteren: sorteren                  sorts
+                    sorts: sorteren                  sorts
                            sortieren                 tridit
                            sorts                     sortari % GB
-                     naam: naam                      name
+                     name: naam                      name
                            name                      jmeno
                            nome                      nume
-                     blok: blok                      float
+                    float: blok                      float
                            gleitobjekt               plvouciobjekt
                            oggettomobile             obiectmobil
-                  blokken: blokken                   floats
+                   floats: blokken                   floats
                            gleitobjekte              plvouciobjekty
                            oggettimobili             obiectemobile
-                   alinea: alinea                    paragraph
+                paragraph: alinea                    paragraph
                            absatz                    odstavec
                            capoverso                 paragraf
                framedtext: kadertekst                framedtext
@@ -2398,13 +2396,13 @@ geencontrole: geencontrole  nocheck
                 itemgroup: itemgroup                 itemgroup
                            itemgroup                 itemgroup
                            itemgroup                 itemgroup
-                    typen: typen                     typing
+                   typing: typen                     typing
                            tippen                    typing
                            typing                    typing % GB
                    buffer: buffer                    buffer
                            puffer                    buffer
                            buffer                    buffer
-                  formule: formule                   formula
+                  formula: formule                   formula
                            formel                    rovnice
                            formula                   formula
                  tabulate: tabulatie                 tabulate
@@ -2425,82 +2423,82 @@ geencontrole: geencontrole  nocheck
                            german                    czech
                            italian                   romanian
 
-                 beginvan: beginvan                  begin
+                    begin: beginvan                  begin
                            anfang                    zacatek
                            inizio                    inceput
-                  eindvan: eindvan                   end
+                      end: eindvan                   end
                            ende                      konec
                            fine                      sfarsit
-               gekoppelde: gekoppelde                coupled
+                  coupled: gekoppelde                coupled
                            verknuepft                propojene
                            accoppiato                cuplat
-                     haal: haal                      get
+                      get: haal                      get
                            get                       ziskat
                            prendi                    get
-            huidigelokale: huidigelokale             currentlocal
+             currentlocal: huidigelokale             currentlocal
                            aktuelllokal              aktualnelokalni
                            correntelocale            localcurent
                        in: in                        -
                            ein                       -
                            -                         -
-                     laad: laad                      load
+                     load: laad                      load
                            laden                     nacist
                            carica                    incarca
-                     leeg: leeg                      empty
+                 emptyone: leeg                      empty
                            vuoto                     leer
                            prazdne                   gol
-                     lege: lege                      empty
+                 emptytwo: lege                      empty
                            leer                      prazdne
                            vuoti                     gol
-                    lijst: lijst                     list
+                     list: lijst                     list
                            auflisten                 seznam
                            elenco                    lista
-                 lijstmet: lijstmet                  listof
+                   listof: lijstmet                  listof
                            auflistenvon              seznam
                            elencodi                  listade
-                   lokale: lokale                    local
+                    local: lokale                    local
                            lokal                     lokalne
                            locale                    local
-                   plaats: plaats                    place
+                    place: plaats                    place
                            platziere                 umisti
                            metti                     pune
-                reserveer: reserveer                 reserve
+                  reserve: reserveer                 reserve
                            reservieren               rezervovat
                            riserva                   rezervat
                     start: start                     start
                            start                     start
                            inizia                    start
-                     stel: stel                      setup
+                    setup: stel                      setup
                            stelle                    nastaveni
                            imposta                   setare
                      stop: stop                      stop
                            stop                      stop
                            termina                   stop
-                  verhoog: verhoog                   increment
+                increment: verhoog                   increment
                            erhoehen                  zvysit
                            incrementa                increment
-                 volgende: volgende                  next
+                     next: volgende                  next
                            folgende                  dalsi
                            successivo                urmatorul
-                volledige: volledige                 complete
+                 complete: volledige                 complete
                            vollende                  uplny
                            completo                  complet
-                   vorige: vorige                    previous
+                 previous: vorige                    previous
                            vorige                    predchozi
                            precedente                precedent
-             vorigelokale: vorigelokale              previouslocal
+            previouslocal: vorigelokale              previouslocal
                            voriglokal                predchozilokalni
                            precedentelocale          precedentlocal
-                      zie: zie                       see
+                      see: zie                       see
                            sieh                      viz
                            vedi                      vezi
                      type: type                      type
                            type                      opis
                            type                      type % GB
-                   opmaak: opmaak                    makeup
+                   makeup: opmaak                    makeup
                            umbruch                   zlom
                            makeup                    makeup % GB
-                    tekst: tekst                     text
+                     text: tekst                     text
                            text                      text
                            testo                     text
 
@@ -2521,13 +2519,13 @@ geencontrole: geencontrole  nocheck
                   comment: commentaar                comment
                            kommentar                 komentar
                            commento                  comentariu
-           interactiemenu: interactiemenu            interactionmenu
+          interactionmenu: interactiemenu            interactionmenu
                            interaktionsmenue         interaktivnimenu
                            menuinterattivo           meniuinteractiune
-               uitstellen: uitstellen                postponing
+               postponing: uitstellen                postponing
                            verschieben               odlozit
                            posporre                  postponing % GB
-                verbergen: verbergen                 hiding
+                   hiding: verbergen                 hiding
                            verbergen                 skryt
                            nascondere                ascundere
                  tabulate: tabulatie                 tabulate
@@ -2539,13 +2537,13 @@ geencontrole: geencontrole  nocheck
              tabulatetail: tabulatiestaart           tabulatetail
                            tabulatetail              tabulatetail
                            codatabulato              tabulatetail %
-                  gegeven: gegeven                   fact
+                     fact: gegeven                   fact
                            gegeben                   fakt
                            fatto                     fapt
-                  legenda: legenda                   legend
+                   legend: legenda                   legend
                            legende                   legenda
                            legenda                   legenda
-                  formule: formule                   formula
+                  formula: formule                   formula
                            formel                    rovnice
                            formula                   formula
                 tablehead: tabelkop                  tablehead
@@ -2554,16 +2552,16 @@ geencontrole: geencontrole  nocheck
                 tabletail: tabelstaart               tabletail
                            tabellenende              konectabulky
                            codatabella               subsoltabel
-             instellingen: instellingen              setups
+                   setups: instellingen              setups
                            impostazioni              einstellungen
                            nastaveni                 setari
                  helptext: helptekst                 helptext
                            hilfetext                 textnapovedy
                            testoaiuto                textajutator
-             deelomgeving: deelomgeving              localenvironment
+         localenvironment: deelomgeving              localenvironment
                            lokaleumgebung            lokalnihoprostredi
                            ambientelocale            mediulocal
-       sectieblokomgeving: sectieblokomgeving        sectionblockenvironment
+  sectionblockenvironment: sectieblokomgeving        sectionblockenvironment
                            sectionblockenvironment   sectionblockenvironment
                            ambientebloccosezione     blocsectiuneambient % TB TH
               pagecomment: paginacommentaar          pagecomment
diff --git a/tex/context/base/mult-ini.tex b/tex/context/base/mult-ini.tex
index 154c604bd..40e8f26fb 100644
--- a/tex/context/base/mult-ini.tex
+++ b/tex/context/base/mult-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=mult-ini,
+%D   [       filefile=mult-ini,
 %D        version=1996.06.01,
 %D          title=\CONTEXT\ Multilingual Macros,
 %D       subtitle=Initialization,
@@ -16,7 +16,7 @@
 %D parameters. Currently the following interfaces are
 %D supported:
 %D
-%D \starttabulatie[|l|l|c|c|]
+%D \starttabulate[|l|l|c|c|]
 %D \NC\bf language\NC\bf translator \NC\bf messages\NC\bf interface\NC\NR
 %D \NC dutch     \NC Hans Hagen           \NC yes \NC yes \NC\NR
 %D \NC english   \NC Hans Hagen           \NC yes \NC yes \NC\NR
@@ -24,14 +24,14 @@
 %D \NC czech     \NC Tom Hudec            \NC yes \NC yes \NC\NR
 %D \NC italian   \NC Giuseppe Bilotta     \NC yes \NC yes \NC\NR
 %D \NC norwegian \NC Hans Fredrik Nordhaug\NC yes \NC no  \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \writestatus{loading}{Context Multilingual Macros / Initialization}
 
 \unprotect
 
 %D \macros
-%D   [constanten,variabelen,commandos]
+%D   [constanten,variabelen,commands]
 %D   {v!,c!,k!,s!,e!,m!,l!,r!,f!,p!,x!,y!}
 %D
 %D In the system modules we introduced some prefixed constants,
@@ -43,8 +43,8 @@
 %D multi||lingual user interface. Redefining these next set of
 %D prefixes therefore can have desastrous results.
 %D
-%D \startregelcorrectie
-%D \starttabel[|c|c|c|]
+%D \startlinecorrection
+%D \starttable[|c|c|c|]
 %D \HL
 %D \NC \bf prefix        \NC \bf meaning \NC \bf application     \NC\SR
 %D \HL
@@ -61,8 +61,8 @@
 %D \NC \type{\x!prefix!} \NC  x!         \NC setup constant      \NC\MR
 %D \NC \type{\y!prefix!} \NC  y!         \NC setup variable      \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D In the single||lingual version we used \type{!}, \type{!!},
 %D \type{!!!} and \type{!!!!}.
@@ -125,19 +125,19 @@
 %D \type{!}. To force consistency, we provide a few commands
 %D for defining such constants.
 %D
-%D \starttypen
+%D \starttyping
 %D \defineinterfaceconstant {name} {meaning}
 %D \defineinterfacevariable {name} {meaning}
 %D \defineinterfaceelement  {name} {meaning}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which is the same as:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\c!name{meaning}
 %D \def\v!name{meaning}
 %D \def\e!name{meaning}
-%D \stoptypen
+%D \stoptyping
 
 \def\defineinterfaceconstant #1#2{\setvalue{\c!prefix!#1}{#2}}
 \def\defineinterfacevariable #1#2{\setvalue{\v!prefix!#1}{#2}}
@@ -145,20 +145,20 @@
 
 %D Next come some interface independant constants:
 %D
-%D \starttypen
+%D \starttyping
 %D \definereferenceconstant {name} {meaning}
 %D \definefileconstant      {name} {meaning}
-%D \stoptypen
+%D \stoptyping
 
 \def\definereferenceconstant #1#2{\setvalue{\r!prefix!#1}{#2}}
 \def\definefileconstant      #1#2{\setvalue{\f!prefix!#1}{#2}}
 
 %D And finaly we have the one argument, space saving constants
 %D
-%D \starttypen
+%D \starttyping
 %D \definesystemconstant  {name}
 %D \definemessageconstant {name}
-%D \stoptypen
+%D \stoptyping
 
 \def\definesystemconstant  #1{\setvalue{\s!prefix!#1}{#1}}
 \def\definemessageconstant #1{\setvalue{\m!prefix!#1}{#1}}
@@ -168,9 +168,9 @@
 %D parameters by a unique prefix. Such a prefix is defined
 %D with:
 %D
-%D \starttypen
+%D \starttyping
 %D \definesystemvariable {name}
-%D \stoptypen
+%D \stoptyping
 
 \def\definesystemvariable#1{\setevalue{\??prefix#1}{\@@prefix#1}}
 
@@ -206,7 +206,7 @@
 
   \def\defaultinterface{english}
 
-  \def\selectinterface%
+  \def\selectinterface
     {\def\docommando##1##2%
        {\bgroup
         \endlinechar\minusone
@@ -224,7 +224,7 @@
 
 \else
 
-  \def\selectinterface%
+  \def\selectinterface
     {\writestatus{interface}{defining \currentinterface\space interface}%
      \writeline
      \writestatus{interface}{using    \currentresponses\space messages}%
@@ -243,13 +243,13 @@
 %D interface languages. This can be done by means of the
 %D selector:
 %D
-%D \starttypen
+%D \starttyping
 %D \startinterface language
 %D
 %D language specific definitions & commands
 %D
 %D \stopinterface
-%D \stoptypen
+%D \stoptyping
 
 %\def\startinterface #1
 %  {\doifinsetelse{\currentinterface}{#1}
@@ -280,11 +280,11 @@
 %D in libraries. We can extract a message from such a library
 %D in three ways:
 %D
-%D \starttypen
+%D \starttyping
 %D \getmessage  {library} {tag}
 %D \showmessage {library} {tag} {data}
 %D \makemessage {library} {tag} {data}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first command gets the message \type{tag} from the
 %D \type{library} specified. The other commands take an extra
@@ -294,31 +294,31 @@
 %D Before we explain the \type{data} argument, we give an
 %D example of a library.
 %D
-%D \starttypen
+%D \starttyping
 %D \startmessages  english  library: alfa
 %D   title: something
 %D       1: first message
 %D       2: second (--) message --
 %D \stopmessages
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first message is a simple one and can be shown with:
 %D
-%D \starttypen
+%D \starttyping
 %D \showmessage {alfa} {1} {}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second message on the other hand needs some extra data:
 %D
-%D \starttypen
+%D \starttyping
 %D \showmessage {alfa} {2} {and last,to you}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This message is shown as:
 %D
-%D \starttypen
+%D \starttyping
 %D something : second (and last) message to you
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we can see, the title entry is shown with the message.
 %D The data fields are comma separated and are specified in the
@@ -327,11 +327,11 @@
 %D It is not required to define all messages in a library at
 %D once. We can add messages to a library in the following way:
 %D
-%D \starttypen
+%D \starttyping
 %D \startmessages  english  library: alfa
 %D      10: tenth message
 %D \stopmessages
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because such definitions can take place in different
 %D modules, the system gives a warning when a tag occurs more
@@ -465,10 +465,10 @@
 %D considerably. We therefore introduce warnings. Users can
 %D turn of warnings and messages by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \showwarningstrue
 %D \showmessagestrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D Turning off messages also turns off warnings, which is
 %D quote logical because they are less important.
@@ -501,7 +501,7 @@
 %D
 %D First we show a well||defined (simplified) alternative:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosetvalue#1#2#3%
 %D   {\doifdefinedelse{\c!prefix!#2}
 %D      {\setvalue{#1\getvalue{\c!prefix!#2}}{#3}}
@@ -513,12 +513,12 @@
 %D         {\getvalue{#2\getvalue{\c!prefix!#3}}}}
 %D      {\setvalue{#1#3}%
 %D         {\getvalue{#2#3}}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are called upon quite often and so we optimized
 %D them a bit.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosetvalue#1#2#3%
 %D   {\let\c!internal!\c!internal!n
 %D    \p!doifundefined{\k!prefix!#2}%
@@ -568,7 +568,7 @@
 %D      \@EA\def\csname#1\csname\k!prefix!#3\endcsname\endcsname%
 %D        {\csname#2\csname\k!prefix!#3\endcsname\endcsname}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 
 \def\doresetvalue#1#2%
   {\dosetvalue{#1}{#2}{}}
@@ -584,7 +584,7 @@
 %D the embedded \type {\csname} we can reduce the format file
 %D by about 5\% (60~KB out of 1.9~MB).
 %D
-%D \starttypen
+%D \starttyping
 %D \def\docopyvalue#1#2#3%  c -> k
 %D   {\p!doifundefined{\k!prefix!#3}%
 %D      \let\donottest\doprocesstest
@@ -597,7 +597,7 @@
 %D        \csname\@EA#1\@EA\csname\@EA\k!prefix!\@EA#3\@EA\endcsname\@EA
 %D        \endcsname\@EA{\csname#2\csname\k!prefix!#3\endcsname\endcsname}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next alternatives are slightly faster.
 
@@ -861,15 +861,15 @@
 %D users instruct the system by means of variables, values and
 %D keywords. These instructions take the form:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupsomething[some variable=some value, another one=a keyword]
-%D \stoptypen
+%D \stoptyping
 %D
 %D or by keyword only:
 %D
-%D \starttypen
-%D \dosomething[this way, that way, no way]
-%D \stoptypen
+%D \starttyping
+%D \dosomething[this way,that way,no way]
+%D \stoptyping
 %D
 %D Because the same variables can occur in more than one setup
 %D command, we have to be able to distinguish them. This is
@@ -879,34 +879,34 @@
 %D specify the height and width of the box. Behide the scenes
 %D the command
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbox [width=12cm, height=3cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D results in something like
 %D
-%D \starttypen
+%D \starttyping
 %D \<box><width>   {12cm}
 %D \<box><height>  {3cm}
-%D \stoptypen
+%D \stoptyping
 %D
 %D while a similar command for specifying the page dimensions
-%D of an \kap{A4} page results in:
+%D of an \cap{A4} page results in:
 %D
-%D \starttypen
+%D \starttyping
 %D \<page><width>  {21.0cm}
 %D \<page><height> {27.9cm}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The prefixes \type{<box>} and \type{<page>} are hidden from
 %D users and can therefore be language independant. Variables
 %D on the other hand, differ for each language:
 %D
-%D \starttypen
+%D \starttyping
 %D \<box><color>   {<blue>}
 %D \<box><kleur>   {<blauw>}
 %D \<box><couleur> {<blue>}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this example we can see that the assigned values or
 %D keywords are language dependant too. This will be a
@@ -915,10 +915,10 @@
 %D A third phenomena is that variables and values can have a
 %D similar meaning.
 %D
-%D \starttypen
+%D \starttyping
 %D \<pagenumber><location> {<left>}
 %D \<skip><left>           {12cm}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A (minor) complication is that where in english we use
 %D \type{<left>}, in dutch we find both \type{<links>} and
@@ -931,17 +931,17 @@
 %D user supplied and/or language specific elements. In english
 %D we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \<empty><figure>
 %D \<empty><intermezzo>
-%D \stoptypen
+%D \stoptyping
 %D
 %D But in dutch we have the following:
 %D
-%D \starttypen
+%D \starttyping
 %D \<lege><figuur>
 %D \<leeg><intermezzo>
-%D \stoptypen
+%D \stoptyping
 %D
 %D These subtle differences automatically lead to a solution
 %D where variables, values, elements and other components have
@@ -952,28 +952,28 @@
 %D in terms of identifiers with language specific meanings. In
 %D such an implementation, each fixed variable is available as:
 %D
-%D \starttypen
+%D \starttyping
 %D \<prefix><variable>
-%D \stoptypen
+%D \stoptyping
 %D
 %D This means that for instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbox[width=12cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D expands to something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\boxwidth{12cm}
-%D \stoptypen
+%D \stoptyping
 %D
 %D because we don't want to recode the source, a setup command
 %D in another language has to expand to this variable, so:
 %D
-%D \starttypen
-%D \stelblokin[breedte=12cm]
-%D \stoptypen
+%D \starttyping
+%D \setupblock[width=12cm]
+%D \stoptyping
 %D
 %D has to result in the definition of \type{\boxwidth} too.
 %D This method enables us to build compact, fast and readable
@@ -983,18 +983,18 @@
 %D more indirect way. In this case, both calls generate a
 %D different variable:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\boxwidth   {12cm}
 %D \def\boxbreedte {12cm}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And because we don't want to recode those megabytes of
 %D already developed code, this variable has to be called with
 %D something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \valueof\box\width
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\valueof} takes care of the translation of
 %D \type{width} or \type{breedte} to \type{width} and
@@ -1016,17 +1016,17 @@
 %D because in the source we only encounter \type{width}. Such
 %D system constants are presented as
 %D
-%D \starttypen
+%D \starttyping
 %D \c!width
-%D \stoptypen
+%D \stoptyping
 %D
 %D This constant is always equivalent to \type{width}. As we
 %D can see, we use \type{c!} to mark this one as constant. Its
 %D dutch counterpart is:
 %D
-%D \starttypen
+%D \starttyping
 %D \c!breedte
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we interpret a setup command each variable is
 %D translated to it's \type{c!} counterpart. This means that
@@ -1038,16 +1038,16 @@
 %D command \type{\getparameters} that we introduced in the
 %D system module. Let us define some simple setup command:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\setupbox[#1]%
 %D   {\getparameters[\??bx][#1]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command can be used as:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbox [width=3cm, height=1cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Afterwards we have two variables \type{\@@bxwidth} and
 %D \type{\@@bxheight} which have the values \type{3cm} and
@@ -1057,9 +1057,9 @@
 %D  \type{height} or \type{breedte} and \type{hoogte},
 %D depending on the actual language. In dutch we just say:
 %D
-%D \starttypen
-%D \stelblokin [breedte=3cm, hoogte=1cm]
-%D \stoptypen
+%D \starttyping
+%D \setupblock [width=3cm, height=1cm]
+%D \stoptyping
 %D
 %D and get ourselves \type{\@@bxwidth} and \type{\@@bxheight}
 %D too. In the source of \CONTEXT, we can recognize constants
@@ -1071,19 +1071,19 @@
 %D keyword, but instead use in the source a variable which
 %D meaning depends on the interface language.
 %D
-%D \starttypen
+%D \starttyping
 %D \v!left
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which can be used in macro's like:
 %D
-%D \starttypen
+%D \starttyping
 %D \processaction
 %D   [\@@bxlocation]
 %D   [  \v!left=>\dosomethingontheleft,
 %D    \v!middle=>\dosomthinginthemiddle,
 %D     \v!right=>\dosomethingontheright]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because variables like \type{\@@bxlocation} can have a lot
 %D of meanings, including tricky expandable tokens, we cannot
@@ -1096,15 +1096,15 @@
 %D Although we know it sounds confusing we want to state two
 %D important characteristics of the interface as described:
 %D
-%D \startsmaller \em
+%D \startnarrower \em
 %D user variables become system constants
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D and
 %D
-%D \startsmaller \em
+%D \startnarrower \em
 %D user constants (keywords) become system variables
-%D \stopsmaller
+%D \stopnarrower
 %D
 
 %D \macros
@@ -1115,26 +1115,26 @@
 %D and variables are defined. We only show two languages and
 %D a few words.
 %D
-%D \starttypen
+%D \starttyping
 %D \startconstants  english    dutch
 %D
 %D          width:  width      breedte
 %D         height:  height     hoogte
 %D
 %D \stopconstants
-%D \stoptypen
+%D \stoptyping
 %D
 %D Keep in mind that what users see as variables, are constants
 %D for the system.
 %D
-%D \starttypen
+%D \starttyping
 %D \startvariables  english    dutch
 %D
 %D       location:  left       links
 %D           text:  text       tekst
 %D
 %D \stopvariables
-%D \stoptypen
+%D \stoptyping
 %D
 %D The macro's responsible for interpreting these setups are
 %D shared. They take care of empty lines and permit a more or
@@ -1302,12 +1302,12 @@
 %D following, more efficient approach does not work here,
 %D because it sometimes generates spaces.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\setinterfacesetupconstant
 %D   {\ifinterfacetranslation
 %D      \expandafter\setinterfaceconstant
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We therefore use the more redundant but robust method:
 
@@ -1327,7 +1327,7 @@
 %D Due to the object oriented nature of \CONTEXT, we also need
 %D to define the elements that are used to build commands:
 %D
-%D \starttypen
+%D \starttyping
 %D \startelements  english     dutch
 %D
 %D      beginvan:  begin       beginvan
@@ -1336,7 +1336,7 @@
 %D          stop:  stop        stop
 %D
 %D \stopelements
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such elements sometimes are the same in diferent
 %D languages, but mostly they differ. Things can get even
@@ -1346,14 +1346,14 @@
 %D problem, because we just define two elements. When no second
 %D  part is needed, we use a \type{-}:
 %D
-%D \starttypen
+%D \starttyping
 %D \startelements  english     dutch
 %D
 %D        setupa:  setup       stel
 %D        setupb:  -           in
 %D
 %D \stopelements
-%D \stoptypen
+%D \stoptyping
 %D
 %D Element translation is realized by means of:
 
@@ -1377,7 +1377,7 @@
 %D The last setup has to do with the commands themselve.
 %D Commands are defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \startcommands  english     dutch
 %D
 %D    starttekst:  starttext   starttekst
@@ -1386,11 +1386,17 @@
 %D    margewoord:  marginword  margewoord
 %D
 %D \stopcommands
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here we also have to take care of the optional translation
 %D needed for reference cards.
 
+% \ifx\doifdefinedascommandelse\undefined
+%   \let\doifdefinedascommandelse\thirdofthreearguments
+% \else
+%   % this one will be defined in the encoding modules
+% \fi
+
 \def\setinterfacecommand#1#2%
   {\doifelse{#2}\nointerfaceobject
      {\debuggerinfo{command}{no link to #1}%
@@ -1400,10 +1406,8 @@
         {\doifdefinedelse{#2}
            {\debuggerinfo{command}{core command #2 redefined as #1}}%
            {\debuggerinfo{command}{#2 defined as #1}}%
-        %\@EAEAEA\def\@EA\csname\@EA#2\@EA\endcsname
-        %  \@EA{\csname#1\endcsname}}%
-         \@EA\def\csname#2\@EA\endcsname % ugly but faster
-           \@EA{\csname#1\endcsname}}%
+        %\@EAEAEA\def\@EA\csname\@EA#2\@EA\endcsname\@EA{\csname#1\endcsname}}%
+        \@EA\def\csname#2\@EA\endcsname\@EA{\csname#1\endcsname}}% ugly but faster
       \setinterfacesetupvariable{#1}{#2}}}
 
 \def\startcommands
@@ -1415,9 +1419,9 @@
 %D Generating the interface translation macro's that are used
 %D in the reference lists, is enabled by setting the boolean:
 %D
-%D \starttypen
+%D \starttyping
 %D \interfacetranslationtrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D Keep in mind that enabling interfacetranslation costs a
 %D bit of hash space.
@@ -1464,11 +1468,11 @@
 %D generate a new format. Just reloading the relevant
 %D definition files suits:
 %D
-%D \starttypen
+%D \starttyping
 %D \interfacetranslationtrue
 %D \input mult-con
 %D \input mult-com
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {interfaced}
@@ -1477,9 +1481,9 @@
 %D When we want to translate 'by hand' we can use the simple
 %D but effective command:
 %D
-%D \starttypen
+%D \starttyping
 %D \interfaced {something}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Giving \type{\interfaced{breedte}} results in \type{width}
 %D or, when not defined, in \type{breedte} itself. This
@@ -1528,7 +1532,13 @@
    \ifx\normalmonth\undefined\the\month\else\the\normalmonth\fi.%
    \ifx\normalday  \undefined\the\day  \else\the\normalday  \fi}
 
-\ifx\contextversion\undefined \def\contextversion{unknown} \fi
+\ifx\contextversion\undefined
+    \def\contextversion{unknown}
+    \def\contextversionnumber{0}
+\else
+    \def\contextversionnumber#1.#2.#3\relax{#1\ifnum#2<10 0\fi#2\ifnum#3<10 0\fi#3}
+    \edef\contextversionnumber{\expandafter\contextversionnumber\contextversion\relax}
+\fi
 
 \ifx\undefined\normaldump
   \newtoks\everydump
diff --git a/tex/context/base/mult-sys.tex b/tex/context/base/mult-sys.tex
index dda3bd8c9..482c76561 100644
--- a/tex/context/base/mult-sys.tex
+++ b/tex/context/base/mult-sys.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=mult-sys,
+%D   [       filefile=mult-sys,
 %D        version=1996.06.01,
 %D          title=\CONTEXT\ Multilingual Macros,
 %D       subtitle=System,
@@ -22,10 +22,10 @@
 %D The constants are grouped in such a way that there is a
 %D minimal change of conflicts.
 %D
-%D \starttypen
+%D \starttyping
 %D \definesystemconstants {word}
 %D \definemessageconstant {word}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This commands generate \type{\s!word} and \type{\m!word}.
 
@@ -51,6 +51,8 @@
 \definesystemconstant {romanian}    \definesystemconstant {ro}
 \definesystemconstant {russian}     \definesystemconstant {ru}
 \definesystemconstant {slovak}      \definesystemconstant {sk}
+\definesystemconstant {slovenian}   \definesystemconstant {sl}
+\definesystemconstant {slovene}
 \definesystemconstant {spanish}     \definesystemconstant {es}
 \definesystemconstant {swedish}     \definesystemconstant {sv}
 \definesystemconstant {turkish}     \definesystemconstant {tr}
@@ -107,10 +109,10 @@
 %D Where in the \ASCII\ file the second lines takes nine extra
 %D characters, \TEX\ saves us 13~tokens.
 %D
-%D \starttypen
+%D \starttyping
 %D \hrule width 10pt height 2pt depth 1pt
 %D \hrule \!!width 10pt \!!height 2pt \!!depth 1pt
-%D \stoptypen
+%D \stoptyping
 %D
 %D One condition is that we have defined \type{\!!height},
 %D \type{\!!width} and \type{\!!depth} as respectively
@@ -357,7 +359,7 @@
 
 %D A rough test is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\TestMe % 7.75 sec on a P4/2G
 %D   {\dimen0=10\points\dimen0=10\points\dimen0=10\points\dimen0=10\points\dimen0=10\points
 %D    \dimen0=10\points\dimen0=10\points\dimen0=10\points\dimen0=10\points\dimen0=10\points}
@@ -371,7 +373,7 @@
 %D    \dimen0=10\s!pt\dimen0=10\s!pt\dimen0=10\s!pt\dimen0=10\s!pt\dimen0=10\s!pt}
 %D
 %D \testfeatureonce {500000}{\TestMe}
-%D \stoptypen
+%D \stoptyping
 
 %D Variables are composed of a command specific tag and a user
 %D supplied variable (system constant). The first tag \type{ag}
diff --git a/tex/context/base/page-app.tex b/tex/context/base/page-app.tex
index e522b5673..417e5ab95 100644
--- a/tex/context/base/page-app.tex
+++ b/tex/context/base/page-app.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-app, % from meta-fig
+%D   [       filefile=page-app, % from meta-fig
 %D        version=1998.01.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Independent page building,
@@ -20,20 +20,20 @@
 
 \definepapersize
   [\??fp\s!dummy]
-  [\c!breedte=\fittingwd,
-   \c!hoogte=\fittinght]
+  [\c!width=\fittingwd,
+   \c!height=\fittinght]
 
 \definelayout
   [\??fp\s!dummy]
-  [\c!breedte=\fittingwd,\c!hoogte=\fittinght,\c!plaats=\v!midden,
-   \c!kopwit=\!!zeropoint,\c!rugwit=\!!zeropoint,
-   \c!snijwit=\!!zeropoint,\c!bodemwit=\!!zeropoint,
-   \c!tekstafstand=\!!zeropoint,\c!regels=0,\c!grid=\v!nee,
-   \c!boven=\!!zeropoint,\c!onder=\!!zeropoint,
-   \c!marge=\!!zeropoint,\c!rand=\!!zeropoint,
-   \c!linkermarge=\!!zeropoint,\c!linkerrand=\!!zeropoint,
-   \c!rechtermarge=\!!zeropoint,\c!rechterrand=\!!zeropoint,
-   \c!hoofd=\!!zeropoint,\c!voet=\!!zeropoint]
+  [\c!width=\fittingwd,\c!height=\fittinght,\c!location=\v!middle,
+   \c!topspace=\!!zeropoint,\c!backspace=\!!zeropoint,
+   \c!cutspace=\!!zeropoint,\c!bottomspace=\!!zeropoint,
+   \c!textdistance=\!!zeropoint,\c!lines=0,\c!grid=\v!no,
+   \c!top=\!!zeropoint,\c!bottom=\!!zeropoint,
+   \c!margin=\!!zeropoint,\c!edge=\!!zeropoint,
+   \c!leftmargin=\!!zeropoint,\c!leftedge=\!!zeropoint,
+   \c!rightmargin=\!!zeropoint,\c!rightedge=\!!zeropoint,
+   \c!header=\!!zeropoint,\c!footer=\!!zeropoint]
 
 % \def\dostartfittingpage[#1][#2]%
 %   {\pagina % this is kind of tricky! there can be preceding page refs
@@ -72,23 +72,23 @@
 %    \egroup}
 
 \def\dostartfittingpage[#1][#2]%
-  {\pagina % this is kind of tricky! there can be preceding page refs
+  {\page % this is kind of tricky! there can be preceding page refs
    \bgroup % resulting in a zero height page; test fig-make !
    \def\currentfittingpage{#1}%
    \dontcomplain
    % runs under current page regime, i.e. page variables passed to mp
-   \getparameters[\currentfittingpage][\c!papier=,#2]% auto or size or nothing
+   \getparameters[\currentfittingpage][\c!paper=,#2]% auto or size or nothing
    \setbox\scratchbox\hbox
      \bgroup
-     % needed later \getparameters[\currentfittingpage][\c!papier=,#2]% auto or size or nothing
-     \doifvalue{\currentfittingpage\c!marge}\v!pagina % undocumented
+     % needed later \getparameters[\currentfittingpage][\c!paper=,#2]% auto or size or nothing
+     \doifvalue{\currentfittingpage\c!margin}\v!page % undocumented
        {\offsetbox
-          [\c!linkeroffset=\rugwit,
-           \c!rechteroffset=\snijwit,
-           \c!bovenoffset=\kopwit,
-           \c!onderoffset=\bodemwit]\hbox}%
+          [\c!leftoffset=\backspace,
+           \c!rightoffset=\cutspace,
+           \c!topoffset=\topspace,
+           \c!bottomoffset=\bottomspace]\hbox}%
      \bgroup
-     \schaal[\c!schaal=\getvalue{\currentfittingpage\c!schaal}]%
+     \scale[\c!scale=\getvalue{\currentfittingpage\c!scale}]%
      \bgroup\localframed[\currentfittingpage]%
      \bgroup}
 
@@ -107,19 +107,19 @@
    \fi
    \let\checkcurrentlayout\relax % else interference with odd/even layout
    \processaction
-     [\getvalue{\currentfittingpage\c!papier}]
+     [\getvalue{\currentfittingpage\c!paper}]
      [   \v!auto=>\let\fittingpapersize\printpapersize,
       \s!unknown=>\let\fittingpapersize\commalistelement,
       \s!default=>\def\fittingpapersize{\??fp\s!dummy}]%
    \expanded{\setuppapersize[\??fp\s!dummy][\fittingpapersize]}%
    \definelayout
-     [\v!pagina]%
-     [\c!plaats=\v!midden,
-      \c!breedte=\fittingwd,
-      \c!hoogte=\fittinght]%
+     [\v!page]%
+     [\c!location=\v!middle,
+      \c!width=\fittingwd,
+      \c!height=\fittinght]%
    \setuplayout
-     [\v!pagina]%
-   \startmakeup[\v!standaard][\c!tekststatus=\v!leeg,\c!dubbelzijdig=\v!nee,\c!pagina=]%
+     [\v!page]%
+   \startmakeup[\v!standard][\c!textstate=\v!empty,\c!doublesided=\v!no,\c!page=]%
      \centerbox{\box\scratchbox}%
    \stopmakeup
    \stoplocallayout
@@ -143,13 +143,13 @@
    \dostopfittingpage}
 
 \setupTEXpage
-  [\c!schaal=1000,
-   \c!strut=\v!nee,
-   \c!uitlijnen=\v!normaal, % needed, else problems !
+  [\c!scale=1000,
+   \c!strut=\v!no,
+   \c!align=\v!normal, % needed, else problems !
    \c!offset=\v!overlay,
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!passend,
-   \c!kader=\v!uit]
+   \c!width=\v!fit,
+   \c!height=\v!fit,
+   \c!frame=\v!off]
 
 %D Application pages (for an example, see \type {m-pstric}):
 
@@ -196,7 +196,7 @@
    \setbox\scratchbox\hbox
      {\expanded{\externalfigure
         [\bufferprefix\@@texapp.\ifdone eps\else pdf\fi]
-        [\c!object=\v!nee]}}%
+        [\c!object=\v!no]}}%
    \setbox\scratchbox\hbox
      {\lower\ht\scratchbox\hbox{\raise\dimen2\box\scratchbox}}%
    \wd\scratchbox\dimen0
@@ -205,4 +205,4 @@
    \box\scratchbox
    \egroup}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-bck.tex b/tex/context/base/page-bck.tex
index 967679216..367983ad2 100644
--- a/tex/context/base/page-bck.tex
+++ b/tex/context/base/page-bck.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-bck, % copied from main-001
+%D   [       filefile=page-bck, % copied from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Backgrounds,
@@ -50,9 +50,9 @@
 %D amount of background calculations. The main switch is set
 %D by the recalculate directive.
 %D
-%D \starttypen
+%D \starttyping
 %D \recalculatebackgrounds
-%D \stoptypen
+%D \stoptyping
 %D
 %D Other modules may not directly set the switches
 %D themselves.
@@ -64,12 +64,12 @@
 %D {*background} mode. This mode is only available when
 %D typesetting the pagebody.
 %D
-%D \starttypen
+%D \starttyping
 %D \startmode[*background] ...
-%D \stoptypen
+%D \stoptyping
 
 \appendtoks
-  \ifsomebackground \ifnewbackground \setsystemmode\v!achtergrond \fi \fi
+  \ifsomebackground \ifnewbackground \setsystemmode\v!background \fi \fi
 \to \everybeforepagebody
 
 %D \macros
@@ -81,12 +81,12 @@
 %D is made up by four macros that add background to parts of
 %D the layout.
 %D
-%D \starttypen
+%D \starttyping
 %D \addmainbackground  <box>
 %D \addtextbackground  <box>
 %D \addpagebackground  <box>
 %D \addprintbackground <box>
-%D \stoptypen
+%D \stoptyping
 
 %D To minimize calculations, we keep track of the state of the
 %D background of each area. A previous implementation did
@@ -114,13 +114,13 @@
 
 \def\checkbackground#1%
   {\edef\!!stringe{\??ma#1}%
-   \doifelsevaluenothing{\!!stringe\c!achtergrond   }
-  {\doifelsevaluenothing{\!!stringe\c!voorgrondkleur}
-         {\doifelsevalue{\!!stringe\c!kader       }\v!aan\!!doneatrue
-         {\doifelsevalue{\!!stringe\c!linkerkader }\v!aan\!!doneatrue
-         {\doifelsevalue{\!!stringe\c!rechterkader}\v!aan\!!doneatrue
-         {\doifelsevalue{\!!stringe\c!bovenkader  }\v!aan\!!doneatrue
-         {\doifelsevalue{\!!stringe\c!onderkader  }\v!aan\!!doneatrue
+   \doifelsevaluenothing{\!!stringe\c!background   }
+  {\doifelsevaluenothing{\!!stringe\c!foregroundcolor}
+         {\doifelsevalue{\!!stringe\c!frame       }\v!on\!!doneatrue
+         {\doifelsevalue{\!!stringe\c!leftframe }\v!on\!!doneatrue
+         {\doifelsevalue{\!!stringe\c!rightframe}\v!on\!!doneatrue
+         {\doifelsevalue{\!!stringe\c!topframe  }\v!on\!!doneatrue
+         {\doifelsevalue{\!!stringe\c!bottomframe  }\v!on\!!doneatrue
                                                          \!!doneafalse}}}}}
                                                          \!!doneatrue}
                                                          \!!doneatrue
@@ -151,8 +151,8 @@
   {\ifsomebackgroundfound#1\ifdim#3>\zeropoint\ifdim#4>\zeropoint
      \setbox#2\vbox\fastlocalframed
        [\??ma#1]
-       [\c!component=#1,\c!strut=\v!nee,\c!offset=\v!overlay,%
-        \c!breedte=#3,\c!hoogte=#4]
+       [\c!component=#1,\c!strut=\v!no,\c!offset=\v!overlay,%
+        \c!width=#3,\c!height=#4]
        {\dp#2\zeropoint\box#2}%
    \fi\fi\fi}
 
@@ -162,7 +162,7 @@
 
 \def\addprintbackground#1%
   {\addsomebackground
-     \v!papier#1\printpapierbreedte\printpapierhoogte}
+     \v!paper#1\printpaperwidth\printpaperheight}
 
 %D The page backgrounds can be put behind the {\em left
 %D page}, the {\em right page} or {\em each page}. As with
@@ -170,13 +170,13 @@
 
 \def\addpagebackground#1%
   {\doifbothsidesoverruled
-     \addsomebackground\v!rechterpagina#1\papierbreedte\papierhoogte
+     \addsomebackground\v!rightpage#1\paperwidth\paperheight
    \orsideone
-     \addsomebackground\v!rechterpagina#1\papierbreedte\papierhoogte
+     \addsomebackground\v!rightpage#1\paperwidth\paperheight
    \orsidetwo
-     \addsomebackground\v!linkerpagina #1\papierbreedte\papierhoogte
+     \addsomebackground\v!leftpage #1\paperwidth\paperheight
    \od
-     \addsomebackground\v!pagina       #1\papierbreedte\papierhoogte}
+     \addsomebackground\v!page       #1\paperwidth\paperheight}
 
 %D Then there are the 25 areas that make up the layout: {\em
 %D top, header, text, footer, bottom} times {\em left edge,
@@ -205,9 +205,9 @@
 
 \def\addtextbackground#1%
   {\ifconditional\hiddenbackgroundenabled
-     \addsomebackground\v!verborgen#1\zetbreedte\teksthoogte % mine !
+     \addsomebackground\v!hidden#1\makeupwidth\textheight % mine !
    \fi
-   \addsomebackground\v!tekst#1\zetbreedte\teksthoogte}
+   \addsomebackground\v!text#1\makeupwidth\textheight}
 
 % \def\addtextbackground#1%
 %   {\ifconditional\hiddenbackgroundenabled
@@ -280,7 +280,7 @@
        \global\chardef\newrightbackground\zerocount
      \fi
    \od
-   \ifx\@@mastatus\v!herhaal\else\global\newbackgroundfalse\fi}
+   \ifx\@@mastate\v!repeat\else\global\newbackgroundfalse\fi}
 
 \def\addmainbackground#1% todo: dimension spec
   {\ifsomebackground
@@ -298,18 +298,18 @@
      \global\let\pagebackgroundhoffset\!!zeropoint
      \global\let\pagebackgroundvoffset\!!zeropoint
      \global\let\pagebackgrounddepth  \!!zeropoint
-     \doifsomebackgroundelse{\v!tekst\v!tekst}\donetrue\donefalse
-     \ifdone\else\doifsomebackgroundelse\v!tekst\donetrue\donothing\fi
+     \doifsomebackgroundelse{\v!text\v!text}\donetrue\donefalse
+     \ifdone\else\doifsomebackgroundelse\v!text\donetrue\donothing\fi
      \ifdone
        \bgroup
-       \scratchdimen\getvalue{\??ma\v!pagina\c!offset}%
-       \doifsomebackgroundelse{\v!boven\v!tekst}\donothing
-         {\doifsomebackgroundelse{\v!onder\v!tekst}\donothing
+       \scratchdimen\getvalue{\??ma\v!page\c!offset}%
+       \doifsomebackgroundelse{\v!top\v!text}\donothing
+         {\doifsomebackgroundelse{\v!bottom\v!text}\donothing
             {\xdef\pagebackgroundhoffset{\the\scratchdimen}}}%
-       \doifsomebackgroundelse{\v!tekst\v!rechterrand}\donothing
-         {\doifsomebackgroundelse{\v!tekst\v!linkerrand}\donothing
+       \doifsomebackgroundelse{\v!text\v!rightedge}\donothing
+         {\doifsomebackgroundelse{\v!text\v!leftedge}\donothing
             {\xdef\pagebackgroundvoffset{\the\scratchdimen}%
-             \scratchdimen\getvalue{\??ma\v!pagina\c!diepte}%
+             \scratchdimen\getvalue{\??ma\v!page\c!depth}%
              \xdef\pagebackgrounddepth{\the\scratchdimen}}}%
        \egroup
      \fi
@@ -317,26 +317,6 @@
 
 \appendtoks \setbackgroundoffsets \to \everybeforepagebody
 
-% \def\setbackgroundbox#1#2%
-%   {\global\setbox#1\vbox
-%      {\dontcomplain
-%       \calculatereducedvsizes
-%       \offinterlineskip
-%       #2\relax
-%       \vskip-\bovenhoogte
-%       \vskip-\bovenafstand
-%       \dodopagebodybackground\v!boven\bovenhoogte
-%       \vskip\bovenafstand
-%       \dodopagebodybackground\v!hoofd\hoofdhoogte
-%       \vskip\hoofdafstand
-%       \dodopagebodybackground\v!tekst\teksthoogte
-%       \vskip\voetafstand
-%       \dodopagebodybackground\v!voet\voethoogte
-%       \vskip\onderafstand
-%       \dodopagebodybackground\v!onder\onderhoogte
-%       \vfilll}%
-%   \smashbox#1}
-
 \newconditional\swapbackgroundmargins \settrue\swapbackgroundmargins
 
 \def\setbackgroundbox#1#2%
@@ -345,23 +325,23 @@
       \swapmargins
       \ifconditional\swapbackgroundmargins
         \doifmarginswapelse \donothing
-          {\swapmacros\v!rechtermarge\v!linkermarge
-           \swapmacros\v!rechterrand \v!linkerrand}%
+          {\swapmacros\v!rightmargin\v!leftmargin
+           \swapmacros\v!rightedge \v!leftedge}%
       \fi
       \calculatereducedvsizes
       \offinterlineskip
       #2\relax
-      \vskip-\bovenhoogte
-      \vskip-\bovenafstand
-      \dodopagebodybackground\v!boven\bovenhoogte
-      \vskip\bovenafstand
-      \dodopagebodybackground\v!hoofd\hoofdhoogte
-      \vskip\hoofdafstand
-      \dodopagebodybackground\v!tekst\teksthoogte
-      \vskip\voetafstand
-      \dodopagebodybackground\v!voet\voethoogte
-      \vskip\onderafstand
-      \dodopagebodybackground\v!onder\onderhoogte
+      \vskip-\topheight
+      \vskip-\topdistance
+      \dodopagebodybackground\v!top\topheight
+      \vskip\topdistance
+      \dodopagebodybackground\v!header\headerheight
+      \vskip\headerdistance
+      \dodopagebodybackground\v!text\textheight
+      \vskip\footerdistance
+      \dodopagebodybackground\v!footer\footerheight
+      \vskip\bottomdistance
+      \dodopagebodybackground\v!bottom\bottomheight
       \vfilll}%
   \smashbox#1}
 
@@ -391,15 +371,15 @@
        \bgroup\hbox\bgroup
        % \swapmargins
          \goleftonpage
-         \dododopagebodybackground\linkerrandbreedte  #2#1\v!linkerrand
-         \hskip\linkerrandafstand
-         \dododopagebodybackground\linkermargebreedte #2#1\v!linkermarge
-         \hskip\linkermargeafstand
-         \dododopagebodybackground\zetbreedte         #2#1\v!tekst
-         \hskip\rechtermargeafstand
-         \dododopagebodybackground\rechtermargebreedte#2#1\v!rechtermarge
-         \hskip\rechterrandafstand
-         \dododopagebodybackground\rechterrandbreedte #2#1\v!rechterrand
+         \dododopagebodybackground\leftedgewidth  #2#1\v!leftedge
+         \hskip\leftedgedistance
+         \dododopagebodybackground\leftmarginwidth #2#1\v!leftmargin
+         \hskip\leftmargindistance
+         \dododopagebodybackground\makeupwidth         #2#1\v!text
+         \hskip\rightmargindistance
+         \dododopagebodybackground\rightmarginwidth#2#1\v!rightmargin
+         \hskip\rightedgedistance
+         \dododopagebodybackground\rightedgewidth #2#1\v!rightedge
        \egroup\egroup
      \wd\scratchbox\zeropoint
      \box\scratchbox\relax
@@ -411,8 +391,8 @@
        \ifdim#1>\zeropoint\relax
          \fastlocalframed
            [\??ma#3#4]
-           [\c!component=#3-#4,\c!breedte=#1,\c!hoogte=#2,\c!offset=\v!overlay]
-           {\getvalue{\??ma#3#4\c!commando}}% {\hsize=#1\vsize=#2....}
+           [\c!component=#3-#4,\c!width=#1,\c!height=#2,\c!offset=\v!overlay]
+           {\getvalue{\??ma#3#4\c!command}}% {\hsize=#1\vsize=#2....}
        \else
          \hskip#1%
        \fi
@@ -428,11 +408,11 @@
 %D usage, but since today's \TEX's are large, we now do the
 %D work on forehand.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbackgrounds [settings]
 %D \setupbackgrounds [paper,page,text,..] [settings]
 %D \setupbackgrounds [top,...] [leftedge,...] [settings]
-%D \stoptypen
+%D \stoptyping
 %D
 %D \showsetup{\y!setupbackgrounds}
 %D
@@ -446,7 +426,7 @@
   {\ifthirdargument
      \global\somebackgroundtrue
      \def\docommando##1%
-       {\doifinsetelse{##1}{\v!papier,\v!pagina,\v!linkerpagina,\v!rechterpagina}
+       {\doifinsetelse{##1}{\v!paper,\v!page,\v!leftpage,\v!rightpage}
           {\getparameters[\??ma##1][#3]\checkbackground{##1}}
           {\def\dodocommando####1%
              {\getparameters[\??ma##1####1][#3]\checkbackground{##1####1}}%
@@ -454,26 +434,26 @@
      \processcommalist[#1]\docommando
    \else\ifsecondargument
      \global\somebackgroundtrue
-     \doifcommonelse{#1}{\v!tekst,\v!verborgen,%
+     \doifcommonelse{#1}{\v!text,\v!hidden,%
                         %\v!linkertekst,\v!rechtertekst,%
-                         \v!papier,\v!pagina,\v!linkerpagina,\v!rechterpagina}
+                         \v!paper,\v!page,\v!leftpage,\v!rightpage}
        {\def\docommando##1%
           {\getparameters[\??ma##1][#2]\checkbackground{##1}}%
         \processcommalist[#1]\docommando}%
        {\setupbackgrounds
           [#1]%
-          [\v!linkerrand,\v!linkermarge,\v!tekst,\v!rechtermarge,\v!rechterrand]%
+          [\v!leftedge,\v!leftmargin,\v!text,\v!rightmargin,\v!rightedge]%
           [#2]}%
    \else\iffirstargument
      \getparameters[\??ma][#1]%
    \fi\fi\fi
-   \doifelsevalue{\??ma\v!pagina\c!offset}\v!overlay
+   \doifelsevalue{\??ma\v!page\c!offset}\v!overlay
      {\global\pageoffset\zeropoint}
-     {\global\pageoffset\getvalue{\??ma\v!pagina\c!offset}}%
-   \global\pagedepth\getvalue{\??ma\v!pagina\c!diepte}%
+     {\global\pageoffset\getvalue{\??ma\v!page\c!offset}}%
+   \global\pagedepth\getvalue{\??ma\v!page\c!depth}%
    \xdef\pagebackgroundoffset{\the\pageoffset}%
    \xdef\pagebackgrounddepth {\the\pagedepth }%
-   \doifelse\@@mastatus\v!stop
+   \doifelse\@@mastate\v!stop
      {\global\newbackgroundfalse}
      {\global\newbackgroundtrue }}
 
@@ -485,42 +465,42 @@
 %D Each areas (currently there are $1+3+25+1=30$ of them)
 %D has its own low level framed object associated.
 
-\presetlocalframed [\??ma\v!papier]
-\presetlocalframed [\??ma\v!pagina]
-\presetlocalframed [\??ma\v!linkerpagina]
-\presetlocalframed [\??ma\v!rechterpagina]
+\presetlocalframed [\??ma\v!paper]
+\presetlocalframed [\??ma\v!page]
+\presetlocalframed [\??ma\v!leftpage]
+\presetlocalframed [\??ma\v!rightpage]
 
 \copyparameters
-  [\??ma\v!papier\c!kader][\??ma\v!pagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!paper\c!frame][\??ma\v!page]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!papier\c!achtergrond][\??ma\v!pagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!paper\c!background][\??ma\v!page]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!pagina\c!kader][\??ma\v!pagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!page\c!frame][\??ma\v!page]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!pagina\c!achtergrond][\??ma\v!pagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!page\c!background][\??ma\v!page]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!linkerpagina\c!kader][\??ma\v!linkerpagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!leftpage\c!frame][\??ma\v!leftpage]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!linkerpagina\c!achtergrond][\??ma\v!linkerpagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!leftpage\c!background][\??ma\v!leftpage]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!rechterpagina\c!kader][\??ma\v!rechterpagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!rightpage\c!frame][\??ma\v!rightpage]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 \copyparameters
-  [\??ma\v!rechterpagina\c!achtergrond][\??ma\v!rechterpagina]
-  [\c!offset,\c!diepte,\c!straal,\c!hoek,\c!kleur,\c!raster]
+  [\??ma\v!rightpage\c!background][\??ma\v!rightpage]
+  [\c!offset,\c!depth,\c!radius,\c!corner,\c!color,\c!screen]
 
 %D We save some keying by defining the areas using
 %D intermediate commands. The inheritance macro makes sure
@@ -528,38 +508,38 @@
 
 \def\dodocommando#1#2%
   {\copylocalframed
-     [\??ma#1#2][\??ma\v!pagina]%
+     [\??ma#1#2][\??ma\v!page]%
    \getparameters
      [\??ma#1#2]
-     [\c!achtergrond=,\c!kader=,\c!kleur=,\c!raster=\@@rsraster,
-      \c!onderkader=,\c!bovenkader=,\c!linkerkader=,\c!rechterkader=]%
-   \inheritparameter[\??ma][#1#2\c!kleur][\v!pagina\c!kleur]%
-   \inheritparameter[\??ma][#1#2\c!raster][\v!pagina\c!raster]%
-   \inheritparameter[\??ma][#1#2\c!kaderkleur][\v!pagina\c!kaderkleur]%
-   \inheritparameter[\??ma][#1#2\c!achtergrondkleur][\v!pagina\c!achtergrondkleur]%
-   \inheritparameter[\??ma][#1#2\c!achtergrondraster][\v!pagina\c!achtergrondraster]}
+     [\c!background=,\c!frame=,\c!color=,\c!screen=\@@rsscreen,
+      \c!bottomframe=,\c!topframe=,\c!leftframe=,\c!rightframe=]%
+   \inheritparameter[\??ma][#1#2\c!color][\v!page\c!color]%
+   \inheritparameter[\??ma][#1#2\c!screen][\v!page\c!screen]%
+   \inheritparameter[\??ma][#1#2\c!framecolor][\v!page\c!framecolor]%
+   \inheritparameter[\??ma][#1#2\c!backgroundcolor][\v!page\c!backgroundcolor]%
+   \inheritparameter[\??ma][#1#2\c!backgroundscreen][\v!page\c!backgroundscreen]}
 
 %D The stand alone text area inherits from the page too.
 
-\dodocommando\v!tekst       \empty
+\dodocommando\v!text       \empty
 %dodocommando\v!linkertekst \empty
 %dodocommando\v!rechtertekst\empty
-\dodocommando\v!verborgen   \empty
+\dodocommando\v!hidden   \empty
 
 %D We now define all 25 main areas in a row.
 
 \def\docommando#1%
-  {\dodocommando#1\v!linkerrand
-   \dodocommando#1\v!linkermarge
-   \dodocommando#1\v!tekst
-   \dodocommando#1\v!rechtermarge
-   \dodocommando#1\v!rechterrand}
-
-\docommando\v!boven
-\docommando\v!hoofd
-\docommando\v!tekst
-\docommando\v!voet
-\docommando\v!onder
+  {\dodocommando#1\v!leftedge
+   \dodocommando#1\v!leftmargin
+   \dodocommando#1\v!text
+   \dodocommando#1\v!rightmargin
+   \dodocommando#1\v!rightedge}
+
+\docommando\v!top
+\docommando\v!header
+\docommando\v!text
+\docommando\v!footer
+\docommando\v!bottom
 
 %D We need some cleanup now.
 
@@ -569,29 +549,29 @@
 %D defaults.
 
 \setupbackgrounds
-  [\c!status=\c!start]
+  [\c!state=\c!start]
 
 \setupbackgrounds
-  [\v!papier,\v!pagina,\v!linkerpagina,\v!rechterpagina]
-  [\c!kader=\v!uit,
-   \c!straal=.5\korpsgrootte,
-   \c!hoek=\v!recht,
-   \c!achtergrond=,
-   \c!raster=\@@rsraster,
-   \c!kleur=,
-  %\c!kaderoffset=\getvalue{\??ma\v!pagina\c!offset},
-  %\c!achtergrondoffset=\getvalue{\??ma\v!pagina\c!offset},
+  [\v!paper,\v!page,\v!leftpage,\v!rightpage]
+  [\c!frame=\v!off,
+   \c!radius=.5\korpsgrootte,
+   \c!corner=\v!rectangular,
+   \c!background=,
+   \c!screen=\@@rsscreen,
+   \c!color=,
+  %\c!frameoffset=\getvalue{\??ma\v!page\c!offset},
+  %\c!backgroundoffset=\getvalue{\??ma\v!page\c!offset},
    \c!offset=\!!zeropoint, % later set to \v!overlay, watch out !
-   \c!diepte=\!!zeropoint]
+   \c!depth=\!!zeropoint]
 
 \def\docommando#1%
-  {\inheritparameter[\??ma][#1\c!kaderoffset][\v!pagina\c!offset]%
-   \inheritparameter[\??ma][#1\c!achtergrondoffset][\v!pagina\c!offset]}
+  {\inheritparameter[\??ma][#1\c!frameoffset][\v!page\c!offset]%
+   \inheritparameter[\??ma][#1\c!backgroundoffset][\v!page\c!offset]}
 
-\docommando\v!papier
-\docommando\v!pagina
-\docommando\v!linkerpagina
-\docommando\v!rechterpagina
+\docommando\v!paper
+\docommando\v!page
+\docommando\v!leftpage
+\docommando\v!rightpage
 
 %D Again we clean up temporary macros.
 
@@ -613,25 +593,25 @@
   {\global\setfalse\hiddenbackgroundenabled}
 
 \def\hiddenbackground
-  {\v!tekst-2,\v!tekst-1,\v!voorgrond,\v!tekst+1,\v!tekst+2}
+  {\v!text-2,\v!text-1,\v!foreground,\v!text+1,\v!text+2}
 
 \setupbackgrounds
-  [\v!verborgen]
-  [\c!achtergrond=\hiddenbackground]
+  [\v!hidden]
+  [\c!background=\hiddenbackground]
 
 % The next series is used in local (for instance floating)
 % backgrounds.
 
 \presetlocalframed
-  [\??ma\v!lokaal]
+  [\??ma\v!local]
 
 \def\localbackground
-  {\v!lokaal-2,\v!lokaal-1,\v!voorgrond,\v!lokaal+1,\v!lokaal+2}
+  {\v!local-2,\v!local-1,\v!foreground,\v!local+1,\v!local+2}
 
-\defineoverlay[\v!lokaal-2][\positionoverlay{\v!lokaal-2}]
-\defineoverlay[\v!lokaal-1][\positionoverlay{\v!lokaal-1}]
-\defineoverlay[\v!lokaal+1][\positionoverlay{\v!lokaal+1}]
-\defineoverlay[\v!lokaal+2][\positionoverlay{\v!lokaal+2}]
+\defineoverlay[\v!local-2][\positionoverlay{\v!local-2}]
+\defineoverlay[\v!local-1][\positionoverlay{\v!local-1}]
+\defineoverlay[\v!local+1][\positionoverlay{\v!local+1}]
+\defineoverlay[\v!local+2][\positionoverlay{\v!local+2}]
 
 \def\addlocalbackgroundtobox
   {\ifconditional\hiddenbackgroundenabled
@@ -660,19 +640,19 @@
 %    \doglobal\increment\localpositionnumber % afterwards !
 %    \next}
 
-\def\doaddlocalbackground#1%
-  {\edef\next
-     {\noexpand\redoglobal\wd#1\the\wd#1%
-      \noexpand\redoglobal\ht#1\the\ht#1%
-      \noexpand\dodoglobal\dp#1\the\dp#1}%
-   \dodoglobal\setbox#1\hbox
-     {\fastlocalframed
-        [\??ma\v!lokaal]
-        [\c!component=local,\c!kader=\v!uit,\c!offset=\v!overlay,%
-         \c!achtergrond=\localbackground]%
-        {\registerMPlocaltextarea{\box#1}}}%
-   \next
-   \doglobal\increment\localpositionnumber\relax} % afterwards !
+% \def\doaddlocalbackground#1%
+%   {\edef\next
+%      {\noexpand\redoglobal\wd#1\the\wd#1%
+%       \noexpand\redoglobal\ht#1\the\ht#1%
+%       \noexpand\dodoglobal\dp#1\the\dp#1}%
+%    \dodoglobal\setbox#1\hbox
+%      {\fastlocalframed
+%         [\??ma\v!lokaal]
+%         [\c!component=local,\c!kader=\v!uit,\c!offset=\v!overlay,%
+%          \c!achtergrond=\localbackground]%
+%         {\registerMPlocaltextarea{\box#1}}}%
+%    \next
+%    \doglobal\increment\localpositionnumber\relax} % afterwards !
 
 \def\doaddlocalbackground#1%
   {\edef\next
@@ -681,15 +661,14 @@
       \noexpand\dodoglobal\dp#1\the\dp#1}%
    \dodoglobal\setbox#1\hbox
      {\fastlocalframed
-        [\??ma\v!lokaal]
-        [\c!component=local,\c!kader=\v!uit,\c!offset=\v!overlay,%
-         \c!breedte=\wd#1,\c!hoogte=\ht#1,\c!diepte=\dp#1,%
-         \c!achtergrond=\localbackground]%
+        [\??ma\v!local]
+        [\c!component=local,\c!frame=\v!off,\c!offset=\v!overlay,%
+         \c!width=\wd#1,hoogte=\ht#1,% no diepte=\dp#1 in cont-exp.tex, to be checked !
+         \c!background=\localbackground]%
         {\registerMPlocaltextarea{\box#1}}}%
    \next
    \doglobal\increment\localpositionnumber\relax} % afterwards !
 
-
 % Test how previous macro behaves with depth:
 %
 % \startcolumnset
@@ -707,19 +686,19 @@
 
 \protect \endinput
 
-%D Removed \citeer {features}:
+%D Removed \quote {features}:
 %D
-%D \starttypen
-%D \startinteractie
+%D \starttyping
+%D \startinteraction
 %D \doifmarginswapelse
 %D   {\copy\leftbackground}
 %D   {\copy\rightbackground}%
-%D \stopinteractie
-%D \stoptypen
+%D \stopinteraction
+%D \stoptyping
 %D
-%D \starttypen
+%D \starttyping
 %D \edef\setpagebackgrounddepth%
 %D   {\dp#2=\the\dp#2}%
 %D \setbox#2=\vbox\localframed[\??ma#1]{...}
 %D \setpagebackgrounddepth
-%D \stoptypen
+%D \stoptyping
diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex
index 00cf3996f..3170466db 100644
--- a/tex/context/base/page-flt.tex
+++ b/tex/context/base/page-flt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-flt,
+%D   [       filefile=page-flt,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Floating Bodies,
@@ -160,29 +160,29 @@
      12: nedefinit
 \stopmessages
 
-\def\stelplaatsblokkenin
+\def\setupfloats
   {\dodoubleargument\getparameters[\??bk]}
 
-\def\stelblokkopjesin
+\def\setupcaptions
   {\dodoubleargument\getparameters[\??kj]}
 
-\def\dostelplaatsblokin[#1][#2]%
+\def\dosetupfloat[#1][#2]%
   {\def\docommando##1{\getparameters[\??fl##1][#2]}%
    \processcommalist[#1]\docommando}
 
-\def\stelplaatsblokin
-  {\dodoubleargument\dostelplaatsblokin}
+\def\setupfloat
+  {\dodoubleargument\dosetupfloat}
 
-\def\dostelblokkopjein[#1][#2]%
+\def\dosetupcaption[#1][#2]%
   {\def\docommando##1{\getparameters[\??kj##1][#2]}%
    \processcommalist[#1]\docommando}
 
-\def\stelblokkopjein
-  {\dodoubleargument\dostelblokkopjein}
+\def\setupcaption
+  {\dodoubleargument\dosetupcaption}
 
-\def\doleegblok#1%
+\def\doemptyblock#1%
   {\localframed
-     [\??fl#1][\c!kader=\v!aan]%
+     [\??fl#1][\c!frame=\v!on]%
      {\getmessage\m!floatblocks{12}}}
 
 % A complication is that we may have to handle a pagebreak
@@ -194,8 +194,8 @@
 \def\docomplexplaatsblok[#1][#2]% [#3]#4%
   {\edef\floattype{#1}%
    \doifelsenothing\floattype
-     {\let\floattype\v!figuur}
-     {\doifundefined{\??fl#1\c!default}{\let\floattype\v!figuur}}%
+     {\let\floattype\v!figure}
+     {\doifundefined{\??fl#1\c!default}{\let\floattype\v!figure}}%
    \doifelsenothing{#2}
      {\edef\floatlocation{\getvalue{\??fl\floattype\c!default}}}
      {\edef\floatlocation{#2}}%
@@ -206,25 +206,25 @@
 \flushsidefloats % here !
    \ifsomefloatwaiting
      % this was \checkwaitingfloats spread all over
-     \doifinsetelse\v!altijd{#2}
+     \doifinsetelse\v!always{#2}
        {\showmessage\m!floatblocks5\empty}
        {\doifcommonelse
           {#2}
-          {\v!links,\v!rechts,\v!binnen,\v!buiten,%
-           \v!rugwit,\v!snijwit,%
-           \v!inlinker,\v!inrechter,\v!inmarge,%
-           \v!linkermarge,\v!rechtermarge,\v!linkerrand,\v!rechterrand,%
-           \v!binnenmarge,\v!buitenmarge,\v!binnenrand,\v!buitenrand,%
-           \v!tekst,\v!naast}% \v!pagina
+          {\v!left,\v!right,\v!inner,\v!outer,%
+           \v!backspace,\v!cutspace,%
+           \v!inleft,\v!inright,\v!inmargin,%
+           \v!leftmargin,\v!rightmargin,\v!leftedge,\v!rightedge,%
+           \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,%
+           \v!text,\v!opposite}% \v!page
           {\doflushfloats}
           {}}%
      % but which should be done before using box \floatbox
    \fi
    \ifmargeblokken % waarschijnlijk gebroken ! ! ! !
-     \doifinset\v!marge{#2}
+     \doifinset\v!margin{#2}
        {\endgraf
         \bgroup\everypar{\egroup\the\everypar}%
-        \hsize\@@mbbreedte}%
+        \hsize\@@mbwidth}%
    \fi
    \global\insidefloattrue
    \begingroup % **
@@ -233,12 +233,12 @@
    \presetmorefloatvariables{#2}%
    \dowithnextboxcontent % better a \the\everyfloattoks
      {\setlocalfloathsize
-      \getvalue{\??fl#1\c!binnen}%
+      \getvalue{\??fl#1\c!inner}%
       \fuzzysnappingfalse
       \postponefootnotes} % new
      {\xdocompletefloat{#1}{#3}{#1}{#2}{#1}{#4}% ** not yet done
        % we need to carry over the par because of side floats
-      \doifnotinset\v!tekst{#2}{\carryoverpar\endgroup}%
+      \doifnotinset\v!text{#2}{\carryoverpar\endgroup}%
       \global\sidefloatdownshift \zeropoint
       \global\sidefloatextrashift\zeropoint
       \ifparfloat
@@ -258,42 +258,42 @@
 \def\presetfloatvariables#1#2#3#4%
   {\doifcommonelse
      {#2}
-     {\v!links,\v!rechts,\v!binnen,\v!buiten,%
-      \v!inlinker,\v!inrechter,\v!inmarge,%
-      \v!rugwit,\v!snijwit,%
-      \v!binnenmarge,\v!buitenmarge,\v!binnenrand,\v!buitenrand,%
-      \v!linkermarge,\v!linkerrand,\v!rechtermarge,\v!rechterrand}
+     {\v!left,\v!right,\v!inner,\v!outer,%
+      \v!inleft,\v!inright,\v!inmargin,%
+      \v!backspace,\v!cutspace,%
+      \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,%
+      \v!leftmargin,\v!leftedge,\v!rightmargin,\v!rightedge}
      {\global\parfloattrue}
      {\global\parfloatfalse}%
-   \ifbinnenkolommen
+   \ifinsidecolumns
      \global\parfloatfalse
    \fi
    \global\sidefloatshift\zeropoint
    \global\sidefloatmaximum\zeropoint
-   \global\chardef\sidefloatmethod\getvalue{\??fl#1\c!zijmethode}%
-   \global\chardef\textfloatmethod\getvalue{\??fl#1\c!tekstmethode}%
+   \global\chardef\sidefloatmethod\getvalue{\??fl#1\c!sidemethod}%
+   \global\chardef\textfloatmethod\getvalue{\??fl#1\c!textmethod}%
    \global\chardef\sidefloatalign\zerocount
    \globallet\floatrotation\!!zerocount
    \calculatefloatskips{#1}%
    \ifparfloat
      \processaction
-       [\getvalue{\??fl#1\c!zijuitlijnen}]
-       [\v!hoogte=>\global\chardef\sidefloatalign\plusone,%
-         \v!regel=>\global\chardef\sidefloatalign\plustwo,% (***)
-        \v!diepte=>\global\chardef\sidefloatalign\plusthree,%
+       [\getvalue{\??fl#1\c!sidealign}]
+       [\v!height=>\global\chardef\sidefloatalign\plusone,%
+         \v!line=>\global\chardef\sidefloatalign\plustwo,% (***)
+        \v!depth=>\global\chardef\sidefloatalign\plusthree,%
           \v!grid=>\global\chardef\sidefloatalign4,%
-    \v!halveregel=>\global\chardef\sidefloatalign5]%
+    \v!halfline=>\global\chardef\sidefloatalign5]%
 % todo (test first): \doifinset\v!lokaal{#2}{\chardef\sidefloatalign\zerocount}%
      \ifcase\sidefloatalign\relax % todo: optie v!lokaal => \else
-       \doifinset\v!hoogte    {#2}{\global\chardef\sidefloatalign\plusone}%
-       \doifinset\v!regel     {#2}{\global\chardef\sidefloatalign\plustwo}%
-       \doifinset\v!diepte    {#2}{\global\chardef\sidefloatalign\plusthree}%
+       \doifinset\v!height    {#2}{\global\chardef\sidefloatalign\plusone}%
+       \doifinset\v!line     {#2}{\global\chardef\sidefloatalign\plustwo}%
+       \doifinset\v!depth    {#2}{\global\chardef\sidefloatalign\plusthree}%
        \doifinset\v!grid      {#2}{\global\chardef\sidefloatalign4}%
-       \doifinset\v!halveregel{#2}{\global\chardef\sidefloatalign5}% meant for 'none'
+       \doifinset\v!halfline{#2}{\global\chardef\sidefloatalign5}% meant for 'none'
      \fi
-     \doifinset\v!hoog{#2}{\global\sidefloattopskip   \zeropoint}%
-     \doifinset\v!laag{#2}{\global\sidefloatbottomskip\zeropoint}%
-     \doifinset\v!passend{#2}
+     \doifinset\v!high{#2}{\global\sidefloattopskip   \zeropoint}%
+     \doifinset\v!low{#2}{\global\sidefloatbottomskip\zeropoint}%
+     \doifinset\v!fit{#2}
        {\global\sidefloattopskip   \zeropoint
         \global\sidefloatbottomskip\zeropoint
         \global\floatsideskip      \zeropoint}%
@@ -304,17 +304,17 @@
         180=>\globallet\floatrotation\commalistelement,%
         270=>\globallet\floatrotation\commalistelement]%
    \fi
-   \doifinsetelse\v!geennummer{#2}
+   \doifinsetelse\v!nonumber{#2}
      {\global\nofloatnumbertrue}
-     {\doifelsevalue{\??kj#1\c!nummer}\v!ja
+     {\doifelsevalue{\??kj#1\c!number}\v!yes
         {\global\nofloatnumberfalse}
         {\global\nofloatnumbertrue}}%
    \ConvertToConstant\doifelse{#4}{}
      {\global\emptyfloatcaptiontrue}
      {\global\emptyfloatcaptionfalse}%
-   \doifinsetelse\v!geen{#2}
+   \doifinsetelse\v!none{#2}
      {\global\nofloatcaptiontrue}
-     {\ConvertToConstant\doifelse{#4}\v!geen
+     {\ConvertToConstant\doifelse{#4}\v!none
         {\global\nofloatcaptiontrue}
         {\global\nofloatcaptionfalse}}%
    \ifemptyfloatcaption \ifnofloatnumber
@@ -324,17 +324,17 @@
 % documenteren in details
 
 \def\presetmorefloatvariables#1%
-  {\doifelse\@@bklokaal\v!ja % fout keyword
+  {\doifelse\@@bklocal\v!yes % fout keyword
      \globalcenterfloatboxtrue
      \globalcenterfloatboxfalse
    \ifglobalcenterfloatbox
      \localcenterfloatboxtrue
    \else
-     \doifinsetelse\v!lokaal{#1}
+     \doifinsetelse\v!local{#1}
        \localcenterfloatboxtrue
        \localcenterfloatboxfalse
    \fi
-   \doifnotcommon{\v!altijd,\v!hier,\v!forceer}{#1} % ! ! ! ! ! !
+   \doifnotcommon{\v!always,\v!here,\v!force}{#1} % ! ! ! ! ! !
      {\globalcenterfloatboxfalse
       \localcenterfloatboxfalse}}
 
@@ -420,9 +420,9 @@
       \def\movedownsidefloat##1%
         {\processaction
            [##1]%
-           [ \v!regel=>\docommando+,%
-            +\v!regel=>\docommando+,%
-            -\v!regel=>\docommando-]}%
+           [ \v!line=>\docommando+,%
+            +\v!line=>\docommando+,%
+            -\v!line=>\docommando-]}%
       \def\docommando##1%
         {\ifdone\else\global\sidefloatdownshift\zeropoint\donetrue\fi
          \global\advance\sidefloatdownshift##1\lineheight}%
@@ -434,7 +434,7 @@
 
 \def\xdocompletefloat#1#2#3#4#5#6%
   {\ifextrafloatactions
-     \doifinsetelse\v!tekst{#4}
+     \doifinsetelse\v!text{#4}
        {% fuzzy, text overloads left, since then it's a directive
         \docompletefloat{#1}{#2}{#3}{#4}{#5}{#6}\nextbox}
        {\let\@@extrafloat\empty
@@ -442,17 +442,17 @@
         % already be set at this point
         \processallactionsinset
           [#4] % ininner/inouter : for old times sake
-          [     \v!binnen=>\xxdocompletefloat\v!links       \v!rechts,
-                \v!buiten=>\xxdocompletefloat\v!rechts      \v!links,
-           \v!binnenmarge=>\xxdocompletefloat\v!linkermarge \v!rechtermarge,
-           \v!buitenmarge=>\xxdocompletefloat\v!rechtermarge\v!linkermarge,
-            \v!binnenrand=>\xxdocompletefloat\v!linkerrand  \v!rechterrand,
-            \v!buitenrand=>\xxdocompletefloat\v!rechterrand \v!linkerrand,
-                \v!rugwit=>\xxdocompletefloat\v!rugwit      \v!snijwit,
-               \v!snijwit=>\xxdocompletefloat\v!snijwit     \v!rugwit,
-                 \v!links=>\xxdocompletefloat\v!links       \v!links,
-                \v!rechts=>\xxdocompletefloat\v!rechts      \v!rechts,
-                 \v!regel=>, % only -n*line is handled (see ***)
+          [     \v!inner=>\xxdocompletefloat\v!left       \v!right,
+                \v!outer=>\xxdocompletefloat\v!right      \v!left,
+           \v!innermargin=>\xxdocompletefloat\v!leftmargin \v!rightmargin,
+           \v!outermargin=>\xxdocompletefloat\v!rightmargin\v!leftmargin,
+            \v!inneredge=>\xxdocompletefloat\v!leftedge  \v!rightedge,
+            \v!outeredge=>\xxdocompletefloat\v!rightedge \v!leftedge,
+                \v!backspace=>\xxdocompletefloat\v!backspace      \v!cutspace,
+               \v!cutspace=>\xxdocompletefloat\v!cutspace     \v!backspace,
+                 \v!left=>\xxdocompletefloat\v!left       \v!left,
+                \v!right=>\xxdocompletefloat\v!right      \v!right,
+                 \v!line=>, % only -n*line is handled (see ***)
                \s!unknown=>{\movedownsidefloat[\commalistelement]}]%
         \ifx\@@extrafloat\empty
           \docompletefloat{#1}{#2}{#3}{#4}{#5}{#6}\nextbox
@@ -473,142 +473,142 @@
        #4\setbox#3\vbox
         {\vskip\sidefloatdownshift\nointerlineskip\box#3}%
      \fi
-     \doifvaluesomething{\??fl#1\c!minbreedte}
-       {\scratchdimen\getvalue{\??fl#1\c!minbreedte}\relax
+     \doifvaluesomething{\??fl#1\c!minwidth}
+       {\scratchdimen\getvalue{\??fl#1\c!minwidth}\relax
         \ifdim\wd#3<\scratchdimen
           #4\setbox#3\hbox to \scratchdimen
-            {\doifnotvalue{\??fl#1\c!plaats}\v!links \hss
+            {\doifnotvalue{\??fl#1\c!location}\v!left \hss
              \box#3%
-             \doifnotvalue{\??fl#1\c!plaats}\v!rechts\hss}%
+             \doifnotvalue{\??fl#1\c!location}\v!right\hss}%
         \fi}%
      % todo: rand / rug
-     \doifinset\v!hangend{#2}
-       {\doifcommonelse{\v!inlinker,\v!linkermarge}{#2}
-          {\letvalue{\??fl#1\c!maxbreedte}\linkermargebreedte}%
-          {\doifcommon{\v!inrechter,\v!rechtermarge}{#2}
-             {\letvalue{\??fl#1\c!maxbreedte}\rechtermargebreedte}}}%
-     \doifvaluesomething{\??fl#1\c!maxbreedte}
-       {\scratchdimen\getvalue{\??fl#1\c!maxbreedte}\relax
+     \doifinset\v!hanging{#2}
+       {\doifcommonelse{\v!inleft,\v!leftmargin}{#2}
+          {\letvalue{\??fl#1\c!maxwidth}\leftmarginwidth}%
+          {\doifcommon{\v!inright,\v!rightmargin}{#2}
+             {\letvalue{\??fl#1\c!maxwidth}\rightmarginwidth}}}%
+     \doifvaluesomething{\??fl#1\c!maxwidth}
+       {\scratchdimen\getvalue{\??fl#1\c!maxwidth}\relax
         \ifdim\wd#3>\scratchdimen
-          \doifcommonelse{\v!inrechter,\v!rechtermarge,\v!rechterrand
-                          \v!inlinker,\v!linkermarge,\v!linkerrand}{#2}
+          \doifcommonelse{\v!inright,\v!rightmargin,\v!rightedge
+                          \v!inleft,\v!leftmargin,\v!leftedge}{#2}
             {\global\sidefloatmaximum\scratchdimen}
             {#4\setbox#3\hbox to \scratchdimen
-              {\doifcommonelse{\v!rechts,\v!links}{#2}
-                 {\doifnotinset\v!rechts{#2}\hss
+              {\doifcommonelse{\v!right,\v!left}{#2}
+                 {\doifnotinset\v!right{#2}\hss
                   \box#3%
-                  \doifnotinset\v!links{#2}\hss}%
-                 {\doifnotvalue{\??fl#1\c!plaats}\v!links\hss
+                  \doifnotinset\v!left{#2}\hss}%
+                 {\doifnotvalue{\??fl#1\c!location}\v!left\hss
                   \box#3%
-                  \doifnotvalue{\??fl#1\c!plaats}\v!rechts\hss}}}%
+                  \doifnotvalue{\??fl#1\c!location}\v!right\hss}}}%
         \fi}%
   \fi}
 
-\def\docomplexstarttekstblok[#1][#2][#3]%
+\def\docomplexstarttextblock[#1][#2][#3]%
   {\flushnotes
    \flushsidefloats % hoort eigenlijk niet hier
-   \docomplexplaatsblok[#1][\v!tekst,#2,\v!links][#3]}
+   \docomplexplaatsblok[#1][\v!text,#2,\v!left][#3]}
 
-\def\docomplexreserveerblok[#1][#2][#3][#4]#5%
-  {\getvalue{\e!plaats#1}[#3][#4]{#5}{\localframed[\??fl#1][#2]{#1}}}
+\def\docomplexreserveblock[#1][#2][#3][#4]#5%
+  {\getvalue{\e!place#1}[#3][#4]{#5}{\localframed[\??fl#1][#2]{#1}}}
 
-\def\docomplexstartreserveertekstblok[#1][#2][#3][#4]%
+\def\docomplexstartreservetextblock[#1][#2][#3][#4]%
   {\flushsidefloats % hoort eigenlijk niet hier
-   \docomplexreserveerblok[#1][#2][\v!tekst,#3,\v!links][#4]}
+   \docomplexreserveblock[#1][#2][\v!text,#3,\v!left][#4]}
 
-\def\definieerplaatsblok
-  {\dotripleempty\dodefinieerplaatsblok}
+\def\definefloat
+  {\dotripleempty\dodefinefloat}
 
-\def\dodefinieerplaatsblok[#1][#2][#3]% #1=naam #2=meervoud #3=parent
+\def\dodefinefloat[#1][#2][#3]% #1=naam #2=meervoud #3=parent
   {\ifthirdargument
      \redodefinieerplaatsblok[#1][#2][#3]%
    \else\ifsecondargument
-     \dododefinieerplaatsblok[#1][#2]%
+     \dododefinefloat[#1][#2]%
    \else
-     \dododefinieerplaatsblok[#1][#1]%
+     \dododefinefloat[#1][#1]%
    \fi\fi}
 
-\def\dododefinieerplaatsblok[#1][#2]%
+\def\dododefinefloat[#1][#2]%
   {\presetlocalframed[\??fl#1]%
-   \stelplaatsblokin
+   \setupfloat
      [#1]
-     [\c!breedte=8\lineheight, % 15\korpsgrootte,
-      \c!hoogte=6\lineheight,  % 10\korpsgrootte,
-      \c!minbreedte=,
-      \c!maxbreedte=,
-      \c!maxhoogte=,
+     [\c!width=8\lineheight, % 15\korpsgrootte,
+      \c!height=6\lineheight,  % 10\korpsgrootte,
+      \c!minwidth=,
+      \c!maxwidth=,
+      \c!maxheight=,
       \c!criterium=,
-      \c!zijvoorwit=\@@bkzijvoorwit,
-      \c!zijnawit=\@@bkzijnawit,
-      \c!zijuitlijnen=\@@bkzijuitlijnen, % \v!regel
-      \c!marge=\@@bkmarge,
-      \c!linkermargeafstand=\@@bklinkermargeafstand,
-      \c!rechtermargeafstand=\@@bkrechtermargeafstand,
-      \c!kader=\@@bkkader,
-      \c!straal=\@@bkstraal,
-      \c!hoek=\@@bkhoek,
-      \c!plaats=\@@bkplaats,
-      \c!achtergrond=\@@bkachtergrond,
-      \c!achtergrondraster=\@@bkachtergrondraster,
-      \c!achtergrondkleur=\@@bkachtergrondkleur,
-      \c!achtergrondoffset=\@@bkachtergrondoffset,
-      \c!bovenkader=\@@bkbovenkader,
-      \c!onderkader=\@@bkonderkader,
-      \c!linkerkader=\@@bklinkerkader,
-      \c!rechterkader=\@@bkrechterkader,
-      \c!kaderoffset=\@@bkkaderoffset,
-     %\c!lokaal=\@@bklokaal,
-      \c!paginaovergangen=,
-      \c!tekstmethode=\@@bktekstmethode,
-      \c!zijmethode=\@@bkzijmethode,
+      \c!sidespacebefore=\@@bksidespacebefore,
+      \c!sidespaceafter=\@@bksidespaceafter,
+      \c!sidealign=\@@bksidealign, % \v!line
+      \c!margin=\@@bkmargin,
+      \c!leftmargindistance=\@@bkleftmargindistance,
+      \c!rightmargindistance=\@@bkrightmargindistance,
+      \c!frame=\@@bkframe,
+      \c!radius=\@@bkradius,
+      \c!corner=\@@bkcorner,
+      \c!location=\@@bklocation,
+      \c!background=\@@bkbackground,
+      \c!backgroundscreen=\@@bkbackgroundscreen,
+      \c!backgroundcolor=\@@bkbackgroundcolor,
+      \c!backgroundoffset=\@@bkbackgroundoffset,
+      \c!topframe=\@@bktopframe,
+      \c!bottomframe=\@@bkbottomframe,
+      \c!leftframe=\@@bkleftframe,
+      \c!rightframe=\@@bkrightframe,
+      \c!frameoffset=\@@bkframeoffset,
+     %\c!local=\@@bklocal,
+      \c!pageboundaries=,
+      \c!textmethod=\@@bktextmethod,
+      \c!sidemethod=\@@bksidemethod,
       \c!default=]%
-   \stelblokkopjein
+   \setupcaption
      [#1]
-     [\c!plaats=\@@kjplaats,
-     %\c!voor=\@@kjvoor,
-      \c!tussen=\@@kjtussen,
-     %\c!na=\@@kjna,
-      \c!breedte=\@@kjbreedte,
-      \c!minbreedte=\@@kjminbreedte,
-      \c!kopletter=\@@kjkopletter,
-      \c!kopkleur=\@@kjkopkleur,
-      \c!tekstletter=\@@kjtekstletter,
-      \c!tekstkleur=\@@kjtekstkleur,
-      \c!letter=\@@kjletter,
-      \c!kleur=\@@kjkleur,
-      \c!uitlijnen=\@@kjuitlijnen,
-      \c!nummer=\@@kjnummer,
-      \c!wijze=\@@kjwijze,
-      \c!blokwijze=\@@kjblokwijze,
-      \c!sectienummer=\@@kjsectienummer,
-      \c!afstand=\@@kjafstand,
-      \c!scheider=\@@kjscheider,
-      \c!commando=\@@kjcommando,
-      \c!conversie=\@@kjconversie]%
-   \definieernummer % \doorlabelen
+     [\c!location=\@@kjlocation,
+     %\c!before=\@@kjbefore,
+      \c!inbetween=\@@kjinbetween,
+     %\c!after=\@@kjafter,
+      \c!width=\@@kjwidth,
+      \c!minwidth=\@@kjminwidth,
+      \c!headstyle=\@@kjheadstyle,
+      \c!headcolor=\@@kjheadcolor,
+      \c!textstyle=\@@kjtextstyle,
+      \c!textcolor=\@@kjtextcolor,
+      \c!style=\@@kjstyle,
+      \c!color=\@@kjcolor,
+      \c!align=\@@kjalign,
+      \c!number=\@@kjnumber,
+      \c!way=\@@kjway,
+      \c!blockway=\@@kjblockway,
+      \c!sectionnumber=\@@kjsectionnumber,
+      \c!distance=\@@kjdistance,
+      \c!separator=\@@kjseparator,
+      \c!command=\@@kjcommand,
+      \c!conversion=\@@kjconversion]%
+   \definenumber % \definelabel
      [#1]
-     [\c!tekst=#1,
-      \c!plaats=\v!intekst,
-      \c!wijze=\getvalue{\??kj#1\c!wijze},
-      \c!blokwijze=\getvalue{\??kj#1\c!blokwijze},
-      \c!sectienummer=\getvalue{\??kj#1\c!sectienummer},
-      \c!conversie=\getvalue{\??kj#1\c!conversie}]%
+     [\c!text=#1,
+      \c!location=\v!intext,
+      \c!way=\getvalue{\??kj#1\c!way},
+      \c!blockway=\getvalue{\??kj#1\c!blockway},
+      \c!sectionnumber=\getvalue{\??kj#1\c!sectionnumber},
+      \c!conversion=\getvalue{\??kj#1\c!conversion}]%
    \presetlabeltext[#1=\Word{#1}~]%
    \dodefinefloatcommands[#1][#2]}
 
 \def\dodefinefloatcommands[#1][#2]%
-  {\definieerlijst[#1]%
+  {\definelist[#1]%
    \presetheadtext[#2=\Word{#2}]%
-   \setvalue        {\e!plaats\e!lijstmet#2}{\dodoubleempty\doplaatslijst[#1]}%
-   \setvalue     {\e!volledige\e!lijstmet#2}{\dotripleempty\dodovolledigelijst[#1][#2]}%
-   \setvalue                   {\e!plaats#1}{\dotripleempty\docomplexplaatsblok[#1]}%
-   \setvalue                {\e!reserveer#1}{\doquadrupleempty\docomplexreserveerblok[#1]}%
-   \setvalue            {\e!start#1\e!tekst}{\dotripleempty\docomplexstarttekstblok[#1]}%
-   \setvalue             {\e!stop#1\e!tekst}{\dostoptextfloat}%
-   \setvalue{\e!start\e!reserveer#1\e!tekst}{\doquadrupleempty\docomplexstartreserveertekstblok[#1]}%
-   \setvalue {\e!stop\e!reserveer#1\e!tekst}{\dostoptextfloat}%
-   \setvalue                     {\e!lege#1}{\doleegblok{#1}}%
-   \setvalue                     {\e!leeg#1}{\doleegblok{#1}}}
+   \setvalue        {\e!place\e!listof#2}{\dodoubleempty\doplacelist[#1]}%
+   \setvalue     {\e!complete\e!listof#2}{\dotripleempty\dodocompletelist[#1][#2]}%
+   \setvalue                   {\e!place#1}{\dotripleempty\docomplexplaatsblok[#1]}%
+   \setvalue                {\e!reserve#1}{\doquadrupleempty\docomplexreserveblock[#1]}%
+   \setvalue            {\e!start#1\e!text}{\dotripleempty\docomplexstarttextblock[#1]}%
+   \setvalue             {\e!stop#1\e!text}{\dostoptextfloat}%
+   \setvalue{\e!start\e!reserve#1\e!text}{\doquadrupleempty\docomplexstartreservetextblock[#1]}%
+   \setvalue {\e!stop\e!reserve#1\e!text}{\dostoptextfloat}%
+   \setvalue                 {\e!emptyone#1}{\doemptyblock{#1}}%
+   \setvalue                 {\e!emptytwo#1}{\doemptyblock{#1}}}
 
 % \setupfloat[...][leftmargindistance=1cm,default={left,none}]
 
@@ -616,22 +616,22 @@
   {\presetlocalframed[\??fl#1]%
    \copylocalframed[\??fl#1][\??fl#3]%
    \copyparameters[\??fl#1][\??fl#3]
-     [\c!breedte,\c!hoogte,%\c!lokaal,
-      \c!maxbreedte,\c!maxhoogte,\c!minbreedte,
-      \c!marge,\c!zijvoorwit,\c!zijnawit,\c!zijuitlijnen,
-      \c!linkermargeafstand,\c!rechtermargeafstand,\c!criterium,
-      \c!kader,\c!straal,\c!hoek,\c!plaats,\c!achtergrond,\c!kaderkleur,
-      \c!achtergrondraster,\c!achtergrondkleur,\c!achtergrondoffset,
-      \c!bovenkader,\c!onderkader,\c!linkerkader,\c!rechterkader,
-      \c!kaderoffset,\c!paginaovergangen,\c!default,
-      \c!tekstmethode,\c!zijmethode]%
+     [\c!width,\c!height,%\c!local,
+      \c!maxwidth,\c!maxheight,\c!minwidth,
+      \c!margin,\c!sidespacebefore,\c!sidespaceafter,\c!sidealign,
+      \c!leftmargindistance,\c!rightmargindistance,\c!criterium,
+      \c!frame,\c!radius,\c!corner,\c!location,\c!background,\c!framecolor,
+      \c!backgroundscreen,\c!backgroundcolor,\c!backgroundoffset,
+      \c!topframe,\c!bottomframe,\c!leftframe,\c!rightframe,
+      \c!frameoffset,\c!pageboundaries,\c!default,
+      \c!textmethod,\c!sidemethod]%
    \copyparameters[\??kj#1][\??kj#3]
-     [\c!plaats,\c!voor,\c!tussen,\c!na,
-      \c!breedte,\c!kopletter,\c!kopkleur,\c!letter,\c!kleur,
-      \c!tekstletter,\c!tekstkleur,\c!minbreedte,
-      \c!uitlijnen,\c!nummer,\c!wijze,\c!blokwijze,
-      \c!sectienummer,\c!scheider,\c!afstand,\c!conversie]%
-   \definieernummer[#1][#3]%
+     [\c!location,\c!before,\c!inbetween,\c!after,
+      \c!width,\c!headstyle,\c!headcolor,\c!style,\c!color,
+      \c!textstyle,\c!textcolor,\c!minwidth,
+      \c!align,\c!number,\c!way,\c!blockway,
+      \c!sectionnumber,\c!separator,\c!distance,\c!conversion]%
+   \definenumber[#1][#3]%
    \presetlabeltext[#1=\labeltext{#3}]%
    \dodefinefloatcommands[#1][#2]}
 
@@ -847,21 +847,21 @@
 % beter de laatste skip buiten de \insert uitvoeren,
 % bovendien bij volle flush onder baseline.
 
-\def\betweenfloatblanko% assumes that \@@bknawit is present
+\def\betweenfloatblanko% assumes that \@@bkspaceafter is present
   {\bgroup
-   \setbox0\vbox{\strut\blanko[\@@bkvoorwit]\strut}%
-   \setbox2\vbox{\strut\blanko[\@@bknawit  ]\strut}%
+   \setbox0\vbox{\strut\blank[\@@bkspacebefore]\strut}%
+   \setbox2\vbox{\strut\blank[\@@bkspaceafter  ]\strut}%
    \ifdim\ht0>\ht2
-     \blanko[-\@@bknawit,\@@bkvoorwit]
+     \blank[-\@@bkspaceafter,\@@bkspacebefore]
    \fi
    \egroup}
 
 \def\doplacefloatbox
   {%\forgetall % NJET!
-   \witruimte
-   \blanko[\@@bkvoorwit]
+   \whitespace
+   \blank[\@@bkspacebefore]
    \flushfloatbox
-   \blanko[\@@bknawit]}
+   \blank[\@@bkspaceafter]}
 
 \ifx\someherefloat\undefined \let\someherefloat\doplacefloatbox \fi
 \ifx\somefixdfloat\undefined \let\somefixdfloat\doplacefloatbox \fi
@@ -879,10 +879,10 @@
   {%\checkwaitingfloats{#1}%
    \global\setbox\collectedpagefloats\vbox
      {\unvbox\collectedpagefloats
-      \vbox to \teksthoogte
-        {\doifnotinset\v!hoog{#1}\vfill
+      \vbox to \textheight
+        {\doifnotinset\v!high{#1}\vfill
          \box\floatbox
-         \doifnotinset\v!laag{#1}\vfill}%
+         \doifnotinset\v!low{#1}\vfill}%
       \goodbreak}%
    \doinsertfloatinfo}
 
@@ -893,13 +893,13 @@
    \global\floatwidth\wd\floatbox
    \global\floatheight\ht\floatbox % forget about the depth
    \global\advance\floattextwidth -\floatwidth
-   \global\advance\floattextwidth -\@@bkmarge\relax % was \tfskipsize
-   \doifinsetelse\v!lang{#1}
+   \global\advance\floattextwidth -\@@bkmargin\relax % was \tfskipsize
+   \doifinsetelse\v!tall{#1}
      {\floattextheight\pagegoal
       \advance\floattextheight -\pagetotal
       \advance\floattextheight -\bigskipamount     % lelijk
-      \ifdim\floattextheight>\teksthoogte
-        \floattextheight\teksthoogte
+      \ifdim\floattextheight>\textheight
+        \floattextheight\textheight
       \fi
       \boxmaxdepth\zeropoint \relax            % toegevoegd
       \ifdim\floattextheight<\floatheight
@@ -909,13 +909,13 @@
      {\setbox\floattext\vbox}%
    \bgroup
    \forgetall \setupblank \setupwhitespace % new, also needed for footnotes
-   \blanko[\v!blokkeer]
+   \blank[\v!disable]
    \hsize\floattextwidth
    \ignorespaces}
 
 \def\dodostoptextfloat[#1]%  % de tekst kan beter in een soort
   {\egroup                   % kadertekst zonder kader, is flexibeler
-   \doifnotinset\v!lang{#1}% en beter
+   \doifnotinset\v!tall{#1}% en beter
      {\ifdim\ht\floattext<\floatheight
         \floattextheight\floatheight
       \else
@@ -923,27 +923,27 @@
       \fi}%
    \setbox\floatbox\vbox to \floattextheight
      {\hsize\floatwidth
-      \doifinsetelse\v!beide{#1}%
-        {\doifinsetelse\v!laag{#1}
+      \doifinsetelse\v!both{#1}%
+        {\doifinsetelse\v!low{#1}
            {\vfill\box\floatbox}
-           {\doifinsetelse\v!midden{#1}
+           {\doifinsetelse\v!middle{#1}
               {\vfill\box\floatbox\vfill}
               {\box\floatbox\vfill}}}
         {\box\floatbox\vfill}}%
     \setbox\floattext\vbox to \floattextheight
      {\hsize\floattextwidth
-      \doifinsetelse\v!laag{#1}
+      \doifinsetelse\v!low{#1}
         {\vfill
          \box\floattext
-         \doifinset\c!offset{#1}{\witruimte\blanko}}
-        {\doifinsetelse\v!midden{#1}
+         \doifinset\c!offset{#1}{\whitespace\blank}}
+        {\doifinsetelse\v!middle{#1}
            {\vfill
             \box\floattext
             \vfill}
-           {\doifinset\v!offset{#1}{\witruimte\blanko}%
+           {\doifinset\v!offset{#1}{\whitespace\blank}%
             \box\floattext
             \vfill}}}%
-   \doifinsetelse\v!rechts{#1}%
+   \doifinsetelse\v!right{#1}%
      {\setbox\floatbox\hbox to \hsize
         {\box\floattext
          \hfill
@@ -953,24 +953,24 @@
          \hfill
          \box\floattext}}%
    \baselinecorrection
-   \witruimte
-   \blanko[\@@bkvoorwit]%
-   \doifnotinset\v!lang{#1}%
+   \whitespace
+   \blank[\@@bkspacebefore]%
+   \doifnotinset\v!tall{#1}%
      {\dp\floatbox\openstrutdepth}% dp\strutbox}%      % toegevoegd
    \box\floatbox
-   \blanko[\@@bknawit]%
+   \blank[\@@bkspaceafter]%
    \endgroup % **
    \doinsertfloatinfo}
 
 \def\somefacefloat[#1]%  links, rechts, midden, hoog, midden, laag
   {%\checkwaitingfloats{#1}%
-   \startnaast\box\floatbox\stopnaast
+   \startopposite\box\floatbox\stopopposite
    \doinsertfloatinfo}
 
 \def\someelsefloat[#1]%
-  {\doifinsetelse\v!hier{#1}
-     {\doifinsetelse\v!altijd{#1}
-        {\pagina[\v!voorkeur]%
+  {\doifinsetelse\v!here{#1}
+     {\doifinsetelse\v!always{#1}
+        {\page[\v!preference]%
          \docheckiffloatfits
          \ifroomforfloat
            \placesomeherefloat[#1]%
@@ -981,7 +981,7 @@
         {\ifsomefloatwaiting
            \dosavefloat
          \else
-           \pagina[\v!voorkeur]%
+           \page[\v!preference]%
            \docheckiffloatfits
            \ifroomforfloat
              \placesomeherefloat[#1]%
@@ -989,18 +989,18 @@
              \dosavefloat
            \fi
          \fi}}
-     {\doifinsetelse\v!altijd{#1}
+     {\doifinsetelse\v!always{#1}
         {\docheckiffloatfits
          \ifroomforfloat
-           \doifinsetelse\v!boven{#1}
+           \doifinsetelse\v!top{#1}
             {\placesometopsfloat[#1]}
-            {\doifinsetelse\v!onder{#1}
+            {\doifinsetelse\v!bottom{#1}
                {\placesomebotsfloat[#1]}
                {\placesomeherefloat[#1]}}%
          % more compact and efficient, but quite ugly
-         % \doifinsetelse\v!boven{#1}
+         % \doifinsetelse\v!top{#1}
          %   \placesometopsfloat
-         %   {\doifinsetelse\v!onder{#1}
+         %   {\doifinsetelse\v!bottom{#1}
          %      \placesomebotsfloat
          %      \placesomeherefloat}[#1]%
          \else
@@ -1009,9 +1009,9 @@
          \fi}
         {\docheckiffloatfits
          \ifroomforfloat
-           \doifinsetelse\v!boven{#1}
+           \doifinsetelse\v!top{#1}
              {\placesometopsfloat[#1]}
-             {\doifinsetelse\v!onder{#1}
+             {\doifinsetelse\v!bottom{#1}
                 {\placesomebotsfloat[#1]}
                 {\placesomeherefloat[#1]}}%
          \else
@@ -1058,22 +1058,22 @@
 \def\docalculatefloatskip#1#2%
   {\doifelsenothing{#2}
      {\global#1\zeropoint}
-     {\doifelse{#2}\v!geen
+     {\doifelse{#2}\v!none
         {\global#1\zeropoint}
-        {\setbox0\vbox{\witruimte\@EA\blanko\@EA[#2]}%
+        {\setbox0\vbox{\whitespace\@EA\blank\@EA[#2]}%
          \global#1\ht0}}}
 
 \def\calculatefloatskips#1%
-  {{\docalculatefloatskip\floattopskip       \@@bkvoorwit
-    \docalculatefloatskip\floatbottomskip    \@@bknawit
-    \docalculatefloatskip\sidefloattopskip   {\getvalue{\??fl#1\c!zijvoorwit}}% \@@bkzijvoorwit
-    \docalculatefloatskip\sidefloatbottomskip{\getvalue{\??fl#1\c!zijnawit}}% \@@bkzijnawit
+  {{\docalculatefloatskip\floattopskip       \@@bkspacebefore
+    \docalculatefloatskip\floatbottomskip    \@@bkspaceafter
+    \docalculatefloatskip\sidefloattopskip   {\getvalue{\??fl#1\c!sidespacebefore}}% \@@bksidespacebefore
+    \docalculatefloatskip\sidefloatbottomskip{\getvalue{\??fl#1\c!sidespaceafter}}% \@@bksidespaceafter
     \gdef\sidefloattopoffset{\openstrutdepth}% was \def
-    \global\floatsideskip\getvalue{\??fl#1\c!marge}%
-    \global\sidefloatleftshift \getvalue{\??fl#1\c!linkermargeafstand}%
-    \global\sidefloatrightshift\getvalue{\??fl#1\c!rechtermargeafstand}%
-    \global\noftopfloats \@@bknboven\relax
-    \global\nofbotfloats \@@bknonder\relax}}
+    \global\floatsideskip\getvalue{\??fl#1\c!margin}%
+    \global\sidefloatleftshift \getvalue{\??fl#1\c!leftmargindistance}%
+    \global\sidefloatrightshift\getvalue{\??fl#1\c!rightmargindistance}%
+    \global\noftopfloats \@@bkntop\relax
+    \global\nofbotfloats \@@bknbottom\relax}}
 
 \newif\ifinsidefloat
 
@@ -1119,7 +1119,7 @@
      \letgvalue{@fl@r@#1}\relax
      \letgvalue{@fl@t@#1}\relax
    \else
-     \verhoognummer[#1]%
+     \incrementnumber[#1]%
      \maakhetnummer[#1]%
    % \globallet\flhetnummer\hetnummer % beware, not unique should be done on a per class base
      \letgvalue{@fl@n@#1}\hetnummer
@@ -1127,8 +1127,8 @@
      \setgvalue{@fl@r@#1}%
        {\dofloatreference
         \redofloatorder{#1}%
-      % \doschrijfnaarlijst{#1}{\flhetnummer}{#3}{#1}%
-        \doschrijfnaarlijst{#1}{\getvalue{@fl@n@#1}}{#3}{#1}%
+      % \dowritetolist{#1}{\flhetnummer}{#3}{#1}%
+        \dowritetolist{#1}{\getvalue{@fl@n@#1}}{#3}{#1}%
         \doglobal\convertargument#3\to\flasciititle % \asciititle is global
       % \doifsomething{#2}{\rawreference\s!flt{#2}{{\flhetnummer}{\flasciititle}}}%
         \doifsomething{#2}{\rawreference\s!flt{#2}{{\getvalue{@fl@n@#1}}{\flasciititle}}}%
@@ -1136,11 +1136,11 @@
      \setgvalue{@fl@t@#1}%
      % {\preparethenumber{\??kj#1}\flhetnummer\preparednumber
        {\preparethenumber{\??kj#1}{\getvalue{@fl@n@#1}}\preparednumber
-        \doattributes{\??kj#1}\c!letter\c!kleur
-          {\doattributes{\??kj#1}\c!kopletter\c!kopkleur
+        \doattributes{\??kj#1}\c!style\c!color
+          {\doattributes{\??kj#1}\c!headstyle\c!headcolor
              {\labeltexts{#1}{\preparednumber}}%
-           \doattributes{\??kj#1}\c!tekstletter\c!tekstkleur
-             {\dotfskip{\getvalue{\??kj#1\c!afstand}}#3}}}%
+           \doattributes{\??kj#1}\c!textstyle\c!textcolor
+             {\dotfskip{\getvalue{\??kj#1\c!distance}}#3}}}%
    \fi}
 
 \def\placefloatcaptiontext     [#1]{\getvalue{@fl@t@#1}}
@@ -1155,9 +1155,9 @@
 \def\borderedfloatbox#1%
   {\localframed
      [\??fl#1]
-     [\c!breedte=\@@bkbreedte,
-      \c!hoogte=\@@bkhoogte,
-      \c!plaats=\v!normaal,
+     [\c!width=\@@bkwidth,
+      \c!height=\@@bkheight,
+      \c!location=\v!normal,
       \c!offset=\@@bkoffset]%
      {\box\floatbox}}
 
@@ -1168,10 +1168,10 @@
 \def\putcompletecaption#1#2#3#4%
   {\noindent
    \xdef\floatcaptionnumber{#1}%
-   \dostartattributes{\??kj#1}\c!letter\c!kleur\empty
+   \dostartattributes{\??kj#1}\c!style\c!color\empty
      \ifnofloatnumber
      \else
-       \hbox{\doattributes{\??kj#1}\c!kopletter\c!kopkleur{\strut#2\floatcaptionsuffix}}%
+       \hbox{\doattributes{\??kj#1}\c!headstyle\c!headcolor{\strut#2\floatcaptionsuffix}}%
        \ifnofloatcaption \else \ifemptyfloatcaption \else
          \ifcase#4\relax
            \scratchskip\@@kjkjafstand\relax
@@ -1182,7 +1182,7 @@
        \fi \fi
      \fi
      \ifnofloatcaption \else
-       \doattributes{\??kj#1}\c!tekstletter\c!tekstkleur
+       \doattributes{\??kj#1}\c!textstyle\c!textcolor
          {\begstrut#3\endstrut\endgraf}%
      \fi
    \dostopattributes}
@@ -1219,11 +1219,11 @@
 \fi
    \forgetall
    \postponefootnotes
-   \mindermeldingen
+   \dontcomplain
    \setbox\tempfloatbox\vbox{\borderedfloatbox{#4}}%
    \def\locatefloat
      {\chardef\alignstrutmode\zerocount
-      \alignedline\@@flflplaats\v!midden}%
+      \alignedline\@@flflplaats\v!middle}%
    \docheckcaptioncontent{#1}{#2}{#3}{#4}%
    \ifnofloatcaption
      \dopreparenocaption{#1}{#2}{#3}{#4}%
@@ -1231,13 +1231,13 @@
      \doglobal\addlocalbackgroundtobox\floatbox
    \else
      % todo: installable maken, variant/method=auto vs macro
-     \doifinsetelse\@@kjkjplaats{\v!hoog,\v!midden,\v!laag}
+     \doifinsetelse\@@kjkjplaats{\v!high,\v!middle,\v!low}
        {\dopreparesidecaption{#1}{#2}{#3}{#4}}
-       {\doifelse\@@kjkjminbreedte\v!passend
+       {\doifelse\@@kjkjminbreedte\v!fit
           {\doifelse\@@kjkjbreedte\v!max
              {\dopreparestackcaptionmax{#1}{#2}{#3}{#4}}
              {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox % wider caption
-                \doifelse\@@kjkjbreedte\v!passend
+                \doifelse\@@kjkjbreedte\v!fit
                   {\dopreparestackcaptionaut{#1}{#2}{#3}{#4}}
                   {\dopreparestackcaptionwid{#1}{#2}{#3}{#4}}%
               \else
@@ -1252,7 +1252,7 @@
    \fi
    \ifnum\floatrotation>0
      \global\setbox\floatbox\vbox
-        {\rotate[\c!rotatie=\floatrotation]{\box\floatbox}}%
+        {\rotate[\c!rotation=\floatrotation]{\box\floatbox}}%
          \edef\width{\the\wd\tempfloatbox}%
    \else
      \postcenterfloatbox\width
@@ -1268,7 +1268,7 @@
 
 \def\dopreparenocaption#1#2#3#4%
   {\global\setbox\floatbox\vbox % pas op als wd groter dan hsize
-     {\ifbinnenkolommen\ifdim\wd\tempfloatbox>\hsize
+     {\ifinsidecolumns\ifdim\wd\tempfloatbox>\hsize
         \let\locatefloat\relax
       \fi\fi
       \locatefloat{\copy\tempfloatbox}}}
@@ -1360,7 +1360,7 @@
 
 \def\dopreparestackcaptionaut#1#2#3#4%
   {\doifsomething\@@kjkjuitlijnen
-     {\ExpandBothAfter\doifnotinset\v!midden\@@kjkjuitlijnen
+     {\ExpandBothAfter\doifnotinset\v!middle\@@kjkjuitlijnen
         {\let\captionovershoot\!!zeropoint}}%
    \ifdim\wd\tempfloatbox>\hsize
      % float is wider than \hsize
@@ -1405,7 +1405,7 @@
           \putcompletecaption{#4}{#2}{#3}{0}}%
      \else
        % just over a line, don't use an overshoot
-       \doifinsetelse\@@kjkjuitlijnen{\v!links,\v!rechts}
+       \doifinsetelse\@@kjkjuitlijnen{\v!left,\v!right}
          {\dosetraggedvbox\@@kjkjuitlijnen
           \setbox\tempcaptionbox\raggedbox
             {\hsize\scratchdimen
@@ -1421,7 +1421,7 @@
 \def\dopreparesidecaption#1#2#3#4%
   {\dimen0\hsize
    \advance\dimen0 -\wd\tempfloatbox
-   \advance\dimen0 -\@@bkmarge\relax % was \tfskipsize\relax
+   \advance\dimen0 -\@@bkmargin\relax % was \tfskipsize\relax
    \ifdim\wd\tempcaptionbox>\dimen0
      \dimen2=1.3\dimen0
      \ifdim\wd\tempcaptionbox<\dimen2
@@ -1439,22 +1439,22 @@
       \forgetall
       \processaction
         [\@@kjkjplaats]
-        [ \v!boven=>\locatefloat{\box\tempcaptionbox}%
+        [ \v!top=>\locatefloat{\box\tempcaptionbox}%
                     \endgraf\nointerlineskip\@@kjkjtussen
                     \locatefloat{\box\tempfloatbox},
-          \v!onder=>\locatefloat{\box\tempfloatbox}%
+          \v!bottom=>\locatefloat{\box\tempfloatbox}%
                     \endgraf\nointerlineskip\@@kjkjtussen
                     \locatefloat{\box\tempcaptionbox},
-           \v!hoog=>\locatefloat
-                      {\doifelse\@@flflplaats\v!links
+           \v!high=>\locatefloat
+                      {\doifelse\@@flflplaats\v!left
                          {\box\tempfloatbox
                           \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox{\@@kjkjtussen\box\tempcaptionbox\vfill}}
                          {\vbox to\ht\tempfloatbox{\@@kjkjtussen\box\tempcaptionbox\vfill}%
                           \tfskip
                           \box\tempfloatbox}},
-           \v!laag=>\locatefloat
-                      {\doifelse\@@flflplaats\v!links
+           \v!low=>\locatefloat
+                      {\doifelse\@@flflplaats\v!left
                          {\box\tempfloatbox
                           \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox
@@ -1463,8 +1463,8 @@
                             {\vfill\box\tempcaptionbox\@@kjkjtussen}%
                           \dotfskip\@@kjkjafstand
                           \box\tempfloatbox}},
-         \v!midden=>\locatefloat
-                      {\doifelse\@@flflplaats\v!links
+         \v!middle=>\locatefloat
+                      {\doifelse\@@flflplaats\v!left
                          {\box\tempfloatbox
                           \dotfskip\@@kjkjafstand
                           \vbox to\ht\tempfloatbox{\vfill\box\tempcaptionbox\vfill}}
@@ -1472,12 +1472,12 @@
                           \dotfskip\@@kjkjafstand
                           \box\tempfloatbox}},
         \s!unknown=>\locatefloat{\box\tempfloatbox},
-           \v!geen=>\locatefloat{\box\tempfloatbox}]}}
+           \v!none=>\locatefloat{\box\tempfloatbox}]}}
 
 \newif\ifpostponecolumnfloats \postponecolumnfloatsfalse % don't change
 
 %\def\postcenterfloatbox#1%
-%  {\ifbinnenkolommen
+%  {\ifinsidecolumns
 %     \ifpostponecolumnfloats
 %       \scratchdimen=\zetbreedte
 %     \else
@@ -1514,7 +1514,7 @@
 %    \global\floatwidth\wd\floatbox}
 
 %\def\postcenterfloatbox#1%
-%  {\ifbinnenkolommen
+%  {\ifinsidecolumns
 %     \ifpostponecolumnfloats
 %       \scratchdimen\zetbreedte
 %     \else
@@ -1530,9 +1530,9 @@
 %     {\hss  \box\floatbox\hss  }} % wel \hss, anders mis in colset
 
 \def\postcenterfloatbox#1%
-  {\ifbinnenkolommen
+  {\ifinsidecolumns
      \ifpostponecolumnfloats
-       \scratchdimen\zetbreedte
+       \scratchdimen\makeupwidth
      \else
        \scratchdimen#1\relax
      \fi
@@ -1562,7 +1562,7 @@
   {\bgroup
    \forgetall
    \postponefootnotes
-   \mindermeldingen
+   \dontcomplain
    %\showcomposition
    \setbox\tempfloatbox\vbox{\borderedfloatbox{#4}}%
    \addlocalbackgroundtobox\tempfloatbox % no \doglobal
@@ -1574,7 +1574,7 @@
        {\dosetraggedvbox\@@kjkjuitlijnen
         \setbox\tempcaptionbox\raggedbox
           {\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}}%
-       {\doifelse\@@kjkjbreedte\v!passend
+       {\doifelse\@@kjkjbreedte\v!fit
           {\ifdim\wd\tempcaptionbox>\wd\tempfloatbox\relax
              \setbox\tempcaptionbox\vbox
                {\forgetall\hsize\wd\tempfloatbox\putcompletecaption{#4}{#2}{#3}{0}}%
@@ -1590,13 +1590,13 @@
      \global\setbox\floatbox\vbox
        {\processaction
           [\@@kjkjplaats]
-          [ \v!boven=>\box\tempcaptionbox
+          [ \v!top=>\box\tempcaptionbox
                       \endgraf\nointerlineskip\@@kjkjtussen
                       \box\tempfloatbox,
-            \v!onder=>\box\tempfloatbox
+            \v!bottom=>\box\tempfloatbox
                       \endgraf\nointerlineskip\@@kjkjtussen
                       \box\tempcaptionbox,
-             \v!geen=>\box\tempfloatbox,
+             \v!none=>\box\tempfloatbox,
           \s!unknown=>\box\tempfloatbox
                       \endgraf\nointerlineskip\@@kjkjtussen
                       \box\tempcaptionbox]}%
@@ -1609,14 +1609,14 @@
 \long\def\dosetfloatbox#1#2#3#4% todo : \global\setbox
   {\ifvisible
      \par
-     \edef\@@kjkjplaats    {\getvalue{\??kj#4\c!plaats    }}%
-      \def\@@kjkjtussen    {\getvalue{\??kj#4\c!tussen    }}%  no \edef
-      \def\@@kjkjcommando  {\getvalue{\??kj#4\c!commando  }}%  no \edef
-     \edef\@@kjkjbreedte   {\getvalue{\??kj#4\c!breedte   }}%
-     \edef\@@kjkjminbreedte{\getvalue{\??kj#4\c!minbreedte}}%  in geval van automatisch
-     \edef\@@kjkjafstand   {\getvalue{\??kj#4\c!afstand   }}%
-     \edef\@@kjkjuitlijnen {\getvalue{\??kj#4\c!uitlijnen }}%
-     \edef\@@flflplaats    {\getvalue{\??fl#4\c!plaats    }}%
+     \edef\@@kjkjplaats    {\getvalue{\??kj#4\c!location    }}%
+      \def\@@kjkjtussen    {\getvalue{\??kj#4\c!inbetween    }}%  no \edef
+      \def\@@kjkjcommando  {\getvalue{\??kj#4\c!command  }}%  no \edef
+     \edef\@@kjkjbreedte   {\getvalue{\??kj#4\c!width   }}%
+     \edef\@@kjkjminbreedte{\getvalue{\??kj#4\c!minwidth}}%  in geval van automatisch
+     \edef\@@kjkjafstand   {\getvalue{\??kj#4\c!distance   }}%
+     \edef\@@kjkjuitlijnen {\getvalue{\??kj#4\c!align }}%
+     \edef\@@flflplaats    {\getvalue{\??fl#4\c!location    }}%
      \ifparfloat
        \@EA\dosetparfloat % {#1}{#2}{#3}{#4}%
      \else
@@ -1629,7 +1629,7 @@
      \global\advance\floatheight \dp\floatbox
      \global\floatwidth\wd\floatbox
      \global\advance\totalnoffloats \plusone
-     \doifnotinset\v!marge{#1} % gaat namelijk nog fout
+     \doifnotinset\v!margin{#1} % gaat namelijk nog fout
        {\setbox\floatbox\vbox
           {\parindent\zeropoint
            \ifvoorlopig
@@ -1639,9 +1639,9 @@
      \wd\floatbox\floatwidth
      \dimen0=\floatheight
      \advance\dimen0 \lineheight
-     \ifdim\dimen0<\teksthoogte
+     \ifdim\dimen0<\textheight
      \else
-       \global\floatheight\teksthoogte
+       \global\floatheight\textheight
        \global\advance\floatheight -\lineheight
        \ht\floatbox\floatheight
        \dp\floatbox\zeropoint
@@ -1657,7 +1657,7 @@
      {\dogetfloatbox{#1}\empty}
      {\ifdim\wd\floatbox>\getvalue{\??fl#4\c!criterium}\relax
         \postcenterfloatbox{\wd\floatbox}% else we get left aligned
-        \dogetfloatbox{#1}\v!hier        % see details/pascal
+        \dogetfloatbox{#1}\v!here        % see details/pascal
       \else
         \dogetfloatbox{#1}\empty
       \fi}}
@@ -1666,53 +1666,6 @@
 \let\naturalfloatwidth \!!zeropoint
 \let\naturalfloatdepth \!!zeropoint
 
-% \long\def\docompletefloat#1#2#3#4#5#6#7% #7 = box number
-%   {\flushsidefloats
-%    \presetfloatvariables{#1}{#4}{#2}{#6}%
-%    \bgroup
-%   %\setlocalfloatdimensions{#1}{#4}{#7}\relax
-%    \global\setbox\floatbox\vbox{\box#7}%
-%    \xdef\naturalfloatheight{\the\ht\floatbox}%
-%    \xdef\naturalfloatwidth {\the\wd\floatbox}%
-%    \xdef\naturalfloatdepth {\the\dp\floatbox}%
-%    \dimen0 \ht\floatbox
-%    \advance\dimen0 \dp\floatbox
-%    \ifdim\dimen0=\zeropoint
-%      \showmessage\m!floatblocks{11}\empty
-%      \global\setbox\floatbox\vbox{\getvalue{\e!lege#3}}%
-%    \fi
-%    \ifnofloatcaption
-%      \global\setbox\floatbox\vbox
-%        {\unvbox\floatbox
-%         \vss % gets rid of the depth (unless tabulate)
-%         \rawpagereference\s!flt{#2}}%
-%       \egroup
-%       \dofloat{#4}{}{#6}{#1}%
-%    \else
-%      \doglobal\convertargument#6\to\asciititle % \asciititle is global
-% %     \doifelsevalue{\??kj#1\c!nummer}\v!ja
-%      \ifnofloatnumber
-%        \global\setbox\floatbox\vbox
-%          {\unvbox\floatbox % no \vss, keep the depth
-%           \rawreference\s!flt{#2}{{}{\asciititle}}}%
-%        \egroup
-%        \dofloat{#4}{}{#6}{#1}%
-%      \else
-%        \verhoognummer[#1]%
-%        \maakhetnummer[#1]%
-%        \global\setbox\floatbox\vbox
-%          {\unvbox\floatbox % no \vss, keep the depth
-%           \dofloatreference
-%           \redofloatorder{#1}%
-%           \rawreference\s!flt{#2}{{\hetnummer}{\asciititle}}%
-%           \doschrijfnaarlijst{#3}{\hetnummer}{#6}{#3}}%
-%        \egroup
-%        \preparethenumber{\??kj#1}\hetnummer\preparednumber
-%        \dofloat{#4}{\labeltexts{#5}{\preparednumber}}{#6}{#1}%
-%      \fi
-%    \fi
-%    \global\insidefloatfalse}
-
 \def\setnaturalfloatdimensions#1%
   {\xdef\naturalfloatheight{\the\ht#1}%
    \xdef\naturalfloatwidth {\the\wd#1}%
@@ -1724,13 +1677,13 @@
    \bgroup
    \setnaturalfloatdimensions#7%
    \global\setbox\floatbox\vbox
-     {\executeifdefined{\??fl#1\c!commando}\firstofoneargument{\box#7}}%
+     {\executeifdefined{\??fl#1\c!command}\firstofoneargument{\box#7}}%
    \setnaturalfloatdimensions\floatbox
    \dimen0 \ht\floatbox
    \advance\dimen0 \dp\floatbox
    \ifdim\dimen0=\zeropoint
      \showmessage\m!floatblocks{11}\empty
-     \global\setbox\floatbox\vbox{\getvalue{\e!lege#3}}%
+     \global\setbox\floatbox\vbox{\doemptyblock{#3}}%
    \fi
    \ifnofloatcaption
      \global\setbox\floatbox\vbox
@@ -1748,14 +1701,14 @@
        \egroup
        \dofloat{#4}{}{#6}{#1}%
      \else
-       \verhoognummer[#1]%
+       \incrementnumber[#1]%
        \maakhetnummer[#1]%
        \global\setbox\floatbox\vbox
          {\unvbox\floatbox % no \vss, keep the depth
           \dofloatreference
           \redofloatorder{#1}%
           \rawreference\s!flt{#2}{{\hetnummer}{\asciititle}}%
-          \doschrijfnaarlijst{#3}{\hetnummer}{#6}{#3}}%
+          \dowritetolist{#3}{\hetnummer}{#6}{#3}}%
        \egroup
        \preparethenumber{\??kj#1}\hetnummer\preparednumber
        \dofloat{#4}{\labeltexts{#5}{\preparednumber}}{#6}{#1}%
@@ -1765,33 +1718,33 @@
 
 \newif\ifmargeblokken
 
-\def\dostelmargeblokkenin[#1]%
+\def\dosetupmarginblocks[#1]%
   {\getparameters[\??mb][#1]%
-   \doifelse\@@mbstatus\v!start
+   \doifelse\@@mbstate\v!start
      {\showmessage\m!layouts4\empty
       \margeblokkentrue
       \let\somenextfloat\dosomenextfloat
-      \let\startmargeblok\dostartmargeblok
-      \let\stopmargeblok\dostopmargeblok}%
+      \let\startmarginblock\dostartmarginblock
+      \let\stopmarginblock\dostopmarginblock}%
      {\showmessage\m!layouts5\empty
       \margeblokkenfalse
       \def\somenextfloat[##1]%
-        {\someelsefloat[##1,\v!hier]}%
-      \let\startmargeblok\dontstartmargeblok
-      \let\stopmargeblok\dontstopmargeblok}}
+        {\someelsefloat[##1,\v!here]}%
+      \let\startmarginblock\dontstartmargeblok
+      \let\stopmarginblock\dontstopmargeblok}}
 
-\def\stelmargeblokkenin
-  {\dosingleargument\dostelmargeblokkenin}
+\def\setupmarginblocks
+  {\dosingleargument\dosetupmarginblocks}
 
 \newbox\marginbox
 
 \def\dosomenextfloat[#1]%
   {\global\setbox\marginbox\vbox
-     {\hsize\@@mbbreedte
+     {\hsize\@@mbwidth
       \unvcopy\marginbox
-      \ifvoid\marginbox\else\expandafter\@@mbtussen\fi
+      \ifvoid\marginbox\else\expandafter\@@mbinbetween\fi
       \box\floatbox\filbreak}%
-   \ifdim\ht\marginbox>\teksthoogte
+   \ifdim\ht\marginbox>\textheight
      \dosavefloatinfo
    \else
      \doinsertfloatinfo
@@ -1806,17 +1759,17 @@
      \endofshapebox
      \reshapebox
        {\box\shapebox}%
-     \setbox\preparedmarginbox\vbox to \teksthoogte
-       {\@@mbboven
+     \setbox\preparedmarginbox\vbox to \textheight
+       {\@@mbtop
         \flushshapebox
-        \@@mbonder}%
+        \@@mbbottom}%
    \fi}
 
 \def\plaatsrechtermargeblok
-  {\hskip\rechtermargebreedte}
+  {\hskip\rightmarginwidth}
 
 \def\plaatslinkermargeblok
-  {\hskip\linkermargebreedte}
+  {\hskip\leftmarginwidth}
 
 \def\checkmargeblokken
   {\ifvoid\marginbox\else\docheckmargeblokken\fi}
@@ -1826,73 +1779,73 @@
      {\forgetall
       \splittopskip\topskip
       \ifvoid\marginbox\else
-        \ifdim\ht\marginbox>\teksthoogte
-          \vsplit\marginbox to \teksthoogte
+        \ifdim\ht\marginbox>\textheight
+          \vsplit\marginbox to \textheight
         \else
           \unvbox\marginbox
         \fi
       \fi}%
    \reshapemargin
    \setbox\preparedmarginbox\vbox
-      {\@@mbvoor\box\preparedmarginbox\@@mbna}%
+      {\@@mbbefore\box\preparedmarginbox\@@mbafter}%
    \def\rightmarginbox
      {\def\plaatsrechtermargeblok
-        {\setbox\preparedmarginbox\hbox to \rechtermargebreedte
-           {\@@mblinks\box\preparedmarginbox\@@mbrechts}%
+        {\setbox\preparedmarginbox\hbox to \rightmarginwidth
+           {\@@mbleft\box\preparedmarginbox\@@mbright}%
          \vsmashbox\preparedmarginbox
          \box\preparedmarginbox}}%
    \def\leftmarginbox
      {\def\plaatslinkermargeblok
-        {\setbox\preparedmarginbox\hbox to \linkermargebreedte
-           {\@@mbrechts\box\preparedmarginbox\@@mblinks}%
+        {\setbox\preparedmarginbox\hbox to \leftmarginwidth
+           {\@@mbright\box\preparedmarginbox\@@mbleft}%
          \vsmashbox\preparedmarginbox
          \box\preparedmarginbox}}%
    \processaction % traag
-     [\@@mbplaats]
-     [ \v!inmarge=>\doifbothsidesoverruled
+     [\@@mblocation]
+     [ \v!inmargin=>\doifbothsidesoverruled
                      \rightmarginbox
                    \orsideone
                      \rightmarginbox
                    \orsidetwo
                      \leftmarginbox
                    \od,
-        \v!midden=>\doifbothsidesoverruled
+        \v!middle=>\doifbothsidesoverruled
                      \rightmarginbox
                    \orsideone
                      \leftmarginbox
                    \orsidetwo
                      \rightmarginbox
                    \od,
-         \v!links=>\leftmarginbox,
-        \v!rechts=>\rightmarginbox,
+         \v!left=>\leftmarginbox,
+        \v!right=>\rightmarginbox,
        \s!unknown=>\setbox\preparedmarginbox\hbox{}]}
 
-\def\dostartmargeblok % 2 maal \vbox ivm \unvbox elders
+\def\dostartmarginblock % 2 maal \vbox ivm \unvbox elders
   {\global\setbox\marginbox\vtop\bgroup\vbox\bgroup
-     \hsize\@@mbbreedte
+     \hsize\@@mbwidth
      \ifvoid\marginbox\else
        \unvbox\marginbox
-       \@@mbtussen
+       \@@mbinbetween
      \fi
-     \setupalign[\@@mbuitlijnen]%
-     \dostartattributes\??mb\c!letter\c!kleur{}%
+     \setupalign[\@@mbalign]%
+     \dostartattributes\??mb\c!style\c!color{}%
      \begstrut\ignorespaces}
 
-\def\dostopmargeblok
+\def\dostopmarginblock
   {\unskip\endstrut
    \dostopattributes
    \egroup
    \egroup}
 
 \def\dontstartmargeblok
-  {\@@mbvoor
+  {\@@mbbefore
    \bgroup
-   \dostartattributes\??mb\c!letter\c!kleur\empty}
+   \dostartattributes\??mb\c!style\c!color\empty}
 
 \def\dontstopmargeblok
   {\dostopattributes
    \egroup
-   \@@mbna}
+   \@@mbafter}
 
 \newcounter\nofpostponedblocks
 
@@ -1955,7 +1908,7 @@
 
 \def\douitstellen
   {\bgroup % new may 2004
-   \setsystemmode\v!uitstellen % new may 2004
+   \setsystemmode\v!postponing % new may 2004
    \the\everytopofpage
    \ifvoid\collectedpagefloats\else
      % message
@@ -1976,7 +1929,7 @@
      \global\inuitstellentrue                      % definitely needed else
      \the\postponedpageblocks                      % we can loose or disorder
      \dorecurse\nofpostponedblocks                 % floats; anyhow, this
-       {\haalbuffer[pbuf-\recurselevel]}           % mechanism is still
+       {\getbuffer[pbuf-\recurselevel]}           % mechanism is still
      \doflushfloats % new but potential dangerous  % suboptimal and needs a
      \doglobal\newcounter\nofpostponedblocks       % proper analysis
      \global\inuitstellenfalse
@@ -1986,11 +1939,11 @@
    \egroup} % new may 2004
 
 \def\getpostponedblock#1#2%
-  {\doif{#1}\realfolio{\haalbuffer[rbuf-#2]}} % no \ifnum, avoid \fi
+  {\doif{#1}\realfolio{\getbuffer[rbuf-#2]}} % no \ifnum, avoid \fi
 
 % beware, \dosingleempty conflicts with buffers (feeds back the \par)
 
-\setvalue{\e!start\v!uitstellen}%
+\setvalue{\e!start\v!postponing}%
   {\bgroup
    \obeylines
    \doifnextcharelse[%
@@ -2005,52 +1958,52 @@
    \egroup
    \showmessage\m!layouts3\nofpostponedpageblocks
    \dostartbuffer[rbuf-\nofpostponedpageblocks]%
-     [\e!start\v!uitstellen][\e!stop\v!uitstellen]}
+     [\e!start\v!postponing][\e!stop\v!postponing]}
 
 \def\dodostartpostponing
   {\doglobal\increment\nofpostponedblocks
    \showmessage\m!layouts3\nofpostponedblocks
    \dostartbuffer[pbuf-\nofpostponedblocks]%
-     [\e!start\v!uitstellen][\e!stop\v!uitstellen]}
+     [\e!start\v!postponing][\e!stop\v!postponing]}
 
-\definieernummer
+\definenumber
   [\??si]
-  [\c!wijze=\v!per\v!tekst,
-   \c!conversie=\@@siconversie]
+  [\c!way=\v!by\v!text,
+   \c!conversion=\@@siconversion]
 
-\def\stelplaatsbloksplitsenin
+\def\setupfloatsplitting
   {\dodoubleargument\getparameters[\??si]}
 
 % ook (continued)
 
-\def\dosplitsplaatsblok[#1]#2% nog dubbele refs
-  {\ifbinnenkolommen         % tzt ook nog figuren splitten
+\def\dosplitfloat[#1]#2% nog dubbele refs
+  {\ifinsidecolumns         % tzt ook nog figuren splitten
      % not yet supported
    \else
      \bgroup
      \insidefloattrue
      \getparameters[\??si][#1]%
      \resetnumber[\??si]%
-     \def\floatcaptionsuffix{\nummer[\??si]}%
-     \TABLEcaptionheight=\@@siregels\lineheight % brrr
+     \def\floatcaptionsuffix{\convertednumber[\??si]}%
+     \TABLEcaptionheight=\@@silines\lineheight % brrr
      \simplifypagebreak % \page becomes \goodbreak
      \dowithnextbox
        {\forgetall
-        \mindermeldingen
+        \dontcomplain
         \doloop
           {\setbox2\vsplit\nextbox to \lineheight
            \setbox2\vbox{\unvbox2}
            \ifdim\ht2>\lineheight
-             \verhoognummer[\??si]%
-             \ifnum\ruwenummer[\??si]=1 \ifdim\nextboxht=\zeropoint
+             \incrementnumber[\??si]%
+             \ifnum\rawnumber[\??si]=1 \ifdim\nextboxht=\zeropoint
                \let\floatcaptionsuffix\empty
              \fi \fi
              \bgroup
              #2{\unvbox2}
              \egroup
              \ifdim\nextboxht>\zeropoint
-               \pagina
-               \verlaagnummer[\floatcaptionnumber]%
+               \page
+               \decrementnumber[\floatcaptionnumber]%
              \fi
            \fi
            \ifdim\nextboxht>\zeropoint\else
@@ -2060,108 +2013,108 @@
      \vbox
    \fi}
 
-\def\splitsplaatsblok%
-  {\dosingleempty\dosplitsplaatsblok}
+\def\splitfloat%
+  {\dosingleempty\dosplitfloat}
 
 \def\dooutput{\sidefloatoutput}           % redefinition of \dooutput
 
-\stelmargeblokkenin
-  [\c!status=\v!start,
-   \c!plaats=\v!inmarge,
-   \c!breedte=\rechtermargebreedte,
-   \c!letter=,
-   \c!kleur=,
-   \c!uitlijnen=,
-   \c!links=,
-   \c!rechts=,
-   \c!boven=,
-   \c!tussen=\blanko,
-   \c!onder=\vfill,
-   \c!voor=,
-   \c!na=]
-
-\definieerplaatsblok
-  [\v!figuur]
-  [\v!figuren]
-
-\definieerplaatsblok
-  [\v!tabel]
-  [\v!tabellen]
-
-\stelplaatsblokin
-  [\v!tabel]
-  [\c!kader=\v!uit]
-
-\definieerplaatsblok
+\setupmarginblocks
+  [\c!state=\v!start,
+   \c!location=\v!inmargin,
+   \c!width=\rightmarginwidth,
+   \c!style=,
+   \c!color=,
+   \c!align=,
+   \c!left=,
+   \c!right=,
+   \c!top=,
+   \c!inbetween=\blank,
+   \c!bottom=\vfill,
+   \c!before=,
+   \c!after=]
+
+\definefloat
+  [\v!figure]
+  [\v!figures]
+
+\definefloat
+  [\v!table]
+  [\v!tables]
+
+\setupfloat
+  [\v!table]
+  [\c!frame=\v!off]
+
+\definefloat
   [\v!intermezzo]
-  [\v!intermezzos]
-
-\definieerplaatsblok
-  [\v!grafiek]
-  [\v!grafieken]
-
-\stelblokkopjesin
-  [\c!plaats=\v!onder,
-   \c!voor=\blanko,
-   \c!tussen={\blanko[\v!middel]},
-   \c!na=\blanko,
-   \c!breedte=\v!passend,
-   \c!minbreedte=\v!passend, % id est: the width of the floatbox in some cases
-   \c!kopletter=\v!vet,
-   \c!kopkleur=,
-   \c!letter=\v!normaal,
-   \c!kleur=,
-   \c!tekstletter=,
-   \c!tekstkleur=,
-   \c!uitlijnen=,
-   \c!nummer=\v!ja,
-   \c!wijze=\@@nrwijze,
-   \c!blokwijze=\@@nrblokwijze,
-   \c!sectienummer=\@@nrsectienummer,
-   \c!scheider=\@@koscheider,
-   \c!afstand=1em,
-   \c!commando=,
-   \c!conversie=\v!cijfers]
-
-\stelplaatsblokkenin
-  [\c!plaats=\v!midden,
-   \c!breedte=\v!passend,
-   \c!hoogte=\v!passend,
+  [\v!intermezzi]
+
+\definefloat
+  [\v!graphic]
+  [\v!graphics]
+
+\setupcaptions
+  [\c!location=\v!bottom,
+   \c!before=\blank,
+   \c!inbetween={\blank[\v!medium]},
+   \c!after=\blank,
+   \c!width=\v!fit,
+   \c!minwidth=\v!fit, % id est: the width of the floatbox in some cases
+   \c!headstyle=\v!bold,
+   \c!headcolor=,
+   \c!style=\v!normal,
+   \c!color=,
+   \c!textstyle=,
+   \c!textcolor=,
+   \c!align=,
+   \c!number=\v!yes,
+   \c!way=\@@nrway,
+   \c!blockway=\@@nrblockway,
+   \c!sectionnumber=\@@nrsectionnumber,
+   \c!separator=\@@koseparator,
+   \c!distance=1em,
+   \c!command=,
+   \c!conversion=\v!numbers]
+
+\setupfloats
+  [\c!location=\v!middle,
+   \c!width=\v!fit,
+   \c!height=\v!fit,
    \c!offset=\v!overlay,
-   \c!kader=\v!uit,
-   \c!straal=.5\korpsgrootte,
-   \c!hoek=\v!recht,
-   \c!achtergrond=,
-   \c!achtergrondraster=\@@rsraster,
-   \c!achtergrondkleur=,
-   \c!achtergrondoffset=\!!zeropoint,
-   \c!bovenkader=,
-   \c!onderkader=,
-   \c!linkerkader=,
-   \c!rechterkader=,
-   \c!kaderoffset=\!!zeropoint,
-   \c!voor=,
-   \c!na=,
-   \c!voorwit=\v!groot,
-   \c!nawit=\v!groot,
-   \c!zijvoorwit=\@@bkvoorwit,
-   \c!zijnawit=\@@bknawit,
-   \c!zijuitlijnen=\v!normaal,
-   \c!tekstmethode=\ifgridsnapping2\else0\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt)
-   \c!zijmethode=\ifgridsnapping2\else1\fi,   % 0=raw 1=safe (.99pg) 2=tight (-1pt)
-   \c!springvolgendein=\v!nee,
-   \c!marge=1em,
-   \c!linkermargeafstand=\zeropoint,
-   \c!rechtermargeafstand=\@@bklinkermargeafstand,
-   \c!nboven=2,
-   \c!nonder=0,
-   \c!nregels=4,
-   \c!lokaal=,
-   \c!default=\v!figuur]
-
-\stelplaatsbloksplitsenin
-  [\c!conversie=\v!letter, % \v!romeins
-   \c!regels=3]
+   \c!frame=\v!off,
+   \c!radius=.5\korpsgrootte,
+   \c!corner=\v!rectangular,
+   \c!background=,
+   \c!backgroundscreen=\@@rsscreen,
+   \c!backgroundcolor=,
+   \c!backgroundoffset=\!!zeropoint,
+   \c!topframe=,
+   \c!bottomframe=,
+   \c!leftframe=,
+   \c!rightframe=,
+   \c!frameoffset=\!!zeropoint,
+   \c!before=,
+   \c!after=,
+   \c!spacebefore=\v!big,
+   \c!spaceafter=\v!big,
+   \c!sidespacebefore=\@@bkspacebefore,
+   \c!sidespaceafter=\@@bkspaceafter,
+   \c!sidealign=\v!normal,
+   \c!textmethod=\ifgridsnapping2\else0\fi, % 0=raw 1=safe (.99pg) 2=tight (-1pt)
+   \c!sidemethod=\ifgridsnapping2\else1\fi,   % 0=raw 1=safe (.99pg) 2=tight (-1pt)
+   \c!indentnext=\v!no,
+   \c!margin=1em,
+   \c!leftmargindistance=\zeropoint,
+   \c!rightmargindistance=\@@bkleftmargindistance,
+   \c!ntop=2,
+   \c!nbottom=0,
+   \c!nlines=4,
+   \c!local=,
+   \c!default=\v!figure]
+
+\setupfloatsplitting
+  [\c!conversion=\v!character, % \v!romannumerals
+   \c!lines=3]
 
 % float strategy, replaces some of the above macros
 
@@ -2185,33 +2138,33 @@
         \let\floatrow\empty
         \edef\floatmethod{#2}}%
      \doifundefined{\string\floatmethod\floatmethod}
-        {\let\floatmethod\v!hier}%
+        {\let\floatmethod\v!here}%
      \getvalue{\string\floatmethod\floatmethod}[#1]%
    \fi}
 
 \def\installfloathandler#1#2% #1=keyword #2=handler
   {\setvalue{\string\floatmethod#1}{#2}}
 
-\installfloathandler \v!hier         \someherefloat
-\installfloathandler \v!forceer      \somefixdfloat
-\installfloathandler \v!links        \someleftsidefloat
-\installfloathandler \v!rechts       \somerightsidefloat
-\installfloathandler \v!tekst        \sometextfloat
-\installfloathandler \v!boven        \sometopfloat
-\installfloathandler \v!onder        \somebottomfloat
-\installfloathandler \v!marge        \somemarginfloat
-\installfloathandler \v!naast        \somefacefloat
-\installfloathandler \v!pagina       \somepagefloat
-\installfloathandler \v!inmarge      \someinmarginfloat
-\installfloathandler \v!inlinker     \someinleftmarginfloat
-\installfloathandler \v!inrechter    \someinrightmarginfloat
-\installfloathandler \v!linkermarge  \someinleftmarginfloat
-\installfloathandler \v!rechtermarge \someinrightmarginfloat
-\installfloathandler \v!linkerrand   \someinleftedgefloat
-\installfloathandler \v!rechterrand  \someinrightedgefloat
-
-\installfloathandler \v!rugwit       \somebackspacefloat
-\installfloathandler \v!snijwit      \somecutspacefloat
+\installfloathandler \v!here         \someherefloat
+\installfloathandler \v!force      \somefixdfloat
+\installfloathandler \v!left        \someleftsidefloat
+\installfloathandler \v!right       \somerightsidefloat
+\installfloathandler \v!text        \sometextfloat
+\installfloathandler \v!top        \sometopfloat
+\installfloathandler \v!bottom        \somebottomfloat
+\installfloathandler \v!margin        \somemarginfloat
+\installfloathandler \v!opposite        \somefacefloat
+\installfloathandler \v!page       \somepagefloat
+\installfloathandler \v!inmargin      \someinmarginfloat
+\installfloathandler \v!inleft     \someinleftmarginfloat
+\installfloathandler \v!inright    \someinrightmarginfloat
+\installfloathandler \v!leftmargin  \someinleftmarginfloat
+\installfloathandler \v!rightmargin \someinrightmarginfloat
+\installfloathandler \v!leftedge   \someinleftedgefloat
+\installfloathandler \v!rightedge  \someinrightedgefloat
+
+\installfloathandler \v!backspace       \somebackspacefloat
+\installfloathandler \v!cutspace      \somecutspacefloat
 
 \installfloathandler {tblr} \someslotfloat
 \installfloathandler {lrtb} \someslotfloat
@@ -2243,7 +2196,7 @@
 \def\someinleftedgefloat   [#1]{\somesidefloat[#1]}
 \def\someinrightedgefloat  [#1]{\somesidefloat[#1]}
 \def\someinmarginfloat     [#1]{\somesidefloat[#1]}
-\def\someherefloat         [#1]{\someelsefloat[\v!hier,#1]}
+\def\someherefloat         [#1]{\someelsefloat[\v!here,#1]}
 
 \def\somebackspacefloat    [#1]{\somesidefloat[#1]}
 \def\somecutspacefloat     [#1]{\somesidefloat[#1]}
diff --git a/tex/context/base/page-flw.tex b/tex/context/base/page-flw.tex
index 8d69b5d53..80c8c21e3 100644
--- a/tex/context/base/page-flw.tex
+++ b/tex/context/base/page-flw.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-flw,
+%D   [       filefile=page-flw,
 %D        version=2003.04.19, % from test-002 (1997) profile experiment
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Text Flows,
@@ -27,7 +27,7 @@
        {\setbox\textflowcollector{#1}\emptybox}
        {\@EA\newbox\csname\??tx:c:#1\endcsname}%
      \getparameters[\??tx:p:#1]
-       [\c!breedte=\hsize,\c!letter=,#2]%
+       [\c!width=\hsize,\c!style=,#2]%
    \fi}
 
 \def\textflowparameter#1#2{\csname\??tx:p:#1#2\endcsname}
@@ -52,9 +52,9 @@
      {\global\setbox\textflowcollector{#1}\vbox
         \bgroup
         \unvbox\textflowcollector{#1}%
-        \hsize\textflowparameter{#1}\c!breedte
-        \doifsomething{\textflowparameter{#1}\c!letter}%
-          {\doconvertfont{\textflowparameter{#1}\c!letter}}%
+        \hsize\textflowparameter{#1}\c!width
+        \doifsomething{\textflowparameter{#1}\c!style}%
+          {\doconvertfont{\textflowparameter{#1}\c!style}}%
         \def\stoptextflow{\endgraf\egroup}}
      {\let\stoptextflow\relax}}
 
@@ -104,4 +104,4 @@
 %    \else        {\bf MATERIE}\quad \input materie \par
 %    \fi}
 %
-% \stoptekst
\ No newline at end of file
+% \stoptekst
diff --git a/tex/context/base/page-imp.tex b/tex/context/base/page-imp.tex
index 7d0491e4c..19f8b29d3 100644
--- a/tex/context/base/page-imp.tex
+++ b/tex/context/base/page-imp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-imp, % was: core-pag,
+%D   [       filefile=page-imp, % was: core-pag,
 %D        version=1998.01.15,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Pagebody Building (Imposition),
@@ -31,19 +31,19 @@
 \def\clippedprintbox#1#2% can be made more efficient, see other clipper
   {\ifclipprintbox
      \!!widthc\pagebackgroundoffset
-     \!!widtha \papierbreedte
+     \!!widtha \paperwidth
      \advance\!!widtha \!!widthc
-     \!!heighta\papierhoogte
+     \!!heighta\paperheight
      \advance\!!heighta\!!widthc
      \advance\!!heighta\!!widthc
-     \setbox#2\vbox to \papierhoogte{\vfill\box#2}%
-     \ht#2\papierhoogte
-     \wd#2\papierbreedte
+     \setbox#2\vbox to \paperheight{\vfill\box#2}%
+     \ht#2\paperheight
+     \wd#2\paperwidth
      \setbox#2\vbox
        {\framed
-          [\c!offset=\!!widthc,\c!strut=\v!nee,\c!kader=\v!uit]
+          [\c!offset=\!!widthc,\c!strut=\v!no,\c!frame=\v!off]
           {\box#2}}%
-     \setbox#2\hbox to \papierbreedte
+     \setbox#2\hbox to \paperwidth
        {\ifcase#1\relax
           \!!widthb\zeropoint
           \hskip-\!!widthc
@@ -52,11 +52,11 @@
         \fi
         \lower\!!widthc\hbox
           {\clip
-             [\c!breedte=\!!widtha,\c!hoogte=\!!heighta,
+             [\c!width=\!!widtha,\c!height=\!!heighta,
               \c!hoffset=\!!widthb,\c!voffset=\zeropoint]
              {\box#2}}}%
-     \wd#2\papierbreedte
-     \ht#2\papierhoogte
+     \wd#2\paperwidth
+     \ht#2\paperheight
    \fi
    \box#2\relax}
 
@@ -97,8 +97,8 @@
           {\clip
              [\c!hoffset=\!!widthc,
               \c!voffset=-\!!widthb,
-              \c!breedte=\!!widtha,
-              \c!hoogte=\!!heighta]%
+              \c!width=\!!widtha,
+              \c!height=\!!heighta]%
              {\box#1}}}%
      \wd#1\!!widtha
      \ht#1\!!heighta
@@ -157,7 +157,7 @@
      \shipout\vbox
        {\forgetall
         \offinterlineskip
-        \mindermeldingen
+        \dontcomplain
         \scratchdimen-1in
         \vskip\scratchdimen
         \hskip\scratchdimen
@@ -173,7 +173,6 @@
               \the\everyshipout\relax
               % always last (and after the main one)
               \ifnum\realpageno=\lastpage\relax
-                \flushtextdata
                 \the\everylastshipout
                 \global\everylastshipout\emptytoks
               \fi}%
@@ -225,14 +224,14 @@
 \def\calculatepaperoffsets#1%
   {\scratchdimen\getvalue{\??pp#1\c!offset}%
    \divide\scratchdimen \arrangedpageX
-   \global\advance\papierbreedte -2\scratchdimen
+   \global\advance\paperwidth -2\scratchdimen
    \scratchdimen\getvalue{\??pp#1\c!offset}%
    \divide\scratchdimen \arrangedpageY
-   \global\advance\papierhoogte -2\scratchdimen}
+   \global\advance\paperheight -2\scratchdimen}
 
 \def\setuparranging[#1]%
   {\ifarrangingdisabled \else
-     \doifelse{#1}\v!blokkeer
+     \doifelse{#1}\v!disable
        {\global\arrangingdisabledtrue}
        {\global\arrangingdisabledfalse}%
      \global\arrangingpagestrue
@@ -243,10 +242,10 @@
      \gdef\arrangedrotationE{180}%
      \processallactionsinset
        [#1]
-       [  \v!gespiegeld=>\global\mirrorarrangedtrue,
-        \v!dubbelzijdig=>\global\doublearrangedtrue,
-            \v!negatief=>\global\negatearrangedtrue,
-           \v!geroteerd=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270},
+       [  \v!mirrored=>\global\mirrorarrangedtrue,
+        \v!doublesided=>\global\doublearrangedtrue,
+            \v!negative=>\global\negatearrangedtrue,
+           \v!rotated=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270},
                      90=>\gdef\arrangedrotationO {90}\gdef\arrangedrotationE{270},
                     180=>\gdef\arrangedrotationO{180}\gdef\arrangedrotationE{0},
                     270=>\gdef\arrangedrotationO{270}\gdef\arrangedrotationE{90},
@@ -256,7 +255,7 @@
      \ifx\handlearrangedpage\undefined
        \global\arrangingpagesfalse
      \fi
-     \doifcommonelse{#1}{90,270,\v!geroteerd}
+     \doifcommonelse{#1}{90,270,\v!rotated}
        {\swapmacros\horizontalcutmarks\verticalcutmarks}{}% ugly solution
      \setuppapersize
      \ifarrangingpages
@@ -280,7 +279,7 @@
    \global\let    \poparrangedpages  #7%
    \global\let    \handlearrangedpage#8}
 
-\installpagearrangement {\v!normaal}
+\installpagearrangement {\v!normal}
   {\global\arrangingpagesfalse}
 
 \installpagearrangement 2*16
@@ -354,13 +353,13 @@
    \fi}
 
 \def\handlearrangedpageXandY#1#2#3#4#5%
-  {\global\setbox#5\hbox to \arrangedpageX\papierbreedte
-     {\setbox\scratchbox\vbox to \arrangedpageY\papierhoogte
+  {\global\setbox#5\hbox to \arrangedpageX\paperwidth
+     {\setbox\scratchbox\vbox to \arrangedpageY\paperheight
         {\forgetall
          \offinterlineskip
-         \mindermeldingen
-         \vskip#4\papierhoogte
-         \hskip#3\papierbreedte
+         \dontcomplain
+         \vskip#4\paperheight
+         \hskip#3\paperwidth
          \dorotatebox{\ifcase#2 0\else180\fi}\hbox{\box#1}%
          \vfill}%
       \wd\scratchbox\zeropoint
@@ -404,9 +403,9 @@
 
 \def\poparrangedpagesAB
   {\ifnum\arrangedpageN>\zerocount
-     \mindermeldingen
-     \papierbreedte\arrangedpageX\papierbreedte
-     \papierhoogte\arrangedpageY\papierhoogte
+     \dontcomplain
+     \paperwidth\arrangedpageX\paperwidth
+     \paperheight\arrangedpageY\paperheight
      \outputarrangedbox\arrangedpageA
      \outputarrangedbox\arrangedpageB
      \doglobal\newcounter\arrangedpageN
@@ -513,18 +512,18 @@
    \fi}
 
 \def\handlearrangedpageSIDE
-  {\global\wd\arrangedpageA\papierbreedte
-   \global\wd\arrangedpageB\papierbreedte
+  {\global\wd\arrangedpageA\paperwidth
+   \global\wd\arrangedpageB\paperwidth
    \global\setbox\arrangedpageA\hbox
      {\box\arrangedpageA\box\arrangedpageB}%
-   \global\ht\arrangedpageA\papierhoogte
+   \global\ht\arrangedpageA\paperheight
    \global\setbox\arrangedpageB\box\scratchbox} % ?
 
 \def\handlearrangedpageTOP
-  {\global\ht\arrangedpageA\papierhoogte
-   \global\ht\arrangedpageB\papierhoogte
+  {\global\ht\arrangedpageA\paperheight
+   \global\ht\arrangedpageB\paperheight
    \global\setbox\arrangedpageA\vbox
-     {\forgetall\offinterlineskip\vskip\papierhoogte
+     {\forgetall\offinterlineskip\vskip\paperheight
       \box\arrangedpageA\box\arrangedpageB}%
    \global\setbox\arrangedpageB\box\scratchbox} % ?
 
@@ -539,20 +538,6 @@
      \setbox\scratchbox\vsplit\arrangedpageB to \scratchdimen
    \fi}
 
-% \def\handlearrangedpageTWOUP
-%   {\splitoffarrangedpagesTWO
-%    \ifswaparranged
-%      \global\setbox\arrangedpageA\hbox
-%        {\box\arrangedpageA\box\arrangedpageB}%
-%      \swaparrangedfalse
-%    \else
-%      \global\setbox\arrangedpageA\hbox
-%        {\box\arrangedpageB\box\arrangedpageA}%
-%      \swaparrangedtrue
-%    \fi
-%    \global\ht\arrangedpageA\papierhoogte
-%    \global\setbox\arrangedpageB\box\scratchbox}
-
 \def\handlearrangedpageTWOUP
   {\splitoffarrangedpagesTWO
    \ifswaparranged
@@ -566,21 +551,21 @@
         \clippedprintbox1\arrangedpageA}%
      \swaparrangedtrue
    \fi
-   \global\ht\arrangedpageA\papierhoogte
+   \global\ht\arrangedpageA\paperheight
    \global\setbox\arrangedpageB\box\scratchbox}
 
 \def\handlearrangedpageTWODOWN
   {\splitoffarrangedpagesTWO
-   \global\ht\arrangedpageA\papierhoogte
-   \global\ht\arrangedpageB\papierhoogte
+   \global\ht\arrangedpageA\paperheight
+   \global\ht\arrangedpageB\paperheight
    \ifswaparranged
      \global\setbox\arrangedpageA\vbox
-       {\forgetall\offinterlineskip\vskip\papierhoogte
+       {\forgetall\offinterlineskip\vskip\paperheight
         \box\arrangedpageA\box\arrangedpageB}%
      \swaparrangedfalse
    \else
      \global\setbox\arrangedpageA\vbox
-       {\forgetall\offinterlineskip\vskip\papierhoogte
+       {\forgetall\offinterlineskip\vskip\paperheight
         \box\arrangedpageB\box\arrangedpageA}%
      \swaparrangedtrue
    \fi
@@ -588,15 +573,15 @@
 
 \def\poparrangedpagesTWO
   {\ifnum\arrangedpageN>\zerocount
-     \mindermeldingen
+     \dontcomplain
      \swaparrangedfalse
      \doloop
        {\handlearrangedpage
         \bgroup
-        \papierbreedte\arrangedpageX\papierbreedte
-        \papierhoogte\arrangedpageY\papierhoogte
-        \ht\arrangedpageA\papierhoogte
-        \wd\arrangedpageA\papierbreedte
+        \paperwidth\arrangedpageX\paperwidth
+        \paperheight\arrangedpageY\paperheight
+        \ht\arrangedpageA\paperheight
+        \wd\arrangedpageA\paperwidth
         \outputarrangedbox\arrangedpageA
         \egroup
         \ifdim\ht\arrangedpageB=\zeropoint
@@ -643,9 +628,9 @@
 
 \def\poparrangedpagesAtoH
   {\ifnum\arrangedpageN>\zerocount
-     \mindermeldingen
-     \papierbreedte\arrangedpageX\papierbreedte
-     \papierhoogte\arrangedpageY\papierhoogte
+     \dontcomplain
+     \paperwidth\arrangedpageX\paperwidth
+     \paperheight\arrangedpageY\paperheight
      \outputarrangedbox\arrangedpageA
      \outputarrangedbox\arrangedpageB
      \outputarrangedbox\arrangedpageC
@@ -661,9 +646,9 @@
 
 \def\poparrangedpagesAtoD
   {\ifnum\arrangedpageN>\zerocount
-     \mindermeldingen
-     \papierbreedte\arrangedpageX\papierbreedte
-     \papierhoogte\arrangedpageY\papierhoogte
+     \dontcomplain
+     \paperwidth\arrangedpageX\paperwidth
+     \paperheight\arrangedpageY\paperheight
      \outputarrangedbox\arrangedpageA
      \outputarrangedbox\arrangedpageB
      \outputarrangedbox\arrangedpageC
@@ -738,14 +723,14 @@
    \reportarrangedpage\arrangedpageN
    \doglobal\increment\arrangedpageM
    \global\setbox\arrangedpageB\hbox
-     \ifdim\@@ppbreedte>\zeropoint to \@@ppbreedte \fi
+     \ifdim\@@ppwidth>\zeropoint to \@@ppwidth \fi
      {\ifvoid\arrangedpageB\else
         \unhbox\arrangedpageB\hss\hskip\@@ppdx\hss
       \fi
       \box#1}%
    \ifnum\arrangedpageM<\arrangedpageX\else
      \global\setbox\arrangedpageA\vbox
-          \ifdim\@@pphoogte>\zeropoint to \@@pphoogte \fi
+          \ifdim\@@ppheight>\zeropoint to \@@ppheight \fi
        {\offinterlineskip
         \ifvoid\arrangedpageA\else
           \unvbox\arrangedpageA\vss\vskip\@@ppdy\vss
@@ -759,9 +744,9 @@
 
 \def\poparrangedpagesXY
   {\ifnum\arrangedpageN>\zerocount
-     \mindermeldingen
-     \papierbreedte\arrangedpageX\papierbreedte
-     \papierhoogte \arrangedpageY\papierhoogte
+     \dontcomplain
+     \paperwidth\arrangedpageX\paperwidth
+     \paperheight \arrangedpageY\paperheight
      \outputarrangedbox\arrangedpageA
      \doglobal\newcounter\arrangedpageN
      \doglobal\newcounter\arrangedpageM
@@ -775,12 +760,12 @@
 
 \definepapersize
   [XY]
-  [\c!breedte=\dimexpr(\dimexpr(\@@ppbreedte-\numexpr(\@@ppnx-1)\dimexpr(\@@ppdx))/\@@ppnx),
-   \c!hoogte =\dimexpr(\dimexpr(\@@pphoogte -\numexpr(\@@ppny-1)\dimexpr(\@@ppdy))/\@@ppny)]
+  [\c!width=\dimexpr(\dimexpr(\@@ppwidth-\numexpr(\@@ppnx-1)\dimexpr(\@@ppdx))/\@@ppnx),
+   \c!height =\dimexpr(\dimexpr(\@@ppheight -\numexpr(\@@ppny-1)\dimexpr(\@@ppdy))/\@@ppny)]
 
 \setuppaper
-  [\c!breedte=\dimexpr(\printpapierbreedte-2\dimexpr(\@@pprugwit)),
-   \c!hoogte =\dimexpr(\printpapierhoogte -2\dimexpr(\@@ppkopwit))]
+  [\c!width=\dimexpr(\printpaperwidth-2\dimexpr(\@@ppbackspace)),
+   \c!height =\dimexpr(\printpaperheight -2\dimexpr(\@@pptopspace))]
 
 \endETEX
 
@@ -849,26 +834,26 @@
      \let\vpageshifts\empty
      \let\shiftprintpagebox\gobbleoneargument
      \let\shiftpaperpagebox\gobbleoneargument
-     \doifdefined{\??pt\v!horizontaal:#2}
-       {\edef\hpageshifts{\getvalue{\??pt\v!horizontaal:#2}}}%
-     \doifdefined{\??pt\v!vertikaal  :#3}
-       {\edef\vpageshifts{\getvalue{\??pt\v!vertikaal  :#3}}}%
-     \doif{#1}\v!pagina{\let\shiftprintpagebox\shiftpagebox}%
-     \doif{#1}\v!papier{\let\shiftpaperpagebox\shiftpagebox}%
+     \doifdefined{\??pt\v!horizontal:#2}
+       {\edef\hpageshifts{\getvalue{\??pt\v!horizontal:#2}}}%
+     \doifdefined{\??pt\v!vertical  :#3}
+       {\edef\vpageshifts{\getvalue{\??pt\v!vertical  :#3}}}%
+     \doif{#1}\v!page{\let\shiftprintpagebox\shiftpagebox}%
+     \doif{#1}\v!paper{\let\shiftpaperpagebox\shiftpagebox}%
    \else\ifsecondargument
-     \doifinsetelse{#1}{\v!pagina,\v!papier}
+     \doifinsetelse{#1}{\v!page,\v!paper}
        {\setuppageshift[#1][#2][#2]}
-       {\setuppageshift[\v!pagina][#1][#2]}%
+       {\setuppageshift[\v!page][#1][#2]}%
    \else\iffirstargument
-     \setuppageshift[\v!pagina][#1][#1]%
+     \setuppageshift[\v!page][#1][#1]%
    \fi\fi}
 
 %D One can (mis)use this mechanism, in close cooperation
 %D with \PDFTEX\ to arrange pages of already produced files.
 %D
-%D \starttypen
+%D \starttyping
 %D \insertpages[file.pdf][1,3][n=30,width=18cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The pages are inserted in the text area, and even pages
 %D are repositioned according to the width. In this example
@@ -876,16 +861,16 @@
 %D
 %D Selecting pages can be accomplished by:
 %D
-%D \starttypen
+%D \starttyping
 %D \filterpages[file.pdf][1,3,5][n=30,width=18cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D One may pass \type {odd} or \type {even} instead of a
 %D comma separated list. A third alternative is:
 %D
-%D \starttypen
+%D \starttyping
 %D \copypages[file.pdf][n=30,scale=950]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macros inserts the page, according to the settings
 %D provided.
@@ -900,13 +885,13 @@
 
 \def\dodoinsertpages[#1][#2][#3]%
   {\bgroup
-   \mindermeldingen
+   \dontcomplain
    \getfiguredimensions[#1]%
-   \getparameters[\??ip][\c!n=\noffigurepages,\c!breedte=\!!zeropoint,#3]%
-   \doifinset0{#2}{\null\pagina}%
+   \getparameters[\??ip][\c!n=\noffigurepages,\c!width=\!!zeropoint,#3]%
+   \doifinset0{#2}{\null\page}%
    \dorecurse\@@ipn
      {\dofilterpage{#1}\recurselevel
-      \doifinset\recurselevel{#2}{\null\pagina}}%
+      \doifinset\recurselevel{#2}{\null\page}}%
    \egroup}
 
 \def\filterpages
@@ -914,13 +899,13 @@
 
 \def\dofilterpages[#1][#2][#3]% % \noffigurepages not yet supported
   {\bgroup
-   \mindermeldingen
+   \dontcomplain
    \getfiguredimensions[#1]%
-   \getparameters[\??ip][\c!n=\noffigurepages,\c!breedte=\!!zeropoint,#3]%
+   \getparameters[\??ip][\c!n=\noffigurepages,\c!width=\!!zeropoint,#3]%
    \doifelse{#2}\v!even
      {\dorecurse\@@ipn
         {\ifodd\recurselevel\relax\else\dofilterpage{#1}\recurselevel\fi}}
-     {\doifelse{#2}\v!oneven
+     {\doifelse{#2}\v!odd
         {\dorecurse\@@ipn
            {\ifodd\recurselevel\relax\dofilterpage{#1}\recurselevel\fi}}
         {\def\dodocommando##1%
@@ -937,16 +922,16 @@
    \dostepwiserecurse\fromrange\torange1{#2{\recurselevel}}}
 
 \def\dofilterpage#1#2%
-  {\hbox to \tekstbreedte
-     {\ifdubbelzijdig\ifdim\@@ipbreedte>\zeropoint\relax\ifodd\realpageno\else
+  {\hbox to \textwidth
+     {\ifdubbelzijdig\ifdim\@@ipwidth>\zeropoint\relax\ifodd\realpageno\else
         \hfill
-        \def\dowithfigure{\hskip-\@@ipbreedte}%
+        \def\dowithfigure{\hskip-\@@ipwidth}%
       \fi\fi\fi
       \setbox0\hbox
-        {\externalfigure[#1][\c!pagina=#2,\c!hoogte=\teksthoogte]}%
+        {\externalfigure[#1][\c!page=#2,\c!height=\textheight]}%
       \wd0\zeropoint
       \box0}
-   \pagina}
+   \page}
 
 \def\copypages
   {\dodoubleempty\docopypages}
@@ -956,24 +941,24 @@
    \getfiguredimensions[#1]%
    \getparameters[\??ip]
      [\c!n=\noffigurepages,
-      \c!markering=\v!uit,
-      \c!schaal=\!!thousand,
+      \c!marking=\v!off,
+      \c!scale=\!!thousand,
       \c!offset=\!!zeropoint,
       #2]%
    \dorecurse\@@ipn
-     {\vbox to \teksthoogte
-        {\hsize\tekstbreedte
+     {\vbox to \textheight
+        {\hsize\textwidth
          \scratchdimen\@@ipoffset
          \centeredbox
-           {\doifelse\@@ipmarkering\v!aan\cuthbox\hbox
+           {\doifelse\@@ipmarking\v!on\cuthbox\hbox
               {\ifdim\scratchdimen>\zeropoint\relax
                  \advance\vsize -2\scratchdimen
                  \advance\hsize -2\scratchdimen
-                 \externalfigure[#1][\c!pagina=\recurselevel,#2,\c!schaal=,\c!factor=\v!max,\c!offset=\v!overlay]%
+                 \externalfigure[#1][\c!page=\recurselevel,#2,\c!scale=,\c!factor=\v!max,\c!offset=\v!overlay]%
                \else
-                 \externalfigure[#1][\c!pagina=\recurselevel,#2,\c!offset=\v!overlay]%
+                 \externalfigure[#1][\c!page=\recurselevel,#2,\c!offset=\v!overlay]%
                \fi}}}
-      \pagina}
+      \page}
    \egroup}
 
 %D \macros
@@ -983,7 +968,7 @@
 %D {\combinepages}. This macro builds a matrix of pages from a
 %D file, for example:
 %D
-%D \starttypen
+%D \starttyping
 %D \setuppapersize
 %D   [A4][A4] % or [A4,landscape][A4,landscape]
 %D
@@ -998,7 +983,7 @@
 %D \starttext
 %D   \combinepages[slides][nx=2,ny=3,frame=on]
 %D \stoptext
-%D \starttypen
+%D \starttyping
 %D
 %D One can influence the way the pages are combined. (This
 %D will be explained some time.)
@@ -1008,27 +993,27 @@
 
 \def\docombinepages[#1][#2]% a=perpag b=free
   {\bgroup
-   \mindermeldingen
+   \dontcomplain
    \getfiguredimensions[#1]%
    \getparameters
      [\??ip]
-     [\c!variant=\v!a,
+     [\c!alternative=\v!a,
       \c!n=\noffigurepages,\c!nx=2,\c!ny=2,\c!start=1,\c!stop=\!!maxcard,
-      \c!afstand=\bodyfontsize,
-      \c!onder=\vfill,\c!boven=\vss,
-      \c!links=\hss,\c!rechts=\hss,
-      \c!voor=\pagina,\c!na=\pagina,\c!tussen=\blanko,
-      \c!kader=,\c!achtergrond=,\c!achtergrondkleur=,
+      \c!distance=\bodyfontsize,
+      \c!bottom=\vfill,\c!top=\vss,
+      \c!left=\hss,\c!right=\hss,
+      \c!before=\page,\c!after=\page,\c!inbetween=\blank,
+      \c!frame=,\c!background=,\c!backgroundcolor=,
       #2]%
-   \@@ipvoor
+   \@@ipbefore
   %\doglobal\newcounter\combinedpagescounter
    \globallet\combinedpagescounter\@@ipstart
-   \doifelse\@@ipvariant\v!b\!!doneafalse\!!doneatrue
+   \doifelse\@@ipalternative\v!b\!!doneafalse\!!doneatrue
    \if!!donea
      \doloop
-       {\vbox to \teksthoogte
-           {\hsize\tekstbreedte % ? ?
-            \scratchdimen\@@ipafstand
+       {\vbox to \textheight
+           {\hsize\textwidth % ? ?
+            \scratchdimen\@@ipdistance
             \!!widtha\hsize
             \advance\!!widtha  -\@@ipnx\scratchdimen
             \advance\!!widtha  \scratchdimen
@@ -1043,33 +1028,33 @@
                     {\vbox to \!!heighta
                        {\hsize\!!widtha
                         \vsize\!!heighta
-                        \@@ipboven
+                        \@@iptop
                         \hbox to \hsize
-                          {\@@iplinks
+                          {\@@ipleft
                            \ifnum\combinedpagescounter>\@@ipstop\relax
                              \globallet\@@ipn\!!zerocount
                            \else\ifnum\combinedpagescounter>\@@ipn \else
                              \externalfigure[#1]
-                               [\c!object=\v!nee,
-                                \c!pagina=\combinedpagescounter,
+                               [\c!object=\v!no,
+                                \c!page=\combinedpagescounter,
                                 \c!factor=\v!max,
-                                \c!achtergrond=\@@ipachtergrond,
-                                \c!achtergrondkleur=\@@ipachtergrondkleur,
-                                \c!kader=\@@ipkader]%
+                                \c!background=\@@ipbackground,
+                                \c!backgroundcolor=\@@ipbackgroundcolor,
+                                \c!frame=\@@ipframe]%
                            \fi\fi
-                           \@@iprechts}
-                        \@@iponder}%
+                           \@@ipright}
+                        \@@ipbottom}%
                      \doglobal\increment\combinedpagescounter
                      \hfil}%
                   \hfilneg}
                \vfil}%
            \vfilneg}%
-           \pagina
+           \page
         \ifnum\combinedpagescounter>\@@ipn \exitloop\fi}
    \else
      \doloop
        {\startbaselinecorrection
-          \scratchdimen\@@ipafstand
+          \scratchdimen\@@ipdistance
           \!!widtha\hsize
           \advance\!!widtha -\@@ipnx\scratchdimen
           \advance\!!widtha         \scratchdimen
@@ -1079,21 +1064,21 @@
                {\doglobal\increment\combinedpagescounter
                 \ifnum\combinedpagescounter>\@@ipn \else
                    \expanded{\externalfigure[#1]
-                     [\c!pagina=\combinedpagescounter,
-                      \c!breedte=\the\!!widtha,% todo \freezedimenmacro
-                      \c!achtergrond=\@@ipachtergrond,
-                      \c!achtergrondkleur=\@@ipachtergrondkleur,
-                      \c!kader=\@@ipkader]}%
+                     [\c!page=\combinedpagescounter,
+                      \c!width=\the\!!widtha,% todo \freezedimenmacro
+                      \c!background=\@@ipbackground,
+                      \c!backgroundcolor=\@@ipbackgroundcolor,
+                      \c!frame=\@@ipframe]}%
                    \hfill
                 \fi}\hfillneg}%
         \stopbaselinecorrection
         \ifnum\combinedpagescounter<\@@ipn\relax
-          \@@iptussen
+          \@@ipinbetween
         \else
           \exitloop
         \fi}
    \fi
-   \@@ipna
+   \@@ipafter
    \egroup}
 
 %D \macros
@@ -1101,81 +1086,81 @@
 %D
 %D This command is not yet documented. Usage:
 %D
-%D \starttypen
+%D \starttyping
 %D \setuppagecomment[state=start,location=right]
 %D
 %D \startpagecomment
 %D \input knuth
 %D \stoppagecomment
-%D \stoptypen
+%D \stoptyping
 
 \def\setuppagecomment
   {\dosingleempty\dosetuppagecomment}
 
 \def\dosetuppagecomment[#1]%
   {\getparameters[\??pc][#1]%
-   \doifelse\@@pcstatus\v!start
-     {\doifinsetelse\@@pcplaats{\v!onder,\v!boven}
-        {\setuppapersize[\c!links=\hskip\@@pcoffset]%
-         \adddimenmacro\papierhoogte\@@pcoffset\@@pcoffset\@@pcafstand\@@pchoogte\to\@@pcpaperheight
-         \adddimenmacro\papierbreedte\@@pcoffset\@@pcoffset\to\@@pcpaperwidth
+   \doifelse\@@pcstate\v!start
+     {\doifinsetelse\@@pclocation{\v!bottom,\v!top}
+        {\setuppapersize[\c!left=\hskip\@@pcoffset]%
+         \adddimenmacro\paperheight\@@pcoffset\@@pcoffset\@@pcdistance\@@pcheight\to\@@pcpaperheight
+         \adddimenmacro\paperwidth\@@pcoffset\@@pcoffset\to\@@pcpaperwidth
          \defineoverlay[\v!pagecomment][\placepagecommentTB]}
-        {\setuppapersize[\c!boven=\vskip\@@pcoffset]%
-         \adddimenmacro\papierhoogte\@@pcoffset\@@pcoffset\to\@@pcpaperheight
-         \adddimenmacro\papierbreedte\@@pcoffset\@@pcoffset\@@pcafstand\@@pcbreedte\to\@@pcpaperwidth
+        {\setuppapersize[\c!top=\vskip\@@pcoffset]%
+         \adddimenmacro\paperheight\@@pcoffset\@@pcoffset\to\@@pcpaperheight
+         \adddimenmacro\paperwidth\@@pcoffset\@@pcoffset\@@pcdistance\@@pcwidth\to\@@pcpaperwidth
          \defineoverlay[\v!pagecomment][\placepagecommentLR]}%
       \processaction
-        [\@@pcplaats]
-        [ \v!onder=>{\setuppapersize[\c!onder =\vss,\c!boven =\vskip\@@pcoffset]},
-          \v!boven=>{\setuppapersize[\c!boven =\vss,\c!onder =\vskip\@@pcoffset]},
-          \v!links=>{\setuppapersize[\c!links =\hss,\c!rechts=\hskip\@@pcoffset]},
-         \v!rechts=>{\setuppapersize[\c!rechts=\hss,\c!links =\hskip\@@pcoffset]}]%
+        [\@@pclocation]
+        [ \v!bottom=>{\setuppapersize[\c!bottom =\vss,\c!top =\vskip\@@pcoffset]},
+          \v!top=>{\setuppapersize[\c!top =\vss,\c!bottom =\vskip\@@pcoffset]},
+          \v!left=>{\setuppapersize[\c!left =\hss,\c!right=\hskip\@@pcoffset]},
+         \v!right=>{\setuppapersize[\c!right=\hss,\c!left =\hskip\@@pcoffset]}]%
       \definepapersize
         [\v!pagecomment]
-        [\c!hoogte=\@@pcpaperheight,
-         \c!breedte=\@@pcpaperwidth]%
+        [\c!height=\@@pcpaperheight,
+         \c!width=\@@pcpaperwidth]%
       \let\@@pcprintpapersize\printpapersize
       \setuppapersize[\papersize][\v!pagecomment]%
-      \setupbackgrounds[\v!papier][\c!achtergrond=\v!pagecomment]}
-    {\doif\@@pcstatus\v!stop % else initialization  invokes backgrounds
+      \setupbackgrounds[\v!paper][\c!background=\v!pagecomment]}
+    {\doif\@@pcstate\v!stop % else initialization  invokes backgrounds
        {% this should be tested first
         % \expanded{\setuppapersize[\papersize][\@@pcprintpapersize]}%
-        \setupbackgrounds[\v!papier][\c!achtergrond=]}}}
+        \setupbackgrounds[\v!paper][\c!background=]}}}
 
 \def\@@pcprintpapersize{\printpapersize}
 
 \def\placepagecommentTB
-  {\vbox to \printpapierhoogte
+  {\vbox to \printpaperheight
      {\forgetall
-      \hsize\printpapierbreedte
+      \hsize\printpaperwidth
       \vskip\@@pcoffset
-      \doifelse\@@pcplaats\v!onder{\vskip\papierhoogte\vskip\@@pcafstand}\vss
+      \doifelse\@@pclocation\v!bottom{\vskip\paperheight\vskip\@@pcdistance}\vss
       \hskip\@@pcoffset
-      \vbox to \@@pchoogte
+      \vbox to \@@pcheight
         {\forgetall
-         \hsize\papierbreedte
+         \hsize\paperwidth
          \ifpagecomment
            \getbuffer[\v!pagecomment]%
            \global\pagecommentfalse
          \fi}%
       \hfill
-      \doifelse\@@pcplaats\v!onder\vss{\vskip\papierhoogte\vskip\@@pcafstand}
+      \doifelse\@@pclocation\v!bottom\vss{\vskip\paperheight\vskip\@@pcdistance}
       \vskip\@@pcoffset}}
 
 \def\placepagecommentLR
-  {\hbox to \printpapierbreedte
+  {\hbox to \printpaperwidth
      {\hskip\@@pcoffset
-      \doifelse\@@pcplaats\v!rechts{\hskip\papierbreedte\hskip\@@pcafstand}\hss
-      \vbox to \printpapierhoogte
+      \doifelse\@@pclocation\v!right{\hskip\paperwidth\hskip\@@pcdistance}\hss
+      \vbox to \printpaperheight
         {\forgetall
          \vskip\@@pcoffset
-         \hsize\@@pcbreedte
+         \hsize\@@pcwidth
          \ifpagecomment
            \getbuffer[\v!pagecomment]%
            \global\pagecommentfalse
          \fi
          \vss}%
-      \doifelse\@@pcplaats\v!rechts\hss{\hskip\papierbreedte\hskip\@@pcafstand}%
+      \doifelse\@@pclocation\v!right\hss{\hskip\paperwidth\hskip\@@pcdistance}%
       \hskip\@@pcoffset}}
 
 \newif\ifpagecomment
@@ -1185,12 +1170,12 @@
    \dostartbuffer[\v!pagecomment][\e!start\v!pagecomment][\e!stop\v!pagecomment]}
 
 \setuppagecomment
-  [\c!status=, % \v!stop would invoke background calculation
-   \c!plaats=\v!onder,
+  [\c!state=, % \v!stop would invoke background calculation
+   \c!location=\v!bottom,
    \c!offset=.5cm,
-   \c!afstand=.5cm,
-   \c!hoogte=5cm,
-   \c!breedte=10cm]
+   \c!distance=.5cm,
+   \c!height=5cm,
+   \c!width=10cm]
 
 % This macro cuts a page into n parts that can be pasted
 % together.
@@ -1217,17 +1202,17 @@
      [\c!n=1,
       \c!offset=\!!zeropoint,
       \c!hoffset=\!!zeropoint,\c!voffset=\!!zeropoint,
-      \c!breedte=\figurewidth,\c!hoogte=\figureheight,#2]
+      \c!width=\figurewidth,\c!height=\figureheight,#2]
    \ifnum\@@ipn>\zerocount
      \definepapersize
-       [\s!dummy][\c!hoogte=\@@iphoogte,\c!breedte=\@@ipbreedte]
+       [\s!dummy][\c!height=\@@ipheight,\c!width=\@@ipwidth]
      \setuppapersize
        [\s!dummy][\s!dummy]
      \setuplayout
-       [\c!rugwit=\!!zeropoint,\c!kopwit=\!!zeropoint,
-        \c!hoogte=\v!midden,\c!breedte=\v!midden,
-        \c!tekstafstand=\!!zeropoint,
-        \c!hoofd=\!!zeropoint,\c!voet=\!!zeropoint]
+       [\c!backspace=\!!zeropoint,\c!topspace=\!!zeropoint,
+        \c!height=\v!middle,\c!width=\v!middle,
+        \c!textdistance=\!!zeropoint,
+        \c!header=\!!zeropoint,\c!footer=\!!zeropoint]
    \fi
    \dorecurse\noffigurepages
      {\global\let\slicedpagenumber\recurselevel
@@ -1238,10 +1223,10 @@
              {\let\yslice\recurselevel
               \clip
                 [\c!nx=\@@ipn,\c!ny=\@@ipn,\c!x=\xslice,\c!y=\yslice]
-                {\schaal
-                   [\c!schaal=\@@ipn000]
-                   {\externalfigure[#1][\c!pagina=\slicedpagenumber]}}
-              \pagina}}
+                {\scale
+                   [\c!scale=\@@ipn000]
+                   {\externalfigure[#1][\c!page=\slicedpagenumber]}}
+              \page}}
       \else
         \ifodd\slicedpagenumber\relax
           \getparameters[\??ip][#2]
@@ -1251,12 +1236,12 @@
         \hskip\@@ipoffset
         \clip
           [\c!hoffset=\@@iphoffset,\c!voffset=\@@ipvoffset,
-           \c!hoogte=\@@iphoogte,\c!breedte=\@@ipbreedte]
-          {\externalfigure[#1][\c!pagina=\slicedpagenumber]}
-        \pagina
+           \c!height=\@@ipheight,\c!width=\@@ipwidth]
+          {\externalfigure[#1][\c!page=\slicedpagenumber]}
+        \page
       \fi}
    \egroup}
 
 % \starttext \slicepages[slice1.pdf][n=3] \stoptext
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-ini.tex b/tex/context/base/page-ini.tex
index 37dbc8835..f43d38fbd 100644
--- a/tex/context/base/page-ini.tex
+++ b/tex/context/base/page-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-ini,
+%D   [       filefile=page-ini,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Initializations,
@@ -922,20 +922,34 @@
      \dosupereject
    \fi
    % but does not hurt either (we're still in the otr!)
-   \inpagebodytrue      % needed for enabling \blanko !
+   \inpagebodytrue      % needed for enabling \blank !
    \flushsavedfloats    % was \dosetbothinserts; only otr one !
    \setvsize            % this is needed for interacting components, like floats and multicolumns
    \adaptfuzzypagegoal} % watch this hack!
 
-\def\dofinaloutput#1#2%
+% \def\dofinaloutput#1#2%
+%   {\beforefinaloutput
+%    \the\everybeforeshipout
+%    \ifspecialbasedsettings
+%      \myshipout{\hbox{\hbox to \zeropoint{\the\pageboundsettings}%
+%                       \hbox{\dopagebody#1#2\setpagecounters}}}%
+%    \else
+%      \the\pageboundsettings
+%      \myshipout{\hbox{\dopagebody#1#2\setpagecounters}}%
+%    \fi
+%    \the\everyaftershipout
+%    \afterfinaloutput
+%    \popproperties}  % ... and here ...
+
+\def\dofinaloutput#1#2% \vbox: prevents spurious spaces in every..pagebody
   {\beforefinaloutput
    \the\everybeforeshipout
    \ifspecialbasedsettings
      \myshipout{\hbox{\hbox to \zeropoint{\the\pageboundsettings}%
-                      \hbox{\dopagebody#1#2\setpagecounters}}}%
+                      \hbox{\vbox{\dopagebody#1#2\setpagecounters}}}}%
    \else
      \the\pageboundsettings
-     \myshipout{\hbox{\dopagebody#1#2\setpagecounters}}%
+     \myshipout{\hbox{\vbox{\dopagebody#1#2\setpagecounters}}}%
    \fi
    \the\everyaftershipout
    \afterfinaloutput
@@ -1004,14 +1018,14 @@
    \or
      % simple
      \vskip\!!sixpoint
-     \hbox to \zetbreedte
+     \hbox to \makeupwidth
        {\infofont
         Concept: \currentdate
         \hss\reportpagedimensions}%
    \or
      % extensive
      \vskip\!!sixpoint
-     \hbox to \zetbreedte
+     \hbox to \makeupwidth
        {\infofont
         \getmessage\m!systems{27}: \currentdate\
         \doplaatsversieaanduiding{Project}\currentproject
@@ -1023,19 +1037,19 @@
 
 % tot hier
 
-\def\doversie[#1]%
+\def\doversion[#1]%
   {\voorlopigfalse
    \chardef\conceptmode\zerocount
    \overfullrule\zeropoint
-   \processaction % \v!definitief=>
+   \processaction % \v!final=>
      [#1]
      [  \v!concept=>\chardef\conceptmode\plusone,% simple banner
            \v!file=>\chardef\conceptmode\plustwo,% full banner
-      \v!voorlopig=>\chardef\conceptmode\plustwo % full banner plus
+      \v!temporary=>\chardef\conceptmode\plustwo % full banner plus
                     \overfullrule5\points]}      % info in the margin
 
-\def\versie
-  {\dosingleargument\doversie}
+\def\version
+  {\dosingleargument\doversion}
 
 %\def\addstatusinfo
 %  {\ifvoorlopig
@@ -1054,11 +1068,11 @@
    \fi}
 
 \def\doaddstatusinfo#1%
-  {\setbox#1\vbox to \papierhoogte
+  {\setbox#1\vbox to \paperheight
      {\vsmashbox#1\box#1%
       \offinterlineskip
-      \vskip\kopwit
-      \hsize\papierbreedte
+      \vskip\topspace
+      \hsize\paperwidth
       \hfill\hbox{\plaatstestinfo\hskip.5cm}\vss
       \settexthoffset\hskip\texthoffset % brrrr
      %\tlap{\plaatsversieaanduiding}\vskip.5cm}}
@@ -1103,7 +1117,7 @@
 
 \def\plaatstestinfo
   {\ifvoorlopig
-     \vbox to \zethoogte
+     \vbox to \makeupheight
        {\forgetall
         \infofont
         \hsize10em
@@ -1127,7 +1141,7 @@
         \vss}
    \fi}
 
-\versie[\v!definitief]
+\version[\v!final]
 
 \newif\ifinpagebody
 
@@ -1175,21 +1189,21 @@
    \processaction
      [#1]%
      [\v!reset=>\chardef\showgridstate\zerocount,
-     %\v!onder=>\chardef\showgridstate\plusone,
-      \v!boven=>\chardef\showgridstate\plustwo]}
+     %\v!bottom=>\chardef\showgridstate\plusone,
+      \v!top=>\chardef\showgridstate\plustwo]}
 
 \def\buildpagebox#1%
-  {\setbox#1\vbox to \papierhoogte
-     {\hsize\papierbreedte
-      \vskip\kopwit
+  {\setbox#1\vbox to \paperheight
+     {\hsize\paperwidth
+      \vskip\topspace
       \doifbothsides
-        \hskip\rugwit
+        \hskip\backspace
       \orsideone
-        \hskip\rugwit
+        \hskip\backspace
       \orsidetwo
-        \hskip\papierbreedte
-        \hskip-\rugwit
-        \hskip-\zetbreedte
+        \hskip\paperwidth
+        \hskip-\backspace
+        \hskip-\makeupwidth
       \od
       \box#1}%
    \dp#1\zeropoint}
@@ -1233,7 +1247,7 @@
 
 % beware, \??ly is used before defined, i.e. bad module design
 
-\setuplayout[\c!methode=\v!normaal]
+\setuplayout[\c!method=\v!normal]
 
 \def\buildpagebody#1#2%
   {\ifsavepagebody\global\setbox\savedpagebody\fi
@@ -1241,18 +1255,18 @@
      {\beginrestorecatcodes
       \forgetall  % igv problemen, check: \boxmaxdepth\maxdimen
       \boxmaxdepth\maxdimen % new
-      \mindermeldingen
+      \dontcomplain
       % the following plugin uses and sets pagebox; beware: this
       % will change and is for my (hh) personal experiments
-      \executeifdefined{\??ly\c!methode\@@lymethode}%
-        {\getvalue{\??ly\c!methode\v!normaal}}#1#2%
+      \executeifdefined{\??ly\c!method\@@lymethod}%
+        {\getvalue{\??ly\c!method\v!normal}}#1#2%
       % the finishing touch
       \ifcase\pageornamentstate
         \addpagebackground \pagebox
       \fi
       \registerpageposition\pagebox
       \ifarrangingpages
-        \shiftpaperpagebox \pagebox % \v!papier
+        \shiftpaperpagebox \pagebox % \v!paper
       \else
         \clippagebox       \pagebox
         \addpagecutmarks   \pagebox
@@ -1265,7 +1279,7 @@
         \addprintbackground\pagebox
         \mirrorprintbox    \pagebox
         \rotateprintbox    \pagebox
-        \shiftprintpagebox \pagebox % \v!pagina
+        \shiftprintpagebox \pagebox % \v!page
         \offsetprintbox    \pagebox
         \negateprintbox    \pagebox
       \fi
@@ -1273,12 +1287,12 @@
       \endrestorecatcodes}%
    \ifsavepagebody\copy\savedpagebody\fi}
 
-\setvalue{\??ly\c!methode\v!normaal}#1#2%
+\setvalue{\??ly\c!method\v!normal}#1#2%
   {\setbox\pagebox\vbox
      {\offinterlineskip
       \ifcase\pageornamentstate
         \bgroup % else footnotes get inconsistent font/baseline
-          \dostartattributes\??ly\c!letter\c!kleur\empty
+          \dostartattributes\??ly\c!style\c!color\empty
             \offinterlineskip
             \gettextboxes
           \dostopattributes
@@ -1316,7 +1330,7 @@
    \starttextproperties
    \gotonextsubpage  % nog eens: als in pagina (tbv standaard opmaak)
    \dontshowboxes    % dan hier blokkeren en verderop resetten
-   \naastpagina
+%    \shipoutfacingpage
    \checkreferences
    \checkmargeblokken
    \dotoks\beforeeverypage
@@ -1410,7 +1424,7 @@
 % was: \resetsectionmarks\firstsection, zie \handelpaginaaf
 
 \def\page  {\pagebreak} % the short form of \pagebreak (mult-com one)
-\def\pagina{\pagebreak} % for the moment, keep this one
+\def\page{\pagebreak} % for the moment, keep this one
 
 \def\resetpagebreak
   {\global\paginageblokkeerdfalse}
@@ -1451,7 +1465,7 @@
    \iffirstargument % or if empty i.e. []
      \flushnotes\executepagebreakhandlers{#1}%
    \else % so, no pagebreak when \pagebreak[] ! ! !
-     \flushnotes\executepagebreakhandler\v!ja
+     \flushnotes\executepagebreakhandler\v!yes
    \fi
    \ifnum\prevrealpageno<\realpageno
      \global\chardef\pageornamentstate\zerocount
@@ -1466,8 +1480,8 @@
    \gotonextpage
    \ejectdummypage}
 
-\installpagebreakhandler \v!kader
-  {\page\bgroup\showframe\page[\v!leeg]\egroup}
+\installpagebreakhandler \v!frame
+  {\page\bgroup\showframe\page[\v!empty]\egroup}
 
 \installpagebreakhandler \s!unknown
   {\doifinstringelse{+}\@@pagespecification
@@ -1492,59 +1506,59 @@
   {% better not: \global\chardef\pageornamentstate\zerocount
    \resetpagebreak}
 
-\installpagebreakhandler \v!blokkeer
+\installpagebreakhandler \v!disable
   {\global\paginageblokkeerdtrue}
 
-\installpagebreakhandler \v!ja
+\installpagebreakhandler \v!yes
   {\ifpaginageblokkeerd\else
      \ejectinsert
      \gotonextpage
-     \ifbinnenkolommen % this will move to MUL
+     \ifinsidecolumns % this will move to MUL
        \ejectpage  % anders soms geen overgang
      \fi
    \fi}
 
-\installpagebreakhandler \v!opmaak % ??
+\installpagebreakhandler \v!makeup % ??
   {\ifpaginageblokkeerd\else
      \eject
    \fi}
 
-\installpagebreakhandler \v!blanko
+\installpagebreakhandler \v!blank
   {\ifcase\pageornamentstate
      \global\chardef\pageornamentstate\plusone
    \fi}
 
-\installpagebreakhandler \v!nee
+\installpagebreakhandler \v!no
   {\ifpaginageblokkeerd\else
      \dosomebreak\nobreak
    \fi}
 
-\installpagebreakhandler \v!voorkeur
+\installpagebreakhandler \v!preference
   {\ifpaginageblokkeerd\else
-     \ifbinnenkolommen % this will move to MUL
+     \ifinsidecolumns % this will move to MUL
        \dosomebreak\goodbreak
      \else
        \testpage[3][\zeropoint]%
      \fi
     \fi}
 
-\installpagebreakhandler \v!grotevoorkeur
+\installpagebreakhandler \v!bigpreference
   {\ifpaginageblokkeerd\else
-     \ifbinnenkolommen % this will move to MUL
+     \ifinsidecolumns % this will move to MUL
        \dosomebreak\goodbreak
      \else
        \testpage[5][\zeropoint]%
      \fi
    \fi}
 
-\installpagebreakhandler \v!leeg
+\installpagebreakhandler \v!empty
   {\ejectinsert
    \gotonextpage
-   \doifnotvalue{\??tk\v!hoofd\c!status}\v!stop{\setupheader[\c!status=\v!leeg]}%
-   \doifnotvalue{\??tk\v!voet \c!status}\v!stop{\setupfooter[\c!status=\v!leeg]}%
+   \doifnotvalue{\??tk\v!header\c!state}\v!stop{\setupheader[\c!state=\v!empty]}%
+   \doifnotvalue{\??tk\v!footer \c!state}\v!stop{\setupfooter[\c!state=\v!empty]}%
    \ejectdummypage}
 
-\installpagebreakhandler \v!links
+\installpagebreakhandler \v!left
   {\ejectinsert
    \gotonextpageX % will become \gotonextpage
    \doifbothsidesoverruled
@@ -1554,7 +1568,7 @@
    \orsidetwo
    \od}
 
-\installpagebreakhandler \v!rechts
+\installpagebreakhandler \v!right
   {\ejectinsert
    \gotonextpageX % will become \gotonextpage
    \doifbothsidesoverruled
@@ -1565,14 +1579,14 @@
    \od}
 
 \installpagebreakhandler \v!even
-  {\pagina
+  {\page
    \doifoddpageelse{\resetcurrentsectionmarks\ejectdummypage}\donothing}
 
-\installpagebreakhandler \v!oneven
-  {\pagina
+\installpagebreakhandler \v!odd
+  {\page
    \doifoddpageelse\donothing{\resetcurrentsectionmarks\ejectdummypage}}
 
-\installpagebreakhandler \v!viertal % not yet ok inside columnsets
+\installpagebreakhandler \v!quadruple % not yet ok inside columnsets
   {\ifdubbelzijdig
      \!!counta\realpageno
      \!!countb\realpageno
@@ -1580,18 +1594,18 @@
      \divide\!!countb 2
      \ifnum\!!counta=\!!countb
      \else
-       \executepagebreakhandler\v!ja
-       \executepagebreakhandler\v!leeg
-       \executepagebreakhandler\v!leeg
+       \executepagebreakhandler\v!yes
+       \executepagebreakhandler\v!empty
+       \executepagebreakhandler\v!empty
      \fi
    \fi}
 
-\installpagebreakhandler \v!laatste
+\installpagebreakhandler \v!last
   {\ejectinsert
    \gotonextpageX % will become \gotonextpage
    \relax
    \doifbothsidesoverruled
-     \naastpagina
+     \shipoutfacingpage
    \orsideone
    \orsidetwo
      \noheaderandfooterlines
@@ -1607,11 +1621,11 @@
 
 % nb: \executepagebreakhandler\v!hoofd in other ones
 
-\installpagebreakhandler \v!hoofd
-  {\doifnotvalue{\??tk\v!hoofd\c!status}\v!stop{\setupheader[\c!status=\v!leeg]}}
+\installpagebreakhandler \v!header
+  {\doifnotvalue{\??tk\v!header\c!state}\v!stop{\setupheader[\c!state=\v!empty]}}
 
-\installpagebreakhandler \v!voet
-  {\doifnotvalue{\??tk\v!voet \c!status}\v!stop{\setupfooter[\c!status=\v!leeg]}}
+\installpagebreakhandler \v!footer
+  {\doifnotvalue{\??tk\v!footer \c!state}\v!stop{\setupfooter[\c!state=\v!empty]}}
 
 % \definepagebreak
 %   [chapter]
@@ -1662,7 +1676,7 @@
 \definecomplexorsimple\columnbreak
 
 \def\simplecolumnbreak
-  {\executecolumnbreakhandler\v!ja}
+  {\executecolumnbreakhandler\v!yes}
 
 \def\complexcolumnbreak[#1]% if empty, do nothing and avoid processing
   {\doifsomething{#1}{\executecolumnbreakhandlers{#1}}}
@@ -1710,13 +1724,12 @@
 
 \let\selectie   \empty
 \let\paginasoort\empty
-\let\naastpagina\relax
 \let\napagina   \relax
 \let\voorpagina \relax
 
 \def\dodovoorpagina#1%
   {\global\let\voorpagina\relax
-   \getvalue{\??pg#1\c!voor}}
+   \getvalue{\??pg#1\c!before}}
 
 \def\dovoorpagina
   {\doifsomething\paginasoort
@@ -1725,10 +1738,10 @@
 \def\dododonapagina#1%
   {\global\let\napagina\relax
    \global\let\paginasoort\empty
-   \getvalue{\??pg#1\c!na}}
+   \getvalue{\??pg#1\c!after}}
 
 \def\dodonapagina#1%
-  {\doifelsevalue{\??pg#1\c!optie}\v!dubbelzijdig
+  {\doifelsevalue{\??pg#1\c!option}\v!doublesided
      {\doifbothsidesoverruled
         \dododonapagina{#1}%
       \orsideone
@@ -1744,7 +1757,7 @@
 % Dit wordt eigenlijk nooit en moet worden vervangen door
 % het meer algemene mechanisme.
 
-\def\dosoortpagina[#1]%
+\def\dopagetype[#1]%
   {\edef\desoortpagina{#1}%
    \ifx\desoortpagina\empty \else
      \@EA\doglobal\@EA\addtocommalist\@EA{\desoortpagina}\paginasoort
@@ -1756,38 +1769,38 @@
      \gdef\napagina  {\donapagina  }%
    \fi}
 
-\def\soortpagina
-  {\dosingleargument\dosoortpagina}
+\def\pagetype
+  {\dosingleargument\dopagetype}
 
-\def\dokoppelpagina[#1][#2]%
+\def\docouplepage[#1][#2]%
   {\getparameters
      [\??pg]
-     [\c!voor=,
-      \c!na=,
-      \c!optie=,
+     [\c!before=,
+      \c!after=,
+      \c!option=,
       #2]%
    \def\docommando##1%
      {\getparameters
         [\??pg##1]
-        [\c!voor=\@@pgvoor,
-         \c!na=\@@pgna,
-         \c!optie=\@@pgoptie]}%
+        [\c!before=\@@pgbefore,
+         \c!after=\@@pgafter,
+         \c!option=\@@pgoption]}%
    \processcommalist[#1]\docommando}%
 
-\def\koppelpagina
-  {\dodoubleargument\dokoppelpagina}
+\def\couplepage
+  {\dodoubleargument\docouplepage}
 
-\def\doverwerkpagina[#1][#2]%
+\def\doprocesspage[#1][#2]%
   {\processaction
      [#2]
-     [ \v!ja=>\global\verwerkentrue,
-      \v!nee=>\global\verwerkenfalse]%
+     [ \v!yes=>\global\verwerkentrue,
+      \v!no=>\global\verwerkenfalse]%
    \gdef\selectie{#1}%
    \global\selecterentrue
    \global\geselecteerdfalse}
 
-\def\verwerkpagina
-  {\dodoubleargument\doverwerkpagina}
+\def\processpage
+  {\dodoubleargument\doprocesspage}
 
 \def\resetselectiepagina
   {\ifselecteren
@@ -1835,4 +1848,66 @@
      \box#3%
    \egroup}
 
-\protect \endinput
\ No newline at end of file
+%D \macros
+%D   {setupoppositeplacing,startopposite}
+%D
+%D \starttyping
+%D \starttext
+%D test \startopposite \blackrule[width=3cm,height=4cm] \stopopposite test
+%D test \startopposite \blackrule[width=3cm,height=4cm] \stopopposite test
+%D \stoptext
+%D \stoptyping
+
+% Moved from page-mar.tex, made english, cleaned up, but still to be
+% redesigned
+
+\newbox\facingpage
+
+\def\setupoppositeplacing
+  {\dodoubleargument\getparameters[\??np]}
+
+\def\startopposite
+  {\dowithnextboxcontent
+     {\hsize\makeupwidth}%
+     {\global\setbox\facingpage\vbox
+        {\ifvoid\facingpage
+           \@@npbefore
+         \else
+           \@@npinbetween
+           \unvbox\facingpage
+         \fi
+         \box\nextbox}}%
+     \vbox\bgroup}
+
+\def\stopopposite
+  {\egroup}
+
+\def\finishfacingpage
+  {\ifvoid\facingpage\else
+     \global\setbox\facingpage\vbox to \makeupheight
+       {\unvbox\facingpage
+        \@@npafter
+        \vss}%
+   \fi}
+
+\def\shipoutfacingpage
+  {\doif\@@npstate\v!start
+     {\ifvoid\facingpage\else
+        \ifnum\realpageno>\plusone
+          \bgroup
+          \chardef\pageornamentstate\plusone
+          \finishfacingpage
+          \myshipout{\buildpagebody\box\facingpage}%
+          \egroup
+        \else
+          \global\setbox\facingpage\emptybox
+        \fi
+      \fi}}
+
+\setupoppositeplacing
+  [\c!state=\v!start,
+   \c!before=,
+   \c!inbetween=\blank,
+   \c!after=]
+
+\protect \endinput
diff --git a/tex/context/base/page-lay.tex b/tex/context/base/page-lay.tex
index 309471878..5fe19b87d 100644
--- a/tex/context/base/page-lay.tex
+++ b/tex/context/base/page-lay.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-lay,
+%D   [       filefile=page-lay,
 %D        version=2000.10.20, % copied from main-001
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Layout Specification,
@@ -13,8 +13,6 @@
 
 \writestatus{loading}{Context Page Macros / Layout Specification}
 
-% swapmargins will disappear, and be replaced by inner/outer
-
 % to be translated into english
 
 % hoofdhoogte wordt bij status=hoog niet aangepast op outer
@@ -40,37 +38,37 @@
 %D The dimensions related to layout areas are represented by
 %D real dimensions.
 
-\newdimen\papierhoogte       \papierhoogte         = 297mm
-\newdimen\papierbreedte      \papierbreedte        = 210mm
+\newdimen\paperheight       \paperheight         = 297mm
+\newdimen\paperwidth      \paperwidth        = 210mm
 
-\newdimen\printpapierhoogte  \printpapierhoogte    = \papierhoogte
-\newdimen\printpapierbreedte \printpapierbreedte   = \papierbreedte
+\newdimen\printpaperheight  \printpaperheight    = \paperheight
+\newdimen\printpaperwidth \printpaperwidth   = \paperwidth
 
-\newdimen\zethoogte                                % calculated
-\newdimen\zetbreedte                               % calculated
+\newdimen\makeupheight                                % calculated
+\newdimen\makeupwidth                               % calculated
 
-\newdimen\teksthoogte                              % calculated
-\newdimen\tekstbreedte                             % calculated
+\newdimen\textheight                              % calculated
+\newdimen\textwidth                             % calculated
 
-\newdimen\kopwit              \kopwit              = 2cm
-\newdimen\rugwit              \rugwit              = \kopwit
-\newdimen\snijwit             \snijwit             = 0pt
-\newdimen\bodemwit            \bodemwit            = 0pt
+\newdimen\topspace              \topspace              = 2cm
+\newdimen\backspace              \backspace              = \topspace
+\newdimen\cutspace             \cutspace             = 0pt
+\newdimen\bottomspace            \bottomspace            = 0pt
 
-\newdimen\hoofdhoogte         \hoofdhoogte         = 2cm
-\newdimen\voethoogte          \voethoogte          = \hoofdhoogte
+\newdimen\headerheight         \headerheight         = 2cm
+\newdimen\footerheight          \footerheight          = \headerheight
 
 \newdimen\kopoffset           \kopoffset           = 0pt
 \newdimen\rugoffset           \rugoffset           = \kopoffset
 
-\newdimen\linkermargebreedte  \linkermargebreedte  = 3cm
-\newdimen\rechtermargebreedte \rechtermargebreedte = \linkermargebreedte
+\newdimen\leftmarginwidth  \leftmarginwidth  = 3cm
+\newdimen\rightmarginwidth \rightmarginwidth = \leftmarginwidth
 
-\newdimen\linkerrandbreedte   \linkerrandbreedte   = 3cm
-\newdimen\rechterrandbreedte  \rechterrandbreedte  = \linkerrandbreedte
+\newdimen\leftedgewidth   \leftedgewidth   = 3cm
+\newdimen\rightedgewidth  \rightedgewidth  = \leftedgewidth
 
-\newdimen\bovenhoogte         \bovenhoogte         = 0cm
-\newdimen\onderhoogte         \onderhoogte         = \bovenhoogte
+\newdimen\topheight         \topheight         = 0cm
+\newdimen\bottomheight         \bottomheight         = \topheight
 
 \newcount\layoutlines         \layoutlines         = 0
 \newcount\layoutcolumns       \layoutcolumns       = 0
@@ -148,121 +146,54 @@
 %D couple of backgrounds only (which is far less than one
 %D percent on a normal document).
 
-\newif\iffixedlayoutdimensions \fixedlayoutdimensionstrue
-
-\iffixedlayoutdimensions
-  \let\@the\the
-\else
-  \let\@the\empty
-\fi
-
 %D The next series of dimensions are complemented by left
 %D and rights ones.
 
-\iffixedlayoutdimensions
-
-  \newdimen \margeafstand
-  \newdimen \randafstand
-  \newdimen \margebreedte
-  \newdimen \randbreedte
-
-\else
-
-  \def\margeafstand{\layoutparameter\c!margeafstand}
-  \def\randafstand {\layoutparameter\c!randafstand}
-  \def\margebreedte{\layoutparameter\c!marge}
-  \def\randbreedte {\layoutparameter\c!rand}
-
-\fi
+\newdimen \margindistance
+\newdimen \edgedistance
+\newdimen \marginwidth
+\newdimen \edgewidth
 
 %D Because a distance does not really makes sense when there
 %D is no area, we use a zero distance in case there is no
 %D area.
 
-\iffixedlayoutdimensions
-
-  \def\layoutdistance#1#2%
-    {\ifdim\zeropoint<#1\layoutparameter#2\else\zeropoint  \fi}
-
-\else
-
-  \def\layoutdistance#1#2%
-    {\ifdim\zeropoint<#1\layoutparameter#2\else\!!zeropoint\fi}
-
-\fi
+\def\layoutdistance#1#2%
+  {\ifdim\zeropoint<#1\layoutparameter#2\else\zeropoint\fi}
 
 %D The horizontal distances are:
 
-\iffixedlayoutdimensions
-
-  \newdimen \linkerrandafstand
-  \newdimen \rechterrandafstand
-  \newdimen \linkermargeafstand
-  \newdimen \rechtermargeafstand
-
-\else
-
-  \def\linkerrandafstand
-    {\layoutdistance\linkerrandbreedte\c!linkerrandafstand}
-
-  \def\rechterrandafstand
-    {\layoutdistance\rechterrandbreedte\c!rechterrandafstand}
-
-  \def\linkermargeafstand
-    {\layoutdistance\linkermargebreedte\c!linkermargeafstand}
-
-  \def\rechtermargeafstand
-    {\layoutdistance\rechtermargebreedte\c!rechtermargeafstand}
-
-\fi
+\newdimen \leftedgedistance
+\newdimen \rightedgedistance
+\newdimen \leftmargindistance
+\newdimen \rightmargindistance
 
 %D The vertical distances are:
 
-\iffixedlayoutdimensions
-
-  \newdimen \bovenafstand
-  \newdimen \hoofdafstand
-  \newdimen \voetafstand
-  \newdimen \onderafstand
-
-\else
-
-  \def\bovenafstand{\layoutdistance\bovenhoogte\c!bovenafstand}
-  \def\hoofdafstand{\layoutdistance\hoofdhoogte\c!hoofdafstand}
-  \def\voetafstand {\layoutdistance\voethoogte \c!voetafstand }
-  \def\onderafstand{\layoutdistance\onderhoogte\c!onderafstand}
-
-\fi
-
-%D When fixed dimensions are used, we need to calculate the
-%D distances:
-
-\iffixedlayoutdimensions
-
-  \def\setlayoutdimensions
-    {\global\margebreedte       \layoutparameter\c!marge
-     \global\randbreedte        \layoutparameter\c!rand
-     \global\margeafstand       \layoutparameter\c!margeafstand
-     \global\randafstand        \layoutparameter\c!randafstand
-     \global\linkerrandafstand  \layoutdistance \linkerrandbreedte  \c!linkerrandafstand
-     \global\rechterrandafstand \layoutdistance \rechterrandbreedte \c!rechterrandafstand
-     \global\linkermargeafstand \layoutdistance \linkermargebreedte \c!linkermargeafstand
-     \global\rechtermargeafstand\layoutdistance \rechtermargebreedte\c!rechtermargeafstand
-     \global\bovenafstand       \layoutdistance \bovenhoogte        \c!bovenafstand
-     \global\hoofdafstand       \layoutdistance \hoofdhoogte        \c!hoofdafstand
-     \global\voetafstand        \layoutdistance \voethoogte         \c!voetafstand
-     \global\onderafstand       \layoutdistance \onderhoogte        \c!onderafstand}
-
-  \def\setlayoutdistances % local in \setreducedvsize
-    {\hoofdafstand\layoutdistance\hoofdhoogte\c!hoofdafstand
-     \voetafstand \layoutdistance\voethoogte \c!voetafstand}
-
-\else
-
-  \let\setlayoutdimensions\relax
-  \let\setlayoutdistance  \relax
-
-\fi
+\newdimen \topdistance
+\newdimen \headerdistance
+\newdimen \footerdistance
+\newdimen \bottomdistance
+
+%D We need to calculate the extra distances:
+
+\def\setlayoutdimensions
+  {\global\marginwidth       \layoutparameter\c!margin
+   \global\edgewidth        \layoutparameter\c!edge
+   \global\margindistance       \layoutparameter\c!margindistance
+   \global\edgedistance        \layoutparameter\c!edgedistance
+   \global\leftedgedistance  \layoutdistance \leftedgewidth  \c!leftedgedistance
+   \global\rightedgedistance \layoutdistance \rightedgewidth \c!rightedgedistance
+   \global\leftmargindistance \layoutdistance \leftmarginwidth \c!leftmargindistance
+   \global\rightmargindistance\layoutdistance \rightmarginwidth\c!rightmargindistance
+   \global\topdistance       \layoutdistance \topheight        \c!topdistance
+   \global\headerdistance       \layoutdistance \headerheight        \c!headerdistance
+   \global\footerdistance        \layoutdistance \footerheight         \c!footerdistance
+   \global\bottomdistance       \layoutdistance \bottomheight        \c!bottomdistance}
+
+\def\setlayoutdistances % local in \setreducedvsize
+  {\headerdistance\layoutdistance\headerheight\c!headerdistance
+   \footerdistance \layoutdistance\footerheight \c!footerdistance}
 
 %D \macros
 %D   {definepapersize}
@@ -281,8 +212,8 @@
   {\ifsecondargument
      \doifsomething{#1} % to be sure
        {\getparameters
-          [\??pp#1] % geen \c!schaal, scheelt hash ruimte
-          [\c!breedte=\@@ppbreedte,\c!hoogte=\@@pphoogte,\c!offset=\@@ppoffset,#2]}%
+          [\??pp#1] % geen \c!scale, scheelt hash ruimte
+          [\c!width=\@@ppwidth,\c!height=\@@ppheight,\c!offset=\@@ppoffset,#2]}%
    \else
      \getparameters[\??pp][#1]%
      \setuppapersize
@@ -298,7 +229,7 @@
 %D paper.
 
 \definepapersize
-  [\c!breedte=210mm,\c!hoogte=297mm,\c!offset=\!!zeropoint]
+  [\c!width=210mm,\c!height=297mm,\c!offset=\!!zeropoint]
 
 %D \macros
 %D   {setuppaper,setuppapersize}
@@ -332,16 +263,16 @@
 % which is handy in 'example' when we use setups
 
 \def\setuppaper[#1]%
-  {\getparameters[\??pp][\c!papier=,\c!pagina=,#1]%
+  {\getparameters[\??pp][\c!paper=,\c!page=,#1]%
    \scratchcounter\@@ppnx
    \multiply\scratchcounter\@@ppny
    \edef\@@ppxy{\the\scratchcounter}%
-   \doifelsenothing\@@pppagina
-     {\doifsomething\@@pppapier
-        {\dodosetuppapersize[\papersize][\@@pppapier]}}
-     {\doifelsenothing\@@pppapier
-        {\dodosetuppapersize[\@@pppagina][\printpapersize]}
-        {\dodosetuppapersize[\@@pppagina][\@@pppapier]}}}
+   \doifelsenothing\@@pppage
+     {\doifsomething\@@pppaper
+        {\dodosetuppapersize[\papersize][\@@pppaper]}}
+     {\doifelsenothing\@@pppaper
+        {\dodosetuppapersize[\@@pppage][\printpapersize]}
+        {\dodosetuppapersize[\@@pppage][\@@pppaper]}}}
 
 \def\setuppapersize
   {\dodoubleempty\dosetuppapersize}
@@ -353,66 +284,6 @@
         {\getparameters[\??pp#1][#2]}
         {\dodosetuppapersize[#1][#2]}}}
 
-% \def\dodosetuppapersize[#1][#2]%
-%   {\ifsecondargument
-%      \xdef\restorepapersize
-%        {\noexpand\setuppapersize[#1][#2]}%
-%      \dostelpapierrichtingin{#1}\paperlandscape\paperrotation\paperreverse\papermirror
-%      \dostelpapierrichtingin{#2}\printlandscape\printrotation\printreverse\printmirror
-%      \def\docommando##1%
-%        {\doifsomething{##1}{\doifdefined{\??pp##1\c!breedte}
-%           {\global\papierbreedte\getvalue{\??pp##1\c!breedte}%
-%            \global\papierhoogte\getvalue{\??pp##1\c!hoogte}%
-%            \calculatepaperoffsets{##1}%
-%            \xdef\papersize{##1}}}}%
-%      \processcommacommand[#1]\docommando
-%      \doifdefinedelse{\??pp#1\c!schaal}
-%        {\edef\paperscale{\getvalue{\??pp#1\c!schaal}}}
-%        {\edef\paperscale{1}}%
-%      \def\docommando##1%
-%        {\doifsomething{##1}{\doifdefined{\??pp##1\c!breedte}
-%           {\global\printpapierbreedte\getvalue{\??pp##1\c!breedte}%
-%            \global\printpapierhoogte\getvalue{\??pp##1\c!hoogte}%
-%            \xdef\printpapersize{##1}}}}%
-%      \processcommacommand[#2]\docommando
-%      \global\setdimentoatleast\papierbreedte     \onepoint
-%      \global\setdimentoatleast\papierhoogte      \onepoint
-%      \global\setdimentoatleast\printpapierbreedte\onepoint
-%      \global\setdimentoatleast\printpapierhoogte \onepoint
-%      \ifcase\paperlandscape\else
-%        \doglobal\swapdimens\papierbreedte\papierhoogte
-%      \fi
-%      \ifcase\printlandscape\else
-%        \doglobal\swapdimens\printpapierbreedte\printpapierhoogte
-%      \fi
-%      % this check can be confusing, so we've added the possibility
-%      % to bypass this test: \setuppapersize[option=fit]
-%      \doif\@@ppoptie\v!max % \v!fit is
-%        {\bgroup
-%         % we need to pre-swap else we get the wrong paper size
-%         \doifinset\paperrotation{90,270}{\swapdimens\papierbreedte\papierhoogte}%
-%         \doifinset\printrotation{90,270}{\swapdimens\printpapierbreedte\printpapierhoogte}%
-%         \ifdim\papierhoogte>\printpapierhoogte
-%           \global\printpapierhoogte\papierhoogte
-%           \writestatus\m!systems{print height forced to paper height}%
-%         \fi
-%         \ifdim\papierbreedte>\printpapierbreedte
-%           \global\printpapierbreedte\papierbreedte
-%           \writestatus\m!systems{print width forced to paper width}%
-%         \fi
-%         \egroup}%
-%      %
-%      \calculatehsizes
-%      \calculatevsizes
-%      \recalculatelogos
-%      \recalculatebackgrounds
-%      \recalculatelayout
-%    \else\iffirstargument
-%      \setuppapersize[#1][#2]%
-%    \else\ifx\papersize\undefined\else
-%      \restorepapersize
-%    \fi\fi\fi}
-
 \def\dodosetuppapersize[#1][#2]%
   {\ifsecondargument
      \dododosetuppapersize[#1][#2]%
@@ -433,44 +304,44 @@
    \dostelpapierrichtingin{#1}\paperlandscape\paperrotation\paperreverse\papermirror
    \dostelpapierrichtingin{#2}\printlandscape\printrotation\printreverse\printmirror
    \def\docommando##1%
-     {\doifsomething{##1}{\doifdefined{\??pp##1\c!breedte}
-        {\global\papierbreedte\getvalue{\??pp##1\c!breedte}%
-         \global\papierhoogte\getvalue{\??pp##1\c!hoogte}%
+     {\doifsomething{##1}{\doifdefined{\??pp##1\c!width}
+        {\global\paperwidth\getvalue{\??pp##1\c!width}%
+         \global\paperheight\getvalue{\??pp##1\c!height}%
          \calculatepaperoffsets{##1}%
          \xdef\papersize{##1}}}}%
    \processcommacommand[#1]\docommando
-   \doifdefinedelse{\??pp#1\c!schaal}
-     {\edef\paperscale{\getvalue{\??pp#1\c!schaal}}}
+   \doifdefinedelse{\??pp#1\c!scale}
+     {\edef\paperscale{\getvalue{\??pp#1\c!scale}}}
      {\edef\paperscale{1}}%
    \def\docommando##1%
-     {\doifsomething{##1}{\doifdefined{\??pp##1\c!breedte}
-        {\global\printpapierbreedte\getvalue{\??pp##1\c!breedte}%
-         \global\printpapierhoogte\getvalue{\??pp##1\c!hoogte}%
+     {\doifsomething{##1}{\doifdefined{\??pp##1\c!width}
+        {\global\printpaperwidth\getvalue{\??pp##1\c!width}%
+         \global\printpaperheight\getvalue{\??pp##1\c!height}%
          \xdef\printpapersize{##1}}}}%
    \processcommacommand[#2]\docommando
-   \global\setdimentoatleast\papierbreedte     \onepoint
-   \global\setdimentoatleast\papierhoogte      \onepoint
-   \global\setdimentoatleast\printpapierbreedte\onepoint
-   \global\setdimentoatleast\printpapierhoogte \onepoint
+   \global\setdimentoatleast\paperwidth     \onepoint
+   \global\setdimentoatleast\paperheight      \onepoint
+   \global\setdimentoatleast\printpaperwidth\onepoint
+   \global\setdimentoatleast\printpaperheight \onepoint
    \ifcase\paperlandscape\else
-     \doglobal\swapdimens\papierbreedte\papierhoogte
+     \doglobal\swapdimens\paperwidth\paperheight
    \fi
    \ifcase\printlandscape\else
-     \doglobal\swapdimens\printpapierbreedte\printpapierhoogte
+     \doglobal\swapdimens\printpaperwidth\printpaperheight
    \fi
    % this check can be confusing, so we've added the possibility
    % to bypass this test: \setuppapersize[option=fit]
-   \doif\@@ppoptie\v!max % \v!fit is
+   \doif\@@ppoption\v!max % \v!fit is
      {\bgroup
       % we need to pre-swap else we get the wrong paper size
-      \doifinset\paperrotation{90,270}{\swapdimens\papierbreedte\papierhoogte}%
-      \doifinset\printrotation{90,270}{\swapdimens\printpapierbreedte\printpapierhoogte}%
-      \ifdim\papierhoogte>\printpapierhoogte
-        \global\printpapierhoogte\papierhoogte
+      \doifinset\paperrotation{90,270}{\swapdimens\paperwidth\paperheight}%
+      \doifinset\printrotation{90,270}{\swapdimens\printpaperwidth\printpaperheight}%
+      \ifdim\paperheight>\printpaperheight
+        \global\printpaperheight\paperheight
         \writestatus\m!systems{print height forced to paper height}%
       \fi
-      \ifdim\papierbreedte>\printpapierbreedte
-        \global\printpapierbreedte\papierbreedte
+      \ifdim\paperwidth>\printpaperwidth
+        \global\printpaperwidth\paperwidth
         \writestatus\m!systems{print width forced to paper width}%
       \fi
       \egroup}}
@@ -483,10 +354,10 @@
    \global\negateprintboxfalse
    \processallactionsinset
      [#1]
-     [   \v!liggend=>\global\chardef#2\plusone,
-      \v!gespiegeld=>\global\chardef#5\plusone,
-       \v!geroteerd=>\gdef#3{90}\gdef#4{270},
-        \v!negatief=>\global\negateprintboxtrue,
+     [   \v!landscape=>\global\chardef#2\plusone,
+      \v!mirrored=>\global\chardef#5\plusone,
+       \v!rotated=>\gdef#3{90}\gdef#4{270},
+        \v!negative=>\global\negateprintboxtrue,
                  90=>\gdef#3{90}\gdef#4{270},
                 180=>\gdef#3{180}\gdef#4{0},
                 270=>\gdef#3{270}\gdef#4{90}]}
@@ -495,8 +366,8 @@
 
   \def\calculatepaperoffsets#1%
     {\scratchdimen\getvalue{\??pp#1\c!offset}%
-     \global\advance\papierbreedte -2\scratchdimen
-     \global\advance\papierhoogte  -2\scratchdimen}
+     \global\advance\paperwidth -2\scratchdimen
+     \global\advance\paperheight  -2\scratchdimen}
 
 \fi
 
@@ -518,25 +389,25 @@
 
 
 \def\recalculatelayout
-  {\doifsomething{\layoutparameter\c!pagina\layoutparameter\c!papier}
-     {\dododosetuppapersize[\layoutparameter\c!pagina][\layoutparameter\c!papier]}%
+  {\doifsomething{\layoutparameter\c!page\layoutparameter\c!paper}
+     {\dododosetuppapersize[\layoutparameter\c!page][\layoutparameter\c!paper]}%
    \dorecalculatelayout}
 
 \def\dorecalculatelayout
   {%\the\everybeforelayout
    \setups[\layoutparameter\c!preset]%
-   \global\linkermargebreedte \layoutparameter\c!linkermarge
-   \global\rechtermargebreedte\layoutparameter\c!rechtermarge
-   \global\linkerrandbreedte  \layoutparameter\c!linkerrand
-   \global\rechterrandbreedte \layoutparameter\c!rechterrand
-   \global\hoofdhoogte        \layoutparameter\c!hoofd
-   \global\voethoogte         \layoutparameter\c!voet
-   \global\onderhoogte        \layoutparameter\c!onder
-   \global\bovenhoogte        \layoutparameter\c!boven
-   \global\rugwit             \layoutparameter\c!rugwit
-   \global\kopwit             \layoutparameter\c!kopwit
+   \global\leftmarginwidth \layoutparameter\c!leftmargin
+   \global\rightmarginwidth\layoutparameter\c!rightmargin
+   \global\leftedgewidth   \layoutparameter\c!leftedge
+   \global\rightedgewidth  \layoutparameter\c!rightedge
+   \global\headerheight    \layoutparameter\c!header
+   \global\footerheight    \layoutparameter\c!footer
+   \global\bottomheight    \layoutparameter\c!bottom
+   \global\topheight       \layoutparameter\c!top
+   \global\backspace       \layoutparameter\c!backspace
+   \global\topspace        \layoutparameter\c!topspace
    \setlayoutdimensions % the rest of the `dimensions'
-   \doifelse\@@lygrid\v!ja\gridsnappingtrue\gridsnappingfalse
+   \doifelse\@@lygrid\v!yes\gridsnappingtrue\gridsnappingfalse
    \ifgridsnapping
      \setsystemmode\v!grid
    \else
@@ -545,79 +416,79 @@
    \setups[\layoutparameter\c!setups]% depends on gridsnapping !
    \simplesetupwhitespace
    \simplesetupblank
-   \global\snijwit\layoutparameter\c!snijwit
+   \global\cutspace\layoutparameter\c!cutspace
    \relax
-   \doifelse{\layoutparameter\c!breedte}\v!midden
-     {\ifdim\snijwit=\zeropoint
-        \global\snijwit\rugwit
+   \doifelse{\layoutparameter\c!width}\v!middle
+     {\ifdim\cutspace=\zeropoint
+        \global\cutspace\backspace
       \fi
-      \global\zetbreedte\papierbreedte
-      \global\advance\zetbreedte -\rugwit
-      \global\advance\zetbreedte -\snijwit}
-     {\doifelse{\layoutparameter\c!breedte}\v!passend
-        {\ifdim\snijwit=\zeropoint
-           \global\snijwit\rugwit
+      \global\makeupwidth\paperwidth
+      \global\advance\makeupwidth -\backspace
+      \global\advance\makeupwidth -\cutspace}
+     {\doifelse{\layoutparameter\c!width}\v!fit
+        {\ifdim\cutspace=\zeropoint
+           \global\cutspace\backspace
          \fi
-         \global\zetbreedte\papierbreedte
-         \global\advance\zetbreedte -\snijwit
-         \scratchdimen\rugwit
-         \advance\scratchdimen -\linkerrandbreedte
-         \advance\scratchdimen -\linkerrandafstand
-         \advance\scratchdimen -\linkermargebreedte
-         \advance\scratchdimen -\linkermargeafstand\relax
+         \global\makeupwidth\paperwidth
+         \global\advance\makeupwidth -\cutspace
+         \scratchdimen\backspace
+         \advance\scratchdimen -\leftedgewidth
+         \advance\scratchdimen -\leftedgedistance
+         \advance\scratchdimen -\leftmarginwidth
+         \advance\scratchdimen -\leftmargindistance\relax
          \ifdim\scratchdimen<\zeropoint
            \scratchdimen\zeropoint
          \fi
-         \global\advance\zetbreedte -\rechtermargeafstand
-         \global\advance\zetbreedte -\rechtermargebreedte
-         \global\advance\zetbreedte -\rechterrandafstand
-         \global\advance\zetbreedte -\rechterrandbreedte
-         \global\advance\zetbreedte -\scratchdimen}
-        {\global\zetbreedte\layoutparameter\c!breedte\relax
-         \ifdim\snijwit=\zeropoint
-           \global\snijwit\papierbreedte
-           \global\advance\snijwit-\zetbreedte
-           \global\advance\snijwit-\rugwit
+         \global\advance\makeupwidth -\rightmargindistance
+         \global\advance\makeupwidth -\rightmarginwidth
+         \global\advance\makeupwidth -\rightedgedistance
+         \global\advance\makeupwidth -\rightedgewidth
+         \global\advance\makeupwidth -\scratchdimen}
+        {\global\makeupwidth\layoutparameter\c!width\relax
+         \ifdim\cutspace=\zeropoint
+           \global\cutspace\paperwidth
+           \global\advance\cutspace-\makeupwidth
+           \global\advance\cutspace-\backspace
         % \else
             % A kind of inconsistent specification, but used
             % in for instance s-pre-19.tex; the cutspace is
             % used only for determining some kind of right
             % margin; don't use this in doublesided mode
          \fi}}%
-   \scratchdimen\layoutparameter\c!bodemwit\relax
+   \scratchdimen\layoutparameter\c!bottomspace\relax
   %\ifdim\scratchdimen=\zeropoint
-  %  \scratchdimen\kopwit
+  %  \scratchdimen\topspace
   %\fi
-   \global\bodemwit\layoutparameter\c!bodemwit\relax
-   \global\layoutlines0\number\layoutparameter\c!regels\relax % may be empty
+   \global\bottomspace\layoutparameter\c!bottomspace\relax
+   \global\layoutlines0\number\layoutparameter\c!lines\relax % may be empty
    \ifcase\layoutlines
-     \doifelse{\layoutparameter\c!hoogte}\v!midden
-       {\ifdim\bodemwit=\zeropoint
-          \global\bodemwit\kopwit
+     \doifelse{\layoutparameter\c!height}\v!middle
+       {\ifdim\bottomspace=\zeropoint
+          \global\bottomspace\topspace
         \fi
-        \global\zethoogte\papierhoogte
-        \global\advance\zethoogte -\kopwit
-        \global\advance\zethoogte -\bodemwit}
-       {\doifelse{\layoutparameter\c!hoogte}\v!passend
-          {\ifdim\bodemwit=\zeropoint
-            \global\bodemwit\kopwit
+        \global\makeupheight\paperheight
+        \global\advance\makeupheight -\topspace
+        \global\advance\makeupheight -\bottomspace}
+       {\doifelse{\layoutparameter\c!height}\v!fit
+          {\ifdim\bottomspace=\zeropoint
+            \global\bottomspace\topspace
            \fi
-           \global\zethoogte\papierhoogte
-           \global\advance\zethoogte -\bodemwit
-           \scratchdimen\kopwit
-           \advance\scratchdimen -\bovenhoogte
-           \advance\scratchdimen -\bovenafstand\relax
+           \global\makeupheight\paperheight
+           \global\advance\makeupheight -\bottomspace
+           \scratchdimen\topspace
+           \advance\scratchdimen -\topheight
+           \advance\scratchdimen -\topdistance\relax
            \ifdim\scratchdimen<\zeropoint
              \scratchdimen\zeropoint
            \fi
-           \global\advance\zethoogte -\onderafstand
-           \global\advance\zethoogte -\onderhoogte
-           \global\advance\zethoogte -\scratchdimen}
-          {\global\zethoogte\layoutparameter\c!hoogte\relax
-           \ifdim\bodemwit=\zeropoint
-             \global\bodemwit\papierhoogte
-             \global\advance\bodemwit-\zethoogte
-             \global\advance\bodemwit-\kopwit
+           \global\advance\makeupheight -\bottomdistance
+           \global\advance\makeupheight -\bottomheight
+           \global\advance\makeupheight -\scratchdimen}
+          {\global\makeupheight\layoutparameter\c!height\relax
+           \ifdim\bottomspace=\zeropoint
+             \global\bottomspace\paperheight
+             \global\advance\bottomspace-\makeupheight
+             \global\advance\bottomspace-\topspace
            \else
              % inconsistent specification
            \fi}}%
@@ -626,23 +497,24 @@
      % a global lineheight is tricky: should we take the bodyfont interlinespace or the one set
      % independent of the bodyfont (before or after a layout spec); way too fuzzy, so we
      % stick to the current method (after a night of experimenting ...2003/10/13)
-     \global\zethoogte\layoutparameter\c!regels\lineheight
+     \global\makeupheight\layoutparameter\c!lines\lineheight
      % new, cleaner
-     \global\advance\zethoogte-\strutheight
-     \global\advance\zethoogte \topskip
+     \global\advance\makeupheight-\strutheight
+     \global\advance\makeupheight \topskip
      % new, was a bug
-     \global\advance\zethoogte \hoofdafstand
-     \global\advance\zethoogte \voetafstand
+     \global\advance\makeupheight \headerdistance
+     \global\advance\makeupheight \footerdistance
      % so far
-     \global\advance\zethoogte \hoofdhoogte
-     \global\advance\zethoogte \voethoogte
+     \global\advance\makeupheight \headerheight
+     \global\advance\makeupheight \footerheight
    \fi
-   \rugoffset\layoutparameter\c!rugoffset
-   \kopoffset\layoutparameter\c!kopoffset
-   \global\setdimentoatleast\zetbreedte\onepoint
-   \global\setdimentoatleast\zethoogte \onepoint
+   \rugoffset\layoutparameter\c!horoffset
+   \kopoffset\layoutparameter\c!veroffset
+   \global\setdimentoatleast\makeupwidth\onepoint
+   \global\setdimentoatleast\makeupheight \onepoint
    % \checkcurrentlayout % here ?
    % \the\everyafterlayout
+   \calculatelayoutextras
    \calculatehsizes
    \calculatevsizes
    \calculatepseudocolumns
@@ -650,12 +522,16 @@
    \recalculatelogos
    \recalculatebackgrounds}
 
+\newtoks\extralayoutcalculations
+
+\def\calculatelayoutextras{\the\extralayoutcalculations}
+
 \def\calculatepseudocolumns
-  {\global\layoutcolumns\layoutparameter\c!kolommen
-   \global\layoutcolumndistance\layoutparameter\c!kolomafstand
+  {\global\layoutcolumns\layoutparameter\c!columns
+   \global\layoutcolumndistance\layoutparameter\c!columndistance
    \global\layoutcolumnwidth-\layoutcolumns\layoutcolumndistance
    \global\advance\layoutcolumnwidth\layoutcolumndistance
-   \global\advance\layoutcolumnwidth\zetbreedte
+   \global\advance\layoutcolumnwidth\makeupwidth
    \global\divide\layoutcolumnwidth\layoutcolumns
    \dorecurse\layoutcolumns
      {\scratchdimen\layoutcolumnwidth
@@ -673,30 +549,10 @@
   {\executeifdefined{\??ly:c:#1}\!!zeropoint}
 
 \def\checklayout
-  {\ifdim\zethoogte=\layoutlines\lineheight \else \recalculatelayout \fi}
+  {\ifdim\makeupheight=\layoutlines\lineheight \else \recalculatelayout \fi}
 
 \appendtoks \checklayout \to \everystarttext
 
-% \def\checkcurrentlayout % public and used in naw, so keep this name
-%   {\ifundefined{\??ly\realfolio\c!status}%
-%      \doifoddpageelse\checkcurrentoddlayout\checkcurrentevenlayout
-%    \else
-%      \doifvalue{\??ly\realfolio\c!status}\v!start
-%        {\edef\currentlayout{\realfolio}\recalculatelayout}%
-%    \fi}
-
-% \def\checkcurrentoddlayout
-%   {\ifundefined{\??ly\v!oneven\c!status}\else
-%      \doifvalue{\??ly\v!oneven\c!status}\v!start
-%        {\let\currentlayout\v!oneven\recalculatelayout}%
-%    \fi}
-
-% \def\checkcurrentevenlayout
-%   {\ifundefined{\??ly\v!even\c!status}\else
-%      \doifvalue{\??ly\v!even\c!status}\v!start
-%        {\let\currentlayout\v!even\recalculatelayout}%
-%    \fi}
-
 % document:
 %
 % \setuplayout[odd][state=stop] \setuplayout[even][state=stop] \setuplayout[page]
@@ -704,22 +560,22 @@
 % \startstandardmakeup[page=blank] ... \stopstandardmakeup
 
 \def\checkcurrentlayout % public and used in naw, so keep this name
-  {\ifundefined{\??ly\realfolio\c!status}%
+  {\ifundefined{\??ly\realfolio\c!state}%
      \doifoddpageelse\checkcurrentoddlayout\checkcurrentevenlayout
    \else
-     \doifvalue{\??ly\realfolio\c!status}\v!start
+     \doifvalue{\??ly\realfolio\c!state}\v!start
        {\xdef\currentlayout{\realfolio}\recalculatelayout}% new, global
    \fi}
 
 \def\checkcurrentoddlayout
-  {\ifundefined{\??ly\v!oneven\c!status}\else
-     \doifvalue{\??ly\v!oneven\c!status}\v!start
-       {\globallet\currentlayout\v!oneven\recalculatelayout}% new, global
+  {\ifundefined{\??ly\v!odd\c!state}\else
+     \doifvalue{\??ly\v!odd\c!state}\v!start
+       {\globallet\currentlayout\v!odd\recalculatelayout}% new, global
    \fi}
 
 \def\checkcurrentevenlayout
-  {\ifundefined{\??ly\v!even\c!status}\else
-     \doifvalue{\??ly\v!even\c!status}\v!start
+  {\ifundefined{\??ly\v!even\c!state}\else
+     \doifvalue{\??ly\v!even\c!state}\v!start
        {\globallet\currentlayout\v!even\recalculatelayout}% new, global
    \fi}
 
@@ -730,20 +586,20 @@
 \def\presetcenterpagebox % in \setuplayout !!!!!!!!!!!!!!!!
   {\doublesidedprintfalse
    \ExpandFirstAfter\processallactionsinset
-     [\@@lyplaats]
-     [      \v!midden=>{\setuppapersize[\c!links=\hss,\c!rechts=\hss,\c!boven=\vss,\c!onder=\vss]},
-             \v!links=>{\setuppapersize[\c!links=,\c!rechts=\hss]},
-            \v!rechts=>{\setuppapersize[\c!links=\hss,\c!rechts=]},
-             \v!onder=>{\setuppapersize[\c!boven=\vss,\c!onder=]},
-             \v!boven=>{\setuppapersize[\c!boven=,\c!onder=\vss]},%
-      \v!dubbelzijdig=>\doublesidedprinttrue,
-       \v!enkelzijdig=>\doublesidedprintfalse]}
+     [\@@lylocation]
+     [      \v!middle=>{\setuppapersize[\c!left=\hss,\c!right=\hss,\c!top=\vss,\c!bottom=\vss]},
+             \v!left=>{\setuppapersize[\c!left=,\c!right=\hss]},
+            \v!right=>{\setuppapersize[\c!left=\hss,\c!right=]},
+             \v!bottom=>{\setuppapersize[\c!top=\vss,\c!bottom=]},
+             \v!top=>{\setuppapersize[\c!top=,\c!bottom=\vss]},%
+      \v!doublesided=>\doublesidedprinttrue,
+       \v!singlesided=>\doublesidedprintfalse]}
 
 \def\definelayout
   {\dodoubleargument\dodefinelayout}
 
 \def\dodefinelayout[#1][#2]%
-  {\getparameters[\??ly#1][\c!status=\v!start,#2]}
+  {\getparameters[\??ly#1][\c!state=\v!start,#2]}
 
 \def\dodosetuplayout[#1][#2]%
   {\ConvertToConstant\doifnot{#2}\v!reset % #2 ?
@@ -781,16 +637,16 @@
 \def\setuplayout
   {\dodoubleempty\dosetuplayout}
 
-\let\@@zahoogte=\!!zeropoint
+\let\@@zaheight=\!!zeropoint
 
 \def\dopushpagedimensions
-  {\xdef\oldteksthoogte{\the\teksthoogte}%
-   \xdef\oldvoethoogte {\the\voethoogte}%
-   \global\let\@@zahoogte\@@zahoogte}
+  {\xdef\oldteksthoogte{\the\textheight}%
+   \xdef\oldvoethoogte {\the\footerheight}%
+   \global\let\@@zaheight\@@zaheight}
 
 \def\dopoppagedimensions
-  {\global\teksthoogte\oldteksthoogte
-   \global\voethoogte\oldvoethoogte
+  {\global\textheight\oldteksthoogte
+   \global\footerheight\oldvoethoogte
    \recalculatelayout
    \global\let\pushpagedimensions\dopushpagedimensions
    \global\let\poppagedimensions\relax}
@@ -819,26 +675,26 @@
 
 \def\reportpagedimensions
   {\ifx\poppagedimensions\relax \else
-     \spatie\@@zahoogte\space-\space
+     \space\@@zaheight\space-\space
    \fi
    \realfolio}
 
-\def\dodopaslayoutaan[#1]%
-  {\getparameters[\??za][\c!hoogte=,\c!regels=0,#1]%
+\def\dodoadaptlayout[#1]%
+  {\getparameters[\??za][\c!height=,\c!lines=0,#1]%
    \pushpagedimensions
-   \ifcase\@@zaregels\relax
-     \showmessage\m!layouts1{\@@zahoogte,\realfolio}%
+   \ifcase\@@zalines\relax
+     \showmessage\m!layouts1{\@@zaheight,\realfolio}%
    \else
-     \showmessage\m!layouts1{\@@zaregels\space\v!regels,\realfolio}%
-     \def\@@zahoogte{\@@zaregels\openlineheight}%
+     \showmessage\m!layouts1{\@@zalines\space\v!lines,\realfolio}%
+     \def\@@zaheight{\@@zalines\openlineheight}%
    \fi
-   \doifelse\@@zahoogte\v!max
-     {\balancedimensions\teksthoogte\voethoogte\voethoogte}
-     {\balancedimensions\teksthoogte\voethoogte\@@zahoogte}%
-   \ifdim\voethoogte<\zeropoint
-     \global\advance\teksthoogte \voethoogte
-     \global\voethoogte\zeropoint
-     \global\xdef\@@zahoogte{\layoutparameter\c!voet\spatie(\v!max)}%
+   \doifelse\@@zaheight\v!max
+     {\balancedimensions\textheight\footerheight\footerheight}
+     {\balancedimensions\textheight\footerheight\@@zaheight}%
+   \ifdim\footerheight<\zeropoint
+     \global\advance\textheight \footerheight
+     \global\footerheight\zeropoint
+     \global\xdef\@@zaheight{\layoutparameter\c!footer\space(\v!max)}%
    \fi
    \setvsize
    \global\pagegoal\vsize  % nog corrigeren voor insertions ?
@@ -847,17 +703,17 @@
    \global\let\pushpagedimensions\relax
    \global\let\poppagedimensions\dopoppagedimensions}
 
-\def\dopaslayoutaan[#1][#2]%
+\def\doadaptlayout[#1][#2]%
   {\doifelsenothing{#2}
-     {\dodopaslayoutaan[#1]}
+     {\dodoadaptlayout[#1]}
      {\def\docommando##1%
         {\addtocommalist{##1}\adaptedpages
-         \setgvalue{\??za##1}{\dodopaslayoutaan[#2]}}%
+         \setgvalue{\??za##1}{\dodoadaptlayout[#2]}}%
       \processcommalist[#1]\docommando
       \adaptpagedimensions}}
 
-\def\paslayoutaan%
-  {\dodoubleempty\dopaslayoutaan}
+\def\adaptlayout%
+  {\dodoubleempty\doadaptlayout}
 
 % describe interface
 
@@ -866,19 +722,19 @@
 %D {right} parameters.
 
 \def\centerpagebox#1%
-  {\printpapierbreedte\paperscale\printpapierbreedte
-   \printpapierhoogte \paperscale\printpapierhoogte
-   \setbox#1\vbox to \printpapierhoogte
-     {\@@ppboven
-      \hbox to \printpapierbreedte
+  {\printpaperwidth\paperscale\printpaperwidth
+   \printpaperheight \paperscale\printpaperheight
+   \setbox#1\vbox to \printpaperheight
+     {\@@pptop
+      \hbox to \printpaperwidth
         {\ifdoublesidedprint
-           \doifbothsides \@@pplinks \box#1\@@pprechts
-           \orsideone     \@@pplinks \box#1\@@pprechts
-           \orsidetwo     \@@pprechts\box#1\@@pplinks
-         \od \else        \@@pplinks \box#1\@@pprechts
+           \doifbothsides \@@ppleft \box#1\@@ppright
+           \orsideone     \@@ppleft \box#1\@@ppright
+           \orsidetwo     \@@ppright\box#1\@@ppleft
+         \od \else        \@@ppleft \box#1\@@ppright
          \fi}%
       \par
-      \@@pponder}}
+      \@@ppbottom}}
 
 \def\offsetprintbox#1%
   {\ifdim\kopoffset=\zeropoint % \relax
@@ -965,11 +821,11 @@
   {\mirrorpagebodybox{#1}\printmirror}
 
 \def\scalepagebox#1%
-  {\ifdim\@@lyschaal\points=\onepoint \else
+  {\ifdim\@@lyscale\points=\onepoint \else
      \setbox#1\vbox
-       {\schaal[\c!sx=\@@lyschaal,\c!sy=\@@lyschaal]{\box#1}}%
-     \papierbreedte\@@lyschaal\papierbreedte
-     \papierhoogte \@@lyschaal\papierhoogte
+       {\scale[\c!sx=\@@lyscale,\c!sy=\@@lyscale]{\box#1}}%
+     \paperwidth\@@lyscale\paperwidth
+     \paperheight \@@lyscale\paperheight
    \fi}
 
 \def\negateprintbox#1%
@@ -993,18 +849,18 @@
    \makecutbox}
 
 \def\addpagecutmarks % #1
-  {\doifelse\@@lymarkering\v!aan
+  {\doifelse\@@lymarking\v!on
      \makepagecutbox
-     {\doifelse\@@lymarkering\v!tekst
+     {\doifelse\@@lymarking\v!text
         {\let\pagecutmarksymbol\empty
          \let\pagecutmarkbottomtext\extrapagecutmarkbottomtext
          \makepagecutbox}
         \gobbleoneargument}}
 
 \def\addpagecolormarks % #1
-  {\doifelse\@@lymarkering\v!kleur
+  {\doifelse\@@lymarking\v!color
      {\doaddpagecolormarks\colormarkbox}
-     {\doifelse\@@lymarkering\v!raster
+     {\doifelse\@@lymarking\v!screen
         {\doaddpagecolormarks\rastermarkbox}
         \gobbleoneargument}}
 
@@ -1018,10 +874,10 @@
 \newif\ifenkelzijdig  \enkelzijdigtrue
 
 \def\doifsometextlineelse#1%
-  {\edef\!!stringa{\csname\??tk#1\c!status\endcsname}%
-   \ifx\!!stringa\v!geen
+  {\edef\!!stringa{\csname\??tk#1\c!state\endcsname}%
+   \ifx\!!stringa\v!none
      \@EA\secondoftwoarguments
-   \else\ifx\!!stringa\v!hoog
+   \else\ifx\!!stringa\v!high
      \@EAEAEA\secondoftwoarguments
    \else
      \@EAEAEA\firstoftwoarguments
@@ -1030,48 +886,48 @@
 % NOG EENS NAGAAN WANNEER NU GLOBAL EN WANNEER NIET
 
 \def\calculatevsizes % global needed in \recalculatelayoutregel
-  {\redoglobal\teksthoogte\zethoogte
-   \doifsometextlineelse \v!hoofd
-     {\redoglobal\advance\teksthoogte -\hoofdhoogte
-      \redoglobal\advance\teksthoogte -\hoofdafstand}%
+  {\redoglobal\textheight\makeupheight
+   \doifsometextlineelse \v!header
+     {\redoglobal\advance\textheight -\headerheight
+      \redoglobal\advance\textheight -\headerdistance}%
      \donothing
-   \doifsometextlineelse \v!voet
-     {\redoglobal\advance\teksthoogte -\voethoogte
-      \redoglobal\advance\teksthoogte -\voetafstand}%
+   \doifsometextlineelse \v!footer
+     {\redoglobal\advance\textheight -\footerheight
+      \redoglobal\advance\textheight -\footerdistance}%
      \donothing
-   \ifzeropt\hoofdhoogte
-     \resetsystemmode\v!hoofd
+   \ifzeropt\headerheight
+     \resetsystemmode\v!header
    \else
-     \setsystemmode\v!hoofd
+     \setsystemmode\v!header
    \fi
-   \ifzeropt\voethoogte
-     \resetsystemmode\v!voet
+   \ifzeropt\footerheight
+     \resetsystemmode\v!footer
    \else
-     \setsystemmode\v!voet
+     \setsystemmode\v!footer
    \fi
    \resetglobal
    \setvsize}
 
 \def\calculatereducedvsizes
-  {\teksthoogte\zethoogte
-   \doifsometextlineelse \v!hoofd
-     {\advance\teksthoogte -\hoofdhoogte
-      \advance\teksthoogte -\hoofdafstand}%
-     {\hoofdhoogte\zeropoint
+  {\textheight\makeupheight
+   \doifsometextlineelse \v!header
+     {\advance\textheight -\headerheight
+      \advance\textheight -\headerdistance}%
+     {\headerheight\zeropoint
       \setlayoutdistances}%
-   \doifsometextlineelse \v!voet
-     {\advance\teksthoogte -\voethoogte
-      \advance\teksthoogte -\voetafstand}%
-     {\voethoogte\zeropoint
+   \doifsometextlineelse \v!footer
+     {\advance\textheight -\footerheight
+      \advance\textheight -\footerdistance}%
+     {\footerheight\zeropoint
       \setlayoutdistances}}
 
-\def\freezetextwidth        % \zetbreedte may be set to \tekstbreedte
-  {\tekstbreedte\zetbreedte % which is a tricky but valid value
-   \doifsomething{\layoutparameter\c!tekstbreedte}%
-     {\tekstbreedte\layoutparameter\c!tekstbreedte}%         % local
-   \doifsomething{\layoutparameter\c!tekstmarge}%
-     {\advance\tekstbreedte-\layoutparameter\c!tekstmarge    % local
-      \advance\tekstbreedte-\layoutparameter\c!tekstmarge}}  % local
+\def\freezetextwidth        % \makeupwidth may be set to \textwidth
+  {\textwidth\makeupwidth % which is a tricky but valid value
+   \doifsomething{\layoutparameter\c!textwidth}%
+     {\textwidth\layoutparameter\c!textwidth}%         % local
+   \doifsomething{\layoutparameter\c!textmargin}%
+     {\advance\textwidth-\layoutparameter\c!textmargin    % local
+      \advance\textwidth-\layoutparameter\c!textmargin}}  % local
 
 \def\calculatehsizes
   {\freezetextwidth
@@ -1137,52 +993,40 @@
 
 \def\settexthoffset
   {\doifbothsides
-     \texthoffset\rugwit
+     \texthoffset\backspace
    \orsideone
-     \texthoffset\rugwit
+     \texthoffset\backspace
    \orsidetwo
-     \texthoffset\papierbreedte
-     \advance\texthoffset-\rugwit
-     \advance\texthoffset-\zetbreedte
+     \texthoffset\paperwidth
+     \advance\texthoffset-\backspace
+     \advance\texthoffset-\makeupwidth
    \od}
 
 \def\goleftonpage
-  {\hskip-\linkermargeafstand
-   \hskip-\linkermargebreedte
-   \hskip-\linkerrandafstand
-   \hskip-\linkerrandbreedte}
-
-\iffixedlayoutdimensions
-
-  \def\doswapmargins
-    {\let\doswapmargins\relax % to prevent local swapping
-     \swapdimens\linkermargeafstand\rechtermargeafstand
-     \swapdimens\linkerrandafstand \rechterrandafstand
-     \swapdimens\linkermargebreedte\rechtermargebreedte
-     \swapdimens\linkerrandbreedte \rechterrandbreedte}
-
-\else
-
-  \def\dodoswapmargins#1#2%
-    {\edef\!!stringa{\layoutparameter#1}%
-     \edef\!!stringb{\layoutparameter#2}%
-     \letvalue{\??ly\currentlayout#1}\!!stringb
-     \letvalue{\??ly\currentlayout#2}\!!stringa}
-
-  \def\doswapmargins
-    {\let\doswapmargins\relax % to prevent local swapping
-     \dodoswapmargins\c!linkermargeafstand\c!rechtermargeafstand
-     \dodoswapmargins\c!linkerrandafstand \c!rechterrandafstand
-     \swapdimens\linkermargebreedte\rechtermargebreedte
-     \swapdimens\linkerrandbreedte \rechterrandbreedte}
+  {\hskip-\leftmargindistance
+   \hskip-\leftmarginwidth
+   \hskip-\leftedgedistance
+   \hskip-\leftedgewidth}
 
-\fi
+\newtoks\everyswapmargins
+
+\appendtoks
+   \swapdimens\leftmargindistance\rightmargindistance
+   \swapdimens\leftedgedistance \rightedgedistance
+   \swapdimens\leftmarginwidth\rightmarginwidth
+   \swapdimens\leftedgewidth \rightedgewidth
+\to \everyswapmargins
 
 \def\doifmarginswapelse#1#2%
   {\doifbothsides#1\orsideone#1\orsidetwo#2\od}
 
 \def\swapmargins
   {\doifmarginswapelse\relax\doswapmargins}
+
+\def\doswapmargins
+  {\let\swapmargins  \relax % to prevent local swapping
+   \let\doswapmargins\relax % to prevent local swapping
+   \the\everyswapmargins}
 
 \def\rightorleftpageaction
   {\ifdubbelzijdig
@@ -1195,38 +1039,28 @@
      \@EA\firstoftwoarguments
    \fi}
 
-\def\outermarginwidth
-  {\rightorleftpageaction\rechtermargebreedte\linkermargebreedte}
-\def\innermarginwidth
-  {\rightorleftpageaction\linkermargebreedte \rechtermargebreedte}
-\def\outermargindistance
-  {\rightorleftpageaction\rechtermargeafstand\linkermargeafstand}
-\def\innermargindistance
-  {\rightorleftpageaction\linkermargeafstand \rechtermargeafstand}
-
-\def\outeredgewidth
-  {\rightorleftpageaction\rechterrandbreedte\linkerrandbreedte}
-\def\inneredgewidth
-  {\rightorleftpageaction\linkerrandbreedte \rechterrandbreedte}
-\def\outeredgedistance
-  {\rightorleftpageaction\rechterrandafstand\linkerrandafstand}
-\def\inneredgedistance
-  {\rightorleftpageaction\linkerrandafstand \rechterrandafstand}
-
-\def\outerspacewidth
-  {\rightorleftpageaction\snijwit\rugwit}
-\def\innerspacewidth
-  {\rightorleftpageaction\rugwit\snijwit}
+\def\outermarginwidth   {\rightorleftpageaction\rightmarginwidth\leftmarginwidth }
+\def\innermarginwidth   {\rightorleftpageaction\leftmarginwidth \rightmarginwidth}
+\def\outermargindistance{\rightorleftpageaction\rightmargindistance\leftmargindistance }
+\def\innermargindistance{\rightorleftpageaction\leftmargindistance \rightmargindistance}
+
+\def\outeredgewidth     {\rightorleftpageaction\rightedgewidth\leftedgewidth }
+\def\inneredgewidth     {\rightorleftpageaction\leftedgewidth \rightedgewidth}
+\def\outeredgedistance  {\rightorleftpageaction\rightedgedistance\leftedgedistance }
+\def\inneredgedistance  {\rightorleftpageaction\leftedgedistance \rightedgedistance}
+
+\def\outerspacewidth    {\rightorleftpageaction\cutspace\backspace }
+\def\innerspacewidth    {\rightorleftpageaction\backspace \cutspace}
 
 \beginETEX \dimexpr
 
-  \def\leftmargintotal {\dimexpr(\linkermargebreedte +\linkermargeafstand )}
-  \def\rightmargintotal{\dimexpr(\rechtermargebreedte+\rechtermargeafstand)}
-  \def\leftedgetotal   {\dimexpr(\linkerrandbreedte  +\linkerrandafstand  )}
-  \def\rightedgetotal  {\dimexpr(\rechterrandbreedte +\rechterrandafstand )}
+  \def\leftmargintotal {\dimexpr(\leftmarginwidth +\leftmargindistance )}
+  \def\rightmargintotal{\dimexpr(\rightmarginwidth+\rightmargindistance)}
+  \def\leftedgetotal   {\dimexpr(\leftedgewidth  +\leftedgedistance  )}
+  \def\rightedgetotal  {\dimexpr(\rightedgewidth +\rightedgedistance )}
 
-  \def\leftsidetotal   {\dimexpr(\linkermargebreedte +\leftedgetotal )}
-  \def\rightsidetotal  {\dimexpr(\rechtermargebreedte+\rightedgetotal)}
+  \def\leftsidetotal   {\dimexpr(\leftmarginwidth +\leftedgetotal )}
+  \def\rightsidetotal  {\dimexpr(\rightmarginwidth+\rightedgetotal)}
 
   \def\leftcombitotal  {\dimexpr(\leftmargintotal +\leftedgetotal )}
   \def\rightcombitotal {\dimexpr(\rightmargintotal+\rightedgetotal)}
@@ -1273,7 +1107,7 @@
 %D \showsetup{\y!showframe}
 %D \showsetup{\y!showlayout}
 %D \showsetup{\y!showsetups}
-%D \showsetup{\y!showmargins}
+%D %showsetup{\y!showmargins}
 
 \fetchruntimecommand \showprint   {page-run}
 \fetchruntimecommand \showframe   {page-run}
@@ -1296,55 +1130,55 @@
 %D depending on the current font setting.
 
 \setuplayout
-  [             \c!kopwit=.08417508418\papierhoogte,  %  2.5cm
-                 \c!boven=\!!zeropoint,
-          \c!bovenafstand=\!!zeropoint,
-                 \c!hoofd=.06734006734\papierhoogte,  %  2.0cm
-          \c!hoofdafstand=\!!zeropoint,
-                \c!hoogte=.84175084175\papierhoogte,  % 25.0cm
-           \c!voetafstand=\layoutparameter\c!hoofdafstand,
-                  \c!voet=.06734006734\papierhoogte,  %  2.0cm
-          \c!onderafstand=\layoutparameter\c!bovenafstand,
-                 \c!onder=\!!zeropoint,
-                \c!rugwit=.11904761905\papierbreedte, %  2.5cm
-                  \c!rand=\!!zeropoint,
-           \c!randafstand=\layoutparameter\c!margeafstand,
-                 \c!marge=.12649983170\papierbreedte, %  snijwit-2*afstand
-          \c!margeafstand=.02008341748\papierbreedte, %  12.0pt
-            \c!linkerrand=\layoutparameter\c!rand,
-     \c!linkerrandafstand=\layoutparameter\c!randafstand,
-           \c!linkermarge=\layoutparameter\c!marge,
-    \c!linkermargeafstand=\layoutparameter\c!margeafstand,
-               \c!breedte=.71428571429\papierbreedte, %  15.0cm
-   \c!rechtermargeafstand=\layoutparameter\c!margeafstand,
-          \c!rechtermarge=\layoutparameter\c!marge,
-    \c!rechterrandafstand=\layoutparameter\c!randafstand,
-           \c!rechterrand=\layoutparameter\c!rand,
-             \c!kopoffset=\!!zeropoint,
-              \c!bodemwit=\!!zeropoint,
-             \c!rugoffset=\!!zeropoint,
-               \c!snijwit=\!!zeropoint,
-          \c!tekstbreedte=, % dangerous option -> centered / local
-            \c!tekstmarge=, % dangerous option -> both sides
-          \c!tekstafstand=\!!zeropoint, % shift down on grid
-                \c!letter=,
-                 \c!kleur=,
-             \c!markering=\v!uit,
-                \c!plaats=, % \v!enkelzijdig, but empty is signal
-                \c!schaal=1,
+  [             \c!topspace=.08417508418\paperheight,  %  2.5cm
+                 \c!top=\!!zeropoint,
+          \c!topdistance=\!!zeropoint,
+                 \c!header=.06734006734\paperheight,  %  2.0cm
+          \c!headerdistance=\!!zeropoint,
+                \c!height=.84175084175\paperheight,  % 25.0cm
+           \c!footerdistance=\layoutparameter\c!headerdistance,
+                  \c!footer=.06734006734\paperheight,  %  2.0cm
+          \c!bottomdistance=\layoutparameter\c!topdistance,
+                 \c!bottom=\!!zeropoint,
+                \c!backspace=.11904761905\paperwidth, %  2.5cm
+                  \c!edge=\!!zeropoint,
+           \c!edgedistance=\layoutparameter\c!margindistance,
+                 \c!margin=.12649983170\paperwidth, %  snijwit-2*afstand
+          \c!margindistance=.02008341748\paperwidth, %  12.0pt
+            \c!leftedge=\layoutparameter\c!edge,
+     \c!leftedgedistance=\layoutparameter\c!edgedistance,
+           \c!leftmargin=\layoutparameter\c!margin,
+    \c!leftmargindistance=\layoutparameter\c!margindistance,
+               \c!width=.71428571429\paperwidth, %  15.0cm
+   \c!rightmargindistance=\layoutparameter\c!margindistance,
+          \c!rightmargin=\layoutparameter\c!margin,
+    \c!rightedgedistance=\layoutparameter\c!edgedistance,
+           \c!rightedge=\layoutparameter\c!edge,
+             \c!veroffset=\!!zeropoint,
+              \c!bottomspace=\!!zeropoint,
+             \c!horoffset=\!!zeropoint,
+               \c!cutspace=\!!zeropoint,
+          \c!textwidth=, % dangerous option -> centered / local
+            \c!textmargin=, % dangerous option -> both sides
+          \c!textdistance=\!!zeropoint, % shift down on grid
+                \c!style=,
+                 \c!color=,
+             \c!marking=\v!off,
+                \c!location=, % \v!singlesided, but empty is signal
+                \c!scale=1,
                     \c!nx=1,
                     \c!ny=1,
                     \c!dx=\!!zeropoint,
                     \c!dy=\!!zeropoint,
-                  \c!grid=\v!nee,
+                  \c!grid=\v!no,
                 \c!preset=,
                 \c!setups=\systemsetupsprefix\s!default,
             \c!clipoffset=\!!zeropoint,
-                \c!regels=0,
-                \c!papier=, % for foxet
-                \c!pagina=, % for foxet
-              \c!kolommen=1,
-          \c!kolomafstand=\!!zeropoint]
+                \c!lines=0,
+                \c!paper=, % for foxet
+                \c!page=, % for foxet
+              \c!columns=1,
+          \c!columndistance=\!!zeropoint]
 
 %D First we define a whole range of (DIN) papersizes,
 %D of which the A-series makes most sense. We enable checking.
@@ -1353,119 +1187,119 @@
 %D positioning the typeset paper onto the print paper.
 
 \setuppaper % (size) % only used in XY imposition
-  [\c!breedte=\zeropoint,
-   \c!hoogte=\zeropoint,
-   \c!kopwit=\zeropoint,
-   \c!rugwit=\zeropoint,
+  [\c!width=\zeropoint,
+   \c!height=\zeropoint,
+   \c!topspace=\zeropoint,
+   \c!backspace=\zeropoint,
    \c!dx=\zeropoint,
    \c!dy=\zeropoint,
    \c!nx=1,
    \c!ny=1]
 
 \setuppapersize
-  [\c!optie=\v!max,
-   \c!boven=,
-   \c!onder=\vss,
-   \c!links=,
-   \c!rechts=\hss]
-
-\definepapersize [A0]  [\c!breedte=841mm,\c!hoogte=1189mm]
-\definepapersize [A1]  [\c!breedte=594mm,\c!hoogte=841mm]
-\definepapersize [A2]  [\c!breedte=420mm,\c!hoogte=594mm]
-\definepapersize [A3]  [\c!breedte=297mm,\c!hoogte=420mm]
-\definepapersize [A4]  [\c!breedte=210mm,\c!hoogte=297mm]
-\definepapersize [A5]  [\c!breedte=148mm,\c!hoogte=210mm]
-\definepapersize [A6]  [\c!breedte=105mm,\c!hoogte=148mm]
-\definepapersize [A7]  [\c!breedte=74mm,\c!hoogte=105mm]
-\definepapersize [A8]  [\c!breedte=52mm,\c!hoogte=74mm]
-\definepapersize [A9]  [\c!breedte=37mm,\c!hoogte=52mm]
-\definepapersize [A10] [\c!breedte=26mm,\c!hoogte=37mm]
-
-\definepapersize [B0]  [\c!breedte=1000mm,\c!hoogte=1414mm]
-\definepapersize [B1]  [\c!breedte=707mm,\c!hoogte=1000mm]
-\definepapersize [B2]  [\c!breedte=500mm,\c!hoogte=707mm]
-\definepapersize [B3]  [\c!breedte=353mm,\c!hoogte=500mm] % [\c!breedte=354mm,\c!hoogte=500mm]
-\definepapersize [B4]  [\c!breedte=250mm,\c!hoogte=353mm] % [\c!breedte=250mm,\c!hoogte=354mm]
-\definepapersize [B5]  [\c!breedte=176mm,\c!hoogte=250mm] % [\c!breedte=177mm,\c!hoogte=250mm]
-\definepapersize [B6]  [\c!breedte=125mm,\c!hoogte=176mm] % [\c!breedte=125mm,\c!hoogte=177mm]
-\definepapersize [B7]  [\c!breedte=88mm,\c!hoogte=125mm]
-\definepapersize [B8]  [\c!breedte=62mm,\c!hoogte=88mm]   % [\c!breedte=63mm,\c!hoogte=88mm]
-\definepapersize [B9]  [\c!breedte=44mm,\c!hoogte=62mm]   % [\c!breedte=44mm,\c!hoogte=63mm]
-\definepapersize [B10] [\c!breedte=31mm,\c!hoogte=44mm]
-
-\definepapersize [C0]  [\c!breedte=917mm,\c!hoogte=1297mm]
-\definepapersize [C1]  [\c!breedte=648mm,\c!hoogte=917mm] % [\c!breedte=649mm,\c!hoogte=917mm]
-\definepapersize [C2]  [\c!breedte=458mm,\c!hoogte=648mm] % [\c!breedte=459mm,\c!hoogte=649mm]
-\definepapersize [C3]  [\c!breedte=324mm,\c!hoogte=458mm] % [\c!breedte=324mm,\c!hoogte=459mm]
-\definepapersize [C4]  [\c!breedte=229mm,\c!hoogte=324mm]
-\definepapersize [C5]  [\c!breedte=162mm,\c!hoogte=229mm]
-\definepapersize [C6]  [\c!breedte=114mm,\c!hoogte=162mm] % [\c!breedte=115mm,\c!hoogte=162mm]
-\definepapersize [C7]  [\c!breedte=81mm,\c!hoogte=114mm]  % [\c!breedte=81mm,\c!hoogte=115mm]
-\definepapersize [C8]  [\c!breedte=57mm,\c!hoogte=81mm]
-\definepapersize [C9]  [\c!breedte=40mm,\c!hoogte=57mm]
-\definepapersize [C10] [\c!breedte=28mm,\c!hoogte=40mm]
+  [\c!option=\v!max,
+   \c!top=,
+   \c!bottom=\vss,
+   \c!left=,
+   \c!right=\hss]
+
+\definepapersize [A0]  [\c!width=841mm,\c!height=1189mm]
+\definepapersize [A1]  [\c!width=594mm,\c!height=841mm]
+\definepapersize [A2]  [\c!width=420mm,\c!height=594mm]
+\definepapersize [A3]  [\c!width=297mm,\c!height=420mm]
+\definepapersize [A4]  [\c!width=210mm,\c!height=297mm]
+\definepapersize [A5]  [\c!width=148mm,\c!height=210mm]
+\definepapersize [A6]  [\c!width=105mm,\c!height=148mm]
+\definepapersize [A7]  [\c!width=74mm,\c!height=105mm]
+\definepapersize [A8]  [\c!width=52mm,\c!height=74mm]
+\definepapersize [A9]  [\c!width=37mm,\c!height=52mm]
+\definepapersize [A10] [\c!width=26mm,\c!height=37mm]
+
+\definepapersize [B0]  [\c!width=1000mm,\c!height=1414mm]
+\definepapersize [B1]  [\c!width=707mm,\c!height=1000mm]
+\definepapersize [B2]  [\c!width=500mm,\c!height=707mm]
+\definepapersize [B3]  [\c!width=353mm,\c!height=500mm] % [\c!width=354mm,\c!height=500mm]
+\definepapersize [B4]  [\c!width=250mm,\c!height=353mm] % [\c!width=250mm,\c!height=354mm]
+\definepapersize [B5]  [\c!width=176mm,\c!height=250mm] % [\c!width=177mm,\c!height=250mm]
+\definepapersize [B6]  [\c!width=125mm,\c!height=176mm] % [\c!width=125mm,\c!height=177mm]
+\definepapersize [B7]  [\c!width=88mm,\c!height=125mm]
+\definepapersize [B8]  [\c!width=62mm,\c!height=88mm]   % [\c!width=63mm,\c!height=88mm]
+\definepapersize [B9]  [\c!width=44mm,\c!height=62mm]   % [\c!width=44mm,\c!height=63mm]
+\definepapersize [B10] [\c!width=31mm,\c!height=44mm]
+
+\definepapersize [C0]  [\c!width=917mm,\c!height=1297mm]
+\definepapersize [C1]  [\c!width=648mm,\c!height=917mm] % [\c!width=649mm,\c!height=917mm]
+\definepapersize [C2]  [\c!width=458mm,\c!height=648mm] % [\c!width=459mm,\c!height=649mm]
+\definepapersize [C3]  [\c!width=324mm,\c!height=458mm] % [\c!width=324mm,\c!height=459mm]
+\definepapersize [C4]  [\c!width=229mm,\c!height=324mm]
+\definepapersize [C5]  [\c!width=162mm,\c!height=229mm]
+\definepapersize [C6]  [\c!width=114mm,\c!height=162mm] % [\c!width=115mm,\c!height=162mm]
+\definepapersize [C7]  [\c!width=81mm,\c!height=114mm]  % [\c!width=81mm,\c!height=115mm]
+\definepapersize [C8]  [\c!width=57mm,\c!height=81mm]
+\definepapersize [C9]  [\c!width=40mm,\c!height=57mm]
+\definepapersize [C10] [\c!width=28mm,\c!height=40mm]
 
 %D Per August 2004 the rounding of some (seldom used) sizes
 %D were corrected top the latest DIN specifications. Peter
 %D Rolf came up with these and a few more missing sizes.
 %D Watch out: spaces and slashes!
 
-\definepapersize [4 A0]  [\c!breedte=1682mm,\c!hoogte=2378mm]
-\definepapersize [2 A0]  [\c!breedte=1189mm,\c!hoogte=1682mm]
-\definepapersize [C6/C5] [\c!breedte=114mm,\c!hoogte=229mm]
+\definepapersize [4 A0]  [\c!width=1682mm,\c!height=2378mm]
+\definepapersize [2 A0]  [\c!width=1189mm,\c!height=1682mm]
+\definepapersize [C6/C5] [\c!width=114mm,\c!height=229mm]
 
 %D Because there are no standardized screen sizes, we define
 %D a bunch of sizes with $4:3$ ratios. The \type {S6} size is
 %D nearly as wide as a sheet of \type {A4} paper.
 
-\definepapersize [S3] [\c!breedte=300pt,\c!hoogte=225pt]
-\definepapersize [S4] [\c!breedte=400pt,\c!hoogte=300pt]
-\definepapersize [S5] [\c!breedte=500pt,\c!hoogte=375pt]
-\definepapersize [S6] [\c!breedte=600pt,\c!hoogte=450pt]
-\definepapersize [S8] [\c!breedte=800pt,\c!hoogte=600pt]
-\definepapersize [SW] [\c!breedte=800pt,\c!hoogte=450pt]
-\definepapersize [SM] [\c!breedte=720pt,\c!hoogte=450pt]
+\definepapersize [S3] [\c!width=300pt,\c!height=225pt]
+\definepapersize [S4] [\c!width=400pt,\c!height=300pt]
+\definepapersize [S5] [\c!width=500pt,\c!height=375pt]
+\definepapersize [S6] [\c!width=600pt,\c!height=450pt]
+\definepapersize [S8] [\c!width=800pt,\c!height=600pt]
+\definepapersize [SW] [\c!width=800pt,\c!height=450pt]
+\definepapersize [SM] [\c!width=720pt,\c!height=450pt]
 
 %D These are handy too:
 
-\definepapersize [S33] [\c!breedte=300pt,\c!hoogte=300pt]
-\definepapersize [S44] [\c!breedte=400pt,\c!hoogte=400pt]
-\definepapersize [S55] [\c!breedte=500pt,\c!hoogte=500pt]
-\definepapersize [S66] [\c!breedte=600pt,\c!hoogte=600pt]
+\definepapersize [S33] [\c!width=300pt,\c!height=300pt]
+\definepapersize [S44] [\c!width=400pt,\c!height=400pt]
+\definepapersize [S55] [\c!width=500pt,\c!height=500pt]
+\definepapersize [S66] [\c!width=600pt,\c!height=600pt]
 
 %D One may wonder if \TEX\ should be used for typesetting
 %D \CDROM\ covers, but it does not hurt to have the paper size
 %D ready.
 
-\definepapersize [CD] [\c!breedte=120mm,\c!hoogte=120mm]
+\definepapersize [CD] [\c!width=120mm,\c!height=120mm]
 
 %D The next series is for our English speaking friends who
 %D decided to stick to non metric values. Thanks to Nelson
 %D Beebe for completing the inch based list.
 
-\definepapersize [letter]    [\c!breedte=8.5in,\c!hoogte=11in]
-\definepapersize [ledger]    [\c!breedte=11in,\c!hoogte=17in]
-\definepapersize [tabloid]   [\c!breedte=17in,\c!hoogte=11in]
+\definepapersize [letter]    [\c!width=8.5in,\c!height=11in]
+\definepapersize [ledger]    [\c!width=11in,\c!height=17in]
+\definepapersize [tabloid]   [\c!width=17in,\c!height=11in]
 
-\definepapersize [legal]     [\c!breedte=8.5in,\c!hoogte=14in]
-\definepapersize [folio]     [\c!breedte=8.5in,\c!hoogte=13in]
-\definepapersize [executive] [\c!breedte=7.25in,\c!hoogte=10.5in]
+\definepapersize [legal]     [\c!width=8.5in,\c!height=14in]
+\definepapersize [folio]     [\c!width=8.5in,\c!height=13in]
+\definepapersize [executive] [\c!width=7.25in,\c!height=10.5in]
 
-\definepapersize [A] [\c!breedte=8.5in,\c!hoogte=11in] % 1 sheet
-\definepapersize [B] [\c!breedte=11in,\c!hoogte=17in]  % 2 sheets
-\definepapersize [C] [\c!breedte=17in,\c!hoogte=22in]  % 4 sheets
+\definepapersize [A] [\c!width=8.5in,\c!height=11in] % 1 sheet
+\definepapersize [B] [\c!width=11in,\c!height=17in]  % 2 sheets
+\definepapersize [C] [\c!width=17in,\c!height=22in]  % 4 sheets
 
 %D The next set is for Tobias Burnus, who gave me the sizes.
 
-\definepapersize [envelope 9]  [\c!breedte=8.88in,\c!hoogte=3.88in]
-\definepapersize [envelope 10] [\c!breedte=9.5in,\c!hoogte=4.13in]
-\definepapersize [envelope 11] [\c!breedte=10.38in,\c!hoogte=4.5in]
-\definepapersize [envelope 12] [\c!breedte=11.0in,\c!hoogte=4.75in]
-\definepapersize [envelope 14] [\c!breedte=11.5in,\c!hoogte=5.0in]
-\definepapersize [monarch]     [\c!breedte=7.5in,\c!hoogte=3.88in]
-\definepapersize [check]       [\c!breedte=8.58in,\c!hoogte=3.88in]
-\definepapersize [DL]          [\c!breedte=110mm,\c!hoogte=220mm] % [\c!breedte=220mm,\c!hoogte=110mm]
-\definepapersize [E4]          [\c!breedte=280mm,\c!hoogte=400mm]
+\definepapersize [envelope 9]  [\c!width=8.88in,\c!height=3.88in]
+\definepapersize [envelope 10] [\c!width=9.5in,\c!height=4.13in]
+\definepapersize [envelope 11] [\c!width=10.38in,\c!height=4.5in]
+\definepapersize [envelope 12] [\c!width=11.0in,\c!height=4.75in]
+\definepapersize [envelope 14] [\c!width=11.5in,\c!height=5.0in]
+\definepapersize [monarch]     [\c!width=7.5in,\c!height=3.88in]
+\definepapersize [check]       [\c!width=8.58in,\c!height=3.88in]
+\definepapersize [DL]          [\c!width=110mm,\c!height=220mm] % [\c!width=220mm,\c!height=110mm]
+\definepapersize [E4]          [\c!width=280mm,\c!height=400mm]
 
 %D We can now default to a reasonable size. We match the print
 %D paper size with the typeset paper size. This setting should
@@ -1480,46 +1314,46 @@
 
 \definepapersize
   [oversized]
-  [\c!breedte=\dimexpr(\papierbreedte+1.5cm),
-   \c!hoogte=\dimexpr(\papierhoogte+1.5cm)]
+  [\c!width=\dimexpr(\paperwidth+1.5cm),
+   \c!height=\dimexpr(\paperheight+1.5cm)]
 
 \definepapersize
   [doublesized]
-  [\c!breedte=\dimexpr(\papierbreedte),
-   \c!hoogte=\dimexpr(2\papierhoogte)]
+  [\c!width=\dimexpr(\paperwidth),
+   \c!height=\dimexpr(2\paperheight)]
 
 \definepapersize
   [doubleoversized]
-  [\c!breedte=\dimexpr(\papierhoogte+1.5cm),
-   \c!hoogte=\dimexpr(2\papierbreedte+1.5cm)]
+  [\c!width=\dimexpr(\paperheight+1.5cm),
+   \c!height=\dimexpr(2\paperwidth+1.5cm)]
 
 \endETEX
 
 \definelayout
-  [\v!pagina]
-  [\c!rugwit=\zeropoint,
-   \c!snijwit=\zeropoint,
-   \c!kopwit=\zeropoint,
-   \c!bodemwit=\zeropoint,
-   \c!marge=\zeropoint,
-   \c!rand=\zeropoint,
-   \c!hoofd=\zeropoint,
-   \c!voet=\zeropoint,
-   \c!boven=\zeropoint,
-   \c!onder=\zeropoint,
-   \c!linkermarge=\zeropoint,
-   \c!rechtermarge=\zeropoint,
-   \c!linkerrand=\zeropoint,
-   \c!rechterrand=\zeropoint,
-   \c!tekstafstand=\zeropoint,
-   \c!breedte=\v!midden,
-   \c!hoogte=\v!midden,
-   \c!regels=0,
-   \c!grid=\v!nee]
+  [\v!page]
+  [\c!backspace=\zeropoint,
+   \c!cutspace=\zeropoint,
+   \c!topspace=\zeropoint,
+   \c!bottomspace=\zeropoint,
+   \c!margin=\zeropoint,
+   \c!edge=\zeropoint,
+   \c!header=\zeropoint,
+   \c!footer=\zeropoint,
+   \c!top=\zeropoint,
+   \c!bottom=\zeropoint,
+   \c!leftmargin=\zeropoint,
+   \c!rightmargin=\zeropoint,
+   \c!leftedge=\zeropoint,
+   \c!rightedge=\zeropoint,
+   \c!textdistance=\zeropoint,
+   \c!width=\v!middle,
+   \c!height=\v!middle,
+   \c!lines=0,
+   \c!grid=\v!no]
 
 \definelayout
-  [\v!midden]
-  [\c!breedte=\v!midden,
-   \c!hoogte=\v!midden]
+  [\v!middle]
+  [\c!width=\v!middle,
+   \c!height=\v!middle]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-lin.tex b/tex/context/base/page-lin.tex
index 1d69d18e1..f25096443 100644
--- a/tex/context/base/page-lin.tex
+++ b/tex/context/base/page-lin.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-lin, % copied from main-001
+%D   [       filefile=page-lin, % copied from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Line Numbering,
@@ -15,35 +15,39 @@
 
 \unprotect
 
-\newif\ifinregels % \newif\ifregelnummersinmarge
+\newif\ifnumberinglines
+\newif\iftypesettinglines
+
+\newcount\linenumber
+\newcount\linestepper
 
 \chardef\linenumberlocation=0
 
 \newtoks\beforeeverylinenumbering
 \newtoks\aftereverylinenumbering
 
-\def\stelregelsin
+\def\setuplines
   {\dodoubleargument\getparameters[\??rg]}
 
-\def\startregels
-  {\@@rgvoor
-   \witruimte
-  %\pagina[\v!voorkeur]} gaat mis na koppen, nieuw: later \nobreak
+\def\startlines
+  {\@@rgbefore
+   \whitespace
+  %\page[\v!preference]} gaat mis na koppen, nieuw: later \nobreak
    \begingroup
    \def\@@rgstepyes{\parindent\zeropoint}%
    \def\@@rgstepno {\parindent\zeropoint}%
    \edef\@@rgparindent{\the\parindent}%
    \globallet\@@rglinesteptoggle\!!plusone
    \processaction
-     [\@@rginspringen]
-     [    \v!ja=>\def\@@rgstepyes{\parindent\@@rgparindent}%
+     [\@@rgindenting]
+     [    \v!yes=>\def\@@rgstepyes{\parindent\@@rgparindent}%
                  \def\@@rgstepno {\parindent\@@rgparindent},
-      \v!oneven=>\def\@@rgstepyes{\parindent\zeropoint    }%
+      \v!odd=>\def\@@rgstepyes{\parindent\zeropoint    }%
                  \def\@@rgstepno {\parindent\@@rgparindent},
         \v!even=>\def\@@rgstepno {\parindent\zeropoint    }%
                  \def\@@rgstepyes{\parindent\@@rgparindent}]%
-   \inregelstrue
-   \setupwhitespace[\v!geen]%
+   \typesettinglinestrue
+   \setupwhitespace[\v!none]%
    \obeylines
    \let\checkindentation\relax
    \@@rgstepno
@@ -77,41 +81,37 @@
 %    \fi}                                     % etex
 
 \def\dobetweenthelines
-  {\doifmeaningelse\next\obeyedline\@@rgtussen\donothing}
+  {\doifmeaningelse\next\obeyedline\@@rginbetween\donothing}
 
-\def\stopregels
+\def\stoplines
   {\endgroup
-   \@@rgna}
-
-\newcount\linenumber
-\newcount\linestepper
-\newif\ifinregelnummeren
+   \@@rgafter}
 
 % het gebruik van \setlocalreference scheelt een hash entry
 
 \def\dodoshowlinenumber % for use elsewhere, to be extended
-  {\doschrijfregelnummer
+  {\doplacelinenumber
    \global\advance\linenumber \plusone}
 
-\def\regelweergave
-  {\@@rnlinks\convertnumber\@@rnconversie\linenumber\@@rnrechts}
+\def\completelinenumber
+  {\@@rnleft\convertnumber\@@rnconversion\linenumber\@@rnright}
 
-\def\dostelregelnummerenin[#1]%
-  {\getparameters[\??rn][\c!start=1,\c!stap=1,#1]%
+\def\dosetuplinenumbering[#1]%
+  {\getparameters[\??rn][\c!start=1,\c!step=1,#1]%
    \global\linenumber\plusone}
 
-\def\stelregelnummerenin
-  {\dosingleargument\dostelregelnummerenin}
+\def\setuplinenumbering
+  {\dosingleargument\dosetuplinenumbering}
 
 \def\dostartnummerenLINE
-  {\EveryPar{\schrijfregelnummer}}
+  {\EveryPar{placelinenumber}}
 
 \def\dostopnummerenLINE
   {\the\aftereverylinenumbering
    \egroup}
 
 \def\dostartnummerenVERB
-  {\EveryLine{\schrijfregelnummer}}
+  {\EveryLine{\placelinenumber}}
 
 \def\dostopnummerenVERB
   {\the\aftereverylinenumbering
@@ -119,31 +119,31 @@
 
 \newevery \everylinenumber \relax
 
-\def\dodoschrijfregelnummer
+\def\dodoplacelinenumber
   {% beware of em's, the font is already switched !
    \setbox\scratchbox\hbox
-     {\setbox0\hbox{\@@rncommando{\regelweergave}}\vsmashbox0%
+     {\setbox0\hbox{\@@rncommand{\completelinenumber}}\vsmashbox0%
       \ifcase\linenumberlocation
-        \rlap{\hbox to \@@rnbreedte{\box0\hss}}% was \llap, nog testen !!
+        \rlap{\hbox to \@@rnwidth{\box0\hss}}% was \llap, nog testen !!
       \or
         \inleftmargin
           {\forgetall
-           \doifelse\@@rnbreedte\v!marge
-             {\hsize\linkermargebreedte}{\hsize\@@rnbreedte}%
-           \alignedline\@@rnuitlijnen\v!rechts{\box0\hskip\@@rnafstand}}%
+           \doifelse\@@rnwidth\v!margin
+             {\hsize\leftmarginwidth}{\hsize\@@rnwidth}%
+           \alignedline\@@rnalign\v!right{\box0\hskip\@@rndistance}}%
       \else
         \inrightmargin
           {\forgetall
-           \doifelse\@@rnbreedte\v!marge
-             {\hsize\rechtermargebreedte}{\hsize\@@rnbreedte}%
-           \alignedline\@@rnuitlijnen\v!links{\hskip\@@rnafstand\box0}}%
+           \doifelse\@@rnwidth\v!margin
+             {\hsize\rightmarginwidth}{\hsize\@@rnwidth}%
+           \alignedline\@@rnalign\v!left{\hskip\@@rndistance\box0}}%
       \fi}%
    \vsmashbox\scratchbox
    \box\scratchbox
    \the\everylinenumber}
 
-\def\complexstartregelnummeren[#1]%
-  {\doifnot{#1}\v!verder
+\def\complexstartlinenumbering[#1]%
+  {\doifnot{#1}\v!continue
      {\doifnumberelse{#1}
         {\global\linenumber#1\relax}
         {\doifelsenothing\@@rnstart
@@ -151,97 +151,85 @@
            {\global\linenumber\@@rnstart}}}%
    \chardef\linenumberlocation\zerocount
    \processaction
-     [\@@rnplaats]
-     [  \v!inmarge=>\chardef\linenumberlocation1,
-       \v!inlinker=>\chardef\linenumberlocation1,
-      \v!inrechter=>\chardef\linenumberlocation2,
-          \v!marge=>\chardef\linenumberlocation1]%
-       %  \v!tekst=>\chardef\linenumberlocation0,
+     [\@@rnlocation]
+     [  \v!inmargin=>\chardef\linenumberlocation1,
+       \v!inleft=>\chardef\linenumberlocation1,
+      \v!inright=>\chardef\linenumberlocation2,
+          \v!margin=>\chardef\linenumberlocation1]%
+       %  \v!text=>\chardef\linenumberlocation0,
        %\s!unknown=>\chardef\linenumberlocation0,
        %\s!default=>\chardef\linenumberlocation0]%
    \ifcase\linenumberlocation % text
-     \advance\leftskip \@@rnbreedte\relax
+     \advance\leftskip \@@rnwidth\relax
    \fi
    \chardef\@@rn@@rnmethod
-     \ifprocessingverbatim0\else\ifinregels1\else2\fi\fi
+     \ifprocessingverbatim0\else\iftypesettinglines1\else2\fi\fi
    \processaction
-     [\@@rnmethode]
+     [\@@rnmethod]
      [ \v!type=>\chardef\@@rn@@rnmethod0,
-      \v!regel=>\chardef\@@rn@@rnmethod1,
-      \v!tekst=>\chardef\@@rn@@rnmethod2,
+      \v!line=>\chardef\@@rn@@rnmethod1,
+      \v!text=>\chardef\@@rn@@rnmethod2,
        \v!file=>\chardef\@@rn@@rnmethod3]%
    \ifcase\@@rn@@rnmethod % verbatim, line by line
-     \inregelstrue
+     \typesettinglinestrue
      \let\dostartnummeren\dostartnummerenVERB
-     \let\stopregelnummeren\dostopnummerenVERB
-     \def\schrijfregelnummer
-       {\doschrijfregelnummer
+     \let\stoplinenumbering\dostopnummerenVERB
+     \def\placelinenumber
+       {\doplacelinenumber
         \global\advance\linenumber \plusone}%
    \or % text, line by line
      \let\dostartnummeren\dostartnummerenLINE
-     \let\stopregelnummeren\dostopnummerenLINE
-     \def\schrijfregelnummer
-       {\doschrijfregelnummer
+     \let\stoplinenumbering\dostopnummerenLINE
+     \def\placelinenumber
+       {\doplacelinenumber
         \global\advance\linenumber \plusone}%
    \or % text, whole lot
      \let\dostartnummeren\dostartnummerenPAR
-     \let\stopregelnummeren\dostopnummerenPAR
-     \def\schrijfregelnummer
+     \let\stoplinenumbering\dostopnummerenPAR
+     \def\placelinenumber
        {\global\advance\linenumber \minusone
-        \doschrijfregelnummer}%
+        \doplacelinenumber}%
    \or % verbatim, selective line by line
-     \inregelstrue
+     \typesettinglinestrue
      \let\dostartnummeren\dostartnummerenVERB
-     \let\stopregelnummeren\dostopnummerenVERB
-     \def\schrijfregelnummer
+     \let\stoplinenumbering\dostopnummerenVERB
+     \def\placelinenumber
        {\global\linenumber\verbatimlinenumber
-        \doschrijfregelnummer}%
+        \doplacelinenumber}%
    \fi
    \dostartnummeren}
 
-\def\startregelnummeren
+\def\startlinenumbering
   {\bgroup
    \the\beforeeverylinenumbering
-   \inregelnummerentrue
-   \complexorsimpleempty\startregelnummeren}
+   \numberinglinestrue
+   \complexorsimpleempty\startlinenumbering}
 
-\def\doschrijfregelnummer
+\def\doplacelinenumber
   {\ifnum\linenumber<\@@rnstart\relax
    \else
      \!!counta\linenumber
-     \divide\!!counta \@@rnstap
-     \multiply\!!counta \@@rnstap\relax
+     \divide\!!counta \@@rnstep
+     \multiply\!!counta \@@rnstep\relax
      \ifnum\!!counta=\linenumber
-       \doattributes\??rn\c!letter\c!kleur\dodoschrijfregelnummer
+       \doattributes\??rn\c!style\c!color\dodoplacelinenumber
      \fi
    \fi}
 
-\def\eenregel[#1]%
-  {\regelreferentie0[#1]\ignorespaces}
-
-\def\startregel[#1]%
-  {\regelreferentie1[#1]\ignorespaces}
+\def\someline[#1]%
+  {\dolinereference0[#1]\ignorespaces}
 
-\def\stopregel[#1]%
-  {\removelastspace\regelreferentie2[#1]}
+\def\startline[#1]%
+  {\dolinereference1[#1]\ignorespaces}
 
-% \def\inregellabel#1%
-%   {\doifinstringelse{--}{#1}
-%      {\labeltext{\v!regels}}
-%      {\labeltext{\v!regel}}}
-%
-% \def\inregel#1[#2]%
-%   {\doifelsenothing{#1}
-%      {\in{\inregellabel{\currenttextreference}}[\@@rnprefix#2]}
-%      {\in{#1}[\@@rnprefix#2]}}
-%
-% double labels:
+\def\stopline[#1]%
+  {\removelastspace\dolinereference2[#1]}
 
-\def\inregel#1[#2]%
+\def\inline#1[#2]%
   {\doifelsenothing{#1}
      {\doifinstringelse{--}\currenttextreference
-        {\in{\leftlabeltext\v!regels}{\rightlabeltext\v!regels}[\@@rnprefix#2]}
-        {\in{\leftlabeltext\v!regel }{\rightlabeltext\v!regel }[\@@rnprefix#2]}}
+        {\in{\leftlabeltext\v!lines}{\rightlabeltext\v!lines}[\@@rnprefix#2]}
+        {\in{\leftlabeltext\v!line }{\rightlabeltext\v!line }[\@@rnprefix#2]}}
      {\in{#1}[\@@rnprefix#2]}}
 
 \def\dostartnummerenPAR
@@ -267,26 +255,10 @@
 % 4 yyy yyy yyy yyy yyy xxx xxx <= stop y
 % 5 xxx xxx xxx xxx xxx xxx xxx
 
-%\def\regelreferentie#1[#2]%
-%  {\bgroup
-%   \dimen0\strutdp
-%   \doif{\@@rnrefereren}{\v!aan}
-%     {\doglobal\increment\linereference
-%      % start 1=>(n=y,l=0,p=1)
-%      % stop  2=>(n=y,l=0,p=2)
-%      \setxvalue{lrf:n:\linereference}{\@@rnprefix#2}%
-%      \setxvalue{lrf:l:\linereference}{0}%
-%      \setxvalue{lrf:p:\linereference}{#1}%
-%      \advance\dimen0 by \linereference sp}%
-%   \prewordbreak
-%   \vrule \!!width \!!zeropoint \!!depth \dimen0 \!!height \!!zeropoint
-%   \prewordbreak
-%   \egroup}
-
-\def\regelreferentie#1[#2]%
+\def\dolinereference#1[#2]%
   {\bgroup
    \dimen0=\strutdp
-   \doif\@@rnrefereren\v!aan
+   \doif\@@rnreferencing\v!on
      {\doglobal\increment\linereference
       % start 1=>(n=y,l=0,p=1)
       % stop  2=>(n=y,l=0,p=2)
@@ -303,7 +275,7 @@
    \linestepper\zerocount
    \reshapebox{\global\advance\linestepper \plusone}%
    \global\advance\linenumber \linestepper
-   \doifelse\@@rnrefereren\v!aan
+   \doifelse\@@rnreferencing\v!on
      {\reshapebox % We are going back!
         {\global\advance\linenumber \minusone
          \dimen0=\dp\shapebox
@@ -358,13 +330,13 @@
               \ifdim\dimen0>\zeropoint
                 \dp\shapebox\strutdp
               \fi
-              \schrijfregelnummer\box\shapebox}}% no \strut !
+              \placelinenumber\box\shapebox}}% no \strut !
       \else
-        \reshapebox{\hbox{\schrijfregelnummer\box\shapebox}}% no \strut !
+        \reshapebox{\hbox{\placelinenumber\box\shapebox}}% no \strut !
       \fi}
      {\reshapebox{\global\advance\linenumber \minusone}%
       \global\advance\linenumber \linestepper
-      \reshapebox{\hbox{\schrijfregelnummer\box\shapebox}}}% no \strut !
+      \reshapebox{\hbox{\placelinenumber\box\shapebox}}}% no \strut !
    \global\advance\linenumber \linestepper
    \flushshapebox
    \the\aftereverylinenumbering
@@ -378,25 +350,25 @@
 
 \newcount\internalparagraphnumber
 
-\def\stelparagraafnummerenin%
-  {\dosingleempty\dostelparagraafnummerenin}
+\def\setupparagraphnumbering%
+  {\dosingleempty\dosetupparagraphnumbering}
 
-\def\dostelparagraafnummerenin[#1]%
+\def\dosetupparagraphnumbering[#1]%
   {\getparameters
      [\??ph][#1]%
    \processaction
-     [\@@phstatus]
+     [\@@phstate]
      [\v!start=>\let\showparagraphnumber\doshowparagraphnumberA,
        \v!stop=>\let\showparagraphnumber\relax,
-      \v!regel=>\let\showparagraphnumber\doshowparagraphnumberB,
+      \v!line=>\let\showparagraphnumber\doshowparagraphnumberB,
       \v!reset=>\global\internalparagraphnumber\zerocount
                 \let\showparagraphnumber\doshowparagraphnumberA]}
 
 \def\dodoshowparagraphnumber
   {\global\advance\internalparagraphnumber \plusone
    \inleftmargin % \tf normalizes em
-     {\tf{\doattributes\??ph\c!letter\c!kleur{\the\internalparagraphnumber}}%
-      \kern\@@phafstand}}
+     {\tf{\doattributes\??ph\c!style\c!color{\the\internalparagraphnumber}}%
+      \kern\@@phdistance}}
 
 \def\doshowparagraphnumberA
   {\ifprocessingverbatim
@@ -406,42 +378,42 @@
    \fi}
 
 \def\doshowparagraphnumberB
-  {\ifinregelnummeren
+  {\ifnumberinglines
      \doshowparagraphnumberA
    \fi}
 
-\stelregelnummerenin
-  [\c!methode=,
-   \c!conversie=\v!cijfers,
+\setuplinenumbering
+  [\c!method=,
+   \c!conversion=\v!numbers,
    \c!start=1,
-   \c!stap=1,
-   \c!plaats=\v!marge,
-   \c!letter=,
-   \c!kleur=,
-   \c!breedte=2em,
+   \c!step=1,
+   \c!location=\v!margin,
+   \c!style=,
+   \c!color=,
+   \c!width=2em,
    \c!prefix=,
-   \c!refereren=\v!aan]
+   \c!referencing=\v!on]
 
 % new
 
-\stelregelnummerenin
-  [\c!breedte=\ifcase\linenumberlocation2em\else\v!marge\fi,
-   \c!links=,
-   \c!rechts=,
-   \c!commando=,
-   \c!afstand=\zeropoint,
-   \c!uitlijnen=\ifcase\linenumberlocation\v!rechts\or\v!rechts\or\v!links\fi]
-
-\stelparagraafnummerenin
-  [\c!status=\v!stop,
-   \c!letter=,
-   \c!kleur=,
-   \c!afstand=\ifcase\linenumberlocation2em\else\!!zeropoint\fi]
-
-\stelregelsin
-  [\c!voor=\blanko,
-   \c!na=\blanko,
-   \c!tussen=\blanko,
-   \c!inspringen=\v!nee]
-
-\protect \endinput
\ No newline at end of file
+\setuplinenumbering
+  [\c!width=\ifcase\linenumberlocation2em\else\v!margin\fi,
+   \c!left=,
+   \c!right=,
+   \c!command=,
+   \c!distance=\zeropoint,
+   \c!align=\ifcase\linenumberlocation\v!right\or\v!right\or\v!left\fi]
+
+\setupparagraphnumbering
+  [\c!state=\v!stop,
+   \c!style=,
+   \c!color=,
+   \c!distance=\ifcase\linenumberlocation2em\else\!!zeropoint\fi]
+
+\setuplines
+  [\c!before=\blank,
+   \c!after=\blank,
+   \c!inbetween=\blank,
+   \c!indenting=\v!no]
+
+\protect \endinput
diff --git a/tex/context/base/page-log.tex b/tex/context/base/page-log.tex
index 58cab81df..7afe7b64a 100644
--- a/tex/context/base/page-log.tex
+++ b/tex/context/base/page-log.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-log, % moved here from main-001
+%D   [       filefile=page-log, % moved here from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Logos,
@@ -58,15 +58,15 @@
 %D is provided by a macro that signals changes in layout
 %D specifications:
 %D
-%D \starttypen
+%D \starttyping
 %D \recalculatelogos
-%D \stoptypen
+%D \stoptyping
 %D
 %D as well as a simple placement macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \addlogobackground <box>
-%D \stoptypen
+%D \stoptyping
 %D
 %D In no way the following boolean switch should be used
 %D directly.
@@ -79,12 +79,12 @@
 %D The current state of logos is registered in a status
 %D variable \type {\logostatus}.
 %D
-%D \starttabulatie[|l|l|l|]
+%D \starttabulate[|l|l|l|]
 %D \NC 0 \NC don't place              \NC remains 0 \NC \NR
 %D \NC 1 \NC place now                \NC remains 1 \NC \NR
 %D \NC 2 \NC calulate and place       \NC becomes 1 \NC \NR
 %D \NC 3 \NC calculate and place once \NC becomes 2 \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \chardef\logostatus=0
 
@@ -136,75 +136,75 @@
    \fi}
 
 \def\dosetlogobox#1#2%
-  {\global\setbox#1\vbox to \papierhoogte
+  {\global\setbox#1\vbox to \paperheight
      {\dontcomplain           % needed here ?
       \calculatereducedvsizes % needed here ?
       \offinterlineskip
       #2\relax
-      \vskip-\kopwit
-      \dodosetlogobox\v!boven\blap
-      \vskip\kopwit
-      \dodosetlogobox\v!hoofd\blap
-      \vskip\hoofdhoogte
-      \vskip\hoofdafstand
-      \dodosetlogobox\v!tekst\blap
-      \vskip\teksthoogte
-      \vskip\voetafstand
-      \vskip\voethoogte
-      \dodosetlogobox\v!voet \tlap
+      \vskip-\topspace
+      \dodosetlogobox\v!top\blap
+      \vskip\topspace
+      \dodosetlogobox\v!header\blap
+      \vskip\headerheight
+      \vskip\headerdistance
+      \dodosetlogobox\v!text\blap
+      \vskip\textheight
+      \vskip\footerdistance
+      \vskip\footerheight
+      \dodosetlogobox\v!footer \tlap
       \vfilll
-      \dodosetlogobox\v!onder\tlap
-      \vskip\kopwit}
+      \dodosetlogobox\v!bottom\tlap
+      \vskip\topspace}
   \smashbox#1}
 
 \def\dodosetlogobox#1#2%
-  {\hbox % width equals \zetbreedte
+  {\hbox % width equals \makeupwidth
      {\def\docommando##1%
         {\donefalse
          \ifnum\logostatus=3 \ExpandBothAfter
            \doifinset{\getvalue{\??lo#1##1}}\requestedlogos\donetrue
          \else
-           \doifvalue{\??lo#1##1\c!status}\v!start\donetrue
+           \doifvalue{\??lo#1##1\c!state}\v!start\donetrue
          \fi
          \ifdone
-           #2{\hbox{\getvalue{\??lo#1##1\c!commando}}}%
+           #2{\hbox{\getvalue{\??lo#1##1\c!command}}}%
          \fi}%
       \def\dodocommando##1##2##3##4##5##6%
         {\hsmash
            {\hskip-\texthoffset
-            \hbox to \papierbreedte
+            \hbox to \paperwidth
               {\rlap{\docommando##1}\hss\llap{\docommando##6}}%
-            \hskip-\papierbreedte
-            \hbox to \papierbreedte
+            \hskip-\paperwidth
+            \hbox to \paperwidth
               {\hskip\texthoffset
-               \hskip-\linkermargebreedte
-               \hskip-\linkermargeafstand
-               \hbox to \linkermargebreedte{\docommando##2\hss}%
-               \hskip\linkermargeafstand
-               \hbox to \zetbreedte{\docommando##3\hss\docommando##4}%
-               \hskip\rechtermargeafstand
-               \hbox to \rechtermargebreedte{\hss\docommando##5}%
+               \hskip-\leftmarginwidth
+               \hskip-\leftmargindistance
+               \hbox to \leftmarginwidth{\docommando##2\hss}%
+               \hskip\leftmargindistance
+               \hbox to \makeupwidth{\docommando##3\hss\docommando##4}%
+               \hskip\rightmargindistance
+               \hbox to \rightmarginwidth{\hss\docommando##5}%
                \hfill}}}%
       \normalbaselines
       \settexthoffset
       \hsmash
-        {\hbox to \zetbreedte{\hss\docommando\c!midden\hss}}%
+        {\hbox to \makeupwidth{\hss\docommando\c!middle\hss}}%
       \hsmash
         {\hskip-\texthoffset
-         \hbox to \papierbreedte{\docommando\v!pagina\hss}}%
+         \hbox to \paperwidth{\docommando\v!page\hss}}%
       \swapmargins
       \doifbothsidesoverruled
         \dodocommando
-          \v!linkerrand \v!linkermarge  \v!links
-          \v!rechts     \v!rechtermarge \v!rechterrand
+          \v!leftedge \v!leftmargin  \v!left
+          \v!right     \v!rightmargin \v!rightedge
       \orsideone
         \dodocommando
-          \v!linkerrand \v!linkermarge  \v!links
-          \v!rechts     \v!rechtermarge \v!rechterrand
+          \v!leftedge \v!leftmargin  \v!left
+          \v!right     \v!rightmargin \v!rightedge
       \orsidetwo
         \dodocommando
-          \v!rechterrand \v!rechtermarge \v!rechts
-          \v!links       \v!linkermarge  \v!linkerrand
+          \v!rightedge \v!rightmargin \v!right
+          \v!left       \v!leftmargin  \v!leftedge
       \od}}
 
 %D The user interface is relatively simple and provides
@@ -233,4 +233,4 @@
   {\xdef\requestedlogos{\iffirstargument#1\else\definedlogos\fi}%
    \global\chardef\logostatus3 }
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-lyr.tex b/tex/context/base/page-lyr.tex
index 9d93a9e1a..a1ab4d0ff 100644
--- a/tex/context/base/page-lyr.tex
+++ b/tex/context/base/page-lyr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-lyr,
+%D   [       filefile=page-lyr,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Layers,
@@ -74,19 +74,19 @@
 \def\dodefinelayer[#1][#2]%
   {\setuplayer
      [#1]
-     [\c!dubbelzijdig=,\c!preset=,
-      \c!status=\v!start,\c!richting=\v!normaal,\c!optie=,
-      \c!x=\!!zeropoint,\c!y=\!!zeropoint,\c!positie=\v!nee,
-      \c!regel=0,\c!kolom=0,
-      \c!breedte=\nextboxwd,\c!hoogte=\nextboxht,
-      \c!offset=\!!zeropoint,\c!rotatie=, % geen 0 !
+     [\c!doublesided=,\c!preset=,
+      \c!state=\v!start,\c!direction=\v!normal,\c!option=,
+      \c!x=\!!zeropoint,\c!y=\!!zeropoint,\c!position=\v!no,
+      \c!line=0,\c!column=0,
+      \c!width=\nextboxwd,\c!height=\nextboxht,
+      \c!offset=\!!zeropoint,\c!rotation=, % geen 0 !
       \c!hoffset=\!!zeropoint,\c!voffset=\!!zeropoint,
-      \c!plaats=rb,\c!positie=\v!nee,\c!pagina=,
-      \c!methode=\v!overlay,
-      \c!sx=1,\c!sy=1,\c!hoek=,#2]%
-   \doifvalue{\??ll#1\c!dubbelzijdig}\v!ja
-     {\dopresetlayerbox{\v!links #1}%
-      \dopresetlayerbox{\v!rechts#1}}%
+      \c!location=rb,\c!position=\v!no,\c!page=,
+      \c!method=\v!overlay,
+      \c!sx=1,\c!sy=1,\c!corner=,#2]%
+   \doifvalue{\??ll#1\c!doublesided}\v!yes
+     {\dopresetlayerbox{\v!left #1}%
+      \dopresetlayerbox{\v!right#1}}%
    \dopresetlayerbox{#1}%
    \defineoverlay[#1][\composedlayer{#1}]}
 
@@ -118,9 +118,9 @@
 %D the current point as reference point. Otherwise the topleft
 %D corner is used as reference point.
 %D
-%D \starttypen
+%D \starttyping
 %D \setlayer [identifier] [optional parameters] {data}
-%D \stoptypen
+%D \stoptyping
 
 \def\currentlayerdata{0}
 
@@ -128,7 +128,7 @@
   {\dotripleempty\dosetlayer}
 
 \def\dosetlayer[#1][#2][#3]% #4 == box do \fi is ok
-  {\doifelsevalue{\??ll#1\c!status}\v!stop
+  {\doifelsevalue{\??ll#1\c!state}\v!stop
      {\dowithnextbox\donothing\hbox}
      {\ifthirdargument
         \dodosetlayer[#1][#2][#3]%
@@ -143,7 +143,7 @@
    \doglobal\increment\currentlayerdata
    \forgetall
    \dontcomplain
-   \doifvalue{\??ll#1\c!optie}\v!test\tracelayerstrue
+   \doifvalue{\??ll#1\c!option}\v!test\tracelayerstrue
    \iftracelayers\traceboxplacementtrue\fi
    \dowithnextbox % sneller als aparte macro
      {\ifundefined{\@@layerbox#1}%
@@ -153,11 +153,11 @@
           {\ifodd\realpageno
           %  discard nextbox
            \else
-             \dododosetlayer[#1][\v!links][#3]%
+             \dododosetlayer[#1][\v!left][#3]%
            \fi}%
-          {\doifelse{#2}\v!oneven
+          {\doifelse{#2}\v!odd
              {\ifodd\realpageno
-                \dododosetlayer[#1][\v!rechts][#3]%
+                \dododosetlayer[#1][\v!right][#3]%
              %\else
              %  discard nextbox
               \fi}%
@@ -210,8 +210,8 @@
 \def\dododosetlayer[#1][#2][#3]% will be sped up
   {% we use the global width, never change this
    \def\currentlayer{#1}%
-   \@@layerxsiz\layerparameter\c!breedte
-   \@@layerysiz\layerparameter\c!hoogte
+   \@@layerxsiz\layerparameter\c!width
+   \@@layerysiz\layerparameter\c!height
    \layerwidth \@@layerxsiz
    \layerheight\@@layerysiz
    % preroll
@@ -219,16 +219,16 @@
    % presets and real roll
    \executeifdefined{\??ll\??ll\layerparameter\c!preset}\gobbletwoarguments\currentlayer{#3}%
    % that was real slow
-   \doif{\layerparameter\c!positie}\v!overlay  % slow
-     {\getparameters[\??ll\currentlayer][\c!breedte=\zeropoint,\c!hoogte=\zeropoint,\c!positie=\v!ja]}%
-   \doifsomething{\layerparameter\c!rotatie}
+   \doif{\layerparameter\c!position}\v!overlay  % slow
+     {\getparameters[\??ll\currentlayer][\c!width=\zeropoint,\c!height=\zeropoint,\c!position=\v!yes]}%
+   \doifsomething{\layerparameter\c!rotation}
      {\setbox\nextbox\hbox
         {\rotate % to be checked with new rotation
-           [\c!plaats=\v!hoog,\c!rotatie=\layerparameter\c!rotatie]
+           [\c!location=\v!high,\c!rotation=\layerparameter\c!rotation]
            {\flushnextbox}}}%
    % no, not local
-   % \@@layerxsiz\layerparameter\c!breedte
-   % \@@layerysiz\layerparameter\c!hoogte
+   % \@@layerxsiz\layerparameter\c!width
+   % \@@layerysiz\layerparameter\c!height
    % never change that
    \@@layerxpos\layerparameter\c!x
    \@@layerypos\layerparameter\c!y
@@ -242,51 +242,51 @@
    \@@layerypos\layerparameter\c!sy\@@layerypos
    \@@layerxoff\layerparameter\c!sx\@@layerxoff
    \@@layeryoff\layerparameter\c!sy\@@layeryoff
-   \doifelse{\layerparameter\c!positie}\v!ja   % combine ^
+   \doifelse{\layerparameter\c!position}\v!yes   % combine ^
      {\setlastlayerpos{#2\currentlayer}% todo l/r %%%%%%%%%%%%
       \@@layerxpos\lastlayerxpos
       \@@layerypos\lastlayerypos
-      \letgvalue{\??ll\currentlayer\layerpage\c!positie}\v!ja
-      \letgvalue{\??ll\currentlayer\c!status}\v!start % needed ?
+      \letgvalue{\??ll\currentlayer\layerpage\c!position}\v!yes
+      \letgvalue{\??ll\currentlayer\c!state}\v!start % needed ?
       \setbox\layerbox\vbox to \@@layerysiz
         {\hbox to \@@layerxsiz{\xypos{lyr:\currentlayerdata}\hss}\vss}}
      {\setbox\layerbox\emptybox
       \globallet\lastlayerxpos\!!zeropoint
       \globallet\lastlayerypos\!!zeropoint
-      \ExpandBothAfter\doifinset\v!onder{\layerparameter\c!hoek}
-        {\ifnum\layerparameter\c!regel=\zerocount\else % can be < 0
-           \scratchcounter\layerparameter\c!regel
+      \ExpandBothAfter\doifinset\v!bottom{\layerparameter\c!corner}
+        {\ifnum\layerparameter\c!line=\zerocount\else % can be < 0
+           \scratchcounter\layerparameter\c!line
            \scratchcounter-\scratchcounter
            \advance\scratchcounter\layoutlines
            \advance\scratchcounter\plusone
-           \setevalue{\??ll\currentlayer\c!regel}{\the\scratchcounter}%
+           \setevalue{\??ll\currentlayer\c!line}{\the\scratchcounter}%
          \fi
          \ifdim\@@layerysiz>\zeropoint
            \advance\@@layerypos-\@@layerysiz
            \@@layerypos-\@@layerypos
            \@@layeryoff-\@@layeryoff
          \fi}%
-      \ExpandBothAfter\doifinset\v!rechts{\layerparameter\c!hoek}
-        {\ifnum\layerparameter\c!kolom=\zerocount\else % can be < 0
-           \scratchcounter\layerparameter\c!kolom
+      \ExpandBothAfter\doifinset\v!right{\layerparameter\c!corner}
+        {\ifnum\layerparameter\c!column=\zerocount\else % can be < 0
+           \scratchcounter\layerparameter\c!column
            \scratchcounter-\scratchcounter
            \advance\scratchcounter \layoutcolumns
            \advance\scratchcounter \plusone
-           \setevalue{\??ll\currentlayer\c!kolom}{\the\scratchcounter}%
+           \setevalue{\??ll\currentlayer\c!column}{\the\scratchcounter}%
          \fi
          \ifdim\@@layerxsiz>\zeropoint
            \advance\@@layerxpos-\@@layerxsiz
            \@@layerxpos-\@@layerxpos
            \@@layerxoff-\@@layerxoff
          \fi}%
-      \ExpandBothAfter\doif\v!midden{\layerparameter\c!hoek}
+      \ExpandBothAfter\doif\v!middle{\layerparameter\c!corner}
         {\ifdim\@@layerxsiz>\zeropoint
            \advance\@@layerxpos.5\@@layerxsiz
          \fi
          \ifdim\@@layerysiz>\zeropoint
            \advance\@@layerypos.5\@@layerysiz
          \fi}%
-      \edef\layerpage{\layerparameter\c!pagina}}%
+      \edef\layerpage{\layerparameter\c!page}}%
    \doifsomething\layerpage
      {\edef\layerpage{:\layerpage}%
       \doifundefined{\@@layerbox#2\currentlayer\layerpage}
@@ -297,9 +297,9 @@
      \gsetboxllx\layerpagebox\zeropoint
      \gsetboxlly\layerpagebox\zeropoint
    \fi
-   \global\setbox\layerpagebox\vbox %to \layerparameter\c!hoogte % new, otherwise no negative y possible
+   \global\setbox\layerpagebox\vbox %to \layerparameter\c!height % new, otherwise no negative y possible
      {\offinterlineskip
-     %postpone, to after nextboxwd correction % \hsize\layerparameter\c!breedte % new, keep box small
+     %postpone, to after nextboxwd correction % \hsize\layerparameter\c!width % new, keep box small
      %\ifvoid\csname\@@layerbox\currentlayer\layerpage\endcsname\else % why not #2#1
       \ifvoid\layerpagebox
         \let\lastlayerwidth \zeropoint
@@ -310,28 +310,28 @@
         \ht\layerpagebox\zeropoint
         \dp\layerpagebox\zeropoint
         \wd\layerpagebox\zeropoint
-        \doifnotvalue{\layerparameter\c!richting}\v!omgekeerd{\box\layerpagebox}%
+        \doifnotvalue{\layerparameter\c!direction}\v!reverse{\box\layerpagebox}%
       \fi
       % don't move
       \xdef\lastlayerwd{\the\nextboxwd}%
       \xdef\lastlayerht{\the\nextboxht}% % not entirely ok when grid !
       \xdef\lastlayerdp{\the\nextboxdp}% % not entirely ok when grid !
       % this code
-      \doifelse{\layerparameter\c!plaats}\v!grid\donetrue\donefalse
+      \doifelse{\layerparameter\c!location}\v!grid\donetrue\donefalse
       \ifdone
         \nextboxht\strutheight
         \nextboxdp\strutdepth
       \else
-        \setbox\nextbox\hbox{\alignedbox[\layerparameter\c!plaats]\vbox{\flushnextbox}}%
+        \setbox\nextbox\hbox{\alignedbox[\layerparameter\c!location]\vbox{\flushnextbox}}%
       \fi
-      \ifnum\layerparameter\c!regel=\zerocount\else % no \ifcase, can be negative
-        \advance\@@layerypos \layerparameter\c!regel\lineheight
+      \ifnum\layerparameter\c!line=\zerocount\else % no \ifcase, can be negative
+        \advance\@@layerypos \layerparameter\c!line\lineheight
         \advance\@@layerypos \topskip
         \advance\@@layerypos-\lineheight
         \advance\@@layerypos-\nextboxht
       \fi
-      \ifnum\layerparameter\c!kolom=\zerocount\else % no \ifcase, can be negative
-        \advance\@@layerxpos \layoutcolumnoffset{\layerparameter\c!kolom}%
+      \ifnum\layerparameter\c!column=\zerocount\else % no \ifcase, can be negative
+        \advance\@@layerxpos \layoutcolumnoffset{\layerparameter\c!column}%
       \fi
       \ifdone
         \setbox\nextbox\hbox{\alignedbox[rb]\vbox{\flushnextbox}}%
@@ -359,8 +359,8 @@
         \nextboxdp\zeropoint
       \fi
       % placement
-      \hsize\layerparameter\c!breedte % new, keep box small
-      \vbox to \layerparameter\c!hoogte \bgroup
+      \hsize\layerparameter\c!width % new, keep box small
+      \vbox to \layerparameter\c!height \bgroup
         \smashbox\nextbox
         \vskip\@@layerypos
         \vskip\@@layeryoff
@@ -408,29 +408,29 @@
 %D macro does not takes hash space.
 
 \unexpanded\def\flushlayer[#1]%
-  {\doifelsevalue{\??ll#1\c!status}\v!volgende
-      {\global\letvalue{\??ll#1\c!status}\v!start} % dangerous, stack-built-up
-      {\doifelsevalue{\??ll#1\c!dubbelzijdig}\v!ja
+  {\doifelsevalue{\??ll#1\c!state}\v!next
+      {\global\letvalue{\??ll#1\c!state}\v!start} % dangerous, stack-built-up
+      {\doifelsevalue{\??ll#1\c!doublesided}\v!yes
          {\doifundefinedelse{\@@layerbox#1}%
             {\dodoflushlayerA[#1]}
             {\doifbothsidesoverruled
-               \dodoflushlayerB\v!links [#1]%  left
+               \dodoflushlayerB\v!left [#1]%  left
              \orsideone
-               \dodoflushlayerB\v!rechts[#1]% right
+               \dodoflushlayerB\v!right[#1]% right
              \orsidetwo
-               \dodoflushlayerB\v!links [#1]%  left
+               \dodoflushlayerB\v!left [#1]%  left
              \od}}
          {\dodoflushlayerA[#1]}}}
 
 \def\dodoflushlayerA[#1]%
-  {\doifnotvalue{\??ll#1\c!status}\v!stop
+  {\doifnotvalue{\??ll#1\c!state}\v!stop
      {\startoverlay
         {\dodoflushlayer1{#1}{#1}}
         {\dodoflushlayer0{#1}{#1:\realfolio}}
       \stopoverlay}}
 
 \def\dodoflushlayerB#1[#2]%
-  {\doifnotvalue{\??ll#2\c!status}\v!stop
+  {\doifnotvalue{\??ll#2\c!state}\v!stop
      {\startoverlay
         {\dodoflushlayer1{#2}{#2}}
         {\dodoflushlayer0{#2}{#2:\realfolio}}
@@ -438,58 +438,6 @@
         {\dodoflushlayer0{#2}{#1#2:\realfolio}}
       \stopoverlay}}
 
-% \def\dodoflushlayer#1#2#3%
-%   {\ifundefined{\@@layerbox#3}%
-%      \ifcase#1\else\writestatus{layer}{unknown layer #3}\fi
-%    \else
-%      \bgroup
-%      \forgetall
-%      \offinterlineskip
-%      \doifvalue{\??ll#2\c!optie}\v!test\tracelayerstrue
-%      \iftracelayers\traceboxplacementtrue\fi
-%      \!!doneafalse
-%      \!!donebfalse
-%      \doifvalue{\??ll#2\c!methode}\v!overlay\!!doneatrue
-%      \doifvalue{\??ll#2\c!methode}\v!passend\!!donebtrue
-%      \!!donectrue
-%      \ifcase#1\else
-%        \doifnotvalue{\??ll#2\c!positie}\v!ja
-%          {\doifvalue{\??ll#2\c!herhaal}\v!ja\!!donecfalse
-%           \doifvalue{\??ll#2\c!status}\v!herhaal\!!donecfalse}% old method
-%      \fi
-%      \chardef\layerbox\csname\@@layerbox#3\endcsname
-%      % we need to copy in order to retain the negative offsets for a next
-%      % stage of additions, i.e. llx/lly accumulate in repeat mode and the
-%      % compensation is may differ each flush depending on added content
-%      \setbox\nextbox \if!!doneb
-%        \vbox
-%          {\scratchdimen\getboxlly\layerbox
-%           \vskip-\scratchdimen
-%           \scratchdimen\getboxllx\layerbox
-%           \hskip-\scratchdimen
-%           \advance\scratchdimen-\wd\layerbox
-%           \hsize-\scratchdimen
-%           \if!!donec\box\else\copy\fi\layerbox}%
-%      \else
-%         \if!!donec\box\else\copy\fi\layerbox % sorry for the delay due to copying
-%      \fi
-%      \iftracelayers \ruledvbox \else \vbox \fi \if!!donea to \overlayheight \fi
-%        {\hbox \if!!donea to \overlaywidth \fi
-%           {% klopt dit? #3 en niet #2 ?
-%            \doifvalue{\??ll#3\realfolio\c!positie}\v!ja
-%              {\xypos{lyr:#3:\realfolio}}%
-%            \doifoverlayelse{#3}
-%              {\box\nextbox}
-%              {\startlayoutcomponent{l:#3}{layer #3}\box\nextbox\stoplayoutcomponent}%
-%            \hss}%
-%         \vss}%
-%      \if!!donec
-%        \gsetboxllx\layerbox\zeropoint
-%        \gsetboxlly\layerbox\zeropoint
-%      \fi
-%      \egroup
-%    \fi}
-
 \def\dodoflushlayer#1#2#3%
   {\ifundefined{\@@layerbox#3}%
      \ifcase#1\else\writestatus{layer}{unknown layer #3}\fi
@@ -500,17 +448,17 @@
      % needed because we need to handle method
      \executeifdefined{\??ll\??ll\getvalue{\??ll#2\c!preset}}\gobbletwoarguments{#2}{}%
      %
-     \doifvalue{\??ll#2\c!optie}\v!test\tracelayerstrue
+     \doifvalue{\??ll#2\c!option}\v!test\tracelayerstrue
      \iftracelayers\traceboxplacementtrue\fi
      \!!doneafalse
      \!!donebfalse
-     \doifvalue{\??ll#2\c!methode}\v!overlay\!!doneatrue
-     \doifvalue{\??ll#2\c!methode}\v!passend\!!donebtrue
+     \doifvalue{\??ll#2\c!method}\v!overlay\!!doneatrue
+     \doifvalue{\??ll#2\c!method}\v!fit\!!donebtrue
      \!!donectrue
      \ifcase#1\else
-       \doifnotvalue{\??ll#2\c!positie}\v!ja
-         {\doifvalue{\??ll#2\c!herhaal}\v!ja\!!donecfalse
-          \doifvalue{\??ll#2\c!status}\v!herhaal\!!donecfalse}%
+       \doifnotvalue{\??ll#2\c!position}\v!yes
+         {\doifvalue{\??ll#2\c!repeat}\v!yes\!!donecfalse
+          \doifvalue{\??ll#2\c!state}\v!repeat\!!donecfalse}%
      \fi
      \chardef\layerbox\csname\@@layerbox#3\endcsname
      % we need to copy in order to retain the negative offsets for a next
@@ -531,7 +479,7 @@
      \iftracelayers \ruledvbox \else \vbox \fi \if!!donea to \overlayheight \fi
        {\hbox \if!!donea to \overlaywidth \fi
           {% klopt dit? #3 en niet #2 ?
-           \doifvalue{\??ll#3\realfolio\c!positie}\v!ja     {\xypos{lyr:#3:\realfolio}}%
+           \doifvalue{\??ll#3\realfolio\c!position}\v!yes     {\xypos{lyr:#3:\realfolio}}%
            \doifoverlayelse{#3}
              {\box\nextbox}
              {\startlayoutcomponent{l:#3}{layer #3}\box\nextbox\stoplayoutcomponent}%
@@ -573,8 +521,8 @@
   {\hbox
      {\def\currentlayer{#1}% todo: left/right
       \setbox\nextbox\emptybox        % hoogte/breedte are \wd\nextbox/\ht\nextbox
-      \hsize\layerparameter\c!breedte % \overlaywidth   = \hsize
-      \vsize\layerparameter\c!hoogte  % \overlaywheight = \vsize
+      \hsize\layerparameter\c!width % \overlaywidth   = \hsize
+      \vsize\layerparameter\c!height  % \overlaywheight = \vsize
       \composedlayer{#1}}}
 
 %D \macros
@@ -590,9 +538,9 @@
 
 \def\resetlayer[#1]%
   {\doresetlayer{#1}%
-   \doifvalue{\??ll#1\c!dubbelzijdig}\v!ja % kind of redundant test
-     {\doresetlayer{\v!links #1}%
-      \doresetlayer{\v!rechts#1}}%
+   \doifvalue{\??ll#1\c!doublesided}\v!yes % kind of redundant test
+     {\doresetlayer{\v!left #1}%
+      \doresetlayer{\v!right#1}}%
    \doresetlayer{#1:\realfolio}}
 
 %D \macros
@@ -601,7 +549,7 @@
 %D The following layer macro uses the positions that are
 %D registered by \METAPOST.
 %D
-%D \starttypen
+%D \starttyping
 %D \definelayer[test]
 %D
 %D \setMPlayer [test] [somepos-1] {Whatever we want here!}
@@ -616,15 +564,15 @@
 %D \stopuseMPgraphic
 %D
 %D \getMPlayer[test]{\useMPgraphic{oeps}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The last line is equivalent to
 %D
-%D \starttypen
+%D \starttyping
 %D \framed
 %D   [background={foreground,test},offset=overlay]
 %D   {\useMPgraphic{oeps}}
-%D \stoptypen
+%D \stoptyping
 
 \def\setMPlayer
   {\dotripleempty\dosetMPlayer}
@@ -635,15 +583,15 @@
 \def\dosetMPlayer[#1][#2][#3]%
   {\edef\MPlayerwidth {\MPw{#2}}%
    \edef\MPlayerheight{\MPh{#2}}%
-   \setlayer[#1][\c!x=\MPx{#2},\c!y=\MPy{#2},\c!positie=\v!nee,#3]}
+   \setlayer[#1][\c!x=\MPx{#2},\c!y=\MPy{#2},\c!position=\v!no,#3]}
 
 \def\getMPlayer
   {\dodoubleempty\dogetMPlayer}
 
 \def\dogetMPlayer[#1][#2]%
   {\framed
-     [\c!achtergrond={\v!voorgrond,#1},
-      \c!kader=\v!uit,
+     [\c!background={\v!foreground,#1},
+      \c!frame=\v!off,
       \c!offset=\v!overlay,#2]}
 
 % Some day this (old) mechanism will be combined/integrated
@@ -660,11 +608,11 @@
    \xposition \zeropoint     \yposition \zeropoint
    \xdimension\zeropoint     \ydimension\zeropoint
    \xoffset   \zeropoint     \yoffset   \zeropoint
-   \hfuzz     \papierbreedte \vfuzz     \papierhoogte
+   \hfuzz     \paperwidth \vfuzz     \paperheight
    \setbox\positionbox\hbox\bgroup}
 
 \def\stoppositioning
-  {\doifnot\@@psoffset\v!ja
+  {\doifnot\@@psoffset\v!yes
      {\global\xoffset\zeropoint
       \global\yoffset\zeropoint}%
    \global\advance\xdimension \xoffset
@@ -681,16 +629,16 @@
 
 \def\resetpositioning
   {\getparameters[\??ps]
-     [\c!status=\v!start,%
-      \c!eenheid=\s!cm,%
+     [\c!state=\v!start,%
+      \c!unit=\s!cm,%
       \c!factor=1,%
-      \c!schaal=1,%
+      \c!scale=1,%
       \c!xfactor=\@@psfactor,%
       \c!yfactor=\@@psfactor,%
-      \c!xschaal=\@@psschaal,%
-      \c!yschaal=\@@psschaal,%
-      \c!xstap=\v!absoluut,%
-      \c!ystap=\v!absoluut,%
+      \c!xscale=\@@psscale,%
+      \c!yscale=\@@psscale,%
+      \c!xstep=\v!absolute,%
+      \c!ystep=\v!absolute,%
       \c!xoffset=\!!zeropoint,%
       \c!yoffset=\!!zeropoint]}
 
@@ -699,15 +647,15 @@
    \dodoubleargument\getparameters[\??ps]}
 
 \def\calculateposition#1#2#3#4#5#6#7#8#9%
-  {\setdimensionwithunit\scratchskip{#1}\@@pseenheid
+  {\setdimensionwithunit\scratchskip{#1}\@@psunit
    \scratchskip#8\scratchskip
    \scratchskip#9\scratchskip
    \advance\scratchskip #4\relax
-   \doif{#2}\v!relatief
+   \doif{#2}\v!relative
      {\advance\scratchskip #3%
       \let#4\!!zeropoint}%
    #3\scratchskip\relax
-   \doifnot\@@psstatus\v!overlay
+   \doifnot\@@psstate\v!overlay
      {\scratchskip#5\relax
       \advance\scratchskip #3\relax
       \ifdim#3<-#7\relax          \global#7-#3\relax          \fi
@@ -721,13 +669,13 @@
      {\bgroup
       \getparameters[\??ps][#1]%
       \dontcomplain
-      \calculateposition{#3}\@@psxstap\xposition
+      \calculateposition{#3}\@@psxstep\xposition
         \@@psxoffset{\nextboxwd}\xdimension\xoffset
-        \@@psxschaal\@@psxfactor
+        \@@psxscale\@@psxfactor
       \scratchdimen\nextboxht \advance\scratchdimen \nextboxdp
-      \calculateposition{#4}\@@psystap\yposition
+      \calculateposition{#4}\@@psystep\yposition
         \@@psyoffset\scratchdimen\ydimension\yoffset
-        \@@psyschaal\@@psyfactor
+        \@@psyscale\@@psyfactor
       \vbox to \zeropoint % kan beter.
         {\vskip\yposition
          \hbox to \zeropoint
@@ -748,12 +696,12 @@
 \resetpositioning
 
 \setuppositioning
-  [\c!eenheid=\s!cm,
+  [\c!unit=\s!cm,
    \c!factor=1,
-   \c!schaal=1,
-   \c!xstap=\v!absoluut,
-   \c!ystap=\v!absoluut,
-   \c!offset=\v!ja,
+   \c!scale=1,
+   \c!xstep=\v!absolute,
+   \c!ystep=\v!absolute,
+   \c!offset=\v!yes,
    \c!xoffset=\!!zeropoint,
    \c!yoffset=\!!zeropoint]
 
@@ -763,13 +711,13 @@
 
 \let\normalsettextpagecontent\settextpagecontent
 
-\definelayer[OTRTEXT] \setuplayer[OTRTEXT][\c!breedte=\zetbreedte,\c!hoogte=\teksthoogte]
+\definelayer[OTRTEXT] \setuplayer[OTRTEXT][\c!width=\makeupwidth,\c!height=\textheight]
 
 % will be overloaded in page-spr
 
 \def\settextpagecontent#1#2#3% #2 and #3 will disappear
   {\doifelselayerdata{OTRTEXT}
-     {\setbox#1\hbox to \zetbreedte
+     {\setbox#1\hbox to \makeupwidth
         {\startoverlay
            {\normalsettextpagecontent{#1}{#2}{#3}\box#1}
            {\tightlayer[OTRTEXT]}
@@ -777,4 +725,4 @@
       \dp#1\zeropoint}%
      {\normalsettextpagecontent{#1}{#2}{#3}}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-mak.tex b/tex/context/base/page-mak.tex
index f4155de67..66fc4b2d2 100644
--- a/tex/context/base/page-mak.tex
+++ b/tex/context/base/page-mak.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-mak, % copied from main-001,
+%D   [       filefile=page-mak, % copied from main-001,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Simple MakeUp,
@@ -22,11 +22,11 @@
 %D There is one standard makeup page, but you can define more
 %D if needed.
 %D
-%D \starttypen
+%D \starttyping
 %D \startstandardmakeup
 %D   My Fancy Title
 %D \stopstandardmakeup
-%D \stoptypen
+%D \stoptyping
 %D
 %D The associated commands are:
 %D
@@ -40,29 +40,29 @@
 \def\dodefinemakeup[#1][#2]%
   {\getparameters
      [\??do#1]%
-     [\c!breedte=\zetbreedte,  % example in manual
-      \c!hoogte=\teksthoogte,  % example in manual
+     [\c!width=\makeupwidth,  % example in manual
+      \c!height=\textheight,  % example in manual
       \c!voffset=\!!zeropoint, % example in manual
       \c!hoffset=\!!zeropoint, % example in manual
-      \c!commandos=,
+      \c!commands=,
       \c!setups=,
-      \c!pagina=\v!rechts,
-      \c!dubbelzijdig=\v!leeg,
-      \c!voor=,
-      \c!boven=\vss,
-      \c!onder=\vss,
-      \c!na=,
-      \c!onderstatus=\v!normaal,
-      \c!bovenstatus=\v!normaal,
-      \c!tekststatus=\v!normaal,
-      \c!hoofdstatus=\v!stop,
-      \c!voetstatus=\v!stop,
-      \c!paginastatus=\v!stop, % in manual ! ! !
-      \c!kleur=,
-      \c!uitlijnen=,
+      \c!page=\v!right,
+      \c!doublesided=\v!empty,
+      \c!before=,
+      \c!top=\vss,
+      \c!bottom=\vss,
+      \c!after=,
+      \c!bottomstate=\v!normal,
+      \c!topstate=\v!normal,
+      \c!textstate=\v!normal,
+      \c!headerstate=\v!stop,
+      \c!footerstate=\v!stop,
+      \c!pagestate=\v!stop, % in manual ! ! !
+      \c!color=,
+      \c!align=,
       #2]%
-   \setvalue{\e!start#1\e!opmaak}{\startmakeup[#1]}%
-   \setvalue{\e!stop #1\e!opmaak}{\stopmakeup}}
+   \setvalue{\e!start#1\e!makeup}{\startmakeup[#1]}%
+   \setvalue{\e!stop #1\e!makeup}{\stopmakeup}}
 
 \def\setupmakeup
   {\dodoubleargument\dosetupmakeup}
@@ -103,16 +103,16 @@
 %D The simple case:
 
 \def\donostartmakeup
-  {\pagina
-   \setupheader[\c!status=\v!leeg]%
-   \setupfooter[\c!status=\v!leeg]%
-   \setsystemmode\v!opmaak
-   \vbox to \teksthoogte\bgroup\hsize\tekstbreedte}
+  {\page
+   \setupheader[\c!state=\v!empty]%
+   \setupfooter[\c!state=\v!empty]%
+   \setsystemmode\v!makeup
+   \vbox to \textheight\bgroup\hsize\textwidth}
 
 \def\donostopmakeup
   {\egroup
    \flushmarks % new, here, else empty pages
-   \pagina
+   \page
    \egroup}
 
 %D The normal one:
@@ -120,25 +120,25 @@
 \newbox\makeupbox
 
 \def\dodostartmakeup
-  {\doifvaluesomething{\??do\currentmakeup\c!pagina}
-     {\ExpandFirstAfter\pagina[\makeupparameter\c!pagina]}%
-   \soortpagina[\currentmakeup]%
-   \setsystemmode\v!opmaak
+  {\doifvaluesomething{\??do\currentmakeup\c!page}
+     {\ExpandFirstAfter\page[\makeupparameter\c!page]}%
+   \pagetype[\currentmakeup]%
+   \setsystemmode\v!makeup
    \setupmakeuplayout
-   \makeupparameter\c!commandos % hm, what is this one doing here ?
-   \startregistercolor[\makeupparameter\c!kleur]%
-   \global\setbox\makeupbox\vbox to \makeupparameter\c!hoogte
+   \makeupparameter\c!commands % hm, what is this one doing here ?
+   \startregistercolor[\makeupparameter\c!color]%
+   \global\setbox\makeupbox\vbox to \makeupparameter\c!height
      \bgroup
        \forgetall
        \setups[\makeupparameter\c!setups]%
-       \hsize\makeupparameter\c!breedte
-       \doifsomething{\makeupparameter\c!uitlijnen}
-         {\setupalign[\makeupparameter\c!uitlijnen]}%
-       \makeupparameter\c!boven}
+       \hsize\makeupparameter\c!width
+       \doifsomething{\makeupparameter\c!align}
+         {\setupalign[\makeupparameter\c!align]}%
+       \makeupparameter\c!top}
 
 \def\dodostopmakeup
   {\endgraf
-   \makeupparameter\c!onder
+   \makeupparameter\c!bottom
    \egroup
    \flushmarks % new, here, else empty pages
 \stopregistercolor
@@ -164,63 +164,63 @@
    \fi}
 
 \def\doshipoutmakeup
-  {\globalpushmacro\@@pnstatus % new
-   \makeupparameter\c!voor
-   \vbox{\hbox{\color[\makeupparameter\c!kleur]{\box\makeupbox}}}%
-   \setuppagenumber[\c!status=\makeupparameter\c!paginastatus]%
+  {\globalpushmacro\@@pnstate % new
+   \makeupparameter\c!before
+   \vbox{\hbox{\color[\makeupparameter\c!color]{\box\makeupbox}}}%
+   \setuppagenumber[\c!state=\makeupparameter\c!pagestate]%
    \setupmakeuplayout
-   \pagina
-   \makeupparameter\c!na
+   \page
+   \makeupparameter\c!after
    \relax % voor fi
    \ifdubbelzijdig \ifodd\realpageno\else
      \processaction
-       [\makeupparameter\c!dubbelzijdig]
-       [  \v!ja=>\null
-                 \pagina,
+       [\makeupparameter\c!doublesided]
+       [  \v!yes=>\null
+                 \page,
                % \verlaagpaginanummer, % new
-        \v!leeg=>{\setupmakeuplayout
-                  \pagina[\v!blanko]%
+        \v!empty=>{\setupmakeuplayout
+                  \page[\v!blank]%
                   \null
-                  \pagina}]%
+                  \page}]%
                % \verlaagpaginanummer]% % new
    \fi \fi
  % \verlaagpaginanummer % new
-   \globalpopmacro\@@pnstatus} % new
+   \globalpopmacro\@@pnstate} % new
 
 %D The text surrounding the main body text can be influenced
 %D by setting their associated status variables. The
 %D connection between them is made by the following macro
 
 \def\setupmakeuplayout
-  {\setupfooter[\c!status=\makeupparameter\c!voetstatus ]%
-   \setupheader[\c!status=\makeupparameter\c!hoofdstatus]%
-   \setuptext  [\c!status=\makeupparameter\c!tekststatus]%
-   \setupbottom[\c!status=\makeupparameter\c!onderstatus]%
-   \setuptop   [\c!status=\makeupparameter\c!bovenstatus]%
+  {\setupfooter[\c!state=\makeupparameter\c!footerstate ]%
+   \setupheader[\c!state=\makeupparameter\c!headerstate]%
+   \setuptext  [\c!state=\makeupparameter\c!textstate]%
+   \setupbottom[\c!state=\makeupparameter\c!bottomstate]%
+   \setuptop   [\c!state=\makeupparameter\c!topstate]%
    % this is needed, but no \setuplayout here; fails in texexec --fig=c
    \recalculatelayout}
 
 %D The standard page template is defined as follows:
 
 \definemakeup
-  [\v!standaard]
-  [\c!breedte=\zetbreedte,
-   \c!hoogte=\teksthoogte,
+  [\v!standard]
+  [\c!width=\makeupwidth,
+   \c!height=\textheight,
    \c!voffset=\!!zeropoint,
    \c!hoffset=\!!zeropoint,
-   \c!pagina=\v!rechts,
-   \c!dubbelzijdig=\v!leeg]
+   \c!page=\v!right,
+   \c!doublesided=\v!empty]
 
 \definemakeup
-  [\v!tekst]
-  [\c!bovenstatus=\v!start,
-   \c!hoofdstatus=\v!start,
-   \c!tekststatus=\v!start,
-   \c!voetstatus=\v!start,
-   \c!onderstatus=\v!start,
-   \c!dubbelzijdig=\v!nee,
-   \c!pagina=\v!ja,
-   \c!boven=\pseudostrut\ignorespaces,
-   \c!onder=\obeydepth\vss]
-
-\protect \endinput
\ No newline at end of file
+  [\v!text]
+  [\c!topstate=\v!start,
+   \c!headerstate=\v!start,
+   \c!textstate=\v!start,
+   \c!footerstate=\v!start,
+   \c!bottomstate=\v!start,
+   \c!doublesided=\v!no,
+   \c!page=\v!yes,
+   \c!top=\pseudostrut\ignorespaces,
+   \c!bottom=\obeydepth\vss]
+
+\protect \endinput
diff --git a/tex/context/base/page-mar.tex b/tex/context/base/page-mar.tex
index 939007808..b51d5939b 100644
--- a/tex/context/base/page-mar.tex
+++ b/tex/context/base/page-mar.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-mar, % moved here from main-001
+%D   [       filefile=page-mar, % moved here from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Marginal Things
@@ -11,633 +11,745 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D This module is still to be split and documented.
+%D Support for margin words is one of the reasons for writing
+%D \CONTEXT. Over time support for marginal content has been
+%D extended en enhanced. Therefore it's always good to watch
+%D out for unexpected side effects.
 
 \writestatus{loading}{Context Core Macros / Maginal Things}
 
+\unprotect
+
+%D There are three categories and their historically grown meaning is
+%D as follows:
+%D
+%D marginlines: these are flushed relative to the start of a line and
+%D need to be invoked there.
+%D
+%D marginwords: these can be issued in the text flow and will migrate
+%D sidewards; in spite of the name, it can be a paragraph of text as
+%D well, but normally it's words.
+%D
+%D margintexts: these can be set beforehand and are flushed at the
+%D next paragraph of text (of header)
+%D
+%D While these mechanisms were rather separated, they now are slightly
+%D more integrated. Instead of low level instances we now have a mechanism
+%D for defining additional ones.
+
+%D \macros
+%D   {inleftedge,inleftmargin,inrightmargin,inrightedge}
+%D
+%D The fast and clean way of putting things in the margin is
+%D using \type{\rlap} or \type{\llap}. Unfortunately these
+%D macro's don't handle indentation, left and right skips. We
+%D therefore embed them in some macro's that (force and)
+%D remove the indentation and restore it afterwards.
+
+\def\definemarginline
+  {\dodoubleargument\dodefinemarginline}
+
+\def\dodefinemarginline[#1][#2]%
+  {\getparameters
+     [\??im\??im#1]
+     [\c!location=\v!left,
+      \c!distance=\zeropoint,
+      \c!width=\leftmarginwidth,
+      \c!offset=\leftmargindistance,
+      \c!command=,
+      #2]%
+   \setvalue{#1}{\domarginline{#1}}}
+
+\def\domarginline#1% #2
+  {\getvalue{\s!do\??im\??im\executeifdefined{\??im\??im#1\c!location}\v!left}{#1}} % {#2}
+
+\def\doleftmarginline#1#2%
+  {\pushindentation
+   \llap
+     {\postsignalrightpage
+      \hsize\getvalue{\??im\??im#1\c!width}\relax
+      \executeifdefined{\??im\??im#1\c!command}\firstofoneargument{#2}\relax
+      \hskip\leftskip
+      \hskip\getvalue{\??im\??im#1\c!offset }\relax
+      \hskip\getvalue{\??im\??im#1\c!distance}}%
+   \popindentation
+   \ignorespaces}
+
+\def\dorightmarginline#1#2%
+  {\pushindentation
+   \rlap
+     {\postsignalrightpage
+      \hskip\hsize
+      \hskip-\rightskip
+      \hskip\getvalue{\??im\??im#1\c!offset }\relax
+      \hskip\getvalue{\??im\??im#1\c!distance}\relax
+      \hsize\getvalue{\??im\??im#1\c!width}\relax
+      \executeifdefined{\??im\??im#1\c!command}\firstofoneargument{#2}}%
+   \popindentation
+   \ignorespaces}
+
+\setvalue{\s!do\??im\??im\v!left }{\doleftmarginline}
+\setvalue{\s!do\??im\??im\v!right}{\dorightmarginline}
+\setvalue{\s!do\??im\??im\v!inner}{\presignalrightpage\doifrightpageelse\doleftmarginline \dorightmarginline}
+\setvalue{\s!do\??im\??im\v!outer}{\presignalrightpage\doifrightpageelse\dorightmarginline\doleftmarginline }
+
+\definemarginline[inleftmargin] [\c!location=\v!left, \c!width=\leftmarginwidth, \c!offset=\leftmargindistance]
+\definemarginline[inrightmargin][\c!location=\v!right,\c!width=\rightmarginwidth,\c!offset=\rightmargindistance]
+\definemarginline[inleftedge]   [\c!location=\v!left, \c!width=\leftedgewidth,  \c!offset=\leftedgedistance, \c!distance=\leftmargintotal]
+\definemarginline[inrightedge]  [\c!location=\v!right,\c!width=\rightedgewidth, \c!offset=\rightedgedistance,\c!distance=\rightmargintotal]
+
+\definemarginline[inoutermargin][\c!location=\v!outer,\c!width=\outermarginwidth,\c!offset=\outermargindistance]
+\definemarginline[ininnermargin][\c!location=\v!inner,\c!width=\innermarginwidth,\c!offset=\innermargindistance]
+\definemarginline[inouteredge]  [\c!location=\v!outer,\c!width=\outeredgewidth,  \c!offset=\outeredgedistance,\c!distance=\outermargintotal]
+\definemarginline[ininneredge]  [\c!location=\v!inner,\c!width=\inneredgewidth,  \c!offset=\inneredgedistance,\c!distance=\innermargintotal]
+
+\definemarginline[atleftmargin] [\c!location=\v!left, \c!command=\lrlap,\c!distance=\zeropoint,\c!width=\zeropoint,\c!offset=\zeropoint]
+\definemarginline[atrightmargin][\c!location=\v!right,\c!command=\rllap,\c!distance=\zeropoint,\c!width=\zeropoint,\c!offset=\zeropoint]
+
+\ifx\lrlap\undefined \def\lrlap#1{\llap{\rlap{#1}\hskip\leftskip}}               \fi
+\ifx\rllap\undefined \def\rllap#1{\rlap{\hskip\hsize\hskip-\rightskip\llap{#1}}} \fi
+
+%D We want to keep things efficient and therefore only handle
+%D situations like:
+%D
+%D \startbuffer
+%D                  \inleftedge    {fine} some text \par
+%D \strut           \inleftmargin  {fine} some text \par
+%D \noindent        \inrightmargin {fine} some text \par
+%D \noindent \strut \inrightedge   {fine} some text \par
+%D \stopbuffer
+%D
+%D \typebuffer
+%D
+%D which looks like:
+%D
+%D \bgroup
+%D \getbuffer
+%D \parindent 30pt
+%D \getbuffer
+%D \egroup
+%D
+%D A torture test:
+%D
+%D \starttyping
+%D \def\TestLine#1#2{\backgroundline[#1]{\strut\white\tttf#2~\recurselevel}}
+%D
+%D \startbuffer
+%D \inleftmargin {\TestLine{red}   {lm}}  test test test \par
+%D \inrightmargin{\TestLine{green} {rm}}  test test test \par
+%D \inleftedge   {\TestLine{red}   {le}}  test test test \par
+%D \inrightedge  {\TestLine{green} {re}}  test test test \par
+%D \inoutermargin{\TestLine{blue}  {om}}  test test test \par
+%D \ininnermargin{\TestLine{yellow}{im}}  test test test \par
+%D \inouteredge  {\TestLine{blue}  {oe}}  test test test \par
+%D \ininneredge  {\TestLine{yellow}{ie}}  test test test \par
+%D \atleftmargin {\TestLine{red}   {alm}} \hfill test    \par
+%D \atrightmargin{\TestLine{green} {arm}} test \hfill    \par
+%D \stopbuffer
+%D
+%D \dorecurse{40}\getbuffer \page
+%D \stoptyping
+
+%D New, yet undocumented:
+%D
+%D used for pascal:
+%D
+%D \starttyping
+%D \index {test} test \index {west} west \index {rest} rest
+%D
+%D \startnarrower
+%D \placeregister[index][alternative=b,command=\atleftmargin]
+%D \stopnarrower
+%D \stoptyping
+
 % todo: compensate distance when setuplayout[textwidth=..]
 % todo: generalize margin/edge model, now too much duplication
 
-\unprotect
+%D The next bunch of macros looks messy which is due to its
+%D multi-purpose character.
+
+\chardef\margincontentdisplacement \zerocount
+\let    \margincontentdistance     \!!zeropoint
+\def    \margincontentlines        {1}
+\def    \margincontenttag          {0}
+\let    \margincontentseparator    \empty
+\def    \margincontentstrutheight  {\strutht}
 
-\newif\iflowinmargin
+\newcounter\margincontentlevel
+\newdimen  \margincontentheight
 
-\def\stelinmargein
-  {\dodoubleempty\dostelinmargein}
+\def\setupinmargin
+  {\dodoubleempty\dosetupinmargin}
 
-\def\dostelinmargein[#1][#2]%
+\def\dosetupinmargin[#1][#2]%
   {\ifsecondargument
-     \processcommalist[#1]{\dodostelinmargein[#2]}% becomes [#2]{##1}
+     \processcommalist[#1]{\dodosetupinmargin[#2]}% becomes [#2]{##1}
    \else
      \getparameters[\??im][#1]%
    \fi}
 
-\def\dodostelinmargein[#1]#2% [settings]{class}
-  {\ifundefined{\??im#2\c!offset}%
-     \presetlocalframed
-       [\??im#2]%
-     \getparameters
-       [\??im#2]
-       [\c!kader=\v!uit,
-        \c!offset=\v!overlay,
-        \c!regel=1,
-        \c!scheider=,
-        \c!breedte=\v!ruim,
-        \c!afstand=\!!zeropoint,
-        \c!letter=\@@imletter,
-        \c!kleur=\@@imkleur,
-        \c!plaats=\@@implaats,
-        \c!uitlijnen=\@@imuitlijnen,
-        \c!voor=\@@imvoor,
-        \c!na=\@@imna,
-        #1]%
-   \else
-     \getparameters[\??im#2][#1]%
-   \fi}
-
-\let\margetekstafstand  = \!!zeropoint
-\def\margetekstregels     {1}
-\def\margetekstnummer     {0}
-\let\margetekstscheider = \empty
+\def\dodosetupinmargin[#1]#2% [settings]{class}
+  {\checkinmargin[#2]%
+   \getparameters[\??im#2][#1]}
 
-\def\margestrutheight{\strutht}
+\def\checkinmargin[#1]%
+  {\ifundefined{\??im#1\c!offset}%
+     \addtocommalist{#1}\inmargintaglist
+     \presetmargintext[#1]%
+   \fi}
 
-\def\maakmargetekstblok#1#2#3#4#5#6%
-  {#4\relax
-   \bgroup
+\def\presetmargintext[#1]%
+  {\presetlocalframed
+     [\??im#1]%
+   \getparameters
+     [\??im#1]
+     [\c!frame=\v!off,
+      \c!offset=\v!overlay,
+      \c!line=1,
+      \c!separator=,
+      \c!width=\v!broad,
+      \c!distance=\zeropoint,
+      \c!style=\@@imstyle,
+      \c!color=\@@imcolor,
+      \c!location=\@@imlocation,
+      \c!align=\@@imalign,
+      \c!before=\@@imbefore,
+      \c!after=\@@imafter]}
+
+\newdimen\naturalmargincontentheight
+
+\def\makemargintextblock#1#2#3#4% width l r content
+  {\bgroup
    \forgetall % added, else problems with 'center' and nested itemize
-   \mindermeldingen
+   \dontcomplain
    \hsize#1\relax
-   \doifnumberelse\margetekstnummer
-     {\ifcase\margetekstnummer\relax
-        \def\margetekstnummer{#2}%
+   \doifnumberelse\margincontenttag
+     {\ifcase\margincontenttag\relax
+        \def\margincontenttag{#2}% first one is setups id as well
       \fi}
      \donothing
-   \doifnumberelse\margetekstnummer
-     {\ifnum\margetekstnummer>25 % to be translated
-        \writestatus\m!systems{potential margin stack overflow (\margetekstnummer)}%
+   \doifnumberelse\margincontenttag
+     {\ifnum\margincontenttag>25 % to be translated
+        \writestatus\m!systems{potential margin stack overflow (\margincontenttag)}%
       \fi}
      \donothing
-   % todo
+   % we need to preserve {a,b,c} kind of settings
+   \let\margincontentalign#2%
    \processallactionsinset
-     [\getvalue{\??im\margetekstnummer\c!uitlijnen}]
-     [     \v!ja=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{#2},
-          \v!nee=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{\v!normaal},
-       \v!binnen=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{#2},
-       \v!buiten=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{#3},
-        \v!links=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{\v!links},
-       \v!midden=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{\v!midden},
-       \v!rechts=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{\v!rechts},
-      \s!default=>\setvalue{\??im\margetekstnummer\c!uitlijnen}{#2}]%
-   \setbox0\vbox\localframed
-     [\??im\margetekstnummer]
-     [\c!strut=\v!nee]
-     {\decrement\margetekstregels
-      \@@imvoor
-      \dostartattributes{\??im\margetekstnummer}\c!letter\c!kleur\empty
-        \dorecurse\margetekstregels{\strut\\}%
-        \xdef\margestrutheight{\the\strutht}%
-        \begstrut#6\endstrut\endgraf
+     [\getvalue{\??im\margincontenttag\c!align}]
+     [     \v!yes=>\let\margincontentalign#2,
+          \v!no=>\let\margincontentalign\v!normal,
+       \v!inner=>\let\margincontentalign#2,
+       \v!outer=>\let\margincontentalign#3,
+        \v!left=>\let\margincontentalign\v!left,
+       \v!middle=>\let\margincontentalign\v!middle,
+       \v!right=>\let\margincontentalign\v!right]%
+   \doifvaluesomething{\??im\margincontenttag\c!align} % watch {} around set
+     {\edef\margincontentalign{{\getvalue{\??im\margincontenttag\c!align},\margincontentalign}}}%
+   %
+   \expanded{\getparameters
+     [\??im\margincontenttag]
+     [\c!strut=\v!no,\c!offset=\v!overlay,\c!align=\margincontentalign]}%
+   %
+   \savestrut %
+   \setbox\scratchbox\vbox\localframed
+     [\??im\margincontenttag]
+     {\decrement\margincontentlines
+      \dorecurse\margincontentlines{\savedstrut\endgraf\nointerlineskip}% ! savedstrut
+      \@@imbefore
+      \dostartattributes{\??im\margincontenttag}\c!style\c!color\empty
+        \setstrut % yes or no
+        \begstrut#4\endstrut\endgraf
+        \xdef\margincontentstrutheight{\the\strutht}% so that it's known outside the framed
       \dostopattributes
-      \@@imna}%
-   \doif\@@imstapel\v!ja
+      \@@imafter}%
+   \global        \naturalmargincontentheight\ht\scratchbox
+   \global\advance\naturalmargincontentheight\dp\scratchbox
+   \doif\@@imstack\v!yes
      {\def\overlappingmargin{-20\scaledpoint}% test value, maybe .25\strutboxdp, maybe configurable
-      \setbox0\vbox{\stackeddown\vbox{\box0}}}% new
-   \ht0\strutht
-   \box0
-   \egroup
-   #5\relax}
+      \setbox\scratchbox\vbox{\stackeddown\vbox{\box\scratchbox}}}% new
+   \ht\scratchbox\strutht
+\dp\scratchbox\strutdp % nieuw
+   \box\scratchbox
+   \egroup}
 
 %D The stacker permits constructs like:
 %D
-%D \starttypen
-%D \stelinmargein[stapel=ja]
+%D \starttyping
+%D \setupinmargin[stack=yes]
 %D
-%D \inlinker{test 1}test\break
-%D \inlinker{test 2}test\break
-%D \inlinker{test 1}
+%D \inleft{test 1}test\break
+%D \inleft{test 2}test\break
+%D \inleft{test 1}
 %D \input tufte
-%D \inlinker{test 1}
-%D \inlinker{test 2}
-%D \inlinker{test 3}
+%D \inleft{test 1}
+%D \inleft{test 2}
+%D \inleft{test 3}
 %D \input tufte
-%D \inlinker{test 1}
-%D \inlinker{test 2\endgraf test 3}
-%D \inlinker{test 4}
+%D \inleft{test 1}
+%D \inleft{test 2\endgraf test 3}
+%D \inleft{test 4}
 %D \input tufte
-%D \inlinker{test 1}
-%D \inlinker{test 2\endgraf test 3}
-%D \inlinker{test 4\endgraf test 5\endgraf test 6}
-%D \inlinker{test 7\endgraf test 8\endgraf test 9}
+%D \inleft{test 1}
+%D \inleft{test 2\endgraf test 3}
+%D \inleft{test 4\endgraf test 5\endgraf test 6}
+%D \inleft{test 7\endgraf test 8\endgraf test 9}
 %D \input tufte
-%D \stoptypen
-
-\def\plaatsmargetekstscheider
-  {\ifnum\margincontent>\zerocount
-     \bgroup
-     \dimen0=\margetekstregels\lineheight
-     \advance\dimen0 -\lineheight
-     \lower\dimen0\hbox{\margetekstscheider}%
-     \egroup
-   \fi}
-
-\def\linkermargetekstblok#1%
-  {\maakmargetekstblok \leftmargintextwidth \v!links \v!rechts
-     {\llap{\plaatsmargetekstscheider}}{\hskip\margetekstafstand}
-     {#1}}
-
-% \def\rechtermargetekstblok#1%
-%   {\maakmargetekstblok \rightmargintextwidth \v!rechts \v!links
-%      {\hskip\margetekstafstand}{\rlap{\plaatsmargetekstscheider}}
-%      {#1}}
-
-\def\rechtermargetekstblok#1% new: hsize correction
-  {\maakmargetekstblok \rightmargintextwidth \v!rechts \v!links
-     {\hskip\margetekstafstand\hskip\tekstbreedte\hskip-\hsize }{\rlap{\plaatsmargetekstscheider}}
-     {#1}}
-
-\def\doplacemargintext#1#2#3%
-  {\strut
-   \setbox0\hbox{#1}% % todo: make sure that color stack works
-   \dimen0\ht0
-   \advance\dimen0 \dp0
-   \ifdim\dimen0>\marginheight
-     \global\marginheight\dimen0
-   \fi
-   \setbox0\hbox
-     {#2{\hskip#3\strut
-         \iflowinmargin\else
-           \dimen0\strutdp
-           \advance\dimen0 \margestrutheight
-           \advance\dimen0 -\strutht
-           \raise\dimen0
-         \fi
-         \box0}}%
-   \ht0\zeropoint
-   \dp0\zeropoint
-   \gdef\margestrutheight{\the\strutht}%
-  %\graphicvadjust{\box0}} % fails in high math lines, let it be
-  %\hbox{\lower\strutdp\box0}} % alas, wrong lapping, therefore useless
-   \dopositionmarginbox0}
+%D \stoptyping
 
 %D This approach permits us to implement a better mechanism
 %D later. We need the \type {\graphicvadjust} in order to
 %D handle:
 %D
-%D \starttypen
-%D \inlinker{test} {\red \dorecurse{40}{test }\par}
-%D {\red \inlinker{test} \dorecurse{40}{test }\par}
-%D \stoptypen
+%D \starttyping
+%D \inleft{test} {\red \dorecurse{40}{test }\par}
+%D {\red \inleft{test} \dorecurse{40}{test }\par}
+%D \stoptyping
 %D
 %D The outer margin color is either black or color set as
 %D main text color.
 
+\newif\ifrightmargin % documenteren
+
 \ifx\dopositionmarginbox\undefined
   \def\dopositionmarginbox#1{\graphicvadjust{\box#1}}
 \fi
 
-\def\leftmargintextdistance  {\getvalue{\??im\v!links \c!afstand}}
-\def\rightmargintextdistance {\getvalue{\??im\v!rechts\c!afstand}}
-
-\def\leftmargintextwidth     {\getvalue{\??im\v!links \c!breedte}}
-\def\rightmargintextwidth    {\getvalue{\??im\v!rechts\c!breedte}}
-
-\def\doinlinker#1%
-  {\doplacemargintext
-     {\linkermargetekstblok{#1}\hskip\leftmargintextdistance}
-     \llap\zeropoint}
-
-\def\doinrechter#1%
-  {\doplacemargintext
-     {\hskip\rightmargintextdistance\rechtermargetekstblok{#1}}
-     \rlap\hsize}
-
-\newcounter \nofmarginnotes
-\newif      \iftrackingmarginnotes
-\newif      \ifrightmargin            % documenteren
-
-\definetwopasslist\s!margin
-
-\def\domarginreference % todo: use doonrightpage
-  {\doglobal\increment\nofmarginnotes\relax
-   \edef\writemarref
-     {\writeutilitycommand%
-        {\twopassentry%
-           {\s!margin}%
-           {\nofmarginnotes}%
-           {\noexpand\realfolio}}}%
-   \writemarref}
-
-\def\dodoinmargenormal#1#2#3#4%
-  {\iffirstsidefloatparagraph\geenwitruimte\fi % zo laat mogelijk
-   \ifodd#1\relax
-     \rightmargintrue
-     #3{#4}%
-   \else
-     \rightmarginfalse
-     #2{#4}%
-   \fi}
+% watch out, margin dimensions are swapped locally (\swapmargins)
 
-\def\doinmargenormal#1#2#3%
-  {\bgroup
-   \iftrackingmarginnotes
-     \gettwopassdata\s!margin
-     \iftwopassdatafound
-       \dodoinmargenormal\twopassdata#1#2{#3}%
-     \else
-       \dodoinmargenormal\realfolio#1#2{#3}%
-     \fi
-     \domarginreference
-   \else
-     \dodoinmargenormal\realfolio#1#2{#3}%
+% with \margincontentmethod one can control pagebreaks
+%
+% 0 no break
+% 1 each entry is one line
+% 2 only natural height
+% 3 also stack height
+
+\chardef\margincontentmethod\plusthree % beware: 1 = old method
+\def\margincontentextralines{1}        % old method, play safe
+
+\def\doplacemargintext#1#2#3#4%
+  {\strut
+   \doifsomething{#1}
+     {\def\margincontenttag{#1}}%
+   \doifinsetelse{\margincontenttag}{\v!left,\v!right} % ugly hack
+     {\let \margincontentdistance                                                      \zeropoint}
+     {\edef\margincontentdistance {\executeifdefined{\??im\margincontenttag\c!distance }\zeropoint}}%
+   \edef\margincontentlines    {\executeifdefined{\??im\margincontenttag\c!line   }\plusone  }%
+   \edef\margincontentseparator{\executeifdefined{\??im\margincontenttag\c!separator}\donothing}%
+   \setbox\scratchbox\hbox{#4}% % todo: make sure that color stack works
+\ifcase\margincontentmethod
+  \scratchdimen\zeropoint
+\or % old method
+  \scratchdimen\ht\scratchbox
+  \advance\scratchdimen\dp\scratchbox
+\or
+  \scratchdimen\naturalmargincontentheight
+\or
+  \scratchdimen\naturalmargincontentheight
+  \ifx\laststackvmove\undefined\else\global\advance\scratchdimen\laststackvmove\fi
+\fi
+   \ifdim\scratchdimen>\margincontentheight
+     \global\margincontentheight\scratchdimen
    \fi
-   \egroup}
+   \setbox\scratchbox\hbox
+     {#2{\hskip#3\strut
+         \ifcase\margincontentdisplacement
+           % normal, move strutheight up
+           \scratchdimen\strutdp
+           \advance\scratchdimen \margincontentstrutheight
+           \advance\scratchdimen -\strutht
+           \raise\scratchdimen
+         \or
+           % low, obey vadjust
+         \fi
+         \box\scratchbox}}%
+   \ht\scratchbox\zeropoint
+   \dp\scratchbox\zeropoint
+   \gdef\margincontentstrutheight{\the\strutht}%
+  %\graphicvadjust{\box\scratchbox}}     % fails in high math lines, let it be
+  %\hbox{\lower\strutdp\box\scratchbox}} % alas, wrong lapping, therefore useless
+   \dopositionmarginbox\scratchbox}
+
+\def\leftmargintextdistance {\getvalue{\??im\v!left \c!distance}}
+\def\rightmargintextdistance{\getvalue{\??im\v!right\c!distance}}
+
+\def\leftmargintextwidth    {\getvalue{\??im\v!left \c!width}}
+\def\rightmargintextwidth   {\getvalue{\??im\v!right\c!width}}
+
+\def\doleftmarginblock#1#2%
+  {\doplacemargintext{#1}\llap\zeropoint
+     {\llap{\placemargincontentseparator}%
+      \makemargintextblock\leftmargintextwidth\v!left\v!right{#2}%
+      \hskip\margincontentdistance
+      \hskip\leftmargintextdistance}}
+
+\def\dorightmarginblock#1#2%
+  {\doplacemargintext{#1}\rlap\hsize
+     {\hskip\rightmargintextdistance
+      \hskip\margincontentdistance
+      \hskip\textwidth\hskip-\hsize % new: hsize correction
+      \makemargintextblock\rightmargintextwidth\v!right\v!left{#2}%
+      \rlap{\placemargincontentseparator}}}
+
+\def\placemargincontentseparator
+  {\ifnum\margincontentlevel>\zerocount
+     \ifx\margincontentseparator\empty\else
+       \bgroup
+       \scratchdimen\margincontentlines\lineheight
+       \advance\scratchdimen -\lineheight
+       \lower\scratchdimen\hbox{\margincontentseparator}%
+       \egroup
+     \fi
+   \fi}
 
-\def\doinmargereverse#1#2#3%
-  {\dodoinmargenormal\realfolio#2#1{#3}}
+%
 
-\def\doinmarge[#1][#2][#3][#4][#5]#6%
-  {\doifcommonelse{+,-,\v!laag}{#4}
-     {\dodoinmarge[#1][#2][#3][#4][#5]{#6}}
-     {\dodoinmarge[#1][#2][#3][][#4]{#6}}%
-   \ignorespaces}
+\newbox\marginconstructbox
+
+% \def\doinmarginswapped#1#2#3#4%
+%   {\iffirstsidefloatparagraph\geenwitruimte\fi % zo laat mogelijk
+%    \setbox\marginconstructbox\hbox\bgroup % prevents page break in the middle of construction
+%      \signalrightpage
+%      \doifswappedrightpageelse
+%        {\rightmargintrue \freezepagestate#2}
+%        {\rightmarginfalse\freezepagestate#1}
+%        {#3}% setups
+%        {\freezepagestate#4}% content
+%    \egroup
+%    \unhbox\marginconstructbox}
+
+\def\doinmarginswapped#1#2#3#4%
+  {\iffirstsidefloatparagraph\nowhitespace\fi % zo laat mogelijk
+   \setbox\marginconstructbox\hbox\bgroup % prevents page break in the middle of construction
+     \startsignalrightpage
+       \doifswappedrightpageelse
+         {\rightmargintrue #2}
+         {\rightmarginfalse#1}
+         {#3}% setups
+         {#4}% content
+     \stopsignalrightpage
+   \egroup
+   \unhbox\marginconstructbox}
 
-\def\dodoinmarge[#1][#2][#3][#4][#5]#6%
-  {\ignorespaces
-   \bgroup\postponefootnotes % group is (somehow) needed
-   \doifinsetelse\v!laag{#4}
-     \lowinmargintrue
-     \lowinmarginfalse
+
+% history made this a bit complicated, the +/- was needed before
+% we had enough mem/hash to do the page correction
+
+\edef\inmargintaglist{+,-,\v!low,\v!left,\v!right,\v!inner,\v!outer}
+
+% the old one:
+%
+% \def\doinmargin[#1][#2][#3][#4][#5]% #6 #7
+%   {\doifcommonelse{+,-,\v!laag}{#4}
+%      {\dodoinmargin[#1][#2][#3][#4][#5]}
+%      {\dodoinmargin[#1][#2][#3][][#4]}}
+%
+% an alternative:
+%
+% \letvalue{\??im\v!laag\c!offset}\empty
+% \letvalue{\??im      +\c!offset}\empty
+% \letvalue{\??im      -\c!offset}\empty
+%
+% \def\doinmargin[#1][#2][#3][#4][#5]% #6 #7
+%   {\doifnumberelse{#4}
+%      {\dodoinmargin[#1][#2][#3][#4][#5]}
+%      {\doifdefinedelse{\??im#4\c!offset}
+%         {\dodoinmargin[#1][#2][#3][#4][#5]}
+%         {\dodoinmargin[#1][#2][#3][][#4]}}}
+%
+% the problem is that we ned to keep downward compatibility
+% with respect to the first argument thing a reference or a
+% directive; the alternative is to force users to pass a
+% directive along with a reference; anyhow, as long as one
+% does not use references that have the same name as a
+% directive we can use the (slow) alternative
+
+\def\doinmargin[#1][#2][#3][#4][#5]% #6 #7
+% {\expanded{\doifcommonels{#4}{\inmargintaglist}}
+  {\expanded{\doifinsetelse{#4}{\inmargintaglist}}
+     {\dodoinmargin[#1][#2][#3][#4][#5]}
+     {\dodoinmargin[#1][#2][#3][][#4]}}
+
+\def\defineinmargin
+  {\doquadrupleempty\dodefineinmargin}
+
+\def\dodefineinmargin[#1][#2][#3][#4]%
+  {\doifassignmentelse{#4}
+     {\setupinmargin[#1][#4]%
+      \setvalue{#1}{\indentation\doquintupleempty\doinmargin[#2][#3][#1]}}
+     {\setvalue{#1}{\indentation\doquintupleempty\doinmargin[#2][#3][#4]}}}
+
+\defineinmargin[inleft]  [\v!left]    [\v!normal]    % takes left settings
+\defineinmargin[inright] [\v!right]   [\v!normal]    % takes right settings
+\defineinmargin[ininner] [\v!inner]   [\v!normal]    % takes left/right settings
+\defineinmargin[inouter] [\v!outer]   [\v!normal]    % takes left/right settings
+\defineinmargin[inmargin][\@@imlocation] [\v!normal]    % takes left/right settings
+\defineinmargin[inother] [\@@imlocation] [\v!reverse]  % takes left/right settings
+
+\def\inothermargin{\inother}
+
+%D This permits definitions like:
+%D
+%D \starttyping
+%D \defineinmargins[SomePlace] [inner] [normal] [distance=1cm]
+%D \defineinmargins[SomePlace] [inner] [normal] [SomePlace]    \setupinmargin[SomePlace][distance=1cm]
+%D \defineinmargins[MyPlace]   [inner] [normal] [SomePlace]
+%D \defineinmargins[YourPlace] [inner] [normal] [SomePlace]
+%D \stoptyping
+%D
+%D A torture test:
+%D
+%D \starttyping
+%D \startbuffer
+%D \inleft       {\TestLine{red}    {l}} test test test \par
+%D \inright      {\TestLine{green}  {r}} test test test \par
+%D \inmargin     {\TestLine{blue}   {m}} test test test \par
+%D \inothermargin{\TestLine{yellow} {x}} test test test \par
+%D \ininner      {\TestLine{cyan}   {i}} test test test \par
+%D \inouter      {\TestLine{magenta}{o}} test test test \par
+%D \stopbuffer
+%D
+%D \dorecurse{80}\getbuffer \page
+%D stoptypen
+%D
+%D and
+%D
+%D \starttyping
+%D \defineinmargin[InOuterA] [outer] [normal] [distance=0cm]
+%D \defineinmargin[InOuterB] [outer] [normal] [distance=1cm]
+%D \defineinmargin[InOuterC] [outer] [normal] [distance=2cm,line=2]
+%D
+%D \startbuffer
+%D \InOuterA{\TestLine{red}  {A}} test test test \par
+%D \InOuterB{\TestLine{green}{B}} test test test \par
+%D \InOuterC{\TestLine{blue} {C}} test test test \par
+%D \stopbuffer
+%D
+%D \dorecurse{80}\getbuffer \page
+%D
+%D \dorecurse{10}{\inleft {one} test \inleft {two} test } \page
+%D
+%D \start
+%D   \margintext {one} \margintext {two} \input thuan \par
+%D   \setupinmargin[1][line=3,distance=1cm]
+%D   \margintext [1]{one}
+%D   \margintext [2]{two}
+%D   \input thuan \page
+%D \stop
+%D
+%D \setupinmargin[3][location=inner,distance=1cm]
+%D \setupinmargin[4][location=outer,distance=2cm]
+%D
+%D % \setupinmargin[left] [line=2]
+%D % \setupinmargin[right][line=2]
+%D
+%D \dorecurse
+%D   {10}
+%D   {\margintext       {\kern3cm\TestLine{blue}{none}}
+%D    \margintext[3]    {\TestLine{darkgray}{3}}
+%D    \margintext[4]    {\TestLine{darkgray}{4}}
+%D    \margintext[left] {\TestLine{red}     {left}}
+%D    \margintext[right]{\TestLine{green}   {right}}
+%D    \margintext[inner]{\TestLine{cyan}    {inner}}
+%D    \margintext[outer]{\TestLine{magenta} {outer}}
+%D    \input thuan \endgraf}
+%D
+%D \dorecurse{10}{\margintext{test\\test\\test} \input thuan \endgraf}
+%D \stoptyping
+
+\def\dodoinmargin[#1][#2][#3][#4][#5]#6%
+  {\bgroup
+   \postponefootnotes % group is (somehow) needed
+   \doifinsetelse\v!low{#4}
+     {\chardef\margincontentdisplacement\plusone}
+     {\chardef\margincontentdisplacement\zerocount}%
+   \doif\v!reverse{#2}
+     {\swapmacros\dorightmarginblock\doleftmarginblock}%
    \processaction
      [#1]
-     [  \v!links=>#2{#6},
-       \v!rechts=>#3{#6},
+     [  \v!left=>\let\next\doleftmarginblock,  % no swapping
+       \v!right=>\let\next\dorightmarginblock, % no swapping
+       \v!inner=>\def\next{\doinmarginswapped\dorightmarginblock\doleftmarginblock },
+       \v!outer=>\def\next{\doinmarginswapped\doleftmarginblock \dorightmarginblock},
       \s!unknown=>\ifdubbelzijdig
                     \doifcommonelse{+,-}{#4}
-                      \doinmargereverse\doinmargenormal#2#3{#6}%
+                      {\def\next{\doinmarginswapped\dorightmarginblock\doleftmarginblock }}
+                      {\def\next{\doinmarginswapped\doleftmarginblock \dorightmarginblock}}%
                   \else
-                    #2{#6}%
+                    \let\next\doleftmarginblock
                   \fi]%
-   \rawpagereference\s!mar{#5}%
-   \flushnotes\egroup % don't forget the group
+   \next{#3}{#6}%
+   \rawpagereference\s!mar{#5}% naar binnen ! ! ! !
+   \flushnotes
+   \egroup % don't forget the group
    \ignorespaces}
 
-\def\inlinker
-  {\indentation\doquintupleempty\doinmarge
-     [\v!links][\doinlinker][\doinrechter]}
+% dit zijn voorlopig lokale commando's / vervallen
+%
+% \def\woordinmarge {\indentation\doquintupleempty\doinmargin[\@@implaats][\inleftmargin][\inrightmarge]}
+%
+% \def\woordinlinker {\inleftmargin  } % vervallen
+% \def\woordinrechter{\inrechtermarge} % vervallen
 
-\def\inrechter
-  {\indentation\doquintupleempty\doinmarge
-     [\v!rechts][\doinlinker][\doinrechter]}
+% Some day: \definemarking[\v!margetitel]
 
-\def\inmarge
-  { \doquintupleempty\doinmarge
-     [\@@implaats][\doinlinker][\doinrechter]}
+%D Now come the margin text collectors. The collected content is
+%D flushed at every paragraph by the following macro. Note for
+%D myself: here the location (plaats) is no longer a tag (number).
 
-\def\inanderemarge
-  {\doquintupleempty\doinmarge
-     [\@@implaats][\doinrechter][\doinlinker]}
+% gone: \def\doflushmargincontent{\doinmargin[\@@implaats][\v!normaal][]} % + [#1][#2]{#3}}
 
-\newcounter\margincontent
+%D These are now all the same (long ago they had different
+%D implementations, somewhere in Sork time if I remember
+%D right).
 
-\def\doflushmargincontent % [#1][#2]#3% hier plaats 'globaal' (geen 1,2 enz)
-  {\doinmarge[\@@implaats][\doinlinker][\doinrechter]} % [#1][#2]{#3}}
+\def\margintext {\dodoubleempty\domargincontent}
+\def\marginword {\margintext}
+\def\margintitle{\margintext} % txt mark as well
 
-\newdimen\marginheight
+\newtoks\collectedmargintexts
+\chardef\margintextcollected  \zerocount
 
-\let\restoreinterlinepenalty=\relax
+\def\domargincontent[#1][#2]#3% we used to check for #2/#1 being number, no longer now
+  {\global\chardef\margintextcollected\plusone
+   \edef\margincontenttag{#1}%
+   \ifx\margincontenttag\empty
+     \doglobal\increment\margincontentlevel
+     \let\margincontenttag\margincontentlevel
+   \fi
+   \checkinmargin[\margincontenttag]%
+   \doglobal \appendetoks
+     \noexpand \checkinmargin[\margincontenttag]%
+     \noexpand \doinmargin[\executeifdefined{\??im\margincontenttag\c!location}\@@imlocation][\v!normal][\margincontenttag][\margincontenttag][#2]%
+   \to \collectedmargintexts
+   \doglobal \appendtoks
+     {#3}%
+   \to \collectedmargintexts}
+
+\let\restoreinterlinepenalty\relax
 
 \def\flushmargincontents % plural
-  {\restoreinterlinepenalty  % here?
-   \ifcase\margincontent\else           % called quite often, so we
+  {\restoreinterlinepenalty % here?
+   \ifcase\margintextcollected\else     % called quite often, so we
      \expandafter\doflushmargincontents % speed up the \fi scan by
    \fi}                                 % using a \do..
 
-% for a manual flush in for instance headers
-
-% \def\placemargintexts % to be documented and translated
-%   {\ifcase\margincontent\else
-%      \bgroup
-%        \let\normalvadjust\fakedvadjust
-%        \doflushmargincontents
-%      \egroup
-%    \fi}
-
-\def\placemargintexts % to be documented and translated
-  {\ifcase\margincontent\else
-     \bgroup
-       \chardef\graphicvadjustmode\zerocount
-       \doflushmargincontents
-     \egroup
-   \fi}
-
 \def\doflushmargincontents % links + rechts
   {\bgroup
    \forgetall
-   \global\marginheight\zeropoint
-   \dorecurse\margincontent
-     {\bgroup
-      \edef\margetekstafstand {\getvalue{\??im\recurselevel\c!afstand }}%
-      \edef\margetekstregels  {\getvalue{\??im\recurselevel\c!regel   }}%
-      \edef\margetekstscheider{\getvalue{\??im\recurselevel\c!scheider}}%
-      \let\margetekstnummer\recurselevel
-      \getvalue{\??im\recurselevel}%
-      \letgvalue{\??im\recurselevel}\empty
-      \egroup}%
-   \ifbinnenkolommen
+   \global\margincontentheight\zeropoint
+   \startsignalrightpage
+     \the\collectedmargintexts
+     \signalrightpage
+   \stopsignalrightpage
+   \resetmargincontent
+   % dirty tricks
+   \ifcase\margincontentmethod
+     \donefalse
+   \else\ifinsidecolumns % brrrr
      \donetrue  % how fuzzy
-   \else\ifdim\marginheight>\lineheight\relax
+   \else\ifdim\margincontentheight>\lineheight\relax
      \donetrue  % how dirty
    \else
      \donefalse % how needed
-   \fi\fi
+   \fi\fi\fi
    \ifdone
-     \advance\marginheight \pagetotal
-     \advance\marginheight \lineheight  % a sort of bonus
-     \ifdim\marginheight>\pagegoal
-       \xdef\restoreinterlinepenalty
-         {\global\let\restoreinterlinepenalty\relax
-          \global\interlinepenalty=\the\interlinepenalty}% keep = here
-       \global\interlinepenalty10000
+     \advance\margincontentheight \margincontentextralines\lineheight
+     \bgroup % preserve \margincontentheight
+     \advance\margincontentheight \pagetotal
+     \ifdim\margincontentheight>\pagegoal
+       \egroup
+       \setmargincontentpenalties
+     \else
+       \egroup
      \fi
    \else % We need the above because interlinepenalties overrule vadjusted \nobreaks.
      \vadjust{\nobreak}%
    \fi
-   \doglobal\newcounter\margincontent
    \egroup}
 
-% Some day: \definemarking[\v!margetitel]
-
-\def\docomplexmargewoord#1#2#3%
-  {\@EA\setgvalue\@EA{\@EA\??im\@EA\margincontent\@EA}\@EA
-     {\@EA\stelinmargein\@EA[\margincontent][]%  see next macro
-      \doflushmargincontent[#1][#2]{#3}}}
-
-\def\complexmargewoord[#1][#2]#3%
-  {\doglobal\increment\margincontent
-   \stelinmargein[\margincontent][]% see next macro
-   \ifsecondargument
-     \doifnumberelse{#1} % only one #3 (after test)
-       {\docomplexmargewoord{#2}{#1}{#3}}
-       {\docomplexmargewoord{#1}{#2}{#3}}%
-   \else
-     \doifnumberelse{#1}
-       {\docomplexmargewoord{}{#1}{#3}}
-       {\docomplexmargewoord{#1}{}{#3}}%
-   \fi}
-
-\def\margewoordpositie[#1]#2%
-  {\ifnum#1>\margincontent
-     \xdef\margincontent{#1}%
-   \fi
-   \stelinmargein[#1][]% when at outer level, saves local settings
-   \setgvalue{\??im#1}%
-     {\stelinmargein[#1][]% needed when par start outside group
-      \doflushmargincontent[][]{#2}}}
-
-\def\margewoord
-  {\dodoubleempty\complexmargewoord}
-
-\def\margetitel{\margewoord}
-\def\margetekst{\margewoord}
-
-\def\oplinker#1%
-  {\strut
-   \graphicvadjust
-     {\mindermeldingen
-      \setbox0\vtop{\forgetall\strut#1}%
-      \getboxheight\dimen0\of\box0
-      \vskip-\dimen0 % waarom stond hier een \ ?
-      \box0}}
-
-\def\resetmargincontent % quick hack
-  {\doglobal\newcounter\margincontent}
-
-\def\resetmargetitels
-  {\resetmargincontent}
-
-%D \macros
-%D   {inleftside,inleftmargin,inrightmargin,inrightside}
-%D
-%D The fast and clean way of putting things in the margin is
-%D using \type{\rlap} or \type{\llap}. Unfortunately these
-%D macro's don't handle indentation, left and right skips. We
-%D therefore embed them in some macro's that (force and)
-%D remove the indentation and restore it afterwards.
-
-% beware: no \hsize is set (yet)!
-
-% \def\inleftmargin#1%
-%   {\pushindentation
-%    \llap{#1\hskip\leftskip\hskip\leftmargintextdistance}%
-%    \popindentation
-%    \ignorespaces}
-
-% \def\inrightmargin#1%
-%   {\pushindentation
-%    \rlap{\hskip\hsize\hskip-\rightskip\hskip\rightmargintextdistance#1}%
-%    \popindentation
-%    \ignorespaces}
-
-% \def\inleftedge#1%
-%   {\inleftmargin
-%      {#1\relax
-%       \hskip\linkermargebreedte
-%       \hskip\linkerrandafstand}}
-
-% \def\inrightedge#1%
-%   {\inrightmargin
-%      {\hskip\rechtermargebreedte
-%       \hskip\rechterrandafstand
-%       #1}}
-
-% \hsize added per August 2003:
-
-\def\inleftmargin#1%
-  {\pushindentation
-   \llap
-     {\hsize\linkermargebreedte
-      #1\relax
-      \hskip\leftskip
-      \hskip\linkermargeafstand}%
-   \popindentation
-   \ignorespaces}
-
-% \def\inrightmargin#1%
-%   {\pushindentation
-%    \rlap
-%      {\hskip\hsize
-%       \hskip-\rightskip
-%       \hskip\rechtermargeafstand
-%       \hsize\rechtermargebreedte
-%       #1}%
-%    \popindentation
-%    \ignorespaces}
+\beginETEX
 
+  \def\setmargincontentpenalties
+    {\xdef\restoreinterlinepenalty{\global\resetpenalties\interlinepenalties}%
+     \getnoflines\margincontentheight
+     \global\setpenalties\interlinepenalties\noflines\!!tenthousand}
 
-\def\inrightmargin#1% new: hsize correction
-  {\pushindentation
-   \rlap
-     {\hskip\tekstbreedte
-      %\hskip-\hsize
-      %\hskip\hsize
-      \hskip-\rightskip
-      \hskip\rechtermargeafstand
-      \hsize\rechtermargebreedte
-      #1}%
-   \popindentation
-   \ignorespaces}
+\endETEX
 
-\def\inleftedge#1%
-  {\inleftmargin
-     {\hsize\linkermargebreedte
-      #1\relax
-      \hskip\linkermargebreedte
-      \hskip\linkerrandafstand}}
+\beginTEX
 
-\def\inrightedge#1%
-  {\inrightmargin
-     {\hskip\rechtermargebreedte
-      \hskip\rechterrandafstand
-      \hsize\rechtermargebreedte
-      #1}}
+  \def\setmargincontentpenalties
+    {\xdef\restoreinterlinepenalty
+       {\global\let\restoreinterlinepenalty\relax
+        \global\interlinepenalty=\the\interlinepenalty}% keep = here
+     \global\interlinepenalty\!!tenthousand}
 
-\let\inleftside \inleftedge
-\let\inrightside\inrightedge
+\endTEX
 
-%D We want to keep things efficient and therefore only handle
-%D situations like:
-%D
-%D \startbuffer
-%D                  \inleftside    {fine} some text \par
-%D \strut           \inleftmargin  {fine} some text \par
-%D \noindent        \inrightmargin {fine} some text \par
-%D \noindent \strut \inrightside   {fine} some text \par
-%D \stopbuffer
-%D
-%D \typebuffer
-%D
-%D which looks like:
-%D
-%D \bgroup
-%D \haalbuffer
-%D \parindent 30pt
-%D \haalbuffer
-%D \egroup
-
-%D New, yet undocumented:
-%D
-%D used for pascal:
-%D
-%D \starttypen
-%D \index {test} test \index {west} west \index {rest} rest
-%D
-%D \startnarrower
-%D \placeregister[index][alternative=b,command=\atleftmargin]
-%D \stopnarrower
-%D \stoptypen
+% Yet undocumented, for a manual flush in for instance headers.
 
-\def\atleftmargin#1%
-  {\pushindentation
-   \llap{\rlap{#1}\hskip\leftskip}%
-   \popindentation
-   \ignorespaces}
+\def\resetmargincontent
+  {\doglobal\newcounter\margincontentlevel
+   \global\chardef\margintextcollected\zerocount
+   \global\collectedmargintexts\emptytoks}
 
-\def\atrightmargin#1%
-  {\pushindentation
-   \rlap{\hskip\hsize\hskip-\rightskip\llap{#1}}%
-   \popindentation
-   \ignorespaces}
+\def\placemargincontent
+  {\ifcase\margincontentlevel\else
+     \bgroup
+       \chardef\graphicvadjustmode\zerocount
+       \doflushmargincontents
+     \egroup
+   \fi}
 
-% dit zijn voorlopig lokale commando's
+% For old times sake (i use it in project styles) we provide
 
-\def\woordinlinker {\inleftmargin}  % vervallen
-\def\woordinrechter{\inrechtermarge} % vervallen
+\def\placemargintexts {\placemargincontent}
+\def\resetmargetitels {\resetmargincontent}
+\def\margewoordpositie{\margewoord} % obsolete, now no longer range
 
-\def\woordinmarge
-  {\doquintupleempty\doinmarge
-     [\@@implaats][\woordinlinker][\woordinrechter]}
+% but never use them yourself since they may disappear.
 
+\def\oplinker#1%
+  {\strut
+   \graphicvadjust
+     {\dontcomplain
+      \setbox\scratchbox\vtop{\forgetall\strut#1}%
+      \getboxheight\scratchdimen\of\box\scratchbox
+      \vskip-\scratchdimen % waarom stond hier een \ ?
+      \box\scratchbox}}
+
+\setupinmargin
+  [\c!style=\v!bold,
+   \c!color=,
+   \c!location=\v!both,
+   \c!align=\v!inner,
+   \c!stack=\v!no,
+   \c!before=,
+   \c!after=]
+
+\setupinmargin
+  [\v!left]
+  [\c!distance=\leftmargindistance,
+   \c!width=\leftmarginwidth,
+  %\c!align=\v!left, % no
+   \c!location=\v!left]
+
+\setupinmargin
+  [\v!right]
+  [\c!distance=\rightmargindistance,
+   \c!width=\rightmarginwidth,
+  %\c!align=\v!right, % no
+   \c!location=\v!right]
+
+% bonus needed when [inner/outer] is used as tag
+
+\setupinmargin[\v!inner][\c!location=\v!inner,\c!align=\v!inner]
+\setupinmargin[\v!outer][\c!location=\v!outer,\c!align=\v!inner]
+
+% more efficient (5K less fotmat file)
 %
-
-\stelinmargein
-  [\c!letter=\v!vet,
-   \c!kleur=,
-   \c!plaats=\v!beide,
-   \c!uitlijnen=\v!binnen,
-   \c!stapel=\v!nee,
-   \c!voor=,
-   \c!na=]
-
-\stelinmargein
-  [\v!links]
-  [\c!afstand=\linkermargeafstand,
-   \c!breedte=\linkermargebreedte,
-  %\c!uitlijnen=\v!links, % njet
-   \c!plaats=\v!links]
-
-\stelinmargein
-  [\v!rechts]
-  [\c!afstand=\rechtermargeafstand,
-   \c!breedte=\rechtermargebreedte,
-  %\c!uitlijnen=\v!rechts, % njet
-   \c!plaats=\v!rechts]
+% \letvalue{\??im\v!binnen\c!plaats}\v!binnen \letvalue{\??im\v!binnen\c!uitlijnen}\v!binnen
+% \letvalue{\??im\v!buiten\c!plaats}\v!buiten \letvalue{\??im\v!buiten\c!uitlijnen}\v!binnen
 
-\newbox\facingbox
-\newbox\facingpage
-
-\newif\iffacingpages \facingpagesfalse
-
-\def\shipoutfacingpage
-  {\iffacingpages
-     \ifnum\realpageno>\plusone
-       \bgroup
-       \chardef\pageornamentstate\plusone
-       \setbox\facingpage\vbox to \zethoogte
-         {\unvbox\facingpage\vfil}%
-       \myshipout{\buildpagebody\box\facingpage}%
-       \egroup
-     \else
-       \global\setbox\facingpage\emptybox
-     \fi
-   \fi}
-
-\def\naastpagina
-  {\shipoutfacingpage}
-
-\def\facefloat % redefined
-  {\startnaast\box\floatbox\stopnaast}
-
-\def\startnaast % beter: \dowithnextbox
-  {\iffacingpages
-     \global\setbox\facingbox\vbox
-       \bgroup
-       \hsize\zetbreedte
-   \else
-     \@EA\gobbleuntil\@EA\stopnaast
-   \fi}
-
-\def\stopnaast
-  {\egroup
-   \global\setbox\facingpage\vbox
-     {\ifvoid\facingpage
-        \vskip\openstrutdepth % \strutdp
-      \else
-        \unvbox\facingpage
-      \fi
-      \box\facingbox
-      \blanko}}
-
-\def\dostelnaastplaatsenin[#1]%
-  {\getparameters[\??np][#1]%
-   \doifelse\@@npstatus\v!start
-     {\global\facingpagestrue}
-     {\global\facingpagesfalse}}
-
-\def\stelnaastplaatsenin
-  {\dosingleargument\dostelnaastplaatsenin}
-
-\stelnaastplaatsenin
-  [\c!status=\v!stop]
-
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-mul.tex b/tex/context/base/page-mul.tex
index ca85bc6d4..81d35ef42 100644
--- a/tex/context/base/page-mul.tex
+++ b/tex/context/base/page-mul.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-mul, % was: core-mul
+%D   [       filefile=page-mul, % was: core-mul
 %D        version=1998.03.15,
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Multi Column Output,
@@ -68,16 +68,16 @@
 %D perfect. While at the moment the routine doesn't support
 %D all kind of floats, it does support:
 %D
-%D \startopsomming[opelkaar]
-%D \som  an unlimitted number of columns
-%D \som  ragged or not ragged bottoms
-%D \som  optional balancing without \type{\balancingerrors}
-%D \som  different \type{\baselineskips}, \type{\spacing},
+%D \startitemize[packed]
+%D \item  an unlimitted number of columns
+%D \item  ragged or not ragged bottoms
+%D \item  optional balancing without \type{\balancingerrors}
+%D \item  different \type{\baselineskips}, \type{\spacing},
 %D       \type{\topskip} and \type{\maxdepth}
-%D \som  left- and right indentation, e.g. within lists
-%D \som  moving columns floats to the next column or page
-%D \som  handling of floats that are to wide for a columns
-%D \stopopsomming
+%D \item  left- and right indentation, e.g. within lists
+%D \item  moving columns floats to the next column or page
+%D \item  handling of floats that are to wide for a columns
+%D \stopitemize
 %D
 %D One could wonder why single and multi||columns modes are
 %D still separated. One reason for this is that \TeX\ is not
@@ -86,7 +86,7 @@
 %D column as a special case of multi||columns is posible but at
 %D the cost of worse float handling, worse page breaking,
 %D worse etc. Complicated multi||column page handling should
-%D be done in \kap{DTP}||systems anyway.
+%D be done in \cap{DTP}||systems anyway.
 %D
 %D There are three commands provided for entering and leaving
 %D multi||column mode and for going to the next column:
@@ -177,14 +177,14 @@
 
 %D A lot of footnote stuff added!
 
-\def\finalcolumntextwidth   {\zetbreedte}
-\def\finalcolumntextheight  {\teksthoogte}
-\def\columntextwidth        {\zetbreedte}
-\def\columntextheight       {\teksthoogte}
-\def\usercolumnwidth        {\tekstbreedte}
+\def\finalcolumntextwidth   {\makeupwidth}
+\def\finalcolumntextheight  {\textheight}
+\def\columntextwidth        {\makeupwidth}
+\def\columntextheight       {\textheight}
+\def\usercolumnwidth        {\textwidth}
 \def\columntextoffset       {\!!zeropoint}
 
-\def\fixedcolumnheight      {\teksthoogte}
+\def\fixedcolumnheight      {\textheight}
 \def\betweencolumns         {\hskip\bodyfontsize}
 
 \let\setcolumnfloats        \relax % in CONTEXT used for floats
@@ -290,61 +290,61 @@
 %D   \input tufte
 %D \stopcolumns
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startsmaller
+%D \startnarrower
 %D   \input tufte
-%D \stopsmaller
+%D \stopnarrower
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startcolumns \startsmaller
+%D \startcolumns \startnarrower
 %D   \input tufte
-%D \stopsmaller \stopcolumns
+%D \stopnarrower \stopcolumns
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startsmaller \startcolumns
+%D \startnarrower \startcolumns
 %D   \input tufte
-%D \stopcolumns \stopsmaller
+%D \stopcolumns \stopnarrower
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startcolumns \startsmaller[left]
+%D \startcolumns \startnarrower[left]
 %D   \input tufte
-%D \stopsmaller \stopcolumns
+%D \stopnarrower \stopcolumns
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startsmaller[left] \startcolumns
+%D \startnarrower[left] \startcolumns
 %D   \input tufte
-%D \stopcolumns \stopsmaller
+%D \stopcolumns \stopnarrower
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startsmaller \startcolumns \startsmaller
+%D \startnarrower \startcolumns \startnarrower
 %D   \input tufte
-%D \stopsmaller\stopcolumns \stopsmaller
+%D \stopnarrower\stopcolumns \stopnarrower
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D
 %D \startbuffer[b]
-%D \startsmaller[left] \startcolumns \startsmaller
+%D \startnarrower[left] \startcolumns \startnarrower
 %D   \input tufte
-%D \stopsmaller\stopcolumns \stopsmaller
+%D \stopnarrower\stopcolumns \stopnarrower
 %D \stopbuffer
-%D \typebuffer[b] \haalbuffer[b]
+%D \typebuffer[b] \getbuffer[b]
 %D \stopbuffer
 %D
 %D \start
 %D \def\postprocesscolumnline#1{\ruledhbox{\strut\box#1}\hss}
-%D \haalbuffer
+%D \getbuffer
 %D \stop
 
 %D One should be aware that when font related dimensions are
@@ -710,7 +710,7 @@
 %D
 %D Here we show the natural width of the lines:
 %D
-%D {\haalbuffer}
+%D {\getbuffer}
 %D
 %D The next example does a bit more advanced manipulation:
 %D
@@ -731,7 +731,7 @@
 %D
 %D Here we also see an application of \type{\currentcolumn}:
 %D
-%D {\haalbuffer}
+%D {\getbuffer}
 %D
 %D This feature is implemented using the reshape macros
 %D presented in \type{supp-box}.
@@ -1155,20 +1155,20 @@
 %D The multicolumn mechanism is incorporated in a \CONTEXT\
 %D interface, which acts like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startcolumns[n=4,balance=no]
 %D   some text
 %D \stopcolumns
-%D \stoptypen
+%D \stoptyping
 %D
 %D The setup is optional. The default behaviour of columns
 %D can be set up with:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupcolumns
 %D   [n=2,
 %D    balance=yes]
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this case, stretching is according to the way it's
 %D done outside columns (\type{\inheritcolumnstrue}). Also
@@ -1292,7 +1292,7 @@
     %  \advance\dimen0 \insertionheight
     %\fi
      \setbox\scratchbox\vbox % tricky met objecten ?
-       {\blanko[\@@bkvoorwit]
+       {\blank[\@@bkspacebefore]
         \snaptogrid\vbox{\copy\floatbox}}%
      \advance\dimen0 \ht\scratchbox
      \advance\dimen0 .5\lineheight % needed because goal a bit higher
@@ -1385,11 +1385,11 @@
          \doresavefloat
        \else
         %\setbox2=\vbox
-        %  {\blanko[\@@bkvoorwit]
+        %  {\blank[\@@bkspacebefore]
         %   \snaptogrid\vbox{\copy\floatbox}%
-        %   \blanko[\@@bknawit]
+        %   \blank[\@@bkspaceafter]
          \setbox2=\vbox
-           {\blanko[\@@bkvoorwit]
+           {\blank[\@@bkspacebefore]
             \snaptogrid\vbox{\copy\floatbox}}%
          \advance\dimen0 \ht2
          \ifdim\dimen0>\dimen2
@@ -1399,8 +1399,8 @@
              \ifdim\ht\currenttopcolumnbox=\zeropoint
                \global\setbox\currenttopcolumnbox\vbox
                  {\snaptogrid\vbox{\copy\floatbox}
-                  \witruimte % nodig ?
-                  \blanko[\@@bknawit]}%
+                  \whitespace % nodig ?
+                  \blank[\@@bkspaceafter]}%
                \dimen4=\ht\currenttopcolumnbox
                \advance\dimen4 \dp\currenttopcolumnbox
                \global\advance\vsize -\dimen4
@@ -1420,11 +1420,11 @@
            \par
            \ifdim\prevdepth<\zeropoint \else % anders bovenaan kolom witruimte
              \nobreak
-             \blanko[\@@bkvoorwit]
+             \blank[\@@bkspacebefore]
              \nobreak
            \fi
            \flushfloatbox
-           \blanko[\@@bknawit]
+           \blank[\@@bkspaceafter]
          \fi
        \fi
      \fi
@@ -1435,12 +1435,12 @@
 %D are placed, taking the width of a float into account. This
 %D routine can be improved on different ways:
 %D
-%D \startopsomming[intro,opelkaar]
-%D \som taking into account some imaginary baseline, just to
+%D \startitemize[intro,packed]
+%D \item taking into account some imaginary baseline, just to
 %D      get the captions in line
-%D \som multipass flushing until as many floats are displaced
+%D \item multipass flushing until as many floats are displaced
 %D      as possible
-%D \stopopsomming
+%D \stopitemize
 %D
 %D When handling lots of (small) floats spacing can get worse
 %D because of lining out the columns.
@@ -1460,8 +1460,8 @@
               {\snaptogrid\vbox
                  {\copy\currenttopcolumnbox
                   \hbox{\vphantom{\copy\floatbox}}}
-                  \witruimte % nodig ?
-                  \blanko[\@@bknawit]}%
+                  \whitespace % nodig ?
+                  \blank[\@@bkspaceafter]}%
           \else
             \dogetfloat
             \ifdim\wd\floatbox>\finalcolumntextwidth % better somewhere else too
@@ -1486,9 +1486,9 @@
                 \advance\dimen0 -\intercolumnwidth
                 \global\setbox\floatbox\hbox to \dimen0
                  %{\hss\hbox{\copy\floatbox}\hss}%
-                  {\processaction[\@@bkplaats] % how easy to forget
-                     [  \v!links=>\copy\floatbox\hss,
-                       \v!rechts=>\hss\copy\floatbox,
+                  {\processaction[\@@bklocation] % how easy to forget
+                     [  \v!left=>\copy\floatbox\hss,
+                       \v!right=>\hss\copy\floatbox,
                       \s!default=>\hss\copy\floatbox\hss,
                       \s!unknown=>\hss\copy\floatbox\hss]}%
               \fi
@@ -1501,8 +1501,8 @@
                 {\snaptogrid\vbox
                    {\copy\currenttopcolumnbox
                     \copy\floatbox}
-                 \witruimte % nodig ?
-                 \blanko[\@@bknawit]}%
+                 \whitespace % nodig ?
+                 \blank[\@@bkspaceafter]}%
             \fi
             \dimen6\ht\currenttopcolumnbox
             \advance\dimen6 \dp\currenttopcolumnbox
@@ -1528,9 +1528,9 @@
 %D One inprovement can be to normalize the height of floats
 %D to $n\times$\type{\lineheight} with a macro like:
 %D
-%D \starttypen
+%D \starttyping
 %D \normalizevbox{...}
-%D \stoptypen
+%D \stoptyping
 
 % border case, should fit on one page
 %
@@ -1542,11 +1542,11 @@
 %
 % \stopcolumns
 
-\newif\ifbinnenkolommen
+\newif\ifinsidecolumns
 \newif\if@@klbalanceren
 \newif\if@@kluitlijnen
 
-\binnenkolommenfalse
+\insidecolumnsfalse
 
 \def\setupcolumns
   {\dosingleempty\dosetupcolumns}
@@ -1555,17 +1555,17 @@
   {\getparameters[\??kl][#1]%
    \nofcolumns\@@kln\relax
    \processaction
-     [\@@kllijn]
-     [    \v!aan=>\let\betweencolumns\linebetweencolumns,
-          \v!uit=>\let\betweencolumns\spacebetweencolumns,
+     [\@@klrule]
+     [    \v!on=>\let\betweencolumns\linebetweencolumns,
+          \v!off=>\let\betweencolumns\spacebetweencolumns,
       \s!default=>\let\betweencolumns\spacebetweencolumns,
-      \s!unknown=>\let\betweencolumns\@@kllijn]}
+      \s!unknown=>\let\betweencolumns\@@klrule]}
 
 \def\linebetweencolumns
   {\bgroup
    \starttextproperties
-   \ifdim\@@klafstand>\zeropoint
-     \dimen0=\@@klafstand
+   \ifdim\@@kldistance>\zeropoint
+     \dimen0=\@@kldistance
    \else
      \dimen0=\linewidth
    \fi
@@ -1579,22 +1579,22 @@
    \egroup}
 
 \def\spacebetweencolumns
-  {\hskip\@@klafstand}
+  {\hskip\@@kldistance}
 
 \presetlocalframed[\??kl]
 
 \def\backgroundfinishcolumnbox
-  {\doifinsetelse\@@kloffset{\v!geen,\v!overlay}
+  {\doifinsetelse\@@kloffset{\v!none,\v!overlay}
      {\let\@@kloffset\!!zeropoint}
      {\scratchdimen\@@kloffset
-      \advance\scratchdimen -\@@kllijndikte
+      \advance\scratchdimen -\@@klrulethickness
       \edef\@@kloffset{\the\scratchdimen}}%
    \localframed
      [\??kl]
-     [\c!strut=\v!nee,
-      \c!breedte=\v!passend,
-      \c!hoogte=\v!passend,
-      \c!uitlijnen=]}
+     [\c!strut=\v!no,
+      \c!width=\v!fit,
+      \c!height=\v!fit,
+      \c!align=]}
 
 \let\restorecolumnsettings\relax
 
@@ -1603,87 +1603,87 @@
 \def\complexstartcolumns[#1]% %% \startcolumns
   {\bgroup
    \let\stopcolumns\egroup
-   \ifbinnenkolommen
+   \ifinsidecolumns
    \else
      \setupcolumns[#1]%
      \ifnum\@@kln>1\relax
-       \witruimte
+       \whitespace
        \begingroup
-       \doif\@@kloptie\v!achtergrond
+       \doif\@@kloption\v!background
          {\let\finishcolumnbox\backgroundfinishcolumnbox
           \let\columntextoffset\@@kloffset}%
-       \ifx\@@klcommando\empty\else
-         \let\postprocesscolumnline\@@klcommando
+       \ifx\@@klcommand\empty\else
+         \let\postprocesscolumnline\@@klcommand
        \fi
-       \doifelsenothing\@@klhoogte
+       \doifelsenothing\@@klheight
          \heightencolumnsfalse
          \heightencolumnstrue
-       \doifelse\@@klrichting\v!rechts
+       \doifelse\@@kldirection\v!right
          \reversecolumnsfalse
          \reversecolumnstrue
-       \doifelse\@@klbalanceren\v!ja
+       \doifelse\@@klbalance\v!yes
          \balancecolumnstrue
          \balancecolumnsfalse
        \processaction     % ook nog: laatsteuitlijnen
-         [\@@kluitlijnen]
-         [   \v!ja=>\stretchcolumnstrue
+         [\@@klalign]
+         [   \v!yes=>\stretchcolumnstrue
                     \inheritcolumnsfalse,
-            \v!nee=>\stretchcolumnsfalse
+            \v!no=>\stretchcolumnsfalse
                     \inheritcolumnsfalse,
-          \v!tekst=>\stretchcolumnsfalse
+          \v!text=>\stretchcolumnsfalse
                     \inheritcolumnstrue]%
        \nofcolumns=\@@kln
        %
        % probably more is needed, and how about nesting save's
        %
        \savecurrentblanko
-       \savecurrentwitruimte
+       \savecurrentwhitespace
        \def\restorecolumnsettings
          {\boxmaxdepth\maxdimen % done elsewhere
           \restorecurrentblanko
-          \restorecurrentwitruimte}%
+          \restorecurrentwhitespace}%
        %
-       \edef\fixedcolumnheight{\@@klhoogte}%
-       \edef\minbalancetoplines{\@@klnboven}%
-       \setuptolerance[\@@kltolerantie]%     %% \startcolumns
-       \setupblank[\@@klblanko]%
-       \ifdim\tussenwit>\zeropoint\relax
-         \setupwhitespace[\@@klblanko]%
+       \edef\fixedcolumnheight{\@@klheight}%
+       \edef\minbalancetoplines{\@@klntop}%
+       \setuptolerance[\@@kltolerance]%     %% \startcolumns
+       \setupblank[\@@klblank]%
+       \ifdim\ctxparskip>\zeropoint\relax
+         \setupwhitespace[\@@klblank]%
        \fi
        \def\stopcolumns
          {\endmulticolumns
-          \global\binnenkolommenfalse
+          \global\insidecolumnsfalse
           \endgroup
           \egroup}%
-       \global\binnenkolommentrue
+       \global\insidecolumnstrue
        \beginmulticolumns
      \fi
    \fi}
 
-\installcolumnbreakhandler {MUL} \v!voorkeur
+\installcolumnbreakhandler {MUL} \v!preference
   {\goodbreak}
 
-\installcolumnbreakhandler {MUL} \v!ja
+\installcolumnbreakhandler {MUL} \v!yes
   {\par                                              % todo: since
-   {\testrulewidth\zeropoint\ruledvskip\teksthoogte} % we misuse a
+   {\testrulewidth\zeropoint\ruledvskip\textheight} % we misuse a
    \penalty-200                                      % side effect
-   \vskip-\teksthoogte
-   \prevdepth-\thousandpoint} % signals top of column to \blanko
+   \vskip-\textheight
+   \prevdepth-\thousandpoint} % signals top of column to \blank
 
 \setupcolumns
   [\c!n=2,
-   \c!nboven=1,
-   \c!commando=,
-   \c!richting=\v!rechts,
-   \c!lijn=\v!uit,
-   \c!tolerantie=\v!soepel,
-   \c!afstand=1.5\korpsgrootte, % influenced by switching
-   \c!hoogte=,
-   \c!balanceren=\v!ja,
-   \c!uitlijnen=\v!tekst,
-   \c!blanko={\v!regel,\v!vast},
-   \c!optie=,
-   \c!lijndikte=\linewidth,
+   \c!ntop=1,
+   \c!command=,
+   \c!direction=\v!right,
+   \c!rule=\v!off,
+   \c!tolerance=\v!tolerant,
+   \c!distance=1.5\korpsgrootte, % influenced by switching
+   \c!height=,
+   \c!balance=\v!yes,
+   \c!align=\v!text,
+   \c!blank={\v!line,\v!fixed},
+   \c!option=,
+   \c!rulethickness=\linewidth,
    \c!offset=.5\korpsgrootte]
 
 %D Undocumented and still under development.
@@ -1695,12 +1695,12 @@
   {\bgroup
    \nopenalties
    \getparameters[\??kl]
-     [\c!breedte=\hsize,\c!afstand=1.5\korpsgrootte,%
-      \c!n=2,\c!regels=0,#1]%
-   \let\rigidcolumnlines\@@klregels
-   \setrigidcolumnhsize\@@klbreedte\@@klafstand\@@kln
+     [\c!width=\hsize,\c!distance=1.5\korpsgrootte,%
+      \c!n=2,\c!lines=0,#1]%
+   \let\rigidcolumnlines\@@kllines
+   \setrigidcolumnhsize\@@klwidth\@@kldistance\@@kln
    \setbox\scratchbox\vbox\bgroup
-   \forgetall} % \blanko[\v!blokkeer]
+   \forgetall} % \blank[\v!disable]
 
 \def\stopsimplecolumns
   {\removebottomthings
@@ -1708,4 +1708,4 @@
    \rigidcolumnbalance\scratchbox
    \egroup}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-not.tex b/tex/context/base/page-not.tex
index 2dd5d09ff..0f2a0249b 100644
--- a/tex/context/base/page-not.tex
+++ b/tex/context/base/page-not.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-nnt,
+%D   [       filefile=page-nnt,
 %D        version=2002.04.16,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Footnotes,
@@ -67,4 +67,4 @@
      \restorenotecontent
    \fi}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-num.tex b/tex/context/base/page-num.tex
index 324bf5308..38dd1eddf 100644
--- a/tex/context/base/page-num.tex
+++ b/tex/context/base/page-num.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-num, % moved here from main-001
+%D   [       filefile=page-num, % moved here from main-001
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Core Macros,
 %D       subtitle=Numbering,
@@ -31,49 +31,49 @@
 \newif\ifsubpaging
 \newif\ifshowingsubpage
 
-\definieernummer
+\definenumber
   [\s!subpage]
 
-\stelnummerin
+\setupnumber
   [\s!subpage]
-  [\c!wijze=\@@snwijze]
+  [\c!way=\@@snway]
 
 % hard to sync
 %
-% \def\resetsubpaginanummer%
+% \def\resetsubpagenumber%
 %   {\resetnumber[\s!subpage]%
-%    \global\subpageno=\ruwenummer[\s!subpage]}
+%    \global\subpageno=\rawnumber[\s!subpage]}
 %
 % better sync
 
 \newif\ifresettingsubpagenumber
 
-\def\resetsubpaginanummer
+\def\resetsubpagenumber
   {\global\resettingsubpagenumbertrue}
 
 % so far for sync, see \gotonext...
 
 \def\dosetupsubpagenumber[#1]%
-  {\doifelse{#1}{\v!reset}
-     {\resetsubpaginanummer} % \resetnumber[\s!subpage]
+  {\doifelse{#1}\v!reset
+     \resetsubpagenumber % \resetnumber[\s!subpage]
      {\getparameters[\??sn][#1]%
       \processaction
-        [\@@snstatus]
+        [\@@snstate]
         [  \v!stop=>\ifsubpaging
-                      \resetsubpaginanummer % new, see sync
+                      \resetsubpagenumber % new, see sync
                     \else
                       \subpagingfalse
                     \fi
                     \showingsubpagefalse,
           \v!start=>\subpagingtrue
                     \showingsubpagetrue,
-           \v!geen=>\subpagingtrue
+           \v!none=>\subpagingtrue
                     \showingsubpagefalse]}}
 
-\def\aantalsubpaginas
+\def\numberofsubpages
   {\ifshowingsubpage\nofsubpages\else0\fi}
 
-\def\subpaginanummer
+\def\subpagenumber
   {\ifshowingsubpage\the\subpageno\else0\fi}
 
 \def\setupsubpagenumber
@@ -94,7 +94,7 @@
 \def\savenofsubpages
   {\ifsubpaging
      \showmessage\m!layouts6{\newnofsubpages,\the\subpageno}%
-     \immediatewriteutilitycommand%
+     \immediatewriteutilitycommand
         {\twopassentry%
            {\s!subpage}%
            {\newnofsubpages}%
@@ -122,8 +122,8 @@
    \fi
    \ifsubpaging
      \edef\oldsubpage{\the\subpageno}%
-     \verhoognummer[\s!subpage]%
-     \global\subpageno\ruwenummer[\s!subpage]\relax
+     \incrementnumber[\s!subpage]%
+     \global\subpageno\rawnumber[\s!subpage]\relax
      \ifnum\subpageno=\plusone
        \gettwopassdata\s!subpage
        \setsubpagenumbers
@@ -139,27 +139,27 @@
        \fi
        \doglobal\increment\newnofsubpages\relax
      \fi
-     \setglobalsystemreference\rt!page\v!eerstesubpagina\firstsubpage
-     \setglobalsystemreference\rt!page\v!laatstesubpagina\lastsubpage
+     \setglobalsystemreference\rt!page\v!firstsubpage\firstsubpage
+     \setglobalsystemreference\rt!page\v!lastsubpage\lastsubpage
      \bgroup
      \ifnum\realpageno=\firstsubpage\relax
        \global\let\prevsubpage\firstsubpage
-       \setglobalsystemreference\rt!page{\v!sub\v!achteruit}\lastsubpage
+       \setglobalsystemreference\rt!page{\v!sub\v!backward}\lastsubpage
      \else
        \xdef\prevsubpage{\realfolio}%
        \doglobal\decrement\prevsubpage
-       \setglobalsystemreference\rt!page{\v!sub\v!achteruit}\prevsubpage
+       \setglobalsystemreference\rt!page{\v!sub\v!backward}\prevsubpage
      \fi
-     \setglobalsystemreference\rt!page\v!vorigesubpagina\prevsubpage
+     \setglobalsystemreference\rt!page\v!previoussubpage\prevsubpage
      \ifnum\realpageno=\lastsubpage\relax
        \global\let\nextsubpage\lastsubpage
-       \setglobalsystemreference\rt!page{\v!sub\v!vooruit}\firstsubpage
+       \setglobalsystemreference\rt!page{\v!sub\v!forward}\firstsubpage
      \else
        \xdef\nextsubpage{\realfolio}%
        \doglobal\increment\nextsubpage
-       \setglobalsystemreference\rt!page{\v!sub\v!vooruit}\nextsubpage
+       \setglobalsystemreference\rt!page{\v!sub\v!forward}\nextsubpage
      \fi
-     \setglobalsystemreference\rt!page\v!volgendesubpagina\nextsubpage
+     \setglobalsystemreference\rt!page\v!nextsubpage\nextsubpage
      \egroup
    \fi}
 
@@ -202,56 +202,56 @@
    \ifnum\realpageno>\lastpage
      \xdef\lastpage{\realfolio}%
    \fi
-   \setglobalsystemreference\rt!page\v!eerstepagina \firstpage
-   \setglobalsystemreference\rt!page\v!laatstepagina\lastpage
+   \setglobalsystemreference\rt!page\v!firstpage \firstpage
+   \setglobalsystemreference\rt!page\v!lastpage\lastpage
    \bgroup
    \ifnum\realpageno>\plusone
      \advance\realpageno \minusone
      \xdef\prevpage{\realfolio}%
-     \setglobalsystemreference\rt!page\v!achteruit\prevpage
+     \setglobalsystemreference\rt!page\v!backward\prevpage
    \else
      \global\let\prevpage\firstpage
-     \setglobalsystemreference\rt!page\v!achteruit\lastpage
+     \setglobalsystemreference\rt!page\v!backward\lastpage
    \fi
-   \setglobalsystemreference\rt!page\v!vorigepagina\prevpage
+   \setglobalsystemreference\rt!page\v!previouspage\prevpage
    \egroup
    \bgroup
    \ifnum\realpageno<\lastpage\relax
      \advance\realpageno \plusone
      \xdef\nextpage{\realfolio}%
-     \setglobalsystemreference\rt!page\v!pagina\nextpage
-     \setglobalsystemreference\rt!page\v!vooruit\nextpage
+     \setglobalsystemreference\rt!page\v!page\nextpage
+     \setglobalsystemreference\rt!page\v!forward\nextpage
      \bgroup
      \xdef\nextnextpage{\realfolio}%
      \ifodd\realpageno
-       \setglobalsystemreference\rt!page\v!volgendeonevenpagina\nextnextpage
+       \setglobalsystemreference\rt!page\v!nextoddpage\nextnextpage
      \else
-       \setglobalsystemreference\rt!page\v!volgendeevenpagina\nextnextpage
+       \setglobalsystemreference\rt!page\v!nextevenpage\nextnextpage
      \fi
      \advance\realpageno \plusone
      \xdef\nextnextpage{\realfolio}%
      \ifnum\realpageno>\lastpage\relax
       %\ifodd\realpageno
-      %  \setglobalsystemreference\rt!page\v!volgendeonevenpagina\lastpage
+      %  \setglobalsystemreference\rt!page\v!nextoddpage\lastpage
       %\else
-      %  \setglobalsystemreference\rt!page\v!volgendeevenpagina\lastpage
+      %  \setglobalsystemreference\rt!page\v!nextevenpage\lastpage
       %\fi
      \else
        \ifodd\realpageno
-         \setglobalsystemreference\rt!page\v!volgendeonevenpagina\nextnextpage
+         \setglobalsystemreference\rt!page\v!nextoddpage\nextnextpage
        \else
-         \setglobalsystemreference\rt!page\v!volgendeevenpagina\nextnextpage
+         \setglobalsystemreference\rt!page\v!nextevenpage\nextnextpage
        \fi
      \fi
      \egroup
    \else
      \global\let\nextpage\lastpage
-     \setglobalsystemreference\rt!page\v!pagina\firstpage
-     \setglobalsystemreference\rt!page\v!vooruit\firstpage
-     \setglobalsystemreference\rt!page\v!volgendeonevenpagina\lastpage
-     \setglobalsystemreference\rt!page\v!volgendeevenpagina\lastpage
+     \setglobalsystemreference\rt!page\v!page\firstpage
+     \setglobalsystemreference\rt!page\v!forward\firstpage
+     \setglobalsystemreference\rt!page\v!nextoddpage\lastpage
+     \setglobalsystemreference\rt!page\v!nextevenpage\lastpage
    \fi
-   \setglobalsystemreference\rt!page\v!volgendepagina\realfolio
+   \setglobalsystemreference\rt!page\v!nextpage\realfolio
    \egroup}
 
 \def\checkrealpage
@@ -267,36 +267,36 @@
    \savecurrentvalue\lastpagenumber\folio
    \egroup}
 
-\def\totaalaantalpaginas
+\def\totalnumberofpages
   {\lastpage}
 
 \def\setpagecounters
-  {\setuserpageno{\ruwenummer[\s!page]}%
-   \doifelse\@@snstatus\v!stop
+  {\setuserpageno{\rawnumber[\s!page]}%
+   \doifelse\@@snstate\v!stop
      {\global\subpageno\zerocount}
-     {\global\subpageno\ruwenummer[\s!subpage]}\relax}
+     {\global\subpageno\rawnumber[\s!subpage]}\relax}
 
 % Standaard is \count0 in Plain TeX de paginateller. Omwille
 % van de afhandeling van lokaal nummeren, definieren we
 % echter een eigen nummer.
 
-\definieernummer
+\definenumber
   [\s!page]
-  [\c!conversie=\@@nmconversie,
-   \c!wijze=\@@nmwijze,
-   \c!status=\@@nmstatus,
+  [\c!conversion=\@@nmconversion,
+   \c!way=\@@nmway,
+   \c!state=\@@nmstate,
    \c!start=1]
 
 % \@@pnstatus global, but \@@nmstatus local and only start/stop
 
-\global\let\@@pnstatus\@@pnstatus
+\global\let\@@pnstate\@@pnstate
 
 \def\dosetuppagenumber[#1]%
-  {\getparameters[\??pn][\c!nummer=,#1]%
-   \global\let\@@pnstatus\@@pnstatus
-   \doifsomething\@@pnnummer
-     {\setnumber[\s!page]{\@@pnnummer}%
-      \setuserpageno{\ruwenummer[\s!page]}}%
+  {\getparameters[\??pn][\c!number=,#1]%
+   \global\let\@@pnstate\@@pnstate
+   \doifsomething\@@pnnumber
+     {\setnumber[\s!page]{\@@pnnumber}%
+      \setuserpageno{\rawnumber[\s!page]}}%
    % this makes starting at an even page possible
    \ifnum\realpageno=1 \ifodd\pageno \else
      \global\shiftedrealpagenotrue
@@ -309,13 +309,13 @@
 %
 % \def\verlaagpaginanummer
 %   {\doifinset{\@@pnstatus}{\v!start,\v!leeg,\v!geen}
-%      {\verlaagnummer[\s!page]%
-%       \setuserpageno{\ruwenummer[\s!page]}}}
+%      {\decrementnumber[\s!page]%
+%       \setuserpageno{\rawnumber[\s!page]}}}
 %
 % \def\verhoogpaginanummer
 %   {\doifinset{\@@pnstatus}{\v!start,\v!leeg,\v!geen}
-%      {\verhoognummer[\s!page]%
-%       \setuserpageno{\ruwenummer[\s!page]}}%
+%      {\incrementnumber[\s!page]%
+%       \setuserpageno{\rawnumber[\s!page]}}%
 %    \doifinset{\@@pnstatus}{\v!handhaaf,\v!leeg}
 %      {\global\let\@@pnstatus\v!start}}
 %
@@ -323,30 +323,30 @@
 % (needed during a test / prelude to installable methods)
 
 \def\dodecrementpagenumber
-  {\verlaagnummer[\s!page]\setuserpageno{\ruwenummer[\s!page]}}
+  {\decrementnumber[\s!page]\setuserpageno{\rawnumber[\s!page]}}
 
 \def\doincrementpagenumber
-  {\verhoognummer[\s!page]\setuserpageno{\ruwenummer[\s!page]}}
+  {\incrementnumber[\s!page]\setuserpageno{\rawnumber[\s!page]}}
 
 \def\dosynchronizepagenumber
-  {\global\let\@@pnstatus\v!start}
+  {\global\let\@@pnstate\v!start}
 
-\def\verlaagpaginanummer{\getvalue{\??pn-\@@pnstatus}}
-\def\verhoogpaginanummer{\getvalue{\??pn+\@@pnstatus}}
+\def\verlaagpaginanummer{\getvalue{\??pn-\@@pnstate}}
+\def\verhoogpaginanummer{\getvalue{\??pn+\@@pnstate}}
 
 \letvalue{\??pn-\v!start   }\dodecrementpagenumber
-\letvalue{\??pn-\v!geen    }\dodecrementpagenumber
-\letvalue{\??pn-\v!leeg    }\dodecrementpagenumber
+\letvalue{\??pn-\v!none    }\dodecrementpagenumber
+\letvalue{\??pn-\v!empty    }\dodecrementpagenumber
 
 \letvalue{\??pn+\v!start   }\doincrementpagenumber
-\letvalue{\??pn+\v!geen    }\doincrementpagenumber
-\setvalue{\??pn+\v!leeg   }{\doincrementpagenumber
+\letvalue{\??pn+\v!none    }\doincrementpagenumber
+\setvalue{\??pn+\v!empty   }{\doincrementpagenumber
                             \dosynchronizepagenumber}
-\letvalue{\??pn+\v!handhaaf}\dosynchronizepagenumber
+\letvalue{\??pn+\v!keep}\dosynchronizepagenumber
 
 % so far
 
-\def\checkpagecounter%
+\def\checkpagecounter
   {\checknummer{\s!page}}
 
 % \getpagestatus
@@ -372,7 +372,7 @@
   {\ifdubbelzijdig
      \gettwopassdata\s!page
      \iftwopassdatafound \else
-       \let\twopassdata=\realpageno
+       \let\twopassdata\realpageno
      \fi
      \ifodd\twopassdata
        \global\rightpagetrue
@@ -385,7 +385,7 @@
    \fi}
 
 \def\@@nmin     {} % kan vervallen  (upward compatibility)
-\def\@@nmplaats {} % mag {plaats, in} zijn
+\def\@@nmlocation {} % mag {plaats, in} zijn
 
 \newcounter\@@pagenumberlocation
 
@@ -394,48 +394,49 @@
 
 \def\dodosetpagenumberlocation#1% tricky because of ...texts
   {\increment\@@pagenumberlocation
-   \ifx\@@nmplaats\empty\else
+   \ifx\@@nmlocation\empty\else
      \def\dododosetpagenumberlocation##1%
        {\donetrue
-        \setevalue{\??tk#1##1}%
-          {\noexpand\do@@plaatspaginanummer{\@@pagenumberlocation}}}%
+        \setevalue{\??tk#1##1}{\noexpand\do@@plaatspaginanummer{\@@pagenumberlocation}}}%
      \donefalse
      \ExpandFirstAfter\processallactionsinset
-       [\@@nmplaats]
-       [    \v!midden=>\dododosetpagenumberlocation{\v!tekst\c!middentekst},
-             \v!links=>\dododosetpagenumberlocation{\v!tekst\c!linkertekst},
-            \v!rechts=>\dododosetpagenumberlocation{\v!tekst\c!rechtertekst},
-          \v!inlinker=>\dododosetpagenumberlocation{\v!marge\c!linkertekst},
-         \v!inrechter=>\dododosetpagenumberlocation{\v!marge\c!rechtertekst},
-           \v!inmarge=>\dododosetpagenumberlocation{\v!marge\ifdubbelzijdig
-                         \c!margetekst\else\c!rechtertekst\fi},
-             \v!marge=>\dododosetpagenumberlocation{\v!marge\ifdubbelzijdig
-                         \c!margetekst\else\c!rechtertekst\fi},
-           \v!opmarge=>\dododosetpagenumberlocation{\v!tekst\c!kantlijntekst},
-          \v!kantlijn=>\dododosetpagenumberlocation{\v!tekst\c!kantlijntekst}]%
+       [\@@nmlocation]
+       [    \v!middle=>\dododosetpagenumberlocation{\v!text\c!middletext},
+             \v!left=>\dododosetpagenumberlocation{\v!text\c!lefttext},
+            \v!right=>\dododosetpagenumberlocation{\v!text\c!righttext},
+          \v!inleft=>\dododosetpagenumberlocation{\v!margin\c!lefttext},
+         \v!inright=>\dododosetpagenumberlocation{\v!margin\c!righttext},
+           \v!inmargin=>\dododosetpagenumberlocation{\v!margin\ifdubbelzijdig
+                         \c!margintext\else\c!righttext\fi},
+             \v!margin=>\dododosetpagenumberlocation{\v!margin\ifdubbelzijdig
+                         \c!margintext\else\c!righttext\fi},
+           \v!atmargin=>\dododosetpagenumberlocation{\v!text\c!marginedgetext},
+          \v!marginedge=>\dododosetpagenumberlocation{\v!text\c!marginedgetext}]%
      \ifdone \else
-       \dododosetpagenumberlocation{\v!tekst\c!middentekst}% default
+       \dododosetpagenumberlocation{\v!text\c!middletext}% default
      \fi
    \fi}
 
 \def\dosetpagenumberlocation
-  {\ExpandBothAfter\doifinsetelse\v!hoofd{\@@nmplaats,\@@nmin}
-     {\dodosetpagenumberlocation\v!hoofd}
-     {\dodosetpagenumberlocation\v!voet}}
+  {\ExpandBothAfter\doifinsetelse\v!header{\@@nmlocation,\@@nmin}
+     {\dodosetpagenumberlocation\v!header}
+     {\dodosetpagenumberlocation\v!footer }}
 
 \def\dosetuppagenumbering[#1]%
   {\getparameters[\??nm][#1]%
-   \preparepaginaprefix\??nm
+   \preparepageprefix\??nm
    \enkelzijdigfalse
    \dubbelzijdigfalse
    \ExpandFirstAfter\processallactionsinset
-     [\@@nmvariant]
-     [ \v!enkelzijdig=>\enkelzijdigtrue,
-      \v!dubbelzijdig=>\dubbelzijdigtrue]%
-   \ifdubbelzijdig
-     \trackingmarginnotestrue
-   \else
-     \trackingmarginnotesfalse
+     [\@@nmalternative]
+     [ \v!singlesided=>\enkelzijdigtrue,
+      \v!doublesided=>\dubbelzijdigtrue]%
+   \ifx\trackingmarginnotestrue\undefined\else
+     \ifdubbelzijdig
+       \trackingmarginnotestrue
+     \else
+       \trackingmarginnotesfalse
+     \fi
    \fi
    \dosetpagenumberlocation
    \recalculatebackgrounds
@@ -450,69 +451,55 @@
 
 % erg fout
 %
-% \def\preparepaginaprefix#1%
-%   {\def\dopreparepaginaprefix##1%
+% \def\preparepageprefix#1%
+%   {\def\dopreparepageprefix##1%
 %      {\doifvalue{#1##1\c!nummer}{\v!ja}
 %         {\setvalue{#1\getvalue{\??by##1}\c!nummer}{\v!ja}}}%
-%    \processcommacommand[\@@kolijst]\dopreparepaginaprefix}
+%    \processcommacommand[\@@kolijst]\dopreparepageprefix}
 %
 % nog fouter
 %
-% \def\preparepaginaprefix#1%
-%   {\def\dopreparepaginaprefix##1%
+% \def\preparepageprefix#1%
+%   {\def\dopreparepageprefix##1%
 %      {\doifelsevalue{#1##1\v!nummer}{\v!ja}                    % v
 %         {\setvalue{#1\getvalue{\??by##1}\v!nummer}{\v!ja}}     % v
 %         {\setvalue{#1\getvalue{\??by##1}\v!nummer}{\v!nee}}}%  % v
-%    \processcommacommand[\@@kolijst]\dopreparepaginaprefix}
+%    \processcommacommand[\@@kolijst]\dopreparepageprefix}
 %
 % best, beware, chapter (yes) can be followed by title (no)
 
-\def\preparepaginaprefix#1%
-  {\def\dopreparepaginaprefix##1%
-     {\letvalue{#1\getvalue{\??by##1}\v!nummer}\v!nee}%  %v
-   \rawprocesscommalist[\@@kolijst]\dopreparepaginaprefix
-   \def\dopreparepaginaprefix##1%
-     {\doifvalue{#1##1\v!nummer}\v!ja                    %v
-        {\letvalue{#1\getvalue{\??by##1}\v!nummer}\v!ja}}%
-   \rawprocesscommalist[\@@kolijst]\dopreparepaginaprefix}
-
-% \def\dodopaginaprefix#1% uti seperator --
-%   {\let\normaluchar\uchar\let\uchar\relax % ugly but needed
-%    \doifelsevalue{\paginatype#1\v!nummer}\v!ja % \v! and no \c!
-%      {\@EA\beforesplitstring\@EA\postprefix\@EA\at\sectionseparator\to\preprefix
-%       \@EA\aftersplitstring \@EA\postprefix\@EA\at\sectionseparator\to\postprefix
-%       \let\uchar\normaluchar % ugly but needed
-%       \ifx\preprefix\empty \else
-%         \ifx\preprefix\zerocountervalue\else
-%           \preprefix\@@nmnummerscheider
-%         \fi
-%       \fi}
-%      {\@EA\aftersplitstring\@EA\postprefix\@EA\at\sectionseparator\to\postprefix
-%       \let\uchar\normaluchar}} % ugly but needed
-
-\def\dodopaginaprefix#1% uti seperator --
-  {\let\normaluchar\uchar\let\uchar\relax % ugly but needed
-   \doifelsevalue{\paginatype#1\v!nummer}\v!ja % \v! and no \c!
+\def\preparepageprefix#1%
+  {\def\dopreparepageprefix##1%
+     {\letvalue{#1\getvalue{\??by##1}\v!number}\v!no}%  %v
+   \rawprocesscommalist[\@@kolist]\dopreparepageprefix
+   \def\dopreparepageprefix##1%
+     {\doifvalue{#1##1\v!number}\v!yes                    %v
+        {\letvalue{#1\getvalue{\??by##1}\v!number}\v!yes}}%
+   \rawprocesscommalist[\@@kolist]\dopreparepageprefix}
+
+\def\dodopageprefix#1% uti seperator --
+  {\let\normaluchar\uchar \let\uchar\relax % ugly but needed
+   \doifelsevalue{\pageprefixtype#1\v!number}\v!yes % \v! and no \c!
      {\edef\preprefix {\@@filterheadpart[\postprefix]}%
       \edef\postprefix{\@@filtertailpart[\postprefix]}%
       \let\uchar\normaluchar % ugly but needed
       \ifx\preprefix\empty \else
         \ifx\preprefix\zerocountervalue\else
-          \preprefix\@@nmnummerscheider
+          \preprefix\@@nmnumberseparator
         \fi
       \fi}
      {\edef\postprefix{\@@filtertailpart[\postprefix]}%
       \let\uchar\normaluchar}} % ugly but needed
 
-\def\dopaginaprefix#1%
-  {\dodopaginaprefix{#1}%
+\def\dopageprefix#1%
+  {\dodopageprefix{#1}%
    \donexttracklevel{#1}}
 
-\def\paginaprefix#1[#2]%
+\def\pageprefix#1[#2]%
   {\bgroup
-   \edef\paginatype{#1}%
+   \edef\pageprefixtype{#1}%
    \edef\postprefix{\@@filternumberpart[#2]}%
-   \let\donexttrackcommando\dopaginaprefix
+   \let\donexttrackcommando\dopageprefix
    \donexttrackcommando\firstsection
    \egroup}
 
@@ -522,39 +509,34 @@
 %D interesting that it went unnoticed for so long.
 
 \unexpanded\def\@@plaatspaginanummer % called in empty tests
-  {\doif{\@@nmstatus\@@pnstatus}{\v!start\v!start}
-     {{\doif\@@nmstrut\v!ja\strut
-       \@@nmcommando{\doattributes\??nm\c!letter\c!kleur
-         {\completepagenumber}}}}}
+  {\doif{\@@nmstate\@@pnstate}{\v!start\v!start}
+     {{\doif\@@nmstrut\v!yes\strut
+       \@@nmcommand{\doattributes\??nm\c!style\c!color{\completepagenumber}}}}}
 
 \def\@@plaatspaginascheider% still used ?
-  {\doif{\@@nmstatus\@@pnstatus}{\v!start\v!start}
-     {\@@nmtekstscheider}}
+  {\doif{\@@nmstate\@@pnstate}{\v!start\v!start}\@@nmtextseparator}
 
-\def\userfolio %  naast realfolio
-  {\nummer[\s!page]}
-
-\def\pagenumber
-  {\userfolio}
+\def\userfolio {\convertednumber[\s!page]}  %  naast realfolio
+\def\pagenumber{\userfolio}
 
 \def\pageprefixes
-  {\def\donexttrackcommando##1%
-      {\doifvalue{\??nm##1\v!nummer}\v!ja  % v
-         {\ifnum\countervalue{\??se##1}>\zerocount
-            \getvalue{##1\c!nummer}\@@nmnummerscheider
-          \fi}%
-       \doifsomething\@@nmtekst
-         {\@@nmtekst\@@nmnummerscheider}%
-       \donexttracklevel{##1}}%
-    \donexttrackcommando{\firstsection}}
+  {\let\donexttrackcommando\dopageprefixes
+   \donexttrackcommando\firstsection}
+
+\def\dopageprefixes#1%
+  {\doifvalue{\??nm#1\v!number}\v!yes  % v
+     {\ifnum\countervalue{\??se#1}>\zerocount
+        \getvalue{#1\c!number}\@@nmnumberseparator
+      \fi}%
+   \doifsomething\@@nmtext{\@@nmtext\@@nmnumberseparator}\donexttracklevel{#1}}
 
 \unexpanded\def\completepagenumber
-  {\doif{\@@nmstatus\@@pnstatus}{\v!start\v!start}
-     {\@@nmlinks\labeltexts\v!paginanummer{\pageprefixes\pagenumber}\@@nmrechts}}
+  {\doif{\@@nmstate\@@pnstate}{\v!start\v!start}
+     {\@@nmleft\labeltexts\v!pagenumber{\pageprefixes\pagenumber}\@@nmright}}
 
 \unexpanded\def\placepagenumber
-  {\doif{\@@nmstatus\@@pnstatus}{\v!start\v!start}
-     {\labeltexts\v!paginanummer{\pagenumber}}}
+  {\doif{\@@nmstate\@@pnstate}{\v!start\v!start}
+     {\labeltexts\v!pagenumber{\pagenumber}}}
 
 % Nog een variant; wat is een goeie naam?
 
@@ -565,19 +547,17 @@
 
 \def\translatednumber{\@@filterpagepart}
 
-% \unexpanded\def\referencepagenumber[#1]%
-%   {\doifelsenothing{#1}{?}{\paginaprefix\??rf[#1]\translatednumber[#1]}}
-
 \unexpanded\def\referencepagenumber[#1]%
-  {\doifelsenothing{#1}{?}% \prepare had got lost
-     {\preparepaginaprefix\??rf\paginaprefix\??rf[#1]\translatednumber[#1]}}
+  {\doifelsenothing{#1}{?}%
+     {\preparepageprefix\??rf
+      \pageprefix\??rf[#1]\translatednumber[#1]}}
 
 \setuppagenumber
-  [\c!status=\v!start,
-   \c!nummer=1]
+  [\c!state=\v!start,
+   \c!number=1]
 
 \setupsubpagenumber
-  [\c!wijze=\v!per\v!deel,
-   \c!status=\v!stop]
+  [\c!way=\v!by\v!part,
+   \c!state=\v!stop]
 
 \protect \endinput
diff --git a/tex/context/base/page-one.tex b/tex/context/base/page-one.tex
index 68c919e8c..b85932621 100644
--- a/tex/context/base/page-one.tex
+++ b/tex/context/base/page-one.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-one,
+%D   [       filefile=page-one,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Default Routine,
@@ -31,7 +31,7 @@
   {\superejectpage}
 
 \def\OTRONEsethsize
-  {\global\hsize\tekstbreedte}
+  {\global\hsize\textwidth}
 
 % keep (original one)
 %
@@ -93,13 +93,13 @@
 \def\OTRONEsetvsize
   {\ifgridsnapping
      \ifcase\layoutlines
-       \getrawnoflines\teksthoogte
+       \getrawnoflines\textheight
      \else
        \noflines\layoutlines
      \fi
      \global\vsize\noflines\openlineheight
    \else
-     \global\vsize\teksthoogte
+     \global\vsize\textheight
    \fi
    \ifdim\pagegoal<\maxdimen
      \ifdim\oldvsize=\vsize
@@ -178,7 +178,7 @@
 \def\OTRONEregisteredtextarea#1%
   {\ifregistertextareas
      \setbox0\vbox{#1}%
-     \wd0\zetbreedte % somehow a space creeps in
+     \wd0\makeupwidth % somehow a space creeps in
      \vbox{\registeredtextarea000}%
    \else
      #1%
@@ -195,7 +195,7 @@
    \or % whole page
      \let\OTRONEregisteredtextareaB\OTRONEregisteredtextarea
    \fi
-   \setbox0\vbox \ifbottomnotes to \teksthoogte \fi
+   \setbox0\vbox \ifbottomnotes to \textheight \fi
      {\edef\currentpagedepth{\the\dp#2}% still to be derived from #1
       \dotopinsertions
       \ifgridsnapping
@@ -225,7 +225,7 @@
       \fakenotes}%
    \ifbottomnotes
      \ifgridsnapping
-       \getnoflines\teksthoogte
+       \getnoflines\textheight
        \advance\noflines \minusone
        \scratchdimen\noflines\lineheight
        \advance\scratchdimen \topskip
@@ -243,7 +243,7 @@
      \ht0\zeropoint
    \fi
    \OTRONEregisteredtextareaB
-     {\vbox to \teksthoogte
+     {\vbox to \textheight
         {\box0\box2\ifbottomnotes\else\vfill\fi}}%
    \egroup}
 
@@ -263,14 +263,14 @@
      \noffloatinserts\zerocount
      \let\totaltopinserted\!!zeropoint
      \OTRONEdodosettopinserts
-     \ifnum\@@bknonder=\zerocount
-       \ifnum\@@bknregels>\zerocount
+     \ifnum\@@bknbottom=\zerocount
+       \ifnum\@@bknlines>\zerocount
          \ifdim\totaltopinserted>\zeropoint\relax
            \dimen0=\lineheight
-           \dimen0=\@@bknregels\dimen0
+           \dimen0=\@@bknlines\dimen0
            \advance\dimen0 \totaltopinserted\relax
-           \ifdim\dimen0>\teksthoogte
-             \showmessage\m!floatblocks8\@@bknregels
+           \ifdim\dimen0>\textheight
+             \showmessage\m!floatblocks8\@@bknlines
              \vfilll\eject
            \fi
          \fi
@@ -332,7 +332,7 @@
      \global\advance\topinserted \ht\floatbox
      \global\advance\topinserted \dp\floatbox
      \global\advance\topinserted \floatbottomskip\relax
-     \ifdim\topinserted<\teksthoogte\relax
+     \ifdim\topinserted<\textheight\relax
        \xdef\totaltopinserted{\the\topinserted}%
        \insert\topins
          {\forgetall
@@ -341,11 +341,11 @@
             \kern-\lineskip\par
             \prevdepth\maxdimen
           \else
-            %\blanko[-\@@bknawit,\@@bkvoorwit]% inserts can't look back
+            %\blank[-\@@bkspaceafter,\@@bkspacebefore]% inserts can't look back
             \betweenfloatblanko
           \fi
           \flushfloatbox
-          \blanko[\@@bknawit]}%
+          \blank[\@@bkspaceafter]}%
        \ifsomefloatwaiting
          \advance\noffloatinserts \plusone
        \else
@@ -381,7 +381,7 @@
      \ifdim\botinserted<\pagegoal\relax
        \insert\botins
          {\forgetall
-          \blanko[\@@bkvoorwit]%
+          \blank[\@@bkspacebefore]%
           \flushfloatbox}%
        \ifsomefloatwaiting
          \advance\noffloatinserts \plusone
@@ -486,8 +486,8 @@
      \ifpackflushedfloats
        \centerfloatboxfalse
        \dogetfloat
-       \ifdim\wd\floatbox>\zetbreedte
-         \global\setbox\floatbox\hbox to \zetbreedte{\hss\box\floatbox\hss}%
+       \ifdim\wd\floatbox>\makeupwidth
+         \global\setbox\floatbox\hbox to \makeupwidth{\hss\box\floatbox\hss}%
        \fi
        \OTRONEsetvsize
        \!!widtha\wd\floatbox
@@ -641,8 +641,8 @@
    \someherefloat} % [#1]
 
 \def\OTRONEsomesidefloat[#1]%  links, rechts     NOG TESTEN EN AANPASSEN
-  {\ifbinnenkolommen
-     \someelsefloat[\v!hier]%
+  {\ifinsidecolumns
+     \someelsefloat[\v!here]%
    \else
     %\checkwaitingfloats{#1}%
      \def\logsidefloat
@@ -651,29 +651,29 @@
      \wd\floatbox\floatwidth
      \processfirstactioninset
        [#1]
-       [     \v!links=>\leftfloat       {\box\floatbox},
-            \v!rechts=>\rightfloat      {\box\floatbox},
-          \v!inlinker=>\leftmarginfloat {\box\floatbox},
-         \v!inrechter=>\rightmarginfloat{\box\floatbox},
-       \v!linkermarge=>\leftmarginfloat {\box\floatbox},
-      \v!rechtermarge=>\rightmarginfloat{\box\floatbox},
-        \v!linkerrand=>\leftedgefloat   {\box\floatbox},
-       \v!rechterrand=>\rightedgefloat  {\box\floatbox},
-            \v!rugwit=>\backspacefloat  {\box\floatbox},
-           \v!snijwit=>\cutspacefloat   {\box\floatbox},
-           \v!inmarge=>{\doinmargenormal\leftmarginfloat
+       [     \v!left=>\leftfloat       {\box\floatbox},
+            \v!right=>\rightfloat      {\box\floatbox},
+          \v!inleft=>\leftmarginfloat {\box\floatbox},
+         \v!inright=>\rightmarginfloat{\box\floatbox},
+       \v!leftmargin=>\leftmarginfloat {\box\floatbox},
+      \v!rightmargin=>\rightmarginfloat{\box\floatbox},
+        \v!leftedge=>\leftedgefloat   {\box\floatbox},
+       \v!rightedge=>\rightedgefloat  {\box\floatbox},
+            \v!backspace=>\backspacefloat  {\box\floatbox},
+           \v!cutspace=>\cutspacefloat   {\box\floatbox},
+           \v!inmargin=>{\doinmargenormal\leftmarginfloat
                        \rightmarginfloat{\box\floatbox}}]%
-     \doifinset\v!lang{#1}\flushsidefloatsafterpar
+     \doifinset\v!tall{#1}\flushsidefloatsafterpar
    \fi}
 
 \def\OTRONEsomepagefloat[#1]%
   {%\checkwaitingfloats{#1}%
    \global\setbox\collectedpagefloats\vbox
      {\unvbox\collectedpagefloats
-      \vbox to \teksthoogte
-        {\doifnotinset\v!hoog{#1}\vfill
+      \vbox to \textheight
+        {\doifnotinset\v!high{#1}\vfill
          \box\floatbox
-         \doifnotinset\v!laag{#1}\vfill}%
+         \doifnotinset\v!low{#1}\vfill}%
       \goodbreak}%
    \doinsertfloatinfo}
 
@@ -713,11 +713,11 @@
         \topskipcorrection % [xx] new: see icare topbleed
         \kern-\lineskip\par\prevdepth\maxdimen
       \else
-        %\blanko[-\@@bknawit,\@@bkvoorwit]% inserts can't look back
+        %\blank[-\@@bkspaceafter,\@@bkspacebefore]% inserts can't look back
         \betweenfloatblanko
       \fi
       \flushfloatbox
-      \blanko[\@@bknawit]}%
+      \blank[\@@bkspaceafter]}%
    \doinsertfloatinfo}
 
 \def\OTRONEsomebotsfloat[#1]%
@@ -726,12 +726,15 @@
    \global\advance\botinserted \floattopskip
    \insert\botins
      {\forgetall
-      \blanko[\@@bkvoorwit]%
+      \blank[\@@bkspacebefore]%
       \flushfloatbox}%
    %\global\nofloatpermittedtrue
    \doinsertfloatinfo}
 
+\def\OTRONEsomefacefloat[#1]% untested
+  {\startopposite\flushfloatbox\stopopposite}
+
 \def\OTRONEnextcolumn[#1]%
   {}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-run.tex b/tex/context/base/page-run.tex
index 801ca4c6d..f7955092b 100644
--- a/tex/context/base/page-run.tex
+++ b/tex/context/base/page-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-run,
+%D   [       filefile=page-run,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Runtime Macros,
@@ -18,19 +18,19 @@
 \gdef\doshowprint[#1][#2][#3]%
   {\framed
      [\c!offset=\v!overlay,
-      \c!strut=\v!nee]
+      \c!strut=\v!no]
      {\forgetall
-      \mindermeldingen
+      \dontcomplain
       \globaldefs\minusone
       \dimen0\pagegoal
-      \definepapersize[X][\c!breedte=4em, \c!hoogte=6em]%
-      \definepapersize[Y][\c!breedte=12em,\c!hoogte=14em]%
+      \definepapersize[X][\c!width=4em, \c!height=6em]%
+      \definepapersize[Y][\c!width=12em,\c!height=14em]%
       \setuppapersize[#1,X][#2,Y]%
       \setuplayout[#3]%
       \setbox0\vbox
         {\framed
-          [\c!offset=\v!overlay,\c!strut=\v!nee,
-           \c!breedte=\papierbreedte,\c!hoogte=\papierhoogte]
+          [\c!offset=\v!overlay,\c!strut=\v!no,
+           \c!width=\paperwidth,\c!height=\paperheight]
           {\ss ABC\par DEF}}%
       \dubbelzijdigfalse
       \def\cutmarklength{.5em}%
@@ -92,33 +92,33 @@
 \gdef\doshowframe[#1][#2]%
   {\ifsecondargument
      \setupbackgrounds
-       [\v!pagina]
-       [\c!kader=\v!aan,
-        \c!hoek=\v!recht,
-        \c!kaderoffset=\!!zeropoint,
-        \c!kaderdiepte=\!!zeropoint,
-        \c!kaderkleur=layout:page]
+       [\v!page]
+       [\c!frame=\v!on,
+        \c!corner=\v!rectangular,
+        \c!frameoffset=\!!zeropoint,
+        \c!framedepth=\!!zeropoint,
+        \c!framecolor=layout:page]
      \setupbackgrounds
        [#1][#2]
-       [\c!achtergrond=,
-        \c!kader=\v!aan,
-        \c!hoek=\v!recht,
-        \c!kaderoffset=\!!zeropoint,
-        \c!kaderdiepte=\!!zeropoint,
-        \c!kaderkleur=]
+       [\c!background=,
+        \c!frame=\v!on,
+        \c!corner=\v!rectangular,
+        \c!frameoffset=\!!zeropoint,
+        \c!framedepth=\!!zeropoint,
+        \c!framecolor=]
    \else\iffirstargument
      \showframe
-       [\v!hoofd,\v!tekst,\v!voet]
+       [\v!header,\v!text,\v!footer]
        [#1]
    \else
      \showframe
-       [\v!hoofd,\v!tekst,\v!voet]
-       [\v!linkerrand,\v!linkermarge,
-        \v!tekst,
-        \v!rechtermarge,\v!rechterrand]
+       [\v!header,\v!text,\v!footer]
+       [\v!leftedge,\v!leftmargin,
+        \v!text,
+        \v!rightmargin,\v!rightedge]
    \fi\fi
    \setupbackgrounds
-     [\c!status=\v!herhaal]}
+     [\c!state=\v!repeat]}
 
 \gdef\showframe{\dodoubleempty\doshowframe}
 
@@ -128,26 +128,14 @@
 \gdef\showsetupB#1#2#3%
   {#1&&#2#3&\tttf\string#3\cr}
 
-\iffixedlayoutdimensions
-
-  \global\let\showsetupC=\showsetupA
-
-\else % we could have used \@the
-
-  \gdef\showsetupC#1#2% \relax is really needed here !
-    {#1&\scratchdimen#2\PtToCm{\the\scratchdimen}&%
-     \scratchdimen#2\relax\the\scratchdimen&\tttf\string#2\cr}
-
-\fi
-
 % \startinterface english % english is fallback
 
 \gdef\showsetups
   {\noindent
    \vbox
      {\forgetall
-      \mindermeldingen
-      \switchtobodyfont[\v!klein]
+      \dontcomplain
+      \switchtobodyfont[\v!small]
       \tabskip\zeropoint
       \halign
         {\strut##\quad\hss&##\quad\hss&##\quad\hss&##\hss\cr
@@ -160,22 +148,22 @@
          \showsetupA{height}             \makeupheight
          \showsetupA{width}              \makeupwidth
          \showsetupA{top}                \topheight
-         \showsetupC{topdistance}        \topdistance
+         \showsetupA{topdistance}        \topdistance
          \showsetupA{header}             \headerheight
-         \showsetupC{headerdistance}     \headerdistance
+         \showsetupA{headerdistance}     \headerdistance
          \showsetupA{textheight}         \textheight
-         \showsetupC{footerdistance}     \footerdistance
+         \showsetupA{footerdistance}     \footerdistance
          \showsetupA{footer}             \footerheight
-         \showsetupC{bottomdistance}     \bottomdistance
+         \showsetupA{bottomdistance}     \bottomdistance
          \showsetupA{bottom}             \bottomheight
          \showsetupA{leftedge}           \leftedgewidth
-         \showsetupC{leftedgedistance}   \leftedgedistance
+         \showsetupA{leftedgedistance}   \leftedgedistance
          \showsetupA{leftmargin}         \leftmarginwidth
-         \showsetupC{leftmargindistance} \leftmargindistance
+         \showsetupA{leftmargindistance} \leftmargindistance
          \showsetupA{textwidth}          \textwidth
-         \showsetupC{rightmargindistance}\rightmargindistance
+         \showsetupA{rightmargindistance}\rightmargindistance
          \showsetupA{rightmargin}        \rightmarginwidth
-         \showsetupC{rightedgedistance}  \rightedgedistance
+         \showsetupA{rightedgedistance}  \rightedgedistance
          \showsetupA{rightedge}          \rightedgewidth
          \showsetupB{bodyfontsize}       \the   \globalbodyfontsize
          \showsetupB{line}               \relax \normallineheight
@@ -192,8 +180,8 @@
   {\noindent
    \vbox
      {\forgetall
-      \mindermeldingen
-      \switchtobodyfont[\v!klein]
+      \dontcomplain
+      \switchtobodyfont[\v!small]
       \tabskip\zeropoint
       \halign
         {\strut##\quad\hss&##\quad\hss&##\quad\hss&##\hss\cr
@@ -207,22 +195,22 @@
          \showsetupA{hoogte}             \zethoogte
          \showsetupA{breedte}            \zetbreedte
          \showsetupA{boven}              \bovenhoogte
-         \showsetupC{bovenafstand}       \bovenafstand
+         \showsetupA{bovenafstand}       \bovenafstand
          \showsetupA{hoofd}              \hoofdhoogte
-         \showsetupC{hoofdafstand}       \hoofdafstand
+         \showsetupA{hoofdafstand}       \hoofdafstand
          \showsetupA{teksthoogte}        \teksthoogte
-         \showsetupC{voetafstand}        \voetafstand
+         \showsetupA{voetafstand}        \voetafstand
          \showsetupA{voet}               \voethoogte
-         \showsetupC{onderafstand}       \onderafstand
+         \showsetupA{onderafstand}       \onderafstand
          \showsetupA{onder}              \onderhoogte
          \showsetupA{linkerrand}         \linkerrandbreedte
-         \showsetupC{linkerrandafstand}  \linkerrandafstand
+         \showsetupA{linkerrandafstand}  \linkerrandafstand
          \showsetupA{linkermarge}        \linkermargebreedte
-         \showsetupC{linkermargeafstand} \linkermargeafstand
+         \showsetupA{linkermargeafstand} \linkermargeafstand
          \showsetupA{tekstbreedte}       \tekstbreedte
-         \showsetupC{rechtermargeafstand}\rechtermargeafstand
+         \showsetupA{rechtermargeafstand}\rechtermargeafstand
          \showsetupA{rechtermarge}       \rechtermargebreedte
-         \showsetupC{rechterrandafstand} \rechterrandafstand
+         \showsetupA{rechterrandafstand} \rechterrandafstand
          \showsetupA{rechterrand}        \rechterrandbreedte
          \showsetupB{korps}              \the   \globalbodyfontsize
          \showsetupB{regel}              \relax \normallineheight
@@ -241,8 +229,8 @@
   {\noindent
    \vbox
      {\forgetall
-      \mindermeldingen
-      \switchtobodyfont[\v!klein]
+      \dontcomplain
+      \switchtobodyfont[\v!small]
       \tabskip\zeropoint
       \halign
         {\strut##\quad\hss&##\quad\hss&##\quad\hss&##\hss\cr
@@ -255,22 +243,22 @@
          \showsetupA{hoehe}                \satzhoehe
          \showsetupA{breite}               \satzbreite
          \showsetupA{oben}                 \hoeheoben
-         \showsetupC{abstandoben}          \abstandoben
+         \showsetupA{abstandoben}          \abstandoben
          \showsetupA{kopfzeile}            \kopfzeilenhoehe
-         \showsetupC{kopfzeilenabstand}    \kopfzeilenabstand
+         \showsetupA{kopfzeilenabstand}    \kopfzeilenabstand
          \showsetupA{texthoehe}            \texthoehe
-         \showsetupC{fusszeileabstand}     \fusszeileabstand
+         \showsetupA{fusszeileabstand}     \fusszeileabstand
          \showsetupA{fusszeilen}           \fusszeilenhoehe
-         \showsetupC{abstandunten}         \abstandunten
+         \showsetupA{abstandunten}         \abstandunten
          \showsetupA{hoeheunten}           \hoeheunten
          \showsetupA{linkerrand}           \breitelinkerrand
-         \showsetupC{abstandlinkerrand}    \abstandlinkerrand
+         \showsetupA{abstandlinkerrand}    \abstandlinkerrand
          \showsetupA{linkemarginal}        \linkemarginalbreite
-         \showsetupC{linkemarginalafstand} \linkemarginalafstand
+         \showsetupA{linkemarginalafstand} \linkemarginalafstand
          \showsetupA{textbreite}           \textbreite
-         \showsetupC{rechtemarginalafstand}\rechtemarginalafstand
+         \showsetupA{rechtemarginalafstand}\rechtemarginalafstand
          \showsetupA{rechtemarginal}       \rechtemarginalbreite
-         \showsetupC{abstandrechterrand}   \abstandrechterrand
+         \showsetupA{abstandrechterrand}   \abstandrechterrand
          \showsetupA{rechterrand}          \breiterechterrand
          \showsetupB{fliesstext}           \the   \globalbodyfontsize
          \showsetupB{linie}                \relax \normallineheight
@@ -287,8 +275,8 @@
   {\noindent
    \vbox
      {\forgetall
-      \mindermeldingen
-      \switchtobodyfont[\v!klein]
+      \dontcomplain
+      \switchtobodyfont[\v!small]
       \tabskip\zeropoint
       \halign
         {\strut##\quad\hss&##\quad\hss&##\quad\hss&##\hss\cr
@@ -303,20 +291,20 @@
          \showsetupA{vyskatextu}               \vyskatextu
          \showsetupA{sirkatextu}               \sirkatextu
          \showsetupA{horejsek}                 \vyskahorejsku
-         \showsetupC{vzdalenosthorejsku}       \vzdalenosthorejsku
+         \showsetupA{vzdalenosthorejsku}       \vzdalenosthorejsku
          \showsetupA{zahlavi}                  \vyskazahlavi
-         \showsetupC{vzdalenostzahlavi}        \vzdalenostzahlavi
-         \showsetupC{fusszeileabstand}         \vzdalenostupati
+         \showsetupA{vzdalenostzahlavi}        \vzdalenostzahlavi
+         \showsetupA{fusszeileabstand}         \vzdalenostupati
          \showsetupA{upati}                    \vyskaupati
-         \showsetupC{vzdalenostspodku}         \vzdalenostspodku
+         \showsetupA{vzdalenostspodku}         \vzdalenostspodku
          \showsetupA{spodek}                   \vyakaspodku
          \showsetupA{levyokraj}                \sirkalevehookraje
-         \showsetupC{vzdalenostlevehookraje}   \vzdalenostlevehookraje
+         \showsetupA{vzdalenostlevehookraje}   \vzdalenostlevehookraje
          \showsetupA{levamarginalie}           \sirkalevemarginalie
-         \showsetupC{vzdalenostlevemarginalie} \vzdalenostlevemarginalie
-         \showsetupC{vzdalenostpravemarginalie}\vzdalenostpravemarginalie
+         \showsetupA{vzdalenostlevemarginalie} \vzdalenostlevemarginalie
+         \showsetupA{vzdalenostpravemarginalie}\vzdalenostpravemarginalie
          \showsetupA{pravamarginalie}          \sirkapravemarginalie
-         \showsetupC{vzdalenostpravehookraje}  \vzdalenostpravehookraje
+         \showsetupA{vzdalenostpravehookraje}  \vzdalenostpravehookraje
          \showsetupA{pravyokraj}               \sirkapravehookraje
          \showsetupB{zakladnivelikost}         \the   \globalbodyfontsize
          \showsetupB{linka}                    \relax \normallineheight
@@ -333,8 +321,8 @@
   {\noindent
    \vbox
      {\forgetall
-      \mindermeldingen
-      \switchtobodyfont[\v!klein]
+      \dontcomplain
+      \switchtobodyfont[\v!small]
       \tabskip\zeropoint
       \halign
         {\strut##\quad\hss&##\quad\hss&##\quad\hss&##\hss\cr
@@ -347,22 +335,22 @@
          \showsetupA{height}             \makeupheight
          \showsetupA{width}              \makeupwidth
          \showsetupA{top}                \topheight
-         \showsetupC{topdistance}        \topdistance
+         \showsetupA{topdistance}        \topdistance
          \showsetupA{header}             \headerheight
-         \showsetupC{headerdistance}     \headerdistance
+         \showsetupA{headerdistance}     \headerdistance
          \showsetupA{textheight}         \textheight
-         \showsetupC{footerdistance}     \footerdistance
+         \showsetupA{footerdistance}     \footerdistance
          \showsetupA{footer}             \footerheight
-         \showsetupC{bottomdistance}     \bottomdistance
+         \showsetupA{bottomdistance}     \bottomdistance
          \showsetupA{bottom}             \bottomheight
          \showsetupA{leftedge}           \leftedgewidth
-         \showsetupC{leftedgedistance}   \leftedgedistance
+         \showsetupA{leftedgedistance}   \leftedgedistance
          \showsetupA{leftmargin}         \leftmarginwidth
-         \showsetupC{leftmargindistance} \leftmargindistance
+         \showsetupA{leftmargindistance} \leftmargindistance
          \showsetupA{textwidth}          \textwidth
-         \showsetupC{rightmargindistance}\rightmargindistance
+         \showsetupA{rightmargindistance}\rightmargindistance
          \showsetupA{rightmargin}        \rightmarginwidth
-         \showsetupC{rightedgedistance}  \rightedgedistance
+         \showsetupA{rightedgedistance}  \rightedgedistance
          \showsetupA{rightedge}          \rightedgewidth
          \showsetupB{bodyfontsize}       \the   \globalbodyfontsize
          \showsetupB{line}               \relax \normallineheight
@@ -375,10 +363,10 @@
 
 \gdef\showlayout % interfereert lelijk met een \typefile er na
   {\bgroup
-   \pagina
+   \page
    \showframe
-   \setuplayout[\c!markering=\v!aan]
-   \dorecurse{4}{\showsetups\pagina}
+   \setuplayout[\c!marking=\v!on]
+   \dorecurse{4}{\showsetups\page}
    \egroup}
 
 \gdef\showmargins
diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex
index a77563eba..6eb3622bd 100644
--- a/tex/context/base/page-set.tex
+++ b/tex/context/base/page-set.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-set,
+%D   [       filefile=page-set,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Column Sets,
@@ -382,7 +382,7 @@
 
 \long\def\OTRSETrecurseRL#1%
   {\dostepwiserecurse\nofcolumns\plusone\minusone
-     {#1\hskip\OTRSETgetparameter\c!afstand\recurselevel}}
+     {#1\hskip\OTRSETgetparameter\c!distance\recurselevel}}
 
 \def\OTRSETmakegridbox
   {\ifcase\columndirection
@@ -395,28 +395,28 @@
   {\hbox\bgroup
    \dontcomplain
    \forgetall % can go once in \flush
-   \!!heighta \teksthoogte
+   \!!heighta \textheight
    % test first !
-   \hbox to \zetbreedte
+   \hbox to \makeupwidth
      {\dostepwiserecurse{#1}{#2}{#3}
         {\mofcolumns\recurselevel
          \localcolumnwidth\OTRSETlocalwidth\mofcolumns
          \setbox\scratchbox\hbox\localframed
            [\??mc\OTRSETidentifier\number\mofcolumns]%
-           [\c!breedte=\localcolumnwidth,\c!hoogte=\!!heighta,\c!regels=]%
+           [\c!width=\localcolumnwidth,\c!height=\!!heighta,\c!lines=]%
            {}%
          \wd\scratchbox\localcolumnwidth
          \ht\scratchbox\!!heighta
          \ifcase\columndirection
-           \hskip\OTRSETgetparameter\c!afstand\recurselevel
+           \hskip\OTRSETgetparameter\c!distance\recurselevel
            \box\scratchbox
          \else
            \box\scratchbox
-           \hskip\OTRSETgetparameter\c!afstand\recurselevel
+           \hskip\OTRSETgetparameter\c!distance\recurselevel
          \fi}}%
-   \hskip-\zetbreedte
+   \hskip-\makeupwidth
    % main text
-   \hbox to \zetbreedte
+   \hbox to \makeupwidth
      {\dostepwiserecurse{#1}{#2}{#3}
         {\mofcolumns\recurselevel
          \localcolumnwidth\OTRSETlocalwidth\mofcolumns
@@ -461,11 +461,11 @@
               \kern\zeropoint
               \vss
             \fi}%
-         \wd\scratchbox\localcolumnwidth % \tekstbreedte
+         \wd\scratchbox\localcolumnwidth % \textwidth
          \ifcase\columndirection
-           \hskip\OTRSETgetparameter\c!afstand\recurselevel\box\scratchbox
+           \hskip\OTRSETgetparameter\c!distance\recurselevel\box\scratchbox
          \else
-           \box\scratchbox\hskip\OTRSETgetparameter\c!afstand\recurselevel
+           \box\scratchbox\hskip\OTRSETgetparameter\c!distance\recurselevel
          \fi}}%
    \egroup}
 
@@ -560,7 +560,7 @@
 %    \fi}
 
 \def\OTRSETdofinaloutput
-  {\ifdim\ht\OTRfinalpagebox=\teksthoogte
+  {\ifdim\ht\OTRfinalpagebox=\textheight
     \bgroup % \let\OTRSETsetvsize\relax % prevents useless search for gap
      \ifcase\OTRSETbalancemethod
        \finaloutput\box\OTRfinalpagebox
@@ -568,7 +568,7 @@
        % catch a bordercase
        \scratchdimen\OTRSETbalht
        \advance\scratchdimen\lineheight\relax
-       \ifdim\scratchdimen>\teksthoogte
+       \ifdim\scratchdimen>\textheight
          % full page
          \finaloutput\box\OTRfinalpagebox
        \else
@@ -617,7 +617,7 @@
 
 \def\OTRSETsethsize % of course this does not migrate outside the otr
   {\localcolumnwidth\OTRSETlocalwidth\mofcolumns
-   \tekstbreedte\localcolumnwidth
+   \textwidth\localcolumnwidth
    \hsize\localcolumnwidth}
 
 %\def\OTRSETsynchronizehsize
@@ -625,10 +625,10 @@
 %     \OTRSETsethsize}
 
 \def\OTRSETsynchronizehsize
-  {\ifcase0\getvalue{\??mc\??mc\c!breedte}\else % some width set
+  {\ifcase0\getvalue{\??mc\??mc\c!width}\else % some width set
      \bgroup
      \scratchdimen\OTRSETlocalwidth\mofcolumns
-     \ifdim\scratchdimen=\tekstbreedte
+     \ifdim\scratchdimen=\textwidth
        \egroup
      \else
        % only if change in width and \column/\break
@@ -685,7 +685,7 @@
      \egroup
    \fi}
 
-\installcolumnbreakhandler {SET} \v!lokaal
+\installcolumnbreakhandler {SET} \v!local
   {\OTRSETcolumnhbreak
    \ejectinsert
    \ejectpage % brrr
@@ -699,7 +699,7 @@
 % stay there (basically such a gap is a small empty page
 % then).
 
-\installcolumnbreakhandler {SET} \v!ja
+\installcolumnbreakhandler {SET} \v!yes
   {\OTRSETcolumnhbreak
    \edef\savedmofcolumns{\the\mofcolumns}%
    \edef\savedrealpageno{\the\realpageno}%
@@ -720,7 +720,7 @@
 \installcolumnbreakhandler {SET} \s!unknown
   {\expanded{\OTRSETgotocolumn[\@@columnspecification]}}
 
-\installcolumnbreakhandler {SET} \v!pagina
+\installcolumnbreakhandler {SET} \v!page
   {\vfill\eject % \doejectpage\eject
    \OTRSETgotonextpage}
 
@@ -844,7 +844,7 @@
 
 \def\OTRSEThandleflushedtext#1%
   {\getnoflines{\ht\scratchbox}%
-  %\wd\scratchbox\tekstbreedte % geen \hsize kan < zijn in bv split tabulate
+  %\wd\scratchbox\textwidth % geen \hsize kan < zijn in bv split tabulate
    \wd\scratchbox\OTRSETlocalwidth\mofcolumns
    \doOTRSETsetgridcells
      {\copy\placeholderboxf}
@@ -1044,7 +1044,7 @@
         \else
           \advance\columnhcells \plusone
           \advance\scratchcounter \plusone
-          \advance\totalcolumnspace \OTRSETgetparameter\c!afstand\scratchcounter
+          \advance\totalcolumnspace \OTRSETgetparameter\c!distance\scratchcounter
         \fi
       \else
         \exitloop
@@ -1208,7 +1208,7 @@
 
 \def\OTRSETstoreincolumnslotFIXD#1% fixed column
   {\OTRSETflushtextsofar
-   \ifdim\wd#1>\tekstbreedte
+   \ifdim\wd#1>\textwidth
      \OTRSETstoreincolumnslotSOMEWHERE2{#1}%
    \else
      % crappy test / needed for o-pbu-f / will be replaced
@@ -1219,9 +1219,9 @@
      \ifdim\scratchdimen<\pagegoal
        %OTRSETprepareforcolumnslot3{#1}%
        %ruledvskip\columnslotspacing\lineheight
-       \blanko[\columnslotspacing*\v!regel]%
+       \blank[\columnslotspacing*\v!line]%
        \snaptogrid\hbox to \hsize{\hss\box#1\hss}% strange, why the centering
-       \blanko[\columnslotspacing*\v!regel]%
+       \blank[\columnslotspacing*\v!line]%
      \else
        \OTRSETstoreincolumnslotSOMEWHERE2{#1}%
      \fi
@@ -1452,7 +1452,7 @@
              \totalcolumnspace\OTRSETlocalwidth\currenthcell
              \dostepwiserecurse\!!countc\!!countb\plusone
                {\advance\totalcolumnspace \OTRSETlocalwidth\recurselevel
-                \advance\totalcolumnspace \OTRSETgetparameter\c!afstand\recurselevel}%
+                \advance\totalcolumnspace \OTRSETgetparameter\c!distance\recurselevel}%
              \ifdim\totalcolumnspace>\wd\scratchbox
                \setbox\scratchbox\hbox to \totalcolumnspace{\hss\box\scratchbox\hss}%
              \fi
@@ -1465,8 +1465,8 @@
 \def\OTRSETinitializecolumns% once per page
   {\columnspreadtrue % todo
    \ifcolumnspread
-     \global\rofcolumns\getvalue{\??mc\OTRSETidentifier\c!nrechts}%
-     \global\lofcolumns\getvalue{\??mc\OTRSETidentifier\c!nlinks}%
+     \global\rofcolumns\getvalue{\??mc\OTRSETidentifier\c!nright}%
+     \global\lofcolumns\getvalue{\??mc\OTRSETidentifier\c!nleft}%
      \global\tofcolumns\rofcolumns \relax
      \ifodd\realpageno\relax
        \global\nofcolumns\rofcolumns
@@ -1491,21 +1491,21 @@
 
 \def\dodefinecolumnset[#1][#2]%
   {\getparameters[\??mc#1]
-     [\c!richting=\v!rechts,
-      \c!balanceren=\v!nee,
-      \c!afstand=1.5\bodyfontsize, % controleren
+     [\c!direction=\v!right,
+      \c!balance=\v!no,
+      \c!distance=1.5\bodyfontsize, % controleren
       \c!n=2,
-      \c!nlinks=\getvalue{\??mc#1\c!n},
-      \c!nrechts=\getvalue{\??mc#1\c!n},
-      \c!breedte=\v!passend,
-      \c!regels=0,
+      \c!nleft=\getvalue{\??mc#1\c!n},
+      \c!nright=\getvalue{\??mc#1\c!n},
+      \c!width=\v!fit,
+      \c!lines=0,
       #2]%
-   \dorecurse{\getvalue{\??mc#1\c!nlinks}} % todo
+   \dorecurse{\getvalue{\??mc#1\c!nleft}} % todo
      {\dododefinecolumnset[#1][\recurselevel]}%
-   \dorecurse{\getvalue{\??mc#1\c!nrechts}} % todo
+   \dorecurse{\getvalue{\??mc#1\c!nright}} % todo
      {\dododefinecolumnset[#1][\recurselevel]}%
    % redo framed settings
-   \setupcolumnset[#1][1][\c!afstand=\!!zeropoint]}
+   \setupcolumnset[#1][1][\c!distance=\!!zeropoint]}
 
 \def\dododefinecolumnset[#1][#2]%
   {\presetlocalframed
@@ -1513,11 +1513,11 @@
    \setupcolumnset
      [#1][#2]
      [\c!offset=\v!overlay,
-      \c!kader=\v!uit,
-      \c!uitlijnen=,
-      \c!regels=0,% really needed since c!regels is now part of framed
-      \c!breedte=\getvalue{\??mc#1\c!breedte},
-      \c!afstand=\getvalue{\??mc#1\c!afstand}]}
+      \c!frame=\v!off,
+      \c!align=,
+      \c!lines=0,% really needed since c!regels is now part of framed
+      \c!width=\getvalue{\??mc#1\c!width},
+      \c!distance=\getvalue{\??mc#1\c!distance}]}
 
 \def\setupcolumnset
   {\dotripleargument\dosetupcolumnset}
@@ -1525,7 +1525,7 @@
 \def\dosetupcolumnset[#1][#2][#3]%
   {\ifthirdargument
      \def\docommando##1%
-       {\doifelse{##1}\v!elk
+       {\doifelse{##1}\v!each
           {\dorecurse{\getvalue{\??mc#1\c!n}}{\docommando\recurselevel}}
           {\getparameters[\??mc#1##1][#3]}}%
      \processcommalist[#2]\docommando
@@ -1538,9 +1538,9 @@
 \def\OTRSETgotonextpage
   {\vfill\eject
    \relax\ifnum\mofcolumns>\plusone
-     \OTRSETgotocolumn[\v!laatste]%
+     \OTRSETgotocolumn[\v!last]%
      \ifnum\mofcolumns>\plusone
-       \OTRSETgotocolumn[\v!forceer]%
+       \OTRSETgotocolumn[\v!force]%
      \fi
    \fi}
 
@@ -1622,11 +1622,11 @@
 \def\doOTRSETgotocolumn[#1]% yes|force|first|last|<number>|<number>*<number>
   {\processallactionsinset
      [#1]
-     [     \v!ja=>\OTRSETdummycolumn,
-          \v!nee=>,% not supported
-      \v!forceer=>\OTRSETdummycolumn,
-       \v!eerste=>\expanded{\doOTRSETgotoCOLUMN{1}},
-      \v!laatste=>\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}}]}
 
@@ -1693,7 +1693,7 @@
      \bgroup
      \globallet\columnsetpage\!!plusone
      \def\currentcolumnset{#2}%
-     \binnenkolommentrue % will be different flag
+     \insidecolumnstrue % will be different flag
      \activateotr{SET}{ONE}% andere naam, activate or so
      \doifelsenothing{#1}
        {\globallet\OTRSETlist\s!default}
@@ -1718,8 +1718,8 @@
      \sethsize
      \ifvoid\OTRfinalpagebox\else
        % probably balanced
-       \ifdim\ht\OTRfinalpagebox<\teksthoogte
-         \snaptogrid[\v!pagina]\hbox{\box\OTRfinalpagebox}%
+       \ifdim\ht\OTRfinalpagebox<\textheight
+         \snaptogrid[\v!page]\hbox{\box\OTRfinalpagebox}%
        \else
          \box\OTRfinalpagebox
        \fi
@@ -1903,18 +1903,18 @@
 \def\OTRSETinitializefeatures
   {% number of lines
    % new: raw
-   \getrawnoflines\teksthoogte\xdef\columnmaxcells{\the\noflines}%
+   \getrawnoflines\textheight\xdef\columnmaxcells{\the\noflines}%
    % direction
-   \doifelsevalue{\??mc\OTRSETidentifier\c!richting}\v!rechts
+   \doifelsevalue{\??mc\OTRSETidentifier\c!direction}\v!right
      {\chardef\columndirection\zerocount}
      {\chardef\columndirection\plusone}%
    % balancing
    \chardef\OTRSETbalancemethod\zerocount
    \processaction
-     [\getvalue{\??mc\OTRSETidentifier\c!balanceren}]
-     [    \v!ja=>\chardef\OTRSETbalancemethod\plusone,
-       \v!boven=>\chardef\OTRSETbalancemethod\plustwo,
-       \v!onder=>\chardef\OTRSETbalancemethod\plusthree]}
+     [\getvalue{\??mc\OTRSETidentifier\c!balance}]
+     [    \v!yes=>\chardef\OTRSETbalancemethod\plusone,
+       \v!top=>\chardef\OTRSETbalancemethod\plustwo,
+       \v!bottom=>\chardef\OTRSETbalancemethod\plusthree]}
 
 % keep 'm for a while
 %
@@ -2083,28 +2083,28 @@
 % interface to footnotes
 
 \def\OTRSETassignwidths
-  {%\scratchdimen\zetbreedte
-   \freezetextwidth \scratchdimen\tekstbreedte
+  {%\scratchdimen\makeupwidth
+   \freezetextwidth \scratchdimen\textwidth
    %
    \scratchcounter\zerocount
    \dorecurse\nofcolumns
-     {\doifelsevalue{\??mc\OTRSETidentifier\recurselevel\c!breedte}\v!passend
+     {\doifelsevalue{\??mc\OTRSETidentifier\recurselevel\c!width}\v!fit
         {\advance\scratchcounter \plusone }
-        {\advance\scratchdimen -\getvalue{\??mc\OTRSETidentifier\recurselevel\c!breedte}}%
-      \advance\scratchdimen -\getvalue{\??mc\OTRSETidentifier\recurselevel\c!afstand}}%
+        {\advance\scratchdimen -\getvalue{\??mc\OTRSETidentifier\recurselevel\c!width}}%
+      \advance\scratchdimen -\getvalue{\??mc\OTRSETidentifier\recurselevel\c!distance}}%
    \ifcase\scratchcounter\else
      \divide\scratchdimen \scratchcounter
    \fi
-   \setgvalue{\??mc\??mc\c!breedte}{0}%
+   \setgvalue{\??mc\??mc\c!width}{0}%
    \dorecurse\nofcolumns
-     {\doifelsevalue{\??mc\OTRSETidentifier\recurselevel\c!breedte}\v!passend
+     {\doifelsevalue{\??mc\OTRSETidentifier\recurselevel\c!width}\v!fit
         {\dimen0=\scratchdimen}
-        {\setgvalue{\??mc\??mc\c!breedte}{1}%
-         \dimen0=\getvalue{\??mc\OTRSETidentifier\recurselevel\c!breedte}}%
-      \setxvalue{\??mc\recurselevel\??mc\c!breedte}{\the\dimen0}}}
+        {\setgvalue{\??mc\??mc\c!width}{1}%
+         \dimen0=\getvalue{\??mc\OTRSETidentifier\recurselevel\c!width}}%
+      \setxvalue{\??mc\recurselevel\??mc\c!width}{\the\dimen0}}}
 
 \def\OTRSETlocalwidth#1%
-  {\getvalue{\??mc\number#1\??mc\c!breedte}}
+  {\getvalue{\??mc\number#1\??mc\c!width}}
 
 \newbox\placeholderboxa
 \newbox\placeholderboxb
@@ -2153,12 +2153,12 @@
 \def\OTRSETshowstatus
   {\iftracecolumnset \doOTRSETshowstatus \fi}
 
-\appendtoks \OTRSETshowstatus \to \everypar
+% \appendtoks \OTRSETshowstatus \to \everypar
 
 % page contents
 
 \def\OTRSETdopagecontents#1#2% takes two args: \box<n> \unvbox<n>
-  {\vbox to \teksthoogte{\forgetall#1#2\pushproperties}}
+  {\vbox to \textheight{\forgetall#1#2\pushproperties}}
 
 \def\OTRSETsomepagefloat  {\def\floatmethod{PAGE}\OTRSETsomeslotfloat} % check
 \def\OTRSETsomeherefloat  {\def\floatmethod{HERE}\OTRSETsomeslotfloat} % check
@@ -2185,14 +2185,14 @@
      \noffloatinserts\zerocount
      \let\totaltopinserted\!!zeropoint
      \OTRSETdodosettopinserts
-     \ifnum\@@bknonder=\zerocount
-       \ifnum\@@bknregels>\zerocount
+     \ifnum\@@bknbottom=\zerocount
+       \ifnum\@@bknlines>\zerocount
          \ifdim\totaltopinserted>\zeropoint\relax
            \dimen0\lineheight
-           \dimen0=\@@bknregels\dimen0
+           \dimen0=\@@bknlines\dimen0
            \advance\dimen0 \totaltopinserted\relax
-           \ifdim\dimen0>\teksthoogte % \vsize  %%%%%%%%% \teksthoogte
-             \showmessage\m!floatblocks8{\@@bknregels}%
+           \ifdim\dimen0>\textheight % \vsize  %%%%%%%%% \textheight
+             \showmessage\m!floatblocks8{\@@bknlines}%
              \vfilll\eject
            \fi
          \fi
@@ -2213,15 +2213,15 @@
        {\forgetall
         \iftopofinsert
           \ifdim\OTRSETtopoffset=\zeropoint
-            \verplaatsopgrid[\v!boven]
+            \moveongrid[\v!top]
           \fi
         \else
           \betweenfloatblanko % inserts can't look back
         \fi
         \flushfloatbox
-        \blanko[\@@bknawit]}%
+        \blank[\@@bkspaceafter]}%
      \global\advance\topinserted \ht\scratchbox\relax
-     \ifdim\topinserted>\vsize % was \teksthoogte\relax
+     \ifdim\topinserted>\vsize % was \textheight\relax
        \OTRSETresavebox\floatbox
        \noffloatinserts\noftopfloats\relax
        \global\advance\topinserted -\ht\scratchbox
@@ -2261,7 +2261,7 @@
      \ifdim\botinserted<\pagegoal\relax
        \insert\botins
          {\forgetall
-          \blanko[\@@bkvoorwit]%
+          \blank[\@@bkspacebefore]%
           \flushfloatbox}%
        \ifsomefloatwaiting
          \advance\noffloatinserts \plusone
@@ -2324,24 +2324,24 @@
 
 \def\dodefinecolumntextarea[#1][#2][#3]% y=0 is mogelijke en handig !
   {\ifthirdargument
-     \doifinsetelse{#2}{\v!beide,\v!vast}
-       {\definecolumntextarea[#1][\v!links ][\c!type=#2,#3]%
-        \definecolumntextarea[#1][\v!rechts][\c!type=#2,#3]}
-       {\doifelse{#2}\v!volgende
+     \doifinsetelse{#2}{\v!both,\v!fixed}
+       {\definecolumntextarea[#1][\v!left ][\c!type=#2,#3]%
+        \definecolumntextarea[#1][\v!right][\c!type=#2,#3]}
+       {\doifelse{#2}\v!next
           {\doifoddpageelse
-             {\definecolumntextarea[#1][\v!rechts][\c!type=#2,#3]}
-             {\definecolumntextarea[#1][\v!links ][\c!type=#2,#3]}}
+             {\definecolumntextarea[#1][\v!right][\c!type=#2,#3]}
+             {\definecolumntextarea[#1][\v!left ][\c!type=#2,#3]}}
           {\presetlocalframed
              [\??mt#1#2]%
            \processaction[#2] % \doglobal voorkomt stack build up
-             [ \v!links=>\doglobal\addtocommalist{#1}\columnleftareas,
-              \v!rechts=>\doglobal\addtocommalist{#1}\columnrightareas]%
+             [ \v!left=>\doglobal\addtocommalist{#1}\columnleftareas,
+              \v!right=>\doglobal\addtocommalist{#1}\columnrightareas]%
            \getparameters[\??mt#1#2]
              [\c!x=1,\c!y=1,\c!nx=1,\c!ny=1,\c!clipoffset=2\lineheight,
-              \c!offset=\v!overlay,\c!strut=\v!nee,\c!kader=\v!uit,
-              \c!type=#2,\c!pagina=1,\c!status=\v!stop,#3]}}%
+              \c!offset=\v!overlay,\c!strut=\v!no,\c!frame=\v!off,
+              \c!type=#2,\c!page=1,\c!state=\v!stop,#3]}}%
    \else
-     \definecolumntextarea[#1][\v!volgende][#2]%
+     \definecolumntextarea[#1][\v!next][#2]%
    \fi}
 
 \def\setupcolumntextarea
@@ -2349,25 +2349,25 @@
 
 \def\dosetupcolumntextarea[#1][#2][#3]%
   {\ifthirdargument
-     \doifelse{#2}\v!beide
-       {\setupcolumntextarea[#1][\v!links ][#3]%
-        \setupcolumntextarea[#1][\v!rechts][#3]}
-       {\doifelse{#2}\v!volgende
+     \doifelse{#2}\v!both
+       {\setupcolumntextarea[#1][\v!left ][#3]%
+        \setupcolumntextarea[#1][\v!right][#3]}
+       {\doifelse{#2}\v!next
           {\doifoddpageelse
-             {\setupcolumntextarea[#1][\v!rechts][#3]}
-             {\setupcolumntextarea[#1][\v!links][#3]}}
+             {\setupcolumntextarea[#1][\v!right][#3]}
+             {\setupcolumntextarea[#1][\v!left][#3]}}
           {\getparameters[\??mt#1#2][#3]}}%
    \else
-     \setupcolumntextarea[#1][\v!volgende][#2]%
+     \setupcolumntextarea[#1][\v!next][#2]%
    \fi}
 
 \def\docheckcolumnsetareapage#1#2%
-  {\ifnum\getvalue{\??mt#1\c!pagina}>\plusone
-     \doifelsevalue{\??mt#1\c!type}\v!vast
-       {\ifnum\columnsetpage=\getvalue{\??mt#1\c!pagina}\relax
+  {\ifnum\getvalue{\??mt#1\c!page}>\plusone
+     \doifelsevalue{\??mt#1\c!type}\v!fixed
+       {\ifnum\columnsetpage=\getvalue{\??mt#1\c!page}\relax
           \donetrue\else\donefalse
         \fi}
-       {\ifnum\columnsetpage<\getvalue{\??mt#1\c!pagina}\relax
+       {\ifnum\columnsetpage<\getvalue{\??mt#1\c!page}\relax
           \donefalse\else\donetrue
         \fi}%
    \else
@@ -2376,28 +2376,20 @@
 
 \def\initializecolumntextareas
   {\ifodd\realpageno
-     \doinitializecolumntextareas\columnrightareas\v!rechts
+     \doinitializecolumntextareas\columnrightareas\v!right
    \else
-     \doinitializecolumntextareas\columnleftareas\v!links
+     \doinitializecolumntextareas\columnleftareas\v!left
    \fi}
 
-%\def\doinitializecolumntextareas#1#2%
-%  {\def\docommando##1%
-%     {\doifelsevalue{\??mt##1#2\c!status}\v!start
-%        {\dodoinitializecolumntextareas{##1}{#2}}
-%        {\doifvalue{\??mt##1#2\c!status}\v!herhaal
-%           {\dodoinitializecolumntextareas{##1}{#2}}}}%
-%   \processcommacommand[#1]\docommando}
-
 \def\doinitializecolumntextareas#1#2%
   {\def\docommando##1%
      {\docheckcolumnsetareapage{##1#2}\plusone
       \ifdone
         \donefalse
         \processaction
-          [\getvalue{\??mt##1#2\c!status}]
+          [\getvalue{\??mt##1#2\c!state}]
           [  \v!start=>\donetrue,
-           \v!herhaal=>\donetrue,
+           \v!repeat=>\donetrue,
            \s!unknown=>\doperformtest\commalistelement\donetrue\donefalse]%
         \ifdone\dodoinitializecolumntextareas{##1}{#2}\fi
       \fi}%
@@ -2412,9 +2404,9 @@
 
 \def\placecolumntextareas
   {\ifodd\realpageno
-     \doplacecolumntextareas\columnrightareas\v!rechts
+     \doplacecolumntextareas\columnrightareas\v!right
    \else
-     \doplacecolumntextareas\columnleftareas\v!links
+     \doplacecolumntextareas\columnleftareas\v!left
    \fi}
 
 \def\doplacecolumntextareas#1#2% global ?
@@ -2425,9 +2417,9 @@
       \ifdone
         \donefalse
         \processaction
-          [\getvalue{\??mt##1#2\c!status}]
+          [\getvalue{\??mt##1#2\c!state}]
           [  \v!start=>\donetrue\doglobal\removefromcommalist{##1}#1,
-           \v!herhaal=>\donetrue,
+           \v!repeat=>\donetrue,
            \s!unknown=>\doperformtest\commalistelement\donetrue\donefalse]%
         \ifdone
           \dodoplacecolumntextareas{##1}{#2}
@@ -2438,7 +2430,7 @@
    \processcommacommand[#1]\docommando
    \egroup}
 
-\def\columntextlastbackspace{\rugwit}
+\def\columntextlastbackspace{\backspace}
 
 % beware, we have clipping offsets of 2\lineheight by default
 
@@ -2465,15 +2457,15 @@
    \setbox\scratchbox\vbox
      {\donetrue\localframed
         [\??mt\currentcolumntestarea]
-        [\c!plaats=,% new (*)
-         \c!breedte=\!!widtha,\c!hoogte=\!!heighta,\c!regels=]
+        [\c!location=,% new (*)
+         \c!width=\!!widtha,\c!height=\!!heighta,\c!lines=]
         {\columntextareaparameter\empty}}%
    \!!counta\columntextareaparameter\c!x
    \!!countb\columntextareaparameter\c!y
    \advance\!!countb \columntextareaparameter\c!ny
    \advance\!!countb \minusone
    % new (*)
-   \doif{\columntextareaparameter\c!plaats}\v!diepte
+   \doif{\columntextareaparameter\c!location}\v!depth
      {\setbox\scratchbox\hbox{\lower\strutdepth\box\scratchbox}%
       \dp\scratchbox\zeropoint
       \ht\scratchbox\!!heighta}%
@@ -2483,13 +2475,13 @@
         \copy\scratchbox % \box
       \else
         \clip
-          [%\c!bovenoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!onderoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!linkeroffset=\columntextareaparameter\c!clipoffset,%
+          [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+           %\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
+           %\c!leftoffset=\columntextareaparameter\c!clipoffset,%
            \c!offset=\columntextareaparameter\c!clipoffset,%
-           \c!rechteroffset=\zeropoint,%
-           \c!breedte=\!!widthb,%
-           \c!hoogte=\!!heighta]%
+           \c!rightoffset=\zeropoint,%
+           \c!width=\!!widthb,%
+           \c!height=\!!heighta]%
           {\copy\scratchbox}%
       \fi}%
    \OTRSETsetgridcell\!!counta\!!countb\box0
@@ -2498,15 +2490,15 @@
      \advance\!!counta -\!!countc
      \advance\!!widtha -\!!widthb
      \setbox0\hbox
-       {\hskip-\namedlayoutparameter\v!oneven\c!rugwit
+       {\hskip-\namedlayoutparameter\v!odd\c!backspace
         \clip
-          [%\c!bovenoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!onderoffset=\columntextareaparameter\c!clipoffset,%
-           %\c!rechteroffset=\columntextareaparameter\c!clipoffset,%
+          [%\c!topoffset=\columntextareaparameter\c!clipoffset,%
+           %\c!bottomoffset=\columntextareaparameter\c!clipoffset,%
+           %\c!rightoffset=\columntextareaparameter\c!clipoffset,%
            \c!offset=\columntextareaparameter\c!clipoffset,%
-           \c!linkeroffset=\zeropoint,%
-           \c!breedte=\!!widtha,%
-           \c!hoogte=\!!heighta,%
+           \c!leftoffset=\zeropoint,%
+           \c!width=\!!widtha,%
+           \c!height=\!!heighta,%
            \c!hoffset=\!!widthb]%
           {\copy\scratchbox}}%
      \OTRSETsetgridcell\!!counta\!!countb\box0%
@@ -2517,16 +2509,16 @@
 
 \long\def\dosetupcolumntextareatext[#1][#2][#3]%
   {\ifthirdargument
-     \doifelse{#2}\v!beide
-       {\setvalue{\??mt#1\v!links }{#3}%
-        \setvalue{\??mt#1\v!rechts}{#3}}
-       {\doifelse{#2}\v!volgende
+     \doifelse{#2}\v!both
+       {\setvalue{\??mt#1\v!left }{#3}%
+        \setvalue{\??mt#1\v!right}{#3}}
+       {\doifelse{#2}\v!next
           {\doifoddpageelse
-             {\setvalue{\??mt#1\v!rechts}{#3}}%
-             {\setvalue{\??mt#1\v!links }{#3}}}%
+             {\setvalue{\??mt#1\v!right}{#3}}%
+             {\setvalue{\??mt#1\v!left }{#3}}}%
           {\setvalue{\??mt#1#2}{#3}}}%
    \else
-     \setupcolumntextareatext[#1][\v!volgende][{#2}]%
+     \setupcolumntextareatext[#1][\v!next][{#2}]%
    \fi}
 
 \def\docalculatecolumnsetspan
@@ -2535,7 +2527,7 @@
    % \!!widtha => total width
    % \!!widthb => left width
    % \!!countc => left cols
-   \!!widtha\!!countb\tekstbreedte % we assume equal widths
+   \!!widtha\!!countb\textwidth % we assume equal widths
    \advance\!!countb \!!counta
    \advance\!!countb \minusone
    \ifnum\!!countb>\nofcolumns
@@ -2547,21 +2539,21 @@
    \fi
    \advance\!!counta \plusone
    \dostepwiserecurse\!!counta\!!countb\plusone
-     {\advance\!!widtha\OTRSETgetparameter\c!afstand\recurselevel}%
+     {\advance\!!widtha\OTRSETgetparameter\c!distance\recurselevel}%
    \!!widthb\!!widtha
-   \advance\!!widthb -\!!countc\tekstbreedte
+   \advance\!!widthb -\!!countc\textwidth
    \ifodd\realpageno \else % tricky, assumes that we keep there
      \ifcase\!!countc\else
        % nog niet ok voor enkel/dubbelzijdig
-       \advance\!!widtha \namedlayoutparameter\v!even  \c!rugwit
-       \advance\!!widtha \namedlayoutparameter\v!oneven\c!rugwit
-       \advance\!!widthb \namedlayoutparameter\v!even  \c!rugwit
+       \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!afstand\recurselevel}%
+         {\advance\!!widtha\OTRSETgetparameter\c!distance\recurselevel}%
      \fi
    \fi}
 
-\def\columnsetspanhsize{\tekstbreedte}
+\def\columnsetspanhsize{\textwidth}
 
 \def\setcolumnsetspanhsize#1#2% x nx / uses counta/b
   {\!!counta#1\!!countb#2\docalculatecolumnsetspan
@@ -2574,18 +2566,18 @@
   {%\ifsecondargument
      \defineframedtext
        [cs:#1]
-       [\c!kader=\v!uit,
-        \c!voor=,
-        \c!na=,
+       [\c!frame=\v!off,
+        \c!before=,
+        \c!after=,
         \c!offset=\v!overlay,
-        \c!plaats=\v!links,
-        \c!regelcorrectie=\v!uit,
-        \c!dieptecorrectie=\v!uit,
+        \c!location=\v!left,
+        \c!linecorrection=\v!off,
+        \c!depthcorrection=\v!off,
         \c!n=2,
-        \c!nregels=0,
-        \c!springvolgendein=\v!ja,
+        \c!nlines=0,
+        \c!indentnext=\v!yes,
         \c!default=HERE,
-        \c!variant=\v!a,
+        \c!alternative=\v!a,
         #2]%
    %\else
    %  \definecolumnspan[][#1]%
@@ -2620,9 +2612,9 @@
      \mofcolumns\plusone
    \fi
    \setupframedtexts[cs:#1]
-     [\c!breedte=\columnsetspanhsize,
-      \c!regelcorrectie=\v!uit,
-      \c!dieptecorrectie=\v!uit,
+     [\c!width=\columnsetspanhsize,
+      \c!linecorrection=\v!off,
+      \c!depthcorrection=\v!off,
       #2]%
    % determine widths
    \!!countc\framedtextparameter{cs:#1}\c!n
@@ -2633,16 +2625,16 @@
    \advance\!!countd -\mofcolumns
    \advance\!!countd \plusone
    % n <= n of available columns (alternative a)
-   \doif{\framedtextparameter{cs:#1}\c!variant}\v!a
+   \doif{\framedtextparameter{cs:#1}\c!alternative}\v!a
      {\ifnum\!!countc>\!!countd \!!countc\!!countd \fi}%
    % here it all starts
    \setcolumnsetspanhsize\mofcolumns\!!countc % a/b used
    \hsize\columnsetspanhsize
    \setbox\scratchbox\vbox\bgroup
-     \dostartframedtext[cs:#1][\v!geen]% geen nils placement
+     \dostartframedtext[cs:#1][\v!none]% geen nils placement
      % spoils spacing : \vskip-\struttotal\par\verticalstrut\par
      \ifnum\columnsetlevel>\zerocount
-       \framedtextparameter{cs:#1}\c!voor
+       \framedtextparameter{cs:#1}\c!before
      \fi
      \def\stopcolumnsetspan{\dostopcolumnsetspan{#1}}}
 
@@ -2652,8 +2644,8 @@
    \kern-2\struttotal
    \verticalstrut
    \ifnum\columnsetlevel>\zerocount
-     \doifsomething{\framedtextparameter{cs:#1}\c!na}
-       {\framedtextparameter{cs:#1}\c!na
+     \doifsomething{\framedtextparameter{cs:#1}\c!after}
+       {\framedtextparameter{cs:#1}\c!after
         \kern\zeropoint}% otherwise blanks disappear, better be a switch
    \else
      \endgraf
@@ -2663,7 +2655,7 @@
    % frozen keeps grid snapping okay
    \setbox\scratchbox\frozenhbox to \hsize
      {\dontcomplain
-      \alignedline{\framedtextparameter{cs:#1}\c!plaats}\v!midden
+      \alignedline{\framedtextparameter{cs:#1}\c!location}\v!middle
         {\lower\strutdepth\box\scratchbox}}%
    \dp\scratchbox\zeropoint % else wrong snap insidefloat
 %
@@ -2680,24 +2672,24 @@
    \else\ifnum\columnsetlevel>\zerocount
      % we only set \columnsetspacing when asked for, else bottom problems
      % don't change this any more (test naw)
-     \chardef\columnslotspacing\framedtextparameter{cs:#1}\c!nregels\relax
+     \chardef\columnslotspacing\framedtextparameter{cs:#1}\c!nlines\relax
      % todo: nboven/onder & \chardef\columnslotlocation2
      %\OTRSETstoreincolumnslotHERE\scratchbox
      \edef\floatmethod{\framedtextparameter{cs:#1}\c!default}%
      \@EA\uppercasestring\floatmethod\to\floatmethod
-     % todo : \v!hier -> here enzovoorts
+     % todo : \v!here -> here enzovoorts
      \OTRSETstoreincolumnslot\floatmethod\scratchbox
      % watch out: no \dochecknextindentation{tag}
-     \checknextindentation[\framedtextparameter{cs:#1}\c!springvolgendein]
+     \checknextindentation[\framedtextparameter{cs:#1}\c!indentnext]
    \else
      % of course we needed a one-column fall back for tm; brrr, the box has now too
      % much height (try \ruledvbox); don't change this without testing techniek
      \scratchdimen\ht\scratchbox
      \advance\scratchdimen-\strutdp
      \ht\scratchbox\scratchdimen
-     \framedtextparameter{cs:#1}\c!voor
+     \framedtextparameter{cs:#1}\c!before
      \snaptogrid\vbox{\box\scratchbox}%
-     \framedtextparameter{cs:#1}\c!na
+     \framedtextparameter{cs:#1}\c!after
    \fi\fi
    \egroup
    \endgraf}
@@ -2712,4 +2704,4 @@
 %   \startcolumnsetspan[two] \input tufte   \stopcolumnsetspan
 % \stopcolumnset
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-sid.tex b/tex/context/base/page-sid.tex
index e83d3e17f..c8d7055e5 100644
--- a/tex/context/base/page-sid.tex
+++ b/tex/context/base/page-sid.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-sid,
+%D   [       filefile=page-sid,
 %D        version=2000.10.20,
 %D          title=\CONTEXT\ OTR Macros,
 %D       subtitle=Side Floats,
@@ -28,7 +28,7 @@
 % \sidegap    vervangen door   \floatsideskip
 % \undergap   vervangen door   \floatsidebottomskip
 %
-% \prskp      vervangen door   \tussenwit
+% \prskp      vervangen door   \ctxparskip
 
 % toegevoegde macro's/aanroepen
 %
@@ -95,24 +95,24 @@
        % backspace
      \or
        \global\sidefloatshift-\sidefloatmaximum
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkerrandafstand \rechterrandafstand
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargebreedte \rechtermargebreedte
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargeafstand \rechtermargeafstand
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftedgedistance \rightedgedistance
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmarginwidth \rightmarginwidth
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmargindistance \rightmargindistance
      \or
        \global\sidefloatshift-\sidefloatmaximum
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargeafstand \rechtermargeafstand
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmargindistance \rightmargindistance
      \or
        % left
      \or
        % right
      \or
        \global\sidefloatshift-\sidefloatmaximum
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargeafstand \rechtermargeafstand
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmargindistance \rightmargindistance
      \or
        \global\sidefloatshift-\sidefloatmaximum
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkerrandafstand \rechterrandafstand
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargebreedte \rechtermargebreedte
-       \global\advance\sidefloatshift-\rightorleftpageaction \linkermargeafstand \rechtermargeafstand
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftedgedistance \rightedgedistance
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmarginwidth \rightmarginwidth
+       \global\advance\sidefloatshift-\rightorleftpageaction \leftmargindistance \rightmargindistance
      \or
        % cutspace
      \fi
@@ -123,23 +123,23 @@
    \global\sidefloatleftskip \zeropoint
    \ifcase\sidefloattype
    \or % backspace
-     \global        \sidefloatleftskip \rightorleftpageaction \rugwit \snijwit
+     \global        \sidefloatleftskip \rightorleftpageaction \backspace \cutspace
    \or % leftedge
-     \global        \sidefloatleftskip \rightorleftpageaction \linkermargeafstand\rechtermargeafstand
-     \global\advance\sidefloatleftskip \rightorleftpageaction \linkermargebreedte\rechtermargebreedte
-     \global\advance\sidefloatleftskip \rightorleftpageaction \linkerrandafstand\rechterrandafstand
+     \global        \sidefloatleftskip \rightorleftpageaction \leftmargindistance\rightmargindistance
+     \global\advance\sidefloatleftskip \rightorleftpageaction \leftmarginwidth\rightmarginwidth
+     \global\advance\sidefloatleftskip \rightorleftpageaction \leftedgedistance\rightedgedistance
    \or % leftmargin
-     \global        \sidefloatleftskip \rightorleftpageaction \linkermargeafstand\rechtermargeafstand
+     \global        \sidefloatleftskip \rightorleftpageaction \leftmargindistance\rightmargindistance
    \or % leftside
    \or % rightside
    \or % rightmargin
-     \global        \sidefloatrightskip\rightorleftpageaction \rechtermargeafstand\linkermargeafstand
+     \global        \sidefloatrightskip\rightorleftpageaction \rightmargindistance\leftmargindistance
    \or % rightedge
-     \global        \sidefloatrightskip\rightorleftpageaction \rechtermargeafstand\linkermargeafstand
-     \global\advance\sidefloatrightskip\rightorleftpageaction \rechtermargebreedte\linkermargebreedte
-     \global\advance\sidefloatrightskip\rightorleftpageaction \rechterrandafstand\linkerrandafstand
+     \global        \sidefloatrightskip\rightorleftpageaction \rightmargindistance\leftmargindistance
+     \global\advance\sidefloatrightskip\rightorleftpageaction \rightmarginwidth\leftmarginwidth
+     \global\advance\sidefloatrightskip\rightorleftpageaction \rightedgedistance\leftedgedistance
    \or % cutspace
-     \global        \sidefloatrightskip\rightorleftpageaction \snijwit\rugwit
+     \global        \sidefloatrightskip\rightorleftpageaction \cutspace\backspace
    \fi
    \ifdim\sidefloatrightskip>\zeropoint
      \doglobal\advance\sidefloatrightskip\rightskip
@@ -264,7 +264,7 @@
        \egroup
        \ifdim\parskip>\zeropoint
          \ifdim\sidefloatbottomskip>\parskip
-           \geenwitruimte
+           \nowhitespace
            \vskip\sidefloatbottomskip
          \fi
        \fi
@@ -504,7 +504,7 @@
 
 \def\putsidefloat#1% grid (4) is rather experimental
   {\par
-   \witruimte
+   \whitespace
    % moved here dec 2001
    {\everypar\emptytoks\forgetall\verticalstrut\vskip-\struttotal}% moved
    \checksidefloatshift
@@ -814,11 +814,14 @@
    \else
      \resetsidefloatparagraph
    \fi
-   \parskip\tussenwit}
+   \parskip\ctxparskip}
 
 \def\checksidefloat
   {\dochecksidefloat}
 
+\def\synchronizesidefloats
+  {\ifinner \else \checksidefloat \fi}
+
 \def\doadjustsidefloatdisplaylines
   {\par
    \vskip-\parskip
@@ -848,4 +851,4 @@
    \kern-\!!counta\baselineskip
    \penalty\zerocount }
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/page-spr.tex b/tex/context/base/page-spr.tex
index 98cfabafe..e0ac6fbc7 100644
--- a/tex/context/base/page-spr.tex
+++ b/tex/context/base/page-spr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-spr,
+%D   [       filefile=page-spr,
 %D        version=2002.11.11,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Spreading,
@@ -26,15 +26,15 @@
 
 \def\normalsettextpagecontent#1#2#3% #2 and #3 will disappear
   {\setbox#1\hbox
-     {\vbox to \teksthoogte
+     {\vbox to \textheight
         {\offinterlineskip
          \freezetextwidth
-         \hsize\tekstbreedte   % local variant of \sethsize
+         \hsize\textwidth   % local variant of \sethsize
          \boxmaxdepth\maxdepth
          \noindent             % content can be < \hsize
          \dopagecontents#2#3}}%
    \dp#1\zeropoint
-   \setbox#1\hbox to \zetbreedte
+   \setbox#1\hbox to \makeupwidth
      {\ifinspread
         \ifvoid\spreadbox
           \global\setbox\spreadbox\box#1%
@@ -43,8 +43,8 @@
           % prevent duplicate writes in normal run
           \ifarrangingpages \else \ifcase\showspreadmode
             \global\setbox\spreadbox\null
-            \wd\spreadbox\zetbreedte
-            \ht\spreadbox\teksthoogte
+            \wd\spreadbox\makeupwidth
+            \ht\spreadbox\textheight
           \fi \fi
           \hss\box\spreadbox % right page
         \fi
@@ -55,18 +55,18 @@
 \def\doflushspread
   {\ifinspread \ifvoid\spreadbox\else
      % this page will be discarded later
-     \null \pagina
+     \null \page
    \fi \fi }
 
 \def\startspread
   {\bgroup
    \ifdubbelzijdig
-     \pagina[\v!links]%
+     \page[\v!left]%
     %\setsystemmode{spread}%
      \inspreadtrue
-     \scratchdimen2\tekstbreedte
-     \advance\scratchdimen2\rugwit
-     \expanded{\setuplayout[\c!tekstbreedte=\the\scratchdimen]}%
+     \scratchdimen2\textwidth
+     \advance\scratchdimen2\backspace
+     \expanded{\setuplayout[\c!textwidth=\the\scratchdimen]}%
      \def\startspread{\bgroup\let\stopspread\egroup}%
      \let\stopspread\dostopspread
    \else
@@ -76,10 +76,10 @@
 \let\stopspread\relax
 
 \def\dostopspread
-  {\kern\zeropoint\pagina
+  {\kern\zeropoint\page
    \inspreadfalse
-   \setuplayout[\c!tekstbreedte=\tekstbreedte]
-   \pagina[\v!links]
+   \setuplayout[\c!textwidth=\textwidth]
+   \page[\v!left]
    \egroup}
 
 \protect \endinput
@@ -101,4 +101,4 @@
 %
 % \dorecurse{3}{\input tufte }
 %
-% \stoptext
\ No newline at end of file
+% \stoptext
diff --git a/tex/context/base/page-txt.tex b/tex/context/base/page-txt.tex
index 48f770fa8..b745f9517 100644
--- a/tex/context/base/page-txt.tex
+++ b/tex/context/base/page-txt.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=page-txt, % copied from main-001,
+%D   [       filefile=page-txt, % copied from main-001,
 %D        version=1997.03.31,
 %D          title=\CONTEXT\ Page Macros,
 %D       subtitle=Texts,
@@ -23,21 +23,21 @@
 %D the following macros. The current state of a text line
 %D (header, footer, etc.) is checked by:
 %D
-%D \starttypen
+%D \starttyping
 %D \resetlayouttextlines
-%D \stoptypen
+%D \stoptyping
 %D
 %D The main text box is finished by the following macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \getmainbox <box> <\vbox|\unvbox>
-%D \stoptypen
+%D \stoptyping
 %D
 %D The text lines are collected with:
 %D
-%D \starttypen
+%D \starttyping
 %D \gettextboxes
-%D \stoptypen
+%D \stoptyping
 %D
 %D It is possible to extens the default content of the text
 %D areas by appending content to the following token list
@@ -71,17 +71,17 @@
   {\ifthirdargument
      \getparameters[\??tk#1#2][#3]%
    \else
-    %\getparameters[\??tk#1\v!tekst][#2]%
+    %\getparameters[\??tk#1\v!text][#2]%
      \getparameters[\??tk#1][#2]%
    \fi
   %\checkcurrentlayout % no
    \calculatevsizes}
 
-\def\setuptop    {\dotripleempty\dosetuplayouttext[\v!boven]}
-\def\setupheader {\dotripleempty\dosetuplayouttext[\v!hoofd]}
-\def\setuptext   {\dotripleempty\dosetuplayouttext[\v!tekst]}
-\def\setupfooter {\dotripleempty\dosetuplayouttext[\v!voet]}
-\def\setupbottom {\dotripleempty\dosetuplayouttext[\v!onder]}
+\def\setuptop    {\dotripleempty\dosetuplayouttext[\v!top]}
+\def\setupheader {\dotripleempty\dosetuplayouttext[\v!header]}
+\def\setuptext   {\dotripleempty\dosetuplayouttext[\v!text]}
+\def\setupfooter {\dotripleempty\dosetuplayouttext[\v!footer]}
+\def\setupbottom {\dotripleempty\dosetuplayouttext[\v!bottom]}
 
 %D \macros
 %D  {noheaderandfooterlines,notopandbottomlines}
@@ -93,12 +93,12 @@
 %D \showsetup{\y!notopandbottomlines}
 
 \def\noheaderandfooterlines
-  {\setupheader[\c!status=\v!leeg]%
-   \setupfooter[\c!status=\v!leeg]}
+  {\setupheader[\c!state=\v!empty]%
+   \setupfooter[\c!state=\v!empty]}
 
 \def\notopandbottomlines
-  {\setuptop   [\c!status=\v!leeg]%
-   \setupbottom[\c!status=\v!leeg]}
+  {\setuptop   [\c!state=\v!empty]%
+   \setupbottom[\c!state=\v!empty]}
 
 %D \macros
 %D  {setuptoptexts, setupheadertexts, setuptexttexts,
@@ -116,61 +116,61 @@
 %D \showsetup{\y!setupfootertexts}
 %D \showsetup{\y!setupbottomtexts}
 
-\def\setuptoptexts    {\dosixtupleempty\dosetuptexts[\v!boven]}
-\def\setupheadertexts {\dosixtupleempty\dosetuptexts[\v!hoofd]}
-\def\setuptexttexts   {\dosixtupleempty\dosetuptexts[\v!tekst]}
-\def\setupfootertexts {\dosixtupleempty\dosetuptexts[\v!voet ]}
-\def\setupbottomtexts {\dosixtupleempty\dosetuptexts[\v!onder]}
+\def\setuptoptexts    {\dosixtupleempty\dosetuptexts[\v!top]}
+\def\setupheadertexts {\dosixtupleempty\dosetuptexts[\v!header]}
+\def\setuptexttexts   {\dosixtupleempty\dosetuptexts[\v!text]}
+\def\setupfootertexts {\dosixtupleempty\dosetuptexts[\v!footer ]}
+\def\setupbottomtexts {\dosixtupleempty\dosetuptexts[\v!bottom]}
 
 %D The left, right and center variables can also be set
 %D directly using the previously discussed macros.
 
 \def\dosetuptexts[#1][#2][#3][#4][#5][#6]%
   {\ifsixthargument
-     \setvalue{\??tk#1#2\c!linkertekst}%
+     \setvalue{\??tk#1#2\c!lefttext}%
        {\dodoubletexts{\??tk#1}{#2}%
-          {\c!linkerletter \c!linkerkleur \c!linkerbreedte }{#3}%
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#6}}%
-     \setvalue{\??tk#1#2\c!rechtertekst}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#3}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#6}}%
+     \setvalue{\??tk#1#2\c!righttext}%
        {\dodoubletexts{\??tk#1}{#2}%
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#4}%
-          {\c!linkerletter \c!linkerkleur \c!linkerbreedte }{#5}}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#4}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#5}}%
    \else\iffifthargument
-     \setvalue{\??tk#1\v!tekst\c!linkertekst}%
-       {\dodoubletexts{\??tk#1}\v!tekst
-          {\c!linkerletter \c!linkerkleur \c!linkerbreedte }{#2}%
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#5}}%
-     \setvalue{\??tk#1\v!tekst\c!rechtertekst}%
-       {\dodoubletexts{\??tk#1}\v!tekst
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#3}%
-          {\c!linkerletter \c!linkerkleur \c!linkerbreedte }{#4}}%
+     \setvalue{\??tk#1\v!text\c!lefttext}%
+       {\dodoubletexts{\??tk#1}\v!text
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#2}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#5}}%
+     \setvalue{\??tk#1\v!text\c!righttext}%
+       {\dodoubletexts{\??tk#1}\v!text
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}%
+          {\c!leftstyle \c!leftcolor \c!leftwidth }{#4}}%
    \else\iffourthargument
-     \setvalue{\??tk#1#2\c!linkertekst}%
+     \setvalue{\??tk#1#2\c!lefttext}%
        {\dodoubletexts{\??tk#1}{#2}
-          {\c!linkerletter\c!linkerkleur\c!linkerbreedte}{#3}%
-          {\c!linkerletter\c!linkerkleur\c!linkerbreedte}{#3}}%
-     \setvalue{\??tk#1#2\c!rechtertekst}%
+          {\c!leftstyle\c!leftcolor\c!leftwidth}{#3}%
+          {\c!leftstyle\c!leftcolor\c!leftwidth}{#3}}%
+     \setvalue{\??tk#1#2\c!righttext}%
        {\dodoubletexts{\??tk#1}{#2}
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#4}%
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#4}}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#4}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#4}}%
    \else\ifthirdargument
-     \setvalue{\??tk#1\v!tekst\c!linkertekst}%
-       {\dodoubletexts{\??tk#1}\v!tekst
-          {\c!linkerletter\c!linkerkleur\c!linkerbreedte}{#2}%
-          {\c!linkerletter\c!linkerkleur\c!linkerbreedte}{#2}}%
-     \setvalue{\??tk#1\v!tekst\c!rechtertekst}%
-       {\dodoubletexts{\??tk#1}\v!tekst
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#3}%
-          {\c!rechterletter\c!rechterkleur\c!rechterbreedte}{#3}}%
+     \setvalue{\??tk#1\v!text\c!lefttext}%
+       {\dodoubletexts{\??tk#1}\v!text
+          {\c!leftstyle\c!leftcolor\c!leftwidth}{#2}%
+          {\c!leftstyle\c!leftcolor\c!leftwidth}{#2}}%
+     \setvalue{\??tk#1\v!text\c!righttext}%
+       {\dodoubletexts{\??tk#1}\v!text
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}%
+          {\c!rightstyle\c!rightcolor\c!rightwidth}{#3}}%
    \else\ifsecondargument % new
-     \letvalue{\??tk#1\v!tekst\c!linkertekst }\empty
-     \letvalue{\??tk#1\v!tekst\c!rechtertekst}\empty
-     \setvalue{\??tk#1\v!tekst\c!middentekst }%
-       {\dosingletexts{\??tk#1}\v!tekst\c!letter\c!kleur\c!breedte{#2}}%
+     \letvalue{\??tk#1\v!text\c!lefttext }\empty
+     \letvalue{\??tk#1\v!text\c!righttext}\empty
+     \setvalue{\??tk#1\v!text\c!middletext }%
+       {\dosingletexts{\??tk#1}\v!text\c!style\c!color\c!width{#2}}%
    \else
-     \dosixtupleempty\dosetuptexts[#1][\v!tekst][][][][]%
-     \dosixtupleempty\dosetuptexts[#1][\v!marge][][][][]%
-     \dosixtupleempty\dosetuptexts[#1][\v!rand ][][][][]%
+     \dosixtupleempty\dosetuptexts[#1][\v!text][][][][]%
+     \dosixtupleempty\dosetuptexts[#1][\v!margin][][][][]%
+     \dosixtupleempty\dosetuptexts[#1][\v!edge ][][][][]%
    \fi\fi\fi\fi\fi}
 
 %D Left and right texts are swapped on odd and even pages, but
@@ -185,7 +185,7 @@
 %D dependent.
 
 \def\placetextlinestrut#1%
-  {\doifvalue{#1\c!strut}\v!ja{\setstrut\strut}}
+  {\doifvalue{#1\c!strut}\v!yes{\setstrut\strut}}
 
 % \def\dosingletexts#1#2#3#4#5#6%
 %   {\bgroup
@@ -211,12 +211,12 @@
    \doifsomething\ascii
      {\doattributes{#1#2}#3#4%
         {\placetextlinestrut{#1}% here !
-        %\doifdefinedelse{\??mk\ascii\c!koppeling} % brrr
+        %\doifdefinedelse{\??mk\ascii\c!coupling} % brrr
          \doifelsemarking\ascii
-           {\dolimitatetexts{#1#2#5}{\getmarking[\ascii][\v!eerste]}}
-           {\ConvertConstantAfter\doifelse\v!paginanummer{#6}
+           {\dolimitatetexts{#1#2#5}{\getmarking[\ascii][\v!first]}}
+           {\ConvertConstantAfter\doifelse\v!pagenumber{#6}
                \@@plaatspaginanummer
-              {\ConvertConstantAfter\doifelse\v!datum{#6}
+              {\ConvertConstantAfter\doifelse\v!date{#6}
                  {\currentdate}
                  {% #6{}{}{} -> {} needed for macros that look
                   % ahead, like \uniqueMPgraphic
@@ -232,62 +232,18 @@
 %D The placement of text is hooked into the token lists
 %D associated to the area at hand.
 
-\appendtoks \placelayouttextline\v!boven\bovenhoogte \to    \toptextcontent
-\appendtoks \placelayouttextline\v!hoofd\hoofdhoogte \to \headertextcontent
-\appendtoks \placelayouttextline\v!tekst\teksthoogte \to   \texttextcontent
-\appendtoks \placelayouttextline\v!voet  \voethoogte \to \footertextcontent
-\appendtoks \placelayouttextline\v!onder\onderhoogte \to \bottomtextcontent
+\appendtoks \placelayouttextline\v!top   \topheight    \to \toptextcontent
+\appendtoks \placelayouttextline\v!header\headerheight \to \headertextcontent
+\appendtoks \placelayouttextline\v!text  \textheight   \to \texttextcontent
+\appendtoks \placelayouttextline\v!footer\footerheight \to \footertextcontent
+\appendtoks \placelayouttextline\v!bottom\bottomheight \to \bottomtextcontent
 
 %D Texts can be disables, moved up and ignored, depending in
 %D the \type {status} variable. This is handled by the next
-%D couple of macros. They look less readable then the original
-%D implementation, but because they are expanded quite often,
-%D we will not use:
-%D
-%D \starttypen
-%D \def\plaatslayoutregel#1#2%  % handelt o.b.v. tekst
-%D   {\ExpandFirstAfter\processaction
-%D      [\getvalue{\??tk#1\v!tekst\c!status}]
-%D      [        \v!geen=>,
-%D                   ......
-%D              \v!start=>...]}
-%D \stoptypen
-%D
-%D Instead we will map the values of status onto macro
-%D expansions.
-
-%\def\settextlinestatus#1%
-%  {\edef\textlinestatus{\csname\??tk#1\v!tekst\c!status\endcsname}}
-
-\def\settextlinestatus#1%
-  {\edef\textlinestatus{\csname\??tk#1\c!status\endcsname}}
-
-%\def\resettextlinestatus#1%
-%  {\letgvalue{\??tk#1\v!tekst\c!status}\v!normaal}
+%D couple of macros.
 
-\def\resettextlinestatus#1%
-  {\letgvalue{\??tk#1\c!status}\v!normaal}
-
-%\def\placelayouttextline#1#2%  % handelt o.b.v. tekst
-%  {\settextlinestatus{#1}%
-%   \doifdefinedelse{\string\placelayouttextline\textlinestatus}
-%     {\getvalue{\string\placelayouttextline\textlinestatus}{#1}{#2}}
-%     {\getvalue{\string\placelayouttextline\s!unknown}{#1}{#2}}}
-%
-%\def\placelayouttextline#1% #2
-%  {\settextlinestatus{#1}%
-%   \doifundefined{\string\placelayouttextline\textlinestatus}
-%     {\let\textlinestatus\s!unknown}%
-%   \getvalue{\string\placelayouttextline\textlinestatus}{#1}} % {#2}
-
-% recently bugged
-%
-% \def\placelayouttextline#1% #2
-%   {\settextlinestatus{#1}%
-%    \ifundefined{\string\placelayouttextline\textlinestatus}%
-%      \let\textlinestatus\s!unknown
-%    \fi
-%    \csname\string\placelayouttextline\textlinestatus\endcsname{#1}} % {#2}
+\def\settextlinestatus  #1{\edef\textlinestatus{\csname\??tk#1\c!state\endcsname}}
+\def\resettextlinestatus#1{\letgvalue{\??tk#1\c!state}\v!normal}
 
 \def\placelayouttextline#1% #2
   {\settextlinestatus{#1}%
@@ -299,12 +255,12 @@
      \fi
    \endcsname{#1}} % {#2}
 
-\setvalue{\string\placelayouttextline\v!normaal}{\doplacelayouttextline}
+\setvalue{\string\placelayouttextline\v!normal}{\doplacelayouttextline}
 \setvalue{\string\placelayouttextline          }{\doplacelayouttextline}
-\letvalue{\string\placelayouttextline\v!geen   }\gobbletwoarguments
-\letvalue{\string\placelayouttextline\v!hoog   }\gobbletwoarguments
+\letvalue{\string\placelayouttextline\v!none   }\gobbletwoarguments
+\letvalue{\string\placelayouttextline\v!high   }\gobbletwoarguments
 
-\setvalue{\string\placelayouttextline\v!leeg}#1#2%
+\setvalue{\string\placelayouttextline\v!empty}#1#2%
   {\resettextlinestatus{#1}}
 
 \setvalue{\string\placelayouttextline\v!start}#1#2%
@@ -314,7 +270,7 @@
 \setvalue{\string\placelayouttextline\v!stop}#1#2%
   {}
 
-\setvalue{\string\placelayouttextline\v!geenmarkering}#1#2%
+\setvalue{\string\placelayouttextline\v!nomarking}#1#2%
   {\bgroup
    \resettextlinestatus{#1}%
    \let\dogetmarking\nogetmarking
@@ -325,9 +281,9 @@
   {\bgroup % new
    \resettextlinestatus{#1}%
    \getvalue{\??tk#1\textlinestatus}%
-   \getvalue{\??tk#1\v!tekst\textlinestatus}%
-   \getvalue{\??tk#1\v!marge\textlinestatus}%
-   \getvalue{\??tk#1\v!rand\textlinestatus}%
+   \getvalue{\??tk#1\v!text\textlinestatus}%
+   \getvalue{\??tk#1\v!margin\textlinestatus}%
+   \getvalue{\??tk#1\v!edge\textlinestatus}%
    \doplacelayouttextline{#1}{#2}%
    \egroup}
 
@@ -335,17 +291,17 @@
 %D is flushed.
 
 \def\resetlayouttextline#1% beware: global assignment
-  {\doifvalue{\??tk#1\c!status}\v!hoog
+  {\doifvalue{\??tk#1\c!state}\v!high
      {\resettextlinestatus{#1}%
       \donetrue}}
 
 \def\resetlayouttextlines
   {\donefalse
-   \resetlayouttextline\v!boven
-   \resetlayouttextline\v!hoofd
-   \resetlayouttextline\v!tekst
-   \resetlayouttextline\v!voet
-   \resetlayouttextline\v!onder
+   \resetlayouttextline\v!top
+   \resetlayouttextline\v!header
+   \resetlayouttextline\v!text
+   \resetlayouttextline\v!footer
+   \resetlayouttextline\v!bottom
    \ifdone
      \doglobal\calculatevsizes
      \recalculatebackgrounds
@@ -361,36 +317,36 @@
 
 \def\gettextboxes
   {\setbox\scratchpagebox\vbox
-     {\mindermeldingen
+     {\dontcomplain
       \calculatereducedvsizes
       \swapmargins
       \offinterlineskip
-      \vskip-\bovenhoogte
-      \vskip-\bovenafstand
-      \ifdim\bovenhoogte>\zeropoint
+      \vskip-\topheight
+      \vskip-\topdistance
+      \ifdim\topheight>\zeropoint
         \the\toptextcontent
-        \vskip\bovenhoogte
+        \vskip\topheight
       \fi
-      \vskip\bovenafstand
-      \ifdim\hoofdhoogte>\zeropoint
+      \vskip\topdistance
+      \ifdim\headerheight>\zeropoint
         \the\headertextcontent
-        \vskip\hoofdhoogte
+        \vskip\headerheight
       \fi
-      \vskip\hoofdafstand
+      \vskip\headerdistance
       \placepositionanchors
-      \vskip-\teksthoogte
+      \vskip-\textheight
       \the\texttextcontent
-      \vskip\teksthoogte
+      \vskip\textheight
       \the\everyendoftextbody
-      \vskip\voetafstand
-      \ifdim\voethoogte>\zeropoint
+      \vskip\footerdistance
+      \ifdim\footerheight>\zeropoint
         \the\footertextcontent
-        \vskip\voethoogte
+        \vskip\footerheight
       \fi
-      \vskip\onderafstand
-      \ifdim\onderhoogte>\zeropoint
+      \vskip\bottomdistance
+      \ifdim\bottomheight>\zeropoint
         \the\bottomtextcontent
-        \vskip\onderhoogte
+        \vskip\bottomheight
       \fi
       \vfilll}%
   \smashbox\scratchpagebox
@@ -402,23 +358,23 @@
       \calculatereducedvsizes
       \calculatehsizes
       \swapmargins
-      \vskip\hoofdhoogte
-      \vskip\hoofdafstand
-      \vskip\layoutparameter\c!tekstafstand
-      \hbox to \zetbreedte
+      \vskip\headerheight
+      \vskip\headerdistance
+      \vskip\layoutparameter\c!textdistance
+      \hbox to \makeupwidth
         {\bgroup
            \swapmargins
            \goleftonpage
-           \ifdim\linkerrandbreedte>\zeropoint
+           \ifdim\leftedgewidth>\zeropoint
              \the\leftedgetextcontent
-             \hskip\linkerrandbreedte
+             \hskip\leftedgewidth
            \fi
-           \hskip\linkerrandafstand
-           \ifdim\linkermargebreedte>\zeropoint
+           \hskip\leftedgedistance
+           \ifdim\leftmarginwidth>\zeropoint
              \the\leftmargintextcontent
-             \hskip\linkermargebreedte
+             \hskip\leftmarginwidth
            \fi
-           \hskip\linkermargeafstand
+           \hskip\leftmargindistance
          \egroup
          \settextpagecontent\scratchpagebox{#1}{#2}%
 \setbox\scratchpagebox\vbox
@@ -431,15 +387,15 @@
          \box\scratchpagebox
          \localstoptextcolor
          \bgroup
-           \hskip\rechtermargeafstand
-           \ifdim\rechtermargebreedte>\zeropoint
+           \hskip\rightmargindistance
+           \ifdim\rightmarginwidth>\zeropoint
              \the\rightmargintextcontent
-             \hskip\rechtermargebreedte
+             \hskip\rightmarginwidth
            \fi
-           \hskip\rechterrandafstand
-           \ifdim\rechterrandbreedte>\zeropoint
+           \hskip\rightedgedistance
+           \ifdim\rightedgewidth>\zeropoint
              \the\rightedgetextcontent
-             \hskip\rechterrandbreedte
+             \hskip\rightedgewidth
            \fi
          \egroup
          \hss}}%
@@ -452,12 +408,12 @@
 % will be overloaded in page-lyr
 
 \def\settextpagecontent#1#2#3% #2 and #3 will disappear
-  {\setbox#1\hbox to \zetbreedte
+  {\setbox#1\hbox to \makeupwidth
      {\hss                        % so don't change this
-      \vbox to \teksthoogte
+      \vbox to \textheight
         {\offinterlineskip
          \freezetextwidth
-         \hsize\tekstbreedte      % local variant of \sethsize
+         \hsize\textwidth      % local variant of \sethsize
          \boxmaxdepth\maxdepth
          \noindent                % content can be < \hsize
          \dopagecontents#2#3}%
@@ -471,15 +427,15 @@
 
 \def\addtextgridlayer#1% tzt run time
   {\ifcase\showgridstate\else % 1=bottom 2=top
-     \setgridbox\scratchbox\zetbreedte\teksthoogte
+     \setgridbox\scratchbox\makeupwidth\textheight
      \setbox#1\hbox
-       {\ifcase\showgridstate\or\or\box#1\hskip-\zetbreedte\fi
+       {\ifcase\showgridstate\or\or\box#1\hskip-\makeupwidth\fi
         \bgroup % color
         \startlayoutcomponent{gridcolumns}{grid columns}%
         \incolortrue
         \ifcase\layoutcolumns\else
           \gray
-          \hbox to \zetbreedte
+          \hbox to \makeupwidth
             {\dorecurse\layoutcolumns
                {\hskip\layoutcolumnwidth
                 \ifnum\recurselevel<\layoutcolumns
@@ -488,14 +444,14 @@
                   \!!depth\dp\scratchbox
                   \!!width\layoutcolumndistance
               \fi}}%
-          \hskip-\zetbreedte
+          \hskip-\makeupwidth
         \fi
         \stoplayoutcomponent
         \startlayoutcomponent{gridlines}{grid lines}%
         \startcolor[layout:grid]\box\scratchbox\stopcolor
         \stoplayoutcomponent
         \egroup
-        \ifcase\showgridstate\or\hskip-\zetbreedte\box#1\fi}%
+        \ifcase\showgridstate\or\hskip-\makeupwidth\box#1\fi}%
    \fi}
 
 %D The placement of a whole line is handled by the next two
@@ -514,20 +470,20 @@
            \normalbaselines
            \let\\\ignoredlinebreak
            \let\crlf\ignoredlinebreak
-          %\getvalue{\??tk#1\v!tekst\c!voor}%
-           \getvalue{\??tk#1\c!voor}%
+          %\getvalue{\??tk#1\v!text\c!before}%
+           \getvalue{\??tk#1\c!before}%
            \doifbothsidesoverruled
-             \dodoplacelayouttextline#1\c!linkertekst\c!middentekst\c!rechtertekst
+             \dodoplacelayouttextline#1\c!lefttext\c!middletext\c!righttext
                \gobbleoneargument\getvalue
            \orsideone
-             \dodoplacelayouttextline#1\c!linkertekst\c!middentekst\c!rechtertekst
+             \dodoplacelayouttextline#1\c!lefttext\c!middletext\c!righttext
                \gobbleoneargument\getvalue
            \orsidetwo
-             \dodoplacelayouttextline#1\c!rechtertekst\c!middentekst\c!linkertekst
+             \dodoplacelayouttextline#1\c!righttext\c!middletext\c!lefttext
                \getvalue\gobbleoneargument
            \od
-          %\getvalue{\??tk#1\v!tekst\c!na}%
-           \getvalue{\??tk#1\c!na}%
+          %\getvalue{\??tk#1\v!text\c!after}%
+           \getvalue{\??tk#1\c!after}%
            \kern\zeropoint}% keep the \dp, beware of \vtops, never change this!
         \dp\scratchpagebox\zeropoint
         \box\scratchpagebox}%
@@ -536,46 +492,46 @@
 
 \def\dodoplacelayouttextline#1#2#3#4#5#6% \hsize toegevoegd, \hss's niet meer wijzigen
   {\hbox
-     {\ifdim\linkerrandbreedte>\zeropoint
-        \dododoplacelayouttextline\linkerrandbreedte{#1}\v!rand
-          {\hss\getvalue{\??tk#1\v!rand#2}}%
-        \hskip\linkerrandafstand
+     {\ifdim\leftedgewidth>\zeropoint
+        \dododoplacelayouttextline\leftedgewidth{#1}\v!edge
+          {\hss\getvalue{\??tk#1\v!edge#2}}%
+        \hskip\leftedgedistance
       \fi
-      \ifdim\linkermargebreedte>\zeropoint
-        \dododoplacelayouttextline\linkermargebreedte{#1}\v!marge
-          {\hbox to \linkermargebreedte
-             {\hss\getvalue{\??tk#1\v!marge#2}}%
-           \hskip-\linkermargebreedte
-           \hbox to \linkermargebreedte
-             {\hss#5{\??tk#1\v!marge\c!margetekst}}}%
-        \hskip\linkermargeafstand
+      \ifdim\leftmarginwidth>\zeropoint
+        \dododoplacelayouttextline\leftmarginwidth{#1}\v!margin
+          {\hbox to \leftmarginwidth
+             {\hss\getvalue{\??tk#1\v!margin#2}}%
+           \hskip-\leftmarginwidth
+           \hbox to \leftmarginwidth
+             {\hss#5{\??tk#1\v!margin\c!margintext}}}%
+        \hskip\leftmargindistance
       \fi
-      \ifdim\zetbreedte>\zeropoint
-        \dododoplacelayouttextline\zetbreedte{#1}\v!tekst
-          {\hbox to \zetbreedte
-             {\@@nmpre{#5{\??tk#1\v!tekst\c!kantlijntekst}}%
-              \getvalue{\??tk#1\v!tekst#2}\hss}%
-           \hskip-\zetbreedte
-           \hbox to \zetbreedte
-             {\hss\getvalue{\??tk#1\v!tekst#3}\hss}%
-           \hskip-\zetbreedte
-           \hbox to \zetbreedte
-             {\hss\getvalue{\??tk#1\v!tekst#4}%
-              \@@nmpos{#6{\??tk#1\v!tekst\c!kantlijntekst}}}}%
+      \ifdim\makeupwidth>\zeropoint
+        \dododoplacelayouttextline\makeupwidth{#1}\v!text
+          {\hbox to \makeupwidth
+             {\@@nmpre{#5{\??tk#1\v!text\c!marginedgetext}}%
+              \getvalue{\??tk#1\v!text#2}\hss}%
+           \hskip-\makeupwidth
+           \hbox to \makeupwidth
+             {\hss\getvalue{\??tk#1\v!text#3}\hss}%
+           \hskip-\makeupwidth
+           \hbox to \makeupwidth
+             {\hss\getvalue{\??tk#1\v!text#4}%
+              \@@nmpos{#6{\??tk#1\v!text\c!marginedgetext}}}}%
       \fi
-      \ifdim\rechtermargebreedte>\zeropoint
-        \hskip\rechtermargeafstand
-        \dododoplacelayouttextline\rechtermargebreedte{#1}\v!marge
-          {\hbox to \rechtermargebreedte
-             {\getvalue{\??tk#1\v!marge#4}\hss}%
-           \hskip-\rechtermargebreedte
-           \hbox to \rechtermargebreedte
-             {#6{\??tk#1\v!marge\c!margetekst}\hss}}%
+      \ifdim\rightmarginwidth>\zeropoint
+        \hskip\rightmargindistance
+        \dododoplacelayouttextline\rightmarginwidth{#1}\v!margin
+          {\hbox to \rightmarginwidth
+             {\getvalue{\??tk#1\v!margin#4}\hss}%
+           \hskip-\rightmarginwidth
+           \hbox to \rightmarginwidth
+             {#6{\??tk#1\v!margin\c!margintext}\hss}}%
       \fi
-      \ifdim\rechterrandbreedte>\zeropoint
-        \hskip\rechterrandafstand
-        \dododoplacelayouttextline\rechterrandbreedte{#1}\v!rand
-          {\getvalue{\??tk#1\v!rand#4}\hss}%
+      \ifdim\rightedgewidth>\zeropoint
+        \hskip\rightedgedistance
+        \dododoplacelayouttextline\rightedgewidth{#1}\v!edge
+          {\getvalue{\??tk#1\v!edge#4}\hss}%
       \fi}}
 
 % \def\dododoplacelayouttextline#1#2#3#4%
@@ -588,18 +544,18 @@
 \def\dododoplacelayouttextline#1#2#3#4%
   {\vbox % to \vsize
      {\hsize#1\relax
-      \getvalue{\??tk#2#3\c!voor}%
+      \getvalue{\??tk#2#3\c!before}%
       \startlayoutcomponent{t:#2:#3}{area #2 #3}%
         \hbox to #1{#4}%
       \stoplayoutcomponent
-      \getvalue{\??tk#2#3\c!na}}}
+      \getvalue{\??tk#2#3\c!after}}}
 
 %D Although it is far better to use backgrounds for this
 %D purpose, one can add a rule in the following way. This
 %D method makes the rules disappear in case of an empty text
 %D line. Consider this a feature.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupheadertexts[left][right]
 %D
 %D \setupheader[text][after=\hrule,style=bold]
@@ -609,7 +565,7 @@
 %D   \setupheader[state=empty]
 %D   \input tufte \page
 %D \stoptext
-%D \stoptypen
+%D \stoptyping
 
 %D The next twosome will be done differently (using an
 %D existing auxiliary macro).
@@ -625,9 +581,9 @@
 % newer
 
 \def\@@nmprepos#1#2#3#4#5%
-  {\doifelsenothing\@@nmbreedte
+  {\doifelsenothing\@@nmwidth
      {\doiftext{#5}{#1{#5}#2}}
-     {\doiftext{#5}{\hbox to \@@nmbreedte{#3{#5}#4}}}}
+     {\doiftext{#5}{\hbox to \@@nmwidth{#3{#5}#4}}}}
 
 \def\@@nmpre{\@@nmprepos\empty\tfskip\relax\hss}
 \def\@@nmpos{\@@nmprepos\tfskip\empty\hss\relax}
@@ -635,11 +591,11 @@
 %D This code will move to \type {page-flt.tex}.
 
 \appendtoks
-  \plaatsrechtermargeblok \hskip-\rechtermargebreedte
+  \plaatsrechtermargeblok \hskip-\rightmarginwidth
 \to \rightmargintextcontent
 
 \appendtoks
-  \plaatslinkermargeblok \hskip-\linkermargebreedte
+  \plaatslinkermargeblok \hskip-\leftmarginwidth
 \to \leftmargintextcontent
 
 %D The next hook will later be used for keeping track of
@@ -647,7 +603,7 @@
 %D dependent) reference point.
 
 \ifx\undefined\placepositionanchors
-  \def\placepositionanchors{\vskip\teksthoogte}
+  \def\placepositionanchors{\vskip\textheight}
 \fi
 
 %D \macros
@@ -662,14 +618,14 @@
 %D The next example demonstrates how we can use this
 %D mechanism to provide page (event) dependent text lines.
 %D
-%D \starttypen
-%D \definetext[hoofdstuk][voet][paginanummer]
-%D \stelkopin[hoofdstuk][hoofd=hoog,voet=hoofdstuk]
-%D \setupheadertexts[paginanummer]
-%D \setupfootertexts[links][rechts]
-%D \hoofdstuk{eerste} \dorecurse{20}{\input tufte \relax}
-%D \hoofdstuk{tweede} \dorecurse{20}{\input tufte \relax}
-%D \stoptypen
+%D \starttyping
+%D \definetext[chapter][footer][pagenumber]
+%D \setuphead[chapter][header=high,footer=chapter]
+%D \setupheadertexts[pagenumber]
+%D \setupfootertexts[left][right]
+%D \chapter{eerste} \dorecurse{20}{\input tufte \relax}
+%D \chapter{tweede} \dorecurse{20}{\input tufte \relax}
+%D \stoptyping
 
 \def\definetext
   {\doseventupleempty\dodefinetext}
@@ -690,25 +646,25 @@
 %D The rest of this file is dedicated to setting up the
 %D texts. This code is not that impressive.
 
-\setupheadertexts [\v!tekst] [] []
-\setupheadertexts [\v!marge] [] []
-\setupheadertexts [\v!rand]  [] []
+\setupheadertexts [\v!text] [] []
+\setupheadertexts [\v!margin] [] []
+\setupheadertexts [\v!edge]  [] []
 
-\setupfootertexts [\v!tekst] [] []
-\setupfootertexts [\v!marge] [] []
-\setupfootertexts [\v!rand]  [] []
+\setupfootertexts [\v!text] [] []
+\setupfootertexts [\v!margin] [] []
+\setupfootertexts [\v!edge]  [] []
 
-\setuptexttexts   [\v!tekst] [] []
-\setuptexttexts   [\v!marge] [] []
-\setuptexttexts   [\v!rand]  [] []
+\setuptexttexts   [\v!text] [] []
+\setuptexttexts   [\v!margin] [] []
+\setuptexttexts   [\v!edge]  [] []
 
-\setupbottomtexts [\v!tekst] [] []
-\setupbottomtexts [\v!marge] [] []
-\setupbottomtexts [\v!rand]  [] []
+\setupbottomtexts [\v!text] [] []
+\setupbottomtexts [\v!margin] [] []
+\setupbottomtexts [\v!edge]  [] []
 
-\setuptoptexts    [\v!tekst] [] []
-\setuptoptexts    [\v!marge] [] []
-\setuptoptexts    [\v!rand]  [] []
+\setuptoptexts    [\v!text] [] []
+\setuptoptexts    [\v!margin] [] []
+\setuptoptexts    [\v!edge]  [] []
 
 % alternative
 %
@@ -736,35 +692,35 @@
 \def\dodocommando[#1][#2]%
   {\getparameters
      [\??tk#1#2]
-     [%\c!status=\v!normaal, % moved
-      \c!voor=,  % both global and local are used
-      \c!na=,    % both global and local are used
+     [%\c!state=\v!normal, % moved
+      \c!before=,  % both global and local are used
+      \c!after=,    % both global and local are used
       \c!strut=, % the local one, not (yet) used
-      \c!letter=\getvalue{\??tk#1\c!letter},% hm, got lost
-      \c!kleur=\getvalue{\??tk#1\c!kleur},  % hm, got lost
-      \c!linkertekst=,
-      \c!middentekst=,
-      \c!rechtertekst=,
-      \c!kantlijntekst=,
-      \c!margetekst=,
-      \c!breedte=]%
-   \inheritparameter[\??tk#1#2][\c!linkerletter  ][\c!letter ]%
-   \inheritparameter[\??tk#1#2][\c!rechterletter ][\c!letter ]%
-   \inheritparameter[\??tk#1#2][\c!linkerkleur   ][\c!kleur  ]%
-   \inheritparameter[\??tk#1#2][\c!rechterkleur  ][\c!kleur  ]%
-   \inheritparameter[\??tk#1#2][\c!linkerbreedte ][\c!breedte]%
-   \inheritparameter[\??tk#1#2][\c!rechterbreedte][\c!breedte]}
+      \c!style=\getvalue{\??tk#1\c!style},% hm, got lost
+      \c!color=\getvalue{\??tk#1\c!color},  % hm, got lost
+      \c!lefttext=,
+      \c!middletext=,
+      \c!righttext=,
+      \c!marginedgetext=,
+      \c!margintext=,
+      \c!width=]%
+   \inheritparameter[\??tk#1#2][\c!leftstyle  ][\c!style ]%
+   \inheritparameter[\??tk#1#2][\c!rightstyle ][\c!style ]%
+   \inheritparameter[\??tk#1#2][\c!leftcolor   ][\c!color  ]%
+   \inheritparameter[\??tk#1#2][\c!rightcolor  ][\c!color  ]%
+   \inheritparameter[\??tk#1#2][\c!leftwidth ][\c!width]%
+   \inheritparameter[\??tk#1#2][\c!rightwidth][\c!width]}
 
 \def\docommando#1%
-  {\dodocommando[#1][\v!tekst]%
-   \dodocommando[#1][\v!marge]%
-   \dodocommando[#1][\v!rand]}
+  {\dodocommando[#1][\v!text]%
+   \dodocommando[#1][\v!margin]%
+   \dodocommando[#1][\v!edge]}
 
-\docommando\v!boven
-\docommando\v!hoofd
-\docommando\v!voet
-\docommando\v!tekst
-\docommando\v!onder
+\docommando\v!top
+\docommando\v!header
+\docommando\v!footer
+\docommando\v!text
+\docommando\v!bottom
 
 \let\docommando  \relax
 \let\dodocommando\relax
@@ -772,16 +728,16 @@
 %D While the header and footer lines are moved away from the
 %D main text, the top and bottom lines are centered.
 
-\setuptop   [\c!status=\v!normaal,\c!voor=\vss,\c!na=\vss,\c!strut=]
-\setupheader[\c!status=\v!normaal,\c!voor=,    \c!na=\vss,\c!strut=\v!ja]
-\setuptext  [\c!status=\v!normaal,\c!voor=\vss,\c!na=\vss,\c!strut=]
-\setupfooter[\c!status=\v!normaal,\c!voor=\vss,\c!na=,    \c!strut=\v!ja]
-\setupbottom[\c!status=\v!normaal,\c!voor=\vss,\c!na=\vss,\c!strut=]
+\setuptop   [\c!state=\v!normal,\c!before=\vss,\c!after=\vss,\c!strut=]
+\setupheader[\c!state=\v!normal,\c!before=,    \c!after=\vss,\c!strut=\v!yes]
+\setuptext  [\c!state=\v!normal,\c!before=\vss,\c!after=\vss,\c!strut=]
+\setupfooter[\c!state=\v!normal,\c!before=\vss,\c!after=,    \c!strut=\v!yes]
+\setupbottom[\c!state=\v!normal,\c!before=\vss,\c!after=\vss,\c!strut=]
 
-\setuptop   [\c!letter=,\c!kleur=]
-\setupheader[\c!letter=,\c!kleur=]
-\setuptext  [\c!letter=,\c!kleur=]
-\setupfooter[\c!letter=,\c!kleur=]
-\setupbottom[\c!letter=,\c!kleur=]
+\setuptop   [\c!style=,\c!color=]
+\setupheader[\c!style=,\c!color=]
+\setuptext  [\c!style=,\c!color=]
+\setupfooter[\c!style=,\c!color=]
+\setupbottom[\c!style=,\c!color=]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/pdfr-il2.tex b/tex/context/base/pdfr-il2.tex
index 615fcd7af..f52052ba8 100644
--- a/tex/context/base/pdfr-il2.tex
+++ b/tex/context/base/pdfr-il2.tex
@@ -1,9 +1,9 @@
 %D \module
-%D   [       file=pdfr-il2,
+%D   [       filefile=pdfr-il2,
 %D        version=2000.12.10,
 %D          title=\CONTEXT\ PDF Font Resources,
-%D       subtitle=ISO Latin 2, 
-%D         author={Ondrej Koala Vacha, Hans Hagen}
+%D       subtitle=ISO Latin 2,
+%D         author={Ondrej Koala Vacha, Hans Hagen},
 %D           date=\currentdate,
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
@@ -11,20 +11,20 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-%D This vector is derived (but reformatted a bit) from a 
-%D sample send to me by Petr Ferdus. There was some Czech 
-%D comment in which I could recognize the name of Ondrej 
-%D Koala Vacha. More information on setting up such a vector 
-%D can be found in the \PDF\ reference manual. 
+%D This vector is derived (but reformatted a bit) from a
+%D sample send to me by Petr Ferdus. There was some Czech
+%D comment in which I could recognize the name of Ondrej
+%D Koala Vacha. More information on setting up such a vector
+%D can be found in the \PDF\ reference manual.
 
-\startpdffontresource[il2] 
+\startpdffontresource[il2]
 /CIDInit /ProcSet findresource begin
 12 dict begin
   begincmap
     /CIDSystemInfo
-      << /Registry (Adobe) 
-         /Ordering (T1UV)  
-         /Supplement 0 
+      << /Registry (Adobe)
+         /Ordering (T1UV)
+         /Supplement 0
       >> def
     /CMapName /Adobe-Identity-UCS def
     /CMapType 1 def
@@ -230,4 +230,4 @@ CMapName currentdict /CMap defineresource pop end
 end
 \stoppdffontresource
 
-\endinput 
+\endinput
diff --git a/tex/context/base/plus-rul.tex b/tex/context/base/plus-rul.tex
index a82464d4c..f9373d9db 100644
--- a/tex/context/base/plus-rul.tex
+++ b/tex/context/base/plus-rul.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=plus-rul,
+%D   [       filefile=plus-rul,
 %D        version=2003.03.16,
 %D          title=\CONTEXT\ Plus Macros,
 %D       subtitle=Ruled Stuff Handling,
@@ -17,8 +17,6 @@
 
 %D \definesidebar[whow][rulecolor=green,distance=]
 %D
-%D \starttext
-%D
 %D \input tufte \par
 %D \startsidebar
 %D   \input tufte \par
@@ -26,9 +24,11 @@
 %D   \startsidebar[whow]
 %D     \input tufte \par
 %D     \input tufte \par
-%D     \input tufte \stopsidebar \par
+%D     \input tufte
+%D   \stopsidebar \par
 %D   \input tufte \par
-%D   \input tufte \stopsidebar \par
+%D   \input tufte
+%D \stopsidebar \par
 %D \input tufte \par
 %D \input tufte \par
 %D \startsidebar
@@ -36,7 +36,8 @@
 %D   \input tufte \par
 %D   \input tufte \par
 %D   \input tufte \par
-%D   \input tufte \stopsidebar \par
+%D   \input tufte
+%D \stopsidebar \par
 %D \input tufte \par
 %D \input tufte \par
 %D \startsidebar
@@ -69,9 +70,9 @@
 %    distance=5pt]
 
 \setupsidebars
-  [\c!lijndikte=2pt,
-   \c!lijnkleur=red,
-   \c!afstand=.5\bodyfontsize]
+  [\c!rulethickness=2pt,
+   \c!rulecolor=red,
+   \c!distance=.5\bodyfontsize]
 
 \def\definesidebar
   {\dodoubleempty\dodefinesidebar}
@@ -79,7 +80,7 @@
 \def\dodefinesidebar[#1][#2]%
   {\copyparameters
      [\??sr#1][\??sr]
-     [\c!lijndikte,\c!lijnkleur,\c!afstand]%
+     [\c!rulethickness,\c!rulecolor,\c!distance]%
    \getparameters
      [\??sr#1][#2]}
 
@@ -92,18 +93,18 @@
    \checktextbackgrounds
    \doglobal\increment\currentsidebar
    \doifelsenothing{#1}
-     {\advance\sidebardistance\@@srafstand}
-     {\doifelsevaluenothing{\??sr#1\c!afstand}
-        {\advance\sidebardistance\@@srafstand}
-        {\sidebardistance\getvalue{\??sr#1\c!afstand}}}%
+     {\advance\sidebardistance\@@srdistance}
+     {\doifelsevaluenothing{\??sr#1\c!distance}
+        {\advance\sidebardistance\@@srdistance}
+        {\sidebardistance\getvalue{\??sr#1\c!distance}}}%
    \startpositionoverlay{text-1}%
      \expanded{\setMPpositiongraphicrange
        {b:side:\currentsidebar}%
        {e:side:\currentsidebar}%
        {mpos:bar}%
        {self=side:\currentsidebar,
-        linewidth=\getvalue{\??sr#1\c!lijndikte},
-        linecolor=\getvalue{\??sr#1\c!lijnkleur},
+        linewidth=\getvalue{\??sr#1\c!rulethickness},
+        linecolor=\getvalue{\??sr#1\c!rulecolor},
         distance=\the\sidebardistance}}%
    \stoppositionoverlay
    \edef\stopsidebar{\noexpand\dostopsidebar{\currentsidebar}}%
@@ -161,23 +162,23 @@
 %D \stopmarginrule
 
 \definesidebar
-  [\v!marge]
-  [\c!lijnkleur=\s!black,
-   \c!lijndikte=\@@kalijndikte,
-   \c!afstand=\dimexpr(\linkermargeafstand-\@@kalijndikte/2)]
+  [\v!margin]
+  [\c!rulecolor=\s!black,
+   \c!rulethickness=\@@karulethickness,
+   \c!distance=\dimexpr(\leftmargindistance-\@@karulethickness/2)]
 
 \def\complexstartmarginrule[#1]%
   {\bgroup
-   \ifnum#1<\@@kaniveau\relax
+   \ifnum#1<\@@kalevel\relax
      \let\stopmarginrule\egroup
    \else
      \def\@@kadefaultwidth{#1}%
      \let\stopmarginrule\dostopmarginrule
-     \@EA\startsidebar\@EA[\@EA\v!marge\@EA]%
+     \@EA\startsidebar\@EA[\@EA\v!margin\@EA]%
    \fi}
 
 \def\dostopmarginrule
   {\stopsidebar
    \egroup}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/ppchtex.tex b/tex/context/base/ppchtex.tex
index badc2212d..b68e393f8 100644
--- a/tex/context/base/ppchtex.tex
+++ b/tex/context/base/ppchtex.tex
@@ -1,14 +1,5 @@
-% option=test    => boxes
-%        dummy   => file
-%        final   => file / local run
-%
-% constante van phantom in definitie ONE: \setchemicaltextwidth 300
-%
-% it would be interesting to rewrite this module with todays
-% experiences and new context functionality, mybe ...
-
 %D \module
-%D   [       file=ppchtex (m-chemie),
+%D   [       filefile=ppchtex (m-chemie),
 %D        version=1997.03.19,
 %D          title=\CONTEXT\ Extra Modules,
 %D       subtitle=\PPCHTEX\ (Plain Pictex Context cHemie \TEX),
@@ -21,6 +12,15 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% option=test    => boxes
+%        dummy   => file
+%        final   => file / local run
+%
+% constante van phantom in definitie ONE: \setchemicaltextwidth 300
+%
+% it would be interesting to rewrite this module with todays
+% experiences and new context functionality, mybe ...
+
 % Deze module ondersteunt het zetten van chemische
 % (structuur)formules. Hoewel de macro' zijn afgestemd op
 % CONTEXT, zijn ze ook buiten deze zetomgeving te gebruiken.
@@ -417,23 +417,23 @@
 
 \def\setupchemicalformat[#1]%
   {\processaction
-     [\getvalue{#1\c!formaat}]
-     [  \v!klein=>\def\@@localchemicalformat{\scriptscriptstyle},
-       \v!middel=>\def\@@localchemicalformat{\ifsmallchemicaltext\scriptscriptstyle\else\scriptstyle\fi},
-        \v!groot=>\def\@@localchemicalformat{\ifsmallchemicaltext\scriptstyle\else\textstyle\fi},
-      \s!unknown=>\def\@@localchemicalformat{\getvalue{#1\c!formaat}}]%
+     [\getvalue{#1\c!size}]
+     [  \v!small=>\def\@@localchemicalformat{\scriptscriptstyle},
+       \v!medium=>\def\@@localchemicalformat{\ifsmallchemicaltext\scriptscriptstyle\else\scriptstyle\fi},
+        \v!big=>\def\@@localchemicalformat{\ifsmallchemicaltext\scriptstyle\else\textstyle\fi},
+      \s!unknown=>\def\@@localchemicalformat{\getvalue{#1\c!size}}]%
    \processaction
-     [\getvalue{#1\c!tekstformaat}]
-     [  \v!klein=>\def\@@localchemicalstyle{\scriptscriptstyle},
-       \v!middel=>\def\@@localchemicalstyle{\ifsmallchemicaltext\scriptscriptstyle\else\scriptstyle\fi},
-        \v!groot=>\def\@@localchemicalstyle{\ifsmallchemicaltext\scriptstyle\else\textstyle\fi},
-      \s!unknown=>\def\@@localchemicalstyle{\getvalue{#1\c!tekstformaat}}]%
+     [\getvalue{#1\c!textsize}]
+     [  \v!small=>\def\@@localchemicalstyle{\scriptscriptstyle},
+       \v!medium=>\def\@@localchemicalstyle{\ifsmallchemicaltext\scriptscriptstyle\else\scriptstyle\fi},
+        \v!big=>\def\@@localchemicalstyle{\ifsmallchemicaltext\scriptstyle\else\textstyle\fi},
+      \s!unknown=>\def\@@localchemicalstyle{\getvalue{#1\c!textsize}}]%
    \processaction
-     [\getvalue{#1\c!schaal}]
-     [  \v!klein=>\def\@@localchemicalscale{500},
-       \v!middel=>\def\@@localchemicalscale{625},
-        \v!groot=>\def\@@localchemicalscale{750},
-      \s!unknown=>\def\@@localchemicalscale{\getvalue{#1\c!schaal}}]}
+     [\getvalue{#1\c!scale}]
+     [  \v!small=>\def\@@localchemicalscale{500},
+       \v!medium=>\def\@@localchemicalscale{625},
+        \v!big=>\def\@@localchemicalscale{750},
+      \s!unknown=>\def\@@localchemicalscale{\getvalue{#1\c!scale}}]}
 
 \def\@@currentchemicalformat
   {\ifinchemical
@@ -659,10 +659,10 @@
 \unexpanded\def\complexstartchemical[#1]%
   {\copyparameters
      [\??chemical][\??chemical\s!chemical]
-     [\c!breedte,\c!hoogte,\c!links,\c!rechts,\c!boven,\c!onder,
-      \c!korps,\c!formaat,\c!schaal,\c!status,\c!kader,\c!assenstelsel,
-      \c!plaats,\c!optie,\c!variant,\c!resolutie,\c!offset,\c!letter,
-      \c!kleur,\c!lijnkleur,\c!lijndikte]%
+     [\c!width,\c!height,\c!left,\c!right,\c!top,\c!bottom,
+      \c!bodyfont,\c!size,\c!scale,\c!state,\c!frame,\c!axis,
+      \c!location,\c!option,\c!alternative,\c!resolution,\c!offset,\c!style,
+      \c!color,\c!rulecolor,\c!rulethickness]%
    \getparameters
      [\??chemical]
      [#1]%
@@ -676,7 +676,7 @@
    \doif{\@@chemicalvariant}{2}
      {\@@setsecondchemicalplotsymbol}%
    %
-   \doif{\@@chemicalassenstelsel}{\v!aan}
+   \doif{\@@chemicalassenstelsel}{\v!on}
      {\let\chemicalframe\hbox}%
    %
    \!!counta=250000
@@ -716,15 +716,15 @@
         \fi
       \fi}%
    \fixedchemicalfalse
-   \doif{\@@chemicalbreedte}{\v!passend}
+   \doif{\@@chemicalbreedte}{\v!fit}
      {\edef\@@chemicalbreedte%
         {\ifnum\chemicaldrawingmode=1 2000 \else 1 \fi}%
       \fixedchemicaltrue}%
-   \doif{\@@chemicalhoogte}{\v!passend}
+   \doif{\@@chemicalhoogte}{\v!fit}
      {\edef\@@chemicalhoogte%
         {\ifnum\chemicaldrawingmode=1 2000 \else 1 \fi}%
       \fixedchemicaltrue}%
-   \doifelse{\@@chemicalplaats}{\v!intekst}
+   \doifelse{\@@chemicalplaats}{\v!intext}
      {\!!counta=0 \!!countb=0
       \!!counta=0 \!!countd=0 }
      {\calculateaxis
@@ -739,7 +739,7 @@
    \edef\@@chemicalboven{\the\!!countc}%
    \edef\@@chemicalonder{\the\!!countd}%
    %
-   \doifinsetelse{\v!aan}{\@@chemicalkader,\@@chemicalassenstelsel}
+   \doifinsetelse{\v!on}{\@@chemicalkader,\@@chemicalassenstelsel}
      {\def\@@chemicalborder{\chemicalframe}}
      {\def\@@chemicalborder{\normalchemicalframe}}%
    %
@@ -749,7 +749,7 @@
      {-\the\!!counta}{\the\!!countb}
      {-\the\!!countc}{\the\!!countd}%
    \doif{\@@chemicalstatus}{\v!start}
-     {\doif{\@@chemicalassenstelsel}{\v!aan}
+     {\doif{\@@chemicalassenstelsel}{\v!on}
         {\@@setchemicalaxis
            {-\the\!!counta}{\the\!!countb}
            {-\the\!!countc}{\the\!!countd}}}%
@@ -1160,7 +1160,7 @@
      \setbox4=\hbox{$\@@dochemicalstyle{\@@localchemicalformat C_2^2}$}%
      \setbox6=\hbox{$\@@dochemicalstyle{\@@localchemicalformat O}$}% or C
      \doresetsubscripts
-     \doifnot\@@chemicalplaats\v!intekst
+     \doifnot\@@chemicalplaats\v!intext
        {\ht2=\ht4
         \dp2=\dp4}%
      \setbox2=\hbox{\@@chemicalframe{\@@dochemicalcolor\box2}}%
@@ -1676,7 +1676,7 @@
 \newif\ifinnerchemical
 
 \def\dosimplechemical#1#2#3%
-  {\doifdefinedelse{\??chemical\c!plaats}
+  {\doifdefinedelse{\??chemical\c!location}
      {\writestatus{ppchtex}{the {}{}-alternative is not permitted here}}
      {\ifinnerchemical
         \let\chemicalsign         = \chemicalinnersign
@@ -1778,7 +1778,7 @@
      \drawchemical[#1][#2]%
      \ignorespaces
    \else
-     \startchemical[\c!plaats=\v!intekst]%
+     \startchemical[\c!location=\v!intext]%
        \drawchemical[#1][#2]%
      \expandafter\stopchemical
    \fi
@@ -1821,11 +1821,11 @@
    %\bgroup     % koppelen en afmetingen gaat fout, vandaar:
    \advance\levchemical 1
    \letvalue{\??chemical\s!unknown\the\levchemical}\unknownchemical
-   \setevalue{\??chemical\c!tekst\the\levchemical}{\the\txtchemical}%
+   \setevalue{\??chemical\c!text\the\levchemical}{\the\txtchemical}%
    \txtchemical=0
    \dodochemical[#1][#2]%
-   % \@EA\txtchemical\@EA\csname\??chemical\c!tekst\the\levchemical\endcsname
-   \txtchemical\csname\??chemical\c!tekst\the\levchemical\endcsname
+   % \@EA\txtchemical\@EA\csname\??chemical\c!text\the\levchemical\endcsname
+   \txtchemical\csname\??chemical\c!text\the\levchemical\endcsname
    \@EA\let\@EA\unknownchemical\csname\??chemical\s!unknown\the\levchemical\endcsname
    \advance\levchemical -1
    %\egroup
@@ -3161,7 +3161,7 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
      {\dosetsubscripts%
       $\@@dochemicalstyle{\@@localchemicalformat\strut##1}$%
       \doresetsubscripts}%
-   \doifelse\@@chemicalplaats\v!intekst
+   \doifelse\@@chemicalplaats\v!intext
      {#1{\dochemicaltext\toptext}}%
      {\setbox\chemicalsymbols=\hbox
         {\box\chemicalsymbols
@@ -3186,7 +3186,7 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
      {$\leftarrow\hskip-1em$\rightarrowfill\cr}}
 
 \def\executechemicalsign#1[#2]%
-  {\doifelse\@@chemicalplaats\v!intekst
+  {\doifelse\@@chemicalplaats\v!intext
      {\dosetsubscripts
       $\@@dochemicalstyle{\@@localchemicalformat#1}$%
       \doresetsubscripts}
@@ -3206,19 +3206,19 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
   {\executechemicalsign{=}}
 
 \def\executechemicalSPACE[#1]%
-  {\doifnot\@@chemicalplaats\v!intekst
+  {\doifnot\@@chemicalplaats\v!intext
      {\setbox\chemicalsymbols\hbox
         {\box\chemicalsymbols
          \quad}}}
 
 \def\executechemicalCHEM[#1]%
-  {\doifnot\@@chemicalplaats\v!intekst
+  {\doifnot\@@chemicalplaats\v!intext
      {\setbox\chemicalsymbols\hbox
         {\box\chemicalsymbols
          $\@@dochemicalstyle{\@@localchemicalformat#1}$}}}
 
 \def\executechemicalTEXT[#1]%
-  {\doifnot\@@chemicalplaats\v!intekst
+  {\doifnot\@@chemicalplaats\v!intext
      {\setbox\chemicalsymbols\hbox
         {\box\chemicalsymbols#1}}}
 
@@ -3290,28 +3290,28 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
 \let\setchemicalattributes\relax
 
 \setupchemical
-  [\c!breedte=0,
-   \c!hoogte=0,
-   \c!links=0,
-   \c!rechts=0,
-   \c!boven=0,
-   \c!onder=0,
-   \c!korps=\the\bodyfontsize,
-   \c!resolutie=\outputresolution,
-   \c!schaal=\v!middel,
-   \c!formaat=\v!middel,
-   \c!tekstformaat=\v!groot,
-   \c!kader=\v!uit,
-   \c!assenstelsel=\v!uit,
-   \c!status=\v!start,
-   \c!letter=\rm,
-   \c!plaats=,
-   \c!optie=,
+  [\c!width=0,
+   \c!height=0,
+   \c!left=0,
+   \c!right=0,
+   \c!top=0,
+   \c!bottom=0,
+   \c!bodyfont=\the\bodyfontsize,
+   \c!resolution=\outputresolution,
+   \c!scale=\v!medium,
+   \c!size=\v!medium,
+   \c!textsize=\v!big,
+   \c!frame=\v!off,
+   \c!axis=\v!off,
+   \c!state=\v!start,
+   \c!style=\rm,
+   \c!location=,
+   \c!option=,
    \c!offset=LOW,
-   \c!variant=1,
-   \c!kleur=,
-   \c!lijndikte=,
-   \c!lijnkleur=]
+   \c!alternative=1,
+   \c!color=,
+   \c!rulethickness=,
+   \c!rulecolor=]
 
 % Tijdelijk plaatsen we deze extra macro's hier.
 %
@@ -3348,10 +3348,10 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
 
 %D Here are a couple of \CONTEXT\ goodies:
 %D
-%D \startopsomming
-%D \som styles hooked into \CONTEXT\ style mechanism
-%D \som support for color and rulethickness (mp mode only)
-%D \som position tracking
+%D \startitemize
+%D \item styles hooked into \CONTEXT\ style mechanism
+%D \item support for color and rulethickness (mp mode only)
+%D \item position tracking
 %D \stopopsoming
 
 \ifCONTEXT
@@ -3378,9 +3378,9 @@ RT##3##4##5=>\processchemicaltextelement{RN}{##3##4##5}{#1}{0}{},
   {\doconvertfont\@@chemicalletter}
 
 \setupchemical
-  [\c!lijndikte=\linewidth,
-   \c!lijnkleur=,
-   \c!kleur=]
+  [\c!rulethickness=\linewidth,
+   \c!rulecolor=,
+   \c!color=]
 
 \def\cpos#1#2%
   {\iftrialtypesetting
diff --git a/tex/context/base/prop-ini.tex b/tex/context/base/prop-ini.tex
index 4e846012b..43ccafa51 100644
--- a/tex/context/base/prop-ini.tex
+++ b/tex/context/base/prop-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=prop-ini,
+%D   [       filefile=prop-ini,
 %D        version=2003.04.20,
 %D          title=\CONTEXT\ Property Macros,
 %D       subtitle=Initialization,
@@ -99,7 +99,7 @@
   {\dotripleempty\dodefineproperty}
 
 \def\dodefineproperty[#1]%
-  {\ifundefined{\??py#1\c!globaal}%
+  {\ifundefined{\??py#1\c!global}%
      \expandafter\dododefineproperty
    \else
      \expandafter\nododefineproperty
@@ -113,19 +113,19 @@
 %          none    : no commands
 
 \def\dododefineproperty[#1][#2][#3]% global ! ! !
-  {\getgparameters[\??py#1][\c!globaal=\v!nee,\c!type=#2,\c!methode=\v!geen,#3]% global ! ! ! !
+  {\getgparameters[\??py#1][\c!global=\v!no,\c!type=#2,\c!method=\v!none,#3]% global ! ! ! !
    \expandafter\newcount\csname\??py:l:#2\endcsname % current level
    \expandafter\newcount\csname\??py:p:#2\endcsname % previous level
    \global\csname\??py:p:#2\endcsname\minusone
    \global\expandafter\expandafter\let\csname\??py:c:0\endcsname\empty
    \letgvalue{\??py\s!check#1}\docheckproperty
-   \doifelsevalue{\??py#1\c!methode}\v!commando
-     {\doifelsevalue{\??py#1\c!globaal}\v!ja
+   \doifelsevalue{\??py#1\c!method}\v!command
+     {\doifelsevalue{\??py#1\c!global}\v!yes
         {\setgvalue{\e!start#1}{\dostartproperty{#1}}%
          \letgvalue{\e!stop#1}\dostopproperty}%
         {\setgvalue{\e!start#1}{\dostartgproperty{#1}}%
          \letgvalue{\e!stop#1}\dostopgproperty}}%
-     {\doifelsevalue{\??py#1\c!globaal}\v!ja
+     {\doifelsevalue{\??py#1\c!global}\v!yes
         {\setgvalue{\e!start#2}[##1]{\dostartproperty{##1}}%
          \letgvalue{\e!stop#2}\dostopproperty}%
         {\setgvalue{\e!start#2}[##1]{\dostartgproperty{##1}}%
@@ -134,7 +134,7 @@
 \def\nododefineproperty[#1][#2][#3]%
   {}
 
-\def\doifelseproperty#1{\doifdefinedelse{\??py#1\c!globaal}}
+\def\doifelseproperty#1{\doifdefinedelse{\??py#1\c!global}}
 
 \def\setupproperty
   {\dodoubleempty\dosetupproperty}
@@ -179,4 +179,4 @@
 \def\definepropertyhandler#1{\setvalue{\??py*#1}}
 \def\propertyhandler      #1{\getvalue{\??py*#1}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/prop-lay.tex b/tex/context/base/prop-lay.tex
index c9e39dc2b..18ffa493c 100644
--- a/tex/context/base/prop-lay.tex
+++ b/tex/context/base/prop-lay.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=prop-lay,
+%D   [       filefile=prop-lay,
 %D        version=2003.04.20,
 %D          title=\CONTEXT\ Property Macros,
 %D       subtitle=Layers,
@@ -20,8 +20,8 @@
 \def\checklayerproperty
   {\dodefineviewerlayer
      \currentproperty % tag
-     {\checkedpropertyparameter\c!titel\currentproperty}%
-     {\checkedpropertyparameter\c!status\v!start}% visible or hidden
+     {\checkedpropertyparameter\c!title\currentproperty}%
+     {\checkedpropertyparameter\c!state\v!start}% visible or hidden
      {0}% type (1=frozen)
      {0}}% printable
 
@@ -56,8 +56,8 @@
 %D \setupcolors[state=start]
 %D \setupinteraction[state=start,color=,contrastcolor=]
 %D
-%D \defineproperty [L1] [\s!layer] [title=layer 1]
-%D \defineproperty [L2] [\s!layer] [title=layer 2]
+%D \defineproperty [L1] [layer] [title=layer 1]
+%D \defineproperty [L2] [layer] [title=layer 2]
 %D
 %D \button{HIDE   L1}[HideLayer{L1}]
 %D \button{VIDE   L1}[VideLayer{L1}]
@@ -110,4 +110,4 @@
 %   {\ifshowlayering
 %      \defineproperty[\remappedlayering{#1}][\s!layer][\c!titel=#2]%
 %      \startproperty[\remappedlayering{#1}]%
-%    \fi}
\ No newline at end of file
+%    \fi}
diff --git a/tex/context/base/prop-mis.tex b/tex/context/base/prop-mis.tex
index 822b48cd9..8b90cab85 100644
--- a/tex/context/base/prop-mis.tex
+++ b/tex/context/base/prop-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=prop-mis,
+%D   [       filefile=prop-mis,
 %D        version=2004.05.29, % some code moved from private modules
 %D          title=\CONTEXT\ Property Macros,
 %D       subtitle=Miscelaneous,
@@ -23,8 +23,8 @@
 
 %D Stream based overprint and knockout:
 
-\defineproperty[\v!overprint][\s!overprint] [\c!methode=\v!commando]
-\defineproperty[\v!knockout] [\s!overprint] [\c!methode=\v!commando]
+\defineproperty[\v!overprint][\s!overprint] [\c!method=\v!command]
+\defineproperty[\v!knockout] [\s!overprint] [\c!method=\v!command]
 
 \definepropertyhandler \v!overprint {\dostartoverprint}
 \definepropertyhandler \v!knockout  {\dostopoverprint }
@@ -71,11 +71,11 @@
 
 %D Negation.
 
-\defineproperty [\v!negatief] [\s!negative] [\c!methode=\v!commando]
-\defineproperty [\v!positief] [\s!negative] [\c!methode=\v!commando]
+\defineproperty [\v!negative] [\s!negative] [\c!method=\v!command]
+\defineproperty [\v!positive] [\s!negative] [\c!method=\v!command]
 
-\definepropertyhandler \v!negatief {\dostartnegative}
-\definepropertyhandler \v!positief {\dostopnegative }
+\definepropertyhandler \v!negative {\dostartnegative}
+\definepropertyhandler \v!positive {\dostopnegative }
 
 \def\startnegativeproperty
   {\ifincolor
@@ -121,20 +121,20 @@
 
 \setupproperty
   [\s!effect]
-  [\c!lijndikte=.25pt,
-   \c!rek=1]
+  [\c!rulethickness=.25pt,
+   \c!stretch=1]
 
-\defineproperty [\v!binnen]    [\s!effect]
-\defineproperty [\v!buiten]    [\s!effect]
-\defineproperty [\v!beide]     [\s!effect]
-\defineproperty [\v!normaal]   [\s!effect]
-\defineproperty [\v!verborgen] [\s!effect]
+\defineproperty [\v!inner]    [\s!effect]
+\defineproperty [\v!outer]    [\s!effect]
+\defineproperty [\v!both]     [\s!effect]
+\defineproperty [\v!normal]   [\s!effect]
+\defineproperty [\v!hidden] [\s!effect]
 
-\definepropertyhandler \v!normaal   {0}
-\definepropertyhandler \v!binnen    {0}
-\definepropertyhandler \v!buiten    {1}
-\definepropertyhandler \v!beide     {2}
-\definepropertyhandler \v!verborgen {3}
+\definepropertyhandler \v!normal   {0}
+\definepropertyhandler \v!inner    {0}
+\definepropertyhandler \v!outer    {1}
+\definepropertyhandler \v!both     {2}
+\definepropertyhandler \v!hidden {3}
 
 % \def\handleeffectproperty#1%
 %   {\expanded{\dostartfonteffect
@@ -182,8 +182,8 @@
 
 \def\effectpropertydata#1%
   {{\propertyhandler{#1}}%
-   {\propertyparameter{#1}\c!lijndikte}%
-   {\propertyparameter{#1}\c!rek}}
+   {\propertyparameter{#1}\c!rulethickness}%
+   {\propertyparameter{#1}\c!stretch}}
 
 \def\starteffectproperty
   {\expanded{\dostartfonteffect\effectpropertydata\currentproperty}%
@@ -221,4 +221,4 @@
 \appendtoks \popeffectproperty      \to \everypopproperties
 \appendtoks \popspliteffectproperty \to \everypopsplitproperties
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/prop-run.tex b/tex/context/base/prop-run.tex
index 02991c67e..dcd755b35 100644
--- a/tex/context/base/prop-run.tex
+++ b/tex/context/base/prop-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=prop-run,
+%D   [       filefile=prop-run,
 %D        version=2003.04.20,
 %D          title=\CONTEXT\ Property Macros,
 %D       subtitle=Runtime Macros,
@@ -26,8 +26,8 @@
      \doifelseproperty{#1}
         \donothing
        {\doifelsenothing{#2}%
-          {\defineproperty[#1][\s!layer]}% [\c!titel=#1]
-          {\defineproperty[#1][\s!layer][\c!titel=#2]}}%
+          {\defineproperty[#1][\s!layer]}% [\c!title=#1]
+          {\defineproperty[#1][\s!layer][\c!title=#2]}}%
      \startproperty[#1]%
    \fi}
 
@@ -36,4 +36,4 @@
      \stopproperty
    \fi}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/regi-cyp.tex b/tex/context/base/regi-cyp.tex
index 7d134df50..a1043bc52 100644
--- a/tex/context/base/regi-cyp.tex
+++ b/tex/context/base/regi-cyp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-cyp,
+%D   [       filefile=regi-cyp,
 %D        version=2003.01.24,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Cyrillic Plus,
diff --git a/tex/context/base/regi-cyr.tex b/tex/context/base/regi-cyr.tex
index cc54551f6..a4bcdb5c3 100644
--- a/tex/context/base/regi-cyr.tex
+++ b/tex/context/base/regi-cyr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-cyr,
+%D   [       filefile=regi-cyr,
 %D        version=2003.01.24,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Cyrillic,
@@ -13,13 +13,13 @@
 
 %D Here are input regimes for cyrillic encodings: 
 %D 
-%D \startopsomming 
-%D \som  windows
-%D \som  two variants of dos
-%D \som  three variants of koi-8 for *nix: russian, 
+%D \startitemize 
+%D \item  windows
+%D \item  two variants of dos
+%D \item  three variants of koi-8 for *nix: russian, 
 %D       ukrainian and mixed
-%D \som  two variants for the mac 
-%D \stopopsomming 
+%D \item  two variants for the mac 
+%D \stopitemize 
 %D 
 %D Other, not so popular regimes, can be found in \type 
 %D {regi-cy2}.
diff --git a/tex/context/base/regi-def.tex b/tex/context/base/regi-def.tex
index e26709c77..48f020392 100644
--- a/tex/context/base/regi-def.tex
+++ b/tex/context/base/regi-def.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=regi-def,
+%D   [     filefile=regi-def,
 %D      version=2000.20.12, % split from less verbose base file 
 %D        title=\CONTEXT\ Regime Macros,
 %D     subtitle=Default Character Definitions, 
diff --git a/tex/context/base/regi-grk.tex b/tex/context/base/regi-grk.tex
index 72b732eb8..7ff295a04 100644
--- a/tex/context/base/regi-grk.tex
+++ b/tex/context/base/regi-grk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-grk,
+%D   [       filefile=regi-grk,
 %D        version=2003.03.01,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Greek,
diff --git a/tex/context/base/regi-ibm.tex b/tex/context/base/regi-ibm.tex
index aebd4951a..4f40efb2e 100644
--- a/tex/context/base/regi-ibm.tex
+++ b/tex/context/base/regi-ibm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-ibm,
+%D   [       filefile=regi-ibm,
 %D        version=1995.01.01,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=The Good Old MSDOS IBM codepage,
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
 %C details. 
 
-%D This module activates the \kap{IBM PC} high \ASCII\ 
+%D This module activates the \cap{IBM PC} high \ASCII\ 
 %D characters, such as ‰ and á. 
 
 \startregime [ibm]
diff --git a/tex/context/base/regi-il1.tex b/tex/context/base/regi-il1.tex
index 7c1838fec..af4806a3a 100644
--- a/tex/context/base/regi-il1.tex
+++ b/tex/context/base/regi-il1.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-il1,
+%D   [       filefile=regi-il1,
 %D        version=2000.05.07, 
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=ISO Latin 1 keys,
diff --git a/tex/context/base/regi-ini.tex b/tex/context/base/regi-ini.tex
index 0f663a423..2833843e4 100644
--- a/tex/context/base/regi-ini.tex
+++ b/tex/context/base/regi-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-ini,
+%D   [       filefile=regi-ini,
 %D        version=2000.12.27, % 1998.12.03,
 %D          title=\CONTEXT\ Regime Macros,
 %D       subtitle=Initialization,
diff --git a/tex/context/base/regi-lat.tex b/tex/context/base/regi-lat.tex
index 9a561628a..e31e584f2 100644
--- a/tex/context/base/regi-lat.tex
+++ b/tex/context/base/regi-lat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [     file=regi-lat,
+%D   [     filefile=regi-lat,
 %D      version=1999.11.16,
 %D        title=\CONTEXT\ Encoding Macros,
 %D     subtitle=Pseudo Latin 2,
diff --git a/tex/context/base/regi-mac.tex b/tex/context/base/regi-mac.tex
index b3c281ec0..5d8756c22 100644
--- a/tex/context/base/regi-mac.tex
+++ b/tex/context/base/regi-mac.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-mac,
+%D   [       filefile=regi-mac,
 %D        version=2001.03.18,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Mac Encoding, 
diff --git a/tex/context/base/regi-uni.tex b/tex/context/base/regi-uni.tex
index 2b749967f..a73dd4378 100644
--- a/tex/context/base/regi-uni.tex
+++ b/tex/context/base/regi-uni.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=enco-uni,
+%D   [       filefile=enco-uni,
 %D        version=1998.10.18,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Unicode, 
diff --git a/tex/context/base/regi-utf.tex b/tex/context/base/regi-utf.tex
index 2a441f19d..45fe3af88 100644
--- a/tex/context/base/regi-utf.tex
+++ b/tex/context/base/regi-utf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-utf,
+%D   [       filefile=regi-utf,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=UTF-8,
@@ -42,4 +42,4 @@
 
 \stopregime
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/regi-win.tex b/tex/context/base/regi-win.tex
index 36fd73f9d..205e498bc 100644
--- a/tex/context/base/regi-win.tex
+++ b/tex/context/base/regi-win.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=regi-win,
+%D   [       filefile=regi-win,
 %D        version=1997.08.29,
 %D          title=\CONTEXT\ Encoding Macros,
 %D       subtitle=Windows 1252 ANSI keys,
diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex
index ca3bdf5d6..b1a9180fb 100644
--- a/tex/context/base/s-abr-01.tex
+++ b/tex/context/base/s-abr-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-abr-01,
+%D   [      filefile=s-abr-01,
 %D        version=1996.01.01,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=General Abbreviations 1,
@@ -13,9 +13,9 @@
 
 \unprotect
 
-\stelsorterenin[logo][\c!letter=\v!kapitaal]
+\setupsorting[logo][\c!style=\v!capital]
 
-\setupcapitals[\c!titel=\v!nee]
+\setupcapitals[\c!title=\v!no]
 
 \protect
 
@@ -23,6 +23,7 @@
 \logo [AFM]        {afm}
 \logo [ALEPH]      {Aleph} % {\mathematics{\aleph}}
 \logo [ALGOL]      {ALGOL}
+\logo [ARABTEX]    {Arab\TeX}
 \logo [AMSLATEX]   {\AmSLaTeX}
 \logo [AMSTEX]     {\AmSTeX}
 \logo [AMS]        {ams}
@@ -50,6 +51,7 @@
 \logo [DVIPSONE]   {dvipsone}
 \logo [DVIPDFM]    {dvipdfm}
 \logo [DVIPDFMX]   {dvipdfmx}
+\logo [DVIPOS]     {dvipos}
 \logo [DVIPS]      {dvips}
 \logo [DVISCR]     {dviscr}
 \logo [DVIWINDO]   {dviwindo}
@@ -122,6 +124,7 @@
 \logo [NTS]        {nts}
 \logo [OMEGA]      {Omega}
 \logo [OPI]        {opi}
+\logo [OTP]        {otp}
 \logo [PASCAL]     {Pascal}
 \logo [PCTEX]      {pc\TeX}
 \logo [PDFETEX]    {pdfe\TeX}
@@ -205,6 +208,7 @@
 \logo [XSLT]       {xslt}
 \logo [XSL]        {xsl}
 \logo [XSLFO]      {xsl-fo}
+\logo [XYPIC]      {XYPIC} % wrong logo
 \logo [YandY]      {y\&y}
 
 \def\METAFUN       {\MetaFun}
diff --git a/tex/context/base/s-abr-02.tex b/tex/context/base/s-abr-02.tex
index 1e99dbe00..6f5c6cd86 100644
--- a/tex/context/base/s-abr-02.tex
+++ b/tex/context/base/s-abr-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-abr-02,
+%D   [      filefile=s-abr-02,
 %D        version=1996.01.01,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=General Abbreviations 2,
@@ -15,9 +15,9 @@
 
 \unprotect
 
-\stelsorterenin[logo][\c!letter=\v!smallcaps]
+\setupsorting[logo][\c!style=\v!smallcaps]
 
-\setupcapitals[\c!titel=\v!nee]
+\setupcapitals[\c!title=\v!no]
 
 \protect
 
diff --git a/tex/context/base/s-abr-03.tex b/tex/context/base/s-abr-03.tex
index b746383f6..48a702c16 100644
--- a/tex/context/base/s-abr-03.tex
+++ b/tex/context/base/s-abr-03.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-abr-03,
+%D   [      filefile=s-abr-03,
 %D        version=1998.08.10,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=General Abbreviations 3,
@@ -15,7 +15,7 @@
 
 \unprotect
 
-\stelsorterenin[logo][\c!letter=\v!WOORD]
+\setupsorting[logo][\c!style=\v!WOORD]
 
 \protect
 
diff --git a/tex/context/base/s-chi-00.tex b/tex/context/base/s-chi-00.tex
index 6d3560d8d..77d7eec2a 100644
--- a/tex/context/base/s-chi-00.tex
+++ b/tex/context/base/s-chi-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-chi-00,
+%D   [      filefile=s-chi-00,
 %D        version=1999.12.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Basic Chinese Style,
@@ -18,36 +18,36 @@
 
 \unprotect
 
-\stelsectiein [\v!sectionlevel-1] [\c!kopconversie=\s!chinese]
-\stelsectiein [\v!sectionlevel-2] [\c!kopconversie=\s!chinese]
-\stelsectiein [\v!sectionlevel-3] [\c!kopconversie=\s!chinese]
+\setupsection [\v!sectionlevel-1] [\c!headconversion=\s!chinese]
+\setupsection [\v!sectionlevel-2] [\c!headconversion=\s!chinese]
+\setupsection [\v!sectionlevel-3] [\c!headconversion=\s!chinese]
 
-\stelsectiein [\v!sectionlevel-2] [\v!bijlage\c!conversie=]
+\setupsection [\v!sectionlevel-2] [\v!appendix\c!conversion=]
 
-\stelkopin [\v!hoofdstuk]       [\c!afstand=1.25em]
-\stelkopin [\v!paragraaf]       [\c!afstand=1.25em]
-\stelkopin [\v!sub\v!paragraaf] [\c!afstand=1.00em]
+\setuphead [\v!chapter]       [\c!distance=1.25em]
+\setuphead [\v!section]       [\c!distance=1.25em]
+\setuphead [\v!sub\v!section] [\c!distance=1.00em]
 
-\stellijstin [\v!hoofdstuk] [\c!koplabel=\v!ja,\c!kopconversie=\v!ja,\c!breedte=5em]
-\stellijstin [\v!paragraaf] [\c!koplabel=\v!ja,\c!kopconversie=\v!ja,\c!breedte=5em]
+\setuplist [\v!chapter] [\c!headlabel=\v!yes,\c!headconversion=\v!yes,\c!width=5em]
+\setuplist [\v!section] [\c!headlabel=\v!yes,\c!headconversion=\v!yes,\c!width=5em]
 
-\setupmarking [\v!hoofdstuk\v!nummer] [\c!koplabel=\v!ja,\c!kopconversie=\v!ja]
-\setupmarking [\v!paragraaf\v!nummer] [\c!koplabel=\v!ja,\c!kopconversie=\v!ja]
+\setupmarking [\v!chapter\v!number] [\c!headlabel=\v!yes,\c!headconversion=\v!yes]
+\setupmarking [\v!section\v!number] [\c!headlabel=\v!yes,\c!headconversion=\v!yes]
 
-\setuplabeltext[cn][\v!sub\v!paragraaf={\symbol[S]\kern.25em}]
-\setuplabeltext[cn][\v!sub\v!sub\v!paragraaf={\symbol[S]\kern.25em}]
-\setuplabeltext[cn][\v!sub\v!sub\v!sub\v!paragraaf={\symbol[S]\kern.25em}]
-\setuplabeltext[cn][\v!sub\v!sub\v!sub\v!sub\v!paragraaf={\symbol[S]\kern.25em}]
+\setuplabeltext[cn][\v!sub\v!section={\symbol[S]\kern.25em}]
+\setuplabeltext[cn][\v!sub\v!sub\v!section={\symbol[S]\kern.25em}]
+\setuplabeltext[cn][\v!sub\v!sub\v!sub\v!section={\symbol[S]\kern.25em}]
+\setuplabeltext[cn][\v!sub\v!sub\v!sub\v!sub\v!section={\symbol[S]\kern.25em}]
 
 % nog taalonafhankelijk maken -> \e!tabel enz
 
-\definereferenceformat [intable]   [\c!label=\v!tabel]
-\definereferenceformat [infigure]  [\c!label=\v!figuur]
-\definereferenceformat [inchapter] [\c!label=\v!hoofdstuk]
-\definereferenceformat [insection] [\c!label=\v!paragraaf]
+\definereferenceformat [intable]   [\c!label=\v!table]
+\definereferenceformat [infigure]  [\c!label=\v!figure]
+\definereferenceformat [inchapter] [\c!label=\v!chapter]
+\definereferenceformat [insection] [\c!label=\v!section]
 
 % important
 
-\setuptyping[\c!tab=\v!nee]
+\setuptyping[\c!tab=\v!no]
 
 \protect \endinput
diff --git a/tex/context/base/s-dtk-01.tex b/tex/context/base/s-dtk-01.tex
deleted file mode 100644
index 6c55b8da5..000000000
--- a/tex/context/base/s-dtk-01.tex
+++ /dev/null
@@ -1,257 +0,0 @@
-%D \module
-%D   [      file=s-dtk-01,
-%D        version=1999.08.15,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=\DTK\ basis stijl,
-%D         author=Hans Hagen \& Taco Hoekwater,
-%D           date=\currentdate,
-%D      copyright=PRAGMA]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D Preliminary. Still dutch and english intermixed.
-
-\unprotect
-
-%D Temp hack.
-
-\let\doverbatimgoodbreak\donothing
-
-%D Fonts.
-
-\definebodyfontenvironment
-  [8pt]
-  [\c!interlinie=9pt,
-   \c!groot=9pt,
-   \c!klein=7pt]
-
-\definebodyfontenvironment
-  [9pt]
-  [\c!interlinie=11pt,
-   \c!groot=10pt,
-   \c!klein=8pt]
-
-\definebodyfontenvironment
-  [10pt]
-  [\c!interlinie=12pt,
-   \c!groot=12pt,
-   \c!klein=8pt]
-
-\definebodyfontenvironment
-  [12pt]
-  [\c!interlinie=14pt,
-   \c!groot=14.4pt,
-   \c!klein=10pt]
-
-\definebodyfontenvironment
-  [14.4pt]
-  [\c!interlinie=18pt,
-   \c!groot=14.4pt,
-   \c!klein=12pt]
-
-\setupbodyfont
-  [10pt,cmx,ams]
-
-%D Color.
-
-\setupcolors
-  [\c!conversie=\v!altijd]
-
-%D Default language.
-
-\mainlanguage[en] \language[en]
-
-%D Paper size and layout. The Dante style depends on the
-%D driver to sort out the margins. Therefore we are not
-%D really typesetting in A5, but on something larger.
-
-\definepapersize
-  [DanteA5]
-  [breedte=486.54pt]
-
-\setuppapersize
-  [DanteA5][A4]
-
-\setuplayout % w=342pt h=484pt
-  [\c!rugwit=1in,
-   \c!kopwit=1in,
-   \c!plaats=\v!enkelzijdig,
-   \c!breedte=342pt,
-   \c!hoogte=548pt,
-   \c!hoofd=17pt,
-   \c!hoofdafstand=17pt,
-   \c!voetafstand=17pt,
-   \c!voet=17pt]
-
-%D Headers and footers.
-
-\setupheader [\c!voor=\vfill,\c!na=]
-\setupfooter [\c!voor=\vfill,\c!na=]
-
-%D Numbering.
-
-\setuppagenumbering
-  [\c!plaats=,
-   \c!variant=\v!dubbelzijdig]
-
-%D Spacing.
-
-\setupwhitespace [\v!halveregel]
-\setupblank      [\v!halveregel]
-
-%D Itemize.
-
-\stelopsommingin [\v!elk] [\c!afstand=0pt,\c!marge=.5em]
-\stelopsommingin [1] [\c!breedte=1.0em,\c!symbool=circle]
-\stelopsommingin [2] [\c!breedte=0.9em,\c!symbool=triangle]
-\stelopsommingin [3] [\c!breedte=0.8em,\c!symbool=diamond]
-\stelopsommingin [4] [\c!breedte=0.7em,\c!symbool=dash]
-
-\stelopsommingin [1] [\v!opelkaar]
-
-%D Verbatim.
-
-\setuptyping [\c!optie=,\c!blanko=halveregel]
-
-%D Footnotes.
-
-\def\VoetNootLijn%
-  {\hrule width 5pc height .4pt}
-
-\setupfootnotes
-  [\c!korps=8pt,
-   \c!lijn=\VoetNootLijn,
-   \c!voor=\vskip24pt,
-   \c!nummercommando=]
-
-\setupfootnotedefinition
-  [\c!plaats=\v!aansluitend,
-   \c!breedte=\v!passend,
-   \c!kopletter=\v!normaal,
-   \c!afstand=.5em]
-
-% Abbreviations and logos.
-
-\usemodule[abr-03]
-
-
-%D Some real macros:
-
-\def\startAbstract%
-  {\dostartbuffer[abstract][startAbstract][stopAbstract]}
-
-%D And some dummies (for \MAPS\ style compatibility):
-
-\def\startKeywords#1\stopKeywords
-  {}
-
-\def\Keywords#1%
-  {}
-
-%D We will pick up some user settings.
-
-\def\DTKTypering[#1]%
-  {\getparameters
-     [DTK]
-     [Jaar=1998,
-      Volume=19,
-      Nummer=3,
-      Pagina=99,
-      Titel=Publish or Perish,
-      Subtitel=,
-      Auteur=D.T.K. Auteur,
-      Adres=PRAGMA Advanced Document Engineering \\
-            Ridderstraat 27 \\ 8061GH Hasselt NL,
-      Email=pragma@wxs.nl,
-      #1]}
-
-\DTKTypering[]
-
-%D Some of those are shown in headers and footers.
-
-\def\DTKFooter%
-  {Die \TeX nische Kom\"odie \DTKVolume/\DTKJaar
-   \space---\space
-   Proceedings of the \DTKJaar\ Euro\TeX\ Meeting}
-
-\setupheader[\c!linkerletter=\ss\sl,\c!rechterletter=\ss]
-\setupfooter[\c!letter={\switchtobodyfont[9pt]\ss\sl}]
-
-\setupheadertexts [\DTKTitel]  [\pagenumber]
-\setupfootertexts [\DTKFooter] []
-
-%D It all starts here:
-
-\def\dostartBijdrage[#1]%
-  {\pagina
-   \DTKTypering[#1]
-   \setupheader[\c!status=\v!leeg]
-   \setuppagenumber[\c!nummer=\DTKPagina]
-   \bgroup
-     \setupwhitespace[\v!geen]
-     \bgroup
-       \switchtobodyfont[14.4pt,ss]
-       \setupalign[\v!rechts]
-       \let\\=\par
-       \DTKTitel\par
-       \doifsomething{\DTKSubtitel}
-         {\bgroup
-          \vskip3pt
-          \switchtobodyfont[12pt,ss]
-          \DTKSubtitel\par
-          \egroup}
-     \egroup
-     \vskip12pt
-     \bgroup
-       \switchtobodyfont[12pt,ss]
-       \def\\{\unskip\space\ignorespaces}
-       \DTKAuteur
-       \par
-     \egroup
-     \vskip12pt
-     \bgroup
-       \switchtobodyfont[9pt]
-       \setupnarrower[\c!voor=,\c!na=]
-       \startsmaller[.05\hsize]
-         \setupwhitespace[\v!halveregel]
-         \haalbuffer[abstract]
-       \stopsmaller
-     \egroup
-     \vskip20pt
-    \egroup}
-
-\def\startBijdrage
-  {\starttekst
-   \dosingleempty\dostartBijdrage}
-
-\def\stopBijdrage
-  {\stoptekst}
-
-%D Sectioning.
-
-\stelkopin
-  [\v!paragraaf]
-  [\c!letter={\ss\bfa},
-   \c!uitlijnen=\v!rechts,
-   \c!voor={\blanko[\v!regel,\v!halveregel]},
-   \c!na={\blanko[\v!halveregel]}]
-
-\stelkopin
-  [\v!sub\v!paragraaf]
-  [\c!letter=\ss,
-   \c!uitlijnen=\v!rechts,
-   \c!voor={\blanko[\v!halveregel]},
-   \c!na={\blanko[\v!halveregel]}]
-
-\stelkopin
-  [\v!sub\v!sub\v!paragraaf]
-  [\c!letter=\ss,
-   \c!variant=\v!tekst,
-   \c!voor=,
-   \c!na=]
-
-%D Done.
-
-\protect \endinput
diff --git a/tex/context/base/s-faq-00.tex b/tex/context/base/s-faq-00.tex
index db03f666f..5d0ce0f76 100644
--- a/tex/context/base/s-faq-00.tex
+++ b/tex/context/base/s-faq-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-faq-00,
+%D   [      filefile=s-faq-00,
 %D        version=1997.21.08,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=FAQ Common Macros,
@@ -54,7 +54,7 @@
 \def\IndexOfFAQ  {}
 
 \def\FrequentlyAskedQuestion#1#2%
-  {\pagina
+  {\page
    \doglobal\increment\CurrentNOfFAQ
    \pagereference[faq:\CurrentNOfFAQ]
    \gdef\IndexOfFAQ{#1}
diff --git a/tex/context/base/s-faq-01.tex b/tex/context/base/s-faq-01.tex
index 8c116e0f7..724d1679d 100644
--- a/tex/context/base/s-faq-01.tex
+++ b/tex/context/base/s-faq-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-faq-01,
+%D   [      filefile=s-faq-01,
 %D        version=1997.21.08,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=FAQ Interactive Version,
diff --git a/tex/context/base/s-faq-02.tex b/tex/context/base/s-faq-02.tex
index 02287bde4..2eae953c7 100644
--- a/tex/context/base/s-faq-02.tex
+++ b/tex/context/base/s-faq-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-faq-02,
+%D   [      filefile=s-faq-02,
 %D        version=1997.21.08,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=FAQ Paper Version,
diff --git a/tex/context/base/s-faq-03.tex b/tex/context/base/s-faq-03.tex
index 4f556f713..4100f11b7 100644
--- a/tex/context/base/s-faq-03.tex
+++ b/tex/context/base/s-faq-03.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-faq-03,
+%D   [      filefile=s-faq-03,
 %D        version=1997.21.08,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=FAQ General Framework,
diff --git a/tex/context/base/s-fnt-01.tex b/tex/context/base/s-fnt-01.tex
index ad4c9f8cb..8841e3e28 100644
--- a/tex/context/base/s-fnt-01.tex
+++ b/tex/context/base/s-fnt-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-tnf-01,
+%D   [      filefile=s-tnf-01,
 %D        version=2001.08.22,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Font Environment 1,
diff --git a/tex/context/base/s-grk-00.tex b/tex/context/base/s-grk-00.tex
new file mode 100644
index 000000000..0ff9f0663
--- /dev/null
+++ b/tex/context/base/s-grk-00.tex
@@ -0,0 +1,77 @@
+%D \module
+%D   [      filefile=s-grk-00,
+%D        version=2004.08.23,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=CB Greek Support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D    suggestions=Giuseppe Bilotta,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\usetypescriptfile[type-cbg]
+
+\usetypescript [all] [cbgreek]
+
+\startsetups [cbgreek]
+
+  \catcode`~=\other
+  \catcode`|=\other
+
+  \language[greek]
+  \switchtobodyfont[cbgreek]
+
+\stopsetups
+
+\definestartstop
+  [greek]
+  [commands=\directsetup{cbgreek}]
+
+\doifnotmode{demo}{\endinput}
+
+% The following sample file was submitted to the \CONTEXT\
+% mailing list by Giuseppe Bilotta, along with the right
+% typescripts.
+
+% already loaded: \usemodule[greek]
+
+\mainlanguage[english]
+
+\starttext
+
+We can easily use plain English for normal text, and then switch
+to greek when we want; as a first try we type the lower and
+upper case 26 letters of the latin alphabet and see how they come
+out in greek:
+
+\startgreek
+a b c d e f g h i j k l m n o p q r s t u v w x y z \par
+A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+\stopgreek
+
+As it can be observed, some uppercase letters have strange
+outcomes; also, j gives \greek{j} and c gives the
+end-of-word sigma \greek{c}; interestingly, s gives either the
+normal sigma or the end-of-word one, depending on whether it's at
+the end of the word or not: \greek{satrapws}.
+
+Of course we can use the various diacritical signs: accents
+(\greek{`a, 'a, ~a}), breathings (\greek{<r, >w, a"}) and
+subscribed iotas (\greek{a|, h|, w|}) (these last are pretty ugly in my
+opinion); observe how they automatically get the correct position
+with uppercase letters: (\greek{`A, 'A, ~A, <A, >A, A|}).
+
+Can the thing be used for serious work?
+
+\startgreek
+>>'Andra moi >'ennepe, Mo~usa, pol'utropon, >'os m'ala poll`a\hfill\break
+pl'agqjh, >epe`i Tro'ihs <er`on ptol'iejron >'eperse;\hfill\break
+poll~wn d" >anjr'wpwn >'iden >'astea ka`i n'oon >'egnw,\hfill\break
+poll`a d" <'o g" >en p'ontw| p'ajen >'algea <`on kat`a jum'on,\hfill\break
+>>arn'umenos <'hn te yuq`hn ka`i n'oston <eta'irwn.
+\stopgreek
+
+\stoptext
diff --git a/tex/context/base/s-mag-01.tex b/tex/context/base/s-mag-01.tex
index 6e2471e99..230038ab4 100644
--- a/tex/context/base/s-mag-01.tex
+++ b/tex/context/base/s-mag-01.tex
@@ -1,7 +1,7 @@
 % interface=english
 
 %D \module
-%D   [      file=s-mag-01,
+%D   [      filefile=s-mag-01,
 %D        version=2002.12.14,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=\CONTEXT\ Magazine Base Style,
diff --git a/tex/context/base/s-map-01.tex b/tex/context/base/s-map-01.tex
deleted file mode 100644
index f64e53546..000000000
--- a/tex/context/base/s-map-01.tex
+++ /dev/null
@@ -1,635 +0,0 @@
-% This is an old version, I still have to patch the latest
-% changes into this file.
-
-%D \module
-%D   [       file=s-map-01,
-%D        version=1998.05.05,
-%D          title=\CONTEXT\ Style File,
-%D       subtitle=\MAPS\ basis stijl,
-%D         author={Taco Hoekwater, Siep Kroonenberg \& Hans Hagen},
-%D           date=\currentdate,
-%D      copyright={NTG / MAPS}]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-%D The \MAPS\ layout is designed by Taco Hoekwater and Siep
-%D Kroonenberg, who on behalf of the \MAPS/\NTG\ own the
-%D copyright to the design.
-
-%D In deze file wordt zowel de dubbelzijdig als de enkelzijdige
-%D layout van de \MAPS\ gedefinieerd. Naast deze file
-%D zijn|/|komen wat aanvullende stijlen voor specifieke
-%D doeleinden beschikbaar.
-
-%D Normaal gesproken wordt met \type{\stelinterliniein} de
-%D interlinie voor het gehele document ingesteld op een
-%D zodanige wijze dat deze voor elk korps vergelijkbaar is. In
-%D de \MAPS\ gebruiken we echter per korps een verschillende
-%D specificatie. De daadwerkelijke definities gebeuren in de
-%D file \type{font-map.tex}.
-
-\unprotect
-
-\definebodyfontenvironment
-  [7pt]
-  [\c!interlinie=8pt,
-   \c!groot=8pt,
-   \c!klein=6pt]
-
-\definebodyfontenvironment
-  [8pt]
-  [\c!interlinie=9pt,
-   \c!groot=9pt,
-   \c!klein=7pt]
-
-\definebodyfontenvironment
-  [9pt]
-  [\c!interlinie=11pt,
-   \c!groot=10pt,
-   \c!klein=8pt]
-
-\definebodyfontenvironment
-  [22pt]
-  [\c!interlinie=22pt,
-   \c!groot=22pt,
-   \c!klein=17pt,
-   \c!x=17pt]
-
-%D Met de instellingen \type{groot} en \type{klein} leggen we
-%D vast naar welk korps wordt overgegaan als we aan
-%D \type{\switchnaarkorps} de trefwoorden \type{klein} of
-%D \type{groot} meegeven. Met \type{x} geven we de maat aan van
-%D de pseudo klein||kapitalen. De \MAPS\ wordt gezet in 9pt.
-
-%\setupbodyfont[map,9pt]
-%
-%\startnotmode[localfonts]
-%
-%  \setupbodyfont[mty]
-%
-%\stopnotmode
-
-%D We gebruiken echte small caps:
-
-\stelsorterenin
-  [logo]
-  [\c!letter=\v!smallcaps]
-
-\setupcapitals
-  [\c!titel=\v!nee]
-
-%D De \MAPS\ heeft de breedte van een A4||tje maar is iets
-%D minder hoog. We definieren daarom een wat afwijkend
-%D papierformaat en projecteren dat op A4.
-
-\definepapersize
-  [maps]
-  [\c!breedte=21cm,
-   \c!hoogte=26.4cm]
-
-\setuppapersize
-  [maps]
-  [A4]
-
-%D Artikelen in de \MAPS\ worden breed danwel in twee kolommen
-%D gezet. Vooralsnog beperken we de definitie van de layout tot
-%D de een||koloms opmaak.
-
-\setuplayout
-  [\c!breedte=28pc,
-   \c!hoogte=\v!midden,
-   \c!marge=9pc,
-   \c!margeafstand=1pc,
-   \c!rugwit=1in,
-   \c!kopwit=1.8cm,
-   \c!regels=53,
-   \c!hoofd=35pt,
-   \c!voet=35pt]
-
-\setupcolumns
-  [\c!afstand=1pc]
-
-%D Later zullen we zonodig nog instellen dat de \MAPS\ op een
-%D grid wordt gezet. Het zetten op een grid is voor \TEX\ niet
-%D triviaal, en de ondersteuning in \CONTEXT\ is dan ook
-%D enigzins experimenteel. De \MAPS\ is in die zin een soort
-%D continue testcase.
-
-%D De \MAPS\ wordt vanzelfsprekend dubbelzijdig gezet. Verderop
-%D gaan het paginanummer expliciet plaatsen, vandaar dat we
-%D hier de plaats niet specificeren.
-
-\setuppagenumbering
-  [\c!plaats=,
-   \c!variant=\v!dubbelzijdig]
-
-%D De hoofd- en voetregels worden gezet in een sans serif.
-%D Het instellen op layout niveau is efficienter dan op elk
-%D regel niveau.
-
-\setuplayout
-  [\c!letter=\ss]
-
-%D In principe hebben we 4 verschillende soorten witruimte,
-%D afhankelijk van het al dan niet op grid en/of in
-%D kolommen zetten. We definieren daarom drie soorten wit:
-
-\definieerblanko [mapsvoor]   [groot]
-\definieerblanko [mapstussen] [groot]
-\definieerblanko [mapsna]     [mapsvoor]
-
-%D Waar nodig springen we in. We willen echter niet inspringen
-%D na een witruimte, vandaar het trefwoord \type{volgende}.
-
-\setupindenting
-  [\v!volgende,9.5pt]
-
-%D Hoewel niet strikt noodzakelijk, definities en dergelijke
-%D worden namelijk omgeven door witruimte, stellen we ook hier
-%D in dat we na zo'n definitie niet willen inspringen.
-
-\steldoordefinierenin
-  [\c!springvolgendein=\v!nee]
-
-\steldoornummerenin
-  [\c!springvolgendein=\v!nee]
-
-%D We lijnen netjes uit, behalve in opsommingen, waar we
-%D rechts raffelen. Ook hier springen we niet in na een
-%D opsomming.
-
-\stelopsommingin
-  [\v!elk]
-  [\c!springvolgendein=\v!nee,
-   \c!uitlijnen=\v!rechts]
-
-%D Nu we toch met opsommingen bezig zijn, introduceren we
-%D meteen een nieuw symbool, een vierkantje. We tekenen dit
-%D symbool met behulp van de macros van de visuele debugger.
-
-\def\MapsSymbool%
-  {\hbox
-     {\boxrulewidth=.4pt
-      \raise.2ex\ruledvbox
-        {\phantom{\vrule width .75ex height .75ex}}}}
-
-%D Vervolgens definieren we dit stukje zetwerk als symbool:
-
-\definesymbol
-  [MapsSymbool]
-  [\MapsSymbool]
-
-%D en koppelen het aan de opsommingen op het eerste niveau.
-
-\stelopsommingin
-  [1]
-  [\c!symbool=MapsSymbool]
-
-%D Ook passen we de breedte aan het inspringen aan en
-%D plaatsen we de verschillende items op elkaar. De afstand
-%D speelt vooral een rol als we ruimer willen zetten.
-
-\stelopsommingin
-  [\v!elk]
-  [\c!breedte=9.5pt,
-   \c!afstand=0pt]
-
-\stelopsommingin
-  [1]
-  [\v!opelkaar]
-
-%M % Nodig voor documenteren:
-%M
-%M \unprotect
-%M
-%M \doordefinieren
-%M   [MapsBegrip]
-%M   [\c!plaats=\v!hangend,
-%M    \c!afstand=.75em,
-%M    \c!marge=\v!standaard]
-%M
-%M \protect
-
-%D Hoewel auteurs zelf nieuwe begrippen en dergelijke kunnen
-%D definieren, introduceren we een klasse standaard begrippen,
-%D namelijk \type{\MapsBegrip}. Men kan dus een begrip als
-%D volgt definieren:
-%D
-%D \startbuffer
-%D \MapsBegrip {MAPS} Het periodiek van de \NTG\ dat twee maal
-%D per jaar verschijnt.
-%D \stopbuffer
-%D
-%D \typebuffer
-%D
-%D en krijgt dan:
-%D
-%D \haalbuffer
-
-\doordefinieren
-  [MapsBegrip]
-  [\c!plaats=\v!hangend,
-   \c!afstand=.75em,
-   \c!marge=\v!standaard]
-
-%D Om ruimte te sparen, omringen we verbatim niet met hele lege
-%D regels, maar met halve.
-
-\setuptyping
-  [\c!optie=\v!kleur,
-   \c!blanko=mapstussen,
-   \c!voor={\blanko[mapsvoor]},
-   \c!na={\blanko[mapsna]}]
-
-%D Speciaal voor erg brede verbatim teksten, definieren we
-%D een brede variant. Deze steekt alleen op de linkerbladzijden
-%D in de marge.
-
-\definetyping
-  [breedtypen]
-
-\setuptyping
-  [breedtypen]
-  [\c!onevenmarge=-6pc]
-
-%D En dan nu wat echte macro definities. Samenvattingen en
-%D trefwoorden worden links danwel rechts uitgelijnd gezet.
-%D Omdat sommige artikelen ook nog andere introducerende toeters
-%D en bellen hebben, definieren we een algemene macro.
-
-\def\startWhatever#1%
-  {\witruimte
-   \snaptogrid\vbox\bgroup
-     \forgetall
-     \setupalign[\v!rechts]
-     \parfillskip 0pt plus 1 fill
-     \setuptolerance[\v!zeersoepel]
-     \setupindenting[\v!geen]
-     {\ssbf#1}\par
-     \switchtobodyfont[8pt]
-     \ss\tf
-     \ignorespaces}
-
-\def\stopWhatever%
-  {\par
-   \egroup
-   \blanko[\v!regel]}
-
-%D De macro \type{\snaptogrid} is hier essentieel en zorgt
-%D ervoor dat de tekst op het grid wordt gezet, ondanks de
-%D afwijkende spatiering.
-
-\def\Whatever#1#2%
-  {\startWhatever{#1}#2\stopWhatever}
-
-\def\defineWhatever#1#2%
-  {\setvalue{\e!start#1}{\startWhatever{#2}}
-   \setvalue {\e!stop#1}{\stopWhatever}
-   \setvalue        {#1}{\Whatever{#2}}}
-
-\defineWhatever{Abstract}{abstract}
-\defineWhatever{Keywords}{keywords}
-
-%D Een samenvatting ziet er nu als volgt uit:
-%D
-%D \starttypen
-%D \startAbstract ..... \stopAbstract
-%D \stoptypen
-%D
-%D of korter:
-%D
-%D \starttypen
-%D \Abstract{...}
-%D \stoptypen
-%D
-%D Ook hebben we de beschikking over:
-%D
-%D \starttypen
-%D \startWhatever{....} ..... \stopWhatever
-%D \stoptypen
-
-%D We zullen de artikelen per stuk verwerken. Elk artikel heeft
-%D z'n eigen kenmerken, die, zoals we later zullen zien, worden
-%D ingesteld aan heb begin van een artikel:
-%D
-%D \starttypen
-%D \startBijdrage[instellingen]
-%D .....
-%D .....
-%D \stopBijdrage
-%D \stoptypen
-%D
-%D Hieronder is te zien wat de standaard instellingen zijn:
-
-\def\MapsTypering[#1]%
-  {\getparameters
-     [Maps]
-     [Jaar=1999,
-      Periode=Voorjaar,
-      Categorie=Bijlage,
-      Nummer=F,
-      Pagina=43,
-      Titel=Publish or Perish,
-      Subtitel=,
-      Auteur=M.A.P.S. Auteur,
-      Adres=,
-      Email=maps@ntg.nl,
-      Kolommen=\v!nee,
-      Grid=\v!ja,
-      #1]}
-
-%D In het adres en bij de auteur kan men \type{\\} gebruiken
-%D om naar een nieuwe regel over te gaan. Voor de zekerheid
-%D initialiseren we deze instellingen met:
-
-\MapsTypering[Categorie=Voorbeeld]
-
-%D De instellingen zijn beschikbaar als \type{\MapsVariabele}.
-%D In de onderstaande definities van de hoofd- en voetregels
-%D zien we de instellingen terug (de prefix \type{\unexpanded}
-%D zorgt ervoor dat we straffeloos kunnen testen):
-
-\unexpanded\def\LinkerKolomTekst#1%
-  {\rlap{\hbox to 10pc{\hfill#1}}}
-
-\unexpanded\def\RechterKolomTekst#1%
-  {\llap{\hbox to 10pc{#1\hfill}}}
-
-\edef\AuteurScheider{, }
-
-\unexpanded\def\AuteurNamen#1%
-  {{\let\\=\AuteurScheider#1}}
-
-\setupheadertexts
-  [\MapsTitel]
-  [\LinkerKolomTekst{\MapsCategorie\ \MapsNummer}]
-  [\RechterKolomTekst{\MapsCategorie\ \MapsNummer}]
-  [\AuteurNamen{\MapsAuteur}]
-
-\setupfootertexts
-  [\MapsPeriode\ \MapsJaar]
-  [\LinkerKolomTekst{\pagenumber}]
-  [\RechterKolomTekst{\pagenumber}]
-  [MAPS]
-
-%D Voetnoten worden onderaan de bladzijde gezet, of, in geval
-%D van kolommen, in de tweede kolom. We definieren een wat
-%D afwijkende lijn als scheider:
-
-\def\VoetNootLijn%
-  {\strut\vrule height .4pt depth 0pt width 9.25pc
-   \vskip0pt}
-
-\setupfootnotes
-  [\c!korps=8pt,
-   \c!plaats=\v!kolommen,
-   \c!lijn=\VoetNootLijn,
-   \c!voor=\blanko,
-   \c!letter=\v!schuin,
-   \c!nummercommando=]
-
-%D De voetnoot zelf stellen we in met:
-
-\setupfootnotedefinition
-  [\c!plaats=\v!aansluitend,
-   \c!breedte=\v!passend,
-   \c!kopletter=\v!normaal,
-   \c!afstand=.5em]
-
-%D We komen nu aan de wat lastiger macros. Het eerste dat een
-%D bijdrage definitie doet, is nagaan of we in kolommen zetten.
-%D Afhankelijk van de situatie, laden we wat aanvullende
-%D definities. De titelpgina heeft geen hoofdregels en de
-%D titel wordt automatisch gezet.
-
-\def\Bericht{Bericht}
-
-\newif\ifMapsInKolommen
-
-\def\dostartBijdrage[#1]%
-  {\pagina
-   \MapsTypering[#1]
-   \doifelse{\MapsKolommen}{\v!nee}
-     {\MapsInKolommenfalse}
-     {\MapsInKolommentrue}
-   \ifMapsInKolommen
-     \haalbuffer[s-maps-1] % see later on
-   \fi
-   \setupheader[\c!status=\v!leeg]
-   \setuppagenumber[\c!nummer=\MapsPagina]
-   \setuplayout[\c!grid=\MapsGrid]
-   \ifgridsnapping                           % nog controleren
-     \setupblank[\v!regel]
-     \definieerblanko[mapsvoor][\v!halveregel]
-     \definieerblanko[mapstussen][\v!regel]
-   \else
-     \setupblank[\v!halveregel]
-     \definieerblanko[\v!middel][\v!halveregel]
-     \definieerblanko[mapsvoor][\v!halveregel]
-     \definieerblanko[mapstussen][\v!halveregel]
-   \fi
-   \snaptogrid\vbox
-     \bgroup
-       \switchtobodyfont[ss,22pt]%\ss
-       \bgroup
-         \topskip 0pt
-         \forgetall
-         \ifMapsInKolommen \setupalign[\v!links] \fi
-         \noindent\tf\MapsAffiliatieA
-         \ifx\MapsCategorie\Bericht
-            ~\strut
-         \else
-            \MapsCategorie~\MapsNummer
-         \fi
-         \par \kern -.5pt
-       \egroup
-       \bgroup
-         \forgetall
-         \kern 7.5pt
-         \ifMapsInKolommen
-           \setupalign[\v!links]
-         \else
-           \setupalign[\v!rechts]
-         \fi
-         {\bf\MapsTitel\par}
-         {\bfx\MapsSubtitel\par}
-         \blanko[\v!regel]
-         \kern 3.5pt
-       \egroup
-     \egroup
-   \ifMapsInKolommen\startcolumns\fi
-   \MapsAffiliatieB}
-
-\def\startBijdrage%
-  {\starttekst
-   \dosingleempty\dostartBijdrage}
-
-\def\stopBijdrage%
-  {\ifMapsInKolommen\stopcolumns\fi
-   \stoptekst}
-
-%D De affiliatie wordt in de marge gezet. De wat gecompliceerde
-%D definitie zorgt er voor dat de bovenkant van de eerste
-%D regels uitlijnen. Met \type{\getpagestatus} kunnen we
-%D vaststellen of we op een rechterbladzijde zitten.
-
-\unexpanded\def\MapsAffiliatieA%
-  {\ifMapsInKolommen \else
-     \snaptogrid\vbox\bgroup
-     \setbox0=\hbox{X}%
-     \dimen0=\ht0
-     \switchtobodyfont[9pt,\v!reset]%
-     \setbox0=\hbox{X}%
-     \advance\dimen0 by -\ht0
-     \getpagestatus
-     \ifodd\MapsPagina\relax \rightpagetrue \fi
-     \setbox0=\vtop
-       {\hsize\margebreedte
-        \forgetall
-        \let\\=\par
-        \ifrightpage\raggedright\else\raggedleft\fi
-        \parfillskip 0pt plus \margebreedte
-        \strut\MapsAuteur\\
-        \MapsAdres\\ % kan leeg zijn
-        \strut\tttf\MapsEmail}%
-     \ht0=\ht\strutbox
-     \dp0=\dp\strutbox
-     \ifrightpage
-       \rlap{\kern\zetbreedte\kern\margeafstand\raise\dimen0\box0}%
-     \else
-       \llap{\raise\dimen0\box0\kern\margeafstand}%
-     \fi
-     \global\let\Affiliatie=\relax
-     \egroup
-   \fi}
-
-\unexpanded\def\MapsAffiliatieB%
-  {\ifMapsInKolommen
-     \snaptogrid\vbox\bgroup
-     \forgetall
-     \ss
-     \let\\=\par
-     \strut\MapsAuteur\\
-     \MapsAdres\\ % kan leeg zijn
-     \strut\tttf\MapsEmail\\
-     \egroup
-   \fi}
-
-%D De verschillende koppen worden zo efficient mogelijk gezet.
-%D Let ook hier weer op de halve regels, waardoor gridsnapping
-%D eenvoudiger is.
-
-\stelkopin
-  [\v!paragraaf]
-  [\c!letter=\bfa,
-   \c!voor={\blanko[\v!halveregel]},
-   \c!na={\blanko[\v!halveregel]}]
-
-\stelkopin
-  [\v!sub\v!paragraaf]
-  [\c!letter=\bf,
-   \c!voor=\blanko,
-   \c!na=]
-
-\stelkopin
-  [\v!sub\v!sub\v!paragraaf]
-  [\c!letter=\bf,
-   \c!variant=\v!tekst,
-   \c!voor=\blanko,
-   \c!na=]
-
-%D De plaats van de figuren en het lettertype waarin de
-%D bijschriften worden gezet stellen we in met:
-
-\stelplaatsblokkenin
-  [\c!plaats=\v!links]
-
-\stelblokkopjesin
-  [\c!letter=\sstf,
-   \c!tussen=]
-
-%D Gezien het brede karakter van de \MAPS\ gebruiken we andere
-%D waarden voor links geraffeld uitlijnen. The low level macro
-%D used here is subjected to changes!
-
-\def\raggedleft%
-  {\setraggedness\leftraggedness
-   \setraggedskips{1}{1fill}{0em}{.3333em}{.5em}{1fil}{\parindent}}
-
-%D Standaard gebruikt \CONTEXT\ kleur bij pretty verbatim
-%D printing. In the \MAPS\ gebruiken we echter fonts:
-
-\def\beginofpretty[#1]%
-  {\bgroup
-   \def\COMMONprettyone  {\ttsl}%
-   \def\COMMONprettytwo  {\ttbf}%
-   \def\COMMONprettythree{}%
-   \def\COMMONprettyfour {}%
-   \getvalue{COMMON#1}}
-
-\def\endofpretty%
-  {\egroup}
-
-%D We zijn (heel) wat toleranter in het uitlijnen:
-
-\steltolerantiein
-  [\v!zeersoepel]
-
-%D We misbruiken het buffer mechanisme om enkele eerder
-%D gedefinieerde instellingen te veranderen in geval van zetten
-%D in kolommen.
-
-\startbuffer[s-maps-1]
-
-%D In kolom||mode gebruiken we geen marge en hebben dus wat
-%D meer breedte ter beschikking.
-
-\setuplayout
-  [\c!breedte=38pc]
-
-\setupheadertexts
-  [\MapsTitel]
-  [\MapsCategorie\ \MapsNummer]
-  [\MapsCategorie\ \MapsNummer]
-  [\AuteurNamen{\MapsAuteur}]
-
-\setupfootertexts
-  [\MapsPeriode\ \MapsJaar]
-  [\pagenumber]
-  [\pagenumber]
-  [MAPS]
-
-%D In kolom||mode plaatsen we de inleidingen rechts met een
-%D raffelige linkerkantlijn.
-
-\def\startWhatever#1%
-  {\witruimte
-   \snaptogrid\vbox\bgroup
-   \forgetall
-   \setupalign[\v!links]
-   \steltolerantiein[\v!zeersoepel]
-   \setupindenting[\v!geen]
-   \switchtobodyfont[8pt]
-   \noindent{\ssbf#1}\par
-   \ss\tf
-   \ignorespaces}
-
-\def\stopWhatever
-  {\par
-   \egroup
-   \verticalstrut
-   \noindentation}
-
-%D Tot zover de twee||koloms instelingen.
-
-\stopbuffer
-
-%D Enkele \LATEX\ conversie macro's:
-
-\let\verb=\type
-
-\def\mailadres#1{{\tt#1}}
-
-\endinput
diff --git a/tex/context/base/s-mod-00.tex b/tex/context/base/s-mod-00.tex
index fbfd93d27..d8175d3b3 100644
--- a/tex/context/base/s-mod-00.tex
+++ b/tex/context/base/s-mod-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-mod-00,
+%D   [      filefile=s-mod-00,
 %D        version=very-old,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Documentation Base Environment,
@@ -36,11 +36,11 @@
 
 % nog eens \interface \\ \\ verder doorvoeren
 
-\def\resetmodule%
+\def\resetmodule
   {\getrawparameters
      [Module]
      [       file=\jobname,
-          version={\currentdate[\v!jaar,{.},\v!maand,{.},\v!dag]},
+          version={\currentdate[\v!year,{.},\v!month,{.},\v!day]},
            system=\CONTEXT,
             title=,
          subtitle=,
@@ -56,7 +56,7 @@
    \resetmodule
    \getrawparameters[Module][type=tex,#1]}
 
-\def\startmodule%
+\def\startmodule
   {\dosingleempty\dostartmodule}
 
 \def\complexmodule[#1]%
@@ -65,13 +65,13 @@
    \stopglobal  % i.v.m. \bgroup in \startdocumentation
    \moduletitel}
 
-\def\stopmodule%
-  {\pagina
-   \plaatsregister
+\def\stopmodule
+  {\page
+   \placeregister
      [\v!index]
-     [\c!balanceren=\v!ja,
-      \c!aanduiding=\v!nee,
-      \c!criterium=\v!tekst]}
+     [\c!balance=\v!yes,
+      \c!indicator=\v!no,
+      \c!criterium=\v!text]}
 
 \def\simplemodule#1%
   {\type{#1}}
@@ -146,22 +146,22 @@
 
 \defineframed
   [TitleFrame]
-  [\c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=wit,
-   \c!uitlijnen=\v!rechts,
+  [\c!background=\v!color,
+   \c!backgroundcolor=wit,
+   \c!align=\v!right,
    \c!offset=12pt,
-   \c!strut=\v!nee,
-   \c!kader=\v!uit,
-   \c!onder=]
+   \c!strut=\v!no,
+   \c!frame=\v!off,
+   \c!bottom=]
 
 \definelayout
   [titlepage]
-  [\c!rugwit=0pt,
-   \c!kopwit=0pt,
-   \c!hoofd=0pt,
-   \c!voet=0pt,
-   \c!hoogte=\v!midden,
-   \c!breedte=\v!midden]
+  [\c!backspace=0pt,
+   \c!topspace=0pt,
+   \c!header=0pt,
+   \c!footer=0pt,
+   \c!height=\v!middle,
+   \c!width=\v!middle]
 
 \def\moduletitel%
   {\setuplayout[titlepage]
@@ -172,10 +172,10 @@
        \edef\ModuleNumber{0\ModuleNumber}
      \fi\fi
      \setupbackgrounds
-       [\v!pagina]
-       [\c!achtergrond=titelpagina]
+       [\v!page]
+       [\c!background=titelpagina]
    \fi
-   \startmakeup[\v!standaard][\c!hoofdstatus=\v!geen,\c!voetstatus=\v!geen]
+   \startmakeup[\v!standard][\c!headerstate=\v!none,\c!footerstate=\v!none]
      \switchtobodyfont[14.4pt,ss]
      \bgroup
        \def\CONTEXT {Con\kern-.15em\TeX t}
@@ -191,7 +191,7 @@
        \hfill
          {\bf\setstrut
           \TitleFrame
-            {\insidefloattrue\setuptabulate[\c!voor=,\c!na=]%
+            {\insidefloattrue\setuptabulate[\c!before=,\c!after=]%
              \starttemp
                \doifsomething{\Moduletitle}
                  {\NC title \EQ \Moduletitle \NC\NR}%
@@ -207,14 +207,14 @@
    \stopmakeup
    \ifx\ModuleNumber\undefined \else
      \setupbackgrounds
-       [\v!pagina]
-       [\c!achtergrond=]
+       [\v!page]
+       [\c!background=]
    \fi
    \setuplayout}
 
 \let\stopdocumentation=\relax
 
-\def\startdocumentation%
+\def\startdocumentation
   {\bgroup
    \doglobal\newcounter\NOfMarginLines
    \def\stopdocumentation{\par\egroup}}
@@ -226,7 +226,7 @@
 
 \gdef\CompressDefinitions%
   {\ifcompressdefinitions
-     \switchtobodyfont[\v!klein]%
+     \switchtobodyfont[\v!small]%
    \fi}
 
 \startnotmode[nocode]
@@ -236,9 +236,9 @@
 
   \setuptyping
     [definition]
-    [\c!voor={\pagina[\v!voorkeur]}\blanko\PresetParagraphNumber\CompressDefinitions,
-     \c!na=\ResetParagraphNumber\blanko,
-     \c!optie=\Moduletype]
+    [\c!before={\page[\v!preference]}\blank\PresetParagraphNumber\CompressDefinitions,
+     \c!after=\ResetParagraphNumber\blank,
+     \c!option=\Moduletype]
 
 \stopnotmode
 
@@ -250,22 +250,22 @@
 
 \stopmode
 
-\definetyping [PL]  [\c!optie=PL, \c!marge=\v!standaard]
-\definetyping [JV]  [\c!optie=JV, \c!marge=\v!standaard]
-\definetyping [MP]  [\c!optie=MP, \c!marge=\v!standaard]
-\definetyping [TEX] [\c!optie=TEX,\c!marge=\v!standaard]
+\definetyping [PL]  [\c!option=PL, \c!margin=\v!standard]
+\definetyping [JV]  [\c!option=JV, \c!margin=\v!standard]
+\definetyping [MP]  [\c!option=MP, \c!margin=\v!standard]
+\definetyping [TEX] [\c!option=TEX,\c!margin=\v!standard]
 
-\setuptyping [\v!typen]   [\c!marge=\v!standaard]
-\setuptyping [\v!file]    [\c!marge=\v!standaard]
-\setuptyping [definition] [\c!marge=0pt]
+\setuptyping [\v!typing]   [\c!margin=\v!standard]
+\setuptyping [\v!file]    [\c!margin=\v!standard]
+\setuptyping [definition] [\c!margin=0pt]
 
 \newcounter\NOfMarginLines
 \newcounter\ParagraphNumber
 
-\def\ResetParagraphNumber%
+\def\ResetParagraphNumber
   {\egroup}
 
-\def\PresetParagraphNumber%
+\def\PresetParagraphNumber
   {\bgroup
    \xdef\NOfTextLines%
      {\the\prevgraf}%
@@ -273,7 +273,7 @@
    \doglobal\increment\ParagraphNumber
    \message{.}%
    \gdef\ShowParagraphNumber%
-     {\llap{\slx\ParagraphNumber\hskip\linkermargeafstand}}%
+     {\llap{\slx\ParagraphNumber\hskip\leftmargindistance}}%
    \gdef\ShowParagraphNumberA%
      {\ifnum\NOfMarginLines>\NOfTextLines\relax
         \doglobal\increment\NOfTextLines
@@ -303,15 +303,15 @@
          \else
            \index{#2{##1}}%
          \fi
-         #2{\doboundtext{##1}{\linkermargebreedte}{..}}}%
+         #2{\doboundtext{##1}{\leftmarginwidth}{..}}}%
        \doglobal\increment\NOfMarginLines
        \endgraf}%
    \processcommalist[#1]\docommando}
 
 \def\margeaanduidingen#1[#2]%
   {\def\domargeaanduidingen##1##2%
-     {\margetitel[#2]%
-        {\switchtobodyfont[\v!klein]%
+     {\margintitle[#2]%
+        {\switchtobodyfont[\v!small]%
          \doglobal\newcounter\NOfMarginLines
          \dodomargeaanduidingen[##1]#1%
          \scratchcounter=\NOfMarginLines
@@ -325,7 +325,7 @@
 \def\complexmacros{\margeaanduidingen\tex  }
 \def\complexextras{\margeaanduidingen\relax}
 
-\def\complexelements%
+\def\complexelements
   {\margeaanduidingen\someelement}
 
 \def\someelement#1{\type{<#1>}}
@@ -340,7 +340,7 @@
   {\bgroup
    \processXMLbuffer
    \typebuffer
-   \setupcolors[\c!status=\v!stop]
+   \setupcolors[\c!state=\v!stop]
    \showXSDcomponent[#1][#2]
    \egroup}
 
@@ -350,65 +350,63 @@
 
 % weg ermee
 
-\definieeralineas [interface] [\c!n=2]
-\stelalineasin    [interface] [1] [\c!breedte=4cm]
+\defineparagraphs [interface] [\c!n=2]
+\setupparagraphs  [interface] [1] [\c!width=4cm]
 
-\def\startvoorbeeld{\par\startsmaller}
-\def\stopvoorbeeld {\stopsmaller}
+\def\startvoorbeeld{\par\startnarrower}
+\def\stopvoorbeeld {\stopnarrower}
 
-\gdef\VisualizeLastSpace%
-  {\ifdim\lastskip>0pt\unskip\tttf\char32\fi}
-\gdef\ShowHeadText#1%
-  {\tttf#1\VL\headtext{#1}\VisualizeLastSpace}%
-\gdef\ShowLabelText#1%
-  {\tttf#1\VL\labeltext{#1}\VisualizeLastSpace}
+\gdef\VisualizeLastSpace{\ifdim\lastskip>0pt\unskip\tttf\char32\fi}
+
+\gdef\ShowHeadText #1{\tttf#1\VL\headtext {#1}\VisualizeLastSpace}
+\gdef\ShowLabelText#1{\tttf#1\VL\labeltext{#1}\VisualizeLastSpace}
 
 \startbuffer[lang-a]
-\starttabel[|l|l|]
+\starttable[|l|l|]
   \HL
   \VL \bf head key  \VL \bf current value \VL\SR
   \HL
-  \VL \ShowHeadText \v!afkortingen        \VL\FR
-  \VL \ShowHeadText \v!eenheden           \VL\MR
-  \VL \ShowHeadText \v!figuren            \VL\MR
-  \VL \ShowHeadText \v!grafieken          \VL\MR
+  \VL \ShowHeadText \v!abbreviations      \VL\FR
+  \VL \ShowHeadText \v!units              \VL\MR
+  \VL \ShowHeadText \v!figures            \VL\MR
+  \VL \ShowHeadText \v!graphics           \VL\MR
   \VL \ShowHeadText \v!index              \VL\MR
-  \VL \ShowHeadText \v!inhoud             \VL\MR
-  \VL \ShowHeadText \v!intermezzos        \VL\MR
+  \VL \ShowHeadText \v!content            \VL\MR
+  \VL \ShowHeadText \v!intermezzi         \VL\MR
   \VL \ShowHeadText \v!logos              \VL\MR
-  \VL \ShowHeadText \v!tabellen           \VL\LR
+  \VL \ShowHeadText \v!tables             \VL\LR
   \HL
-\stoptabel
+\stoptable
 \stopbuffer
 
 \startbuffer[lang-b]
-\starttabel[|l|l|]
+\starttable[|l|l|]
   \HL
-  \VL \bf label key  \VL \bf current value      \VL\SR
+  \VL \bf label key  \VL \bf current value    \VL\SR
   \HL
-  \VL \ShowLabelText \v!tabel                   \VL\FR
-  \VL \ShowLabelText \v!figuur                  \VL\MR
-  \VL \ShowLabelText \v!intermezzo              \VL\MR
-  \VL \ShowLabelText \v!grafiek                 \VL\MR
-  \VL \ShowLabelText \v!hoofdstuk               \VL\MR
-  \VL \ShowLabelText \v!paragraaf               \VL\MR
-  \VL \ShowLabelText {\v!sub\v!paragraaf}       \VL\MR
-  \VL \ShowLabelText {\v!sub\v!sub\v!paragraaf} \VL\MR
-  \VL \ShowLabelText \v!bijlage                 \VL\MR
-  \VL \ShowLabelText \v!deel                    \VL\MR
-  \VL \ShowLabelText \v!regel                   \VL\MR
-  \VL \ShowLabelText \v!regels                  \VL\LR
+  \VL \ShowLabelText \v!table                 \VL\FR
+  \VL \ShowLabelText \v!figure                \VL\MR
+  \VL \ShowLabelText \v!intermezzo            \VL\MR
+  \VL \ShowLabelText \v!graphic               \VL\MR
+  \VL \ShowLabelText \v!chapter               \VL\MR
+  \VL \ShowLabelText \v!section               \VL\MR
+  \VL \ShowLabelText {\v!sub\v!section}       \VL\MR
+  \VL \ShowLabelText {\v!sub\v!sub\v!section} \VL\MR
+  \VL \ShowLabelText \v!appendix              \VL\MR
+  \VL \ShowLabelText \v!part                  \VL\MR
+  \VL \ShowLabelText \v!line                  \VL\MR
+  \VL \ShowLabelText \v!lines                 \VL\LR
   \HL
-\stoptabel
+\stoptable
 \stopbuffer
 
 \startbuffer[lang-c]
-\starttabel[|l|l|]
+\starttable[|l|l|]
   \HL
   \VL \bf label key  \VL \bf current value \VL\SR
   \HL
   \VL \ShowLabelText \v!january            \VL\FR
-  \VL \ShowLabelText \v!february            \VL\MR
+  \VL \ShowLabelText \v!february           \VL\MR
   \VL \ShowLabelText \v!march              \VL\MR
   \VL \ShowLabelText \v!april              \VL\MR
   \VL \ShowLabelText \v!may                \VL\MR
@@ -420,11 +418,11 @@
   \VL \ShowLabelText \v!november           \VL\MR
   \VL \ShowLabelText \v!december           \VL\LR
   \HL
-\stoptabel
+\stoptable
 \stopbuffer
 
 \startbuffer[lang-d]
-\starttabel[|l|l|]
+\starttable[|l|l|]
   \HL
   \VL \bf label key  \VL \bf current value \VL\SR
   \HL
@@ -434,9 +432,9 @@
   \VL \ShowLabelText \v!wednesday          \VL\MR
   \VL \ShowLabelText \v!thursday           \VL\MR
   \VL \ShowLabelText \v!friday             \VL\MR
-  \VL \ShowLabelText \v!saturday           \VL\MR
+  \VL \ShowLabelText \v!saturday           \VL\LR
   \HL
-\stoptabel
+\stoptable
 \stopbuffer
 
 \gdef\ShowTextsValues [#1] [#2]
@@ -450,9 +448,9 @@
    \vskip2em
    \halign
      {\hss##\hss&##\hskip1em&\hss##\hss\cr
-      $\vcenter{\haalbuffer[lang-a]}$&&$\vcenter{\haalbuffer[lang-b]}$\cr
+      $\vcenter{\getbuffer[lang-a]}$&&$\vcenter{\getbuffer[lang-b]}$\cr
       \noalign{\vskip1em}
-      $\vcenter{\haalbuffer[lang-c]}$&&$\vcenter{\haalbuffer[lang-d]}$\cr}%
+      $\vcenter{\getbuffer[lang-c]}$&&$\vcenter{\getbuffer[lang-d]}$\cr}%
    \egroup}
 
 \gdef\ShowLanguageValues [#1] [#2] #3 #4
@@ -462,14 +460,14 @@
         \bgroup
         \language[#1]%
         \let\normalbar=|
-        \starttabel[||||]
+        \starttable[||||]
         \HL
         \VL \THREE{\bf subsentence symbol and quotes} \VL\SR
         \HL
-        \VL \citaat{#3 #4} \VL \citeer{#2} \VL \let|=\normalbar |<||<|#3|>|#4|>| \VL\SR
-        \VL \citaat{#3 #4} \VL \citeer{#2} \VL |<||<|#3|>|#4|>| \VL\SR
+        \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
         \HL
-        \stoptabel
+        \stoptable
         \egroup
       \hss}}
 
@@ -479,10 +477,10 @@
       \vskip2em
       \ShowLanguageValues  [#1] [#2] #3 #4 }
    \protect
-   \pagina}
+   \page}
 
 \gdef\ShowAllLanguageValues%
-  {\pagina
+  {\page
    \unprotect
    \doShowAllLanguageValues}
 
@@ -495,13 +493,13 @@
 
 \unprotect
 
-\def\showsetup%
+\def\showsetup
   {\doglobal\newcounter\CurrentArgument
    \setup}
 
 \setupframedtexts
   [setuptext]
-  [\c!achtergrond=\v!raster,
-   \c!kader=\v!uit]
+  [\c!background=\v!screen,
+   \c!frame=\v!off]
 
 \protect \endinput
diff --git a/tex/context/base/s-mod-01.tex b/tex/context/base/s-mod-01.tex
index 5bb42c988..79b7b0b3e 100644
--- a/tex/context/base/s-mod-01.tex
+++ b/tex/context/base/s-mod-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-mod-01,
+%D   [      filefile=s-mod-01,
 %D        version=very-old,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Documentation Paper Environment,
@@ -25,49 +25,49 @@
   [en]
 
 \setupwhitespace
-  [\v!groot]
+  [\v!big]
 
 \setuptolerance
-  [\v!soepel]
+  [\v!tolerant]
 
 \emergencystretch=5em
 
 \setuplayout
-  [\c!rugwit=3.5cm,
-   \c!linkermarge=1.75cm,
-   \c!rechtermarge=0cm,
-   \c!margeafstand=.5cm,
-   \c!linkerrandafstand=.25cm,
-   \c!rechterrandafstand=.5cm,
-   \c!rand=1.5cm,
-   \c!breedte=15.55333cm,         % 13.998cm at 9pt => 15.55333 at 10pt
-   \c!kopwit=2cm,
-   \c!hoofd=1.25cm,
-   \c!voet=1.25cm,
-   \c!hoogte=25cm,
-   \c!letter=\ss]
-
-\stelsetupin
-  [\c!verwijzing=1]
+  [\c!backspace=3.5cm,
+   \c!leftmargin=1.75cm,
+   \c!rightmargin=0cm,
+   \c!margindistance=.5cm,
+   \c!leftedgedistance=.25cm,
+   \c!rightedgedistance=.5cm,
+   \c!edge=1.5cm,
+   \c!width=15.55333cm,         % 13.998cm at 9pt => 15.55333 at 10pt
+   \c!topspace=2cm,
+   \c!header=1.25cm,
+   \c!footer=1.25cm,
+   \c!height=25cm,
+   \c!style=\ss]
+
+\setupsetup
+  [\c!reference=1]
 
 \startnotmode[single]
 
   \setuppagenumbering
-    [\c!variant={\v!dubbelzijdig,\v!enkelzijdig}]
+    [\c!alternative={\v!doublesided,\v!singlesided}]
 
 \stopnotmode
 
-\stelnummeringin
-  [\c!plaats=]
+\setuppagenumbering
+  [\c!location=]
 
 \setupfootertexts
-  [\v!rand]
-  [][\v!paginanummer]
+  [\v!edge]
+  [][\v!pagenumber]
 
 \startmode[single]
 
   \setupfootertexts
-    [\v!marge]
+    [\v!margin]
     [\tt\Modulefile][]
 
 \stopmode
@@ -75,65 +75,65 @@
 \startnotmode[single]
 
   \setupfootertexts
-    [\v!marge]
+    [\v!margin]
     [\tt\Modulefile][]
     [\tt\Modulefile][]
 
 \stopnotmode
 
 \setupfootertexts
-  [\v!tekst]
+  [\v!text]
   [\CONTEXT]
   [\Moduletitle]
 
 \setupheadertexts
-  [\v!tekst]
+  [\v!text]
   []
   [\Modulesubtitle]
 
-\stelinmargein
-  [\c!plaats=\v!links]
+\setupinmargin
+  [\c!location=\v!left]
 
-\stelkoppenin
-  [\c!variant=\v!inmarge]
+\setupheads
+  [\c!alternative=\v!inmargin]
 
-\stelkopin
-  [\v!hoofdstuk]
-  [\c!letter=\ssc,
-   \c!pagina=\v!rechts,
-   \c!hoofd=\v!leeg]
+\setuphead
+  [\v!chapter]
+  [\c!style=\ssc,
+   \c!page=\v!right,
+   \c!header=\v!empty]
 
-\stelkopin
-  [\v!paragraaf]
-  [\c!letter=\ssb,
-   \c!pagina=\v!rechts]
+\setuphead
+  [\v!section]
+  [\c!style=\ssb,
+   \c!page=\v!right]
 
-\stellijstin
-  [\v!hoofdstuk]
-  [\c!letter=\v!vet,
-   \c!na=\blanko]
+\setuplist
+  [\v!chapter]
+  [\c!style=\v!bold,
+   \c!after=\blank]
 
-\stelsamengesteldelijstin
-  [\v!inhoud]
-  [\c!breedte=3em,
-   \c!titeluitlijnen=\v!ja]
+\setupcombinedlist
+  [\v!content]
+  [\c!width=3em,
+   \c!aligntitle=\v!yes]
 
-\stelregisterin
+\setupregister
   [\v!index]
-  [\c!balanceren=\v!ja,
-   \c!aanduiding=\v!nee]
+  [\c!balance=\v!yes,
+   \c!indicator=\v!no]
 
 \startnotmode[nocolor]
 
 \setupcolors
-  [\c!status=\v!start]
+  [\c!state=\v!start]
 
 \stopnotmode
 
 \startnotmode[color]
 
   \setupcolors
-    [\c!conversie=\v!altijd]
+    [\c!conversion=\v!always]
 
   \setuptyping
     [\c!palet=graypretty]
@@ -141,8 +141,8 @@
 \stopnotmode
 
 \setupinteraction
-  [\c!status=\v!start,
-   \c!kleur=,
-   \c!letter=]
+  [\c!state=\v!start,
+   \c!color=,
+   \c!style=]
 
 \protect \endinput
diff --git a/tex/context/base/s-mod-02.tex b/tex/context/base/s-mod-02.tex
index 6eabe7329..6423276dd 100644
--- a/tex/context/base/s-mod-02.tex
+++ b/tex/context/base/s-mod-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-mod-02,
+%D   [      filefile=s-mod-02,
 %D        version=very-old,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Documentation Screen Environment,
@@ -20,24 +20,24 @@
 
 % todo: internationalize + setups
 
-\stelkopin[paragraaf][expansie=commando]
+\setuphead[paragraaf][expansie=commando]
 
 \def\complexmodule[#1]% redefined
-  {\startglobaal % i.v.m. \bgroup in \startdocumentation
+  {\startglobal % i.v.m. \bgroup in \startdocumentation
    \getparameters[Module][#1]
-   \stopglobaal  % i.v.m. \bgroup in \startdocumentation
+   \stopglobal  % i.v.m. \bgroup in \startdocumentation
    \paragraaf{\Modulesubtitle}
    \SchrijfLijstenWeg}
 
 \def\stopmodule% redefined
-  {\pagina
-   \bepaalregisterkenmerken
+  {\page
+   \determineregistercharacteristics
      [index]
      [criterium=paragraaf]
    \ifutilitydone
-     \paginareferentie
+     \pagereference
        [index]
-     \plaatsregister
+     \placeregister
        [index]
        [balanceren=ja,
         aanduiding=nee,
@@ -50,15 +50,15 @@
 
 \newwrite\BatchFile \openout\BatchFile=\jobname.bat
 
-\def\WriteBatchFile%
+\def\WriteBatchFile
   {\doglobal\increment\ModuleNumber
    \immediate\write\BatchFile{call modu-run \FileName\space \ModuleNumber}}
 
 \newif\ifProcessingPublic
 
-\def\SchrijfLijstenWeg%
-  {\schrijfnaarlijst[FileNames] {}{\FileName}
-   \schrijfnaarlijst[GroupItems]{}{\GroupItem}}
+\def\SchrijfLijstenWeg
+  {\writetolist[FileNames] {}{\FileName}
+   \writetolist[GroupItems]{}{\GroupItem}}
 
 \def\moduletitel{}
 
@@ -87,11 +87,11 @@
    \WriteBatchFile}
 
 \def\verwerkmodule#1#2%
-  {\pagina
+  {\page
    \bgroup
    \def\FileName{#1}
-   \stelrefererenin[prefix=#1]
-   \gebruikexterndocument[PaperVersion][#1][]
+   \setupreferencing[prefix=#1]
+   \useexternaldocument[PaperVersion][#1][]
    \aftersplitstring#1\at-\to\GroupItem
    \StelLijstenSamen
    \ifcase#2
@@ -103,16 +103,16 @@
    \or
      \TypeThreeModule{#1}
    \fi
-   \pagina
-   \stelrefererenin[prefix=]
+   \page
+   \setupreferencing[prefix=]
    \egroup}
 
 \def\ModuleGroep#1#2%
-  {\pagina
+  {\page
    \let\Modulefile=\empty
-   \stelrefererenin[prefix=#1]
+   \setupreferencing[prefix=#1]
    \def\FileGroup{#1}
-   \schrijfnaarlijst[FileGroups]{}{\FileGroup}
+   \writetolist[FileGroups]{}{\FileGroup}
    \hoofdstuk[inhoud]{#2}
    \MaakLijstMetItems
    \MaakLijstMetNames
@@ -121,13 +121,13 @@
 
 % Layout
 
-\stelkorpsin
+\setupbodyfont
   [9pt,ams]
 
-\taal
+\mainlanguage
   [en]
 
-\stelpapierformaatin
+\setuppapersize
   [S6][S6]
 
 \setuplayout
@@ -147,139 +147,139 @@
    hoogte=410pt,
    letter=\ss]
 
-\steltypenin
+\setuptyping
   [palet=colorpretty]
 
-\stelsetupin
+\setupsetup
   [verwijzing=3]
 
-\definieerkleur [AchtergrondKleur] [s=.6]
-\definieerkleur [ButtonKleur]      [r=.2,g=.2,b=.6]
-\definieerkleur [TekstKleur]       [r=.6,g=.2,b=.2]
+\definecolor [AchtergrondKleur] [s=.6]
+\definecolor [ButtonKleur]      [r=.2,g=.2,b=.6]
+\definecolor [TekstKleur]       [r=.6,g=.2,b=.2]
 
-\definieerkleur [colorprettyone]   [r=.6,g=.0,b=.0]  % red
-\definieerkleur [colorprettytwo]   [r=.0,g=.6,b=.0]  % green
-\definieerkleur [colorprettythree] [r=.0,g=.0,b=.6]  % blue
-\definieerkleur [colorprettyfour]  [r=.6,g=.6,b=.0]  % yellow
+\definecolor [colorprettyone]   [r=.6,g=.0,b=.0]  % red
+\definecolor [colorprettytwo]   [r=.0,g=.6,b=.0]  % green
+\definecolor [colorprettythree] [r=.0,g=.0,b=.6]  % blue
+\definecolor [colorprettyfour]  [r=.6,g=.6,b=.0]  % yellow
 
-\stelinteractiein
+\setupinteraction
   [status=start,
    pagina=ja,
    contrastkleur=,
    menu=aan,
    kleur=]
 
-\stelachtergrondenin
+\setupbackgrounds
   [pagina]
   [achtergrond=kleur,
    achtergrondkleur=AchtergrondKleur,
    offset=2.5pt]  % this offset influences the menus!
 
-\stelachtergrondenin
+\setupbackgrounds
   [tekst,voet]
   [tekst,linkermarge]
   [achtergrond=kleur,
    achtergrondkleur=wit]
 
-\stelsubpaginanummerin
+\setupsubpagenumber
   [wijze=perparagraaf,
    status=start]
 
-\stelinteractiebalkin
+\setupinteractionbar
   [kader=uit,
    offset=0pt,
    hoogte=passend]
 
-\stelwitruimtein
+\setupwhitespace
   [groot]
 
-\steltypenin
+\setuptyping
   [typen]
   [optie=kleur]
 
-\steltypenin
+\setuptyping
   [definition]
   [optie=kleur]
 
-\steltypenin
+\setuptyping
   [file]
   [optie=kleur]
 
-\stelpaginanummeringin
+\setuppagenumbering
   [variant=enkelzijdig,
    wijze=perparagraaf,
    status=geen]
 
-\stelinmargein
+\setupinmargin
   [plaats=links]
 
-\stelkoppenin
+\setupheads
   [variant=inmarge]
 
-\stelkopin
+\setuphead
   [hoofdstuk]
   [letter=\ssc,
    pagina=rechts]
 
-\stelkopin
+\setuphead
   [paragraaf]
   [letter=\ssb,
    pagina=rechts]
 
-\stellijstin
+\setuplist
   [hoofdstuk]
   [letter=vet,
-   na=\blanko]
+   na=\blank]
 
-\stelinhoudin
+\setupcontent
   [breedte=2em]
 
-\stelindexin
+\setupindex
   [balanceren=ja,
    aanduiding=nee]
 
-\stelkleurenin
+\setupcolors
   [status=start]
 
 \def\TitelBlad#1%
-  {\startstandaardopmaak
+  {\startstandardmakeup
      \definefont[GrootFont] [SansBold at 72pt]
      \definefont[MiddelFont][Sans at 32pt]
      \definefont[KleinFont] [Sans at 24pt]
-     \startkleur[AchtergrondKleur]
+     \startcolor[AchtergrondKleur]
      \vskip12pt
-     \regelmidden{\GrootFont\setstrut\strut    Con\TeX t}
+     \midaligned{\GrootFont\setstrut\strut    Con\TeX t}
      \vskip24pt
-     \regelmidden{\MiddelFont\setstrut\strut   #1}
+     \midaligned{\MiddelFont\setstrut\strut   #1}
      \vskip24pt
-     \regelmidden{\KleinFont\setstrut\strut    Hans Hagen}
+     \midaligned{\KleinFont\setstrut\strut    Hans Hagen}
      \vfilll
-     \regelmidden{\KleinFont\setstrut\strut    PRAGMA ADE}
+     \midaligned{\KleinFont\setstrut\strut    PRAGMA ADE}
      \vskip24pt
-     \regelmidden{\KleinFont\setstrut\strut    www.pragma-ade.nl --- \currentdate}
+     \midaligned{\KleinFont\setstrut\strut    www.pragma-ade.nl --- \currentdate}
      \vskip12pt
-     \stopkleur
-   \stopstandaardopmaak}
+     \stopcolor
+   \stopstandardmakeup}
 
 \def\ColofonBlad%
   {\startmode[atpragma]
-   \pagina
+   \page
    \bgroup
-     \def\PragmaHoogte {\zethoogte}
-     \def\PragmaBreedte{\tekstbreedte}
-     \def\PragmaKopwit {\kopwit}
+     \def\PragmaHoogte {\makeupheight}
+     \def\PragmaBreedte{\textwidth}
+     \def\PragmaKopwit {\topspace}
      \def\PragmaRugwit {\rugwit}
      \def\PragmaMarge  {0pt}
      \PragmaLijnentrue
      \PlaatsPragmaLogo[ADE]
      \vfill
-     \startsmaller[3*midden]
+     \startnarrower[3*midden]
      This is the official documentation of \CONTEXT\ version
-     \kenmerkdatum, a \TEX\ macropackage developed by J.~Hagen
+     \referraldate, a \TEX\ macropackage developed by J.~Hagen
      \& A.F.~Otten, who both hold the copyrights.
-     \stopsmaller
+     \stopnarrower
      \vfill
-     \pagina
+     \page
    \egroup
    \stopmode}
 
@@ -287,23 +287,23 @@
 \newbox\LijstMetGroups
 \newbox\LijstMetNames
 
-\definieerlijst[FileNames]   \def\FileName  {}
-\definieerlijst[FileGroups]  \def\FileGroup {}
-\definieerlijst[GroupItems]  \def\GroupItem {}
+\definelist[FileNames]   \def\FileName  {}
+\definelist[FileGroups]  \def\FileGroup {}
+\definelist[GroupItems]  \def\GroupItem {}
 
-\stellijstin
+\setuplist
   [FileNames,FileGroups,FileGroups]
   [expansie=ja,
    paginanummer=nee,
    letter=\ss\bf]
 
-\stellijstin
+\setuplist
   [FileNames]
   [commando=\FileNameEntry,
    na=\endgraf,
    variant=geen]
 
-\stellijstin
+\setuplist
   [FileGroups]
   [commando=\FileGroupEntry,
    na=\hss,
@@ -315,33 +315,33 @@
 \def\FileGroupEntry#1#2#3%
   {\strut#2\endgraf}
 
-\def\MaakLijstMetItems%
+\def\MaakLijstMetItems
   {\setbox\LijstMetItems=\vbox
      {\ss\bf
-      \plaatslijst[GroupItems][kleur=ButtonKleur,contrastkleur=wit,criterium=hoofdstuk]}}
+      \placelist[GroupItems][kleur=ButtonKleur,contrastkleur=wit,criterium=hoofdstuk]}}
 
-\def\MaakLijstMetNames%
+\def\MaakLijstMetNames
   {\setbox\LijstMetNames=\vbox
-     {\hsize\rechterrandbreedte
+     {\hsize\rightedgewidth
       \ss\bf\stelinterliniein
       \startsimplecolumns[afstand=10pt]
-        \plaatslijst[FileNames][kleur=ButtonKleur,contrastkleur=wit,criterium=hoofdstuk]
+        \placelist[FileNames][kleur=ButtonKleur,contrastkleur=wit,criterium=hoofdstuk]
       \stopsimplecolumns}}
 
-\def\MaakLijstMetGroups%
-  {\setbox\LijstMetGroups=\hbox to \tekstbreedte
+\def\MaakLijstMetGroups
+  {\setbox\LijstMetGroups=\hbox to \textwidth
      {\ss\bf
-      \stelinteractiein[kleur=ButtonKleur]%
-      \plaatslijst[FileGroups][kleur=ButtonKleur,contrastkleur=wit,criterium=alles]\unskip\unskip}}
+      \setupinteraction[kleur=ButtonKleur]%
+      \placelist[FileGroups][kleur=ButtonKleur,contrastkleur=wit,criterium=alles]\unskip\unskip}}
 
 \setbox\LijstMetGroups=\hbox{}
 
-%\stelvoettekstenin
+%\setupfootertexts
 %  [rand]
 %  []
 %  [{\interactiebalk[variant=g]}]
 
-\stelinteractiemenuin
+\setupinteractionmenu
   [rechts,onder]
   [status=start,
    kader=uit,
@@ -354,8 +354,8 @@
    achtergrond=kleur,
    achtergrondkleur=ButtonKleur]
 
-\startinteractiemenu[rechts]
-  \boxofsize \vbox \teksthoogte \voetafstand \voethoogte 5pt
+\startinteractionmenu[rechts]
+  \boxofsize \vbox \textheight \voetafstand \voethoogte 5pt
     \bgroup
       \copy\LijstMetNames
       \vfill
@@ -368,27 +368,27 @@
       \but [VerlaatViewer]       close document \\
       \unskip
     \egroup
-\stopinteractiemenu
+\stopinteractionmenu
 
-\startinteractiemenu[onder]
+\startinteractionmenu[onder]
   \unhcopy\LijstMetGroups
-\stopinteractiemenu
-
-\def\plaatsmoduleregister%
-  {\startuitleidingen
-   \stelsubpaginanummerin[reset]
-   \titel[-:index]{Register}
-   \plaatsindex
-   \stopuitleidingen}
-
-\def\plaatsmoduleinhoud%
-  {\startinleidingen
-   \titel[-:inhoud]{Contents}
-   \stelinteractiebalkin[status=stop]
-   \plaatsinhoud[criterium=tekst,niveau=hoofdstuk]
-   \stopinleidingen}
-
-\stelinhoudin
+\stopinteractionmenu
+
+\def\plaatsmoduleregister
+  {\startbackmatter
+   \setupsubpagenumber[reset]
+   \title[-:index]{Register}
+   \placeregister[index]
+   \stopbackmatter}
+
+\def\plaatsmoduleinhoud
+  {\startfrontmatter
+   \title[-:inhoud]{Contents}
+   \setupinteractionbar[status=stop]
+   \placecontent[criterium=tekst,niveau=hoofdstuk]
+   \stopfrontmatter}
+
+\setupcontent
   [paginanummer=nee,
    niveau=hoofdstuk,
    interactie=alles,
@@ -396,19 +396,19 @@
    voor=,
    na=]
 
-\stelvoettekstenin
+\setupfootertexts
   [marge]
   [\tt\Modulefile]
   []
 
-\stelvoettekstenin
+\setupfootertexts
   [tekst]
   [hoofdstuk][paragraaf]
 
-\stelindexin
+\setupindex
   [symbool=1]
 
-\steltolerantiein
+\setuptolerance
   [zeersoepel]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/s-pre-00.tex b/tex/context/base/s-pre-00.tex
index 3866514b8..104173ed8 100644
--- a/tex/context/base/s-pre-00.tex
+++ b/tex/context/base/s-pre-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-00,
+%D   [      filefile=s-pre-00,
 %D        version=1997.07.22,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 0,
@@ -34,10 +34,10 @@
 
 \setupframedtexts
   [presentationshield]
-  [\c!achtergrond=\v!kleur,
-   \c!achtergrondkleur=StepColor,
+  [\c!background=\v!color,
+   \c!backgroundcolor=StepColor,
    \c!offset=\v!overlay,
-   \c!kader=\v!uit]
+   \c!frame=\v!off]
 
 \definecolor[StepColor][white]
 
@@ -45,7 +45,7 @@
   {\let\enablepresentationstep\relax
    \useJSpreamblenow{presentation}%
    \setuptexttexts
-     [\vbox to \teksthoogte
+     [\vbox to \textheight
         {\dopresentationstep1\box\presentationstack\vfill}]}
 
 \def\presentationstep%
@@ -66,7 +66,7 @@
       \global\presentationheight=\pagetotal
       \forgetall
       \offinterlineskip
-      \mindermeldingen
+      \dontcomplain
       \box\presentationstack
       \doglobal\increment\presentationcounter
       \scratchcounter=\realpageno \multiply\scratchcounter by 100
@@ -74,15 +74,15 @@
       \edef\presentationtag{presentation:\the\scratchcounter}
       \setupfield
         [presentation]
-        [\c!breedte=\v!passend,\c!hoogte=\v!passend,\c!offset=\v!overlay,
-         \c!strut=\v!nee,\c!kader=\v!uit,\c!optie=\v!alleenleesbaar]
+        [\c!width=\v!fit,\c!height=\v!fit,\c!offset=\v!overlay,
+         \c!strut=\v!no,\c!frame=\v!off,\c!option=\v!readonly]
       \definesymbol
         [\presentationtag]
         [\presentationshade]
       \def\presentationshade%
         {\presentationshield
-           [\c!breedte=\tekstbreedte,\c!hoogte=\presentationstepheight]{}}
-      \definefield[\presentationtag][check][presentation][\presentationtag,\v!geen][\presentationtag]
+           [\c!width=\textwidth,\c!height=\presentationstepheight]{}}
+      \definefield[\presentationtag][check][presentation][\presentationtag,\v!none][\presentationtag]
       \fitfield[\presentationtag]}}
 
 \startJSpreamble {presentation} used later
@@ -119,7 +119,7 @@
 %D show functionality. It sort of records pieces of the page
 %D that will show up stepwise. It can be used like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startitemize
 %D \item eerste
 %D \item tweede
@@ -132,57 +132,57 @@
 %D \stopformula
 %D
 %D \presentationstep
-%D \stoptypen
+%D \stoptyping
 %D
 %D When the document is opened, the two text fragments are
 %D covered by a shield. Each page has its own shield stack. The
 %D logical reference \type {NextStep} can be used to hide the
 %D shield.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupfootertexts[{\button{Show Up}[NextStep]}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D In case of presentation style 2, you can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \definereference[Whatever][JS(NextPresentation{\realfolio})]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Depending of the viewer, you need to reset the fields at
 %D startup:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupinteraction[openaction=ResetForm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Fixed spacing give you the best results:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupwhitespace[fixed]
 %D \setupblank[fixed]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Sometimes you need to set the color of the background, as
 %D with style 2:
 %D
-%D \starttypen
+%D \starttyping
 %D \definecolor[StepColor][Page]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Special effects can be reached with:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupframedtexts
 %D   [presentationshield]
 %D   [background=color,backgroundcolor=red]
-%D \stoptypen
+%D \stoptyping
 %D
 %D There is also:
 %D
-%D \starttypen
+%D \starttyping
 %D \autopresentationsteptrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D One can enable this feature as \type {step} mode.
 
@@ -199,4 +199,4 @@
 
 \doifmode{comment}{\setuppagecomment[state=start,location=bottom]}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/s-pre-01.tex b/tex/context/base/s-pre-01.tex
index 9243162f2..8f752ba21 100644
--- a/tex/context/base/s-pre-01.tex
+++ b/tex/context/base/s-pre-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-01,
+%D   [      filefile=s-pre-01,
 %D        version=1997.07.22,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 1,
@@ -103,12 +103,12 @@
 %D I considered the next setup too, but finaly decided to
 %D comment it out.
 %D
-%D \starttypen
+%D \starttyping
 %D \setupbackgrounds
 %D   [bottom][text]
 %D   [frame=on,
 %D    framecolor=white]
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {setupinteraction}
@@ -182,17 +182,17 @@
 %D The titlepage is rather simple and can be typeset in two 
 %D ways: 
 %D
-%D \starttypen
+%D \starttyping
 %D \StartTitlePage
 %D text \\ text \\ text 
 %D \StopTitlepage
-%D \stoptypen
+%D \stoptyping
 %D
 %D or more straightforward:
 %D
-%D \starttypen
+%D \starttyping
 %D \TitlePage{text\\text\\text} 
-%D \stoptypen
+%D \stoptyping
 %D 
 %D The first alternative can be used for more complicated 
 %D title pages.  
@@ -216,7 +216,7 @@
 %D
 %D A presentation after loading this module looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \TitlePage {About Whatever\\Topics}
 %D
 %D \Topics {Todays Talk}
@@ -230,7 +230,7 @@
 %D \Subject {Beta}
 %D
 %D .....
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {definehead}
@@ -291,7 +291,7 @@
 %D subject line by using one of the default alternatives (g). We
 %D could have said:
 %D
-%D \starttypen
+%D \starttyping
 %D \setuplist
 %D   [Subject]
 %D   [alternative=none,
@@ -300,7 +300,7 @@
 %D
 %D \def\SubjectListLine#1#2#3%
 %D   {\midaligned{#2}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But why should we complicate things when we can use 
 %D alternative~\type{g}. The test is only needed if one 
@@ -332,7 +332,7 @@
 %D   {setuplist, placelist,startinteractionmenu}
 %D
 %D The actual topic list is typeset using a \type{\vbox}. We
-%D have to specify \type{criterium=all} because otherwise no 
+%D have to specify \type{criteriumcriterium=all} because otherwise no 
 %D list will be typeset. (By default lists are typeset 
 %D locally.)
 
diff --git a/tex/context/base/s-pre-02.tex b/tex/context/base/s-pre-02.tex
index cbdd97ae9..41ba9d423 100644
--- a/tex/context/base/s-pre-02.tex
+++ b/tex/context/base/s-pre-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-02,
+%D   [      filefile=s-pre-02,
 %D        version=1998.04.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 2,
@@ -236,7 +236,7 @@
 %D
 %D A presentation after loading this module looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \TitlePage {About Whatever\\Topics}
 %D
 %D \Topics {Todays Talk}
@@ -248,7 +248,7 @@
 %D \Topic {Next Topic}
 %D
 %D .....
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D  {StartTitlePage, TitlePage}
@@ -256,17 +256,17 @@
 %D The titlepage is rather simple and can be typeset in two 
 %D ways: 
 %D
-%D \starttypen
+%D \starttyping
 %D \StartTitlePage
 %D text \\ text \\ text 
 %D \StopTitlepage
-%D \stoptypen
+%D \stoptyping
 %D
 %D or as one||liner:
 %D
-%D \starttypen
+%D \starttyping
 %D \TitlePage{text\\text\\text} 
-%D \stoptypen
+%D \stoptyping
 %D 
 %D The first alternative can be used for more complicated 
 %D title pages.  
diff --git a/tex/context/base/s-pre-03.tex b/tex/context/base/s-pre-03.tex
index 440c1b931..e574a2d07 100644
--- a/tex/context/base/s-pre-03.tex
+++ b/tex/context/base/s-pre-03.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-03,
+%D   [      filefile=s-pre-03,
 %D        version=1998.09.06,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 3,
@@ -170,7 +170,7 @@
 %D instead of \type {\chapters}. This time we don't provide
 %D an additional sectioning. So we have:
 %D
-%D \starttypen
+%D \starttyping
 %D \TitlePage{How nice}
 %D
 %D \Topics{This is about ...}
@@ -178,7 +178,7 @@
 %D \Topic{The first one}
 %D
 %D \Topic{Another one}
-%D \stoptypen
+%D \stoptyping
 
 \definehead [Topic] [chapter]
 \definehead [Nopic] [title]
@@ -214,11 +214,11 @@
 %D Instead of \type {\TitlePage}, one can use the pair
 %D \type {\StartTitlePage} -- \type {\StopTitlePage}:
 %D
-%D \starttypen
+%D \starttyping
 %D \StartTitlePage
 %D A Self Made Title
 %D \StopTitlePage
-%D \stoptypen
+%D \stoptyping
 
 \def\StartTitlePage%
   {\startstandardmakeup
diff --git a/tex/context/base/s-pre-04.tex b/tex/context/base/s-pre-04.tex
index 29b040a8b..062255cab 100644
--- a/tex/context/base/s-pre-04.tex
+++ b/tex/context/base/s-pre-04.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-04,
+%D   [      filefile=s-pre-04,
 %D        version=1998.09.06,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 4,
diff --git a/tex/context/base/s-pre-05.tex b/tex/context/base/s-pre-05.tex
index f095ae091..b19ef4d9c 100644
--- a/tex/context/base/s-pre-05.tex
+++ b/tex/context/base/s-pre-05.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-05,
+%D   [      filefile=s-pre-05,
 %D        version=1998.12.12,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 5,
diff --git a/tex/context/base/s-pre-06.tex b/tex/context/base/s-pre-06.tex
index 32e24c27f..aaf99df01 100644
--- a/tex/context/base/s-pre-06.tex
+++ b/tex/context/base/s-pre-06.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-06,
+%D   [      filefile=s-pre-06,
 %D        version=1999.04.28,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 6,
@@ -160,7 +160,7 @@
 %D compatible with the other styles, they are added. A
 %D presentation looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \usemodule[pre-antikwa]
 %D
 %D \startext
@@ -181,7 +181,7 @@
 %D ...
 %D
 %D \stoptext
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {definehead, Topic, Subject}
@@ -227,11 +227,11 @@
 %D The \type {\Topics} command uses a bot of low level
 %D \CONTEXT. We could have done with:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\Topics#1%
 %D   {\Nopic[Topics]{#1}
-%D    \placelist[Topic][criterium=all]}
-%D \stoptypen
+%D    \placelist[Topic][criteriumcriterium=all]}
+%D \stoptyping
 %D
 %D but the next alternative sort of ignores this command when
 %D no list is found.
diff --git a/tex/context/base/s-pre-07.tex b/tex/context/base/s-pre-07.tex
index 3f4c51087..f658dce60 100644
--- a/tex/context/base/s-pre-07.tex
+++ b/tex/context/base/s-pre-07.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-07,
+%D   [      filefile=s-pre-07,
 %D        version=1999.08.20,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 7,
@@ -19,7 +19,7 @@
 %D goal. I must admit that the main macro looks fuzzy. On 
 %D the other hand, the presentation can look quite structured. 
 %D 
-%D \starttypen
+%D \starttyping
 %D \Topics{...}
 %D 
 %D \StartIdeas
@@ -27,7 +27,7 @@
 %D   \StartIdea ... \StopIdea
 %D   \StartIdea ... \StopIdea
 %D \StopIdeas
-%D \stoptypen
+%D \stoptyping
 
 \startmode[asintended] \setupbodyfont[lbr] \stopmode
 
diff --git a/tex/context/base/s-pre-08.tex b/tex/context/base/s-pre-08.tex
index 5680e86d2..74d6f1527 100644
--- a/tex/context/base/s-pre-08.tex
+++ b/tex/context/base/s-pre-08.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-08,
+%D   [      filefile=s-pre-08,
 %D        version=1999.09.01,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 8,
@@ -26,9 +26,9 @@
 
 %D You may want to turn on layer tracing:
 %D
-%D \starttypen
+%D \starttyping
 %D \tracelayerstrue
-%D \stoptypen
+%D \stoptyping
 
 \setuppapersize
   [S6][S6]
diff --git a/tex/context/base/s-pre-09.tex b/tex/context/base/s-pre-09.tex
index cba452973..79357f856 100644
--- a/tex/context/base/s-pre-09.tex
+++ b/tex/context/base/s-pre-09.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-09,
+%D   [      filefile=s-pre-09,
 %D        version=unknown,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 9,
@@ -168,10 +168,10 @@
 %D it covers something else. Otherwise we could have stuct
 %D to:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\Topic#1%
 %D   {\setlayer[topic]{\color[PageColor]{\bfb\setstrut#1}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But, we go for the nice alternative:
 
@@ -331,7 +331,7 @@
 \let\Topics   \gobbleoneargument
 \let\Subjects \relax
 
-%D We will avoid \citeer {overfull} messages.
+%D We will avoid \quote {overfull} messages.
 
 \dontcomplain
 
diff --git a/tex/context/base/s-pre-10.tex b/tex/context/base/s-pre-10.tex
index 67a867ec7..a652fbace 100644
--- a/tex/context/base/s-pre-10.tex
+++ b/tex/context/base/s-pre-10.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-10,
+%D   [      filefile=s-pre-10,
 %D        version=unknown,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 10,
diff --git a/tex/context/base/s-pre-13.tex b/tex/context/base/s-pre-13.tex
index a7b68dd69..0ccced953 100644
--- a/tex/context/base/s-pre-13.tex
+++ b/tex/context/base/s-pre-13.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-13,
+%D   [      filefile=s-pre-13,
 %D        version=1999.08.20,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 13,
diff --git a/tex/context/base/s-pre-14.tex b/tex/context/base/s-pre-14.tex
index 7a777c27e..30fb0af72 100644
--- a/tex/context/base/s-pre-14.tex
+++ b/tex/context/base/s-pre-14.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-14,
+%D   [      filefile=s-pre-14,
 %D        version=1999.08.20,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 14,
diff --git a/tex/context/base/s-pre-15.tex b/tex/context/base/s-pre-15.tex
index 49e13b3da..352897923 100644
--- a/tex/context/base/s-pre-15.tex
+++ b/tex/context/base/s-pre-15.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-15,
+%D   [      filefile=s-pre-15,
 %D        version=1999.09.01, 
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 15,
@@ -19,7 +19,7 @@
 %D This presentation is meant for presentations that build up
 %D an idea stepwise. 
 %D 
-%D \starttypen
+%D \starttyping
 %D \TitlePage{Do you know \TEX ?}
 %D 
 %D \StartIdea
@@ -29,7 +29,7 @@
 %D   \StartItem or presentations like this         \unknown \StopItem
 %D   \StartItem and whatever you can come up with!          \StopItem
 %D \StopIdea
-%D \stoptypen 
+%D \stoptyping 
 
 %D The basic layout is rather simple and used as much of the 
 %D screen as possible. 
diff --git a/tex/context/base/s-pre-16.tex b/tex/context/base/s-pre-16.tex
index 81f21ec60..33685e6ce 100644
--- a/tex/context/base/s-pre-16.tex
+++ b/tex/context/base/s-pre-16.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-16,
+%D   [      filefile=s-pre-16,
 %D        version=1999.09.01, 
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 16,
diff --git a/tex/context/base/s-pre-19.tex b/tex/context/base/s-pre-19.tex
index 56c7c78c4..ea103dfbc 100644
--- a/tex/context/base/s-pre-19.tex
+++ b/tex/context/base/s-pre-19.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-19,
+%D   [      filefile=s-pre-19,
 %D        version=2000.07.31,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 19,
@@ -30,7 +30,7 @@
 %D \type {--mode=demo} and \type {--pdf}, you will get a demo
 %D document.
 
-%D We use one of the standard screen \citeer {paper} sizes, and
+%D We use one of the standard screen \quote {paper} sizes, and
 %D map it onto the same size, so that we get a nicely cropped
 %D page.
 
@@ -87,7 +87,7 @@
 \definecolor [ContrastColor]    [gray]
 
 %D This is an interactive document, so we enable interaction.
-%D In this style, we disable the viewer's \citeer {highlight a
+%D In this style, we disable the viewer's \quote {highlight a
 %D hyperlink when it's clicked on} feature. We will use a
 %D menu, so we enable menus. Later we will see the contract
 %D color |<|hyperlinks gets that color when we are already on
diff --git a/tex/context/base/s-pre-22.tex b/tex/context/base/s-pre-22.tex
index edd99ebde..98a297ab0 100644
--- a/tex/context/base/s-pre-22.tex
+++ b/tex/context/base/s-pre-22.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-22,
+%D   [      filefile=s-pre-22,
 %D        version=2000.08.07,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 22,
@@ -16,16 +16,16 @@
 %D and title. When documenting this style, I changed
 %D reprocessing into pushing on layers. 
 %D 
-%D A \citeer {problem} like this can be solved in several ways:
+%D A \quote {problem} like this can be solved in several ways:
 %D 
-%D \startopsomming
-%D \som writing a lot of semi||complex \TEX\ code as shown 
-%D \som keeping track of positions and draw everything on the 
+%D \startitemize
+%D \item writing a lot of semi||complex \TEX\ code as shown 
+%D \item keeping track of positions and draw everything on the 
 %D      page layer
-%D \som defining an overlay for each summary and changing the 
+%D \item defining an overlay for each summary and changing the 
 %D      order when flushing 
-%D \som maintaining a so called field stack
-%D \stopopsomming
+%D \item maintaining a so called field stack
+%D \stopitemize
 %D 
 %D We go for the first method. We assume that summaries are 
 %D simple text snippets. 
diff --git a/tex/context/base/s-pre-23.tex b/tex/context/base/s-pre-23.tex
index 90ed18353..67892a74e 100644
--- a/tex/context/base/s-pre-23.tex
+++ b/tex/context/base/s-pre-23.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-20,
+%D   [      filefile=s-pre-20,
 %D        version=2000.08.07,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 20,
diff --git a/tex/context/base/s-pre-50.tex b/tex/context/base/s-pre-50.tex
index 49a206fd7..ea01706e3 100644
--- a/tex/context/base/s-pre-50.tex
+++ b/tex/context/base/s-pre-50.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-50,
+%D   [      filefile=s-pre-50,
 %D        version=2003.01.26,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 50,
@@ -21,9 +21,9 @@
 %D still have some 10 of those styles to clean up and 
 %D document.) You can give it a try: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D texexec --pdf --mode=demo s-pre-50 
-%D \stoptypen 
+%D \stoptyping 
 
 % Basic definitions.
 
diff --git a/tex/context/base/s-pre-60.tex b/tex/context/base/s-pre-60.tex
index 060bf44c8..5b7e69da0 100644
--- a/tex/context/base/s-pre-60.tex
+++ b/tex/context/base/s-pre-60.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-60,
+%D   [      filefile=s-pre-60,
 %D        version=2004.03.15,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 60,
@@ -108,4 +108,4 @@
   [symbol={attach-normal,attach-down},
    textlayer=\StepLayer]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/s-pre-61.tex b/tex/context/base/s-pre-61.tex
index 3e60c7c8c..bb47c484e 100644
--- a/tex/context/base/s-pre-61.tex
+++ b/tex/context/base/s-pre-61.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=s-pre-61,
+%D   [      filefile=s-pre-61,
 %D        version=2004.03.15,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Presentation Environment 61,
@@ -252,4 +252,4 @@
 
 \StopSteps
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/setupa.tex b/tex/context/base/setupa.tex
index 843a531d3..56a3a3a3c 100644
--- a/tex/context/base/setupa.tex
+++ b/tex/context/base/setupa.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=setupa,
+%D   [       filefile=setupa,
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Setup Definitions,
 %D       subtitle=Macro Definitions,
@@ -198,7 +198,7 @@ sectionnumber:  numero sezione
 
 \egroup
 
-% \stelsetupin
+% \setupsetup
 %   [verwijzing=<0,1,2,3>]
 %
 % \startsetup
@@ -339,27 +339,27 @@ sectionnumber:  numero sezione
 \def\c!doropt! #1#2#3{{\setupoptfont{#1#2#3}}}
 \def\c!noropt!     #1{{\setupoptfont{#1}}}
 
-\definieerregister
+\defineregister
   [texmacro]
   [texmacros]
 
-\definieersorteren
+\definesorting
   [texcommando]
   [texcommandos]
 
-\stelsorterenin
+\setupsorting
   [texcommando]
-  [\c!commando=\@@stpcommando,
+  [\c!command=\@@stpcommand,
    \c!criterium=\@@stpcriterium]
 
-\definieersorteren
+\definesorting
   [elktexcommando]
   [alletexcommandos]
 
-\stelsorterenin
+\setupsorting
   [elktexcommando]
-  [\c!commando=\@@stpcommando,
-   \c!criterium=\v!alles]
+  [\c!command=\@@stpcommand,
+   \c!criterium=\v!all]
 
 % verwijzing: 0 geen verwijzingen plaatsen / wel genereren
 %             1 alleen bij zie plaatsen / wel genereren
@@ -381,7 +381,7 @@ sectionnumber:  numero sezione
    \fi}
 
 \def\writesetupparbox#1%
-  {\hbox to \@@stpbreedte{\strut#1\hss}}%
+  {\hbox to \@@stpwidth{\strut#1\hss}}%
 
 \def\writesetupparameter#1#2%
   {\doifcommonelse{#1}{#2}
@@ -394,7 +394,7 @@ sectionnumber:  numero sezione
      {\writesetupparameter{##1}{#3}}%
    \veryraggedright
    \noindent
-   \hangindent=\@@stpbreedte
+   \hangindent=\@@stpwidth
    \writesetupparbox{\let\c!setup!variable!\firstofoneargument\getinterfaceconstant{#1}}%
    \processcommalist[#2]\dowritesetupparameter
    \doifcommonelse{#3}{#2}{}{\underbar{#3}}%
@@ -408,7 +408,7 @@ sectionnumber:  numero sezione
         {\writesetupparameter{##1}{#2}}%
       \indent
       \veryraggedright
-      \hangindent=\@@stpbreedte
+      \hangindent=\@@stpwidth
       \writesetupparbox{\c!dots!}%
       \processcommalist[#1]\dowritesetupparameter
       \endgraf
@@ -435,14 +435,14 @@ sectionnumber:  numero sezione
 
 \unexpanded\def\inheritsetup#1%
   {\setsetupreference#1\to\currentsetupinheritance
-   \ifcase\@@stpverwijzing
+   \ifcase\@@stpreference
      \texescape#1% % njet
    \or
-     {\op{p}[\currentsetupinheritance]: \texescape#1}% zonder { } probleem
+     {\at{p}[\currentsetupinheritance]: \texescape#1}% zonder { } probleem
    \or
-     {\op{p}[\currentsetupinheritance]: \texescape#1}% nog eens uitzoeken
+     {\at{p}[\currentsetupinheritance]: \texescape#1}% nog eens uitzoeken
    \or
-     {\naar{\tttf\texescape#1}[\currentsetupinheritance]}%
+     {\goto{\tttf\texescape#1}[\currentsetupinheritance]}%
    \fi}
 
 % #1=name
@@ -463,7 +463,7 @@ sectionnumber:  numero sezione
    \variable[..=..][\getmessage{setup}{see} \inheritsetup{#1}\next#3][]%
    \egroup}
 
-\def\stelsetupin
+\def\setupsetup
   {\dodoubleargument\getparameters[\??stp]}
 
 \bgroup \catcode`<=\active
@@ -539,8 +539,8 @@ sectionnumber:  numero sezione
 
 \defineframedtext
   [setuptext]
-  [\c!breedte=\hsize,
-   \c!hoogte=\v!passend,
+  [\c!width=\hsize,
+   \c!height=\v!fit,
    \c!offset=0.75em]
 
 \popmacro\setuptext
@@ -568,7 +568,7 @@ sectionnumber:  numero sezione
      \advance\hsize by -\leftskip
      \advance\hsize by -\rightskip
      \getvalue{\e!start setuptext}
-       \setupwhitespace[\v!geen]%
+       \setupwhitespace[\v!none]%
        \bgroup
          \verbatimsetupvariablepart \edef\first {#2*}%
          \protectsetupvariablepart  \edef\second{#2}%
@@ -598,19 +598,19 @@ sectionnumber:  numero sezione
           \visualizesetupvariablepart
           \writetexcommand{#2}#3%
           \ifbreaksetup\hfill\else\hss\fi
-          \ifnum\@@stpverwijzing>0
+          \ifnum\@@stpreference>0
             \dointeractivesetup
           \fi
           \setsetupnumber   #1\to\currentsetupnumber
           \setsetupreference#2\to\currentsetupreference
-          \ifcase\@@stpverwijzing
+          \ifcase\@@stpreference
             \dosetupreference
           \or
             \dosetupreference
           \or
             \hskip1em
             \doifreferencefoundelse{\currentsetupreference}
-              {\bf\op[\currentsetupreference]}
+              {\bf\at[\currentsetupreference]}
               {\setupvarfont \translate
                  [nl=nog niet beschreven,
                   en=not yet described,
@@ -622,7 +622,7 @@ sectionnumber:  numero sezione
          \endgraf
        \fi
        \ifshortsetup \else
-         \switchtobodyfont[\v!klein]%
+         \switchtobodyfont[\v!small]%
          \setuptxtfont
          \redefinesetupconstants
          \global\v!dotnumber!=0
@@ -635,11 +635,11 @@ sectionnumber:  numero sezione
               \dimen0=2.5em
             \fi
             \advance\dimen0 by 2em
-            \xdef\@@stpbreedte{\the\dimen0}}%
+            \xdef\@@stpwidth{\the\dimen0}}%
          \global\v!dotnumber!=0
          \setbox0=\vbox{#4}%
          \ifdim\wd0>\!!zeropoint
-           \blanko
+           \blank
            \unvbox0
          \fi
        \fi
@@ -650,7 +650,7 @@ sectionnumber:  numero sezione
   {\protect
    \verbatimsetupvariablepart
    \xdef\globalsetupname{#1}%
-   \expanded{\gebruikcommandos{#1*}}%
+   \expanded{\usecommands{#1*}}%
    \doifdefinedelse{\@@setup\globalsetupname}
      {\getvalue{\@@setup\globalsetupname}}
      {\bgroup
@@ -658,10 +658,10 @@ sectionnumber:  numero sezione
       \setuptxtfont [setup \makemessage{setup}{3}{#1}]\endgraf
       \egroup}%
    \egroup
-   \@@stpna}
+   \@@stpafter}
 
 \def\setup
-  {\@@stpvoor
+  {\@@stpbefore
    \bgroup
    \catcode`\<=\@@active
    \catcode`\>=\@@other
@@ -670,7 +670,7 @@ sectionnumber:  numero sezione
    \dosetup}
 
 \def\shortsetup
-  {\@@stpvoor
+  {\@@stpbefore
    \bgroup
    \catcode`\<=\@@active
    \catcode`\>=\@@other
@@ -707,34 +707,33 @@ sectionnumber:  numero sezione
 
 \let\documenteduntilhere\relax
 
-\definieerblok  [dutch, english, german, czech, italian]
-\verbergblokken [dutch, english, german, czech, italian]
+\defineblock  [dutch, english, german, czech, italian]
+\hideblocks [dutch, english, german, czech, italian]
 
-\stelsetupin
-  [\c!voor=,
-   \c!na=,
-   \c!commando=\setup,
-   \c!verwijzing=0,
-   \c!criterium=\v!gebruikt]
-
-\def\plaatssetup
+\setupsetup
+  [\c!before=,
+   \c!after=,
+   \c!command=\setup,
+   \c!reference=0,
+   \c!criterium=\v!used]
+
+\def\placesetup
   {\bgroup
-   \getvalue{\e!plaats\e!lijstmet texcommandos}
+   \getvalue{\e!place\e!listof texcommandos}
    \egroup}
 
-\def\plaatselkesetup % for fun purposes only
+\def\placeeverysetup % for fun purposes only
   {\bgroup
-   \stelsetupin[\c!verwijzing=2]%
-   \setupreferencing[\c!status=\v!stop]%
-   \getvalue{\e!plaats\e!lijstmet alletexcommandos}%
+   \setupsetup[\c!reference=2]%
+   \setupreferencing[\c!state=\v!stop]%
+   \getvalue{\e!place\e!listof alletexcommandos}%
    \egroup}
 
-\let\setupsetup     \stelsetupin
-\let\placesetup     \plaatssetup
-\let\placeeverysetup\plaatselkesetup
+\let\plaatssetup    \placesetup
+\let\plaatselkesetup\placeeverysetup
 
 \bgroup \catcode`\<=\active \def<{\lesscharacter} \egroup
 
 % \showmessage{setup}{1}{} \catcode`\<=\active
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/setupb.tex b/tex/context/base/setupb.tex
index 1aa66f16b..7e8dbb581 100644
--- a/tex/context/base/setupb.tex
+++ b/tex/context/base/setupb.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=setupb,
+%D   [       filefile=setupb,
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Setup Definitions,
 %D       subtitle=Command Specifications,
@@ -14,6 +14,7 @@
 % nieuw: oncomment plaatssamengesteldelijst
 
 % placeheadtext placeheadnumber  placefloatnumber
+% setupinitial placeinitial \c!status \c!plaats \c!n \s!font=initial (Initial)
 
 % nog 'reductie=ja/nee' in \setupcolors
 
@@ -30,9 +31,9 @@
     [\c!identifier!]
     []
   \variable
-    [\c!spatiering]
-    [\v!opelkaar,\v!ruim]
-    [\v!opelkaar]
+    [\c!spacing]
+    [\v!packed,\v!broad]
+    [\v!packed]
   \variable
     [\s!lefthyphenmin]
     [\c!dimension!]
@@ -42,7 +43,7 @@
     [\c!dimension!]
     [2]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!stop]
   \variable
@@ -205,11 +206,11 @@
     [\c!dimension!]
     []
   \variable
-    [\c!klein]
+    [\c!small]
     [\c!dimension!]
     []
   \variable
-    [\c!groot]
+    [\c!big]
     [\c!dimension!]
     []
 \stopsetup
@@ -306,7 +307,7 @@
   \type
     [\c!vals!]
   \value
-    [5pt,...,12pt,\v!klein,\v!groot,\v!globaal]
+    [5pt,...,12pt,\v!small,\v!big,\v!global]
     []
 \stopsetup
 
@@ -329,8 +330,8 @@
   \type
     [\c!opt!\c!vals!]
   \value
-    [\v!ja,\v!nee,\v!kap,\c!text!]
-    [\v!ja]
+    [\v!yes,\v!no,\v!cap,\c!text!]
+    [\v!yes]
 \stopsetup
 
 % colo-ini
@@ -351,45 +352,45 @@
   \type
     [\c!vars!]
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!globaal,\v!lokaal]
+    [\c!state]
+    [\v!start,\v!stop,\v!global,\v!local]
     [\v!stop]
   \variable
-    [\c!conversie]
-    [\v!ja,\v!nee,\v!altijd]
-    [\v!ja]
+    [\c!conversion]
+    [\v!yes,\v!no,\v!always]
+    [\v!yes]
   \variable
-    [\c!reductie]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!reduction]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
     [\c!rgb]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!cmyk]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!mp\c!cmyk]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!mp\c!spot]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!tekstkleur]
+    [\c!textcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!splitsen]
-    [\c!c,\c!m,\c!y,\c!k,\c!p,\c!s,\v!nee,\c!identifier!]
-    [\v!nee]
+    [\c!split]
+    [\c!c,\c!m,\c!y,\c!k,\c!p,\c!s,\v!no,\c!identifier!]
+    [\v!no]
   \variable
     [\c!criterium]
-    [\v!alles,\v!geen]
-    [\v!geen]
+    [\v!all,\v!none]
+    [\v!none]
 \stopsetup
 
 \startsetup
@@ -510,7 +511,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!rgb,\v!cmyk,\v!grijs,\v!s]
+    [\v!rgb,\v!cmyk,\v!gray,\v!s]
     [\v!rgb]
 \stopsetup
 
@@ -523,7 +524,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!horizontaal,\v!vertikaal,\v!naam,\v!waarde]
+    [\v!horizontal,\v!vertical,\v!name,\v!value]
     []
 \stopsetup
 
@@ -536,7 +537,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!horizontaal,\v!vertikaal,\v!naam,\v!waarde,\v!nummer]
+    [\v!horizontal,\v!vertical,\v!name,\v!value,\v!number]
     []
 \stopsetup
 
@@ -586,19 +587,19 @@
   \type
     [\c!vars!]
   \variable
-    [\c!spatie]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!space]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!optie]
-    [\v!schuin,\v!normaal,\v!geen]
-    [\v!geen]
+    [\c!option]
+    [\v!slanted,\v!normal,\v!none]
+    [\v!none]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     [\v!type]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
 \stopsetup
@@ -633,7 +634,7 @@
   \type
     [\c!val!\c!vars!]
   \value
-    [\v!file,\v!typen,\c!identifier!]
+    [\v!file,\v!typing,\c!identifier!]
     []
   \inheritvariables
     [\y!setuptyping]
@@ -646,74 +647,74 @@
   \type
     [\c!opt!\c!val!\c!vars!]
   \value
-    [\v!file,\v!typen,\c!identifier!]
+    [\v!file,\v!typing,\c!identifier!]
     []
   \variable
-    [\c!spatie]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!space]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!pagina]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!page]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!optie]
-    [\v!schuin,\v!normaal,\v!commandos,\v!kleur,\v!geen]
-    [\v!geen]
+    [\c!option]
+    [\v!slanted,\v!normal,\v!commands,\v!color,\v!none]
+    [\v!none]
   \variable
-    [\c!tekst]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!text]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [i\c!commando]
+    [i\c!command]
     [\c!command!]
     [\ttsl]
   \variable
-    [v\c!commando]
+    [v\c!command]
     [\c!command!]
     []
   \variable
-    [c\c!commando]
+    [c\c!command]
     [\c!command!]
     [\tf]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!marge]
-    [\c!dimension!,\v!standaard,\v!ja,\v!nee]
+    [\c!margin]
+    [\c!dimension!,\v!standard,\v!yes,\v!no]
     [0pt]
   \variable
-    [\c!evenmarge]
+    [\c!evenmargin]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!onevenmarge]
+    [\c!oddmargin]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!blanko]
-    [\c!dimension!,\v!klein,\v!middel,\v!groot,\v!standaard,\v!halveregel,\v!regel]
-    [\v!regel]
+    [\c!blank]
+    [\c!dimension!,\v!small,\v!medium,\v!big,\v!standard,\v!halfline,\v!line]
+    [\v!line]
   \variable
     [\c!escape]
     [\c!character!]
     [/]
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     [\v!type]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
@@ -721,14 +722,14 @@
     [\c!identifier!]
     [colorpretty]
   \variable
-    [\c!regels]
-    [\v!ja,\v!nee,\v!afgebroken]
-    [\v!ja]
+    [\c!lines]
+    [\v!yes,\v!no,\v!hyphenated]
+    [\v!yes]
 \stopsetup
 
 \startsetup
   \command
-    [\e!start<<\y!typen>>]
+    [\e!start<<\y!typing>>]
   \type
     [\c!stp!]
 \stopsetup
@@ -754,55 +755,55 @@
   \type
     [\c!vars!]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!numbers]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!tekst]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!text]
   \variable
-    [\c!plaats]
-    [\v!pagina,\v!tekst,\v!kolommen,\v!eerstekolom,\v!laatstekolom,\v!hoog,\v!geen]
-    [\v!pagina]
+    [\c!location]
+    [\v!page,\v!text,\v!columns,\v!firstcolumn,\v!lastcolumn,\v!high,\v!none]
+    [\v!page]
   \variable
-    [\c!lijn]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!rule]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
-    [\v!klein]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
+    [\v!small]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [.125em]
   \variable
-    [\c!kolomafstand]
+    [\c!columndistance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!margeafstand]
+    [\c!margindistance]
     [\c!dimension!]
     [.5em]
   \variable
@@ -810,29 +811,29 @@
     [\c!number!]
     [1]
   \variable
-    [\c!nummercommando]
+    [\c!numbercommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!tekstcommando]
+    [\c!textcommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!splitsen]
-    [\v!soepel,\v!streng,\v!zeerstreng,\c!number!]
-    [\v!soepel]
+    [\c!split]
+    [\v!tolerant,\v!strict,\v!verystrict,\c!number!]
+    [\v!tolerant]
   \variable
-    [\c!tekstletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!textstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
   \variable
-    [\c!tekstkleur]
+    [\c!textcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!interactie]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!interaction]
+    [\v!yes,\v!no]
+    [\v!yes]
   \inheritvariables
     [\y!framed]
     []
@@ -844,7 +845,7 @@
   \type
     [\c!vars!]
   \inheritvariables
-    [\y!doordefinieren]
+    [\y!definedescription]
     []
 \stopsetup
 
@@ -903,23 +904,23 @@
   \type
     [\c!vars!]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [a,b,c]
     [a]
   \variable
-    [\c!lijndikte]
+    [\c!rulethickness]
     [\c!dimension!]
-    [\lijndikte]
+    [\linewidth]
   \variable
-    [\c!onderoffset]
+    [\c!bottomoffset]
     [\c!dimension!]
     [1.5pt]
   \variable
-    [\c!bovenoffset]
+    [\c!topoffset]
     [\c!dimension!]
     [2.5pt]
   \variable
-    [\c!lijnkleur]
+    [\c!rulecolor]
     [\c!identifier!]
     []
 \stopsetup
@@ -1038,41 +1039,41 @@
   \type
     [\c!vars!]
   \variable
-    [\c!titel]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!title]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!sc]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\v!yes,\v!no]
+    [\v!no]
 \stopsetup
 
 \startsetup
-  \command[\y!kap]
+  \command[\y!smallcapped]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!nokap]
+  \command[\y!notsmallcapped]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!KAP]
+  \command[\y!CAPPED]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!Kap]
+  \command[\y!SmallCapped]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!Kaps]
+  \command[\y!SmallCaps]
   \type[\c!wrds!]
   \value[\c!text!][]
 \stopsetup
@@ -1265,11 +1266,11 @@
   \type
     [\c!var!]
   \variable
-    [\c!niveau]
+    [\c!level]
     [\c!number!]
     [1]
   \variable
-    [\c!lijndikte]
+    [\c!rulethickness]
     [\c!dimension!]
     []
 \stopsetup
@@ -1329,131 +1330,131 @@
   \type
     [\c!vars!]
   \variable
-    [\c!hoogte]
-    [\v!passend,\v!ruim,\c!dimension!]
-    [\v!ruim]
+    [\c!height]
+    [\v!fit,\v!broad,\c!dimension!]
+    [\v!broad]
   \variable
-    [\c!breedte]
-    [\v!passend,\v!ruim,\v!vast,\v!lokaal,\c!dimension!]
-    [\v!ruim]
+    [\c!width]
+    [\v!fit,\v!broad,\v!fixed,\v!local,\c!dimension!]
+    [\v!broad]
   \variable
     [\c!offset]
-    [\v!geen,\v!overlay,\v!default,\c!dimension!]
+    [\v!none,\v!overlay,\v!default,\c!dimension!]
     [1em]
   \variable
-    [\c!plaats]
-    [\v!laag,\v!diepte,\v!hangend]
+    [\c!location]
+    [\v!low,\v!depth,\v!hanging]
     []
   \variable
-    [\c!optie]
-    [\v!geen,\v!leeg]
-    [\v!geen]
+    [\c!option]
+    [\v!none,\v!empty]
+    [\v!none]
   \variable
     [\c!strut]
-    [\v!ja,\v!nee,\v!globaal,\v!lokaal]
-    [\v!ja]
+    [\v!yes,\v!no,\v!global,\v!local]
+    [\v!yes]
   \variable
-    [\c!uitlijnen]
-    [\v!nee,\v!links,\v!rechts,\v!midden,\v!normaal,\v!hoog,\v!laag,\v!laho]
-    [\v!nee]
+    [\c!align]
+    [\v!no,\v!left,\v!right,\v!middle,\v!normal,\v!high,\v!low,\v!lohi]
+    [\v!no]
   \variable
-    [\c!onder]
+    [\c!bottom]
     [\c!command!]
     [\vss]
   \variable
-    [\c!boven]
+    [\c!top]
     [\c!command!]
     []
   \variable
-    [\c!kader]
-    [\v!aan,\v!uit,\v!geen,\v!overlay]
-    [\v!aan]
+    [\c!frame]
+    [\v!on,\v!off,\v!none,\v!overlay]
+    [\v!on]
   \variable
-    [\c!bovenkader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!topframe]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!onderkader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!bottomframe]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!linkerkader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!leftframe]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!rechterkader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!rightframe]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!kaderoffset]
+    [\c!frameoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kaderdiepte]
+    [\c!framedepth]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kaderhoek]
-    [\v!rond,\v!recht]
-    [\v!recht]
+    [\c!framecorner]
+    [\v!round,\v!rectangular]
+    [\v!rectangular]
   \variable
-    [\c!kaderstraal]
+    [\c!frameradius]
     [\c!dimension!]
     [.5\korpsgrootte]
   \variable
-    [\c!kaderkleur]
+    [\c!framecolor]
     [\c!identifier!]
     []
   \variable
-    [\c!achtergrond]
-    [\v!raster,\v!kleur,\v!geen,\v!voorgrond,\c!identifier!]
-    [\v!geen]
+    [\c!background]
+    [\v!screen,\v!color,\v!none,\v!foreground,\c!identifier!]
+    [\v!none]
   \variable
-    [\c!achtergrondraster]
+    [\c!backgroundscreen]
     [\c!number!]
     [0.9]
   \variable
-    [\c!achtergrondkleur]
+    [\c!backgroundcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!achtergrondoffset]
-    [\v!kader,\c!dimension!]
+    [\c!backgroundoffset]
+    [\v!frame,\c!dimension!]
     [0pt]
   \variable
-    [\c!achtergronddiepte]
+    [\c!backgrounddepth]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!achtergrondhoek]
-    [\v!rond,\v!recht]
-    [\v!recht]
+    [\c!backgroundcorner]
+    [\v!round,\v!rectangular]
+    [\v!rectangular]
   \variable
-    [\c!achtergrondstraal]
+    [\c!backgroundradius]
     [\c!dimension!]
     [.5\korpsgrootte]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!hoek]
-    [\v!rond,\v!recht]
-    [\v!recht]
+    [\c!corner]
+    [\v!round,\v!rectangular]
+    [\v!rectangular]
   \variable
-    [\c!straal]
+    [\c!radius]
     [\c!dimension!]
     [.5\korpsgrootte]
   \variable
-    [\c!leeg]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!empty]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!voorgrondkleur]
+    [\c!foregroundcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!voorgrondletter]
+    [\c!foregroundstyle]
     [\c!identifier!]
     []
   \value
@@ -1503,59 +1504,59 @@
   \type
     [\c!var!]
   \variable
-    [\c!interlinie]
-    [\v!klein,\v!middel,\v!groot]
-    [\v!klein]
+    [\c!interlinespace]
+    [\v!small,\v!medium,\v!big]
+    [\v!small]
   \variable
     [\c!n]
     [\c!number!]
     [3]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!achtergrondkleur]
+    [\c!backgroundcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!,\v!max]
     [.5\linewidth]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!,\v!max]
     [.5\linewidth]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [\v!a,\v!b,\v!c,\v!d]
     [\v!a]
   \variable
-    [\c!lijndikte]
+    [\c!rulethickness]
     [\c!dimension!]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!achtergrond]
-    [\v!kleur]
+    [\c!background]
+    [\v!color]
     []
   \variable
-    [\c!achtergrondkleur]
+    [\c!backgroundcolor]
     [\c!identifier!]
     []
 \stopsetup
@@ -1602,48 +1603,48 @@
   \type
     [\c!vars!]
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!klein...,\c!command!] % \v!kap
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!small...,\c!command!] % \v!cap
+    [\v!bold]
   \variable
-    [\c!links]
+    [\c!left]
     [\c!command!]
     [\hfill]
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!command!]
     [\hfill]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!binnen]
+    [\c!inner]
     [\c!command!]
     []
   \variable
-    [\c!regelcorrectie]
-    [\v!aan,\v!uit]
-    [\v!aan]
+    [\c!linecorrection]
+    [\v!on,\v!off]
+    [\v!on]
   \variable
-    [\c!dieptecorrectie]
-    [\v!aan,\v!uit]
-    [\v!aan]
+    [\c!depthcorrection]
+    [\v!on,\v!off]
+    [\v!on]
   \variable
-    [\c!marge]
-    [\v!standaard,\v!ja,\v!nee]
-    [\v!standaard]
+    [\c!margin]
+    [\v!standard,\v!yes,\v!no]
+    [\v!standard]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!midden,\v!geen]
+    [\c!location]
+    [\v!left,\v!right,\v!middle,\v!none]
     []
   \inheritvariables
     [\y!setupframed]
@@ -1669,7 +1670,7 @@
   \type
     [\c!opt!\c!val!\c!opt!\c!vars!\c!stp!]
   \value
-    [\v!links,\v!rechts,\v!midden,\v!geen]
+    [\v!left,\v!right,\v!middle,\v!none]
     []
   \inheritvariables
     [\y!setupframedtexts]
@@ -1706,31 +1707,31 @@
   \type
     [\c!vars!]
   \variable
-    [\c!linkeroffset]
+    [\c!leftoffset]
     [\c!dimension!]
     [.5\korpsgrootte]
   \variable
-    [\c!rechteroffset]
+    [\c!rightoffset]
     [\c!dimension!]
     [.5\korpsgrootte]
   \variable
-    [\c!bovenoffset]
+    [\c!topoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!onderoffset]
+    [\c!bottomoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \inheritvariables
@@ -1764,35 +1765,35 @@
   \type
     [\c!vars!]
   \variable
-    [\c!breedte]
-    [\v!passend,\v!ruim,\c!dimension!]
-    [\v!ruim]
+    [\c!width]
+    [\v!fit,\v!broad,\c!dimension!]
+    [\v!broad]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
     [\c!n]
     [\c!number!]
     [1]
   \variable
-    [\c!interlinie]
-    [\v!klein,\v!middel,\v!groot]
-    [\v!klein]
+    [\c!interlinespace]
+    [\v!small,\v!medium,\v!big]
+    [\v!small]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     []
 \stopsetup
@@ -1813,25 +1814,25 @@
   \type
     [\c!vars!]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [3cm]
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [3cm]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
 \stopsetup
 
 \startsetup
@@ -1840,43 +1841,43 @@
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!links,\v!inmarge]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!inmargin]
+    [\v!left]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [2em]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [2em]
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!lijnkleur]
+    [\c!rulecolor]
     [\c!identifier!]
     []
 \stopsetup
@@ -1887,7 +1888,7 @@
   \type
     [\c!opt!\c!val!\c!opt!\c!arg!]
   \value
-    [\v!boven,\v!onder]
+    [\v!top,\v!bottom]
     []
   \value
     [\c!text!]
@@ -1900,7 +1901,7 @@
   \type
     [\c!opt!\c!val!\c!opt!\c!arg!\c!stp!]
   \value
-    [\v!boven,\v!onder]
+    [\v!top,\v!bottom]
     []
   \value
     [\c!text!]
@@ -1933,23 +1934,23 @@
   \type
     [\c!vars!]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!,\v!max]
     [1.5em]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!,\v!max]
     [1ex]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!,\v!max]
     [0pt]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [\c!a,\c!b]
     [\c!a]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [.25ex]
   \variable
@@ -1988,12 +1989,12 @@
 \stopsetup
 
 \startsetup
-  \command[\y!geentest]
+  \command[\y!donttest]
   \type[]
 \stopsetup
 
 \startsetup
-  \command[\y!startdeelomgeving]
+  \command[\e!start\v!localenvironment]
   \type[\c!stp!]
 \stopsetup
 
@@ -2003,7 +2004,7 @@
   \type
     [\c!vars!]
   \variable
-    [\c!resolutie]
+    [\c!resolution]
     [\c!number!]
     []
   \variable
@@ -2011,12 +2012,12 @@
     [\c!text!]
     [\jobname]
   \variable
-    [\c!gebied]
+    [\c!directory]
     [\c!text!]
     []
   \variable
-    [\c!willekeur]
-    [\v!normaal,\v!klein,\v!middel,\v!groot,\c!number!]
+    [\c!random]
+    [\v!normal,\v!small,\v!medium,\v!big,\c!number!]
     []
 \stopsetup
 
@@ -2045,7 +2046,7 @@
 \startsetup
   \command[\y!lohi]
   \type[\c!opt!\c!val!\c!arg!\c!arg!]
-  \value[\v!laag][]
+  \value[\v!low][]
   \value[\c!text!][]
   \value[\c!text!][]
 \stopsetup
@@ -2056,7 +2057,7 @@
   \type
     [\c!opt!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
+    [\v!text,\v!margin,\v!edge]
     []
 \stopsetup
 
@@ -2068,54 +2069,68 @@
 % \stopsetup
 
 \startsetup
-  \command[\y!regellinks]
+  \command[\y!leftaligned]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!regelrechts]
+  \command[\y!rightaligned]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!regelmidden]
+  \command[\y!midaligned]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!woordrechts]
+  \command[\y!wordright]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!inmarge]
+  \command[\y!inmargin]
   \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
-  \value[+,-,\v!laag][]
+  \value[+,-,\v!low][]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!inanderemarge]
+  \command[\y!inothermargin]
   \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
-  \value[+,-,\v!laag][]
+  \value[+,-,\v!low][]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!inlinker]
+  \command[\y!inleft]
   \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
-  \value[+,-,\v!laag][]
+  \value[+,-,\v!low][]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!inrechter]
+  \command[\y!inright]
   \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
-  \value[+,-,\v!laag][]
+  \value[+,-,\v!low][]
+  \value[\c!text!][]
+\stopsetup
+
+\startsetup
+  \command[\y!ininner]
+  \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
+  \value[+,-,\v!low][]
+  \value[\c!text!][]
+\stopsetup
+
+\startsetup
+  \command[\y!inouter]
+  \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
+  \value[+,-,\v!low][]
   \value[\c!text!][]
 \stopsetup
 
@@ -2160,126 +2175,126 @@
 % \stopsetup
 
 \startsetup
-  \command[\y!margetekst]
+  \command[\y!margintext]
   \type[\c!opt!\c!val!\c!opt!\c!ref!\c!arg!]
-  \value[+,-,\v!laag][]
+  \value[+,-,\v!low][]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelmargeblokkenin]
+    [\y!setupmarginblocks]
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!inmarge,\v!links,\v!midden,\v!rechts]
-    [\v!inmarge]
+    [\c!location]
+    [\v!inmargin,\v!left,\v!middle,\v!right]
+    [\v!inmargin]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts,\v!nee]
+    [\c!align]
+    [\v!left,\v!middle,\v!right,\v!no]
     []
   \variable
-    [\c!boven]
+    [\c!top]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!onder]
+    [\c!bottom]
     [\c!command!]
     [\vfill]
   \variable
-    [\c!links]
+    [\c!left]
     [\c!command!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!command!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startmargeblok]
+    [\y!startmarginblock]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
-  \command[\v!deel]
+  \command[\v!part]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!titel]
+  \command[\v!title]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!hoofdstuk]
+  \command[\v!chapter]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!paragraaf]
+  \command[\v!section]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!sub\v!paragraaf]
+  \command[\v!sub\v!section]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!sub\v!sub\v!paragraaf]
+  \command[\v!sub\v!sub\v!section]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!onderwerp]
+  \command[\v!subject]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!sub\v!onderwerp]
+  \command[\v!sub\v!subject]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!sub\v!sub\v!onderwerp]
+  \command[\v!sub\v!sub\v!subject]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\v!bijlage]
+  \command[\v!appendix]
   \type[\c!opt!\c!refs!\c!arg!]
   \value[\c!text!][]
 \stopsetup
@@ -2291,13 +2306,13 @@
 \stopsetup
 
 \startsetup
-  \command[\y!op]
+  \command[\y!at]
   \type[\c!optint!\c!arg!\c!optint!\c!arg!\c!ref!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!over]
+  \command[\y!about]
   \type[\c!optint!\c!arg!\c!ref!]
   \value[\c!text!][]
 \stopsetup
@@ -2359,15 +2374,15 @@
     [\c!identifier!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     []
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
@@ -2379,7 +2394,7 @@
 % rudiment
 %
 % \startsetup
-%   \command[\y!definieerhbox]
+%   \command[\y!definehbox]
 %   \type[\c!val!\c!val!]
 %   \value[\c!identifier!][]
 %   \value[\c!number!][]
@@ -2398,18 +2413,18 @@
 \stopsetup
 
 \startsetup
-  \command[\y!omlaag]
+  \command[\y!godown]
   \type[\c!val!]
   \value[\c!dimension!][]
 \stopsetup
 
 \startsetup
-  \command[\y!witruimte]
+  \command[\y!whitespace]
   \type[]
 \stopsetup
 
 \startsetup
-  \command[\y!geenwitruimte]
+  \command[\y!nowhitespace]
   \type[]
 \stopsetup
 
@@ -2440,167 +2455,171 @@
 \stopsetup
 
 \startsetup
-  \command[\y!opelkaar]
+  \command[\y!packed]
   \type[]
 \stopsetup
 
-\startsetup
-  \command[\y!herhaal]
-  \type[\c!val!]
-  \value[\c!repeat!\c!text!][]
-\stopsetup
+% \startsetup
+%   \command[\y!redo]
+%   \type[\c!val!]
+%   \value[\c!repeat!\c!text!][]
+% \stopsetup
 
 \startsetup
   \command
-    [\y!steldoordefinierenin]
+    [\y!setupdescriptions]
   \type
     [\c!opt!\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!breedte]
-    [\v!passend,\v!ruim,\c!dimension!]
+    [\c!width]
+    [\v!fit,\v!broad,\c!dimension!]
     [8em]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!monster]
+    [\c!sample]
     [\c!text!]
     []
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts]
+    [\c!align]
+    [\v!left,\v!middle,\v!right]
     []
   \variable
-    [\c!marge]
-    [\v!standaard,\v!ja,\v!nee,\c!dimension!]
+    [\c!margin]
+    [\v!standard,\v!yes,\v!no,\c!dimension!]
     []
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!boven,\v!aanelkaar,
-     \v!inmarge,\v!inlinker,\v!inrechter,\v!hangend]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!right,\v!top,\v!serried,\c!command,
+     \v!inmargin,\v!inleft,\v!inright,\v!hanging]
+    [\v!left]
+  \variable
+    [\c!headcommand]
+    []
+    []
   \variable
     [\c!hang]
-    [\v!passend,\v!ruim,\c!number!]
+    [\v!fit,\v!broad,\c!number!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!inspringen]
-    [\v!nooit,\v!niet,\v!nee,\v!ja,\v!altijd,\v!eerste,\v!volgende]
-    [\v!nooit]
+    [\c!indenting]
+    [\v!never,\v!not,\v!no,\v!yes,\v!always,\v!first,\v!next]
+    [\v!never]
 \stopsetup
 
 \startsetup
   \command
-    [\y!steldoornummerenin]
+    [\y!setupenumerations]
   \type
     [\c!opt!\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!doordefinieren]
+    [\y!definedescription]
     []
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!boven,\v!aanelkaar,
-     \v!inmarge,\v!inlinker,\v!inrechter,\v!hangend]
-    [\v!boven]
+    [\c!location]
+    [\v!left,\v!right,\v!top,\v!serried,
+     \v!inmargin,\v!inleft,\v!inright,\v!hanging]
+    [\v!top]
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
-    [\c!niveaus]
+    [\c!levels]
     [\c!number!]
     [3]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!numbers]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!tekst]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!text]
   \variable
-    [\c!blokwijze]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!blockway]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!sectienummer]
-    [\v!ja,\v!nummer,\v!nee]
+    [\c!sectionnumber]
+    [\v!yes,\v!number,\v!no]
     []
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [.]
   \variable
-    [\c!afsluiter]
+    [\c!stopper]
     [\c!text!]
     []
   \variable
-    [\c!koppeling]
+    [\c!coupling]
     [\c!identifier!]
     []
   \variable
-    [\c!koppelwijze]
-    [\v!globaal,\v!lokaal]
-    [\v!lokaal]
+    [\c!couplingway]
+    [\v!global,\v!local]
+    [\v!local]
   \variable
-    [\c!nummer]
-    [\v!nee,\c!identifier!]
+    [\c!number]
+    [\v!no,\c!identifier!]
     []
   \variable
-    [\c!titeluitlijnen]
-    [\v!nee,\v!ja]
-    [\v!ja]
+    [\c!aligntitle]
+    [\v!no,\v!yes]
+    [\v!yes]
   \variable
     [\c!start]
     [\c!number!]
     [0]
   \inheritvariables
-    [\y!steldoornummerenin]
+    [\y!setupenumerations]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!doornummeren]
+    [\y!defineenumeration]
   \type
     [\c!vals!\c!opt!\c!val!\c!opt!\c!vars!]
   \value
@@ -2610,13 +2629,13 @@
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!steldoornummerenin]
+    [\y!setupenumerations]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!doornummering>>]
+    [<<\y!enumeration>>]
   \type
     [\c!optint!\c!nop!\c!par!]
   \value
@@ -2626,27 +2645,27 @@
 
 \startsetup
   \command
-    [\e!start<<\y!doornummering>>]
+    [\e!start<<\y!enumeration>>]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!doordefinieren]
+    [\y!definedescription]
   \type
     [\c!val!\c!opt!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!steldoordefinierenin]
+    [\y!setupdescriptions]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!doordefinitie>>]
+    [<<\y!description>>]
   \type
     [\c!arg!\c!nop!\c!par!]
   \value
@@ -2659,7 +2678,7 @@
 
 \startsetup
   \command
-    [\e!start<<\y!doordefinitie>>]
+    [\e!start<<\y!description>>]
   \type
     [\c!arg!\c!stp!]
   \value
@@ -2669,66 +2688,66 @@
 
 \startsetup
   \command
-    [\y!steldoorspringenin]
+    [\y!setupindentations]
   \type
     [\c!opt!\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!breedte]
-    [\v!passend,\c!dimension!]
-    [\v!passend]
+    [\c!width]
+    [\v!fit,\c!dimension!]
+    [\v!fit]
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
-    [\c!monster]
+    [\c!sample]
     [\c!text!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [{:}]
 \stopsetup
 
 \startsetup
   \command
-    [\y!doorspringen]
+    [\y!defineindenting]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!steldoorspringenin]
+    [\y!setupindentations]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!doorsprong>>]
+    [<<\y!indentation>>]
   \type
     [\c!nop!\c!par!]
   \value
@@ -2738,49 +2757,49 @@
 
 \startsetup
   \command
-    [\y!doorlabelen]
+    [\y!definelabel]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
-    [\c!plaats]
-    [\v!inmarge,\v!intekst]
-    [\v!intekst]
+    [\c!location]
+    [\v!inmargin,\v!intext]
+    [\v!intext]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!hoofdstuk]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!chapter]
   \variable
-    [\c!blokwijze]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!blockway]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
   \variable
-    [\c!kopkleur]
+    [\c!headcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!doorlabel>>]
+    [<<\y!labeling>>]
   \type
     [\c!opt!\c!ref!]
 \stopsetup
@@ -2795,45 +2814,45 @@
     [\c!number!]
     [2]
   \variable
-    [\c!nboven]
+    [\c!ntop]
     [\c!number!]
     [1]
   \variable
-    [\c!lijn]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!rule]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!tolerantie]
-    [\v!zeerstreng,\v!streng,\v!soepel,\v!zeersoepel,\v!rek]
-    [\v!soepel]
+    [\c!tolerance]
+    [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch]
+    [\v!tolerant]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1.5em]
   \variable
-    [\c!balanceren]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!balance]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!uitlijnen]
-    [\v!ja,\v!nee,\v!tekst]
-    [\v!tekst]
+    [\c!align]
+    [\v!yes,\v!no,\v!text]
+    [\v!text]
   \variable
-    [\c!blanko]
-    [\v!vast,\v!halveregel,\v!regel,\v!flexibel,\v!groot,\v!middel,\v!klein]
-    [\v!vast,\v!regel]
+    [\c!blank]
+    [\v!fixed,\v!halfline,\v!line,\v!flexible,\v!big,\v!medium,\v!small]
+    [\v!fixed,\v!line]
   \variable
-    [\c!optie]
-    [\v!achtergrond]
+    [\c!option]
+    [\v!background]
     []
   \variable
-    [\c!richting]
-    [\v!links,\v!rechts]
-    [\v!rechts]
+    [\c!direction]
+    [\v!left,\v!right]
+    [\v!right]
   \inheritvariables
     [\y!setupframed]
     []
@@ -2858,7 +2877,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!hoofd,\v!voet]
+    [\v!header,\v!footer]
     []
   \value
     [\c!text!]
@@ -2877,43 +2896,43 @@
   \type
     [\c!opt!\c!val!\c!vars!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \variable
-    [\c!status]
-    [\v!normaal,\v!stop,\v!start,\v!leeg,\v!hoog,\v!geen,
-     \v!geenmarkering,\c!identifier!]
-    [\v!normaal]
+    [\c!state]
+    [\v!normal,\v!stop,\v!start,\v!empty,\v!high,\v!none,
+     \v!nomarking,\c!identifier!]
+    [\v!normal]
   \variable
     [\c!strut]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!linkerletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!leftstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!rechterletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!rightstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!linkerbreedte]
+    [\c!leftwidth]
     [\c!dimension!]
     []
   \variable
-    [\c!rechterbreedte]
+    [\c!rightwidth]
     [\c!dimension!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
@@ -2986,13 +3005,13 @@
   \type
     [\c!opt!\c!val!\c!val!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
 \stopsetup
 
@@ -3002,13 +3021,13 @@
   \type
     [\c!opt!\c!val!\c!val!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
 \stopsetup
 
@@ -3018,13 +3037,13 @@
   \type
     [\c!opt!\c!val!\c!val!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
 \stopsetup
 
@@ -3034,13 +3053,13 @@
   \type
     [\c!opt!\c!val!\c!val!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
 \stopsetup
 
@@ -3050,13 +3069,13 @@
   \type
     [\c!opt!\c!val!\c!val!\c!val!]
   \value
-    [\v!tekst,\v!marge,\v!rand]
-    [\v!tekst]
+    [\v!text,\v!margin,\v!edge]
+    [\v!text]
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
   \value
-    [\c!text!,\c!section!,\v!datum,\c!marker!,\v!paginanummer]
+    [\c!text!,\c!section!,\v!date,\c!marker!,\v!pagenumber]
     []
 \stopsetup
 
@@ -3115,17 +3134,17 @@
     [\c!identifier!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!command!]
     [---]
   \variable
-    [\c!expansie]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!no]
+    [\v!no]
 \stopsetup
 
 \startsetup
@@ -3150,7 +3169,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!eerste,\v!laatste,\v!vorige,\v!beide,\v!alles,\v!huidige]
+    [\v!first,\v!last,\v!previous,\v!both,\v!all,\v!current]
     []
 \stopsetup
 
@@ -3170,116 +3189,116 @@
   \type
     [\c!vars!]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\v!passend,\v!midden]
+    [\c!width]
+    [\c!dimension!,\v!fit,\v!middle]
     [15cm]
   \variable
-    [\c!hoogte]
-    [\c!dimension!,\v!passend,\v!midden]
+    [\c!height]
+    [\c!dimension!,\v!fit,\v!middle]
     [25cm]
   \variable
-    [\c!rugwit]
+    [\c!backspace]
     [\c!dimension!]
     [2.5cm]
   \variable
-    [\c!kopwit]
+    [\c!topspace]
     [\c!dimension!]
     [2.5cm]
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [2.5cm]
   \variable
-    [\c!linkermarge]
+    [\c!leftmargin]
     [\c!dimension!]
     []
   \variable
-    [\c!rechtermarge]
+    [\c!rightmargin]
     [\c!dimension!]
     []
   \variable
-    [\c!hoofd]
+    [\c!header]
     [\c!dimension!]
     [2.0cm]
   \variable
-    [\c!voet]
+    [\c!footer]
     [\c!dimension!]
     [2.0cm]
   \variable
-    [\c!boven]
+    [\c!top]
     [\c!dimension!]
     [2.0cm]
   \variable
-    [\c!onder]
+    [\c!bottom]
     [\c!dimension!]
     [2.0cm]
   \variable
-    [\c!linkerrand]
+    [\c!leftedge]
     [\c!dimension!]
     [3cm]
   \variable
-    [\c!rechterrand]
+    [\c!rightedge]
     [\c!dimension!]
     [3cm]
   \variable
-    [\c!hoofdafstand]
+    [\c!headerdistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!voetafstand]
+    [\c!footerdistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!bovenafstand]
+    [\c!topdistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!onderafstand]
+    [\c!bottomdistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!linkermargeafstand]
+    [\c!leftmargindistance]
     [\c!dimension!]
     [12pt]
   \variable
-    [\c!rechtermargeafstand]
+    [\c!rightmargindistance]
     [\c!dimension!]
     [12pt]
   \variable
-    [\c!linkerrandafstand]
+    [\c!leftedgedistance]
     [\c!dimension!]
     [12pt]
   \variable
-    [\c!rechterrandafstand]
+    [\c!rightedgedistance]
     [\c!dimension!]
     [12pt]
   \variable
-    [\c!rugoffset]
+    [\c!horoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kopoffset]
+    [\c!veroffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!markering]
-    [\v!aan,\v!uit,\v!kleur,\v!raster,\v!tekst]
-    [\v!uit]
+    [\c!marking]
+    [\v!on,\v!off,\v!color,\v!screen,\v!text]
+    [\v!off]
   \variable
-    [\c!plaats]
-    [\v!links,\v!midden,\v!rechts,\v!onder,\v!boven,
-     \v!enkelzijdig,\v!dubbelzijdig]
-    [\v!enkelzijdig]
+    [\c!location]
+    [\v!left,\v!middle,\v!right,\v!bottom,\v!top,
+     \v!singlesided,\v!doublesided]
+    [\v!singlesided]
   \variable
-    [\c!schaal]
+    [\c!scale]
     [\c!dimension!]
     [1]
   \variable
@@ -3299,39 +3318,39 @@
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!regels]
+    [\c!lines]
     [\c!number!]
     [0]
   \variable
-    [\c!kolommen]
+    [\c!columns]
     [\c!number!]
     [0]
   \variable
-    [\c!kolomafstand]
+    [\c!columndistance]
     [\c!dimension!]
     [0pt]
   \variable
     [\c!grid]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!bodemwit]
+    [\c!bottomspace]
     [\c!dimension!]
     []
   \variable
-    [\c!snijwit]
+    [\c!cutspace]
     [\c!dimension!]
     []
   \variable
-    [\c!tekstafstand]
+    [\c!textdistance]
     [\c!dimension!]
     []
   \variable
-    [\c!tekstbreedte]
+    [\c!textwidth]
     [\c!number!]
     []
   \variable
-    [\c!tekstmarge]
+    [\c!textmargin]
     [\c!dimension!]
     []
   \variable
@@ -3339,29 +3358,29 @@
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!pagina]
+    [\c!page]
     [\c!identifier!]
     []
   \variable
-    [\c!papier]
+    [\c!paper]
     [\c!identifier!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!paslayoutaan]
+    [\y!adaptlayout]
   \type
     [\c!opt!\c!vals!\c!vars!]
   \value
     [\c!number!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!,\v!max]
     []
   \variable
-    [\c!regels]
+    [\c!lines]
     [\c!number!]
     []
 \stopsetup
@@ -3375,24 +3394,24 @@
 
 \startsetup
   \command
-    [\y!plaatsopgrid]
+    [\y!placeongrid]
   \type
     [\c!opt!\c!val!\c!arg!]
   \inheritvalues
-    [\y!verplaatsopgrid]
+    [\y!moveongrid]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!verplaatsopgrid]
+    [\y!moveongrid]
   \type
     [\c!opt!\c!vals!]
   \value
-    [\v!boven,\v!beide,\v!onder,-\v!boven,-\v!beide,-\v!onder,\v!tekst,
-     \v!hoog,\v!midden,\v!laag,\v!pagina,\v!geen,\v!standaard,
-     \v!ruim,\v!passend,\v!diepte,\v!regel,\c!dimension!]
-    [\v!standaard]
+    [\v!top,\v!both,\v!bottom,-\v!top,-\v!both,-\v!bottom,\v!text,
+     \v!high,\v!middle,\v!low,\v!page,\v!none,\v!standard,
+     \v!broad,\v!fit,\v!depth,\v!line,\c!dimension!]
+    [\v!standard]
 \stopsetup
 
 \startsetup
@@ -3407,7 +3426,7 @@
 
 \startsetup
   \command
-    [\y!startomgeving]
+    [\y!startenvironment]
   \type
     [\c!fil!\c!stp!]
   \value
@@ -3417,7 +3436,7 @@
 
 \startsetup
   \command
-    [\y!startprodukt]
+    [\y!startproduct]
   \type
     [\c!fil!\c!stp!]
   \value
@@ -3427,7 +3446,7 @@
 
 \startsetup
   \command
-    [\y!startonderdeel]
+    [\y!startcomponent]
   \type
     [\c!fil!\c!stp!]
   \value
@@ -3437,7 +3456,7 @@
 
 \startsetup
   \command
-    [\y!geenfilesmeer]
+    [\y!nomorefiles]
   \type
     []
 \stopsetup
@@ -3448,26 +3467,26 @@
   \type
     [\c!opt!\c!or!\c!val!\c!vars!]
   \value
-    [\v!reset,\v!klein,\v!middel,\v!groot,\v!aan,\v!uit]
-    [\v!klein]
+    [\v!reset,\v!small,\v!medium,\v!big,\v!on,\v!off]
+    [\v!small]
   \variable
-    [\v!hoogte]
+    [\v!height]
     [\c!number!]
     [0.72]
   \variable
-    [\v!diepte]
+    [\v!depth]
     [\c!number!]
     [0.28]
   \variable
-    [\v!regel]
+    [\v!line]
     [\c!dimension!]
     [2.8ex]
   \variable
-    [\v!boven]
+    [\v!top]
     [\c!number!]
     [1.0]
   \variable
-    [\v!onder]
+    [\v!bottom]
     [\c!number!]
     [0.4]
 \stopsetup
@@ -3478,69 +3497,69 @@
   \type
     [\c!vars!]
   \variable
-    [\c!variant]
-    [\v!enkelzijdig,\v!dubbelzijdig]
-    [\v!enkelzijdig]
+    [\c!alternative]
+    [\v!singlesided,\v!doublesided]
+    [\v!singlesided]
   \variable
-    [\c!plaats]
-    [\v!hoofd,\v!voet,
-     \v!links,\v!rechts,\v!midden,
-     \v!marge,\v!kantlijn,\v!inlinker,\v!inrechter]
-    [\v!midden]
+    [\c!location]
+    [\v!header,\v!footer,
+     \v!left,\v!right,\v!middle,
+     \v!margin,\v!marginedge,\v!inleft,\v!inright]
+    [\v!middle]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!numbers]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     []
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!deel]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!part]
   \variable
-    [\c!tekst]
+    [\c!text]
     [\c!text!]
     []
   \variable
-    [\c!nummerscheider]
+    [\c!numberseparator]
     [\c!text!]
     [--]
   \variable
-    [\c!tekstscheider]
+    [\c!textseparator]
     [\c!text!]
     []
   \variable
     [\c!sectionnumber!]
-    [\v!ja,\v!nee]
+    [\v!yes,\v!no]
     []
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [--]
   \variable
     [\c!strut]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!oneargument!]
     []
 \stopsetup
@@ -3551,22 +3570,22 @@
   \type
     [\c!vars!]
   \variable
-    [\c!links]
+    [\c!left]
     [\c!dimension!]
     [1.5em]
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!dimension!]
     [1.5em]
   \variable
-    [\c!midden]
+    [\c!middle]
     [\c!dimension!]
     [1.5em]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieer]
+    [\y!define]
   \type
     [\c!opt!\c!val!\c!cmd!\c!arg!]
   \value
@@ -3576,7 +3595,7 @@
 
 \startsetup
   \command
-    [\y!gebruikcommandos]
+    [\y!usecommands]
   \type
     [\c!arg!]
 \stopsetup
@@ -3590,201 +3609,201 @@
     [\c!identifier!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!commandos]
+    [\c!commands]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelkoppenin]
+    [\y!setupheads]
   \type
     [\c!vars!]
   \variable
-    [\c!sectienummer]
-    [\v!ja,\v!nummer,\v!nee]
-    [\v!ja]
+    [\c!sectionnumber]
+    [\v!yes,\v!number,\v!no]
+    [\v!yes]
   \variable
-    [\c!variant]
-    [\v!normaal,\v!marge,\v!midden,\v!tekst,\v!alinea]
-    [\v!normaal]
+    [\c!alternative]
+    [\v!normal,\v!margin,\v!middle,\v!text,\v!paragraph]
+    [\v!normal]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [.]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!rechts,\v!normaal,\v!ruim]
-    [\v!normaal]
+    [\c!align]
+    [\v!left,\v!right,\v!normal,\v!broad]
+    [\v!normal]
   \variable
-    [\c!titeluitlijnen]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!aligntitle]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!tolerantie]
-    [\v!zeerstreng,\v!streng,\v!soepel,\v!zeersoepel,\v!rek]
-    [\v!soepel]
+    [\c!tolerance]
+    [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch]
+    [\v!tolerant]
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!twoarguments!]
     []
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [0pt]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelblokkopjesin]
+    [\y!setupcaptions]
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!boven,\v!onder,\v!geen,\v!hoog,\v!laag,\v!midden]
-    [\v!onder]
+    [\c!location]
+    [\v!top,\v!bottom,\v!none,\v!high,\v!low,\v!middle]
+    [\v!bottom]
   \variable
-    [\c!breedte]
-    [\v!passend,\v!ruim,\v!max,\c!dimension!]
-    [\v!passend]
+    [\c!width]
+    [\v!fit,\v!broad,\v!max,\c!dimension!]
+    [\v!fit]
   \variable
-    [\c!minbreedte]
-    [\v!passend,\c!dimension!]
-    [\v!passend]
+    [\c!minwidth]
+    [\v!fit,\c!dimension!]
+    [\v!fit]
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!nummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!number]
+    [\v!yes,\v!no]
+    [\v!yes]
   %\variable
-  %  [\c!voor]
+  %  [\c!before]
   %  [\c!command!]
-  %  [\blanko]
+  %  [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    []% {\blanko[\v!middel]}]
+    []% {\blank[\v!medium]}]
   %\variable
-  %  [\c!na]
+  %  [\c!after]
   %  [\c!command!]
-  %  [\blanko]
+  %  [\blank]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts,\v!nee]
+    [\c!align]
+    [\v!left,\v!middle,\v!right,\v!no]
     []
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!numbers]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!tekst]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!text]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [.]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!command!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelblokkopjein]
+    [\y!setupcaption]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stelblokkopjesin]
+    [\y!setupcaptions]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelplaatsblokkenin]
+    [\y!setupfloats]
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!midden]
-    [\v!midden]
+    [\c!location]
+    [\v!left,\v!right,\v!middle]
+    [\v!middle]
   \variable
-    [\c!breedte]
-    [\v!passend,\c!dimension!]
-    [\v!passend]
+    [\c!width]
+    [\v!fit,\c!dimension!]
+    [\v!fit]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!voorwit]
-    [\c!repeat!\v!klein,\c!repeat!\v!middel,\c!repeat!\v!groot,\v!geen]
+    [\c!spacebefore]
+    [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none]
     []
   \variable
-    [\c!nawit]
-    [\c!repeat!\v!klein,\c!repeat!\v!middel,\c!repeat!\v!groot,\v!geen]
+    [\c!spaceafter]
+    [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none]
     []
   \variable
-    [\c!zijvoorwit]
-    [\c!repeat!\v!klein,\c!repeat!\v!middel,\c!repeat!\v!groot,\v!geen]
+    [\c!sidespacebefore]
+    [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none]
     []
   \variable
-    [\c!zijnawit]
-    [\c!repeat!\v!klein,\c!repeat!\v!middel,\c!repeat!\v!groot,\v!geen]
+    [\c!sidespaceafter]
+    [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,\v!none]
     []
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!nboven]
+    [\c!ntop]
     [\c!number!]
     [2]
   \variable
-    [\c!nonder]
+    [\c!nbottom]
     [\c!number!]
     [0]
   \variable
-    [\c!nregels]
+    [\c!nlines]
     [\c!number!]
     [4]
   \variable
@@ -3792,21 +3811,21 @@
     [\c!identifier!]
     []
   \variable
-    [\c!tolerantie]
+    [\c!tolerance]
     [0,1,2]
     [1]
   \variable
-    [\c!linkermargeafstand]
+    [\c!leftmargindistance]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!rechtermargeafstand]
+    [\c!rightmargindistance]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!zijuitlijnen]
-    [\v!normaal,\v!regel]
-    [\v!normaal]
+    [\c!sidealign]
+    [\v!normal,\v!line]
+    [\v!normal]
   \inheritvariables
     [\y!setupframed]
     []
@@ -3814,54 +3833,66 @@
 
 \startsetup
   \command
-    [\y!stelplaatsblokkensplitsenin]
+    [\y!setupfloatsplitting]
   \type
     [\c!vars!]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!letter]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!character]
   \variable
-    [\c!regels]
+    [\c!lines]
     [\c!number!]
     [3]
 \stopsetup
 
 \startsetup
   \command
-    [\y!splitsplaatsblok]
+    [\y!splitfloat]
   \type
     [\c!opt!\c!vars!\c!arg!\c!arg!]
   \inheritvariables
-    [\y!stelplaatsblokkensplitsenin]
+    [\y!setupfloatsplitting]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelnaastplaatsenin]
+    [\y!setupoppositeplacing]
   \type
     [\c!var!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!stop]
+  \variable
+    [\c!before]
+    [\c!command!]
+    []
+  \variable
+    [\c!inbetween]
+    [\c!command!]
+    [\blank]
+  \variable
+    [\c!after]
+    [\c!command!]
+    []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startnaast]
+    [\y!startopposite]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelkoppeltekenin]
+    [\y!setuphyphenmark]
   \type
     [\c!var!]
   \variable
-    [\c!teken]
+    [\c!sign]
     [--,---,-,~,(,),=,/]
     [--]
 \stopsetup
@@ -3872,11 +3903,11 @@
   \type
     [\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!overlay]
     [\v!start]
   \variable
-    [\c!eenheid]
+    [\c!unit]
     [\s!cm,\s!pt,\s!em,\s!mm,\s!ex,\s!es,\s!in]
     [\s!cm]
   \variable
@@ -3884,21 +3915,21 @@
     [\c!number!]
     [1]
   \variable
-    [\c!schaal]
+    [\c!scale]
     [\c!number!]
     [1]
   \variable
     [\c!offset]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!xstap]
-    [\v!absoluut,\v!relatief]
-    [\v!absoluut]
+    [\c!xstep]
+    [\v!absolute,\v!relative]
+    [\v!absolute]
   \variable
-    [\c!ystap]
-    [\v!absoluut,\v!relatief]
-    [\v!absoluut]
+    [\c!ystep]
+    [\v!absolute,\v!relative]
+    [\v!absolute]
 \stopsetup
 
 \startsetup
@@ -3938,33 +3969,33 @@
     [\c!number!]
     [0.5]
   \variable
-    [\c!xstap]
+    [\c!xstep]
     [\c!number!]
     [0]
   \variable
-    [\c!ystap]
+    [\c!ystep]
     [\c!number!]
     [0]
   \variable
     [\c!offset]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!factor]
     [\c!number!]
     [1]
   \variable
-    [\c!schaal]
+    [\c!scale]
     [\c!number!]
     [1]
   \variable
-    [\c!eenheid]
+    [\c!unit]
     [\s!cm,\s!pt,\s!em,\s!mm,\s!ex,\s!es,\s!in]
     [\s!cm]
   \variable
-    [\c!plaats]
-    [\v!links,\v!midden]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!middle]
+    [\v!left]
 \stopsetup
 
 
@@ -3974,10 +4005,10 @@
   \type
     [\c!vals!]
   \value
-    [\v!ja,\v!opmaak,\v!nee,\v!voorkeur,\v!grotevoorkeur,
-     \v!links,\v!rechts,\v!blokkeer,\v!laatste,\v!viertal,
-     \v!even,\v!oneven,\v!blanko,\v!leeg,\v!reset,\v!start,\v!stop]
-    [\v!ja]
+    [\v!yes,\v!makeup,\v!no,\v!preference,\v!bigpreference,
+     \v!left,\v!right,\v!disable,\v!last,\v!quadruple,
+     \v!even,\v!odd,\v!blank,\v!empty,\v!reset,\v!start,\v!stop]
+    [\v!yes]
 \stopsetup
 
 \startsetup
@@ -3986,49 +4017,49 @@
   \type
     [\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
     [\c!sectionnumber!]
-    [\v!ja,\v!nee]
+    [\v!yes,\v!no]
     []
   \variable
     [\c!prefix]
     [+,-,\c!text!]
     []
   \variable
-    [\c!interactie]
-    [\v!label,\v!tekst,\v!alles,\v!symbool]
-    [\v!alles]
+    [\c!interaction]
+    [\v!label,\v!text,\v!all,\v!symbol]
+    [\v!all]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!command!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!command!]
     []
   \variable
-    [\c!converteerfile]
-    [\v!ja,\v!nee,\v!klein,\v!groot]
-    [\v!nee]
+    [\c!convertfile]
+    [\v!yes,\v!no,\v!small,\v!big]
+    [\v!no]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [~]
   \variable
     [\c!autofile]
-    [\v!ja,\v!nee,\v!pagina]
-    [\v!nee]
+    [\v!yes,\v!no,\v!page]
+    [\v!no]
   \variable
-    [\c!globaal]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!global]
+    [\v!yes,\v!no]
+    [\v!no]
 \stopsetup
 
 \startsetup
@@ -4037,22 +4068,22 @@
   \type
     [\c!vars!]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     [\v!type]
   \variable
-    [\c!urlvariant]
-    [\v!geen,\v!beide,\v!voor,\v!na]
-    [\v!beide]
+    [\c!urlalternative]
+    [\v!none,\v!both,\v!before,\v!after]
+    [\v!both]
   \variable
-    [\c!urlspatie]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!urlspace]
+    [\v!yes,\v!no]
+    [\v!no]
 \stopsetup
 
 \startsetup
   \command
-    [\y!schrijfnaarreferentielijst]
+    [\y!writetoreferencelist]
   \type
     [\c!val!\c!arg!\c!arg!]
   \value
@@ -4062,7 +4093,7 @@
 
 \startsetup
   \command
-    [\y!plaatsreferentielijst]
+    [\y!placereferencelist]
   \type
     [\c!vals!]
   \value
@@ -4072,7 +4103,7 @@
 
 \startsetup
   \command
-    [\y!definieerreferentielijst]
+    [\y!definereferencelist]
   \type
     [\c!val!\c!opt!\c!vars!]
   \value
@@ -4085,37 +4116,37 @@
 
 \startsetup
   \command
-    [\y!stelreferentielijstin]
+    [\y!setupreferencelist]
   \type
     [\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
     [\c!criterium]
-    [\c!section!,\v!lokaal,\v!vorige,\v!alles]
-    [\v!alles]
+    [\c!section!,\v!local,\v!previous,\v!all]
+    [\v!all]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!command!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!schrijfnaarlijst]
+    [\y!writetolist]
   \type
     [\c!val!\c!arg!\c!arg!]
   \value
@@ -4125,7 +4156,7 @@
 
 \startsetup
   \command
-    [\y!schrijftussenlijst]
+    [\y!writebetweenlist]
   \type
     [\c!val!\c!arg!]
   \value
@@ -4135,7 +4166,7 @@
 
 \startsetup
   \command
-    [\y!geenlijst]
+    [\y!nolist]
   \type
     [\c!arg!]
   \value
@@ -4158,48 +4189,48 @@
 
 \startsetup
   \command
-    [\y!plaatslijst]
+    [\y!placelist]
   \type
     [\c!vals!\c!opt!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stellijstin]
+    [\y!setuplist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!bepaallijstkenmerken]
+    [\y!determinelistcharacteristics]
   \type
     [\c!vals!\c!opt!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stellijstin]
+    [\y!setuplist]
     []
 \stopsetup
 
 % nieuw:
 
-% \startsetup
-%   \command
-%     [\y!plaatssamengesteldelijst]
-%   \type
-%     [\c!val!\c!opt!\c!vars!]
-%   \value
-%     [\c!identifier!]
-%     []
-%   \inheritvariables
-%     [\y!stelsamengesteldelijstin]
-%     []
-% \stopsetup
+\startsetup
+  \command
+    [\y!placecombinedlist]
+  \type
+    [\c!val!\c!opt!\c!vars!]
+  \value
+    [\c!identifier!]
+    []
+  \inheritvariables
+    [\y!setupcombinedlist]
+    []
+\stopsetup
 
 \startsetup
   \command
-    [\y!definieerlijst]
+    [\y!definelist]
   \type
     [\c!val!\c!opt!\c!val!\c!opt!\c!vars!]
   \value
@@ -4209,160 +4240,160 @@
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stellijstin]
+    [\y!setuplist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stellijstin]
+    [\y!setuplist]
   \type
     [\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
-    [\c!variant]
-    [\v!a,\v!b,\v!c,...,\v!geen,\v!commando]
+    [\c!alternative]
+    [\v!a,\v!b,\v!c,...,\v!none,\v!command]
     [\v!b]
   \variable
-    [\c!koppeling]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!coupling]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
     [\c!criterium]
-    [\c!section!,\v!lokaal,\v!vorige,\v!huidige,\v!alles]
-    [\v!lokaal]
+    [\c!section!,\v!local,\v!previous,\v!current,\v!all]
+    [\v!local]
   \variable
-    [\c!paginaovergangen]
+    [\c!pageboundaries]
     [\c!list!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!nummerletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!numberstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!tekstletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!textstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!paginaletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!pagestyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!threearguments!]
     []
   \variable
-    [\c!nummercommando]
+    [\c!numbercommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!tekstcommando]
+    [\c!textcommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!paginacommando]
+    [\c!pagecommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!interactie]
-    [\v!sectienummer,\v!tekst,\v!paginanummer,\v!alles]
-    [\v!sectienummer]
+    [\c!interaction]
+    [\v!sectionnumber,\v!text,\v!pagenumber,\v!all]
+    [\v!sectionnumber]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     []
   \variable
     [\c!label]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
     [\c!prefix]
-    [\v!ja,\v!nee,\v!geen]
-    [\v!ja]
+    [\v!yes,\v!no,\v!none]
+    [\v!yes]
   \variable
-    [\c!paginanummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!pagenumber]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!sectionnumber!]
-    [\v!ja,\v!nee]
+    [\v!yes,\v!no]
     []
   \variable
-    [\c!titeluitlijnen]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!aligntitle]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [3em]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\v!passend]
+    [\c!width]
+    [\c!dimension!,\v!fit]
     [3em]
   \variable
-    [\c!hoogte]
-    [\c!dimension!,\v!passend,\v!ruim]
-    [\v!ruim]
+    [\c!height]
+    [\c!dimension!,\v!fit,\v!broad]
+    [\v!broad]
   \variable
-    [\c!diepte]
-    [\c!dimension!,\v!passend,\v!ruim]
-    [\v!ruim]
+    [\c!depth]
+    [\c!dimension!,\v!fit,\v!broad]
+    [\v!broad]
 %  \variable
 %    [\c!offset]
 %    [\c!dimension!]
 %    [.25em]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [0em]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [.]
   \variable
-    [\c!afsluiter]
+    [\c!stopper]
     [\c!text!]
     []
   \variable
-    [\c!symbool]
-    [\v!geen,1,2,3,...]
+    [\c!symbol]
+    [\v!none,1,2,3,...]
     []
   \variable
-    [\c!expansie]
-    [\v!ja,\v!nee,\v!commando]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!no,\v!command]
+    [\v!no]
   \variable
-    [\c!maxbreedte]
+    [\c!maxwidth]
     [\c!dimension!]
     []
   \inheritvariables
@@ -4372,7 +4403,7 @@
 
 \startsetup
   \command
-    [\y!definieersamengesteldelijst]
+    [\y!definecombinedlist]
   \type
     [\c!val!\c!vals!\c!opt!\c!vars!]
   \value
@@ -4382,64 +4413,64 @@
     [\c!list!]
     []
   \inheritvariables
-    [\y!stelsamengesteldelijstin]
+    [\y!setupcombinedlist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelsamengesteldelijstin]
+    [\y!setupcombinedlist]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!niveau]
-    [1,2,3,4,\c!section!,\v!huidige]
+    [\c!level]
+    [1,2,3,4,\c!section!,\v!current]
     [4]
   \inheritvariables
-    [\y!stellijstin]
+    [\y!setuplist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!plaats<<\y!samengesteldelijst>>]
+    [\e!place<<\y!combinedlist>>]
   \type
     [\c!val!\c!opt!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stelsamengesteldelijstin]
+    [\y!setupcombinedlist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!volledige<<\y!samengesteldelijst>>]
+    [\e!complete<<\y!combinedlist>>]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stelsamengesteldelijstin]
+    [\y!setupcombinedlist]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelnummerenin]
+    [\y!setupnumbering]
   \type
     [\c!vars!]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!hoofdstuk]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!chapter]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
 \stopsetup
@@ -4452,256 +4483,256 @@
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts]
-    [\v!rechts]
+    [\c!location]
+    [\v!left,\v!right]
+    [\v!right]
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     [{(}]
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     [{)}]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts]
+    [\c!align]
+    [\v!left,\v!middle,\v!right]
     []
   \variable
     [\c!strut]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!marge]
-    [\c!dimension!,\v!standaard,\v!ja,\v!nee]
+    [\c!margin]
+    [\c!dimension!,\v!standard,\v!yes,\v!no]
     [0pt]
   \variable
-    [\c!linkermarge]
+    [\c!leftmargin]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!rechtermarge]
+    [\c!rightmargin]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [\c!identifier!]
     [\s!default]
   \variable
-    [\c!voorwit]
+    [\c!spacebefore]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     [.]
 \stopsetup
 
 \startsetup
   \command
-    [\y!publicatie]
+    [\y!publication]
   \type
     [\c!ref!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelpublicatiesin]
+    [\y!setuppublications]
   \type
     [\c!vars!]
   \variable
-    [\c!variant]
-    [\c!apa,\v!normaal]
+    [\c!alternative]
+    [\c!apa,\v!normal]
     [\c!apa]
   \inheritvariables
-    [\y!steldoornummerenin]
+    [\y!setupenumerations]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelregelsin]
+    [\y!setuplines]
   \type
     [\c!vars!]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!inspringen]
-    [\v!ja,\v!nee,\v!even,\v!oneven]
-    [\v!nee]
+    [\c!indenting]
+    [\v!yes,\v!no,\v!even,\v!odd]
+    [\v!no]
 \stopsetup
 
 \startsetup
   \command
-    [\y!startregels]
+    [\y!startlines]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelparagraafnummerenin]
+    [\y!setupparagraphnumbering]
   \type
     [\c!vars!]
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!reset,\v!regel]
+    [\c!state]
+    [\v!start,\v!stop,\v!reset,\v!line]
     [\v!stop]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [0pt]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelregelnummerenin]
+    [\y!setuplinenumbering]
   \type
     [\c!vars!]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins,
-     \v!tekst]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins,
+     \v!text]
+    [\v!numbers]
   \variable
     [\c!start]
     [\c!number!]
     [1]
   \variable
-    [\c!stap]
+    [\c!step]
     [\c!number!]
     [1]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [2ex]
   \variable
-    [\c!plaats]
-    [\v!intekst,\v!inmarge]
-    [\v!inmarge]
+    [\c!location]
+    [\v!intext,\v!inmargin]
+    [\v!inmargin]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
     [\c!prefix]
     [\c!text!]
     []
   \variable
-    [\c!refereren]
-    [\v!aan,\v!uit]
-    [\v!aan]
+    [\c!referencing]
+    [\v!on,\v!off]
+    [\v!on]
 \stopsetup
 
 \startsetup
   \command
-    [\y!startregelnummeren]
+    [\y!startlinenumbering]
   \type
     [\c!val!\c!stp!]
   \value
-    [\v!verder]
+    [\v!continue]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startregel]
+    [\y!startline]
   \type
     [\c!ref!\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!eenregel]
+    [\y!someline]
   \type
     [\c!ref!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!inregel]
+    [\y!inline]
   \type
     [\c!ref!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelinmargein]
+    [\y!setupinmargin]
   \type
     [\c!opt!\c!val!\c!vars!]
   \value
-    [\v!links,\v!rechts,\c!number!]
+    [\v!left,\v!right,\c!number!]
     []
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!beide]
-    [\v!beide]
+    [\c!location]
+    [\v!left,\v!right,\v!both]
+    [\v!both]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!binnen,\v!buiten,\v!links,\v!rechts,\v!midden,\v!normaal,\v!nee,\v!ja]
-    [\v!binnen]
+    [\c!align]
+    [\v!inner,\v!outer,\v!left,\v!right,\v!middle,\v!normal,\v!no,\v!yes]
+    [\v!inner]
   \variable
-    [\c!regel]
+    [\c!line]
     [\c!number!]
     [1]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!scheider]
+    [\c!separator]
     [\c!text!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     []
   \variable
-    [\c!stapel]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!stack]
+    [\v!yes,\v!no]
+    [\v!no]
   \inheritvariables
     [\y!setupframed]
     []
@@ -4713,12 +4744,12 @@
   \type
     [\c!vars!]
   \variable
-    [\c!nummer]
+    [\c!number]
     [\c!number!]
     []
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!handhaaf]
+    [\c!state]
+    [\v!start,\v!stop,\v!keep]
     [\v!start]
 \stopsetup
 
@@ -4728,19 +4759,19 @@
   \type
     [\c!vars!]
   \variable
-    [\c!wijze]
-    [\v!per\v!tekst,\v!per\c!section!]
-    [\v!per\v!deel]
+    [\c!way]
+    [\v!by\v!text,\v!by\c!section!]
+    [\v!by\v!part]
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!geen]
+    [\c!state]
+    [\v!start,\v!stop,\v!none]
     [\v!stop]
 \stopsetup
 
 %\startsetup \command[\y!paginanummer] \type[] \stopsetup
 %\startsetup \command[\y!subpaginanummer] \type[] \stopsetup
-%\startsetup \command[\y!aantalsubpaginas] \type[] \stopsetup
-%\startsetup \command[\y!totaalaantalpaginas] \type[] \stopsetup
+%\startsetup \command[\y!numberofsubpages]   \type[] \stopsetup
+%\startsetup \command[\y!totalnumberofpages] \type[] \stopsetup
 
 \startsetup
   \command
@@ -4748,15 +4779,15 @@
   \type
     [\c!opt!\c!val!]
   \value
-    [\v!normaal,\v!standaard,\v!regel,\c!dimension!,
-     \v!groot,\v!middel,\v!klein,
-     \v!vast,\v!flexibel]
-    [\v!normaal]
+    [\v!normal,\v!standard,\v!line,\c!dimension!,
+     \v!big,\v!medium,\v!small,
+     \v!fixed,\v!flexible]
+    [\v!normal]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieerblanko]
+    [\y!defineblank]
   \type
     [\c!val!\c!val!]
   \value
@@ -4776,11 +4807,11 @@
     [\c!identifier!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [297mm]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [210mm]
   \variable
@@ -4788,7 +4819,7 @@
     [\c!dimension!]
     [210mm]
   \variable
-    [\c!schaal]
+    [\c!scale]
     [\c!number!]
     [1]
 \stopsetup
@@ -4799,11 +4830,11 @@
   \type
     [\c!vars!]
   \variable
-    [\c!papier]
+    [\c!paper]
     [\c!identifier!]
     []
   \variable
-    [\c!pagina]
+    [\c!page]
     [\c!identifier!]
     []
   \variable
@@ -4815,24 +4846,24 @@
     [\c!number!]
     [1]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kopwit]
+    [\c!topspace]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!rugwit]
+    [\c!backspace]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!optie]
-    [\c!max,\v!passend]
+    [\c!option]
+    [\c!max,\v!fit]
     [\c!max]
 \stopsetup
 
@@ -4843,11 +4874,11 @@
     [\c!vals!\c!opt!\c!vals!]
   \value
     [A3,A4,A5,A6,letter,...,CD,\c!identifier!,
-     \v!liggend,\v!gespiegeld,\v!geroteerd,90,180,270]
+     \v!landscape,\v!mirrored,\v!rotated,90,180,270]
     [A4]
   \value
     [A3,A4,A5,A6,letter,...,\c!identifier!,
-     \v!liggend,\v!gespiegeld,\v!geroteerd,\v!negatief,90,180,270]
+     \v!landscape,\v!mirrored,\v!rotated,\v!negative,90,180,270]
     [A4]
 \stopsetup
 
@@ -4857,9 +4888,9 @@
   \type
     [\c!vals!]
   \value
-    [\v!blokkeer,
+    [\v!disable,
      2*16,2*8,2*4,2*2,2**2,2*2*4,2*4*2,2UP,2DOWN,2SIDE,2TOP,
-     \v!gespiegeld,\v!geroteerd,\v!dubbelzijdig,\v!negatief,90,180,270]
+     \v!mirrored,\v!rotated,\v!doublesided,\v!negative,90,180,270]
     []
 \stopsetup
 
@@ -4888,20 +4919,20 @@
     [\c!identifier!]
     []
   \value
-    [\v!boven,\v!hoofd,\v!voet,\v!onder]
+    [\v!top,\v!header,\v!footer,\v!bottom]
     []
   \value
-    [\v!geen,\v!pagina,
-     \v!linkerrand,\v!linkermarge,
-     \v!links,\v!midden,\v!rechts,
-     \v!rechtermarge,\v!rechterrand]
+    [\v!none,\v!page,
+     \v!leftedge,\v!leftmargin,
+     \v!left,\v!middle,\v!right,
+     \v!rightmargin,\v!rightedge]
     []
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!command!,\c!text!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!stop]
 \stopsetup
@@ -4922,8 +4953,8 @@
   \type
     [\c!opt!\c!val!]
   \value
-    [\v!geen,\v!klein,\v!middel,\v!groot,\v!regel,\v!vast,\v!herstel,\c!dimension!]
-    [\v!geen]
+    [\v!none,\v!small,\v!medium,\v!big,\v!line,\v!fixed,\v!fix,\c!dimension!]
+    [\v!none]
 \stopsetup
 
 \startsetup
@@ -4932,52 +4963,52 @@
   \type
     [\c!vals!]
   \value
-    [\v!geen,\v!klein,\v!middel,\v!groot,\v!volgende,\v!eerste,\c!dimension!]
-    [\v!geen]
+    [\v!none,\v!small,\v!medium,\v!big,\v!next,\v!first,\c!dimension!]
+    [\v!none]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieersectieblok]
+    [\y!definesectionblock]
   \type
     [\c!val!\c!opt!\c!vars!]
   \value
     [\c!identifier!]
     []
   \inheritvariables
-    [\y!stelsectieblokin]
+    [\y!setupsectionblock]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelsectieblokin]
+    [\y!setupsectionblock]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!nummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!number]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!pagina]
-    [\v!ja,\v!rechts]
-    [\v!rechts]
+    [\c!page]
+    [\v!yes,\v!right]
+    [\v!right]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieersectie]
+    [\y!definesection]
   \type
     [\c!val!]
   \value
@@ -4987,7 +5018,7 @@
 
 \startsetup
   \command
-    [\y!stelsectiein]
+    [\y!setupsection]
   \type
     [\c!val!\c!opt!\c!val!\c!vars!]
   \value
@@ -4995,103 +5026,103 @@
     []
   \value
     [\c!identifier!]
-    [\v!inleiding,\v!hoofdtekst,\v!bijlage,\v!uitleiding]
+    [\v!frontpart,\v!bodypart,\v!appendix,\v!backpart]
   \variable
-    [\c!conversie]
-    [\v!cijfers,\v!letters,\v!Letters,\v!romeins,\v!Romeins]
-    [\v!cijfers]
+    [\c!conversion]
+    [\v!numbers,\v!characters,\v!Letters,\v!romannumerals,\v!Romeins]
+    [\v!numbers]
   \variable
-    [\c!vorigenummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!previousnumber]
+    [\v!yes,\v!no]
+    [\v!yes]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelkopin]
+    [\y!setuphead]
   \type
     [\c!vals!\c!vars!]
   \value
     [\c!section!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
   \variable
-    [\c!tekstletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!textstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
   \variable
-    [\c!nummerletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!numberstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!tekstkleur]
+    [\c!textcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!nummerkleur]
+    [\c!numbercolor]
     [\c!identifier!]
     []
   \variable
-    [\c!nummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!number]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!eigennummer]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!ownnumber]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!pagina]
-    [\v!links,\v!rechts,\v!ja]
+    [\c!page]
+    [\v!left,\v!right,\v!yes]
     []
   \variable
-    [\c!doorgaan]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!continue]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!hoofd]
-    [\v!geen,\v!leeg,\v!hoog,\v!geenmarkering]
+    [\c!header]
+    [\v!none,\v!empty,\v!high,\v!nomarking]
     []
   \variable
-    [\c!tekst]
-    [\v!geen,\v!leeg,\v!hoog,\v!geenmarkering]
+    [\c!text]
+    [\v!none,\v!empty,\v!high,\v!nomarking]
     []
   \variable
-    [\c!voet]
-    [\v!geen,\v!leeg,\v!hoog,\v!geenmarkering]
+    [\c!footer]
+    [\v!none,\v!empty,\v!high,\v!nomarking]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!variant]
-    [\v!normaal,\v!inmarge,\v!midden,\v!tekst]
-    [\v!normaal]
+    [\c!alternative]
+    [\v!normal,\v!inmargin,\v!middle,\v!text]
+    [\v!normal]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!twoarguments!]
     []
   \variable
-    [\c!nummercommando]
+    [\c!numbercommand]
     [\c!oneargument!]
     []
   \variable
-    [\c!tekstcommando]
+    [\c!textcommand]
     [\c!oneargument!]
     []
   \variable
@@ -5099,17 +5130,17 @@
     [+,-,\c!text!]
     []
   \variable
-    [\c!plaatskop]
-    [\v!ja,\v!nee,\v!leeg] % leeg: wel markering
-    [\v!ja]
+    [\c!placehead]
+    [\v!yes,\v!no,\v!empty] % leeg: wel markering
+    [\v!yes]
   \variable
-    [\c!verhoognummer]
-    [\v!ja,\v!nee,\v!lijst,\c!filename!] % lijst: wel lijstentry
-    [\v!ja]
+    [\c!incrementnumber]
+    [\v!yes,\v!no,\v!list,\c!filename!] % lijst: wel lijstentry
+    [\v!yes]
   \variable
-    [\c!resetnummer]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!resetnumber]
+    [\v!yes,\v!no]
+    [\v!yes]
 %  \variable
 %    [\c!scheider]
 %    [\c!text!]
@@ -5135,21 +5166,21 @@
     [\c!identifier!]
     []
   \variable
-    [\c!expansie]
-    [\v!ja,\v!commando,\v!nee]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!command,\v!no]
+    [\v!no]
   \variable
-    [\c!margetekst]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!margintext]
+    [\v!yes,\v!no]
+    [\v!yes]
   \inheritvariables
-    [\y!stelkoppenin]
+    [\y!setupheads]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelkopnummerin]
+    [\y!setupheadnumber]
   \type
     [\c!val!\c!val!]
   \value
@@ -5162,7 +5193,7 @@
 
 \startsetup
   \command
-    [\y!kopnummer]
+    [\y!headnumber]
   \type
     [\c!opt!\c!val!]
   \value
@@ -5172,7 +5203,7 @@
 
 \startsetup
   \command
-    [\y!bepaalkopnummer]
+    [\y!determineheadnumber]
   \type
     [\c!val!]
   \value
@@ -5182,21 +5213,21 @@
 
 \startsetup
   \command
-    [\y!huidigekopnummer]
+    [\y!currentheadnumber]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!volgende<<\y!sectie>>]
+    [\e!next<<\y!section>>]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieerkop]
+    [\y!definehead]
   \type
     [\c!val!\c!val!]
   \value
@@ -5216,31 +5247,31 @@
     [\c!identifier!]
     []
   \value
-    [\c!number!,\v!elk]
+    [\c!number!,\v!each]
     []
   \value
-    [\v!standaard,\c!repeat!\v!ruim,\c!repeat!\v!aanelkaar,\v!opelkaar,
-     \v!vanelkaar,\v!afsluiter,\v!aansluitend,\v!opmarge,\v!inmarge,
-     \v!autointro,\v!los,\v!paragraaf,\v!intekst]
-    [\v!standaard]
+    [\v!standard,\c!repeat!\v!broad,\c!repeat!\v!serried,\v!packed,
+     \v!unpacked,\v!stopper,\v!joinedup,\v!atmargin,\v!inmargin,
+     \v!autointro,\v!loose,\v!section,\v!intext]
+    [\v!standard]
   \variable
-    [\c!marge]
-    [\v!nee,\v!standaard,\c!dimension!]
+    [\c!margin]
+    [\v!no,\v!standard,\c!dimension!]
     [0pt]
   \variable
-    [\c!linkermarge]
-    [\v!nee,\v!standaard,\c!dimension!]
+    [\c!leftmargin]
+    [\v!no,\v!standard,\c!dimension!]
     [0pt]
   \variable
-    [\c!rechtermarge]
-    [\v!nee,\v!standaard,\c!dimension!]
+    [\c!rightmargin]
+    [\v!no,\v!standard,\c!dimension!]
     [0pt]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [1.5em]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [0.5em]
   \variable
@@ -5256,47 +5287,47 @@
     [\c!number!]
     [1]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     []
   \variable
-    [\c!kopvoor]
+    [\c!beforehead]
     [\c!command!]
     []
   \variable
-    [\c!kopna]
+    [\c!afterhead]
     [\c!command!]
     []
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!marletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!marstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     [\v!type]
   \variable
-    [\c!symletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!symstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!afsluiter]
+    [\c!stopper]
     [\c!text!]
     [.]
   \variable
@@ -5304,17 +5335,17 @@
     [\c!number!]
     []
   \variable
-    [\c!symbool]
+    [\c!symbol]
     [\c!number!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!rechts,\v!normaal]
-    [\v!normaal]
+    [\c!align]
+    [\v!left,\v!right,\v!normal]
+    [\v!normal]
   \variable
-    [\c!springvolgendein]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!indentnext]
+    [\v!yes,\v!no]
+    [\v!yes]
 \stopsetup
 
 %\startsetup
@@ -5327,6 +5358,8 @@
 %    []
 %\stopsetup
 
+%
+
 \startsetup
   \command
     [\e!start<<\y!itemgroup>>]
@@ -5336,11 +5369,11 @@
     [\c!identifier!]
     []
   \value
-    [a,A,KA,n,N,m,r,R,KR,\c!number!,\v!verder,
-     \v!standaard,\c!repeat!\v!ruim,\c!repeat!\v!aanelkaar,\v!opelkaar,
-     \v!afsluiter,\v!aansluitend,\v!opmarge,\v!inmarge,\v!intro,
-     \v!kolommen]
-    [\v!standaard]
+    [a,A,KA,n,N,m,r,R,KR,\c!number!,\v!continue,
+     \v!standard,\c!repeat!\v!broad,\c!repeat!\v!serried,\v!packed,
+     \v!stopper,\v!joinedup,\v!atmargin,\v!inmargin,\v!intro,
+     \v!columns]
+    [\v!standard]
   \inheritvariables
     [\y!setupitemgroup]
     []
@@ -5358,7 +5391,7 @@
 
 \startsetup
   \command
-    [\y!definieerregister]
+    [\y!defineregister]
   \type
     [\c!val!\c!val!]
   \value
@@ -5371,7 +5404,7 @@
 
 \startsetup
   \command
-    [\y!stelregisterin]
+    [\y!setupregister]
   \type
     [\c!val!\c!opt!\c!val!\c!vars!]
   \value
@@ -5385,79 +5418,79 @@
     [\c!number!]
     [2]
   \variable
-    [\c!balanceren]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!balance]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!uitlijnen]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!align]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!paginaletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!pagestyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!tekstletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!textstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!aanduiding]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!indicator]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!koppeling]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!coupling]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
     [\c!sectionnumber!]
-    [\v!ja,\v!nee]
+    [\v!yes,\v!no]
     []
   \variable
     [\c!criterium]
-    [\c!section!,\v!lokaal,\v!alles]
-    [\v!deel]
+    [\c!section!,\v!local,\v!all]
+    [\v!part]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!symbool]
-    [1,2,...,\c!n,\c!a,...,\v!geen]
+    [\c!symbol]
+    [1,2,...,\c!n,\c!a,...,\v!none]
     []
   \variable
-    [\c!interactie]
-    [\v!paginanummer,\v!tekst]
-    [\v!paginanummer]
+    [\c!interaction]
+    [\v!pagenumber,\v!text]
+    [\v!pagenumber]
   \variable
-    [\c!expansie]
-    [\v!ja,\v!commando,\v!nee]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!command,\v!no]
+    [\v!no]
   \variable
-    [\c!refereren]
-    [\v!aan,\v!uit]
-    [\v!aan]
+    [\c!referencing]
+    [\v!on,\v!off]
+    [\v!on]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!oneargument!]
     []
   \variable
-    [\c!plaats]
-    [\v!links,\v!midden,\v!rechts]
-    [\v!midden]
+    [\c!location]
+    [\v!left,\v!middle,\v!right]
+    [\v!middle]
   \variable
-    [\c!maxbreedte]
+    [\c!maxwidth]
     [\c!dimension!]
     []
   \variable
-    [\c!onbekendeverwijzing]
-    [\v!leeg,\v!geen]
-    [\v!leeg]
+    [\c!unknownreference]
+    [\v!empty,\v!none]
+    [\v!empty]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [a,b,A,B]
     [a]
 \stopsetup
@@ -5490,7 +5523,7 @@
 
 \startsetup
   \command
-    [\y!schrijfnaarregister]
+    [\y!writetoregister]
   \type
     [\c!val!\c!opt!\c!val!\c!idxs!]
   \value
@@ -5506,7 +5539,7 @@
 
 \startsetup
   \command
-    [\e!gekoppelde<<\y!register>>]
+    [\e!coupled<<\y!register>>]
   \type
     [\c!opt!\c!val!\c!idx!]
   \value
@@ -5519,7 +5552,7 @@
 
 \startsetup
   \command
-    [\y!koppelregister]
+    [\y!coupleregister]
   \type
     [\c!val!]
   \value
@@ -5529,7 +5562,20 @@
 
 \startsetup
   \command
-    [\e!zie<<\y!register>>]
+    [\y!placeregister]
+  \type
+    [\c!val!\c!opt!\c!vars!]
+  \value
+    [\c!identifier!]
+    []
+  \inheritvariables
+    [\y!setupregister]
+    []
+\stopsetup
+
+\startsetup
+  \command
+    [\e!see<<\y!register>>]
   \type
     [\c!opt!\c!val!\c!arg!\c!idxs!]
   \value
@@ -5545,27 +5591,27 @@
 
 \startsetup
   \command
-    [\e!volledige<<\y!register>>]
+    [\e!complete<<\y!register>>]
   \type
     [\c!optint!\c!opt!\c!vars!]
   \inheritvariables
-    [\y!stelregisterin]
+    [\y!setupregister]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!plaats<<\y!register>>]
+    [\e!place<<\y!register>>]
   \type
     [\c!optint!\c!opt!\c!vars!]
   \inheritvariables
-    [\y!stelregisterin]
+    [\y!setupregister]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieersynoniemen]
+    [\y!definesynonyms]
   \type
     [\c!val!\c!val!\c!val!\c!opt!\c!val!]
   \value
@@ -5584,54 +5630,54 @@
 
 \startsetup
   \command
-    [\y!stelsynoniemenin]
+    [\y!setupsynonyms]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!tekstletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!kap]
+    [\c!textstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!cap]
   \variable
-    [\c!synoniemletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!synonymstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!boven,\v!aanelkaar,
-     \v!inmarge,\v!inlinker,\v!inrechter]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!right,\v!top,\v!serried,
+     \v!inmargin,\v!inleft,\v!inright]
+    [\v!left]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [5em]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
     [\c!criterium]
-    [\v!alles,\v!gebruikt]
-    [\v!gebruikt]
+    [\v!all,\v!used]
+    [\v!used]
   \variable
-    [\c!conversie]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!conversion]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!expansie]
-    [\v!ja,\v!commando,\v!nee]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!command,\v!no]
+    [\v!no]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!threearguments!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!synoniem>>]
+    [<<\y!synonym>>]
   \type
     [\c!opt!\c!val!\c!arg!\c!arg!]
   \value
@@ -5647,26 +5693,26 @@
 
 \startsetup
   \command
-    [\e!volledige\e!lijstmet<<\y!synoniemen>>]
+    [\e!complete\e!listof<<\y!synonyms>>]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!plaats\e!lijstmet<<\y!synoniemen>>]
+    [\e!place\e!listof<<\y!synonyms>>]
   \type
     []
 \stopsetup
 
 \startsetup
-  \command[\e!laad<<\y!synoniemen>>]
+  \command[\e!load<<\y!synonyms>>]
   \type[]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieersorteren]
+    [\y!definesorting]
   \type
     [\c!val!\c!val!\c!opt!\c!val!]
   \value
@@ -5682,45 +5728,45 @@
 
 \startsetup
   \command
-    [\y!stelsorterenin]
+    [\y!setupsorting]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!oneargument!]
     []
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
     [\c!criterium]
-    [\v!alles,\v!gebruikt]
-    [\v!gebruikt]
+    [\v!all,\v!used]
+    [\v!used]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!expansie]
-    [\v!ja,\v!commando,\v!nee]
-    [\v!nee]
+    [\c!expansion]
+    [\v!yes,\v!command,\v!no]
+    [\v!no]
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!sorteer>>]
+    [<<\y!sort>>]
   \type
     [\c!val!\c!arg!]
   \value
@@ -5733,20 +5779,20 @@
 
 \startsetup
   \command
-    [\e!volledige\e!lijstmet<<\y!sorteren>>]
+    [\e!complete\e!listof<<\y!sorts>>]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!plaats\e!lijstmet<<\y!sorteren>>]
+    [\e!place\e!listof<<\y!sorts>>]
   \type
     []
 \stopsetup
 
 \startsetup
-  \command[\e!laad<<\y!sorteren>>]
+  \command[\e!load<<\y!sorts>>]
   \type[]
 \stopsetup
 
@@ -5785,13 +5831,13 @@
     [\c!identifier!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
-    [\zetbreedte]
+    [\makeupwidth]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
-    [\teksthoogte]
+    [\textheight]
   \variable
     [\c!voffset]
     [\c!dimension!]
@@ -5801,62 +5847,62 @@
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!pagina]
-    [\v!links,\v!ja,\v!rechts]
+    [\c!page]
+    [\v!left,\v!yes,\v!right]
     []
   \variable
-    [\c!commandos]
+    [\c!commands]
     [\c!command!]
     []
   \variable
-    [\c!dubbelzijdig]
-    [\v!ja,\v!nee,\v!leeg]
-    [\v!leeg]
+    [\c!doublesided]
+    [\v!yes,\v!no,\v!empty]
+    [\v!empty]
   \variable
-    [\c!hoofdstatus]
-    [\v!normaal,\v!stop,\v!start,\v!leeg,\v!geen,\v!geenmarkering]
-    [\v!leeg]
+    [\c!headerstate]
+    [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking]
+    [\v!empty]
   \variable
-    [\c!voetstatus]
-    [\v!normaal,\v!stop,\v!start,\v!leeg,\v!geen,\v!geenmarkering]
-    [\v!leeg]
+    [\c!footerstate]
+    [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking]
+    [\v!empty]
   \variable
-    [\c!tekststatus]
-    [\v!normaal,\v!stop,\v!start,\v!leeg,\v!geen,\v!geenmarkering]
-    [\v!leeg]
+    [\c!textstate]
+    [\v!normal,\v!stop,\v!start,\v!empty,\v!none,\v!nomarking]
+    [\v!empty]
   \variable
-    [\c!bovenstatus]
+    [\c!topstate]
     [\v!stop,\v!start]
     [\v!stop]
   \variable
-    [\c!onderstatus]
+    [\c!bottomstate]
     [\v!stop,\v!start]
     [\v!stop]
   \variable
-    [\c!paginastatus]
+    [\c!pagestate]
     [\v!stop,\v!start]
     [\v!stop]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!start<<\y!naam>>\e!opmaak] % \tf
+    [\e!start<<\y!name>>\e!makeup] % \tf
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!versie]
+    [\y!version]
   \type
     [\c!val!]
   \value
-    [\v!definitief,\v!concept,\v!voorlopig]
-    [\v!definitief]
+    [\v!final,\v!concept,\v!temporary]
+    [\v!final]
 \stopsetup
 
 \startsetup
@@ -5887,93 +5933,81 @@
     [\c!number!]
     []
   \value
-    [\v!dag,\v!dag+,\v!maand,\v!weekdag,\v!jaar, % \v!WEEKDAG,\v!MAAND,
-     dd,dd+,mm,jj,yy,d,d+,m,j,y,\v!kenmerk]
-    [\v!dag,\v!maand,\v!jaar]
+    [\v!day,\v!day+,\v!month,\v!weekday,\v!year, % \v!WEEKDAG,\v!MAAND,
+     dd,dd+,mm,jj,yy,d,d+,m,j,y,\v!referral]
+    [\v!day,\v!month,\v!year]
 \stopsetup
 
 \startsetup
   \command
-    [\y!kenmerkdatum]
+    [\y!referraldate]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!inspringen]
+    [\y!indenting]
   \type
     [\c!vals!]
   \value
-    [\v!nooit,\v!niet,\v!nee,\v!ja,\v!altijd,\v!eerste,\v!volgende]
-    [\v!nooit]
+    [\v!never,\v!not,\v!no,\v!yes,\v!always,\v!first,\v!next]
+    [\v!never]
 \stopsetup
 
 \startsetup
   \command
-    [\y!nietinspringen]
+    [\y!noindenting]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!blanko]
+    [\y!blank]
   \type
     [\c!opt!\c!vals!]
   \value
-    [\c!repeat!\v!klein,\c!repeat!\v!middel,\c!repeat!\v!groot,
-     \v!geenwit,\v!back,\v!wit,\v!blokkeer,\v!forceer,\v!reset,
-     \v!regel,\v!halveregel,\v!formule,\v!vast,\v!flexibel,\v!geen]
-    [\v!groot]
+    [\c!repeat!\v!small,\c!repeat!\v!medium,\c!repeat!\v!big,
+     \v!nowhite,\v!back,\v!white,\v!disable,\v!force,\v!reset,
+     \v!line,\v!halfline,\v!formula,\v!fixed,\v!flexible,\v!none]
+    [\v!big]
 \stopsetup
 
 \startsetup
   \command
-    [\y!startopelkaar]
+    [\y!startpacked]
   \type
     [\c!opt!\c!val!\c!stp!] % tzt \c!vals!
   \value
-    [\v!blanko]
+    [\v!blank]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startvanelkaar]
+    [\y!startunpacked]
   \type
     [\c!stp!]
 \stopsetup
 
-% \startsetup
-%   \command
-%     [\y!startregelcorrectie]
-%   \type
-%     [\c!opt!\c!val!\c!stp!]
-%   \value
-%     [\v!klein,\v!middel,\v!groot,\v!blanko]
-%     []
-% \stopsetup
-%
-% beter:
-
 \startsetup
   \command
-    [\y!startregelcorrectie]
+    [\y!startlinecorrection]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!corrigeerwitruimte]
+    [\y!correctwhitespace]
   \type
     [\c!arg!]
 \stopsetup
 
 \startsetup
   \command
-    [\e!start\v!uitstellen]
+    [\e!start\v!postponing]
   \type
     [\c!stp!]
 \stopsetup
@@ -5987,17 +6021,17 @@
 
 \startsetup
   \command
-    [\y!startsmaller]
+    [\y!startnarrower]
   \type
     [\c!opt!\c!vals!\c!stp!]
   \value
-    [\c!repeat!\v!links,\c!repeat!\v!midden,\c!repeat!\v!rechts]
-    [\v!midden]
+    [\c!repeat!\v!left,\c!repeat!\v!middle,\c!repeat!\v!right]
+    [\v!middle]
 \stopsetup
 
 \startsetup
   \command
-    [\e!start\v!verbergen]
+    [\e!start\v!hiding]
   \type
     [\c!stp!]
 \stopsetup
@@ -6008,15 +6042,15 @@
   \type
     [\c!val!]
   \value
-    [\v!breedte,\v!links,\v!rechts,\v!midden,\v!binnen,\v!buiten,
-     \v!breed,\v!ruim,\v!hoogte,\v!onder,\v!regel,\v!reset,
-     \v!hangend,\v!niethangend,\v!afgebroken,\v!nietafgebroken]
+    [\v!width,\v!left,\v!right,\v!middle,\v!inner,\v!outer,
+     \v!wide,\v!broad,\v!height,\v!bottom,\v!line,\v!reset,
+     \v!hanging,\v!nothanging,\v!hyphenated,\v!nothyphenated]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startuitlijnen]
+    [\y!startalignment]
   \type
     [\c!stp!\c!opt!\c!val!]
   \inheritvariables
@@ -6030,7 +6064,7 @@
   \type
     [\c!val!]
   \value
-    [\v!ruim,\v!opelkaar]
+    [\v!broad,\v!packed]
     []
 \stopsetup
 
@@ -6040,14 +6074,14 @@
   \type
     [\c!vals!]
   \value
-    [\v!horizontaal,\v!vertikaal,
-     \v!rek,\v!spatie,\v!zeerstreng,\v!streng,\v!soepel,\v!zeersoepel]
-    [\v!zeerstreng]
+    [\v!horizontal,\v!vertical,
+     \v!stretch,\v!space,\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant]
+    [\v!verystrict]
 \stopsetup
 
 \startsetup
   \command
-    [\y!soortpagina]
+    [\y!pagetype]
   \type
     [\c!val!]
   \value
@@ -6057,35 +6091,35 @@
 
 \startsetup
   \command
-    [\y!verwerkpagina]
+    [\y!processpage]
   \type
     [\c!vals!\c!val!]
   \value
     [\c!identifier!]
     []
   \value
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
 \stopsetup
 
 \startsetup
   \command
-    [\y!koppelpagina]
+    [\y!couplepage]
   \type
     [\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!optie]
-    [\v!dubbelzijdig]
+    [\c!option]
+    [\v!doublesided]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
@@ -6112,11 +6146,11 @@
   \type
     [\c!vars!]
   \variable
-    [\c!methode]
-    [\v!punt,\v!lijn,\v!extern]
-    [\v!extern]
+    [\c!method]
+    [\v!dot,\v!rule,\v!external]
+    [\v!external]
   \variable
-    [\c!resolutie]
+    [\c!resolution]
     [\c!number!]
     [508]
   \variable
@@ -6124,7 +6158,7 @@
     [\c!number!]
     [8]
   \variable
-    [\c!raster]
+    [\c!screen]
     [\c!number!]
     [0.95]
 \stopsetup
@@ -6135,15 +6169,15 @@
   \type
     [\c!opt!\c!val!\c!opt!\c!vals!\c!vars!]
   \value
-    [\v!boven,\v!hoofd,\v!tekst,\v!voet,\v!onder,
-     \v!pagina,\v!papier,\v!linkerpagina,\v!rechterpagina]
+    [\v!top,\v!header,\v!text,\v!footer,\v!bottom,
+     \v!page,\v!paper,\v!leftpage,\v!rightpage]
     []
   \value
-    [\v!linkerrand,\v!linkermarge,\v!tekst,\v!rechtermarge,\v!rechterrand]
+    [\v!leftedge,\v!leftmargin,\v!text,\v!rightmargin,\v!rightedge]
     []
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!herhaal]
+    [\c!state]
+    [\v!start,\v!stop,\v!repeat]
     [\v!start]
 %  \variable
 %    [\c!commando]
@@ -6166,7 +6200,7 @@
 
 \startsetup
    \command
-     [\y!haalbuffer]
+     [\y!getbuffer]
    \type
      [\c!opt!\c!val!]
    \value
@@ -6186,7 +6220,7 @@
 
 \startsetup
   \command
-    [\y!definieerbuffer]
+    [\y!definebuffer]
   \type
     [\c!val!]
   \value
@@ -6196,29 +6230,29 @@
 
 \startsetup
   \command
-    [\y!stelbufferin]
+    [\y!setupbuffer]
   \type
     [\c!opt!\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!alinea]
+    [\c!paragraph]
     [\c!number!]
     [0]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
 \stopsetup
 
 \startsetup
    \command
-     [\y!definieerblok]
+     [\y!defineblock]
    \type
      [\c!val!]
    \value
@@ -6228,14 +6262,40 @@
 
 \startsetup
   \command
-     [\y!geenblokkenmeer]
+     [\y!nomoreblocks]
   \type
      []
 \stopsetup
 
 \startsetup
    \command
-     [\y!verbergblokken]
+     [\y!hideblocks]
+   \type
+     [\c!vals!\c!opt!\c!vals!]
+   \value
+     [\c!identifier!]
+     []
+   \value
+     [\c!identifier!]
+     []
+\stopsetup
+
+\startsetup
+   \command
+     [\y!keepblocks]
+   \type
+     [\c!vals!\c!opt!\c!vals!]
+   \value
+     [\c!identifier!]
+     []
+   \value
+     [\v!all,\c!identifier!]
+     []
+\stopsetup
+
+\startsetup
+   \command
+     [\y!useblocks]
    \type
      [\c!vals!\c!opt!\c!vals!]
    \value
@@ -6248,20 +6308,20 @@
 
 \startsetup
    \command
-     [\y!handhaafblokken]
+     [\y!processblocks]
    \type
      [\c!vals!\c!opt!\c!vals!]
    \value
      [\c!identifier!]
      []
    \value
-     [\v!alles,\c!identifier!]
+     [\c!identifier!]
      []
 \stopsetup
 
 \startsetup
    \command
-     [\y!gebruikblokken]
+     [\y!bypassblocks]
    \type
      [\c!vals!\c!opt!\c!vals!]
    \value
@@ -6274,7 +6334,7 @@
 
 \startsetup
    \command
-     [\y!verwerkblokken]
+     [\y!forceblocks]
    \type
      [\c!vals!\c!opt!\c!vals!]
    \value
@@ -6287,7 +6347,7 @@
 
 \startsetup
   \command
-    [\y!selecteerblokken]
+    [\y!selectblocks]
   \type
     [\c!vals!\c!opt!\c!vals!\c!opt!\c!var!]
   \value
@@ -6298,34 +6358,34 @@
      []
   \variable
     [\c!criterium]
-    [\v!alles,\c!section!]
-    [\v!alles]
+    [\v!all,\c!section!]
+    [\v!all]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelblokin]
+    [\y!setupblock]
   \type
     [\c!vals!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!binnen]
+    [\c!inner]
     [\c!command!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
 %  \variable
 %    [\c!scope]
 %    [\v!globaal,\v!lokaal]
@@ -6338,7 +6398,7 @@
 
 \startsetup
   \command
-    [\e!start<<\y!formule>>]
+    [\e!start<<\y!formula>>]
   \type
     [\c!stp!]
   \value
@@ -6358,7 +6418,7 @@
 
 \startsetup
   \command
-    [\y!plaatsformule]
+    [\y!placeformula]
   \type
     [\c!opt!\c!refs!\c!opt!\c!arg!\c!dis!]
   \value
@@ -6371,7 +6431,7 @@
 
 \startsetup
   \command
-    [\y!plaatssubformule]
+    [\y!placesubformula]
   \type
     [\c!opt!\c!refs!\c!opt!\c!arg!\c!dis!]
   \value
@@ -6384,18 +6444,18 @@
 
 \startsetup
   \command
-    [\e!plaats<<\y!blok>>]
+    [\e!place<<\y!float>>]
   \type
     [\c!opt!\c!val!\c!opt!\c!refs!\c!arg!\c!arg!]
   \value
-    [\v!links,\v!rechts,\v!hier,\v!boven,\v!onder,
-     \v!inlinker,\v!inrechter,\v!inmarge,\v!marge,
-     \v!linkermarge,\v!rechtermarge,\v!linkerrand,\v!rechterrand,
-     \v!binnenmarge,\v!buitenmarge,\v!binnenrand,\v!buitenrand,
-     \v!binnen,\v!buiten,\c!regel,\v!hoog,\v!laag,\v!passend,
-     \v!pagina,\v!naast,\v!altijd,\v!forceer,\v!lang,\v!reset,
-     \v!regel,\v!hoogte,\v!diepte]
-    [\v!hier]
+    [\v!left,\v!right,\v!here,\v!top,\v!bottom,
+     \v!inleft,\v!inright,\v!inmargin,\v!margin,
+     \v!leftmargin,\v!rightmargin,\v!leftedge,\v!rightedge,
+     \v!innermargin,\v!outermargin,\v!inneredge,\v!outeredge,
+     \v!inner,\v!outer,\c!line,\v!high,\v!low,\v!fit,
+     \v!page,\v!opposite,\v!always,\v!force,\v!tall,\v!reset,
+     \v!line,\v!height,\v!depth]
+    [\v!here]
   \value
     [\c!text!]
     []
@@ -6406,26 +6466,26 @@
 
 \startsetup
   \command
-    [\e!reserveer<<\y!blok>>]
+    [\e!reserve<<\y!float>>]
   \type
     [\c!opt!\c!vars!\c!opt!\c!val!\c!opt!\c!refs!\c!arg!]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!kader]
-    [\v!aan,\v!uit]
+    [\c!frame]
+    [\v!on,\v!off]
     []
   \value
-    [\v!links,\v!rechts,\v!hier,\v!boven,\v!onder,
-     \v!inlinker,\v!inrechter,\v!inmarge,\v!marge,
-     \v!pagina,\v!naast,\v!altijd,\v!forceer]
-    [\v!hier]
+    [\v!left,\v!right,\v!here,\v!top,\v!bottom,
+     \v!inleft,\v!inright,\v!inmargin,\v!margin,
+     \v!page,\v!opposite,\v!always,\v!force]
+    [\v!here]
   \value
     [\c!text!]
     []
@@ -6433,7 +6493,7 @@
 
 \startsetup
   \command
-    [\y!definieerplaatsblok]
+    [\y!definefloat]
   \type
     [\c!val!\c!val!]
   \value
@@ -6446,30 +6506,30 @@
 
 \startsetup
   \command
-    [\y!stelplaatsblokin]
+    [\y!setupfloat]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!maxhoogte]
+    [\c!maxheight]
     [\c!dimension!]
     []
   \variable
-    [\c!maxbreedte]
+    [\c!maxwidth]
     [\c!dimension!]
     []
   \variable
-    [\c!minbreedte]
+    [\c!minwidth]
     [\c!dimension!]
     []
   \variable
@@ -6477,21 +6537,21 @@
     [\c!identifier!]
     []
   \variable
-    [\c!paginaovergangen]
+    [\c!pageboundaries]
     [\c!list!]
     []
   \variable
-    [\c!linkermargeafstand]
+    [\c!leftmargindistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!rechtermargeafstand]
+    [\c!rightmargindistance]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!plaats]
-    [\v!links,\v!midden,\v!rechts]
-    [\v!midden]
+    [\c!location]
+    [\v!left,\v!middle,\v!right]
+    [\v!middle]
   \inheritvariables
     [\y!setupframed]
     []
@@ -6499,11 +6559,11 @@
 
 \startsetup
   \command
-    [\e!start<<\y!blok>>\e!tekst]
+    [\e!start<<\y!float>>\e!text]
   \type
     [\c!opt!\c!val!\c!opt!\c!ref!\c!arg!\c!arg!\c!stp!]
   \value
-    [\v!links,\v!rechts,\v!hoog,\v!midden,\v!laag,\c!offset,\v!lang]
+    [\v!left,\v!right,\v!high,\v!middle,\v!low,\c!offset,\v!tall]
     []
   \value
     [\c!text!]
@@ -6517,12 +6577,12 @@
 \stopsetup
 
 \startsetup
-  \command[\e!plaats\e!lijstmet<<\y!blokken>>]
+  \command[\e!place\e!listof<<\y!floats>>]
   \type[\c!optint!]
 \stopsetup
 
 \startsetup
-  \command[\e!volledige\e!lijstmet<<\y!blokken>>]
+  \command[\e!complete\e!listof<<\y!floats>>]
   \type[\c!optint!]
 \stopsetup
 
@@ -6558,7 +6618,7 @@
 
 \startsetup
   \command
-    [\y!kenmerk]
+    [\y!referral]
   \type
     [\c!vars!]
   \variable
@@ -6589,18 +6649,18 @@
 
 \startsetup
   \command
-    [\y!selecteerpapier]
+    [\y!selectpaper]
   \type
     [\c!vars!]
   \variable
-    [\c!soort]
+    [\c!family]
     [1,2]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!koppelpapier]
+    [\y!couplepaper]
   \type
     [\c!val!]
   \value
@@ -6619,20 +6679,20 @@
 \stopsetup
 
 \startsetup
-  \command[\y!breuk]
+  \command[\y!fraction]
   \type[\c!arg!\c!arg!]
   \value[\c!text!][]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
-  \command[\y!punten]
+  \command[\y!periods]
   \type[\c!val!]
   \value[\c!number!][]
 \stopsetup
 
 \startsetup
-  \command[\y!woonplaats]
+  \command[\y!domicile]
   \type[\c!arg!]
   \value[\c!text!][]
 \stopsetup
@@ -6643,62 +6703,62 @@
   \type
     [\c!opt!\c!vars!\c!args!]
   \inheritvariables
-    [\y!stelitemsin]
+    [\y!setupitems]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelitemsin]
+    [\y!setupitems]
   \type
     [\c!vars!]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts,\v!inmarge,\v!boven,\v!onder]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!right,\v!inmargin,\v!top,\v!bottom]
+    [\v!left]
   \variable
-    [\c!symbool]
-    [1,2,...,\c!n,\c!a,...,\c!text!,\v!geen]
+    [\c!symbol]
+    [1,2,...,\c!n,\c!a,...,\c!text!,\v!none]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [\hsize]
   \variable
     [\c!n]
-    [\c!number!,\v!onbekend]
-    [\v!onbekend]
+    [\c!number!,\v!unknown]
+    [\v!unknown]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    [{\blanko[\v!middel]}]
+    [{\blank[\v!medium]}]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!rechts,\v!midden,\v!marge]
-    [\v!midden]
+    [\c!align]
+    [\v!left,\v!right,\v!middle,\v!margin]
+    [\v!middle]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
 \stopsetup
 
 \startsetup
   \command
-    [\y!startcitaat]
+    [\y!startquotation]
   \type
     [\c!vals!\c!stp!]
   \value
-    [\c!repeat!\v!links,\c!repeat!\v!midden,\c!repeat!\v!rechts]
-    [\v!midden]
+    [\c!repeat!\v!left,\c!repeat!\v!middle,\c!repeat!\v!right]
+    [\v!middle]
 \stopsetup
 
 \startsetup
   \command
-    [\y!citaat]
+    [\y!quotation]
   \type
     [\c!arg!]
   \value
@@ -6708,7 +6768,7 @@
 
 \startsetup
   \command
-    [\y!citeer]
+    [\y!quote]
   \type
     [\c!arg!]
   \value
@@ -6718,44 +6778,44 @@
 
 \startsetup
   \command
-    [\y!stelciterenin]
+    [\y!setupquote]
   \type
     [\c!vars!]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!plaats]
-    [\v!tekst,\v!marge]
-    [\v!marge]
+    [\c!location]
+    [\v!text,\v!margin]
+    [\v!margin]
 \stopsetup
 
 \startsetup
   \command
-    [\y!toevoegen]
+    [\y!adding]
   \type
     [\c!val!]
   \value
-    [\v!klein,\v!middel,\v!groot]
-    [\v!middel]
+    [\v!small,\v!medium,\v!big]
+    [\v!medium]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieeralineas]
+    [\y!defineparagraphs]
   \type
     [\c!val!\c!vars!]
   \value
@@ -6766,131 +6826,131 @@
     [\c!number!]
     [2]
   \variable
-    [\c!lijn]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!rule]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!hoogte]
-    [\v!passend,\c!dimension!]
-    [\v!passend]
+    [\c!height]
+    [\v!fit,\c!dimension!]
+    [\v!fit]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!binnen]
+    [\c!inner]
     [\c!command!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!tolerantie]
-    [\v!zeerstreng,\v!streng,\v!soepel,\v!zeersoepel,\v!rek]
-    [\v!soepel]
+    [\c!tolerance]
+    [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch]
+    [\v!tolerant]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!rechts,\v!midden]
+    [\c!align]
+    [\v!left,\v!right,\v!middle]
     []
 \stopsetup
 
 \startsetup
   \command
-    [<<\y!alinea>>]
+    [<<\y!paragraph>>]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!start<<\y!alinea>>]
+    [\e!start<<\y!paragraph>>]
   \type
     [\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelalineasin]
+    [\y!setupparagraphs]
   \type
     [\c!val!\c!opt!\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \value
-    [\c!number!,\v!elk]
+    [\c!number!,\v!each]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!rechts,\v!midden,\v!breedte]
-    [\c!breedte]
+    [\c!align]
+    [\v!left,\v!right,\v!middle,\v!width]
+    [\c!width]
   \variable
-    [\c!tolerantie]
-    [\v!zeerstreng,\v!streng,\v!soepel,\v!zeersoepel,\v!rek]
-    [\v!soepel]
+    [\c!tolerance]
+    [\v!verystrict,\v!strict,\v!tolerant,\v!verytolerant,\v!stretch]
+    [\v!tolerant]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!binnen]
+    [\c!inner]
     [\c!command!]
     []
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!command!]
     []
   \variable
-    [\c!lijn]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!rule]
+    [\v!on,\v!off]
+    [\v!off]
 \stopsetup
 
 \startsetup
   \command
-    [\y!steltabin]
+    [\y!setuptab]
   \type
     [\c!vars!]
   \variable
-    [\c!monster]
+    [\c!sample]
     [\c!text!]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!kopletter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
+    [\c!headstyle]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!normal]
   \variable
-    [\c!plaats]
-    [\v!links,\v!rechts]
-    [\v!links]
+    [\c!location]
+    [\v!left,\v!right]
+    [\v!left]
 \stopsetup
 
 \startsetup
@@ -6918,15 +6978,15 @@
     []
 \stopsetup
 
-\startsetup
-  \command
-    [\y!brieven]
-  \type
-    [\c!val!]
-  \value
-    [\c!identifier!]
-    []
-\stopsetup
+% \startsetup
+%   \command
+%     [\y!brieven]
+%   \type
+%     [\c!val!]
+%   \value
+%     [\c!identifier!]
+%     []
+% \stopsetup
 
 \startsetup
   \command
@@ -6938,72 +6998,72 @@
     []
 \stopsetup
 
-\startsetup
-  \command
-    [\y!stelbrievenin]
-  \type
-    [\c!vals!]
-  \value
-    [\v!formeel,\v!informeel,\v!rekening,\v!ls,
-     \v!hoog,\v!midden,\v!laag]
-    [\v!formeel,\v!laag]
-\stopsetup
+% \startsetup
+%   \command
+%     [\y!stelbrievenin]
+%   \type
+%     [\c!vals!]
+%   \value
+%     [\v!formeel,\v!informeel,\v!rekening,\v!ls,
+%      \v!hoog,\v!midden,\v!laag]
+%     [\v!formeel,\v!laag]
+% \stopsetup
 
-\startsetup
-  \command
-    [\y!stelsheetsin]
-  \type
-    [\c!vars!]
-  \variable
-    [\c!variant]
-    [\c!number!]
-    []
-  \variable
-    [\c!tekst]
-    [\c!text!]
-    []
-  \variable
-    [\c!formaat]
-    [\v!klein,\v!middel,\v!groot]
-    [\v!middel]
-  \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!normaal]
-  \variable
-    [\c!nummer]
-    [\c!number!,\v!aansluitend]
-    []
-\stopsetup
+% \startsetup
+%   \command
+%     [\y!stelsheetsin]
+%   \type
+%     [\c!vars!]
+%   \variable
+%     [\c!variant]
+%     [\c!number!]
+%     []
+%   \variable
+%     [\c!tekst]
+%     [\c!text!]
+%     []
+%   \variable
+%     [\c!formaat]
+%     [\v!klein,\v!middel,\v!groot]
+%     [\v!middel]
+%   \variable
+%     [\c!letter]
+%     [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+%     [\v!normaal]
+%   \variable
+%     [\c!nummer]
+%     [\c!number!,\v!aansluitend]
+%     []
+% \stopsetup
 
-\startsetup
-  \command
-    [\y!sheet]
-  \type
-    [\c!val!]
-  \value
-    [\c!text!]
-    []
-\stopsetup
+% \startsetup
+%   \command
+%     [\y!sheet]
+%   \type
+%     [\c!val!]
+%   \value
+%     [\c!text!]
+%     []
+% \stopsetup
 
-\startsetup
-  \command
-    [\y!stelstickersin]
-  \type
-    [\c!vars!]
-  \variable
-    [\c!variant]
-    [a]
-    []
-  \variable
-    [\c!n]
-    [\c!number!,\v!alles]
-    [\c!val!]
-  \variable
-    [\c!plaats]
-    [\v!marge,\v!links,\v!rechts,\v!midden]
-    [\v!links]
-\stopsetup
+% \startsetup
+%   \command
+%     [\y!stelstickersin]
+%   \type
+%     [\c!vars!]
+%   \variable
+%     [\c!variant]
+%     [a]
+%     []
+%   \variable
+%     [\c!n]
+%     [\c!number!,\v!alles]
+%     [\c!val!]
+%   \variable
+%     [\c!plaats]
+%     [\v!marge,\v!links,\v!rechts,\v!midden]
+%     [\v!links]
+% \stopsetup
 
 % *.tex
 
@@ -7045,57 +7105,57 @@
     [\c!identifier!]
     []
   \variable
-    [\c!eenheid]
+    [\c!unit]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!inspringen]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!indenting]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
-    [\c!binnen]
+    [\c!inner]
     [\c!command!]
-    [\blanko]
+    [\blank]
   \variable
     [EQ]
     [\c!text!]
     [:]
   \variable
-    [\c!lijnkleur]
+    [\c!rulecolor]
     [\c!identifier!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts,\v!normaal]
-    [\v!normaal]
+    [\c!align]
+    [\v!left,\v!middle,\v!right,\v!normal]
+    [\v!normal]
   \variable
-    [\c!lijndikte]
+    [\c!rulethickness]
     [\c!dimension!]
-    [\lijndikte]
+    [\linewidth]
   \variable
-    [\c!afstand]
-    [\v!blanko,\v!grid,\v!diepte,\c!dimension!,\v!klein,\v!middel,\v!groot,\v!geen]
-    [\v!diepte,\v!middel]
+    [\c!distance]
+    [\v!blank,\v!grid,\v!depth,\c!dimension!,\v!small,\v!medium,\v!big,\v!none]
+    [\v!depth,\v!medium]
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
   \variable
-    [\c!lijn]
-    [\v!normaal,\v!regel]
-    [\v!regel]
+    [\c!rule]
+    [\v!normal,\v!line]
+    [\v!line]
   \variable
-    [\c!splitsen]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!split]
+    [\v!yes,\v!no]
+    [\v!yes]
 \stopsetup
 
 \startsetup
@@ -7104,64 +7164,64 @@
   \type
     [\c!vars!]
   \variable
-    [\c!afstand]
-    [\v!klein,\v!middel,\v!groot]
-    [\v!middel]
+    [\c!distance]
+    [\v!small,\v!medium,\v!big]
+    [\v!medium]
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
   \variable
     [HL]
-    [\c!number!,\v!klein,\v!middel,\v!groot,\v!geen]
-    [\v!middel]
+    [\c!number!,\v!small,\v!medium,\v!big,\v!none]
+    [\v!medium]
   \variable
     [VL]
-    [\c!number!,\v!klein,\v!middel,\v!groot,\v!geen]
-    [\v!middel]
+    [\c!number!,\v!small,\v!medium,\v!big,\v!none]
+    [\v!medium]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!number!,\v!strut]
     [.40]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!number!,\v!strut]
     [80]
   \variable
-    [\c!lijndikte]
+    [\c!rulethickness]
     [\c!dimension!]
-    [\lijndikte]
+    [\linewidth]
   \variable
-    [\c!lijnkleur]
+    [\c!rulecolor]
     [\c!identifier!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!rechts,\v!midden,\v!links,\v!normaal]
-    [\v!rechts]
+    [\c!align]
+    [\v!right,\v!middle,\v!left,\v!normal]
+    [\v!right]
   \variable
-    [\c!commandos]
+    [\c!commands]
     [\c!command!]
     []
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts,\v!normaal]
-    [\v!rechts]
+    [\c!align]
+    [\v!left,\v!middle,\v!right,\v!normal]
+    [\v!right]
   \variable
-    [\c!achtergrond]
-    [\v!raster,\v!kleur,\v!geen]
-    [\v!geen]
+    [\c!background]
+    [\v!screen,\v!color,\v!none]
+    [\v!none]
   \variable
-    [\c!achtergrondraster]
+    [\c!backgroundscreen]
     [\c!number!]
     [0.9]
   \variable
-    [\c!achtergrondkleur]
+    [\c!backgroundcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
 \stopsetup
 
@@ -7206,15 +7266,15 @@
 
 \startsetup
   \command
-    [\y!gebruikexternefiles]
+    [\y!useexternalfiles]
   \type
     [\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
   \variable
     [\c!file]
@@ -7224,7 +7284,7 @@
 
 \startsetup
   \command
-    [\y!gebruikexternefile]
+    [\y!useexternalfile]
   \type
     [\c!val!\c!val!\c!val!\c!vars!]
   \value
@@ -7237,8 +7297,8 @@
     [\c!filename!]
     []
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
 \stopsetup
 
@@ -7284,59 +7344,59 @@
     [\c!filename!]
     []
   \variable
-    [\c!schaal]
+    [\c!scale]
     [\c!number!]
     [1000]
   \variable
     [\c!factor]
-    [\v!max,\v!passend,\v!ruim]
+    [\v!max,\v!fit,\v!broad]
     []
   \variable
-    [\c!bfactor]
-    [\c!number!,\v!max,\v!ruim,\v!passend]
+    [\c!wfactor]
+    [\c!number!,\v!max,\v!broad,\v!fit]
     []
   \variable
     [\c!hfactor]
-    [\c!number!,\v!max,\v!ruim,\v!passend]
+    [\c!number!,\v!max,\v!broad,\v!fit]
     []
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!kader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!frame]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
     [\c!preset]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!scherm]
+    [\c!display]
     [\c!filename!]
     []
   \variable
     [\c!preview]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!herhaal]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!repeat]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
     [\c!object]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
     [\c!type]
     [\c!eps,\c!mps,\c!pdf,\c!tif,\c!png,\c!jpg,\c!mov,\c!tex]
     []
   \variable
-    [\c!methode]
+    [\c!method]
     [\c!eps,\c!mps,\c!pdf,\c!tif,\c!png,\c!jpg,\c!mov,\c!tex]
     []
 \stopsetup
@@ -7360,17 +7420,17 @@
   \type
     [\c!var!]
   \variable
-    [\c!optie]
-    [\v!kader,\v!leeg,\v!test]
+    [\c!option]
+    [\v!frame,\v!empty,\v!test]
     []
   \variable
     [\c!object]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!hokjes]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!frames]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
     [\c!ymax]
     [\c!number!]
@@ -7380,19 +7440,19 @@
     [\c!number!]
     []
   \variable
-    [\c!gebied]
+    [\c!directory]
     [\c!text!]
     []
   \variable
-    [\c!plaats]
-    [\v!lokaal,\v!globaal,\v!default,\v!geen]
+    [\c!location]
+    [\v!local,\v!global,\v!default,\v!none]
     []
   \variable
-    [\c!maxbreedte]
+    [\c!maxwidth]
     [\c!dimension!]
     []
   \variable
-    [\c!maxhoogte]
+    [\c!maxheight]
     [\c!dimension!]
     []
 \stopsetup
@@ -7403,7 +7463,7 @@
   \type
     [\c!opt!\c!vars!]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [\v!a,\v!b,\v!c]
     [\v!a]
 \stopsetup
@@ -7423,7 +7483,7 @@
 
 \startsetup
   \command
-    [\y!naam]
+    [\y!macroname]
   \type
     [\c!arg!]
   \value
@@ -7433,11 +7493,11 @@
 
 \startsetup
   \command
-    [\e!start\v!legenda]
+    [\e!start\v!legend]
   \type
     [\c!opt!\c!val!\c!tex!{leg}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{leg}\c!stp!]
   \value
-    [\v!twee]
+    [\v!two]
     []
   \value
     [\c!text!]
@@ -7452,10 +7512,10 @@
 
 \startsetup
   \command
-    [\e!start\v!gegeven]
+    [\e!start\v!fact]
   \type
 %    [\c!tex!{geg}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{geg}\c!stp!]
-    [\c!tex!{\y!geg}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{\y!geg}\c!stp!]
+    [\c!tex!{\y!fact}\c!nop!\c!sep!\c!nop!\c!sep!\c!nop!\c!sep!\c!tex!{\y!fact}\c!stp!]
   \value
     [\c!text!]
     []
@@ -7483,13 +7543,13 @@
   \type
     [\c!vars!]
   \variable
-    [\c!rotatie]
+    [\c!rotation]
     [\c!number!]
     [90]
   \variable
-    [\c!plaats]
-    [\v!normaal,\v!hoog,\v!passend,\v!ruim,\v!diepte]
-    [\v!normaal]
+    [\c!location]
+    [\v!normal,\v!high,\v!fit,\v!broad,\v!depth]
+    [\v!normal]
   \inheritvariables
     [\y!setupframed]
     []
@@ -7497,14 +7557,14 @@
 
 \startsetup
   \command
-    [\y!spiegel]
+    [\y!mirror]
   \type
     [\c!arg!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!schaal]
+    [\y!scale]
   \type
     [\c!opt!\c!vars!\c!arg!]
   \variable
@@ -7523,43 +7583,43 @@
   \type
     [\c!vars!]
   \variable
-    [\c!voor]
-    [\c!commando]
+    [\c!before]
+    [\c!command]
     []
   \variable
-    [\c!tussen]
-    [\c!commando]
+    [\c!inbetween]
+    [\c!command]
     []
   \variable
-    [\c!na]
-    [\c!commando]
+    [\c!after]
+    [\c!command]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!hoogte]
-    [\c!dimension!,\v!passend]
-    [\v!passend]
+    [\c!height]
+    [\c!dimension!,\v!fit]
+    [\v!fit]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\v!passend]
-    [\v!passend]
+    [\c!width]
+    [\c!dimension!,\v!fit]
+    [\v!fit]
   \variable
-    [\c!plaats]
-    [\c!boven,\c!midden,\c!onder,\c!links,\c!rechts]
-    [\c!onder]
+    [\c!location]
+    [\c!top,\c!middle,\c!bottom,\c!left,\c!right]
+    [\c!bottom]
   \variable
-    [\c!uitlijnen]
-    [\v!nee,\v!links,\v!rechts,\v!midden,\v!normaal]
-    [\v!midden]
+    [\c!align]
+    [\v!no,\v!left,\v!right,\v!middle,\v!normal]
+    [\v!middle]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!]
+    [\v!bold]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
 \stopsetup
@@ -7632,51 +7692,51 @@
 
 \startsetup
   \command
-    [\y!stelinteractieschermin]
+    [\y!setupinteractionscreen]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\v!passend,\v!max]
-    [\papierbreedte]
+    [\c!width]
+    [\c!dimension!,\v!fit,\v!max]
+    [\paperwidth]
   \variable
-    [\c!hoogte]
-    [\c!dimension!,\v!passend,\v!max]
-    [\papierhoogte]
+    [\c!height]
+    [\c!dimension!,\v!fit,\v!max]
+    [\paperheight]
   \variable
-    [\c!rugwit]
+    [\c!backspace]
     [\c!dimension!]
-    [\rugwit]
+    [\backspace]
   \variable
-    [\c!kopwit]
+    [\c!topspace]
     [\c!dimension!]
-    [\kopwit]
+    [\topspace]
   \variable
-    [\c!rugoffset]
+    [\c!horoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kopoffset]
+    [\c!veroffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!optie]
-    [\v!max,\v!passend,\v!dubbelzijdig,\v!bookmark]
+    [\c!option]
+    [\v!max,\v!fit,\v!doublesided,\v!bookmark]
     []
   \variable
-    [\c!wachttijd]
-    [\c!number!,\v!geen]
-    [\v!geen]
+    [\c!delay]
+    [\c!number!,\v!none]
+    [\v!none]
 \stopsetup
 
 \startsetup
-  \command[\y!scherm]
+  \command[\y!screen]
   \type[\c!alwint!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelpaginaovergangenin]
+    [\y!setuppagetransitions]
   \type
     [\c!opt!\c!vals!]
   \value
@@ -7693,47 +7753,47 @@
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!stop]
   \variable
     [\c!menu]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\v!on,\v!off]
+    [\v!off]
   \variable
-    [\c!pagina]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!page]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!klik]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!click]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!splitsen]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!split]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!scherm]
-    [\v!nieuw]
+    [\c!display]
+    [\v!new]
     []
   \variable
-    [\c!openactie]
+    [\c!openaction]
     [\c!reference!]
     []
   \variable
-    [\c!sluitactie]
+    [\c!closeaction]
     [\c!reference!]
     []
   \variable
-    [\c!openpaginaactie]
+    [\c!openpageaction]
     [\c!reference!]
     []
   \variable
-    [\c!sluitpaginaactie]
+    [\c!closepageaction]
     [\c!reference!]
     []
   \variable
-    [\c!bereken]
+    [\c!calculate]
     [\c!identifier!]
     []
 %  \variable
@@ -7742,134 +7802,134 @@
 %    [\v!normaal]
   \variable
     [\c!strut]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!]
+    [\v!bold]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!contrastkleur]
+    [\c!contrastcolor]
     [\c!identifier!]
     []
   \variable
-    [\c!symboolset]
+    [\c!symbolset]
     [\c!identifier!]
     []
   \variable
-    [\c!titel]
+    [\c!title]
     [\c!text!]
     []
   \variable
-    [\c!subtitel]
+    [\c!subtitle]
     [\c!text!]
     []
   \variable
-    [\c!auteur]
+    [\c!author]
     [\c!text!]
     []
   \variable
-    [\c!datum]
+    [\c!date]
     [\c!text!]
     []
   \variable
-    [\c!trefwoord]
+    [\c!keyword]
     [\c!text!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelinteractiemenuin]
+    [\y!defineinteractionmenu]
   \type
     [\c!alwint!\c!vals!\c!opt!\c!vars!] % \c!opt!\c!dests!
   \value
-    [\v!links,\v!rechts,\v!boven,\v!onder,\c!identifier!]
+    [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!command!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!command!]
     []
   \variable
-    [\c!midden]
+    [\c!middle]
     [\c!command!]
     []
   \variable
-    [\c!status]
-    [\v!start,\v!stop,\v!geen,\v!lokaal]
+    [\c!state]
+    [\v!start,\v!stop,\v!none,\v!local]
     [\v!start]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...\c!command!]
+    [\v!bold]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\v!overlay,\c!dimension!]
     []
   \variable
-    [\c!zelfdepagina]
-    [\v!ja,\v!leeg,\v!nee,\v!geen]
+    [\c!samepage]
+    [\v!yes,\v!empty,\v!no,\v!none]
     []
   \variable
-    [\c!onbekendeverwijzing]
-    [\v!ja,\v!leeg,\v!nee,\v!geen]
+    [\c!unknownreference]
+    [\v!yes,\v!empty,\v!no,\v!none]
     []
   \variable
-    [\c!linkeroffset]
+    [\c!leftoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!rechteroffset]
+    [\c!rightoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!bovenoffset]
+    [\c!topoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!onderoffset]
+    [\c!bottomoffset]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!positie]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!position]
+    [\v!yes,\v!no]
+    [\v!no]
   \inheritvariables
     [\y!setupframed]
     []
@@ -7877,23 +7937,23 @@
 
 \startsetup
   \command
-    [\y!definieerinteractiemenu]
+    [\y!defineinteractionmenu]
   \type
     [\c!alwint!\c!val!\c!opt!\c!val!\c!opt!\c!vars!]
   \value
-    [\v!links,\v!rechts,\v!boven,\v!onder,\c!identifier!]
+    [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!]
     []
   \value
-    [\v!links,\v!rechts,\v!boven,\v!onder,\c!identifier!]
+    [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!]
     []
   \inheritvariables
-    [\y!stelinteractiemenuin]
+    [\y!setupinteractionmenu]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\e!start\v!interactiemenu]
+    [\e!start\y!interactionmenu] % y! ?
   \type
     [\c!alwint!\c!val!\c!stp!]
   \value
@@ -7903,17 +7963,17 @@
 
 \startsetup
   \command
-    [\y!blokkeerinteractiemenu]
+    [\y!disableinteractionmenu]
   \type
     [\c!alwint!\c!val!\c!refs!]
   \value
-    [\v!links,\v!rechts,\v!boven,\v!onder,\c!identifier!]
+    [\v!left,\v!right,\v!top,\v!bottom,\c!identifier!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!gebruikexterndocument]
+    [\y!useexternaldocument]
   \type
     [\c!alwint!\c!val!\c!val!\c!val!]
   \value
@@ -7929,7 +7989,7 @@
 
 \startsetup
   \command
-    [\y!gebruikURL]
+    [\y!useURL]
   \type
     [\c!alwint!\c!val!\c!val!\c!val!\c!val!]
   \value
@@ -7966,28 +8026,28 @@
 \stopsetup
 
 \startsetup
-  \command[\y!uit]
+  \command[\y!from]
   \type[\c!alwint!\c!ref!]
   \value[\c!text!][]
 \stopsetup
 
 \startsetup
   \command
-    [\y!interactiebalk]
+    [\y!interactionbar]
   \type
     [\c!alwint!\c!vars!]
   \inheritvariables
-    [\y!stelinteractiebalkin]
+    [\y!setupinteractionbar]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!interactiebuttons]
+    [\y!interactionbuttons]
   \type
     [\c!alwint!\c!opt!\c!vars!\c!vals!]
   \inheritvariables
-    [\y!stelinteractiebalkin]
+    [\y!setupinteractionbar]
     []
   \value
     [\c!identifier!]
@@ -7998,40 +8058,40 @@
 
 \startsetup
   \command
-    [\y!stelinteractiebalkin]
+    [\y!setupinteractionbar]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
-    [\c!variant]
+    [\c!alternative]
     [a,b,c,d,e,f,g]
     [b]
   \variable
-    [\c!symbool]
-    [\v!ja,\v!nee]
-    [\v!nee]
+    [\c!symbol]
+    [\v!yes,\v!no]
+    [\v!no]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\c!hoogte,\v!passend]
+    [\c!width]
+    [\c!dimension!,\c!height,\v!fit]
     [3cm]
   \variable
-    [\c!hoogte]
-    [\c!dimension!,\c!hoogte,\v!passend]
-    [\v!ruim]
+    [\c!height]
+    [\c!dimension!,\c!height,\v!fit]
+    [\v!broad]
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!]
     [0pt]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!stap]
-    [\c!number!,\v!klein,\v!middel,\v!groot]
+    [\c!step]
+    [\c!number!,\v!small,\v!medium,\v!big]
     [1]
   \inheritvariables
     [\y!setupframed]
@@ -8040,41 +8100,41 @@
 
 \startsetup
  \command
-   [\y!synchroniseer]
+   [\y!synchronize]
  \type
    [\c!alwint!]
 \stopsetup
 
 \startsetup
  \command
-   [\y!startsynchronisatie]
+   [\y!startsynchronization]
  \type
    [\c!alwint!\c!stp!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelsynchronisatiebalkin]
+    [\y!setupsynchronizationbar]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!variant]
-    [\v!pagina,\v!lokaal]
-    [\v!pagina]
+    [\c!alternative]
+    [\v!page,\v!local]
+    [\v!page]
   \variable
-    [\c!breedte]
-    [\c!dimension!,\c!hoogte,\v!passend]
+    [\c!width]
+    [\c!dimension!,\c!height,\v!fit]
     [3cm]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [.5em]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
-    [\v!vet]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
+    [\v!bold]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \inheritvariables
@@ -8084,35 +8144,35 @@
 
 \startsetup
   \command
-    [\y!synchronisatiebalk]
+    [\y!synchronizationbar]
   \type
     [\c!alwint!\c!val!\c!vars!]
   \value
     [\c!identifier!]
     []
   \variable
-    [\c!variant]
-    [\v!pagina,\v!lokaal]
-    [\v!pagina]
+    [\c!alternative]
+    [\v!page,\v!local]
+    [\v!page]
   \inheritvariables
-    [\y!stelsynchronisatiebalkin]
+    [\y!setupsynchronizationbar]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!stelsynchronisatiein]
+    [\y!setupsynchronization]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!stop]
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieerprofiel]
+    [\y!defineprofile]
   \type
     [\c!alwint!\c!vals!\c!vals!]
   \value
@@ -8125,18 +8185,18 @@
 
 \startsetup
   \command
-    [\y!stelprofielenin]
+    [\y!setupprofiles]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!optie]
+    [\c!option]
     [\v!test]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!startprofiel]
+    [\y!startprofile]
   \type
     [\c!alwint!\c!vals!\c!stp!]
   \value
@@ -8146,7 +8206,7 @@
 
 \startsetup
   \command
-    [\y!volgprofiel]
+    [\y!followprofile]
   \type
     [\c!alwint!\c!arg!\c!val!]
   \value
@@ -8179,7 +8239,7 @@
 
 \startsetup
   \command
-    [\y!startversie]
+    [\y!startversion]
   \type
     [\c!alwint!\c!vals!\c!stp!]
   \value
@@ -8189,36 +8249,36 @@
 
 \startsetup
   \command
-    [\y!stelversiesin]
+    [\y!setupversions]
   \type
     [\c!vars!]
   \variable
-    [\c!nummer]
+    [\c!number]
     [\c!number!]
     [1]
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vet\v!schuin,\v!type,\v!kap,\v!klein...,\c!command!]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!bold\v!slanted,\v!type,\v!cap,\v!small...,\c!command!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!markeerversie]
+    [\y!markversion]
   \type
     [\c!alwint!]
 \stopsetup
 
 \startsetup
   \command
-    [\y!selecteerversie]
+    [\y!selectversion]
   \type
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!definieerversie]
+    [\y!defineversion]
   \type
     [\c!val!\c!vals!]
   \value
@@ -8231,7 +8291,7 @@
 
 \startsetup
   \command
-    [\y!volgversie]
+    [\y!followversion]
   \type
     [\c!alwint!\c!arg!\c!val!]
   \value
@@ -8244,7 +8304,7 @@
 
 \startsetup
   \command
-    [\y!volgprofielversie]
+    [\y!followprofileversion]
   \type
     [\c!alwint!\c!arg!\c!val!\c!val!]
   \value
@@ -8260,7 +8320,7 @@
 
 \startsetup
   \command
-    [\y!definieerprogramma]
+    [\y!defineprogram]
   \type
     [\c!alwint!\c!val!\c!val!\c!val!]
   \value
@@ -8276,18 +8336,18 @@
 
 \startsetup
   \command
-    [\y!stelprogrammasin]
+    [\y!setupprograms]
   \type
     [\c!alwint!\c!vars!]
   \variable
-    [\c!gebied]
+    [\c!directory]
     [\c!text!]
     []
 \stopsetup
 
 \startsetup
   \command
-    [\y!programma]
+    [\y!program]
   \type
     [\c!alwint!\c!val!]
   \value
@@ -8313,14 +8373,14 @@
     [\c!number!]
     []
   \variable
-    [\c!kader]
-    [\v!aan,\v!uit]
-    [\v!uit]
+    [\c!frame]
+    [\v!on,\v!off]
+    [\v!off]
 \stopsetup
 
 \startsetup
   \command
-    [\y!referring\subsetup{\v!figuur}]
+    [\y!referring\subsetup{\v!figure}]
   \type
     [\c!poss!\c!poss!\c!val!]
   \value
@@ -8342,7 +8402,7 @@
 
 \startsetup
   \command
-    [\y!marking\subsetup{\v!figuur}]
+    [\y!marking\subsetup{\v!figure}]
   \type
     [\c!poss!\c!poss!\c!val!]
   \value
@@ -8383,7 +8443,7 @@
 
 \startsetup
   \command
-    [\y!naar]
+    [\y!goto]
   \type
     [\c!alwint!\c!arg!\c!alwint!\c!arg!\c!refs!]
   \value
@@ -8393,7 +8453,7 @@
 
 \startsetup
   \command
-    [\y!naarbox]
+    [\y!gotobox]
   \type
     [\c!alwint!\c!arg!\c!refs!]
   \value
@@ -8407,7 +8467,7 @@
   \type
     [\c!alwint!\c!opt!\c!vars!\c!arg!\c!refs!]
   \inheritvariables
-    [\y!stelbuttonsin]
+    [\y!setupbuttons]
     []
   \value
     [\c!text!]
@@ -8416,11 +8476,11 @@
 
 \startsetup
   \command
-    [\y!stelbuttonsin]
+    [\y!setupbuttons]
   \type
     [\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \inheritvariables
@@ -8447,45 +8507,45 @@
   \type
     [\c!vars!]
   \variable
-    [\c!status]
+    [\c!state]
     [\v!start,\v!stop]
     [\v!start]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     []
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!titel]
+    [\c!title]
     [\c!text!]
     []
   \variable
-    [\c!spatie]
-    [\v!ja,\v!nee]
-    [\v!ja]
+    [\c!space]
+    [\v!yes,\v!no]
+    [\v!yes]
   \variable
-    [\c!symbool]
-    [\v!normaal,
+    [\c!symbol]
+    [\v!normal,
      \v!New,\v!Balloon,\v!Addition,\v!Help,\v!Paragraph,\v!Key,
      \c!identifier!]
-    [\v!normaal]
+    [\v!normal]
   \variable
-    [\c!optie]
+    [\c!option]
     [\v!max,\v!buffer]
     []
   \variable
-    [\c!marge]
+    [\c!margin]
     [\c!dimension!]
     [2.5em]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
 \stopsetup
@@ -8505,7 +8565,7 @@
 
 \startsetup
   \command
-    [\y!commentaar]
+    [\y!comment]
   \type
     [\c!opt!\c!val!\c!opt!\c!vars!\c!arg!]
   \value
@@ -8625,7 +8685,7 @@
   \type
     [\c!opt!\c!val!\c!arg!\c!arg!]
   \value
-    [\v!links,\v!rechts,\v!midden]
+    [\v!left,\v!right,\v!middle]
     []
   \value
     [\c!text!]
@@ -8658,7 +8718,7 @@
     [\c!identifier!]
     []
   \value
-    [\v!label,\v!horizontaal,\v!vertikaal,\v!kader]
+    [\v!label,\v!horizontal,\v!vertical,\v!frame]
     []
   \inheritvariables
     [\y!setupfields]
@@ -8674,87 +8734,87 @@
     [\c!identifier!]
     []
   \value
-    [\v!reset,\v!label,\v!horizontaal,\v!vertikaal,\v!kader]
+    [\v!reset,\v!label,\v!horizontal,\v!vertical,\v!frame]
     []
   \variable
     [\c!n]
     [\c!number!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     []
   \variable
-    [\c!voor]
+    [\c!before]
     [\c!command!]
     []
   \variable
-    [\c!na]
+    [\c!after]
     [\c!command!]
     []
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
     []
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
   \variable
-    [\c!letter]
-    [\v!normaal,\v!vet,\v!schuin,\v!vetschuin,\v!type]
-    [\v!normaal]
+    [\c!style]
+    [\v!normal,\v!bold,\v!slanted,\v!boldslanted,\v!type]
+    [\v!normal]
   \variable
-    [\c!uitlijnen]
-    [\v!links,\v!midden,\v!rechts]
+    [\c!align]
+    [\v!left,\v!middle,\v!right]
     []
   \variable
-    [\c!optie]
-    [\v!alleenleesbaar,\v!verplicht,\v!beschermd,\v!gesorteerd,
-     \v!nietbeschikbaar, \v!verborgen,\v!printbaar]
+    [\c!option]
+    [\v!readonly,\v!required,\v!protected,\v!sorted,
+     \v!unavailable, \v!hidden,\v!printable]
     []
   \variable
-    [\c!klikin]
+    [\c!clickin]
     [\c!reference!]
     []
   \variable
-    [\c!klikuit]
+    [\c!clickout]
     [\c!reference!]
     []
   \variable
-    [\c!gebiedin]
+    [\c!regionin]
     [\c!reference!]
     []
   \variable
-    [\c!gebieduit]
+    [\c!regionout]
     [\c!reference!]
     []
   \variable
-    [\c!natoets]
+    [\c!afterkey]
     [\c!reference!]
     []
   \variable
-    [\c!formatteer]
+    [\c!format]
     [\c!reference!]
     []
   \variable
-    [\c!valideer]
+    [\c!validate]
     [\c!reference!]
     []
   \variable
-    [\c!bereken]
+    [\c!calculate]
     [\c!reference!]
     []
   \variable
-    [\c!veldoffset]
+    [\c!fieldoffset]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!veldkaderkleur]
+    [\c!fieldframecolor]
     [\c!identifier!]
     []
   \variable
-    [\c!veldachtergrondkleur]
+    [\c!fieldbackgroundcolor]
     [\c!identifier!]
     []
   \inheritvariables
@@ -8768,7 +8828,7 @@
   \type
     [\c!vars!]
   \variable
-    [\c!methode]
+    [\c!method]
     [HTML,FDF]
     [HTML]
 \stopsetup
@@ -8837,11 +8897,11 @@
     [\c!number!]
     [1]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
@@ -8881,28 +8941,28 @@
     [\c!number!]
     [1]
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [1em]
   \variable
-    [\c!tussen]
+    [\c!inbetween]
     [\c!command!]
-    [] % [{\blanko[\v!middel]}]
+    [] % [{\blank[\v!medium]}]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [\hsize]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [\vsize]
   \variable
-    [\c!plaats]
-    [\v!rechts,\v!onder]
-    [\v!onder]
+    [\c!location]
+    [\v!right,\v!bottom]
+    [\v!bottom]
   \variable
-    [\c!korps]
-    [5pt,...,12pt,\v!klein,\v!groot]
+    [\c!bodyfont]
+    [5pt,...,12pt,\v!small,\v!big]
     []
 \stopsetup
 
@@ -8940,27 +9000,27 @@
     [\c!identifier!]
     []
   \variable
-    [\c!diepte]
+    [\c!depth]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!hoogte]
+    [\c!height]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!breedte]
+    [\c!width]
     [\c!dimension!]
     [\hsize]
   \variable
-    [\c!voorwit]
+    [\c!spacebefore]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!nawit]
+    [\c!spaceafter]
     [\c!dimension!]
     [\!!zeropoint]
   \variable
-    [\c!kleur]
+    [\c!color]
     [\c!identifier!]
     []
 \stopsetup
@@ -8984,24 +9044,24 @@
     [\c!identifier!]
     []
   \variable
-    [\c!links]
+    [\c!left]
     [\c!text!]
     []
   \variable
-    [\c!rechts]
+    [\c!right]
     [\c!text!]
     []
   \variable
-    [\c!afstand]
+    [\c!distance]
     [\c!dimension!]
     [5em]
   \variable
-    [\c!commando]
+    [\c!command]
     [\c!oneargument!]
     []
   \variable
     [\c!strut]
-    [\v!ja,\v!nee,\v!kap,\c!text!]
+    [\v!yes,\v!no,\v!cap,\c!text!]
     [\c!ja]
 \stopsetup
 
@@ -9109,8 +9169,8 @@
   \type
     [\c!val!]
   \value
-    [\v!ja,\v!nee,\v!kap,\c!text!]
-    [\v!ja]
+    [\v!yes,\v!no,\v!cap,\c!text!]
+    [\v!yes]
 \stopsetup
 
-\stopsetupfile
\ No newline at end of file
+\stopsetupfile
diff --git a/tex/context/base/setupd.tex b/tex/context/base/setupd.tex
index 861efe0c4..c22e8dad7 100644
--- a/tex/context/base/setupd.tex
+++ b/tex/context/base/setupd.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=setupd,
+%D   [       filefile=setupd,
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Setup to TWS,
 %D       subtitle=Help Generation,
diff --git a/tex/context/base/setupe.tex b/tex/context/base/setupe.tex
index 29ef61c61..c1b2a65ff 100644
--- a/tex/context/base/setupe.tex
+++ b/tex/context/base/setupe.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=setupe,
+%D   [       filefile=setupe,
 %D        version=2001.10.24,
 %D          title=\CONTEXT\ Setup to XML
 %D       subtitle=Help Generation,
diff --git a/tex/context/base/spec-def.tex b/tex/context/base/spec-def.tex
index 57dcb7ae5..85c595d35 100644
--- a/tex/context/base/spec-def.tex
+++ b/tex/context/base/spec-def.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-def,
+%D   [       filefile=spec-def,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Definitions,
@@ -20,8 +20,8 @@
 %D drivers are supported, as well as two mechanisms for
 %D interactive texts.
 %D
-%D \startregelcorrectie
-%D \starttabel[|l|l|l|l|l|]
+%D \startlinecorrection
+%D \starttable[|l|l|l|l|l|]
 %D \HL
 %D \NC \bf file             \NC
 %D     \bf name             \NC
@@ -69,8 +69,8 @@
 %D     HTML V 2.0           \NC
 %D     (dvips)              \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 
 %D \macros
 %D   {dostartgraymode,dostopgraymode,
@@ -78,10 +78,10 @@
 %D
 %D Switching to and from color can be done in two ways:
 %D
-%D \startopsomming[opelkaar,n]
-%D \som  insert driver specific commands
-%D \som  pass instructions to the output device
-%D \stopopsomming
+%D \startitemize[packed,n]
+%D \item  insert driver specific commands
+%D \item  pass instructions to the output device
+%D \stopitemize
 %D
 %D The first approach is more general and lays the
 %D responsibility at the driver side. Probably due to the fact
@@ -91,10 +91,10 @@
 %D package handles colored text that crosses the page boundary.
 %D Again, there are two approaches.
 %D
-%D \startopsomming[opelkaar,n]
-%D \som  let \TEX\ do the job
-%D \som  let the driver handle things
-%D \stopopsomming
+%D \startitemize[packed,n]
+%D \item  let \TEX\ do the job
+%D \item  let the driver handle things
+%D \stopitemize
 %D
 %D The first approach is as driver independant as possible and
 %D can easily be accomplished by using \TEX's mark mechanism.
@@ -105,9 +105,9 @@
 %D from~0 to~1. When drivers use values in the range 0..255,
 %D this value has to be adapted in the translation process.
 %D Technically it's possible to get a grayscale from combining
-%D colors. In the \kap{RGB} color system, a color with Red,
+%D colors. In the \cap{RGB} color system, a color with Red,
 %D Green and Blue components of 0.80 show the same gray as a
-%D Gray Scale specified 0.80. The \kap{CMYK} color system
+%D Gray Scale specified 0.80. The \cap{CMYK} color system
 %D supports a Black component apart from Cyan, Magenta and
 %D Yellow.
 %D
@@ -122,7 +122,7 @@
 %D in black and white, still can be distinguished. This
 %D approach enables us to serve both printed and electronic
 %D versions, using colored text and illustrations. More on the
-%D fundamentals of this topic can be found in the \kap{MAPS} of
+%D fundamentals of this topic can be found in the \cap{MAPS} of
 %D the Dutch User Group, 14 (95.1).
 %D
 %D To satisfy all those needs, we define four specials which
@@ -134,12 +134,12 @@
 %D We start with the installation of color and grayscale
 %D specials. The values are in the range 0..1 (e.g. 0.25).
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartgraymode      {gray} ... \dostopgraymode
 %D \dostartrgbcolormode  {red} {green} {blue} ... \dostopcolormode
 %D \dostartcmykcolormode {cyan} {magenta} {yellow} {black} ... \dostopcolormode
 %D \dostartgraycolormode {gray} ... \dostopcolormode
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because we can expect conflicts between drivers, we
 %D implement them as category \type{or}. In previous versions
@@ -186,11 +186,11 @@
 %D specials for different formats sometimes are more clear, we
 %D decided to combine them all in one:
 %D
-%D \starttypen
+%D \starttyping
 %D \doinsertfile {type,method} {file,label}
 %D               {xscale} {yscale} {x} {y} {w} {h}
 %D               {options}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The scale is given percents, the other values are base
 %D points.
@@ -216,9 +216,9 @@
 %D Sounds are (for the moment) just files with
 %D associated options.
 %D
-%D \starttypen
+%D \starttyping
 %D \doinsertsoundtrack {file} {label} {options}
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\doinsertsoundtrack] [or] [3]
 
@@ -229,9 +229,9 @@
 %D and for special applications, one may want to have access
 %D to the total number of pages.
 %D
-%D \starttypen
+%D \starttyping
 %D \dogetnofinsertpages{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The number is also available after the insert is placed,
 %D since inclusion may take place immediate when an insert is
@@ -247,9 +247,9 @@
 %D
 %D We support rotation with the special:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartrotation {angle} ... \dostoprotation
-%D \stoptypen
+%D \stoptyping
 %D
 %D For the moment these specials are installed as
 %D category \type{or}.
@@ -263,9 +263,9 @@
 %D
 %D Scaling is also supported:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartscaling {x} {y} ... \dostopscaling
-%D \stoptypen
+%D \stoptyping
 %D
 %D Like the previous one, these specials are of category
 %D \type{or}.
@@ -279,9 +279,9 @@
 %D
 %D And indeed, mirroring is there too:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartmirroring {x} {y} ... \dostopmirroring
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again these specials are installed as category \type{or}.
 
@@ -330,9 +330,9 @@
 %D When we look at the implementation, this is a complicated
 %D one. There are seven arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \doovalbox {w} {h} {d} {linewidth} {radius} {stroke} {fill}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command has to return a \type{\vbox} which can be used
 %D to lay over another one (with text). The radius is in
@@ -347,7 +347,7 @@
 %D Clipping is implemented in such a way that an arbitrary
 %D can be fed.
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartclipping {pathname}{width} {height}
 %D \dostopclipping
 %D \stoptyping
@@ -362,9 +362,9 @@
 %D
 %D We can declare some characteristics of the document with
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetupidentity {title} {subject} {author} {creator} {date} {keys}
-%D \stoptypen
+%D \stoptyping
 %D
 %D All data is in string format.
 
@@ -376,9 +376,9 @@
 %D This special can be used to tell the driver what page size
 %D to use. The special takes three arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetuppaper {type} {width} {height}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The type is one of the common identifiers, like A4, A5 or
 %D B2.
@@ -391,9 +391,9 @@
 %D Some drivers enable the user to specify the paper type
 %D used and/or page dimensions to be taken into account.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetupprinter {type} {hoffset} {voffset} {width} {height}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first argument is one of \type{letter}, \type{legal},
 %D \type{A4}, \type{A5} etc. The dimensions are in
@@ -414,17 +414,17 @@
 %D
 %D The first ones can be used to set up the interaction.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetupinteraction
-%D \stoptypen
+%D \stoptyping
 %D
 %D Normally this command does nothing but giving a message
 %D that some scheme is supported.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetupstartaction
 %D \dosetupstopaction
-%D \stoptypen
+%D \stoptyping
 %D
 %D These two setup the actions to be executed when the document
 %D is opened and closed.
@@ -432,17 +432,17 @@
 %D The next commands sets up the page and screen. They are
 %D kind of related.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetuppage   {hoffset} {voffset} {width} {height} {options}
 %D \dosetupscreen {hoffset} {voffset} {width} {height} {options}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first four arguments are in points. Option~1 results in a
 %D full screen launch.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetuppageview {keyword}
-%D \stoptypen
+%D \stoptyping
 %D
 %D For the moment we only support \type{fit}.
 
@@ -473,10 +473,10 @@
 %D for instance have no meaning on an non||interactive medium.
 %D These elements are hidden by means of:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostarthide
 %D \dostophide
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\dostarthide] [or] [0]
 \installspecial [\dostophide]  [or] [0]
@@ -488,10 +488,10 @@
 %D When we want to support hypertext buttons, again we have
 %D to deal with two concepts.
 %D
-%D \startopsomming[opelkaar,n]
-%D \som let \TEX\ highlight the text
-%D \som let the driver show us where to click
-%D \stopopsomming
+%D \startitemize[packed,n]
+%D \item let \TEX\ highlight the text
+%D \item let the driver show us where to click
+%D \stopitemize
 %D
 %D The first approach is the most secure one. It gives us
 %D complete control over the visual appearance of hyper
@@ -528,17 +528,17 @@
 %D destination, we had to provide both labels (\DVIWINDO) and
 %D pagenumbers (\PDF). Some drivers use start stop pairs.
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartgotolocation {w} {h} {url} {file} {label} {page}
 %D \dostartgotorealpage {w} {h} {url} {file}         {page}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Their counterparts are:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostopgotolocation
 %D \dostopgotorealpage
-%D \stoptypen
+%D \stoptyping
 %D
 %D The internal alternative is used for system||generated
 %D links, the external one for user||generated links. The
@@ -561,9 +561,9 @@
 %D Rather special is the option to include and execute
 %D JavaScript code. This is a typical \PDF\ option.
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartgotoJS {w} {h} {script}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This not so standard \TEX\ feature should be used with
 %D care. Preamble scripts are flushed by
@@ -587,17 +587,17 @@
 %D The opposite commands of \type{\dogotosomething} have only
 %D one argument:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartthisislocation {label}
 %D \dostartthisisrealpage {page}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These commands are accompanied by:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostopthisislocation
 %D \dostopthisisrealpage
-%D \stoptypen
+%D \stoptyping
 %D
 %D As with all interactive commands's they are installed as
 %D \type{and} category specials.
@@ -625,15 +625,15 @@
 %D much on the viewing engine. Therefore one cannot depend
 %D too much on their support.
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartexecutecommand {w} {h} {command} {options}
-%D \stoptypen
+%D \stoptyping
 %D
 %D At least the next commands are supported (more examples
 %D can be found in \type {spec-fdf.tex}:
 %D
-%D \startregelcorrectie\steluitlijnenin[midden]\leavevmode
-%D \starttabel[|l|l|]
+%D \startlinecorrection\setupalign[middle]\leavevmode
+%D \starttable[|l|l|]
 %D \HL
 %D \NC \bf command  \NC \bf action                  \NC\SR
 %D \HL
@@ -649,8 +649,8 @@
 %D \NC enter        \NC enter viewer                \NC\MR
 %D \NC help         \NC show help on the viewer     \NC\LR
 %D \HL
-%D \stoptabel
-%D \stopregelcorrectie
+%D \stoptable
+%D \stoplinecorrection
 %D
 %D Options are to be passed as a comma separated list of
 %D assignments.
@@ -667,21 +667,21 @@
 %D Reuse of object can reduce the output filesize
 %D considerably. Reusable objects are implemented with:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostartobject{class}{name}{width}{height}{depth}
 %D some typeset material
 %D \dostopobject
-%D \stoptypen
+%D \stoptyping
 %D
-%D \starttypen
+%D \starttyping
 %D \doinsertobject{class}{name}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The savings can be huge in interactive texts.
 %D
-%D \starttypen
+%D \starttyping
 %D \doresetobjects
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\dostartobject]  [or] [5]
 \installspecial [\dostopobject]   [or] [0]
@@ -741,9 +741,9 @@
 
 %D This special is called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \doinstallbookmark {level} {nofsubentries} {text} {page} {open}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This definition is very \PDF\ oriented, so for more
 %D information we kindly refer to the \PDF\ manuals.
@@ -755,9 +755,9 @@
 %D short moment, let the audience focus at the screen. Like the
 %D previous one, this special is very \PDF.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetpagetransition{dissolve}{0}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Transitions have symbolic names, like dissolve, box, split,
 %D blinds, wipe and glitter. The second argument determines
@@ -776,7 +776,7 @@
 %D passing parameters. Unfortunately fields often have more
 %D than nine characteristics, so we pack some arguments in one.
 %D
-%D \starttypen
+%D \starttyping
 %D \dopresettextfield / \dopresetlinefield
 %D   {name} {width} {height} {default} {length}
 %D   {style,color} {options} {alignment} {actions}
@@ -799,7 +799,7 @@
 %D
 %D \dopresetradiorecord
 %D   {name} {top} {options} {kids} {actions}
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\dopresetlinefield]   [or] [9]
 \installspecial [\dopresettextfield]   [or] [9]
@@ -827,9 +827,9 @@
 %D For practical reasons we set some field characteristics
 %D using:
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetfieldstatus {mode} {parent} {kids} {root}
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\dosetfieldstatus] [or] [4]
 
@@ -845,9 +845,9 @@
 %D
 %D We can define a calculation order list with:
 %D
-%D \starttypen
+%D \starttyping
 %D \doregistercalculationset {set identifier}
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\doregistercalculationset] [or] [1]
 
@@ -857,16 +857,16 @@
 %D Not so much out of need, but to be complete, we also
 %D implement text annotations, so called  comment:
 %D
-%D \starttypen
+%D \starttyping
 %D \doinsertcomment
 %D   {title} {width} {height} {color} {open} {symbol} {collect} {data}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When enables, comments can be collected and flushed:
 %D
-%D \starttypen
+%D \starttyping
 %D \doflushcomments
-%D \stoptypen
+%D \stoptyping
 
 \installspecial[\doinsertcomment] [and] [8]
 \installspecial[\doflushcomments] [and] [0]
@@ -879,12 +879,12 @@
 %D means of postprocessed \DVI, we can save and call upon
 %D positions.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetposition          {identifier}
 %D \dosetpositionwhd       {identifier} {width} {height} {depth}
 %D \dosetpositionplus      {identifier} {width} {height} {depth} {list}
 %D \dosetpositionpapersize {width} {height}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is one of the few specials where when using \PDFTEX\
 %D the driver directly deals with the utility file.
@@ -897,10 +897,10 @@
 %D \macros
 %D   {dostarttransparency,dostoptransparency}
 %D
-%D \starttypen
+%D \starttyping
 %D \dostarttransparency{fraction}{type}
 %D \dostoptransparency
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although in \CONTEXT\ transparency is closely integrated
 %D in the color drivers, in the end it is an independent
@@ -912,9 +912,9 @@
 %D \macros
 %D   {doattachfile}
 %D
-%D \starttypen
+%D \starttyping
 %D \doattachfile{title}{width}{height}{depth}{color}{symbol}{filename}{source}
-%D \stoptypen
+%D \stoptyping
 
 \installspecial [\doattachfile] [or] [8]
 
@@ -965,15 +965,15 @@
 %D that strong on objects and \PDFTEX\ does a better job.
 %D Some reasonable alternatives are:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupoutput [dvipsone,acrobat]
 %D \setupoutput [dviwindo,acrobat]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although, better is:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupoutput [pdftex]
-%D \stoptypen
+%D \stoptyping
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-dpm.tex b/tex/context/base/spec-dpm.tex
index 710ca70c4..8f7ce1df2 100644
--- a/tex/context/base/spec-dpm.tex
+++ b/tex/context/base/spec-dpm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-dpm,
+%D   [       filefile=spec-dpm,
 %D        version=1998.11.24,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=DVIPDFM support,
@@ -177,12 +177,12 @@
 %D \macros
 %D   {dosetupscreen}
 
-\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpapierhoogte}
+\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpaperheight}
 
-\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpapierhoogte}
-\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpapierhoogte}
-\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpapierhoogte}
-\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpapierhoogte}
+\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpaperheight}
+\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpaperheight}
+\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpaperheight}
+\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpaperheight}
 
 %D \macros
 %D   {dostartexecutecommand}
diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex
index f3f77ff4d..c65f824d8 100644
--- a/tex/context/base/spec-dpx.tex
+++ b/tex/context/base/spec-dpx.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-dpx,
+%D   [       filefile=spec-dpx,
 %D        version=2002.11.28,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=DVIPDFMx support,
@@ -52,7 +52,7 @@
 %D
 %D Literal \PDF\ inclusion is implemented as:
 
-\def\PDFcode#1{\special{pdf: literal direct #1}}
+\def\PDFcode#1{\special{pdf: literal #1}} % no direct in pdftex ! ! !
 
 %D \type{\dosetuppaper} in \type{spec-dpm} did not work properly
 %D because DVIPDFM did not permit changing the page size.
@@ -308,12 +308,12 @@
 %D \macros
 %D   {dosetupscreen}
 
-\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpapierhoogte}
+\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpaperheight}
 
-\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpapierhoogte}
-\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpapierhoogte}
-\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpapierhoogte}
-\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpapierhoogte}
+\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpaperheight}
+\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpaperheight}
+\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpaperheight}
+\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpaperheight}
 
 %D \macros
 %D   {dostartexecutecommand}
@@ -739,4 +739,4 @@
 
 \stopspecials
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-dvi.tex b/tex/context/base/spec-dvi.tex
index 52b2a421d..1adff1949 100644
--- a/tex/context/base/spec-dvi.tex
+++ b/tex/context/base/spec-dvi.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-dvi,
+%D   [       filefile=spec-dvi,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Generic \TEX\ Solutions,
@@ -76,11 +76,11 @@
 %D commands and append these to \type {jobname.tuo} using the
 %D format:
 %D
-%D \starttypen
+%D \starttyping
 %D \pospxy    {identifier}{page}{x}{y}
 %D \pospxywhd {identifier}{page}{x}{y}{w}{h}{d}
 %D \pospxyplus{identifier}{page}{x}{y}{w}{h}{d}{list}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The postprocessor should, of course, provide the \type
 %D {page}, \type {x}, and \type {y} values.
diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex
index a888fa41c..5d4245de4 100644
--- a/tex/context/base/spec-fdf.tex
+++ b/tex/context/base/spec-fdf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-fdf,
+%D   [       filefile=spec-fdf,
 %D        version=1998.05.18,
 %D          title=\CONTEXT\ \PDF\ Macros,
 %D       subtitle=Adobe \PDF/\FDF\ version 2.1,
@@ -217,7 +217,7 @@
 %D interface macros. These must be provided by the special
 %D drivers \type{pdf} (\ACROBAT) and \type{tpd} (\PDFTEX).
 %D
-%D \starttypen
+%D \starttyping
 %D \doPDFdestination        name #1
 %D \doPDFaction             width #1 height #2 action #3
 %D \doPDFannotation         width #1 height #2 data #3
@@ -234,7 +234,7 @@
 %D \defaultobjectreference      #1#2   % class name
 %D \doPDFgetobjectreference     #1#2#3 % class name \PDFobjectreference
 %D \doPDFgetobjectpagereference #1#2#3 % class name \PDFobjectreference
-%D \stoptypen
+%D \stoptyping
 %D
 %D The keywords reflect their use. For the moment we stick to
 %D keywords, because that way at we get an indication of what
@@ -957,8 +957,8 @@
    \donefalse
    \@EA\processallactionsinset\@EA
      [#9]
-     [\v!sturing=>\donetrue,
-      \v!herhaal=>\edef\pdf@@actions{\pdf@@actions /Mode /Repeat },
+     [\v!controls=>\donetrue,
+      \v!repeat=>\edef\pdf@@actions{\pdf@@actions /Mode /Repeat },
       \v!preview=>\edef\pdf@@options{\pdf@@options /Poster true  }]%
    \edef\pdf@@actions{\pdf@@actions /ShowControls \ifdone true\else false\fi}%
    \doPDFannotation width #7 height #8 data
@@ -982,7 +982,7 @@
    \let\pdf@@actions\empty
    \@EA\processallactionsinset\@EA
      [#3]
-     [\v!herhaal=>\edef\pdf@@actions{\pdf@@actions /Mode /Repeat }]%
+     [\v!repeat=>\edef\pdf@@actions{\pdf@@actions /Mode /Repeat }]%
    \flushatshipout % since it can be buried in a chained box
      {\doPDFannotation width 0pt height 0pt data
         {/Subtype /Movie
@@ -1324,17 +1324,17 @@
 \def\@@FDFflag{FDFflag}
 \def\@@FDFplus{FDFplus}
 
-\letvalue  {\@@FDFflag\v!alleenleesbaar}=\FDFflagReadOnly
-\letvalue       {\@@FDFflag\v!verplicht}=\FDFflagRequired
-\letvalue       {\@@FDFflag\v!beschermd}=\FDFflagPassword
-\letvalue      {\@@FDFflag\v!gesorteerd}=\FDFflagSort
-\letvalue {\@@FDFflag\v!nietbeschikbaar}=\FDFflagNoExport
-\letvalue    {\@@FDFflag\v!geencontrole}=\FDFflagDoNotSpellCheck
-\letvalue            {\@@FDFflag\v!vast}=\FDFflagDoNotScroll
+\letvalue  {\@@FDFflag\v!readonly}=\FDFflagReadOnly
+\letvalue       {\@@FDFflag\v!required}=\FDFflagRequired
+\letvalue       {\@@FDFflag\v!protected}=\FDFflagPassword
+\letvalue      {\@@FDFflag\v!sorted}=\FDFflagSort
+\letvalue {\@@FDFflag\v!unavailable}=\FDFflagNoExport
+\letvalue    {\@@FDFflag\v!nocheck}=\FDFflagDoNotSpellCheck
+\letvalue            {\@@FDFflag\v!fixed}=\FDFflagDoNotScroll
 \letvalue            {\@@FDFflag\v!file}=\FDFflagFileSelect
 
-\letvalue       {\@@FDFplus\v!verborgen}=\FDFplusHidden
-\letvalue       {\@@FDFplus\v!printbaar}=\FDFplusPrintable
+\letvalue       {\@@FDFplus\v!hidden}=\FDFplusHidden
+\letvalue       {\@@FDFplus\v!printable}=\FDFplusPrintable
 
 \letvalue            {\@@FDFplus\v!auto}=\FDFplusAutoView
 
@@ -1412,9 +1412,9 @@
 \def\setFDFalignment[#1]%
   {\processaction
      [#1]
-     [ \v!links=>\edef\FDFalign{2},    % raggedleft
-      \v!midden=>\edef\FDFalign{1},    % raggedcenter
-      \v!rechts=>\edef\FDFalign{0}]}   % raggedright
+     [ \v!left=>\edef\FDFalign{2},    % raggedleft
+      \v!middle=>\edef\FDFalign{1},    % raggedcenter
+      \v!right=>\edef\FDFalign{0}]}   % raggedright
 
 %D \macros
 %D   {setFDFattributes}
@@ -1539,10 +1539,10 @@
 
 %D The event handler becomes something:
 %D
-%D \starttypen
+%D \starttyping
 %D /AA << /D << /S ... >> ... /C << /S ... >>
 %D /A << /S /JavaScript /JS (...) >>
-%D \stoptypen
+%D \stoptyping
 
 % \def\setFDFaction#1#2%
 %   {\bgroup
@@ -1578,9 +1578,9 @@
 %D This rather confusion prone series of script can be tested
 %D with:
 %D
-%D \starttypen
+%D \starttyping
 %D \testFDFactions
-%D \stoptypen
+%D \stoptyping
 %D
 %D which simply redefined the previous macro to one that prints
 %D a message to the console.
@@ -1767,12 +1767,12 @@
 \def\dosetuppageview#1% watch the v-h swapping here
   {\processaction
      [#1]
-     [\v!passend=>\def\PDFpageviewkey  {fit}\def\PDFpageviewwrd{/Fit},
-      \v!breedte=>\def\PDFpageviewkey {fith}\def\PDFpageviewwrd{/FitH},
-       \v!hoogte=>\def\PDFpageviewkey {fitv}\def\PDFpageviewwrd{/FitV},
+     [\v!fit=>\def\PDFpageviewkey  {fit}\def\PDFpageviewwrd{/Fit},
+      \v!width=>\def\PDFpageviewkey {fith}\def\PDFpageviewwrd{/FitH},
+       \v!height=>\def\PDFpageviewkey {fitv}\def\PDFpageviewwrd{/FitV},
    \v!minbreedte=>\def\PDFpageviewkey{fitbh}\def\PDFpageviewwrd{/FitBH},
     \v!minhoogte=>\def\PDFpageviewkey{fitbv}\def\PDFpageviewwrd{/FitBV},
-    \v!standaard=>\def\PDFpageviewkey{xyz \PDFpagexyzspec}\def\PDFpageviewwrd{/XYZ \PDFpagexyzspec},
+    \v!standard=>\def\PDFpageviewkey{xyz \PDFpagexyzspec}\def\PDFpageviewwrd{/XYZ \PDFpagexyzspec},
       \s!unknown=>\def\PDFpageviewkey  {fit}\def\PDFpageviewwrd{/Fit}]%
    \edef\PDFpageview{/View [\PDFpageviewwrd]}}
 
@@ -2191,9 +2191,9 @@
 %D \type{push down} are passed as comma separated triplets,
 %D that is, the second argument can look like:
 %D
-%D \starttypen
+%D \starttyping
 %D {yes,ok,fine},{no,rubish,awful}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {doFDFdefinefieldset,doFDFgetfieldset,doFDFiffieldset}
@@ -2201,11 +2201,11 @@
 %D Field sets, the ones we use in submitting and resetting
 %D fields, are implemented using the next low level specials:
 %D
-%D \starttypen
+%D \starttyping
 %D \doFDFdefinefieldset{TAG}{name,name,...}
 %D \doFDFgetfieldset{TAG}
 %D \doFDFiffieldset{TAG}{sequence}
-%D \stoptypen
+%D \stoptyping
 
 \def\doFDFdefinefieldset#1#2% tag commalist
   {\let\FDFfieldset\empty
@@ -2287,22 +2287,22 @@
 %D Once filled in, we can export or submit the field in the
 %D \FDF\ file format. Such a file can be loaded by
 %D
-%D \starttypen
+%D \starttyping
 %D \loadFDFfields{fiel-ini}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or inspected by
 %D
-%D \starttypen
+%D \starttyping
 %D \showFDFfields{fiel-ini}
-%D \stoptypen
+%D \stoptyping
 %D
 %D After both commands, one can use
 %D
-%D \starttypen
+%D \starttyping
 %D \getFDFfield{name}
 %D \setFDFfield{name}{value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D to inspect and overrule the data.
 %D
@@ -2311,9 +2311,9 @@
 %D named \type{filename.fdt}. If one disables the call to this
 %D script, by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \runFDFconverterfalse
-%D \stoptypen
+%D \stoptyping
 %D
 %D or when \CONTEXT\ cannot find the \type{fdt} file, it tries
 %D to interpret the \type{fdf} file directly. Both mechanisms
@@ -2323,7 +2323,7 @@
 
 %D The \PERL\ script produces a file formatted as:
 %D
-%D \starttypen
+%D \starttyping
 %D \beginFDFobject
 %D \beginFDFdata
 %D \beginFDFfields
@@ -2331,7 +2331,7 @@
 %D \endFDFfields
 %D \endFDFdata
 %D \endFDFobject
-%D \stoptypen
+%D \stoptyping
 %D
 %D One reason for using key value pairs is that we cannot be
 %D sure or the order in which the name and value are given
@@ -2642,7 +2642,7 @@
 
 %D Hooked into \CONTEXT, this special supports
 %D
-%D \starttypen
+%D \starttyping
 %D \startcomment
 %D   hello beautiful\\world
 %D \stopcomment
@@ -2652,12 +2652,12 @@
 %D   the f\'irst time
 %D \stopcommen
 %D
-%D \startcommentaar[hallo][kleur=groen,breedte=4cm,hoogte=3cm]
+%D \startcommentaar[hallo][color=green,width=4cm,height=3cm]
 %D   first
 %D
 %D   second
 %D \stopcommentaar
-%D \stoptypen
+%D \stoptyping
 %D
 %D So, special characters, forced linebreaks using \type{\\}
 %D and \type{\par} are handled in the appropriate way.
@@ -3142,4 +3142,4 @@
 
 \fi
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-ini.tex b/tex/context/base/spec-ini.tex
index 1f5a8975d..0fceaa582 100644
--- a/tex/context/base/spec-ini.tex
+++ b/tex/context/base/spec-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-ini,
+%D   [       filefile=spec-ini,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Initialization,
@@ -147,15 +147,15 @@
 %D channel to the outside world. This channel is activated by
 %D the \TEX\ primitive \type {\special}. The sequence
 %D
-%D \starttypen
+%D \starttyping
 %D \special{Hello here I am.}
-%D \stoptypen
+%D \stoptyping
 %D
 %D results in \DVI||codes:
 %D
-%D \starttypen
+%D \starttyping
 %D xxx1 16 Hello here I am.
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type {xxx1} is represented in byte code 239 and the
 %D number of following bytes in a~1, 2, 3 or~4 byte number. So
@@ -208,7 +208,7 @@
 %D the \type{yandy} library. A library is build with the
 %D commands:
 %D
-%D \starttypen
+%D \starttyping
 %D \startspecials[name][inheritance]
 %D
 %D \definespecial\none{...}
@@ -216,7 +216,7 @@
 %D \definespecial\alot#1#2#3#4{...}
 %D
 %D \stopspecials
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because drivers can have overlap in low level macros, a
 %D mechanism of inheritance is implemented. The libraries
@@ -225,11 +225,11 @@
 %D Every special has to be predefined first. We  do this with
 %D the command:
 %D
-%D \starttypen
+%D \starttyping
 %D \installspecial [\none]    [and] [0]
 %D \installspecial [\onlyone] [and] [1]
 %D \installspecial [\alot]    [or]  [4]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This means as much as: there is a special names
 %D \type{\none} which has no arguments and has more than one
@@ -246,9 +246,9 @@
 %D A library is defined in a file with the name
 %D \type{spec-...}. We load a library with the command:
 %D
-%D \starttypen
+%D \starttyping
 %D \usespecials [list]
-%D \stoptypen
+%D \stoptyping
 %D
 %D where the list can contain one or more file tags, the
 %D \type{...} in the filename. The keyword \type{reset}
@@ -429,7 +429,7 @@
 %D additions however |<|like the specials that implement object
 %D handling|>| asked for non||grouped execution.
 
-%D \starttypen
+%D \starttyping
 %D \def\executespecials#1#2%
 %D   {\def\doonespecial##1%
 %D      {\getvalue{##1\string#1}#2\relax}%
@@ -472,7 +472,7 @@
 %D        {\message{illegal special: \string#1}}%
 %D    \fi
 %D    \next}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because specials happen quite often, we will use a bit more
 %D brute force. Keep in mind that we have to collect the
@@ -481,9 +481,9 @@
 %D I tested this on the next test. Where the previous alternative
 %D took about 32 seconds, the new alternative takes 25 seconds.
 %D
-%D \starttypen
+%D \starttyping
 %D \testfeature{10000}{\setbox0=\hbox{test \color[red]{oeps} test}}
-%D \stoptypen
+%D \stoptyping
 
 \def\@@exsp{exsp}
 
@@ -498,7 +498,7 @@
 \setvalue{\@@exsp8}#1#2#3#4#5#6#7#8{{{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}}
 \setvalue{\@@exsp9}#1#2#3#4#5#6#7#8#9{{{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}}
 
-%D \starttypen
+%D \starttyping
 %D \def\executespecials#1%
 %D   {\def\doonespecial##1%
 %D      {\csname##1\xspecialcommand\endcsname#1\relax}%
@@ -508,7 +508,7 @@
 %D \def\executespecial#1%
 %D   {\def\xspecialcommand{\string#1}%
 %D    \@EA\@EA\@EA\executespecials\csname\@@exsp\csname\@@specarg@@\xspecialcommand\endcsname\endcsname}
-%D \stoptypen
+%D \stoptyping
 
 %D Some more speed can be gained by using a dedicated string
 %D processing routine. Now we can bring down the execution
@@ -551,15 +551,15 @@
 %D For testing purposes (this was first needed when object
 %D support was implemented) we have:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifspecialavailableelse\specialcommand{true}{false}
-%D \stoptypen
+%D \stoptyping
 %D
 %D e.g:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifspecialavailableelse\doinsertobject{...}{...}
-%D \stoptypen
+%D \stoptyping
 
 \def\doifspecialavailableelse#1#2#3%
   {\doifelsevaluenothing{\@@speclst@@\string#1}{#3}{#2}}
@@ -613,31 +613,31 @@
 %D For quite some time the \CONTEXT\ way of specifying the
 %D output format has been:
 %D
-%D \starttypen
+%D \starttyping
 %D \usespecials[ps,yy,win,pdf]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because at \PRAGMA\ we use \DVIPSONE, this was a suitable
 %D setting, but with \CONTEXT\ going public, the next sequence
 %D is more suitable for \DVIPS\ users:
 %D
-%D \starttypen
+%D \starttyping
 %D \usespecials[reset,ps,tr,pdf]
-%D \stoptypen
+%D \stoptyping
 %D
 %D On the other hand, for \PDFTEX\ we needed:
 %D
-%D \starttypen
+%D \starttyping
 %D \usespecials[tpd]
-%D \stoptypen
+%D \stoptyping
 %D
 %D To simplify things, I decided to provide a higher level
 %D command.
 %D
-%D \starttypen
+%D \starttyping
 %D \defineoutput[name][specials]
 %D \setupoutput[name,...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D In a \type {spec-def} you can find some examples.
 
@@ -659,4 +659,4 @@
      \resetspecials\processcommacommand[#1]\dosetupoutput
    \fi}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-mis.tex b/tex/context/base/spec-mis.tex
index 948d8fcca..6856f97b1 100644
--- a/tex/context/base/spec-mis.tex
+++ b/tex/context/base/spec-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-mis,
+%D   [       filefile=spec-mis,
 %D        version=1997.04.01,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Miscellaneous Macros,
@@ -160,9 +160,9 @@
 %D \macros
 %D   {escapePSstring}
 %D
-%D \starttypen
+%D \starttyping
 %D \escapePSstring(t\e\1st)))))\to\crap \crap
-%D \stoptypen
+%D \stoptyping
 
 % testcase: webschrift met lege regels en unbalanced ()
 
@@ -234,4 +234,4 @@
   \let\handleMPfshow\dohandleMPfshow
 \to \everyresetspecials
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-pdf.tex b/tex/context/base/spec-pdf.tex
index 5678f1347..7dbc128c4 100644
--- a/tex/context/base/spec-pdf.tex
+++ b/tex/context/base/spec-pdf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-pdf,
+%D   [       filefile=spec-pdf,
 %D        version=1997.09.20,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Adobe \ACROBAT\ version 2.1,
@@ -27,7 +27,7 @@
 %D Instead of a prolog, we can put the code in the file
 %D ourselve.
 %D
-%D \starttypen
+%D \starttyping
 %D \definespecial\dosetupinteraction%
 %D   {\special
 %D      {\@@insertpostscriptretain
@@ -35,14 +35,14 @@
 %D           {pop}
 %D           {userdict /pdfmark /cleartomark load put}
 %D         ifelse}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We decided to use a prolog file. The following code has to
 %D be put somewhere, e.g.\ in the startup directory of
 %D \DISTILLER. To overcome problems, we always embed the fonts,
 %D but copyrights force us always to make subsets.
 %D
-%D \starttypen
+%D \starttyping
 %D /currentdistillerparams where
 %D   { pop } { userdict /currentdistillerparams { 1 dict } put } ifelse
 %D
@@ -56,7 +56,7 @@
 %D    /MaxSubsetPct           99
 %D    /EmbedAllFonts          true
 %D    /SubSetFonts            true >> setdistillerparams
-%D \stoptypen
+%D \stoptyping
 %D
 %D Beware, this is the PostScript Level 2 way of doing things.
 
@@ -140,12 +140,12 @@
 %D We can set up the page dimensions, full screen start up
 %D mode and identify the file with:
 
-\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpapierhoogte}
+\definespecial\dosetupscreen  {\doPDFsetupscreen  \printpaperheight}
 
-\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpapierhoogte}
-\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpapierhoogte}
-\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpapierhoogte}
-\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpapierhoogte}
+\definespecial\dosetupartbox  {\doPDFsetupartbox  \printpaperheight}
+\definespecial\dosetupcropbox {\doPDFsetupcropbox \printpaperheight}
+\definespecial\dosetupbleedbox{\doPDFsetupbleedbox\printpaperheight}
+\definespecial\dosetuptrimbox {\doPDFsetuptrimbox \printpaperheight}
 
 \definespecial\dosetupidentity{\doPDFsetupidentity}
 
@@ -480,4 +480,4 @@
 
 \stopspecials
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-ps.tex b/tex/context/base/spec-ps.tex
index df9097b08..ac54c61fc 100644
--- a/tex/context/base/spec-ps.tex
+++ b/tex/context/base/spec-ps.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-ps,
+%D   [       filefile=spec-ps,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Adobe PostScript,
@@ -226,4 +226,4 @@
 
 \stopspecials
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex
index 224f7520e..72663627e 100644
--- a/tex/context/base/spec-tpd.tex
+++ b/tex/context/base/spec-tpd.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-tpd,
+%D   [       filefile=spec-tpd,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=\PDFTEX,
@@ -146,9 +146,9 @@
 
 %D This means that by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \usespecials[tpd]
-%D \stoptypen
+%D \stoptyping
 %D
 %D we get ourselves full \PDF\ output.
 
@@ -262,13 +262,13 @@
 
 %D The old, \TEX\ base \PDF\ insertion macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dotpdinsertpdf#1#2#3#4#5#6#7#8#9%
 %D   {\beforesplitstring#1\at.\to\filename
 %D    \scratchdimen=#3pt \PointsToReal{.01\scratchdimen}\xscale
 %D    \scratchdimen=#4pt \PointsToReal{.01\scratchdimen}\yscale
 %D    \convertPDFtoPDF{\filename.pdf}\xscale\yscale{#5}{#6}{#7}{#8}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D superseded by the next macros.
 
@@ -327,7 +327,7 @@
       \xdef\PDFimagereference{\the\pdflastximage}%
       \xdef\nofinsertpages{\the\pdflastximagepages}%
       \pdfrefximage\pdflastximage}
-     {\framed[\c!breedte=#7,\c!hoogte=#8]{#1}}%
+     {\framed[\c!width=#7,\c!height=#8]{#1}}%
    \egroup}
 
 \else
@@ -339,7 +339,7 @@
         \ifdim#7>\zeropoint \!!width  #7\fi
         \ifdim#8>\zeropoint \!!height #8\fi
         {#1}}%
-     {\framed[\c!breedte=#7,\c!hoogte=#8]{#1}}%
+     {\framed[\c!width=#7,\c!height=#8]{#1}}%
    \egroup}
 
 \fi
@@ -1330,4 +1330,4 @@
 
 \stopspecials
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-tr.tex b/tex/context/base/spec-tr.tex
index fcf2d6727..275fd6b2c 100644
--- a/tex/context/base/spec-tr.tex
+++ b/tex/context/base/spec-tr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-tr,
+%D   [       filefile=spec-tr,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Thomas Rokicki's \DVIPS,
@@ -20,7 +20,7 @@
 %D   {doinsertfile}
 %D
 %D We overrule the figure||insertion special. Things should
-%D be more accurate, but maybe someday \onbekend
+%D be more accurate, but maybe someday \unknown
 
 \startspecials[rokicki]
 
@@ -103,4 +103,4 @@
 
 \stopspecials
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/spec-var.tex b/tex/context/base/spec-var.tex
index 390e178c4..aa5b74e9e 100644
--- a/tex/context/base/spec-var.tex
+++ b/tex/context/base/spec-var.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-var,
+%D   [       filefile=spec-var,
 %D        version=2003.10.10,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=Variables,
@@ -67,4 +67,4 @@
 
 \fi
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/spec-win.tex b/tex/context/base/spec-win.tex
index 77b88d005..8a30e85a9 100644
--- a/tex/context/base/spec-win.tex
+++ b/tex/context/base/spec-win.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-win,
+%D   [       filefile=spec-win,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=\YandY's \DVIWINDO,
diff --git a/tex/context/base/spec-yy.tex b/tex/context/base/spec-yy.tex
index 9d09b6e35..a8905a136 100644
--- a/tex/context/base/spec-yy.tex
+++ b/tex/context/base/spec-yy.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=spec-yy,
+%D   [       filefile=spec-yy,
 %D        version=1996.01.25,
 %D          title=\CONTEXT\ Special Macros,
 %D       subtitle=\YandY's \DVIPSONE\ and \DVIWINDO,
diff --git a/tex/context/base/supp-ali.tex b/tex/context/base/supp-ali.tex
index f19497e1d..9686875b8 100644
--- a/tex/context/base/supp-ali.tex
+++ b/tex/context/base/supp-ali.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-ali,
+%D   [       filefile=supp-ali,
 %D        version=2000.04.17,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Alignment,
diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex
index 1d305dded..871e14aee 100644
--- a/tex/context/base/supp-box.tex
+++ b/tex/context/base/supp-box.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-box,
+%D   [       filefile=supp-box,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Boxes,
@@ -168,10 +168,10 @@
 %D
 %D Also handy (all dimensions zeroed):
 %D
-%D \starttypen
+%D \starttyping
 %D \smashedhbox to ... {...}
 %D \smashedvbox to ... {...}
-%D \stoptypen
+%D \stoptyping
 
 \def\dosmashedbox#1%
  %{#1\bgroup\dowithnextbox{\smashbox\nextbox\flushnextbox\egroup}#1}
@@ -224,13 +224,13 @@
   {\dowithnextbox
      {\@EA\handletokens\@@smash\with\makesm@sh\flushnextbox}\normalhbox}
 
-%D \starttabulatie[|l|l|]
+%D \starttabulate[|l|l|]
 %D \NC w   \NC \ruledhbox{\smash  [w]{This is some great smashing, isn't it?}} \NC \NR
 %D \NC h   \NC \ruledhbox{\smash  [h]{This is some great smashing, isn't it?}} \NC \NR
 %D \NC d   \NC \ruledhbox{\smash  [d]{This is some great smashing, isn't it?}} \NC \NR
 %D \NC tb  \NC \ruledhbox{\smash [tb]{This is some great smashing, isn't it?}} \NC \NR
 %D \NC whd \NC \ruledhbox{\smash[whd]{This is some great smashing, isn't it?}} \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 %D \macros
 %D   {phantom, hphantom, vphantom, mathstrut}
@@ -285,29 +285,29 @@
 %D Although often needed, \TEX\ does not support arithmics
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \dimen0 = \ht0 + \dp0
-%D \stoptypen
+%D \stoptyping
 %D
 %D so we implemented:
 %D
-%D \starttypen
+%D \starttyping
 %D \getboxheight ... \of \box...
-%D \stoptypen
+%D \stoptyping
 %D
 %D For instance,
 %D
-%D \starttypen
+%D \starttyping
 %D \getboxheight \dimen0 \of \box0
 %D \getboxheight \someheight \of \box \tempbox
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation is rather stupid:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\getboxheight#1\of#2\box#3%
 %D   {#1\ht#3\advance#1\dp#3\relax}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next alternative is slightly more clever, since
 %D it accepts \type {{12}} as well as \type {12} as box
@@ -328,9 +328,9 @@
 %D (dimensie) in een aantal regels en kent dit toe aan
 %D \type{\noflines}.
 %D
-%D \starttypen
+%D \starttyping
 %D \getnoflines{dimensie}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Er wordt gedeeld door \type{\openlineheight} en een hoogte
 %D van~0pt komt overeen met 0~regels. The raw alternative
@@ -361,11 +361,11 @@
 %D returns it it \type {\noflines}. The macro works
 %D reasonable well as long as the content can be unboxed.
 %D
-%D \starttypen
+%D \starttyping
 %D \determinenoflines{test\\test}
 %D \determinenoflines{\bfd test\\test}
 %D \determinenoflines{\definedfont[Sans at 40pt]test\\test}
-%D \stoptypen
+%D \stoptyping
 
 \def\determinenoflines
   {\bgroup
@@ -388,10 +388,10 @@
 %D instance because we pass data, we can fall back on the next
 %D macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \doiftextelse {data} {then branch} {else branch}
 %D \doiftext     {data} {then branch}
-%D \stoptypen
+%D \stoptyping
 
 %\def\doiftextelse#1#2#3%
 %  {\bgroup
@@ -444,18 +444,18 @@
 %D treating it according to earlier specifications. We use for
 %D instance something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\getfloat%
 %D   {\def\handlefloat{...\flushnextbox...}
 %D    \dowithnextbox\handlefloat\normalvbox}
-%D \stoptypen
+%D \stoptyping
 %D
 %D instead of:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\getfloat#1%
 %D   {...#1...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this implementation the \type{\aftergroup} construction
 %D is needed because \type{\afterassignment} is executed inside
@@ -473,19 +473,19 @@
 
 %D So in fact we get:
 %D
-%D \starttypen
+%D \starttyping
 %D \setbox\nextbox { \aftergroup\dodowithnextbox ... }
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D \setbox\nextbox { ... } \dodowithnextbox
-%D \stoptypen
+%D \stoptyping
 %D
 %D A slower but more versatile implementation is:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\dowithnextbox#1#2%
 %D   {\long\def\dodowithnextbox{#1}%
 %D    \ifx#2\normalhbox
@@ -500,7 +500,7 @@
 %D      \afterassignment\dodowithnextbox
 %D    \fi\fi\fi\fi
 %D    \setbox\nextbox#2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This alternative also accepts \type{\box0} and alike, but
 %D we don't really need this functionality now.
@@ -524,9 +524,9 @@
 %D without wanting to use additional grouping. Therefore we
 %D provide:
 %D
-%D \starttypen
+%D \starttyping
 %D \dowithnextboxcontent{inside}{after}{box content}
-%D \stoptypen
+%D \stoptyping
 %D
 %D {\em todo: Search source for potential usage!}
 
@@ -585,11 +585,11 @@
 %D First we have to grab the piece of text we want to act
 %D upon. This is done by means of the duo macros:
 %D
-%D \starttypen
+%D \starttyping
 %D \beginofshapebox
 %D a piece of text
 %D \endofshapebox
-%D \stoptypen
+%D \stoptyping
 %D
 %D When all texts is collected, we can call \type{\reshapebox}
 %D and do something with it's vertical components. We can make
@@ -618,7 +618,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D As we can see, when some kind of numbering is done, we have
 %D to add a second pass.
@@ -643,7 +643,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D This example shows that the content of the box is still
 %D available after flushing. Another feature is that only the
@@ -664,7 +664,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The macros are surprisingly easy to follow and in fact
 %D introduce no new concepts. Nearly all books on \TEX\ show
@@ -674,9 +674,9 @@
 %D reshaping, which can result in an endless loop. We
 %D therefore offer:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifreshapingbox
-%D \stoptypen
+%D \stoptyping
 %D
 %D Some \CONTEXT\ commands are protected this way. Anyhow,
 %D reshaping is aborted after 100 dead cycles.
@@ -821,9 +821,9 @@
 
 %D In real inner situations we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \flushinnershapebox
-%D \stoptypen
+%D \stoptyping
 %D
 %D This one is used in \type{\framed}.
 
@@ -841,12 +841,12 @@
 %D directly. This macro takes four arguments, that take care
 %D of:
 %D
-%D \startopsomming[n,opelkaar]
-%D \som \type{\shapebox}
-%D \som \type{\shapepenalty}
-%D \som \type{\shapekern}
-%D \som \type{\shapeskip}
-%D \stopopsomming
+%D \startitemize[n,packed]
+%D \item \type{\shapebox}
+%D \item \type{\shapepenalty}
+%D \item \type{\shapekern}
+%D \item \type{\shapeskip}
+%D \stopitemize
 
 %D \macros
 %D   {shapedhbox}
@@ -885,9 +885,9 @@
 %D The simple command \type{\hyphenatedword} accepts one
 %D argument and gives the hyphenated word. This macro calls for
 %D
-%D \starttypen
+%D \starttyping
 %D \dohyphenateword {n} {pre} {word}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next examples tell more than lots of words:
 %D
@@ -903,7 +903,7 @@
 %D shorter alternative for the first line.
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D These macros are slow but effective and not that hard to
@@ -914,7 +914,7 @@
 \def\dohyphenateword#1#2#3%
   {\bgroup
    \setbox\scratchbox\normalhbox
-     {\mindermeldingen
+     {\dontcomplain
       \nopenalties % \widowpenalty \clubpenalty \brokenpenalty \doublehyphendemerits \finalhyphendemerits \adjdemerits
       \hyphenpenalty  \zerocount
       \exhyphenpenalty\zerocount
@@ -966,9 +966,9 @@
 
 %D You may want to give the following call a try:
 %D
-%D \starttypen
+%D \starttyping
 %D \hyphenatedpar{\readfile{zapf}{}{}}\endgraf
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {doboundtext}
@@ -980,9 +980,9 @@
 %D argument is appended. When the text to be checked is packed
 %D in a command, we'll have to use \type{\expandafter}.
 %D
-%D \starttypen
+%D \starttyping
 %D \doboundtext{a very, probably to long, text}{3cm}{...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When calculating the room needed, we take the width of the
 %D third argument into account, which leads to a bit more
@@ -1039,10 +1039,10 @@
 %D \TEX\ do most of the job. The previous command works better
 %D on text that cannot be hyphenated.
 %D
-%D \starttypen
+%D \starttyping
 %D \limitatetext {text}  {width} {sentinel}
 %D \limitatetext {text} {-width} {prelude}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When no width is given, the whole text comes available. The
 %D sentinel is optional. This is about the third version.
@@ -1051,7 +1051,7 @@
 
 %D The simple alternative is as follows:
 %D
-%D \starttypen
+%D \starttyping
 %D \unexpanded\def\limitatetext%
 %D   {\bgroup % evt \setstrut
 %D    \forgetall
@@ -1087,7 +1087,7 @@
 %D         \unhbox\nextbox
 %D       \fi}%
 %D    \egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next alternative accepts a negative width. A negative
 %D value crops the beginning. The macro thereby becomes less
@@ -1202,9 +1202,9 @@
 %D chapter~5} is for instance the results of the character
 %D sequence:
 %D
-%D \starttypen
+%D \starttyping
 %D The typeset text \in{chapter}[texniques] is for instance
-%D \stoptypen
+%D \stoptyping
 %D
 %D When such words are made active in interactive texts, the
 %D combination cannot longer be hyphenated. Normally this is no
@@ -1220,9 +1220,9 @@
 %D the more we needed a robust solution. Well, here it is and
 %D it called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \processisolatedwords{some words}\someaction
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second argument \type{someactions} handles the
 %D individual words, like in:
@@ -1238,7 +1238,7 @@
 %D which let the words turn up as:
 %D
 %D \startvoorbeeld
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D The macro has been made a bit more clever than needed at
@@ -1256,9 +1256,9 @@
 %D becomes:
 %D
 %D \startvoorbeeld
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D \stopvoorbeeld
 %D
 %D Single word arguments are treated without further
@@ -1295,7 +1295,7 @@
 \def\processisolatedwords#1#2% todo: vbox ipv hbox ivm afbreken!
   {\bgroup                   % todo: doloop
    \fakecompoundhyphen
-   \mindermeldingen
+   \dontcomplain
    \forgetall
    \nopenalties
    \ifcase\isolatedwordsmode
@@ -1376,7 +1376,7 @@
 %D
 %D \startvoorbeeld
 %D \vskip3\baselineskip
-%D \haalbuffer
+%D \getbuffer
 %D \stopvoorbeeld
 %D
 %D Before displaying the result we added some skip, otherwise
@@ -1384,7 +1384,7 @@
 %D macro can be useful when building complicated menus, headers
 %D and footers and|/|or margin material.
 
-\def\sbox%  in handleiding, voorbeeld \inlinker{xx} \extern..
+\def\sbox%  in handleiding, voorbeeld \inleft{xx} \extern..
   {\normalvbox\bgroup % new ! ! !
    \dowithnextbox
      {\setbox\scratchbox\normalhbox
@@ -1440,13 +1440,13 @@
 %D should be centered with respect to the surrounding box. The
 %D last of the three examples we show below says:
 %D
-%D \starttypen
+%D \starttyping
 %D \vsize=3cm
 %D \hsize=3cm
 %D \ruledvbox to \vsize
 %D   {\centeredbox height .5cm width -1cm
 %D      {\vrule width \hsize height \vsize}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here the \type{\ruledvbox} just shows the surrounding box
 %D and \type{\vrule} is used to show the centered box.
@@ -1456,15 +1456,15 @@
 %D    \hsize=3cm
 %D    \ruledvbox to \vsize
 %D      {\centeredbox height #1 width #2
-%D         {\color[groen]{\vrule width \hsize height \vsize}}}}
+%D         {\color[green]{\vrule width \hsize height \vsize}}}}
 %D
-%D \startregelcorrectie
-%D \startcombinatie[3*1]
+%D \startlinecorrection
+%D \startcombination[3*1]
 %D   {\AnExample {-1cm}  {.5cm}} {}
 %D   {\AnExample {.5cm}  {-1cm}} {}
 %D   {\AnExample {-1cm} {-.5cm}} {}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \stopcombination
+%D \stoplinecorrection
 %D
 %D This command takes two optional arguments: \type{width} and
 %D \type{height}. Observing readers can see that we use \TEX's
@@ -1479,7 +1479,7 @@
   {\bgroup
    \setbox0\normalvbox to \vsize
      \bgroup
-       \mindermeldingen
+       \dontcomplain
        \forgetall
        \setbox0\normalhbox{\vrule\!!width \zeropoint#1}%
        \setbox2\normalvbox{\hrule\!!height\zeropoint#1}%
@@ -1509,10 +1509,10 @@
 %D For those who don't want to deal with \type {\hsize}
 %D and \type {\vsize}, we have:
 %D
-%D \starttypen
+%D \starttyping
 %D \centerednextbox width 2bp height 2bp
 %D   {\framed[width=100bp,height=100bp]{}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Do you see what we call this one \type {next}?
 
@@ -1530,9 +1530,9 @@
 %D
 %D Centering on the available space is done by:
 %D
-%D \starttypen
+%D \starttyping
 %D \centerbox <optional specs> {content}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When omitted, the current \type {\hsize} and \type
 %D {\vsize} are used. Local dimensions are supported.
@@ -1555,10 +1555,10 @@
 %D These macros are copied from the \TEX book, page~397, and
 %D extended by a macro that sets the \type{\hsize}.
 %D
-%D \starttypen
+%D \starttyping
 %D \setrigidcolumnhsize {total width} {distance} {n}
 %D \rigidcolumnbalance  {box}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Both these macros are for instance used in typesetting
 %D footnotes.
@@ -1639,7 +1639,7 @@
 %D pages 398 and 399 of the \TEX book. These macros can be used
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \normalvbox
 %D   \bgroup
 %D     \startvboxtohbox ... \stopvboxtohbox
@@ -1651,7 +1651,7 @@
 %D   \bgroup
 %D     \converthboxtovbox
 %D   \egroup
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are used in reformatting footnotes, so they do
 %D what they're meant for.
@@ -1745,7 +1745,7 @@
 \def\unhhbox#1\with#2%
   {\bgroup
    \nopenalties
-   \mindermeldingen
+   \dontcomplain
    \forgetall
    \setbox\unhhedbox\normalvbox{\hskip\hhboxindent\strut\unhbox#1}% => \hsize
    \doloop
@@ -1794,7 +1794,7 @@
 %D \unhhbox2\with{\ruledhbox{\box\hhbox}}
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D This piece of text was typeset by saying:
 %D
@@ -1809,9 +1809,9 @@
 %D When processing depends on the availability of content, one
 %D can give the next macro a try.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifcontent{pre content}{post content}{no content}\somebox
-%D \stoptypen
+%D \stoptyping
 %D
 %D Where \type{\somebox} is either a \type{\normalhbox} or
 %D \type{\normalvbox}. If the dimension of this box suggest some
@@ -1839,7 +1839,7 @@
 %D \startbuffer
 %D \doifcontent{[}{]}{}\normalhbox{content sensitive typesetting}
 %D
-%D \doifcontent{}{\pagina}{}\normalvbox{content sensitive typesetting}
+%D \doifcontent{}{\page}{}\normalvbox{content sensitive typesetting}
 %D
 %D \doifcontent{}{}{\message{Didn't you forget something?}}\normalhbox{}
 %D \stopbuffer
@@ -1848,7 +1848,7 @@
 %D
 %D We get:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Where the last call of course does not show up in this
 %D document, but definitely generates a confusing message.
@@ -1893,9 +1893,9 @@
 %D
 %D \startbuffer
 %D \startoverlay
-%D   {\omlijnd{hans}}
-%D   {\omlijnd[breedte=3cm]{ton}}
-%D   {\omlijnd[hoogte=2cm]{oeps}}
+%D   {\framed{hans}}
+%D   {\framed[width=3cm]{ton}}
+%D   {\framed[height=2cm]{oeps}}
 %D \stopoverlay
 %D \stopbuffer
 %D
@@ -1903,7 +1903,7 @@
 %D
 %D shows up as:
 %D
-%D \leavevmode\haalbuffer
+%D \leavevmode\getbuffer
 
 % \def\dooverlaybox%
 %   {\ifhmode\unskip\fi
@@ -1982,7 +1982,7 @@
 % %D
 % %D shows up as:
 % %D
-% %D \leavevmode\haalbuffer
+% %D \leavevmode\getbuffer
 %
 % \def\dohspread
 %   {\flushnextbox
@@ -1998,9 +1998,9 @@
 %D
 %D The next macro is a rather silly one, but saves space.
 %D
-%D \starttypen
+%D \starttyping
 %D \normalhbox{\fakebox0}
-%D \stoptypen
+%D \stoptyping
 %D
 %D returns an empty box with the dimensions of the box
 %D specified, here being zero.
@@ -2022,11 +2022,11 @@
 %D
 %D Here are some convenient alternative box types:
 %D
-%D \starttypen
+%D \starttyping
 %D \lbox{text ...}
 %D \cbox{text ...}
 %D \rbox{text ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Are similar to \type {\normalvbox}, which means that they also
 %D accept something like \type{to 3cm}, but align to the left,
@@ -2048,20 +2048,20 @@
 %D to properly align boxes, like in:
 %D
 %D \startbuffer
-%D \starttabel[|||]
+%D \starttable[|||]
 %D \HL
-%D \VL \tbox{\externfiguur[koe][hoogte=3cm,kader=aan]} \VL top aligned    \VL\SR
+%D \VL \tbox{\externalfigure[koe][height=3cm,frame=on]} \VL top aligned    \VL\SR
 %D \HL
-%D \VL \bbox{\externfiguur[koe][hoogte=3cm,kader=aan]} \VL bottom aligned \VL\SR
+%D \VL \bbox{\externalfigure[koe][height=3cm,frame=on]} \VL bottom aligned \VL\SR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
 %D The positioning depends on the strut settings:
 %D
-%D \haalbuffer
+%D \getbuffer
 
 \def\tbox{\tbbox\ht\dp}
 \def\bbox{\tbbox\dp\ht}
@@ -2102,9 +2102,9 @@
 %D width made up of several dimensions. Instead of cumbersome
 %D additions, we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \boxofsize \normalvbox 10cm 3cm -5cm {the text to be typeset}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This example demonstrates that one can use positive and
 %D negative values. Dimension registers are also accepted.
@@ -2346,6 +2346,18 @@
       \boxcursor\hskip\boxhdisplacement\raise-\boxvdisplacement\box0}}
 
 %D \macros
+%D   {obox}
+%D
+%D Experimental, not yet frozen:
+
+\def\lrtbbox#1#2#3#4% l r t b
+  {\bgroup
+   \dowithnextboxcontent
+     {\advance\hsize-#1\advance\hsize-#2\advance\vsize-#3\advance\vsize-#4\relax}
+     {\forgetall\vbox to \vsize{\vskip#3\hbox to \hsize{\hskip#1\box\nextbox\hss}\vss}\egroup}
+     \vbox}
+
+%D \macros
 %D   {toplinebox}
 %D
 %D See core-tbl.tex for an example of its usage:
@@ -2369,7 +2381,7 @@
 %D At the cost of some memory, but saving box registers, we
 %D have implemented a box repository.
 %D
-%D \starttypen
+%D \starttyping
 %D \initializeboxstack{one}
 %D
 %D \savebox{one}{a}{test a}
@@ -2381,7 +2393,7 @@
 %D \normalhbox{p:\foundbox{one}{p}} \par
 %D \normalhbox{x:\foundbox{one}{x}} \par
 %D \normalhbox{y:\foundbox{two}{a}} \par
-%D \stoptypen
+%D \stoptyping
 
 % a first version
 %
@@ -2569,11 +2581,11 @@
 %D construction). Nice stuff for a tips and tricks maps
 %D article.
 %D
-%D \starttypen
+%D \starttyping
 %D \raisebox{100pt}\normalhbox{test}
 %D \raisebox50pt\normalhbox{test}
 %D \hsmash{\raisebox{100pt}\normalhbox{test}}
-%D \stoptypen
+%D \stoptyping
 
 \def\doraiselowerbox#1#2% a nice trick us used to accept
   {\def\next            % both direct and {} dimensions
@@ -2621,7 +2633,7 @@
 % %D \stopbuffer
 % %D
 % %D \typebuffer
-% %D \haalbuffer
+% %D \getbuffer
 %
 % \def\dodonormbox#1#2#3#4#5#6#7%
 %   {\doifnumberelse{#1}
@@ -2740,4 +2752,4 @@
 \def\getboxllx#1{\executeifdefined{b@@x\number#1}\zeropoint}
 \def\getboxlly#1{\executeifdefined{b@@y\number#1}\zeropoint}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-emp.tex b/tex/context/base/supp-emp.tex
index bd0736308..5b6512342 100644
--- a/tex/context/base/supp-emp.tex
+++ b/tex/context/base/supp-emp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-emp,
+%D   [       filefile=supp-emp,
 %D        version=2000.08.09,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=\EMTEX\ specials to \PDF\ conversion,
@@ -29,11 +29,11 @@
 %D
 %D Therefore, \PDFTEX\ provides just these three primitives:
 %D
-%D \starttabulatie[|l|l|]
+%D \starttabulate[|l|l|]
 %D \NC \type {\pdfsavepos}  \NC marks the current position          \NC \NR
 %D \NC \type {\pdflastxpos} \NC the last marked horizontal position \NC \NR
 %D \NC \type {\pdflastypos} \NC the last marked vertical position   \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Based on these three primitives, very advanced systems can
 %D be build, and for some time now, \CONTEXT\ has such a
@@ -45,7 +45,7 @@
 %D {\special} fail when producing \PDF\ code directly. Take for
 %D instance \EMTEX\ specials. When someone sent me a mail
 %D asking if \PDFTEX\ did support those specials, the original
-%D answer was \citaat {no}, but in the last few years I have learned
+%D answer was \quotation {no}, but in the last few years I have learned
 %D that you must never underestimate \TEX's capabilities.
 %D
 %D I must admit that I never use those specials myself, but
@@ -62,10 +62,10 @@
 %D into the macros \type {\EMmoveto} and \type {\EMlineto},
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\EMmoveto{\special{em:moveto}}
 %D \def\EMlineto{\special{em:lineto}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D They are used in macro packages to draw lines, and the
 %D results are often boxes with content like the following:
@@ -83,9 +83,11 @@
 %D This box will contain a triangle, and when typeset, it should
 %D look like:
 %D
-%D \startregelcorrectie[blanko]
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection[blank]
+%D \getbuffer
+%D \stoplinecorrection
+
+\def\EMlinewd{.4}
 
 \ifx\dosetpositionpt\undefined % non context part
 
@@ -105,13 +107,11 @@
 %D length. We need to convert this number into base points as
 %D used by \POSTSCRIPT\ and \PDF. When done, we insert some
 %D literal \PDF\ code into the text using \type {\pdfliteral}.
-%D Here, the \type {m} means \citeer {moveto}, the \type {l}
-%D means \citeer {lineto} and the \type {S} operator \citeer
+%D Here, the \type {m} means \quote {moveto}, the \type {l}
+%D means \quote {lineto} and the \type {S} operator \quote
 %D {strokes} (draws) the line. The macro \type {\EMlinewd}
 %D holds the linewidth in basepoints.
 
-\def\EMlinewd{.4}
-
 \def\EMlineto
   {\bgroup
    \EMgetposition\EMlastlinex\EMlastliney
@@ -119,7 +119,7 @@
    \count2=\EMlastmovey \advance\count2 -\EMlastliney
    \divide\count0 65536
    \divide\count2 65536
-   \pdfliteral{\EMlinewd\space w 0 0 m \the\count0 \space\the\count2 \space l S}%
+   \PDFcode{\EMlinewd\space w 0 0 m \the\count0 \space\the\count2 \space l S}%
    \global\let\EMlastmovex\EMlastlinex
    \global\let\EMlastmovey\EMlastliney
    \egroup}
@@ -136,21 +136,21 @@
 %D shipped out, since \type {\write} postpones its action
 %D until that moment. The file has entries like:
 %D
-%D \starttypen
+%D \starttyping
 %D \EMsetpos 1 4661756 46651918
 %D \EMsetpos 2 5000359 46990521
 %D \EMsetpos 3 4661756 46313315
 %D \EMsetpos 4 5338962 46990521
 %D \EMsetpos 5 4661756 45974712
-%D \stoptypen
+%D \stoptyping
 %D
 %D These lines are written with the command:
 %D
-%D \starttypen
+%D \starttyping
 %D \write\EMfile
 %D   {\EMsetpos\number\EMcounter
 %D    \space\number\pdflastxpos\space\number\pdflastypos}%
-%D \stoptypen
+%D \stoptyping
 %D
 %D In reality the argument to \type {\write} looks slightly
 %D more complicated, because we have to make sure that the
@@ -231,12 +231,12 @@
 %D \stopbuffer
 %D
 %D \startbuffer[pos-nl]
-%D \stelpositionerenin[eenheid=ex]
-%D \startpositioneren
+%D \setuppositioning[uniteenheid=ex]
+%D \startpositioning
 %D   \dostepwiserecurse{-10}{10}{1}
-%D     {\positioneer(0,\recurselevel){\EMmoveto}
-%D      \positioneer(\recurselevel,0){\EMlineto}}
-%D \stoppositioneren
+%D     {\position(0,\recurselevel){\EMmoveto}
+%D      \position(\recurselevel,0){\EMlineto}}
+%D \stoppositioning
 %D \stopbuffer
 %D
 %D \typebuffer[pos-en]
@@ -245,22 +245,22 @@
 %D positioning mechanism, which positions the commands
 %D using \TEX's skips and kerns.
 %D
-%D \startregelcorrectie[blanko]
-%D \haalbuffer[pos-nl]
-%D \stopregelcorrectie
+%D \startlinecorrection[blank]
+%D \getbuffer[pos-nl]
+%D \stoplinecorrection
 %D
 %D Of course one should start and end the file with:
 %D
-%D \starttypen
+%D \starttyping
 %D \startEMspecials
 %D \stopEMspecials
-%D \stoptypen
+%D \stoptyping
 %D
 %D and, if needed, reset the begin position at each page using:
 %D
-%D \starttypen
+%D \starttyping
 %D \resetEMspecials
-%D \stoptypen
+%D \stoptyping
 
 \fi % end of non context part
 
@@ -309,7 +309,7 @@
    \global\advance\EMlastmovey -\EMlastliney
    \ScaledPointsToBigPoints{\number\EMlastmovex}\EMx
    \ScaledPointsToBigPoints{\number\EMlastmovey}\EMy
-   \pdfliteral{\EMlinewd\space w 0 0 m \EMx \space \EMy \space l S}%
+   \PDFcode{\EMlinewd\space w 0 0 m \EMx \space \EMy \space l S}%
    \global\EMlastmovex\EMlastlinex
    \global\EMlastmovey\EMlastliney}
 
@@ -333,7 +333,15 @@
 %D this mechanism transparant to \DVI\ as well as \PDF\
 %D output. We will use \type {\pdfiteral} as trigger.
 
-\ifx\pdfliteral\undefined
+\ifx\PDFcode\undefined
+  \ifx\pdfliteral\undefined
+    \def\PDFcode#1{\special{PDF: #1}}
+  \else
+    \let\PDFcode\pdfliteral
+  \fi
+\fi
+
+\ifx\PDFcode\undefined
   \def\EMpdfordvi#1#2{#2}
 \else\ifx\pdfoutput\undefined
   \def\EMpdfordvi#1#2{#2}
@@ -363,9 +371,9 @@
 %D macro does the job. Beware of the fact that \type
 %D {\special}'s may interfere with the typesetting process.
 %D
-%D \starttypen
+%D \starttyping
 %D \setEMlinewidth{1pt}
-%D \stoptypen
+%D \stoptyping
 
 \def\setEMlinewidth#1% this could be done more efficient for
   {\bgroup           % context alone, but it's a hack anyway
@@ -387,4 +395,4 @@
 %D methods as well. Also, it is always good to have more roads
 %D to reach the same goal.
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/supp-eps.tex b/tex/context/base/supp-eps.tex
index 113911113..a7974ae3b 100644
--- a/tex/context/base/supp-eps.tex
+++ b/tex/context/base/supp-eps.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-eps,
+%D   [       filefile=supp-eps,
 %D        version=1998.05.06,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=\EPS\ tools,
@@ -32,9 +32,9 @@
 %D
 %D A bounding box has the form:
 %D
-%D \starttypen
+%D \starttyping
 %D %%BoundingBox: llx lly urx ury
-%D \stoptypen
+%D \stoptyping
 %D
 %D Before we scan the file, we have to reset special
 %D characters and set some others. The percentage symbol also
@@ -192,4 +192,4 @@
    \dogetEPSboundingbox{#1}\!!widtha\!!heighta\!!widthb\!!heightb
    \egroup}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-fil.tex b/tex/context/base/supp-fil.tex
index fe96069ae..a7dc6c9b4 100644
--- a/tex/context/base/supp-fil.tex
+++ b/tex/context/base/supp-fil.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-fil,
+%D   [       filefile=supp-fil,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Files,
@@ -15,12 +15,12 @@
 %D is a separate module for file support. In \CONTEXT\ files
 %D are used for several purposes:
 %D
-%D \startopsomming[opelkaar]
-%D \som  general textual input
-%D \som  logging status information
-%D \som  saving registers, lists and references
-%D \som  buffering defered textual input
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item  general textual input
+%D \item  logging status information
+%D \item  saving registers, lists and references
+%D \item  buffering defered textual input
+%D \stopitemize
 %D
 %D When dealing with files we can load them as a whole, using
 %D the \type{\input} primitive or load them on a line||by||line
@@ -55,11 +55,11 @@
 %D line ending character the \CATCODE\ comment. This is
 %D accomplished by
 %D
-%D \starttypen
+%D \starttyping
 %D \pushendofline
 %D ... reading ...
 %D \popendofline
-%D \stoptypen
+%D \stoptyping
 %D
 %D Just to be sure, we save the current meaning of \type{^^M}
 %D in \type{\poppedendofline}.
@@ -118,9 +118,9 @@
 %D The next macro offers a framework for processing files on a
 %D line by line basis.
 %D
-%D \starttypen
+%D \starttyping
 %D \doprocessfile \identifier {name} \action
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first argument can for instance be \type{\scratchread}.
 %D The action must do something with \type{\fileline}, which
@@ -159,9 +159,9 @@
 %D Use \type{\pathplusfile} to compose a full file name, like
 %D in:
 %D
-%D \starttypen
+%D \starttyping
 %D \pathplusfile{path}{file}
-%D \stoptypen
+%D \stoptyping
 %D
 %D By default, this expands into {\tt \pathplusfile{path}{file}}.
 
@@ -230,10 +230,10 @@
 %D and switches to interactive mode. The macro \type{\readfile}
 %D takes care of non||existing files. This macro has two faces.
 %D
-%D \starttypen
+%D \starttyping
 %D \ReadFile {filename}
 %D \readfile {filename} {before loading} {not found}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Many \TEX\ implementations have laid out some strategy for
 %D locating files. This can lead to unexpected results,
@@ -267,9 +267,9 @@
 %D directories, upto a predefined level. Users can change this
 %D level, but we default to~3.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\maxreadlevel {3}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is a pseudo \COUNTER.
 %D
@@ -426,14 +426,14 @@
 
 %D So now we've got ourselves five file loading commands:
 %D
-%D \starttypen
+%D \starttyping
 %D \readfile                {filename} {before loading} {not found}
 %D
 %D \readjobfile             {filename} {before loading} {not found}
 %D \readlocfile             {filename} {before loading} {not found}
 %D \readfixfile             {filename} {before loading} {not found}
 %D \readsysfile {directory} {filename} {before loading} {not found}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {readjobfile,readlocfile,readsysfile,readfixfile}
@@ -481,16 +481,16 @@
 %D loading is done. This one obeys the standard \TEX\
 %D implementation method.
 %D
-%D \starttypen
+%D \starttyping
 %D \doiffileelse {filename} {before loading} {not found}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We use \type{\next} here, because we want to close the
 %D file first. We also provide the alternatives:
 %D
-%D \starttypen
+%D \starttyping
 %D \doiflocfileelse {filename} {before loading} {not found}
-%D \stoptypen
+%D \stoptyping
 
 \def\doiffileelse#1%
   {\doifelsenothing{#1}
@@ -524,11 +524,11 @@
 %D capacity is limited. One can prevent multiple execution and
 %D loading by using one of both:
 %D
-%D \starttypen
+%D \starttyping
 %D \doonlyonce{actions}
 %D \doinputonce{filename}
 %D \doendinputonce{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command obeys the standard method for locating files.
 
@@ -552,9 +552,9 @@
 %D to characters with \CATCODE~12, while the characters in
 %D \type{filename} have \CATCODE~11. So we can better use:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifparentfileelse{filename}{yes}{no}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Since \TEXEXEC\ (and thereby \CONTEXT) supports renaming of
 %D the outputfile, we also need to check on that alternative
@@ -668,4 +668,4 @@
 %%    \catcode`<=\@@other
 %%    \catcode`>=\@@other}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-fun.tex b/tex/context/base/supp-fun.tex
index 2da73e625..b68702fbe 100644
--- a/tex/context/base/supp-fun.tex
+++ b/tex/context/base/supp-fun.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-fun,
+%D   [       filefile=supp-fun,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Fun Stuff,
@@ -38,7 +38,7 @@
 %D   Let's start
 %D \stopbuffer
 %D
-%D \haalbuffer with dropped caps, those blown up first
+%D \getbuffer with dropped caps, those blown up first
 %D characters of a paragraph. It's hard to implement a general
 %D mechanism that suits all situations, but dropped caps are so
 %D seldomly used that we can permit ourselves a rather user
@@ -63,7 +63,7 @@
 %D   This simple
 %D \stopbuffer
 %D
-%D \haalbuffer case shows us what happens when we apply minimal
+%D \getbuffer case shows us what happens when we apply minimal
 %D values. Here we used:
 %D
 %D \typebuffer
@@ -75,7 +75,7 @@
 %D   Is this ugly
 %D \stopbuffer
 %D
-%D \haalbuffer example the third argument tells
+%D \getbuffer example the third argument tells
 %D this macro that we want a dropped capital scaled to the
 %D baseline distance. The two zero point arguments are the
 %D horizontal and vertical offsets and the last arguments
@@ -106,7 +106,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer of the general macro is rather simple and only
+%D \getbuffer of the general macro is rather simple and only
 %D depends on the arguments given and the dimensions of the
 %D strut box. We explicitly load the font, which is no problem
 %D because \TEX\ does not load a font twice. We could have
@@ -253,11 +253,11 @@
 
 %D Before we go to the next topic, we summarize this command:
 %D
-%D \starttypen
+%D \starttyping
 %D \DroppedCaps
 %D   {command} {font}
 %D   {height} {hoffset} {voffset} {lines}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Sometimes you need to make sure that the global settings are
 %D kept local, as in:
@@ -267,9 +267,9 @@
 % %D \setupparagraphs [SomePar][1][width=.5\textwidth]
 % %D \setupparagraphs [SomePar][2][width=.5\textwidth]
 %D \startbuffer
-%D \definieeralineas[SomePar][n=2,rule=on]
-%D \stelalineasin [SomePar][1][width=.5\textwidth]
-%D \stelalineasin [SomePar][2][width=.5\textwidth]
+%D \defineparagraphs[SomePar][n=2,rule=on]
+%D \setupparagraphs [SomePar][1][width=.5\textwidth]
+%D \setupparagraphs [SomePar][2][width=.5\textwidth]
 %D
 %D \startSomePar
 %D   \localdropcaps\NiceDroppedCaps{}{cmr12}{0pt}{2}Here we need
@@ -349,10 +349,10 @@
 %D
 %D To save definitions, we also provide:
 %D
-%D \starttypen
+%D \starttyping
 %D \LineDroppedCaps {command} {font} {hoffset} {lines}
 %D \NiceDroppedCaps {command} {font} {hoffset} {lines}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first command scales the font to the exact height, while
 %D the second command scales the font to a nice 2.5 times the
@@ -383,7 +383,7 @@
 %D saying:
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D \typebuffer
 %D
@@ -395,7 +395,7 @@
 %D respect.
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D \typebuffer
 %D
@@ -433,7 +433,7 @@
         \egroup
       \else
         \setbox0\box2
-        \@EAEAES\grabfirstline
+        \@EAEAEA\grabfirstline
       \fi\fi}%
    \grabfirstline}
 
@@ -450,7 +450,7 @@
 %D effects on the individual words. Of course one needs ...
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D to know a bit more about the macro package used to get real
 %D nice effects, but this example probably demonstrates the
 %D principles well.
@@ -460,10 +460,10 @@
 %D Like in dropped caps case, one can hide such treatments in a
 %D macro, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\MyTreatFirstLine%
 %D   {\TreatFirstLine{\bf}{}{\FunnyCommand}{\FunnyCommand}}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {reshapebox}
@@ -481,7 +481,7 @@
 %D \reshapebox{\FunnyCommand{\box\shapebox}} \flushshapebox
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D \typebuffer
 %D
@@ -496,7 +496,7 @@
 %D \TreatFirstCharacter{\bf\color[green]} Just to be
 %D \stopbuffer
 %D
-%D \haalbuffer complete we also offer a very simple one
+%D \getbuffer complete we also offer a very simple one
 %D character alternative, that is not that hard to understand:
 
 \def\TreatFirstCharacter#1#2% command, character
@@ -526,7 +526,7 @@
 %D
 %D Such a stack looks like:
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox to \hsize
 %D    {$\hss\bfd
 %D     \vcenter{\StackCharacters{TEX}    {}{\vskip.2ex}{\FunnyCommand}}%
@@ -537,7 +537,7 @@
 %D     \hss
 %D     \vcenter{\StackCharacters{CONTEXT}{}{\vskip.2ex}{\FunnyCommand}}
 %D     \hss$}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D and is typeset by saying:
 %D
@@ -545,9 +545,9 @@
 %D
 %D An alternative would have been
 %D
-%D \starttypen
+%D \starttyping
 %D \StackCharacters {CONTEXT} {to 5cm} {\vfill} {\FunnyCommand}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {processtokens}
@@ -555,9 +555,9 @@
 %D At a lower level horizontal and vertical manipulations are
 %D already supported by:
 %D
-%D \starttypen
+%D \starttyping
 %D \processtokens {begin} {between} {end} {space} {text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \startbuffer[a]
 %D \processtokens
@@ -575,9 +575,9 @@
 %D
 %D \leavevmode\hbox to \hsize
 %D   {$\hfil\hfil
-%D    \vcenter{\bf\haalbuffer[a]}%
+%D    \vcenter{\bf\getbuffer[a]}%
 %D    \hfil
-%D    \vcenter{\bfd\haalbuffer[b]}%
+%D    \vcenter{\bfd\getbuffer[b]}%
 %D    \hfil\hfil$}
 %D
 %D which was specified as:
@@ -595,10 +595,10 @@
 %D word spacing. In such situations the next few macros can be
 %D of help:
 %D
-%D \starttypen
+%D \starttyping
 %D \NormalizeFontHeight \name {sample text} {height} {font}
 %D \NormalizeFontWidth  \name {sample text} {width}  {font}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These are implemented using an auxilliary macro:
 
@@ -667,7 +667,7 @@
 %D
 %D This shows up as (we also show the baselines):
 %D
-%D {\showbaselines\haalbuffer}
+%D {\showbaselines\getbuffer}
 %D
 %D The horizontal counterpart is:
 %D
@@ -682,24 +682,24 @@
 %D The calculated font scale is avaliable in the macro
 %D \type{\NormalizedFontSize}.
 %D
-%D \startregelcorrectie
-%D \ruledhbox{\haalbuffer}
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \ruledhbox{\getbuffer}
+%D \stoplinecorrection
 %D
 %D One can of course combine these macros with the ones
 %D described earlier, like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \NormalizeFontHeight {text} \DroppedFont {2\baselineskip} {cmbx12}
 %D
 %D \def\NicelyDroppedCaps
 %D   {\DroppedCaps
-%D      {\kleur[groen]}
+%D      {\color[green]}
 %D      {\DroppedFont}
 %D      {2pt}
 %D      {\baselineskip}
 %D      {2}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D It's up to the reader to test this one.
 
@@ -741,14 +741,14 @@
   {\bgroup
    \forgetall
    \dontcomplain
-   \setuptolerance[\v!zeersoepel]% == \tolerance4500
+   \setuptolerance[\v!verytolerant]% == \tolerance4500
    \hsize#1%
    \def\\{\softbreak}%
    \!!heighta#4%
    \!!heightb#2%
    \doloop
      {\ifdim\!!heighta>\onepoint
-        \expanded{\definefont[\s!dummy][#3 at \the\!!heighta][\c!interlinie=#6]}%
+        \expanded{\definefont[\s!dummy][#3 at \the\!!heighta][\c!interlinespace=#6]}%
         \getvalue\s!dummy
         \setbox\scratchbox\vbox{#7\endgraf}%
         \ifdim\ht\scratchbox>\!!heightb
diff --git a/tex/context/base/supp-ini.tex b/tex/context/base/supp-ini.tex
index 96639d108..4adbb74e0 100644
--- a/tex/context/base/supp-ini.tex
+++ b/tex/context/base/supp-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-ini,
+%D   [       filefile=supp-ini,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Support ystem Macros,
 %D       subtitle=Initializations,
diff --git a/tex/context/base/supp-lan.tex b/tex/context/base/supp-lan.tex
index 31fe2f23f..f1824739b 100644
--- a/tex/context/base/supp-lan.tex
+++ b/tex/context/base/supp-lan.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-lan,
+%D   [       filefile=supp-lan,
 %D        version=1997.03.20,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Language Options,
@@ -18,13 +18,13 @@
 %D some memory.
 
 %D \gdef\starttest
-%D   {\blanko
+%D   {\blank
 %D    \noindent
 %D    \halign\bgroup\tt##\hskip2em&##\hskip2em&##\cr}
 %D
 %D \gdef\stoptest
 %D   {\egroup
-%D    \blanko}
+%D    \blank}
 %D
 %D \gdef\test#1%
 %D   {\convertargument#1\to\ascii\ascii&\hyphenatedword{#1}&#1\cr}
@@ -101,7 +101,7 @@
 %D The next special case (concerning quotes) was brought to my
 %D attention by Piet Tutelaers, one of the driving forces
 %D behind rebuilding hyphenation patterns for the dutch
-%D language.\voetnoot{In 1996 the spelling of the dutch
+%D language.\footnote{In 1996 the spelling of the dutch
 %D language has been slightly reformed which made this topic
 %D actual again.} We'll also take care of this case.
 %D
@@ -136,9 +136,9 @@
 %D characters as delimiters. The prefered way of specifying
 %D compound words is using \type{||}, which is installed by:
 %D
-%D \starttypen
+%D \starttyping
 %D \installdiscretionaries || -
-%D \stoptypen
+%D \stoptyping
 %D
 %D Some alternative definitions are:
 %D
@@ -154,7 +154,7 @@
 %D after which we can say:
 %D
 %D \bgroup
-%D \haalbuffer
+%D \getbuffer
 %D \starttest
 %D \test {test**test**test}
 %D \test {test++test++test}
@@ -191,13 +191,13 @@
 %D supports \type{|} as command and delimiter. Before
 %D activating \type{|} we save it's value:
 %D
-%D \starttypen
+%D \starttyping
 %D \edef\domathmodediscretionary{\string|}
-%D \stoptypen
+%D \stoptyping
 %D
 %D after which we're ready to define it's meaning to:
 %D
-%D \starttypen
+%D \starttyping
 %D \catcode`\|=\@@active
 %D
 %D \unexpanded\def|%
@@ -206,7 +206,7 @@
 %D    \else
 %D      \expandafter\dotextmodediscretionary
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We need a two stage \type{\futurelet} because we want to
 %D look ahead for both the compound character definition and
@@ -217,7 +217,7 @@
 %D also save the character following the \type{|#1|} in
 %D \type{\nextnext}.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dotextmodediscretionary%
 %D   {\bgroup
 %D    \futurelet\next\dodotextmodediscretionary}
@@ -225,13 +225,13 @@
 %D \def\dodotextmodediscretionary#1|%
 %D   {\def\betweendiscretionaries{#1}%
 %D    \futurelet\nextnext\dododotextmodediscretionary}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The main macro consists of quite some \type{\ifx} tests
 %D while \type{\checkafterdiscretionary} handles the commas.
 %D We show the simplified version here:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dododotextmodediscretionary%
 %D   {\let\nextnextnext=\egroup
 %D    \ifx     |\next
@@ -259,7 +259,7 @@
 %D    \else
 %D      \let\nextnext=\relax
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Handling \type{(} and \type{)} is a a bit special, because
 %D \TEX\ sees them as decent hyphenation points, according to
@@ -270,16 +270,16 @@
 %D The most recent implementation is more advanced. As
 %D demonstrated we can install delimiters, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \installdiscretionaries || \compoundhyphen
-%D \stoptypen
+%D \stoptyping
 %D
 %D This time we have to use a bit more clever way of saving the
 %D math mode specification of the character we're going to
 %D make active. We also save the user supplied compound hyphen.
 %D We show the a bit more traditional implementation first.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\installdiscretionaries#1%
 %D   {\catcode`#1\@@other
 %D    \expandafter\doinstalldiscretionaries\string#1}
@@ -292,7 +292,7 @@
 %D \def\dodoinstalldiscretionaries#1#2%
 %D   {\setvalue{textmodediscretionary\string#1}{#2}%
 %D    \unexpanded\def#1{\discretionarycommand#1}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A bit more \CATCODE\ and character trickery enables us to
 %D discard the two intermediate steps. This trick originates
@@ -345,11 +345,11 @@
 %D not expanded. Thanks to Tobias Burnus for providing this
 %D example.
 %D
-%D \startformule
+%D \startformula
 %D   \left|f(x_n)-{1\over2}\right| =
 %D      {\cases{|{1\over2}-x_n| &for $0\le x_n < {1\over2}$\cr
 %D              |x_n-{1\over2}| &for ${1\over2}<x_n\le1$   \cr}}
-%D \stopformule
+%D \stopformula
 
 %D \macros
 %D   {defineactivecharacter}
@@ -357,22 +357,22 @@
 %D In \type {lang-ger.tex} we define some language specific
 %D commands for german input, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startlanguagespecifics[de]
 %D   \installcompoundcharacter "a {\moveaccent{-.1ex}\"a\midworddiscretionary}
 %D \stoplanguagespecifics
-%D \stoptypen
+%D \stoptyping
 %D
 %D Occasionally we have to redefine such an active character,
 %D like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \startencoding[pdfdoc]
 %D   \startlanguagespecifics[de]
 %D     \defineactivecharacter " {\"}
 %D   \stoplanguagespecifics
 %D \stopencoding
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here is the command we used:
 
@@ -427,10 +427,10 @@
 %D active can interfere with other features of macropackages,
 %D normally there should be no problems with things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \installdiscretionary || +
 %D \installdiscretionary ++ =
-%D \stoptypen
+%D \stoptyping
 %D
 %D The real work is done by the next set of macros. We have
 %D to use a double \type{\futurelet} because we have to take
@@ -532,9 +532,9 @@
 %D savely break the next text across a line and at the same
 %D time make the words interactive.
 %D
-%D \starttypen
+%D \starttyping
 %D \goto{Some||Long||Word}
-%D \stoptypen
+%D \stoptyping
 
 \def\currentspaceskip
   {\fontdimen2\font\!!plus\fontdimen3\font\!!minus\fontdimen4\font\relax}
@@ -578,9 +578,9 @@
 %D
 %D The more advanced mechanism is activated by calling:
 %D
-%D \starttypen
+%D \starttyping
 %D \enableactivediscretionaries
-%D \stoptypen
+%D \stoptyping
 %D
 %D which is defined as:
 
@@ -661,15 +661,15 @@
 
 %D Now we can safely do things like: \enableactivediscretionaries
 %D
-%D \starttypen
+%D \starttyping
 %D \catcode`<=\@@active  \def<{hello there}
 %D \catcode`>=\@@active  \def>{hello there}
 %D \catcode`(=\@@active  \def({hello there}
 %D \catcode`)=\@@active  \def){hello there}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In normal day||to||day production of texts this kind of
-%D activation is seldom used.\voetnoot{In the \CONTEXT\ manual
+%D activation is seldom used.\footnote{In the \CONTEXT\ manual
 %D the \type{<} and \type{>} are made active and used for some
 %D cross||reference trickery.} If so, we have to take care of
 %D the math mode explicitly, just like we did when making
@@ -899,28 +899,28 @@
 %D versatile as possible. As a result one can define his own
 %D compound character support, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \installcompoundcharacter "a {\"a}
 %D \installcompoundcharacter "e {\"e}
 %D \installcompoundcharacter "i {\"i}
 %D \installcompoundcharacter "u {\"u}
 %D \installcompoundcharacter "o {\"o}
 %D \installcompoundcharacter "s {\SS}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or even
 %D
-%D \starttypen
+%D \starttyping
 %D \installcompoundcharacter "ck {\discretionary {k-}{k}{ck}}
 %D \installcompoundcharacter "ff {\discretionary{ff-}{f}{ff}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The support is not limited to alphabetic characters, so the
 %D next definition is also valid.
 %D
-%D \starttypen
+%D \starttyping
 %D \installcompoundcharacter ". {.\doifnextcharelse{\spacetoken}{}{\kern.125em}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation looks familiar and uses the same tricks as
 %D mentioned earlier in this module. We take care of two
@@ -971,9 +971,9 @@
 %D A compound character can be reset with the following
 %D command.
 %D
-%D \starttypen
+%D \starttyping
 %D \restorecompoundcharacter /
-%D \stoptypen
+%D \stoptyping
 
 \def\restorecompoundcharacter#1% new
   {\catcode`#1=\csname\@nn@\string#1\endcsname\relax}
@@ -1067,9 +1067,9 @@
 %D defined. We either execute the compound character or just
 %D insert the first. So we have
 %D
-%D \starttypen
+%D \starttyping
 %D <key><key>  <key><known>  <key><unknown>
-%D \stoptypen
+%D \stoptyping
 %D
 %D In later modules we will see how these commands are used.
 
@@ -1348,10 +1348,10 @@
 
 %D This would be better, but it spoils \type {\~} and so:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument#1\to\ascii
 %D \expandafter\handletokens\ascii\with\scanurl
-%D \stoptypen
+%D \stoptyping
 
 % \def\scanurl#1%
 %   {\ifx#1\~%
@@ -1475,7 +1475,7 @@
 %D to handle url's passed as argument, the following solutions
 %D came to my mind:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\whateverurl#1%
 %D   {{\def~{\string~}\useURL[dummy][#1]\goto{\url[dummy]}[URL(dummy)]}}
 %D
@@ -1485,16 +1485,16 @@
 %D \def\whateverurl#1%
 %D   {\convertargument#1\to\ascii
 %D    \expanded{\useURL[dummy][\ascii]}\goto{\url[dummy]}[URL(dummy)]}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {hyphenatedfile}
 %D
 %D For the moment we treat filenames in a similar way,
 %D
-%D \starttypen
+%D \starttyping
 %D \hyphenatedfile{here/there/filename.suffix}
-%D \stoptypen
+%D \stoptyping
 
 \let\hyphenatedfile\hyphenatedurl
 
diff --git a/tex/context/base/supp-mat.tex b/tex/context/base/supp-mat.tex
index 682fe59f7..8dc13fa67 100644
--- a/tex/context/base/supp-mat.tex
+++ b/tex/context/base/supp-mat.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-mat,
+%D   [       filefile=supp-mat,
 %D        version=1998.09.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Math,
@@ -25,23 +25,23 @@
 %D This can lead to confusing and errorprone situations when
 %D macros insert \type{$}. When for instance we have defined:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\MyPlus{$\,+\,$}
-%D \stoptypen
+%D \stoptyping
 %D
 %D the sequence \type{$x^2 \MyPlus y^2 = r^2$} will expand to:
 %D
-%D \starttypen
+%D \starttyping
 %D $x^2 $\,+\,$ y^2 = r^2$
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here the \type{\,} are given outside math mode and \TEX\ will
 %D definitely complain about this. A more save definition would
 %D have been:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\MyPlus{\mathematics{\,+\,}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which is implemented as:
 
@@ -139,7 +139,7 @@
    \def_{\ifmmode\expandafter\suber\else\expandafter\normalsuber\fi}}
 \egroup
 
-%D \macro
+%D \macros
 %D   {restoremathstyle}
 %D
 %D We can pick up the current math style by calling \type
diff --git a/tex/context/base/supp-mis.tex b/tex/context/base/supp-mis.tex
index 2f169dd0d..327eb4452 100644
--- a/tex/context/base/supp-mis.tex
+++ b/tex/context/base/supp-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-mis,
+%D   [       filefile=supp-mis,
 %D        version=1997.01.04,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Missing (For Generic Use),
@@ -635,9 +635,9 @@
 %D The following macro is the simplified version, but good
 %D enough for day to day hacks.
 %D
-%D \starttypen
+%D \starttyping
 %D \dohandletokens some text\with\somemacro
-%D \stoptypen
+%D \stoptyping
 
 \ifnocontextobject \dohandletokens \do
 
@@ -696,4 +696,4 @@
 %D That's it. Please forget this junk and take a look at how
 %D it should be done.
 
-\StopLatexHack \protect \endinput
\ No newline at end of file
+\StopLatexHack \protect \endinput
diff --git a/tex/context/base/supp-mpe.tex b/tex/context/base/supp-mpe.tex
index 497f077e6..3c5a367e3 100644
--- a/tex/context/base/supp-mpe.tex
+++ b/tex/context/base/supp-mpe.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-mpe,
+%D   [       filefile=supp-mpe,
 %D        version=1999.07.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=METAPOST Special Extensions,
@@ -40,24 +40,24 @@
 %D specification of the speciality can have two forms,
 %D determined by the setting of a boolean variable:
 %D
-%D \starttypen
+%D \starttyping
 %D _inline_specials_ := false ; % comment like code (default)
 %D _inline_specials_ := true  ; % command like code
-%D \stoptypen
+%D \stoptyping
 %D
 %D When the specification is embedded as comment, it looks
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D %%MetaPostSpecial <size> <data> <number> <identifier>
-%D \stoptypen
+%D \stoptyping
 %D
 %D The in||line alternative is more tuned for \POSTSCRIPT,
 %D since it permits us to define a macro \type {special}.
 %D
-%D \starttypen
+%D \starttyping
 %D inline  : <data> <number> <identifier> <size> special
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type {identifier} determines what to do, and the data
 %D can be used to accomplish this. A type~2 shading function
@@ -68,15 +68,15 @@
 
 %D data:
 %D
-%D \starttypen
+%D \starttyping
 %D from to n inner_r g b x y        outer_r g b x y
 %D from to n inner_r g b x y radius outer_r g b x y radius
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation below saves the data on the stack in
 %D a way similar to the macros in \type {supp-pdf.tex}, and
 %D just overload a few already defined handlers. That way,
-%D the existing macros are still generic. \voetnoot {Actually,
+%D the existing macros are still generic. \footnote {Actually,
 %D the macros here are just as generic.}
 %D
 %D Currently the only extension concerns shading, which is
@@ -250,7 +250,7 @@
 
 %D The naive case looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\handleMPrgbcolor%
 %D   {\setMPcolor
 %D    \ifcase\MPspecialversion
@@ -260,7 +260,7 @@
 %D    \else
 %D      \resetMPcolor\normalhandleMPrgbcolor
 %D    \fi\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, since we want \CMYK\ support, we will use the
 %D following implementation:
@@ -430,7 +430,7 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D These graphics can be hooked into the overlay mechanism,
 %D which is available in many commands.
@@ -443,25 +443,25 @@
 %D
 %D \typebuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D These backgrounds can for instance be applied to \type
 %D {\framed}:
 %D
 %D \startbuffer
-%D \setupframed[breedte=3cm,hoogte=2cm,kader=uit]
-%D \startcombinatie[3*1]
-%D   {\framed[achtergrond=demo 1]{\bfd \white Demo 1}} {}
-%D   {\framed[achtergrond=demo 2]{\bfd \white Demo 2}} {}
-%D   {\framed[achtergrond=demo 3]{\bfd \white Demo 3}} {}
-%D \stopcombinatie
+%D \setupframed[width=3cm,height=2cm,frame=off]
+%D \startcombination[3*1]
+%D   {\framed[backgroundachtergrond=demo 1]{\bfd \white Demo 1}} {}
+%D   {\framed[backgroundachtergrond=demo 2]{\bfd \white Demo 2}} {}
+%D   {\framed[backgroundachtergrond=demo 3]{\bfd \white Demo 3}} {}
+%D \stopcombination
 %D \stopbuffer
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 %D
 %D There are a few more alternatives, determined by the second
 %D parameter passed to \type {circular_shade} and alike.
@@ -474,40 +474,40 @@
 %D      #2_shade(p,#3,#4,#5) ;
 %D    \stopuniqueMPgraphic
 %D    \defineoverlay[Shade-#1][\uniqueMPgraphic{Shade-#1}]%
-%D    \framed[achtergrond=Shade-#1,breedte=2cm,hoogte=2cm,kader=uit]{}}
+%D    \framed[backgroundachtergrond=Shade-#1,width=2cm,height=2cm,frame=off]{}}
 %D
-%D \startregelcorrectie
-%D \startcombinatie[5*1]
+%D \startlinecorrection
+%D \startcombination[5*1]
 %D   {\SomeShade{10}{circular}{0}{.3blue}{.9blue}} {circular 0}
 %D   {\SomeShade{11}{circular}{1}{.3blue}{.9blue}} {circular 1}
 %D   {\SomeShade{12}{circular}{2}{.3blue}{.9blue}} {circular 2}
 %D   {\SomeShade{13}{circular}{3}{.3blue}{.9blue}} {circular 3}
 %D   {\SomeShade{14}{circular}{4}{.3blue}{.9blue}} {circular 4}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \stopcombination
+%D \stoplinecorrection
 %D
-%D \blanko
+%D \blank
 %D
-%D \startregelcorrectie
-%D \startcombinatie[5*1]
+%D \startlinecorrection
+%D \startcombination[5*1]
 %D   {\SomeShade{20}{circular}{0}{.9green}{.3green}} {circular 0}
 %D   {\SomeShade{21}{circular}{1}{.9green}{.3green}} {circular 1}
 %D   {\SomeShade{22}{circular}{2}{.9green}{.3green}} {circular 2}
 %D   {\SomeShade{23}{circular}{3}{.9green}{.3green}} {circular 3}
 %D   {\SomeShade{24}{circular}{4}{.9green}{.3green}} {circular 4}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \stopcombination
+%D \stoplinecorrection
 %D
-%D \blanko
+%D \blank
 %D
-%D \startregelcorrectie
-%D \startcombinatie[4*1]
+%D \startlinecorrection
+%D \startcombination[4*1]
 %D   {\SomeShade{30}{linear}{0}{.3red}{.9red}} {linear 0}
 %D   {\SomeShade{31}{linear}{1}{.3red}{.9red}} {linear 1}
 %D   {\SomeShade{32}{linear}{2}{.3red}{.9red}} {linear 2}
 %D   {\SomeShade{33}{linear}{3}{.3red}{.9red}} {linear 3}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \stopcombination
+%D \stoplinecorrection
 %D
 %D These macros closely cooperate with the \METAPOST\ module
 %D \type {mp-spec.mp}, which is part of the \CONTEXT\
@@ -519,12 +519,12 @@
 %D earlier. In \PDF\ type~2 and~3 shading functions are
 %D specified in terms of:
 %D
-%D \starttabulatie[|Tl|l|]
+%D \starttabulate[|Tl|l|]
 %D \NC /Domain \NC sort of meeting range \NC \NR
 %D \NC /C0     \NC inner shade \NC \NR
 %D \NC /C1     \NC outer shade \NC \NR
 %D \NC /N      \NC smaller values, bigger inner circles \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 \newcount\currentPDFshade  % 0  % global (document wide) counter
 \let\currentMPshades\empty
@@ -751,7 +751,7 @@
 %D An example of using both special features is the
 %D following.
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPpage
 %D   externalfigure "hakker1b.png" scaled 22cm rotated  10 shifted (-2cm,0cm);
 %D   externalfigure "hakker1b.png" scaled 10cm rotated -10 ;
@@ -764,7 +764,7 @@
 %D   circular_shade(s,0,.2red,.9red) ;
 %D   addto currentpicture also c ;
 %D \stopMPpage
-%D \stoptypen
+%D \stoptyping
 
 %D This is some experimental hyperlink driver that I wrote
 %D for Mark Wicks.
@@ -809,29 +809,29 @@
 %D \stopbuffer
 %D
 %D \startbuffer[cmyk]
-%D \startcombinatie[4*1]
+%D \startcombination[4*1]
 %D   {\definecolor[test][c=1,y=.3,k=.3] \processMPbuffer[mp]} {c=1 y=.3 k=.3}
 %D   {\definecolor[test][c=.9,y=.15]    \processMPbuffer[mp]} {c=.9 y=.15}
 %D   {\definecolor[test][c=.25,y=.8]    \processMPbuffer[mp]} {c=.25 y=.8}
 %D   {\definecolor[test][c=.45,y=.1]    \processMPbuffer[mp]} {c=.45 y=.1}
-%D \stopcombinatie
+%D \stopcombination
 %D \stopbuffer
 %D
-%D \plaatsfiguur
+%D \placefigure
 %D   {\CMYK\ support disabled,
 %D    conversion to \RGB.}
-%D   {\setupcolors[cmyk=nee,status=start]\haalbuffer[cmyk]}
+%D   {\setupcolors[cmyk=nee,state=start]\getbuffer[cmyk]}
 %D
-%D \plaatsfiguur
+%D \placefigure
 %D   {\CMYK\ support enabled,
 %D    no support in \METAPOST.}
-%D   {\setupcolors[cmyk=ja,mpcmyk=nee,status=start]\haalbuffer[cmyk]}
+%D   {\setupcolors[cmyk=ja,mpcmyk=nee,state=start]\getbuffer[cmyk]}
 %D
-%D \plaatsfiguur
+%D \placefigure
 %D   {\CMYK\ support enabled,
 %D    no conversion to \RGB,
 %D    support in \METAPOST}
-%D   {\setupcolors[cmyk=ja,status=start]\haalbuffer[cmyk]}
+%D   {\setupcolors[cmyk=ja,state=start]\getbuffer[cmyk]}
 
 \defineMPspecial{1}
   {\ifMPcmykcolors
@@ -920,16 +920,16 @@
 %D imagine situations where tex has to work with values
 %D calculated by \METAPOST.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \getbuffer
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D Later we will implement a more convenient macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \setMPlayer [test] [somepos-1] {Whatever we want here!}
 %D \setMPlayer [test] [somepos-2] {Whatever we need there!}
-%D \stoptypen
+%D \stoptyping
 
 \ifx\dosavepositionwhd\undefined
   \let\dosavepositionwhd\gobblesevenarguments
@@ -965,7 +965,7 @@
 %D
 %D \typebuffer
 %D
-%D \startregelcorrectie \processMPbuffer \stopregelcorrectie
+%D \startlinecorrection \processMPbuffer \stoplinecorrection
 %D
 %D One can also communicate colors between \CONTEXT\ and
 %D \METAPOST:
@@ -986,7 +986,7 @@
 %D fill p rotated 330 withcolor \MPcolor{tyellow} ;
 %D \stopbuffer
 %D
-%D \startregelcorrectie \processMPbuffer \stopregelcorrectie
+%D \startlinecorrection \processMPbuffer \stoplinecorrection
 %D
 %D We save all the three components needed in one macro,
 %D just to save hash space.
@@ -1313,4 +1313,4 @@
 
 \fi
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex
index 26c9d37fe..b5906a44c 100644
--- a/tex/context/base/supp-mps.tex
+++ b/tex/context/base/supp-mps.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-mps,
+%D   [       filefile=supp-mps,
 %D        version=1997.07.05,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=\METAPOST\ Inclusion,
@@ -16,13 +16,13 @@
 %D integrate \METAPOST\ support int \CONTEXT.  We offer two
 %D tracks:
 %D
-%D \startopsomming
-%D \som generating \METAPOST\ code, running this program from
+%D \startitemize
+%D \item generating \METAPOST\ code, running this program from
 %D      within \TEX\ using \type{\write18}, and importing the
 %D      result
-%D \som generating \METAPOST\ code, processing the code
+%D \item generating \METAPOST\ code, processing the code
 %D      afterward, and importing the result in a second pass
-%D \stopopsomming
+%D \stopitemize
 %D
 %D The first approach uses a non standard \TEX\ feature,
 %D implemented in Web2c. I'm not going to discuss the pros and
@@ -30,9 +30,9 @@
 %D arguments against this can be overcome by implementing a
 %D \TEX\ worthy primitive:
 %D
-%D \starttypen
+%D \starttyping
 %D \excuteMetaPost filename
-%D \stoptypen
+%D \stoptyping
 %D
 %D Ok then, let's start:
 
@@ -56,10 +56,10 @@
 %D From within \TEX\ one can execute \METAPOST\ code by putting
 %D it between the two commands
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPgraphic
 %D \stopMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
 %D This is implemented as:
 
@@ -75,15 +75,15 @@
 %D explictly generate a figure in terms of \type{beginfig} and
 %D \type{endfig}, we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPgraphic
 %D \stopMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPrun
 %D \stopMPrun
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next booleans are for internal purposes only.
 
@@ -129,7 +129,7 @@
 %D If the writing process is divided into more steps, one can
 %D use the components of this macro directly.
 %D
-%D \starttypen
+%D \starttyping
 %D \startwritingMPgraphic
 %D ...
 %D \writeMPgraphic{...}
@@ -137,7 +137,7 @@
 %D \writeMPgraphic{...}
 %D ...
 %D \stopwritingMPgraphic
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {ifrunMPgraphics,ifrunMPTEXgraphics,ifinsertMPgraphics}
@@ -195,9 +195,9 @@
 %D One can include for instance common input commands by
 %D passing them to \type{\MPinclusions}:
 %D
-%D \starttypen
+%D \starttyping
 %D \MPinclusions{input mp-mine}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The token register \type {\MPinitializations} is expanded
 %D before all other inclusions, the extensions are expanded
@@ -337,7 +337,7 @@
 
 %D A first version:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\dodowriteMPgraphicline#1tex #2#3etex#4\MPend%
 %D   {\ifx\next\empty\else\ifx\next\relax\else
 %D      \bgroup
@@ -353,7 +353,7 @@
 %D        \dowriteMPgraphicline#4tex \relax etex\MPend
 %D      \fi
 %D    \fi\fi}
-%D \stoptypen
+%D \stoptyping
 
 %D The next alternative also handles inclusions well.
 
@@ -363,7 +363,7 @@
 
 %D Before we supported the graph module, we had:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument        etex\to\MPasciiB
 %D \convertargument     textext\to\MPasciiC % geen "text"
 %D \convertargument graphictext\to\MPasciiD % geen "text"
@@ -378,7 +378,7 @@
 %D     {\doifstringinstringelse\MPasciiD\MPasciiA{\global\MPTEXgraphictrue}
 %D                                               {\global\MPTEXgraphicfalse}}}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The next alternative permits extensions in other modules
 %D without the need to know the details of testing.
@@ -422,7 +422,7 @@
 \forceMPTEXcheck{textext}
 \forceMPTEXcheck{graphictext}
 
-%D \starttypen
+%D \starttyping
 %D \forceMPTEXgraphictrue
 %D
 %D \forceMPTEXcheck{lintext}
@@ -432,7 +432,7 @@
 %D draw hlintext.lft(0, 20,  5, 20cm, "@3e") ;
 %D draw vlogtext.bot(0, 10,  9, 10cm, "@3e") ;
 %D \stopMPcode
-%D \stoptypen
+%D \stoptyping
 
 \def\flushMPTEXgraphic
   {\ifMPTEXgraphic
@@ -708,7 +708,7 @@
 %D
 %D For my polish friends:
 %D
-%D \starttypen
+%D \starttyping
 %D % translate=il2-pl
 %D
 %D \translateMPinput{il2-pl}
@@ -722,7 +722,7 @@
 %D \startMPcode
 %D draw btex MetaPost: ± ¶ etex scaled 5 ;
 %D \stopMPcode
-%D \stoptypen
+%D \stoptyping
 
 \def\translateMPinput#1%
   {\xdef\MPinputtranslation{\letterpercent -translate-file=#1\space}}
@@ -754,9 +754,9 @@
 %D one file. This means that we cannot close this file after
 %D every \type{\stopMPgraphic}. Therefore we need to say:
 %D
-%D \starttypen
+%D \starttyping
 %D \flushMPgraphics
-%D \stoptypen
+%D \stoptyping
 %D
 %D else the file is closed without writing the \METAPOST\ end
 %D command. One will notice this fast enough when in indirect
@@ -770,10 +770,10 @@
 %D
 %D Once defined, we can call for this graphic by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \loadcurrentMPgraphic{setups}
 %D \placeMPgraphic
-%D \stoptypen
+%D \stoptyping
 %D
 %D This two stage insert permits some intermediate manipulations
 %D of the graphic, which temporary saved in:
@@ -828,7 +828,7 @@
 
 %D We assume that one can set objects:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\douseMPbox#1%
 %D   {\setobject{MP}{#1}\vbox
 %D      {\forgetall
@@ -836,9 +836,9 @@
 %D       \deallocateMPslot\currentMPgraphic
 %D       \placeMPgraphic}%
 %D    \setgvalue{#1}{\getobject{MP}{#1}}}
-%D \stoptypen
+%D \stoptyping
 %D
-%D More save is to use a number for {MP}{#1} which permits
+%D More save is to use a number for \type {{MP}{#1}} which permits
 %D redefinition.
 
 \newcount\MPobjectcounter
@@ -925,7 +925,7 @@
 
 \let\useMPgraphic=\reuseMPgraphic
 
-%D \macro
+%D \macros
 %D   {doifMPgraphicelse}
 %D
 %D For (mainly internal) purposes we provide a test macro.
@@ -945,7 +945,7 @@
 %D In a graphic one can call up another (predefined one)
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \startuseMPgraphic{a}
 %D   fill fullcircle scaled 100 ;
 %D \stopuseMPgraphic
@@ -956,7 +956,7 @@
 %D \stopuseMPgraphic
 %D
 %D \useMPgraphic{b}
-%D \stoptypen
+%D \stoptyping
 
 \def\includeMPgraphic#1%
   {\csname\@@MPG#1\endcsname}
@@ -980,9 +980,9 @@
 %D
 %D For faster running, one can generate a format, saying
 %D
-%D \starttypen
+%D \starttyping
 %D mpost -ini context
-%D \stoptypen
+%D \stoptyping
 %D
 %D (The resulting \type {mem} file should be moved to the
 %D right location. Watch out for misatching \type {progname}
@@ -1057,10 +1057,10 @@
      \else
        \externalfigure
          [#1]
-         [\c!type=\c!mps,\c!object=\v!nee,
-          \c!symbool=\v!ja,\c!reset=\v!ja,
-          \c!maxbreedte=,\c!maxhoogte=,
-          \c!kader=\v!uit,\c!achtergrond=,
+         [\c!type=\c!mps,\c!object=\v!no,
+          \c!symbol=\v!yes,\c!reset=\v!yes,
+          \c!maxwidth=,\c!maxheight=,
+          \c!frame=\v!off,\c!background=,
           #2]%
      \fi}
 
@@ -1074,7 +1074,7 @@
 %D This module can be used in \PLAIN\ \TEX too. When using
 %D \DVIPS, just try to process:
 %D
-%D \starttypen
+%D \starttyping
 %D \input supp-mps
 %D
 %D \runMPgraphicstrue
@@ -1088,15 +1088,15 @@
 %D \stopuseMPgraphic
 %D
 %D \useMPgraphic{1}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Don't forget to enable \type{\write18}. When does not say
 %D \type{\runMPgraphicstrue}, the \METAPOST\ scratch file
 %D must be closed by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \flushMPgraphics
-%D \stoptypen
+%D \stoptyping
 %D
 %D When using the indirect method, one has to process the file
 %D \type{mpgraph.mp} between two successive \TEX\ runs.
@@ -1124,15 +1124,15 @@
 %D The method we use is both robust and simple: one can do
 %D with calling the next macro with the filename as argument:
 %D
-%D \starttypen
+%D \starttyping
 %D \includeMPfonts{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can turn of this mechanism with:
 %D
-%D \starttypen
+%D \starttyping
 %D \includeMPfontsfalse
-%D \stoptypen
+%D \stoptyping
 %D
 %D {\em Currently this method fails for situations where the
 %D font definition is not on one line, which is he case when
@@ -1170,7 +1170,7 @@
 %D In \CONTEXT\ font handling is intergrated in the figure
 %D inclusion macros. A decent plain \TEX\ alternative is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPgraphic#1%
 %D   {\hbox\bgroup
 %D    \includeMPfonts{#1}%
@@ -1188,28 +1188,28 @@
 %D          urx=\EPSurx\space
 %D          ury=\EPSury\space}}%
 %D    \egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro needs \type {supp-eps.tex} and provided no
 %D scaling. For \LATEX\ users the next one will do:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPgraphic#1#%
 %D   {\hbox\bgroup
 %D    \def\includeMPgraphics##1%
 %D      {\includeMPfonts{##1}%
-%D       \includegraphics[type=mps,#1]{##1}%  or whatever type they use
+%D       \includegraphics[typetype=mps,#1]{##1}%  or whatever type they use
 %D       \egroup}%
 %D    \includeMPgraphics}
-%D \stoptypen
+%D \stoptyping
 
 %D We scan the graphics file for the \type{fshow} operator,
 %D that is, lines that start with \type{(}. If found it
 %D interprets the line, which looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D (string ... string) font size fshow
-%D \stoptypen
+%D \stoptyping
 %D
 %D Font definitions specified in the preamble are simply
 %D ignored. Only lines starting with \type{(} are interpreted.
@@ -1277,18 +1277,18 @@
 %D The lines starting with \type{(} are interpreted and
 %D handled by
 %D
-%D \starttypen
+%D \starttyping
 %D \def\includeMPcharacters(#1) #2 #3 #4\relax%
 %D   {\font\temp=#2 at #3bp\temp#1}
-%D \stoptypen
+%D \stoptyping
 %D
 %D While processing some \TUG~98 proceedings, I also had to
 %D deal with:
 %D
-%D \starttypen
+%D \starttyping
 %D /nfont {10 div dup scale 10} def
 %D (T) ANTTB 7.13086 nfont fshow
-%D \stoptypen
+%D \stoptyping
 %D
 %D which comes to rounding sizes. This is something
 %D experimental. (The macro in supp-pdf.tex is more
@@ -1321,27 +1321,27 @@
 %D Now let's see if things work all right and show the example
 %D files that are part of the \METAPOST\ distribution:
 %D
-%D \startregelcorrectie
-%D \steluitlijnenin[midden]
+%D \startlinecorrection
+%D \setupalign[middle]
 %D \leavevmode
-%D \startcombinatie[3*3]
-%D   {\externfiguur[mp-exa-1][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-2][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-3][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-4][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-5][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-6][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-7][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-8][kader=aan,breedte=.2\hsize]} {}
-%D   {\externfiguur[mp-exa-9][kader=aan,breedte=.2\hsize]} {}
-%D \stopcombinatie
-%D \stopregelcorrectie
+%D \startcombination[3*3]
+%D   {\externalfigure[mp-exa-1][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-2][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-3][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-4][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-5][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-6][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-7][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-8][frame=on,width=.2\hsize]} {}
+%D   {\externalfigure[mp-exa-9][frame=on,width=.2\hsize]} {}
+%D \stopcombination
+%D \stoplinecorrection
 %D
 %D Here we used calls like:
 %D
-%D \starttypen
-%D \externfiguur[mp-exa-1][methode-mps,kader=aan,breedte=.2\hsize]
-%D \stoptypen
+%D \starttyping
+%D \externalfigure[mp-exa-1][methode-mps,frame=on,width=.2\hsize]
+%D \stoptyping
 
 %D \macros
 %D   {convertMPcolors,
@@ -1349,8 +1349,8 @@
 %D
 %D When I told the editors that I wanted to use colored
 %D \METAPOST\ graphics in the color issue of the \MAPS, I was
-%D asked to use the \kap{CMYK} colorspace instead of \kap{RGB}
-%D one. However, \METAPOST\ only supports \kap{RGB} colors. I
+%D asked to use the \cap{CMYK} colorspace instead of \cap{RGB}
+%D one. However, \METAPOST\ only supports \cap{RGB} colors. I
 %D decided to write a utility to convert the \type
 %D {setrgbcolor} operators into \type {setcmykcolor} ones, and
 %D some experiments showed me that I could best let \TEX\ do it
@@ -1365,9 +1365,9 @@
 
 %D The main macro is called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertMPcolors{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When active, this macro returns a message saying if indeed
 %D conversion took place. The old file is overwritten! This
@@ -1494,37 +1494,37 @@
 %D By setting both \type{rgb} and \type{cmyk} to off, we force
 %D conversion to gray scales using:
 %D
-%D \plaatsformule[-]
-%D   \startformule
+%D \placeformula[-]
+%D   \startformula
 %D   G = .30r + .59g + .11b
-%D   \stopformule
+%D   \stopformula
 %D
 %D By using buffers, we keep the \ASCII\ layout clean:
 %D
 %D \startbuffer
 %D \startbuffer[rgb]
-%D   \stelkleurenin[rgb=ja,cmyk=nee,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=ja,cmyk=nee,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[cmyk]
-%D   \stelkleurenin[rgb=nee,cmyk=ja,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=ja,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[cmy]
-%D   \stelkleurenin[rgb=nee,cmyk=ja,reductie=ja,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=ja,reduction=yes,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D
 %D \startbuffer[gray]
-%D   \stelkleurenin[rgb=nee,cmyk=nee,reductie=nee,conversie=nee]
+%D   \setupcolors[rgb=nee,cmyk=nee,reduction=no,conversion=no]
 %D   \useMPgraphic{hans}
 %D \stopbuffer
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The graphic is rather simple and is generated each time
 %D it's called:
@@ -1534,7 +1534,7 @@
 %D \startbuffer
 %D \startbuffer[graphic]
 %D   \startuseMPgraphic{hans}
-%D     width  :=\the\tekstbreedte/5;
+%D     width  :=\the\textwidth/5;
 %D     height := width/4;
 %D     fill fullcircle
 %D       xscaled width
@@ -1545,40 +1545,40 @@
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Next we combine the four alternative interpretations in a
 %D combination:
 %D
 %D \startbuffer
 %D \startbuffer[result]
-%D   \startcombinatie[4]
-%D     {\haalbuffer[rgb]}  {\tfxx original}
-%D     {\haalbuffer[cmyk]} {\ttxx\string\convertMPcolorstrue}
-%D     {\haalbuffer[cmy]}  {\ttxx\string\reduceMPcolorstrue}
-%D     {\haalbuffer[gray]} {\ttxx\string\forcegrayMPcolorstrue}
-%D   \stopcombinatie
+%D   \startcombination[4]
+%D     {\getbuffer[rgb]}  {\tfxx original}
+%D     {\getbuffer[cmyk]} {\ttxx\string\convertMPcolorstrue}
+%D     {\getbuffer[cmy]}  {\ttxx\string\reduceMPcolorstrue}
+%D     {\getbuffer[gray]} {\ttxx\string\forcegrayMPcolorstrue}
+%D   \stopcombination
 %D \stopbuffer
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D Finally we call the buffers, using different setting:
 %D
 %D \startbuffer
-%D \plaatsfiguur
+%D \placefigure
 %D   {\METAPOST\ color conversions}
-%D   {\def\RedGreenBlue{.1,.4,.6}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.1,.6,.4}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.4,.1,.6}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.4,.6,.1}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.6,.1,.4}\haalbuffer[graphic]\haalbuffer[result]\vskip6pt
-%D    \def\RedGreenBlue{.6,.4,.1}\haalbuffer[graphic]\haalbuffer[result]}
+%D   {\def\RedGreenBlue{.1,.4,.6}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.1,.6,.4}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.4,.1,.6}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.4,.6,.1}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.6,.1,.4}\getbuffer[graphic]\getbuffer[result]\vskip6pt
+%D    \def\RedGreenBlue{.6,.4,.1}\getbuffer[graphic]\getbuffer[result]}
 %D \stopbuffer
 %D
 %D \typebuffer
-%D \haalbuffer
+%D \getbuffer
 %D
 %D By the way, when the \POSTSCRIPT\ file resulting from
 %D this input is converted into \PDF\ and viewed in Acrobat
@@ -1591,7 +1591,7 @@
 %D
 %D Some experimental macros:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPdrawing
 %D \stopMPdrawing
 %D \pushMPdrawing
@@ -1600,7 +1600,7 @@
 %D \ifMPdrawingdone
 %D \getMPdrawing
 %D \MPdivten[number]
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are used in \PPCHTEX.
 
@@ -1673,17 +1673,17 @@
 %D We can use \METAPOST\ to calculate arbitrary clipping
 %D paths. Such a path is defined by (for instance):
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPclip{window}
 %D    clip currentpicture to fullcircle xscaled \width yscaled \height ;
 %D \stopMPclip
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such a path can be extracted (processed) by:
 %D
-%D \starttypen
+%D \starttyping
 %D \grabMPclippath{window}{method}{width}{height}{default path}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Currently only method 1 makes sense; it produces \PDF\
 %D code. This macro only makes sense when hooked into a
@@ -1839,13 +1839,13 @@
 %D
 %D We can save some typing with:
 %D
-%D \starttypen
+%D \starttyping
 %D \startMPcode whatever \stopMPcode
-%D \stoptypen
+%D \stoptyping
 %D
 %D this automatically places the graphic
 
 \long\def\startMPcode#1\stopMPcode
   {\startuseMPgraphic{@@}#1\stopuseMPgraphic\useMPgraphic{@@}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-mrk.tex b/tex/context/base/supp-mrk.tex
index 6e3ad7cdd..75e06525b 100644
--- a/tex/context/base/supp-mrk.tex
+++ b/tex/context/base/supp-mrk.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-mrk,
+%D   [       filefile=supp-mrk,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Marks,
@@ -55,13 +55,13 @@
 
 %D We start with the presetting the interface macros.
 %D
-%D \starttabulatie[|||]
+%D \starttabulate[|||]
 %D \NC \type{\getmarks}          \NC sets the marks to their values \NC \NR
 %D \NC \type{\getallmarks}       \NC sets all marks to their values \NC \NR
 %D \NC \type{\getsplitmarks}     \NC sets the splitmarks to their values\NC \NR
 %D \NC \type{\getallsplitmarks}  \NC sets all splitmarks to their values\NC \NR
 %D \NC \type{\setmarks}          \NC synchronizes topmarks (\ETEX) \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Later we will overload these, dependent of the brand of
 %D \TEX\ that we use.
@@ -90,46 +90,46 @@
 %D other \type {\new} macros in \PLAIN\ \TEX. A mark is
 %D defined by:
 %D
-%D \starttypen
+%D \starttyping
 %D \newmark\name
-%D \stoptypen
+%D \stoptyping
 %D
 %D and can be called upon with:
 %D
-%D \starttypen
+%D \starttyping
 %D \gettopmark  \name  % or \topname
 %D \getbotmark  \name  % or \botname
 %D \getfirstmark\name  % or \firstname
-%D \stoptypen
+%D \stoptyping
 %D
 %D The only drawback of his approach is that the marks must be
 %D preloaded in the output routine. This is accomplished by
 %D means of:
 %D
-%D \starttypen
+%D \starttyping
 %D \getmarks\name
-%D \stoptypen
+%D \stoptyping
 %D
 %D The macros presented here are in most aspects copies of
 %D those presented by Jim Fox. We've taken the freedom to
 %D change a few things for more or less obvious reasons:
 %D
-%D \startopsomming
-%D \som  Because the original macros look quite complicated,
+%D \startitemize
+%D \item  Because the original macros look quite complicated,
 %D       which is mainly due to extensive use of
 %D       \type{\expandafter}'s and \type{\csname}'s, we changed
 %D       those in favor of \type{\getvalue}.
-%D \som  To be more in line with the rest of \CONTEXT, we've
+%D \item  To be more in line with the rest of \CONTEXT, we've
 %D       changed some of the names of macros.
-%D \som  Because we are already short on \COUNTERS\ we use
+%D \item  Because we are already short on \COUNTERS\ we use
 %D       macros when possible.
-%D \som  We maintain a list of defined marks and use one
+%D \item  We maintain a list of defined marks and use one
 %D       call for getting them all at once.
-%D \som  We have extended the mechanism to splitmarks (not
+%D \item  We have extended the mechanism to splitmarks (not
 %D       perfected yet).
-%D \som  We've introduced optional expansion of the contents
+%D \item  We've introduced optional expansion of the contents
 %D       of marks.
-%D \stopopsomming
+%D \stopitemize
 %D
 %D Whatever changes we've made, the credits still go to Jim,
 %D whatever goes wrong is due to me. The method is described
@@ -139,17 +139,17 @@
 %D be defined at will and a number concerning the position at
 %D which it was defined.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\somelist{... \domark5{this} ... \domark31{that} ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The original \type{\mark} keeps track of the number and
 %D \type{\topmark} and \type{\botmark} are used to extract the
 %D actual marks from the list. The counting is done by
 %D
-%D \starttypen
+%D \starttyping
 %D \currentmarker
-%D \stoptypen
+%D \stoptyping
 %D
 %D In \CONTEXT\ we use the mark mechanism to keep track of
 %D colors. In a complicated documents with many colors per
@@ -163,11 +163,11 @@
 %D have been substituted by macros, one has been replaced by
 %D our scratch counter.
 %D
-%D \starttypen
+%D \starttyping
 %D \newcount\topmarker
 %D \newcount\botmarker
 %D \newcount\foundmarker
-%D \stoptypen
+%D \stoptyping
 %D
 %D We've also introduced some constants, one for the lists and
 %D three for composing the mark commands.
@@ -246,9 +246,9 @@
 %D list is done by \type{\addmarker}. This is an internal
 %D command, the user set a marks bij calling it's name:
 %D
-%D \starttypen
+%D \starttyping
 %D \setmark\mymark{some text} % or \mymark{some text}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Where \type{\mymark} is previously defined by
 %D \type{\newmark}.
@@ -476,10 +476,10 @@
 
 %D In \type {page-ini} or \type {core-mar} we should say:
 %D
-%D \starttypen
+%D \starttyping
 %D \appendtoks \getallmarks \to \everybeforepagebody
 %D \appendtoks \setallmarks \to \everyafterpagebody
-%D \stoptypen
+%D \stoptyping
 
 \let\getcurrentmark     \thecurrentmarks
 \let\gettopmark         \checkedtopmarks
@@ -529,9 +529,9 @@
 %D Here a node is inserted, which can interfere badly. In
 %D fact, a real \type {\clearmarks\name} is needed.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\resetmark#1{\marks#1{}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A possible macro solution is presented here. When discussing
 %D \type {\clearmarks} on the \ETEX\ discussion list, Chris
@@ -552,7 +552,7 @@
 %D \ruledhbox{\unhbox0}
 %D \stopbuffer
 %D
-%D \typebuffer\blanko\haalbuffer\blanko
+%D \typebuffer\blank\getbuffer\blank
 %D
 %D \startbuffer
 %D \setbox0=\vbox{test\normalmark{}}
@@ -560,7 +560,7 @@
 %D \ruledhbox{\unhbox0}
 %D \stopbuffer
 %D
-%D \typebuffer\blanko\haalbuffer\blanko
+%D \typebuffer\blank\getbuffer\blank
 %D
 %D \startbuffer
 %D \setbox0=\vbox{test\hbox{\normalmark{}}}
@@ -568,7 +568,7 @@
 %D \ruledhbox{\unhbox0}
 %D \stopbuffer
 %D
-%D \typebuffer\blanko\haalbuffer\blanko
+%D \typebuffer\blank\getbuffer\blank
 %D
 %D \startbuffer
 %D \setbox0=\vbox{test\vbox{\normalmark{}}}
@@ -576,7 +576,7 @@
 %D \ruledhbox{\unhbox0}
 %D \stopbuffer
 %D
-%D \typebuffer\blanko\haalbuffer\blanko
+%D \typebuffer\blank\getbuffer\blank
 
 %D One final advice. Use marks with care. When used in globally
 %D assigned boxes, the list can grow quite big, and processing
@@ -611,4 +611,4 @@
 
 \endETEX
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-num.tex b/tex/context/base/supp-num.tex
index 73ba3311b..b0de1d507 100644
--- a/tex/context/base/supp-num.tex
+++ b/tex/context/base/supp-num.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-num,
+%D   [       filefile=supp-num,
 %D        version=1998.05.15,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Number (Digit) Handling,
@@ -21,15 +21,15 @@
 %D Depending on the digit mode the command \type {\digits}
 %D normalizes number patterns depending on the language set.
 %D
-%D \starttypen
+%D \starttyping
 %D This will never be a \digits{1.000.000} seller.
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D I will never grow longer than \digits 1.86 \Meter.
-%D \stoptypen
+%D \stoptyping
 %D
 %D The different modes are shown in:
 %D
@@ -46,9 +46,9 @@
 %D
 %D This is typset as:
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 %D
 %D The sign can be typeset as is or within the space of a
 %D digit.
@@ -64,9 +64,9 @@
 %D
 %D This is typset as:
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 
 \chardef\digitoutputmode=1 % 0..6
 \chardef\digitsignmode  =0 % 0..3
@@ -76,14 +76,14 @@
 
 %D The digit modes are:
 %D
-%D \startopsomming[opelkaar]
-%D \som periods      \& comma
-%D \som commas       \& period
-%D \som thinmuskips  \& comma
-%D \som thinmuskips  \& period
-%D \som thickmuskips \& comma
-%D \som thickmuskips \& period
-%D \stopopsomming
+%D \startitemize[packed]
+%D \item periods      \& comma
+%D \item commas       \& period
+%D \item thinmuskips  \& comma
+%D \item thinmuskips  \& period
+%D \item thickmuskips \& comma
+%D \item thickmuskips \& period
+%D \stopitemize
 
 \let\collecteddigits \empty \chardef\digitinputmode =1
 \let\saveddigits     \empty \chardef\skipdigit      =0
@@ -117,10 +117,10 @@
 %D we need to do an indirect test (see \type {verb-ini.tex})
 %D for details.
 %D
-%D \starttypen
+%D \starttyping
 %D \def           ^^M{\obeyedline}
 %D \def\nextbeyedline{\obeyedline}
-%D \stoptypen
+%D \stoptyping
 
 \ifx\normalmathshift\undefined \let\normalmathshift=$ \fi
 
@@ -323,7 +323,7 @@
 %D well as different formats. We strongly suggest you to use
 %D the grouped call.
 %D
-%D \starttabulatie[|l|l|l|]
+%D \starttabulate[|l|l|l|]
 %D \NC \type{.} \NC , . \NC comma or period \NC \NR
 %D \NC \type{,} \NC , . \NC comma or period \NC \NR
 %D \NC \type{@} \NC \NC invisible space \NC \NR
@@ -336,7 +336,7 @@
 %D \NC \type{m} \NC $\negative$ \NC high minus sign \NC \NR
 %D \NC \type{n} \NC $\negative$ \NC high minus (negative) sign \NC \NR
 %D \NC \type{=} \NC $\zeroamount$ \NC zero padding \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D These triggers are used in the following examples.
 %D
@@ -368,9 +368,9 @@
 %D
 %D \typebuffer
 %D
-%D \startregels
-%D \haalbuffer
-%D \stopregels
+%D \startlines
+%D \getbuffer
+%D \stoplines
 
 %D \macros
 %D   {Digits}
@@ -382,22 +382,22 @@
 %D These macros are complicated by the fact that we also
 %D have to support cases like:
 %D
-%D \starttypen
+%D \starttyping
 %D {\digits1234}
 %D \digits{1234}
 %D \digits 1234\whatever
 %D $\digits 123.222,00$
 %D \digits 123.222,00.
-%D \stoptypen
+%D \stoptyping
 %D
 %D The latter case shows us that trailing non digits are to
 %D be passed untreated.
 %D
 %D Another interesting case is:
 %D
-%D \starttypen
+%D \starttyping
 %D \digits 123.222,00^10
-%D \stoptypen
+%D \stoptyping
 %D
 %D The separator is defined as:
 
@@ -410,9 +410,9 @@
 %D Users can specify the way they enter those digits by saying
 %D something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \digittemplate 12.000.000,00 % \digittemplate .,
-%D \stoptypen
+%D \stoptyping
 
 \def\digittemplate #1 %
   {\chardef\digitinputmode\zerocount
diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex
index 718963cd2..3864ab747 100644
--- a/tex/context/base/supp-pdf.tex
+++ b/tex/context/base/supp-pdf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-pdf,
+%D   [       filefile=supp-pdf,
 %D        version=2004.03.26,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=\METAPOST\ to \PDF\ conversion,
@@ -77,10 +77,10 @@
 %D natural to the form embedding. This enables alternative
 %D images to be embedded.
 %D
-%D \starttypen
+%D \starttyping
 %D \pdfimage  <optional dimensions> {file}
 %D \pdfimages <optional dimensions> {high res file} {low res file}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first one replaces the pre||version||14 original,
 %D while the latter provides alternative images.
@@ -89,9 +89,9 @@
 %D needed to paste prepared \PDF\ pages into conference
 %D proceedings.
 %D
-%D \starttypen
+%D \starttyping
 %D \pdfclippedimage <optional dimensions> {file} {l} {r} {t} {b}
-%D \stoptypen
+%D \stoptyping
 
 % \ifx\pdftexversion\undefined % no \m!systems for the sake of latex
 %   \writestatus{systems}{Why not use pdf(e)TeX binaries?}
@@ -145,13 +145,13 @@
 %D If you want to save a few hash entries, you may prefer the
 %D less readable alternatives, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\pdfimage#1#% This one is less readable but needs no additional
 %D   {\bgroup      % hash entry for the second stage macro.
 %D    \def\pdfimage##1%
 %D      {\immediate\pdfximage##1{#2}%
 %D       \pdfrefximage\pdflastximage\egroup}}
-%D \stoptypen
+%D \stoptyping
 
 %D For old times sake we provide a few aliases. These will be
 %D removed some day.
@@ -178,21 +178,21 @@
 %D work. Interpreting their specifications is beyond the
 %D current implementation.
 %D
-%D \starttypen
+%D \starttyping
 %D \convertPDFtoPDF
 %D   {filename}
 %D   {x scale} {y scale}
 %D   {x offset } {y offset}
 %D   {width} {height}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When the scales are set to~1, the last last four values
 %D are the same as the bounding box, e.g.
 %D
-%D \starttypen
+%D \starttyping
 %D \convertPDFtoPDF{mp-pra-1.pdf} {1} {1}{-1bp}{-1bp}{398bp}{398bp}
 %D \convertPDFtoPDF{mp-pra-1.pdf}{.5}{.5} {0bp} {0bp}{199bp}{199bp}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Keep in mind, that this kind of copying only works for
 %D pure and valid pdf code (without fonts).
@@ -210,9 +210,9 @@
 %D specifies the dimensions and offsets of the graphic. When
 %D we say:
 %D
-%D \starttypen
+%D \starttyping
 %D \PDFmediaboxpreferedtrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D the mediabox present in the file superseded the user
 %D specified, already scaled and calculated offset and
@@ -281,7 +281,7 @@
 %D one transform call (\type{cm}). This saves some additional
 %D scaling.
 
-%D \starttypen
+%D \starttyping
 %D \def\startPDFtoPDF%
 %D   {\setbox0=\vbox\bgroup
 %D      \message{[PDF to PDF \PDFfilename}%
@@ -329,11 +329,11 @@
 %D The next macro can be used to find the mediabox of a \PDF\
 %D illustration.
 %D
-%D \starttypen
+%D \starttyping
 %D \dogetPDFmediabox
 %D   {filename}
 %D   {new dimen}{new dimen}{new dimen}{new dimen}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Beware of dimen clashes: this macro uses the 5~default
 %D scratch registers! When no file or mediabox is found, the
@@ -439,7 +439,7 @@
 
 %D By the way, the \type {setcmykcolor} operator is not
 %D output by \METAPOST\ but can result from converting the
-%D \kap{RGB} color specifications, as implemented in
+%D \cap{RGB} color specifications, as implemented in
 %D \type{supp-mps}.
 
 %D In \POSTSCRIPT\ arguments precede the operators. Due to the
@@ -451,23 +451,23 @@
 %D (optional) postprocessing. Values are pushed onto the stack
 %D by:
 %D
-%D \starttypen
+%D \starttyping
 %D \setMPargument {value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D They can be retrieved by the short named macros:
 %D
-%D \starttypen
+%D \starttyping
 %D \gMPa {number}
 %D \gMPs {number}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When scanning a path specification, we also save the
 %D operator, using
 %D
-%D \starttypen
+%D \starttyping
 %D \setMPkeyword {n}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The path drawing operators are coded for speed: \type{clip},
 %D \type{stroke}, \type{fill} and \type{fillstroke} become
@@ -476,9 +476,9 @@
 %D When processing the path this code can be retrieved
 %D using
 %D
-%D \starttypen
+%D \starttyping
 %D \getMPkeyword % {n}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When setting an argument, the exact position on the stack
 %D depends on the current value of the \COUNTERS\
@@ -490,9 +490,9 @@
 %D These variables hold the coordinates. The argument part of
 %D the stack is reset by:
 %D
-%D \starttypen
+%D \starttyping
 %D \resetMPstack
-%D \stoptypen
+%D \stoptyping
 %D
 %D We use the prefix \type{@@MP} to keep the stack from
 %D conflicting with existing macros. To speed up things a bit
@@ -627,9 +627,9 @@
 
 %D In earlier versions we used the sequence
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\handleMPsequence\input filename\relax
-%D \stoptypen
+%D \stoptyping
 %D
 %D Persistent problems in \LATEX\ however forced us to use a
 %D different scheme. Every \POSTSCRIPT\ file starts with a
@@ -800,11 +800,11 @@
 %D We check for three kind of bounding boxes: the normal one
 %D and two high precision ones:
 %D
-%D \starttypen
+%D \starttyping
 %D BoundingBox: llx lly ucx ucy
 %D HiResBoundingBox: llx lly ucx ucy
 %D ExactBoundingBox: llx lly ucx ucy
-%D \stoptypen
+%D \stoptyping
 %D
 %D The original as well as the recalculated dimensions are
 %D saved for later use.
@@ -971,7 +971,7 @@
 %D However, the following implementation is more robust, since
 %D some fonts have funny visible spaces in the space slot. This
 %D gives a mismatch between the space that \METAPOST\ took into
-%D account and the \citeer {natural} space. This only happens in
+%D account and the \quote {natural} space. This only happens in
 %D labels, since \type {btex}||\type {etex} thingies don't have
 %D spaces. This phenomena showed up when preparing the
 %D \METAFUN\ manual, where Palatino fonts are used. We can
@@ -1010,11 +1010,11 @@
 %D two alternatives, that result in a similar look in both
 %D $x$- and $y$-dorection. As John Hobby says:
 %D
-%D \startsmaller \switchtobodyfont[ss]
-%D \starttypen
+%D \startnarrower \switchtobodyfont[ss]
+%D \starttyping
 %D x 0 dtransform exch truncate exch idtransform pop setlinewidth
 %D 0 y dtransform truncate idtransform setlinewidth pop
-%D \stoptypen
+%D \stoptyping
 %D
 %D These are just fancy versions of \type{x setlinewidth} and
 %D \type{y setlinewidth}. The \type{x 0 ...} form is used if
@@ -1028,7 +1028,7 @@
 %D conversion rules cause a horizontal or vertical line of
 %D integer width $n$ in device space to come out $n+1$ pixels
 %D wide, regardless of the phase relative to the pixel grid.)
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D The common operator in these sequences is \type{dtransform},
 %D so we can use this one to trigger setting the linewidth.
@@ -1061,13 +1061,13 @@
 
 %D In \METAPOST\ there are three ways to handle a path $p$:
 %D
-%D \starttypen
+%D \starttyping
 %D draw p;  fill p;  filldraw p;
-%D \stoptypen
+%D \stoptyping
 %D
 %D The last case outputs a \type{gsave fill grestore} before
 %D \type{stroke}. Handling the path outside the main loops
-%D saves about 40\% run time.\voetnoot{We can save some more by
+%D saves about 40\% run time.\footnote{We can save some more by
 %D following the \METAPOST\ output routine, but for the moment
 %D we keep things simple.} Switching between the main loop and
 %D the path loop is done by means of the recursely called
@@ -1164,9 +1164,9 @@
 %D I rewrote and optimized the original macro to suit the other
 %D macros in this module.
 %D
-%D \starttypen
+%D \starttyping
 %D \doMPconcat {x position} \xresult {y position} \yresult
-%D \stoptypen
+%D \stoptyping
 %D
 %D By setting the auxiliary \DIMENSIONS\ \type{\dimen0} upto
 %D \type{\dimen10} only once per path, we save over 20\% run
@@ -1220,7 +1220,7 @@
   {\dimen 8=\zeropoint                    % t_x
    \dimen10=\zeropoint}                   % t_y
 
-%D \starttypen
+%D \starttyping
 %D \def\doMPconcat#1#2#3#4%
 %D   {\dimen12=#1 pt \doMPreducedimen12 % p_x
 %D    \dimen14=#3 pt \doMPreducedimen14 % p_y
@@ -1259,12 +1259,12 @@
 %D    %
 %D    \edef#2{\withoutpt\the\dimen18}% % p_x^\prime
 %D    \edef#4{\withoutpt\the\dimen12}} % p_y^\prime
-%D \stoptypen
+%D \stoptyping
 
 %D The following optimization resulted from some tests by
 %D and email exchanges with Sanjoy Mahajan.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doMPconcat#1#2#3#4%
 %D   {\dimen12=#1 pt \doMPreducedimen12 % p_x
 %D    \dimen14=#3 pt \doMPreducedimen14 % p_y
@@ -1311,7 +1311,7 @@
 %D    %
 %D    \edef#2{\withoutpt\the\dimen18}% % p_x^\prime
 %D    \edef#4{\withoutpt\the\dimen12}} % p_y^\prime
-%D \stoptypen
+%D \stoptyping
 %D
 %D But, this one is still too inaccurate, so we now have:
 
@@ -1474,7 +1474,7 @@
 %D \METAPOST\ to \PDF\ conversion however only needs
 %D transformation.
 
-%M \start \switchnaarkorps [ss]
+%M \start \switchtobodyfont [ss]
 
 %D Given a point $(U_x, U_y)$ in user coordinates, the business
 %D of \POSTSCRIPT\ is to convert it to device space. Let us say
@@ -1482,37 +1482,37 @@
 %D \POSTSCRIPT\ $(D_x, D_y)$ can be written in terms of
 %D $(U_x, U_y)$ in matrix notation, either as
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D   \pmatrix{D_x&D_y&1\cr} = \pmatrix{U_x&U_y&1\cr}
 %D                            \pmatrix{s_x&r_x&0\cr
 %D                                     r_y&s_y&0\cr
 %D                                     t_x&t_y&1\cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D or
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D    \pmatrix{D_x\cr D_y\cr 1} = \pmatrix{s_x&r_y&t_x\cr
 %D                                         r_x&s_y&t_y\cr
 %D                                         0  &0  &1  \cr}
 %D                                \pmatrix{U_x\cr
 %D                                         U_y\cr
 %D                                         1  \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D both of which is a shorthand for the same set of equations:
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D      D_x = s_x U_x + r_y U_y + t_x
-%D   \stopformule
+%D   \stopformula
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D      D_y = r_x U_x + s_y U_y + t_y
-%D   \stopformule
+%D   \stopformula
 %D
 %D which define what is called an `affine transformation'.
 %D
@@ -1529,7 +1529,7 @@
 %D $[s_x\, r_x\, r_y\, s_y\, t_x\, t_y]$ and you say \typ{[a b
 %D c d e f] concat}, this means:
 %D
-%D \startsmaller
+%D \startnarrower
 %D Take the user space coordinates and transform them to an
 %D intermediate set of coordinates using array $[a\, b\, c\, d\,
 %D e\, f]$ as the transformation matrix.
@@ -1537,29 +1537,29 @@
 %D Take the intermediate set of coordinates and change them to
 %D device coordinates using array $[s_x\, r_x\, r_y\, s_y\, t_x\, t_y]$
 %D as the transformation matrix.
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D Well, what is the net effect? In matrix notation, it is
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     \pmatrix{I_x\cr I_y\cr 1\cr} = \pmatrix{a&c&e\cr
 %D                                             b&d&f\cr
 %D                                             0&0&1\cr}
 %D                                    \pmatrix{U_x\cr
 %D                                             U_y\cr
 %D                                             1  \cr}
-%D   \stopformule
+%D   \stopformula
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     \pmatrix{D_y\cr D_y\cr 1\cr} = \pmatrix{s_x&r_y&t_x\cr
 %D                                             r_x&s_y&t_y\cr
 %D                                             0  &0  &1  \cr}
 %D                                    \pmatrix{I_x\cr
 %D                                             I_y\cr
 %D                                             1  \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D where $(I_x, I_y)$ is the intermediate coordinate.
 %D
@@ -1567,26 +1567,26 @@
 %D a chain of such matrix equations, one can always compose
 %D them into one matrix equation using the standard matrix
 %D composition law. The composite matrix from two matrices can
-%D be derived very easily: the element in the $i$\hoog{th}
-%D horizontal row and $j$\hoog{th} vertical column is
-%D calculated by`multiplying' the $i$\hoog{th} row of the first
-%D matrix and the $j$\hoog{th} column of the second matrix (and
+%D be derived very easily: the element in the $i$\high{th}
+%D horizontal row and $j$\high{th} vertical column is
+%D calculated by`multiplying' the $i$\high{th} row of the first
+%D matrix and the $j$\high{th} column of the second matrix (and
 %D summing over the elements). Thus, in the above:
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D   \pmatrix{D_x\cr D_y\cr 1} = \pmatrix{s_x^\prime&r_y^\prime&t_x^\prime\cr
 %D                                        r_x^\prime&s_y^\prime&t_y^\prime\cr
 %D                                        0         &0         &0        \cr}
 %D                               \pmatrix{U_x\cr
 %D                                        U_y\cr
 %D                                        1  \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D with
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D      \eqalign
 %D        {s_x^\prime & = s_x a + r_y b       \cr
 %D         r_x^\prime & = r_x a + s_y b       \cr
@@ -1594,7 +1594,7 @@
 %D         s_y^\prime & = r_x c + s_y d       \cr
 %D         t_x^\prime & = s_x e + r_y f + t_x \cr
 %D         t_y^\prime & = r_x e + s_y f + t_y \cr}
-%D   \stopformule
+%D   \stopformula
 
 %D In fact, the same rule is true not only when one is going
 %D from user coordinates to device coordinates, but whenever
@@ -1619,23 +1619,23 @@
 %D acts on $(P_x^\prime, P_y^\prime)$, they produce $(P_x,
 %D P_y)$. That is we need to solve the set of equations:
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     \pmatrix{P_x\cr P_y\cr 1\cr} = \pmatrix{s_x&r_y&t_x\cr
 %D                                             r_x&s_y&t_y\cr
 %D                                             0  &0  &1  \cr}
 %D                                    \pmatrix{P_x^\prime\cr
 %D                                             P_y^\prime\cr
 %D                                             1         \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D Again matrix notation comes in handy (i.e. someone has
 %D already solved the problem for us): we need the inverse
 %D transformation matrix. The inverse transformation matrix can
 %D be calculated very easily:
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     \pmatrix{P_x^\prime\cr P_y^\prime\cr 1\cr} =
 %D        \pmatrix{s_x^\prime&r_y^\prime&t_x^\prime\cr
 %D                 r_x^\prime&s_y^\prime&t_y^\prime\cr
@@ -1643,12 +1643,12 @@
 %D        \pmatrix{P_x\cr
 %D                 P_y\cr
 %D                 1         \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D where, the inverse transformation matrix is given by
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     \eqalign
 %D       {D          & = s_x s_y - r_x r_y           \cr
 %D        s_x^\prime & = s_y / D                     \cr
@@ -1657,22 +1657,22 @@
 %D        r_y^\prime & = - r_y / D                   \cr
 %D        t_x^\prime & = ( - s_y t_x + r_y t_y ) / D \cr
 %D        t_y^\prime & = (   r_x t_x - s_x t_y ) / D \cr}
-%D   \stopformule
+%D   \stopformula
 %D
 %D And you can see that when expanded out, this does
 %D give the formulas:
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     P_x^\prime = { { s_y(p_x-t_x) + r_y(t_y-p_y) } \over
 %D                    { s_x s_y-r_x r_y } }
-%D   \stopformule
+%D   \stopformula
 %D
-%D \plaatsformule
-%D   \startformule
+%D \placeformula
+%D   \startformula
 %D     P_y^\prime = { { s_x(p_y-t_y) + r_x(t_x-p_x) } \over
 %D                    { s_x*s_y-r_x*r_y } }
-%D   \stopformule
+%D   \stopformula
 %D
 %D The code works by representing a real number by converting
 %D it to a dimension to be put into a \DIMENSION\ register: 2.3 would
@@ -1722,10 +1722,10 @@
 %D between, is hard to determine, so we add an additional
 %D check.
 %D
-%D \starttypen
+%D \starttyping
 %D clip currentpicture to origin -- cycle ;
 %D setbounds currentpicture to fullsquare scaled 5cm ;
-%D \stoptypen
+%D \stoptyping
 
 \def\checkMPpath
   {\ifcase\finiMPpath
@@ -1804,17 +1804,17 @@
 
 %D The main conversion command is:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertMPtoPDF {filename} {x scale} {y scale}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The dimensions are derived from the bounding box. So we
 %D only have to say:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertMPtoPDF{mp-pra-1.eps}{1}{1}
 %D \convertMPtoPDF{mp-pra-1.eps}{.5}{.5}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {makeMPintoPDFobject,lastPDFMPobject}
@@ -1827,11 +1827,11 @@
 %D This option defaults to~0, because \CONTEXT\ takes care
 %D of objects at another level, which saves some bytes.
 %D
-%D \starttabulatie[|l|l|p|]
+%D \starttabulate[|l|l|p|]
 %D \NC 0 \NC never    \NC don't use an object    \NC\NR
 %D \NC 1 \NC always   \NC always use an object   \NC\NR
 %D \NC 2 \NC optional \NC use object when needed \NC\NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The last object number used is avaliable in the macro
 %D \type {\lastPDFMPobject}.
@@ -2026,9 +2026,9 @@
 %D We can limit the precision to two digits after the comma
 %D by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \twodigitMPoutput
-%D \stoptypen
+%D \stoptyping
 %D
 %D This option only works in \CONTEXT\ combined with \ETEX.
 
@@ -2047,4 +2047,4 @@
 
 \ifx\undefined\StopLatexHack \else \StopLatexHack \fi
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/supp-ran.tex b/tex/context/base/supp-ran.tex
index 7e55988f0..90741ef2f 100644
--- a/tex/context/base/supp-ran.tex
+++ b/tex/context/base/supp-ran.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-ran,
+%D   [       filefile=supp-ran,
 %D        version=1998.01.21,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Random Number Generation,
@@ -23,12 +23,12 @@
 %D redefine some \TEX\ primitives. We also use different names
 %D for the two generators and add an extra one.
 %D
-%D \starttypen
+%D \starttyping
 %D \getrandomcount  \countregister {minimum} {maximum}
 %D \getrandomdimen  \dimenregister {minimum} {maximum}
 %D \getrandomnumber \macroname     {minimum} {maximum}
 %D \getrandomfloat  \macroname     {minimum} {maximum}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Of course the file \type{random.tex} needs to be present.
 %D To prevent name clashes, the \CONTEXT\ distribution
@@ -36,15 +36,15 @@
 %D
 %D The randomseed can be set by:
 %D
-%D \starttypen
+%D \starttyping
 %d \setrandomseed{number>0}
-%D \stoptypen
+%D \stoptyping
 %D
 %D and get by:
 %D
-%D \starttypen
+%D \starttyping
 %D \getrandomseed\randomseed
-%D \stoptypen
+%D \stoptyping
 
 \ifx\nextrandom\undefined
 
diff --git a/tex/context/base/supp-spe.tex b/tex/context/base/supp-spe.tex
index a03eb4ba2..6909082d4 100644
--- a/tex/context/base/supp-spe.tex
+++ b/tex/context/base/supp-spe.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-spe,
+%D   [       filefile=supp-spe,
 %D        version=1997.07.05,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Specials,
@@ -25,17 +25,17 @@
 %D When interpreting specials we need to do some basic scanning.
 %D For the moment we distinguish between three cases. We need 
 %D 
-%D \starttypen
+%D \starttyping
 %D \special{tag: arguments}
 %D \special{tag arguments}
 %D \special{tag}
-%D \stoptypen
+%D \stoptyping
 %D 
 %D We cannot be sure that the first case isn't 
 %D 
-%D \starttypen
+%D \starttyping
 %D \special{tag:arguments}
-%D \stoptypen
+%D \stoptyping
 %D 
 %D So we have to take care of that one too. 
 
@@ -72,9 +72,9 @@
 %D
 %D Mimmicking specials is activated by saying: 
 %D
-%D \starttypen
+%D \starttyping
 %D \mimmickspecials
-%D \stoptypen
+%D \stoptyping
 %D
 %D This commands redefines the \PLAIN\ \TEX\ primitive 
 %D \type{\special}. 
@@ -126,10 +126,10 @@
 %D 
 %D Which results in:
 %D 
-%D \startregels
-%D \haalbuffer[tmp-1]
-%D \haalbuffer[tmp-2]
-%D \stopregels
+%D \startlines
+%D \getbuffer[tmp-1]
+%D \getbuffer[tmp-2]
+%D \stoplines
 
 %D \macros
 %D   {mimmickspecial}
@@ -137,9 +137,9 @@
 %D When needed, one can call a mimmicked special directly by 
 %D saying for instance: 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \mimmickspecial a: \using...\endspecial
-%D \stoptypen
+%D \stoptyping
 %D
 %D This can be handy when specials have much in common.
 
@@ -152,9 +152,9 @@
 %D One can for instance ignore all further specials by saying
 %D \type{\normalspecial}:
 %D 
-%D \starttypen
+%D \starttyping
 %D \def\defaultspecial#1{}
-%D \stoptypen
+%D \stoptyping
 %D 
 %D But here we default to idle. 
 
diff --git a/tex/context/base/supp-tpi.tex b/tex/context/base/supp-tpi.tex
index c01d1fef5..16eac08b1 100644
--- a/tex/context/base/supp-tpi.tex
+++ b/tex/context/base/supp-tpi.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-tpi,
+%D   [       filefile=supp-tpi,
 %D        version=1997.07.05,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=\TPIC\ Conversion,
@@ -46,9 +46,9 @@
 %D offers some rather discutable, but nevertheless handy
 %D feature:
 %D
-%D \starttypen
+%D \starttyping
 %D \write18{execute program with arguments}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Knowing this, I immediatelly decided to throw away the old
 %D conversion macros and use the marvelous \METAPOST, \TEX\
@@ -66,8 +66,8 @@
 %D because we don't know in advance what actions to apply on
 %D it.
 %D
-%D \plaatstabel[hier][tab:TPIC specials]{The \TPIC\ special syntax.}
-%D \starttabel[|||l|]
+%D \placetable[here][tab:TPIC specials]{The \TPIC\ special syntax.}
+%D \starttable[|||l|]
 %D \HL
 %D \NC \bf tag \NC \bf arguments               \NC \bf meaning        \NC\SR
 %D \HL
@@ -82,7 +82,7 @@
 %D \NC ia      \NC $x$ $y$ $r_x$ $r_y$ $b$ $e$ \NC fill (partial) arc \NC\MR
 %D \NC sh      \NC $s$                         \NC fill next path     \NC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 
 %D The first problem we have to take care of is the fact that
 %D there is no decent begin or end of the drawing process
@@ -91,16 +91,16 @@
 %D simply because else this is the most common used way to
 %D treat something \TEX\ as as a whole, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \hbox{\special{}\special{}...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We just start a picture as soon as the first special is
 %D encountered, so this becomes:
 %D
-%D \starttypen
+%D \starttyping
 %D \hbox{\openpicture\newspecial{}\newspecial{}...
-%D \stoptypen
+%D \stoptyping
 
 %D The first step in opening the picture is to start a group.
 %D Now we can savely use the egroup that closes the box to also
@@ -325,14 +325,14 @@
 %D then most \DVI\ drivers do using the \TPIC\ prescribed
 %D b-splines. Take for instance the sequence:
 %D
-%D \starttypen
+%D \starttyping
 %D \special{pa 2000 1000}
 %D \special{pa 1000 2000}
 %D \special{pa 0000 1000}
 %D \special{pa 1000 0000}
 %D \special{pa 2000 1000}
 %D \special{sp}
-%D \stoptypen
+%D \stoptyping
 %D
 %D One would expect that this code produced a closed circle,
 %D but the curve that comes out using b-splines is far from
diff --git a/tex/context/base/supp-vis.tex b/tex/context/base/supp-vis.tex
index a3545bfc5..521bffa5b 100644
--- a/tex/context/base/supp-vis.tex
+++ b/tex/context/base/supp-vis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-vis,
+%D   [       filefile=supp-vis,
 %D        version=1996.10.21,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=Visualization,
@@ -12,9 +12,9 @@
 %C details.
 
 %D \gdef\ShowBufferedExample% private typeseting macro
-%D   {\startregelcorrectie
+%D   {\startlinecorrection
 %D    \bgroup
-%D    \steltypenin[marge=0pt,optie=kleur]
+%D    \setuptyping[margin=0pt,option=color]
 %D    \showmakeup
 %D    \centeredvcuetrue
 %D    \dontinterfere
@@ -23,15 +23,15 @@
 %D      {\normalhbox to \hsize
 %D         {$\hsize=.5\hsize
 %D          \advance\hsize by -.5em
-%D          \normalvcenter{\vbox{\haalbuffer}}\normalhss
+%D          \normalvcenter{\vbox{\getbuffer}}\normalhss
 %D          \normalvcenter{\vbox{\dontshowcomposition\typebuffer}}$}}
 %D    \egroup
-%D    \stopregelcorrectie}
+%D    \stoplinecorrection}
 %D
 %D \gdef\ShowBufferedExampleBox% private typeseting macro
-%D   {\startregelcorrectie
+%D   {\startlinecorrection
 %D    \bgroup
-%D    \steltypenin[marge=0pt,optie=kleur]
+%D    \setuptyping[margin=0pt,option=color]
 %D    \showmakeup
 %D    \centeredvcuetrue
 %D    \dontinterfere
@@ -40,10 +40,10 @@
 %D      {\normalhbox to \hsize
 %D         {$\hsize=.5\hsize
 %D          \advance\hsize by -.5em
-%D          \normalvcenter{\baselineruletrue\vbox{\haalbuffer}}\normalhss
+%D          \normalvcenter{\baselineruletrue\vbox{\getbuffer}}\normalhss
 %D          \normalvcenter{\vbox{\dontshowcomposition\typebuffer}}$}}
 %D    \egroup
-%D    \stopregelcorrectie}
+%D    \stoplinecorrection}
 
 %D Although an integral part of \CONTEXT, this module is one
 %D of the support modules. Its stand alone character permits
@@ -121,6 +121,11 @@
   {\hbadness\!!tenthousand \vbadness\hbadness
    \hfuzz   \maxdimen      \vfuzz   \hfuzz}
 
+% This obsolete dutch name is sometimes uses in manual styles; when
+% cleaning up the codebase I decided to move this definition here.
+
+\let\mindermeldingen\dontcomplain
+
 %D \macros
 %D   {normaloffinterlineskip}
 %D
@@ -257,9 +262,9 @@
 %D complicated, but it supports all three kind of boxes. The
 %D next command expects a \BOX\ specification, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \makeruledbox0
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {baselinerule,baselinefill}
@@ -268,10 +273,10 @@
 %D as a rule. The line is drawn on top of the baseline. All
 %D we have to say is:
 %D
-%D \starttypen
+%D \starttyping
 %D \baselineruletrue
 %D \baselinefilltrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D At the cost of some overhead these alternatives are
 %D implemented using \type{\if}'s:
@@ -284,12 +289,12 @@
 %D
 %D Rules can be turned on and off, but by default we have:
 %D
-%D \starttypen
+%D \starttyping
 %D \topruletrue
 %D \bottomruletrue
 %D \leftruletrue
 %D \rightruletrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we see below:
 
@@ -305,9 +310,9 @@
 %D assigning an apropriate value to the dimension used. This
 %D module defaults the width to:
 %D
-%D \starttypen
+%D \starttyping
 %D \boxrulewidth=.2pt
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although we are already low on \DIMENSIONS\ it's best to
 %D spend one here, mainly because it enables easy manipulation,
@@ -321,12 +326,12 @@
 %D \type{\vtop}'s and \type{\vbox}'es behave the way we expect
 %D them to do.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox
 %D   {\ruledhbox to 5em{\strut test\normalhss}\hskip1em
 %D    \ruledvbox{\hsize 5em\strut test \par test\strut}\hskip1em
 %D    \ruledvtop{\hsize 5em\strut test \par test\strut}}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D The \type{\cleaders} part of the macro is responsible for
 %D the visual baseline. The \type{\normalhfill} belongs to this
@@ -490,16 +495,16 @@
 %D with \type{\ruledbox} and afterwards --- when the macro
 %D satisfy the needs --- let it to \type{\relax}.
 %D
-%D \starttypen
+%D \starttyping
 %D \ruledbox\hbox{What rules do you mean?}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The macro \type{\setruledbox} can be used to directly
 %D rule a box.
 %D
-%D \starttypen
+%D \starttyping
 %D \setruledbox12=\hbox{Who's talking about rules here?}
-%D \stoptypen
+%D \stoptyping
 %D
 %D At the cost of some extra macros we can implement a
 %D variant that does not need the~\type{=}, but we stick to:
@@ -521,19 +526,19 @@
 %D variables, that tell us a bit more about the registers we
 %D use:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifflexible
 %D \ifzero
 %D \ifnegative
 %D \ifpositive
-%D \stoptypen
+%D \stoptyping
 %D
 %D These status variables are set when we call for one of the
 %D investigation macros, e.g.
 %D
-%D \starttypen
+%D \starttyping
 %D \investigateskip\scratchskip
-%D \stoptypen
+%D \stoptyping
 %D
 %D We use some dirty trick to check stretchability of \SKIPS.
 %D Users of these macros are invited to study their exact
@@ -650,9 +655,9 @@
 %D auxiliary macro, which behavior can be influenced by the
 %D boolean \type{\centeredvcue}. By saying
 %D
-%D \starttypen
+%D \starttyping
 %D \centeredvcuetrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D one turns centering on. As said, we turn it off.
 
@@ -663,17 +668,17 @@
 
 %D We could have used the more robust version
 %D
-%D \starttypen
+%D \starttyping
 %D \def\normalvcue%
 %D   {\normalhbox \ifcenteredvcue to \hsize \fi
 %D    \bgroup\bgroup\normalhss
 %D    \aftergroup\normalhss\aftergroup\egroup
 %D    \let\next=}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or the probably best one:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\normalvcue%
 %D   {\hbox \ifcenteredvcue to \hsize
 %D      \bgroup\bgroup\normalhss
@@ -682,7 +687,7 @@
 %D      \bgroup
 %D    \fi
 %D    \let\next=}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because we don't have to preserve \CATCODES\ and only use
 %D small arguments, we stick to the first alternative.
@@ -698,9 +703,9 @@
 %D As with ruled boxes, we use a \DIMENSION\ to specify the
 %D width of the ruled elements. This dimension defaults to:
 %D
-%D \starttypen
+%D \starttyping
 %D \testrulewidth=\boxrulewidth
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because we prefer whole numbers for specifying the
 %D dimensions, we often use even multiples of
@@ -713,9 +718,9 @@
 %D components of \SKIPS. At the cost of some accuracy we can
 %D make this stretch visible.
 %D
-%D \starttypen
+%D \starttyping
 %D \visiblestretchtrue
-%D \stoptypen
+%D \stoptyping
 
 \newdimen\testrulewidth  \testrulewidth=\boxrulewidth
 \newif\ifvisiblestretch  \visiblestretchfalse
@@ -766,56 +771,56 @@
 %D visualization. Watch the small dots. Fillers can be
 %D combined within reasonable margins.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\type{\hss}\ruledhss test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\type{\hfil}\ruledhfil test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\type{\hfill}\ruledhfill test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut
 %D    \type{\hfil}\type{\hfil}\ruledhfil\ruledhfil
 %D    test%
 %D    \ruledhfil\type{\hfil}}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D The negative counterparts are visualizes, but seldom
 %D become visible, apart from their boundaries.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\type{\hfilneg}\ruledhfilneg test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\type{\hfillneg}\ruledhfillneg test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D Although leaders are used for visualizing, they are
 %D visualized themselves correctly as the next example shows.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \baselinerulefalse
 %D \ruledhbox to \hsize
 %D   {\strut\cleaders\normalhbox to 2em{\normalhss$\circ$\normalhss}\ruledhfill}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D All five substitutions use the same auxiliary macro. Watch
 %D the positive first -- negative next approach.
@@ -882,7 +887,7 @@
 %D Because they act the same as their horizontal counterparts
 %D we only show a few examples.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox to \hsize
 %D   {\dontinterfere
 %D    \baselinerulefalse
@@ -902,7 +907,7 @@
 %D    \ruledvbox to 10ex
 %D      {\hsize.18\hsize
 %D       \type{\vfillneg}\ruledvfillneg last line}}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
 %D Keep in mind that \type{\vfillneg} is not part of \PLAIN\
 %D \TEX, but are mimmicked by a macro.
@@ -918,11 +923,11 @@
 %D
 %D Skips differ from kerns in two important aspects:
 %D
-%D \startopsomming[opelkaar]
-%D \som  line and pagebreaks are allowed at a skip
-%D \som  skips can have a positive and/or negative
+%D \startitemize[packed]
+%D \item  line and pagebreaks are allowed at a skip
+%D \item  skips can have a positive and/or negative
 %D       stretchcomponent
-%D \stopopsomming
+%D \stopitemize
 %D
 %D Stated a bit different: kerns are fixed skips at which no
 %D line or pagebreak can occur. Because skips have a more open
@@ -1036,20 +1041,20 @@
 %D    test}
 %D \stopbuffer
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \showmakeup
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \getbuffer
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \showmakeup
 %D \visiblestretchtrue
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \getbuffer
+%D \stoplinecorrection
 %D
-%D \startregelcorrectie
-%D \haalbuffer
-%D \stopregelcorrectie
+%D \startlinecorrection
+%D \getbuffer
+%D \stoplinecorrection
 
 %D \macros
 %D   {ruledvskip}
@@ -1351,10 +1356,10 @@
 
 %D A a bit more \TEX nice solution is:
 %D
-%D \starttypen
+%D \starttyping
 %D \unexpanded\def\ruledkern%
 %D   {\csname ruled\ifvmode v\else h\fi kern\endcsname\normalkern}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {ruledhglue,ruledvglue}
@@ -1538,7 +1543,7 @@
 %D size. The next example shows the positive and negative
 %D penalties of 0, 1, 10, 100, 1000 and 10000.
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox
 %D   {test \ruledhpenalty0
 %D    test \ruledhpenalty1
@@ -1547,11 +1552,11 @@
 %D    test \ruledhpenalty1000
 %D    test \ruledhpenalty10000
 %D    test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \blanko
+%D \blank
 %D
-%D \startregelcorrectie
+%D \startlinecorrection
 %D \hbox
 %D   {test \ruledhpenalty0
 %D    test \ruledhpenalty-1
@@ -1560,9 +1565,9 @@
 %D    test \ruledhpenalty-1000
 %D    test \ruledhpenalty-10000
 %D    test}
-%D \stopregelcorrectie
+%D \stoplinecorrection
 %D
-%D \blanko
+%D \blank
 %D
 %D This way stacked penalties of different severance can be
 %D shown in combination.
@@ -1710,10 +1715,10 @@
 %D At the cost of some more tokens, a bit more clever
 %D implementation would be:
 %D
-%D \starttypen
+%D \starttyping
 %D \unexpanded\def\ruledpenalty%
 %D   {\csname ruled\ifvmode v\else h\fi penalty\endcsname}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {showfils,dontshowfils,
@@ -1795,10 +1800,10 @@
 %D user. The first two macros only do their job when we are
 %D actually showing the composition.
 %D
-%D \starttypen
+%D \starttyping
 %D \showingcompositiontrue
 %D \showcomposition
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because the output routine can do tricky things, like
 %D multiple column typesetting and manipulation of the
@@ -1831,17 +1836,17 @@
 %D
 %D Just to make things even more easy, we have defined:
 %D
-%D \starttypen
+%D \starttyping
 %D \showmakeup
-%D \stoptypen
+%D \stoptyping
 %D
 %D For the sake of those who don't (yet) use \CONTEXT\ we
 %D preset \type{\defaulttestrulewidth} to the already set
 %D value. Otherwise we default to a bodyfontsize related value.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\defaulttestrulewidth{.2pt}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Beware, it's a macro not a \DIMENSION.
 
@@ -1865,24 +1870,19 @@
 %D table of contents and a local register.
 %D \fi \next
 
-% %D Lets end with some more advanced examples. When visualized,
-% %D the table of contents of the outer level is typeset as:
-% %D
-% %D {\showmakeup\plaatsinhoud[criterium=vorige]}
-% %D
 %D Lets end with some more advanced examples.
 %D Definitions and enumerations come in many flavors. The
 %D next one for instance is defined as:
 %D
-%D \starttypen
+%D \starttyping
 %D \definedescription[test][place=left,hang=3,width=6em]
-%D \stoptypen
+%D \stoptyping
 %D
 %D When applied to some text, this would look like:
 %D
 %D \bgroup
 %D \showmakeup
-%D \doordefinieren[test][plaats=links,hang=3,breedte=6em]
+%D \definedescription[test][location=left,hang=3,width=6em]
 %D
 %D \test{visual\\debugger} I would be very pleased if \TEX\
 %D had two more primitives: \type{\vnop} and \type{\hnop}. Both
@@ -1897,11 +1897,11 @@
 %D
 %D The index to this section looks like:
 %D
-%D {\stelrefererenin[prefix=dummy]\showmakeup\plaatsindex[criterium=lokaal]}
+%D {\setupreferencing[prefixprefix=dummy]\showmakeup\placeindex[criterium=local]}
 %D
 %D Although not impressive examples or typesetting, both
 %D show us how and where things happen. When somehow the last
 %D lines in this two column index don't allign, then this is
 %D due to some still unknown interference.
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/symb-eur.tex b/tex/context/base/symb-eur.tex
index f5edb3b8b..cea720e86 100644
--- a/tex/context/base/symb-eur.tex
+++ b/tex/context/base/symb-eur.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-eur,
+%D   [       filefile=symb-eur,
 %D        version=2000.06.22,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Adobe Euro Symbols,
@@ -63,4 +63,4 @@
 %D               \NC \tt\it\euro \NC \tt\bs\euro \NC \tt\bi\euro \NC\NR
 %D \stoptabulate
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/symb-glm.tex b/tex/context/base/symb-glm.tex
index e99b7d5ce..694ae99f3 100644
--- a/tex/context/base/symb-glm.tex
+++ b/tex/context/base/symb-glm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-glm,
+%D   [       filefile=symb-glm,
 %D        version=2002.05.07,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Guillemots,
@@ -54,4 +54,4 @@
 
 \stopencoding
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/symb-ini.tex b/tex/context/base/symb-ini.tex
index 9b514415b..7e9b641f4 100644
--- a/tex/context/base/symb-ini.tex
+++ b/tex/context/base/symb-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-ini,
+%D   [       filefile=symb-ini,
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Basic Symbols Commands,
@@ -73,10 +73,10 @@
 %D Symbols are simply linked to a tag. Such tags can be numbers
 %D or strings.
 %D
-%D \starttypen
+%D \starttyping
 %D \definesymbol [1]       [$\bullet$]
 %D \definesymbol [level 5] [$\star$]
-%D \stoptypen
+%D \stoptyping
 
 % ss:tag     -> symbol
 % ss:set:tag -> symbol out of set
@@ -190,13 +190,7 @@
   {\dodoubleempty\dofiguresymbol}
 
 \def\dofiguresymbol[#1][% #2]%
-  {\externalfigure
-     [#1]
-     [\c!reset=\v!ja,
-      \c!symbool=\v!ja,
-     %\c!hfactor=\defaultsymbolfactor,
-      \c!hoogte=\defaultsymbolheight,
-      }% #2]}
+  {\externalfigure[#1][\c!reset=\v!yes,\c!symbol=\v!yes,\c!height=\defaultsymbolheight,}% #2]}
 
 \appendtoks \resetexternalfigures \to \everysymbol
 
@@ -223,9 +217,7 @@
 
 \def\xfetchsymbol#1%
   {\ifnosymbol
-     \@EA\ifx\csname\??ss:#1:\currentsymbol\endcsname\relax\else
-       \nosymbolfalse
-     \fi
+     \@EA\ifx\csname\??ss:#1:\currentsymbol\endcsname\relax\else\nosymbolfalse\fi
    \fi}
 
 \def\xredosymbol#1%
@@ -270,24 +262,24 @@
 %D From these macro definitions one can deduce that symbols can
 %D be grouped in symbol sets:
 %D
-%D \starttypen
+%D \starttyping
 %D \startsymbolset [navigation 1]
 %D   \definefiguresymbol [Next] [mp-symb.1]
 %D   \definefiguresymbol [Prev] [mp-symb.2]
 %D \stopsymbolset
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such a symbol can be typeset with:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupsymbolset[navigation 1]\symbol[Next]
-%D \stoptypen
+%D \stoptyping
 %D
 %D or simply:
 %D
-%D \starttypen
+%D \starttyping
 %D \symbol[navigation 1][Next]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Formally:
 %D
@@ -340,4 +332,4 @@
 %D itemization macros, we prefer symbols because they can more
 %D easier be (partially) redefined.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/symb-mis.tex b/tex/context/base/symb-mis.tex
index 10defdc4c..d9291f0c2 100644
--- a/tex/context/base/symb-mis.tex
+++ b/tex/context/base/symb-mis.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-mis,
+%D   [       filefile=symb-mis,
 %D        version=2002.05.07,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Miscelaneous,
@@ -16,7 +16,7 @@
 %D We predefine some common symbols and conversions that will
 %D be understood by many commands.
 
-\definesymbol [\v!geen]   []
+\definesymbol [\v!none]   []
 \definesymbol [bullet]    [\mathematics{\bullet}]
 \definesymbol [dash]      [\mathematics{-}]
 \definesymbol [star]      [\mathematics{\star}]
@@ -39,27 +39,27 @@
 %D Special hyperlinks, namely those to pages or navigational
 %D properties, are associated with symbols.
 
-\definesymbol [\v!eerstepagina]      [\gotobegincharacter]
-\definesymbol [\v!vorigepagina]      [\gobackwardcharacter]
-\definesymbol [\v!volgendepagina]    [\goforwardcharacter]
-\definesymbol [\v!laatstepagina]     [\gotoendcharacter]
-\definesymbol [\v!eerstesubpagina]   [\gotobegincharacter]
-\definesymbol [\v!vorigesubpagina]   [\gobackwardcharacter]
-\definesymbol [\v!volgendesubpagina] [\goforwardcharacter]
-\definesymbol [\v!laatstesubpagina]  [\gotoendcharacter]
+\definesymbol [\v!firstpage]      [\gotobegincharacter]
+\definesymbol [\v!previouspage]      [\gobackwardcharacter]
+\definesymbol [\v!nextpage]    [\goforwardcharacter]
+\definesymbol [\v!lastpage]     [\gotoendcharacter]
+\definesymbol [\v!firstsubpage]   [\gotobegincharacter]
+\definesymbol [\v!previoussubpage]   [\gobackwardcharacter]
+\definesymbol [\v!nextsubpage] [\goforwardcharacter]
+\definesymbol [\v!lastsubpage]  [\gotoendcharacter]
 \definesymbol [\v!PreviousJump]      [\gobackjumpcharacter]
 \definesymbol [\v!NextJump]          [\goforjumpcharacter]
 \definesymbol [\v!CloseDocument]     [\closecharacter]
 
-\definesymbol [\v!eerste]   [{\symbol[\v!eerstepagina]}]
-\definesymbol [\v!vorige]   [{\symbol[\v!vorigepagina]}]
-\definesymbol [\v!volgende] [{\symbol[\v!volgendepagina]}]
-\definesymbol [\v!laatste]  [{\symbol[\v!laatstepagina]}]
-\definesymbol [\v!ergens]   [\gotosomewherecharacter]
-\definesymbol [\v!nergens]  [\gonowherecharacter]
+\definesymbol [\v!first]   [{\symbol[\v!firstpage]}]
+\definesymbol [\v!previous]   [{\symbol[\v!previouspage]}]
+\definesymbol [\v!next] [{\symbol[\v!nextpage]}]
+\definesymbol [\v!last]  [{\symbol[\v!lastpage]}]
+\definesymbol [\v!somewhere]   [\gotosomewherecharacter]
+\definesymbol [\v!nowhere]  [\gonowherecharacter]
 
-\definesymbol [\v!achteruit] [{\symbol[\v!vorigepagina]}]
-\definesymbol [\v!vooruit]   [{\symbol[\v!volgendepagina]}]
+\definesymbol [\v!backward] [{\symbol[\v!previouspage]}]
+\definesymbol [\v!forward]   [{\symbol[\v!nextpage]}]
 
 %D The next two symbols (\symbol[P] and \symbol[S]) are
 %D variations in their math counterparts. The following ones
@@ -111,7 +111,7 @@
 %  {{\hbox{\hsmash{\gobackwardcharacter}\goforwardcharacter}}}
 
 \def\gotosomewherecharacter%
-  {{\hbox{\hsmash{\symbol[\v!vorige]}\symbol[\v!volgende]}}}
+  {{\hbox{\hsmash{\symbol[\v!previous]}\symbol[\v!next]}}}
 
 \unexpanded\def\closecharacter%
   {\dogotocharacter\boxtimes
diff --git a/tex/context/base/symb-mvs.tex b/tex/context/base/symb-mvs.tex
index 83e499c7e..c215474d1 100644
--- a/tex/context/base/symb-mvs.tex
+++ b/tex/context/base/symb-mvs.tex
@@ -3,7 +3,7 @@
 % tobias: what is the original and what the berry name?
 
 %D \module
-%D   [       file=symb-mvs,
+%D   [       filefile=symb-mvs,
 %D        version=2000.03.30,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Martin Vogels Symbole,
@@ -16,7 +16,7 @@
 %C details.
 
 %D This module implements the Martin Vogel Symbole font
-%D (marvosym). The names are derived from the \LaTeXe\ package
+%D (marvosym). The names are derived from the \LATEX\ package
 %D \type {marvosym} of Thomas Henlich. The symbols are
 %D available as Type~1 font and are included in \TETEX\ and
 %D \FPTEX\ distributions.
diff --git a/tex/context/base/symb-nav.tex b/tex/context/base/symb-nav.tex
index 765a9bd73..50f2e9a42 100644
--- a/tex/context/base/symb-nav.tex
+++ b/tex/context/base/symb-nav.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-nav,
+%D   [       filefile=symb-nav,
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Navigational Symbols,
@@ -23,20 +23,20 @@
 
 \startsymbolset [navigation 1]
 
-  \definesymbol [\v!vorigepagina]      [\ContextNavigationGlyph{1}]
-  \definesymbol [\v!volgendepagina]    [\ContextNavigationGlyph{2}]
-  \definesymbol [\v!eerstepagina]      [\ContextNavigationGlyph{3}]
-  \definesymbol [\v!laatstepagina]     [\ContextNavigationGlyph{4}]
+  \definesymbol [\v!previouspage]      [\ContextNavigationGlyph{1}]
+  \definesymbol [\v!nextpage]    [\ContextNavigationGlyph{2}]
+  \definesymbol [\v!firstpage]      [\ContextNavigationGlyph{3}]
+  \definesymbol [\v!lastpage]     [\ContextNavigationGlyph{4}]
 
   \definesymbol [\v!PreviousJump]      [\ContextNavigationGlyph{5}]
   \definesymbol [\v!NextJump]          [\ContextNavigationGlyph{6}]
 
   \definesymbol [\v!CloseDocument]     [\ContextNavigationGlyph{7}]
 
-  \definesymbol [\v!vorigesubpagina]   [\ContextNavigationGlyph{1}]
-  \definesymbol [\v!volgendesubpagina] [\ContextNavigationGlyph{2}]
-  \definesymbol [\v!eerstesubpagina]   [\ContextNavigationGlyph{3}]
-  \definesymbol [\v!laatstesubpagina]  [\ContextNavigationGlyph{4}]
+  \definesymbol [\v!previoussubpage]   [\ContextNavigationGlyph{1}]
+  \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{2}]
+  \definesymbol [\v!firstsubpage]   [\ContextNavigationGlyph{3}]
+  \definesymbol [\v!lastsubpage]  [\ContextNavigationGlyph{4}]
 
   \definesymbol [\v!StartSound]        [\ContextNavigationGlyph{2}]
   \definesymbol [\v!PauseSound]        [\ContextNavigationGlyph{8}]
@@ -55,20 +55,20 @@
 
 \startsymbolset [navigation 2]
 
-  \definesymbol [\v!vorigepagina]      [\ContextNavigationGlyph{101}]
-  \definesymbol [\v!volgendepagina]    [\ContextNavigationGlyph{102}]
-  \definesymbol [\v!eerstepagina]      [\ContextNavigationGlyph{103}]
-  \definesymbol [\v!laatstepagina]     [\ContextNavigationGlyph{104}]
+  \definesymbol [\v!previouspage]      [\ContextNavigationGlyph{101}]
+  \definesymbol [\v!nextpage]    [\ContextNavigationGlyph{102}]
+  \definesymbol [\v!firstpage]      [\ContextNavigationGlyph{103}]
+  \definesymbol [\v!lastpage]     [\ContextNavigationGlyph{104}]
 
   \definesymbol [\v!PreviousJump]      [\ContextNavigationGlyph{105}]
   \definesymbol [\v!NextJump]          [\ContextNavigationGlyph{106}]
 
   \definesymbol [\v!CloseDocument]     [\ContextNavigationGlyph{107}]
 
-  \definesymbol [\v!vorigesubpagina]   [\ContextNavigationGlyph{101}]
-  \definesymbol [\v!volgendesubpagina] [\ContextNavigationGlyph{102}]
-  \definesymbol [\v!eerstesubpagina]   [\ContextNavigationGlyph{103}]
-  \definesymbol [\v!laatstesubpagina]  [\ContextNavigationGlyph{104}]
+  \definesymbol [\v!previoussubpage]   [\ContextNavigationGlyph{101}]
+  \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{102}]
+  \definesymbol [\v!firstsubpage]   [\ContextNavigationGlyph{103}]
+  \definesymbol [\v!lastsubpage]  [\ContextNavigationGlyph{104}]
 
   \definesymbol [\v!StartSound]        [\ContextNavigationGlyph{102}]
   \definesymbol [\v!PauseSound]        [\ContextNavigationGlyph{108}]
@@ -87,20 +87,20 @@
 
 \startsymbolset [navigation 3]
 
-  \definesymbol [\v!vorigepagina]      [\ContextNavigationGlyph{201}]
-  \definesymbol [\v!volgendepagina]    [\ContextNavigationGlyph{202}]
-  \definesymbol [\v!eerstepagina]      [\ContextNavigationGlyph{203}]
-  \definesymbol [\v!laatstepagina]     [\ContextNavigationGlyph{204}]
+  \definesymbol [\v!previouspage]      [\ContextNavigationGlyph{201}]
+  \definesymbol [\v!nextpage]    [\ContextNavigationGlyph{202}]
+  \definesymbol [\v!firstpage]      [\ContextNavigationGlyph{203}]
+  \definesymbol [\v!lastpage]     [\ContextNavigationGlyph{204}]
 
   \definesymbol [\v!PreviousJump]      [\ContextNavigationGlyph{205}]
   \definesymbol [\v!NextJump]          [\ContextNavigationGlyph{206}]
 
   \definesymbol [\v!CloseDocument]     [\ContextNavigationGlyph{207}]
 
-  \definesymbol [\v!vorigesubpagina]   [\ContextNavigationGlyph{201}]
-  \definesymbol [\v!volgendesubpagina] [\ContextNavigationGlyph{202}]
-  \definesymbol [\v!eerstesubpagina]   [\ContextNavigationGlyph{203}]
-  \definesymbol [\v!laatstesubpagina]  [\ContextNavigationGlyph{204}]
+  \definesymbol [\v!previoussubpage]   [\ContextNavigationGlyph{201}]
+  \definesymbol [\v!nextsubpage] [\ContextNavigationGlyph{202}]
+  \definesymbol [\v!firstsubpage]   [\ContextNavigationGlyph{203}]
+  \definesymbol [\v!lastsubpage]  [\ContextNavigationGlyph{204}]
 
   \definesymbol [\v!StartSound]        [\ContextNavigationGlyph{202}]
   \definesymbol [\v!PauseSound]        [\ContextNavigationGlyph{208}]
@@ -121,4 +121,4 @@
 %D \showsymbolset[navigation 2]
 %D \showsymbolset[navigation 3]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/symb-run.tex b/tex/context/base/symb-run.tex
index 6668f40cd..04c295c75 100644
--- a/tex/context/base/symb-run.tex
+++ b/tex/context/base/symb-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=symb-run, % code moved from symb-ini 
+%D   [       filefile=symb-run, % code moved from symb-ini
 %D        version=1998.07.20,
 %D          title=\CONTEXT\ Symbol Libraries,
 %D       subtitle=Runtime Macros,
@@ -11,24 +11,24 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\unprotect 
+\unprotect
 
 \gdef\doshowsymbolset[#1][#2]% looks like \showexternalfigureb
   {\vbox\bgroup
-   \blanko
+   \blank
    \getparameters[\??ss][\c!n=5,#2]%
    \forcesymbolset[#1]%
    \doifdefined{\??ss#1}
      {\global\let\allfigures\empty
       \doglobal\newcounter\figurecounter
-      \setupcolors[\c!status=\v!start]% to prevent mps color conversion 
-      \mindermeldingen
+      \setupcolors[\c!state=\v!start]% to prevent mps color conversion
+      \dontcomplain
       \def\doshowsymbols% global needed due to grouping in alignment
         {\expanded{\globalprocesscommalist[\getvalue{\??ss#1}]\noexpand\docommando}}%
       \def\docommando##1%
         {\vbox
            {\forgetall
-            \tttf 
+            \tttf
             \halign
               {\hss\quad####\strut\quad\hss\cr
                \symbol[##1]\quad{\red\ruledhbox{\black\symbol[##1]}}\cr
@@ -44,7 +44,7 @@
       \tabskip\zeropoint \!!plus 1fill
       \halign to \hsize
         {&\hss##\hss\cr\doshowsymbols\crcr}}%
-   \blanko
+   \blank
    \egroup}
 
 \gdef\showsymbolset%
diff --git a/tex/context/base/syst-con.tex b/tex/context/base/syst-con.tex
index 0db485c7a..5461827c8 100644
--- a/tex/context/base/syst-con.tex
+++ b/tex/context/base/syst-con.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-con,
+%D   [       filefile=syst-con,
 %D        version=2000.12.10, % actually very old -)
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Conversions,
@@ -32,7 +32,7 @@
 %D The ugly indirectness is needed to get rid of \TEX\
 %D induced spaces and \type {\relax}'s.
 %D
-%D \starttypen
+%D \starttyping
 %D [\uchexnumber{0}]
 %D [\uchexnumber\scratchcounter]
 %D [\uchexnumber\zerocount]
@@ -46,7 +46,7 @@
 %D [\expandafter\uchexnumber\expandafter{\number\zerocount}]
 %D [\expandafter\uchexnumber\expandafter{\the\scratchcounter}]
 %D [\expandafter\uchexnumber\expandafter{\the\zerocount}]
-%D \stoptypen
+%D \stoptyping
 
 \def\lchexnumber#1%
   {\@EA\dolchexnumber\number#1\relax}
@@ -199,4 +199,4 @@
 
 \egroup
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-etx.tex b/tex/context/base/syst-etx.tex
index ba5fc0f3f..a907b2c40 100644
--- a/tex/context/base/syst-etx.tex
+++ b/tex/context/base/syst-etx.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-etx,
+%D   [       filefile=syst-etx,
 %D        version=1999.03.17, % some time ...
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Efficient \PLAIN\ \TEX\ loading,
@@ -15,6 +15,15 @@
 %D the definition files that come with this useful \TEX\
 %D extension, but implement our own alternatives.
 
+%D \CONTEXT\ was one of the first systems that had support for \ETEX\
+%D built in. In the process we found out that the extensions were not
+%D as bug free as the rest of \TEX. Especially the bugs in \type
+%D {lastnode}, flushing of token lists with an index in the extension
+%D range, and spurious box behaviour of boxes adressed in the extended
+%D box space made us a bit careful. It's hard to to track down such
+%D bugs, especially if one has a mind set of \TEX\ being bug free. If
+%D you encounter unexpected behaviour let me know.
+
 \unprotect
 
 %D Constants to be used with \type {\grouptype}.
@@ -227,9 +236,9 @@
 
 %D These macros can be checked by tests like:
 %D
-%D \starttypen
+%D \starttyping
 %D \let\wlog\message \dorecurse{1000}{\newcount\dummy}
-%D \stoptypen
+%D \stoptyping
 
 %D A few bonus bindings.
 
@@ -255,4 +264,4 @@
 
 \endTEX
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex
index 5cfe86d83..9ab48b0e8 100644
--- a/tex/context/base/syst-ext.tex
+++ b/tex/context/base/syst-ext.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-ext,
+%D   [       filefile=syst-ext,
 %D        version=1995.10.10,
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Extras,
@@ -95,16 +95,16 @@
 %D \type {\global} hopelessly fails here. But a slight
 %D adaption of Knuth's original macro permits:
 %D
-%D \starttypen
+%D \starttyping
 %D \doglobal\newif\iftest
-%D \stoptypen
+%D \stoptyping
 %D
 %D Of course one can still say:
 %D
-%D \starttypen
+%D \starttyping
 %D \global\testtrue
 %D \global\testfalse
-%D \stoptypen
+%D \stoptyping
 %D
 %D Apart from the prefixes, a few more \type{\expandafters}
 %D are needed:
@@ -149,12 +149,12 @@
 %D but fortunately we can store numbers in a macro. We can
 %D increment such pseudo \COUNTERS\ with \type{\increment}.
 %D
-%D \starttypen
+%D \starttyping
 %D \increment(\counter,20)
 %D \increment(\counter,-4)
 %D \increment(\counter)
 %D \increment\counter
-%D \stoptypen
+%D \stoptyping
 %D
 %D After this sequence of commands, the value of
 %D \type{\counter} is 20, 16, 17 and~18. Of course there is
@@ -162,9 +162,9 @@
 %D
 %D Global assignments are possible too, using \type{\doglobal}:
 %D
-%D \starttypen
+%D \starttyping
 %D \doglobal\increment\counter
-%D \stoptypen
+%D \stoptyping
 %D
 %D When \type{\counter} is undefined, it's value is initialized
 %D at~0. It is nevertheless better to define a \COUNTER\
@@ -173,9 +173,9 @@
 %D not accept undefined macro's. The \COUNTER\ in our example
 %D can for instance be defined with:
 %D
-%D \starttypen
+%D \starttyping
 %D \newcounter\counter
-%D \stoptypen
+%D \stoptyping
 %D
 %D The command \type{\newcounter} must not be confused with
 %D \type{\newcount}! Of course this mechanism is much slower
@@ -185,10 +185,10 @@
 %D from some other incompatilities we want to mention a pitfal
 %D when using \type{\ifnum}.
 %D
-%D \starttypen
+%D \starttyping
 %D \ifnum\normalcounter=\pseudocounter \doif \else \doelse \fi
 %D \ifnum\pseudocounter=\normalcounter \doif \else \doelse \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D In the first test, \TEX\ continues it's search for the
 %D second number after reading  \type{\pseudocounter}, while
@@ -325,9 +325,9 @@
 %D signal. Signals must be unique and the next macro takes care
 %D of that.
 %D
-%D \starttypen
+%D \starttyping
 %D \newsignal\somesignal
-%D \stoptypen
+%D \stoptyping
 %D
 %D Signals old dimensions and can be used in skips, kerns and
 %D tests like \type{\ifdim}.
@@ -347,9 +347,9 @@
 %D amount is too small to suit certain packages. Therefore when
 %D possible one should use:
 %D
-%D \starttypen
+%D \starttyping
 %D \newskimen\tempskimen
-%D \stoptypen
+%D \stoptyping
 %D
 %D This commands allocates a \DIMENSION\ or a \SKIP, depending
 %D on the availability. One should be aware of the difference
@@ -358,7 +358,7 @@
 %D found. This search can be canceled by using \type{\relax}
 %D when possible and needed.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\newskimen#1%
 %D   {\ifx#1\undefined
 %D      \ifnum\count11>\count12
@@ -367,7 +367,7 @@
 %D        \newdimen#1\relax
 %D      \fi
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In order to make this macro work in plain \TEX\ too, we
 %D use the following alternative, which fools \TEX\ about
@@ -384,9 +384,9 @@
 %D The next macro can be very useful when using \type{\csname}
 %D like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \csname if\strippedcsname\something\endcsname
-%D \stoptypen
+%D \stoptyping
 %D
 %D This expands to \type{\ifsomething}.
 
@@ -414,29 +414,29 @@
 %D memory saving alternative is presented here. A conditional
 %D is defined by:
 %D
-%D \starttypen
+%D \starttyping
 %D \newconditional\doublesided
 %D \setfalse
 %D
 %D Setting a conditional is done by \type{\settrue} and
 %D \type{\setfalse}:
 %D
-%D \starttypen
+%D \starttyping
 %D \settrue\doublesided
 %D \setfalse
 %D
 %D while testing is accomplished by:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifconditional\doublesided  ... \else ... \fi
 %D \setfalse
 %D
 %D We cannot use the simple scheme:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\settrue#1{\let#1=\iftrue}
 %D \def\settrue#1{\let#1=\iffalse}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such an implementation gives problems with nested
 %D conditionals. The next implementation is abaou as fast
@@ -455,9 +455,9 @@
 %D pretty \type{\if}||safe too. It can be used in cases
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifzeropt \somedimen ... \else ... \fi
-%D \stoptypen
+%D \stoptyping
 
 \let\ifzeropt\ifcase
 
@@ -472,9 +472,9 @@
 %D The most simple alternative is the one that only needs a
 %D number.
 %D
-%D \starttypen
+%D \starttyping
 %D \dorecurse {n} {whatever we want}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro can be nested without problems and therefore be
 %D used in situations where \PLAIN\ \TEX's \type{\loop} macro
@@ -482,7 +482,7 @@
 %D available in \type{\recurselevel}, before as well as after
 %D the \typ{whatever we wat} stuff.
 %D
-%D \starttypen
+%D \starttyping
 %D \dorecurse               % inner loop
 %D   {10}
 %D   {\recurselevel:          % outer value
@@ -493,7 +493,7 @@
 %D        {\recurselevel}     % outer value
 %D        {\recurselevel}     % inner value
 %D    \endgraf}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this example the first, second and fourth
 %D \type{\recurselevel} concern the outer loop, while the third
@@ -514,7 +514,7 @@
 
 %D Acceptable:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\dostepwiserecurse#1#2#3%
 %D   {\let\nextrecurse\gobblefourarguments
 %D    \ifnum#3>0\relax\ifnum#2<#1\relax\else
@@ -524,11 +524,11 @@
 %D      \def\nextrecurse{\dosetstepwiserecurse<}%
 %D    \fi\fi
 %D    \nextrecurse{#1}{#2}{#3}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Better:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\dostepwiserecurse#1#2#3%
 %D   {\let\nextrecurse\gobblefourarguments
 %D    \ifnum#3>0\relax \ifnum#2<#1\relax \else
@@ -577,7 +577,7 @@
 %D \def\nododorecurse
 %D   {\global\advance\outerrecurse -1
 %D    \edef\recurselevel{\csname\@@irecurse\recursedepth\endcsname}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Cleaner and much faster:
 
@@ -682,18 +682,18 @@
 %D As we can see here, the simple command \type{\dorecurse} is
 %D a special case of the more general:
 %D
-%D \starttypen
+%D \starttyping
 %D \dostepwiserecurse {from} {to} {step} {action}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This commands accepts positive and negative steps. Illegal
 %D values are handles as good as possible and the macro accepts
 %D numbers and \COUNTERS.
 %D
-%D \starttypen
+%D \starttyping
 %D \dostepwiserecurse  {1} {10}  {2} {...}
 %D \dostepwiserecurse {10}  {1} {-2} {...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because the simple case is used often, we implement it
 %D more efficiently:
@@ -757,7 +757,7 @@
 %D pseudo counter. When this macro is nested, we have to use
 %D different counters. This time we use keywords.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\alfa{2} \def\beta{100} \def\gamma{3}
 %D
 %D \for \n=55    \to 100   \step  1      \do {... \n ...}
@@ -765,7 +765,7 @@
 %D \for \n=\n    \to 120   \step  1      \do {... \n ...}
 %D \for \n=120   \to 100   \step -3      \do {... \n ...}
 %D \for \n=55    \to 100   \step  2      \do {... \n ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Only in the third example we need to predefine \type{\n}.
 %D The use of \type{\od} as a dilimiter would have made nested
@@ -786,11 +786,11 @@
 %D explictly exit it. Nesting is supported. First we present
 %D a more extensive alternative.
 %D
-%D \starttypen
+%D \starttyping
 %D \doloop
 %D   {Some kind of typesetting punishment \par
 %D    \ifnum\pageno>100 \exitloop \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When needed, one can call for \type{\looplevel} and
 %D \type{\loopdepth}.
@@ -798,7 +798,7 @@
 %D If we write this macros from scratch, we end up with
 %D something like the ones described above:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\@@eloop{@@eloop}  % exit
 %D \def\@@iloop{@@iloop}  % stepper
 %D \def\@@aloop{@@aloop}  % action
@@ -845,7 +845,7 @@
 %D
 %D \def\looplevel{\recurselevel}
 %D \def\loopdepth{\recursedepth}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We don't have to declare new counters for \type{\looplevel}
 %D and \type{\loopdepth} because we can use \type{\recurselevel}
@@ -854,13 +854,13 @@
 %D We prefer however a more byte saving implementation, that
 %D executes of course a bit slower.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doloop%
 %D   {\dostepwiserecurse1\maxdimen1}
 %D
 %D \def\exitloop%
 %D   {\letvalue{\@@irecurse\recursedepth}\maxdimen}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although, the next version is faster because it used the
 %D simple loop.
@@ -907,16 +907,16 @@
 %D The loop is executed at least once, so beware of situations
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \doloop {\exitloop some commands}
-%D \stoptypen
+%D \stoptyping
 %D
 %D It's just a matter of putting the text into the \type{\if}
 %D statement that should be there anyway, like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \doloop {\ifwhatever \exitloop \else some commands\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D You can also quit a loop immediately, by using \type
 %D {\exitloopnow} instead. Beware, this is more sensitive
@@ -942,7 +942,7 @@
 %D unreadable, so let's first show an implementation that
 %D shows how things are done:
 %D
-%D \starttypen
+%D \starttyping
 %D \newtoks \everyline
 %D \newtoks \oldeveryline
 %D \newif   \ifeveryline
@@ -1050,32 +1050,32 @@
 %D going to present in the visual debugger. First we save
 %D the primitive \type{\everypar}:
 %D
-%D \starttypen
+%D \starttyping
 %D \let\normaleverypar=\everypar
-%D \stoptypen
+%D \stoptyping
 %D
 %D Next we allocate a \TOKENLIST\ named \type{\everypar},
 %D which means that \type{\everypar} is no longer a primitive
 %D but something like \type{\toks44}.
 %D
-%D \starttypen
+%D \starttyping
 %D \newtoks\everypar
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because \TEX\ now executes \type{\normaleverypar} instead
 %D of \type{\everypar}, we are ready to assign some tokens to
 %D this internally known and used \TOKENLIST.
 %D
-%D \starttypen
+%D \starttyping
 %D \normaleverypar={all the things the system wants to do \the\everypar}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Where the user can provide his own tokens to be expanded
 %D every time he expects them to expand.
 %D
-%D \starttypen
+%D \starttyping
 %D \everypar={something the user wants to do}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We don't use this method because it undoubtly leads to
 %D confusing situations, especially when other packages are
@@ -1089,15 +1089,15 @@
 %D macro converts a parameter or an expanded macro to it's
 %D textual meaning.
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument ... \to \command
-%D \stoptypen
+%D \stoptyping
 %D
 %D For example,
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument{one \two \three{four}}\to\ascii
-%D \stoptypen
+%D \stoptyping
 %D
 %D The resulting macro \type{\ascii} can be written to a file
 %D or the terminal without problems. In \CONTEXT\ we use this
@@ -1105,9 +1105,9 @@
 %D
 %D The second conversion alternative accepts a command:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertcommand\command\to\ascii
-%D \stoptypen
+%D \stoptyping
 %D
 %D Both commands accept the prefix \type{\doglobal} for global
 %D assignments.
@@ -1166,9 +1166,9 @@
 %D was found after rereading the \TEX book. The first
 %D implementation was:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doconvertargument#1->#2\\\\{#2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \type{-}, the delimiter \type{\\\\} and the the second
 %D argument are completely redundant.
@@ -1176,9 +1176,9 @@
 % %D As said, the \TEX\ alternative fails on expanding primitives,
 % %D like in:
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \convertcommand\someprimitive\to\ascii
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D Because these primitives convert to themselves, we can use
 % %D the backslash as a signal to treat them different. At the
@@ -1221,9 +1221,9 @@
 %D in the \ETEX\ implementation, but since we want
 %D compatibility, we need:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifmeaningelse {\next} {\something} {true} {false}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Watch the one level expansion of the second argument.
 
@@ -1278,7 +1278,7 @@
 %D executing the commands that uses them. We can best
 %D illustrate this with an example.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\first  {alfa,beta,gamma}
 %D \def\second {alfa,epsilon,zeta}
 %D
@@ -1289,7 +1289,7 @@
 %D \ExpandFirstAfter\processcommalist[\first]\message
 %D
 %D \ExpandAfter       \doifcommon {\first} {alfa}    {\message{OK}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first three calls result in the threefold message
 %D \type{OK}, the fourth one shows the three elements of
@@ -1331,19 +1331,19 @@
 %D argument to a string of unexpandable characters. To make
 %D comparison possible, we have to convert the constant too
 %D
-%D \starttypen
+%D \starttyping
 %D \ConvertToConstant\doifelse {...} {...} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This construction is only needed when the first argument
 %D can give troubles. Misuse can slow down processing.
 %D
-%D \starttypen
+%D \starttyping
 %D \ConvertToConstant\doifelse{\c!alfa}        {\c!alfa}{...}{...}
 %D \ConvertToConstant\doifelse{alfa}           {\c!alfa}{...}{...}
 %D \ConvertToConstant\doifelse{alfa}           {alfa}   {...}{...}
 %D \ConvertToConstant\doifelse{alfa \alfa test}{\c!alfa}{...}{...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In examples~2 and~3 both arguments equal, in~1 and~4
 %D they differ.
@@ -1369,27 +1369,27 @@
 %D When the argument \type{#1} consists of commands, we had
 %D better use
 %D
-%D \starttypen
+%D \starttyping
 %D \ConvertConstantAfter\processaction[#1][...]
-%D \ConvertConstantAfter\doifelse{#1}{\v!iets}{}{}
-%D \stoptypen
+%D \ConvertConstantAfter\doifelse{#1}{\v!something}{}{}
+%D \stoptyping
 %D
 %D This commands accepts things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \v!constant
 %D constant
 %D \hbox to \hsize{\rubish}
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we will see in the core modules, this macro permits
 %D constructions like:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupfootertexts[...][...]
 %D \setupfootertexts[margin][...][...]
 %D \setupfootertexts[\v!margin][...][...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{...} can be anything legally \TEX.
 
@@ -1410,9 +1410,9 @@
 %D
 %D We can assign a default value to an empty macro using:
 %D
-%D \starttypen
+%D \starttyping
 %D \assignifempty \macros {default value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We don't explicitly test if the macro is defined.
 
@@ -1430,10 +1430,10 @@
 %D like constructions. Sometimes, the \type{\stop} is used as a
 %D hard coded delimiter like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\startcommand#1\stopcommand%
 %D   {... #1 ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In many cases the \type{\start}||\type{\stop} pair is
 %D defined at format generation time or during a job. This
@@ -1442,21 +1442,21 @@
 %D \type{\expandafter} I was able to to implement a solution,
 %D starting with:
 %D
-%D \starttypen
+%D \starttyping
 %D \grabuntil{stop}\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D This commands executes, after having encountered
 %D \type {\stop} the command \type {\command}. This command
 %D receives as argument the text preceding the \type {\stop}.
 %D This means that:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\starthello%
 %D   {\grabuntil{stophello}\message}
 %D
 %D \starthello Hello world!\stophello
-%D \stoptypen
+%D \stoptyping
 %D
 %D results in: \type{\message{Hello world!}}.
 
@@ -1468,22 +1468,22 @@
 
 %D The next command build on this mechanism:
 %D
-%D \starttypen
+%D \starttyping
 %D \processbetween{string}\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here:
 %D
-%D \starttypen
+%D \starttyping
 %D \processbetween{hello}\message
 %D \starthello Hello again!\stophello
-%D \stoptypen
+%D \stoptyping
 %D
 %D leads to: \type{\message{Hello again!}}. The command
 %D
-%D \starttypen
+%D \starttyping
 %D \gobbleuntil{sequence}
-%D \stoptypen
+%D \stoptyping
 %D
 %D is related to these commands. This one simply throws away
 %D everything preceding \type{\command}.
@@ -1499,9 +1499,9 @@
 
 %D The next one simply expands the pickup up tokens.
 %D
-%D \starttypen
+%D \starttyping
 %D \processuntil{sequence}
-%D \stoptypen
+%D \stoptyping
 
 \def\processuntil#1%
   {\long\def\next##1#1{##1}\next}
@@ -1511,9 +1511,9 @@
 %D
 %D Commands often manipulate argument as in:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doezomaarwat#1{....#1....}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A disadvantage of this approach is that the tokens that
 %D form \type{#1} are fixed the the moment the argument is read
@@ -1529,27 +1529,27 @@
 %D The next macro offers a solution for both unwanted
 %D situations:
 %D
-%D \starttypen
+%D \starttyping
 %D \groupedcommand {before} {after}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which can be used like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\cite%
 %D   {\groupedcommand{\rightquote\rightquote}{\leftquote\leftquote}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command is equivalent to, but more 'robust' than:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\cite#1%
 %D   {\rightquote\rightquote#1\leftquote\leftquote}
-%D \stoptypen
+%D \stoptyping
 %D
 %D One should say that the next implementation would suffice:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\groupedcommand#1#2%
 %D   {\def\BeforeGroup{#1\ignorespaces}%
 %D    \def\AfterGroup{\unskip#2\egroup}%
@@ -1557,23 +1557,23 @@
 %D    \aftergroup\AfterGroup
 %D    \afterassignment\BeforeGroup
 %D    \let\next=}
-%D \stoptypen
+%D \stoptyping
 %D
 %D It did indeed, but one day we decided to support the
 %D processing of boxes too:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\rightword%
 %D   {\groupedcommand{\hfill\hbox}{\parfillskip\!!zeropoint}}
 %D
 %D .......... \rightword{the right way}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here \TEX\ typesets \type{\bf the right way} unbreakable
 %D at the end of the line. The solution mentioned before does
 %D not work here.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\unexpanded\def\groupedcommand#1#2%
 %D   {\bgroup
 %D    \long\def\BeforeGroup%
@@ -1582,20 +1582,20 @@
 %D      {#2\egroup\egroup}%
 %D    \afterassignment\BeforeGroup
 %D    \let\next=}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We used this method some time until the next alternative
 %D was needed. From now on we support both
 %D
-%D \starttypen
+%D \starttyping
 %D to be \bold{bold} or not, that's the question
-%D \stoptypen
+%D \stoptyping
 %D
 %D and
 %D
-%D \starttypen
+%D \starttyping
 %D to be {\bold bold} or not, that's the question
-%D \stoptypen
+%D \stoptyping
 %D
 %D This alternative checks for a \type{\bgroup} token first.
 %D The internal alternative does not accept the box handling
@@ -1616,7 +1616,7 @@
 
 %D These macros come together in:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\unexpanded\def\groupedcommand#1#2%
 %D   {\def\dogroupedcommand%
 %D      {\ifx\next\bgroup
@@ -1626,16 +1626,16 @@
 %D       \fi
 %D       \next{#1}{#2}}%
 %D    \futurelet\next\dogroupedcommand}
-%D \stoptypen
+%D \stoptyping
 %D
 %D From the missing paragraph number one can deduce that the
 %D last macro is not the real one yet. I considered it a
 %D nuisance that
 %D
-%D \starttypen
-%D \kleur[groen]
+%D \starttyping
+%D \color[green]
 %D   {as grass}
-%D \stoptypen
+%D \stoptyping
 %D
 %D was not interpreted as one would expect. This is due to the
 %D fact that \type{\futurelet} obeys blank spaces, and a
@@ -1667,10 +1667,10 @@
 %D explictly close the paragraph with \type{\par}, else the
 %D settings will be forgotten and not applied. So it's:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\BoldRaggedCenter%
 %D   {\groupedcommand{\raggedcenter\bf}{\par}}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {checkdefined}
@@ -1681,9 +1681,9 @@
 %D already defined. We considered blocking the definition, but
 %D this is not always what we want.
 %D
-%D \starttypen
+%D \starttyping
 %D \checkdefined {category} {class} {command}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The user is warned with the suggestion to use
 %D \type{CAPITALS}. This suggestion is feasible, because
@@ -1703,16 +1703,16 @@
 %D this contents grouped. The next macro for instance typesets
 %D a paragraph in boldface.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\remark#1\par%
 %D   {\bgroup\bf#1\egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro has to be called like
 %D
-%D \starttypen
+%D \starttyping
 %D \remark some text ... ending with \par
-%D \stoptypen
+%D \stoptyping
 %D
 %D Instead of \type{\par} we can of course use an empty line.
 %D When we started typesetting with \TEX, we already had
@@ -1722,22 +1722,22 @@
 %D \TEX\ permits a cramped and badly formatted source, it adds
 %D to confusion and sometimes introduces errors. So we prefer:
 %D
-%D \starttypen
+%D \starttyping
 %D \remark
 %D
 %D some text ... ending with an empty line
-%D \stoptypen
+%D \stoptyping
 %D
 %D We are going to implement a mechanism that allows such open
 %D specifications. The definition of the macro handling
 %D \type{\remark} becomes:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\remark%
 %D   {\BeforePar{\bgroup\bf}%
 %D    \AfterPar{\egroup}%
 %D    \GetPar}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A macro like \type{\GetPar} can be defined in several
 %D ways. The recent version, the fourth one in a row,
@@ -1756,7 +1756,7 @@
 
 %D The original definition was:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doGotoPar
 %D   {\ifx\nextchar\blankspace
 %D      \@EA\GotoPar
@@ -1773,13 +1773,13 @@
 %D
 %D \def\GotoPar
 %D   {\afterassignment\doGotoPar\let\nextchar=}
-%D \stoptypen
+%D \stoptyping
 
 %D Its big brother \type{\GetPar} redefines the \type{\par}
 %D primitive, which can lead to unexpected results, depending
 %D in the context.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\GetPar
 %D   {\expanded
 %D      {\BeforePar
@@ -1793,16 +1793,16 @@
 %D             \BeforePar\emptytoks
 %D             \AfterPar\emptytoks}}}%
 %D    \GotoPar}
-%D \stoptypen
+%D \stoptyping
 
 %D However, we can implement a better alternative by using:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dowithpar#1#2%
 %D   {\def\handlepar##1\par{#1##1#2}%
 %D    \def\gobblepar\par{\dowithpar{#1}{#2}}%
 %D    \doifnextcharelse\par\gobblepar\handlepar}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Or, nicer
 
@@ -1850,10 +1850,10 @@
 %D We start with a commands that acts on paragraphs. This
 %D command is called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \dowithpargument\command
 %D \dowithpargument{\command ... }
-%D \stoptypen
+%D \stoptyping
 %D
 %D In \CONTEXT\ we use this one to read in the titles of
 %D chapters, sections etc. The commands responsible for these
@@ -1861,19 +1861,19 @@
 %D passing. In these examples, the \type{\par} can be omitted
 %D when an empty line is present.
 %D
-%D \starttypen
+%D \starttyping
 %D \command{...}
 %D \command ... \par
 %D \command
 %D   {...}
 %D \command
 %D   ... \par
-%D \stoptypen
+%D \stoptyping
 %D
 %D We show two implementations, of which for the moment the
 %D we prefier to use the second one:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dowithpargument#1%
 %D   {\def\dodowithpargument%
 %D      {\ifx\next\bgroup
@@ -1883,18 +1883,18 @@
 %D       \fi
 %D       \next}%
 %D    \futurelet\next\dodowithpargument}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A second and better implementation was:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dowithpargument#1%
 %D   {\def\nextpar##1 \par{#1{##1}}%
 %D    \def\nextarg##1{#1{##1}}%
 %D    \doifnextcharelse{\bgroup}
 %D      {\nextarg}
 %D      {\nextpar}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We ended up with an alternative that also accepts en empty
 %D argument. This command permits for instance chapters to
@@ -1918,27 +1918,27 @@
 %D When we want to act upon words we can use the \type{w}
 %D alternative.
 %D
-%D \starttypen
+%D \starttyping
 %D \dowithwargument\command
 %D \dowithwargument{... \command ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The main difference bwteen two alternatives is in the
 %D handling of \type{\par}'s. This time the space token acts
 %D as a delimiter.
 %D
-%D \starttypen
+%D \starttyping
 %D \command{...}
 %D \command ...
 %D \command
 %D   {...}
 %D \command
 %D   ...
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again there are two implementations possible:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dowithwargument#1%
 %D   {\def\dodowithwargument%
 %D      {\ifx\next\bgroup
@@ -1948,7 +1948,7 @@
 %D       \fi
 %D       \next}%
 %D    \futurelet\next\dodowithwargument}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We've chosen:
 
@@ -1971,24 +1971,24 @@
 %D \type{\dorecurse}. The next alternative however, suits
 %D better some of the \CONTEXT\ interface commands.
 %D
-%D \starttypen
+%D \starttyping
 %D \dorepeat[n*\command]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The value of the used \COUNTER\ can be called within
 %D \type{\command} by \type{\repeater}.
 %D
 %D A slightly different alternative is:
 %D
-%D \starttypen
+%D \starttyping
 %D \dorepeatwithcommand[n*{...}]\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we call for something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \dorepeatwithcommand[3*{Hello}]\message
-%D \stoptypen
+%D \stoptyping
 %D
 %D we get ourselves three \type{\message{Hello}} messages in
 %D a row. In both commands, the \type{n*} is optional. When this
@@ -2090,14 +2090,14 @@
 %D The next macro is meant for situations where both strings
 %D are macros. This save some unneeded expansion.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifstringinstringelse#1#2%
 %D   {\p!doifinstringelse#1#2%
 %D      \@EA\firstoftwoarguments
 %D    \else
 %D      \@EA\secondoftwoarguments
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A bit faster is:
 
@@ -2121,12 +2121,12 @@
 %D comma separated lists are more suitable for the user
 %D interface. Nevertheless we have:
 %D
-%D \starttypen
+%D \starttyping
 %D (\doglobal) \appendtoks ... \to\tokenlist
 %D (\doglobal) \prependtoks ... \to\tokenlist
 %D (\doglobal) \flushtoks\tokenlist
 %D             \dotoks\tokenlist
-%D \stoptypen
+%D \stoptyping
 %D
 %D Er worden eerst enkele klad||registers gedefinieerd. These
 %D macros are clones of the ones implemented in page~378 of
@@ -2135,7 +2135,7 @@
 %D A simple implementation, one that does not handle braces
 %D at the outer level, is:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\appendtoks#1\to#2%
 %D   {\scratchtoks={#1}%
 %D    \expanded{\dodoglobal\noexpand#2{\the#2\the\scratchtoks}}}
@@ -2143,7 +2143,7 @@
 %D \def\prependtoks#1\to#2%
 %D   {\scratchtoks={#1}%
 %D    \expanded{\dodoglobal\noexpand#2{\the\scratchtoks\the#2}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But here we prefer:
 
@@ -2216,28 +2216,41 @@
 
 %D The test macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doifintokselse#1#2% #1 en #2 zijn toks
 %D   {\edef\!!stringa{\the#1}\convertcommand\!!stringa\to\asciiA
 %D    \edef\!!stringb{\the#2}\convertcommand\!!stringb\to\asciiB
 %D    \doifinstringelse\asciiA\asciiB}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Better:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doifintokselse#1#2% #1 en #2 zijn toks
 %D   {\edef\!!stringa{\the#1}\convertcommand\!!stringa\to\asciiA
 %D    \edef\!!stringb{\the#2}\convertcommand\!!stringb\to\asciiB
 %D    \doifstringinstringelse\asciiA\asciiB}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Even better:
 
-\def\doifintokselse#1#2% #1 en #2 zijn toks
-  {\@EA\convertargument\the#1\to\asciiA
-   \@EA\convertargument\the#2\to\asciiB
-   \doifstringinstringelse\asciiA\asciiB}
+\beginETEX
+
+  \def\doifintokselse#1#2% #1 en #2 zijn toks
+    {\@EA\convertargument\the#1\to\asciiA
+     \@EA\convertargument\the#2\to\asciiB
+     \doifstringinstringelse\asciiA\asciiB}
+
+\endETEX
+
+\beginTEX
+
+  \def\doifintokselse#1#2% #1 en #2 zijn toks
+    {\edef\asciiA{\the#1}\convertcommand\asciiA\to\asciiA
+     \edef\asciiB{\the#2}\convertcommand\asciiB\to\asciiB
+     \doifstringinstringelse\asciiA\asciiB}
+
+\endTEX
 
 %D Also:
 
@@ -2260,19 +2273,19 @@
 %D Declaring, setting and resetting \COUNTERS\ can be doen
 %D with the next set of commands.
 %D
-%D \starttypen
+%D \starttyping
 %D \makecounter   {name}
 %D \pluscounter   {name}
 %D \minuscounter  {name}
 %D \resetcounter  {name}
 %D \setcounter    {name} {value}
 %D \countervalue  {name}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We prefer the use of global counters. This means that we
 %D have to load \PLAIN\ \TEX\ in a bit different way:
 %D
-%D \starttypen
+%D \starttyping
 %D \let\oldouter=\outer
 %D \let\outer=\relax
 %D \input plain.tex
@@ -2280,12 +2293,12 @@
 %D
 %D \def\newcount%
 %D   {\alloc@0\count\countdef\insc@unt}
-%D \stoptypen
+%D \stoptyping
 %D
 %D First we show a solution in which we use real \COUNTERS.
 %D Apart from some expansion, nothing special is done.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\makecounter#1%
 %D   {\expandafter\newcount\csname#1\endcsname}
 %D
@@ -2303,7 +2316,7 @@
 %D
 %D \def\countervalue#1%
 %D   {\the\getvalue{#1}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because these macros are already an indirect way of working
 %D with counters, there is no harm in using pseudo \COUNTERS\
@@ -2386,10 +2399,10 @@
 %D These both commands split a string at a given point in two
 %D parts, so \type{x.y} becomes \type{x} or \type{y}.
 %D
-%D \starttypen
+%D \starttyping
 %D \beforesplitstring test.tex\at.\to\filename
 %D \aftersplitstring  test.tex\at.\to\extension
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first routine looks (and is indeed) a bit simpler than
 %D the second one. The alternative looking more or less like
@@ -2467,9 +2480,9 @@
 %D
 %D A first application of the two routines defined above is:
 %D
-%D \starttypen
+%D \starttyping
 %D \removesubstringtest-\from first-last\to\nothyphenated
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which in terms of \TEX\ looks like:
 
@@ -2494,12 +2507,12 @@
 %D list. When we add an item, we first check if it's already
 %D there. This means that every item in the list is unique.
 %D
-%D \starttypen
+%D \starttyping
 %D \addtocommalist      {alfa}  \name
 %D \addtocommalist      {beta}  \name
 %D \addtocommalist      {gamma} \name
 %D \removefromcommalist {beta}  \name
-%D \stoptypen
+%D \stoptyping
 %D
 %D These commands can be prefixed with \type{\doglobal}. The
 %D implementation of the second command is more complecated,
@@ -2508,24 +2521,24 @@
 %D commas. When one item is left, we also have to get rid of
 %D trailing spaces.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\words{alfa, beta, gamma, delta}
 %D \def\words{alfa,beta,gamma,delta}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Removing an item takes more time than adding one.
 %D
 %D A fast appending alternative, without any testing, is
 %D also provided:
 %D
-%D \starttypen
+%D \starttyping
 %D \appendtocommalist  {something} \name
 %D \prependtocommalist {something} \name
-%D \stoptypen
+%D \stoptyping
 %D
 %D This can be implemented as follows:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\appendtocommalist#1#2%
 %D   {\ifx#2\empty
 %D      \dodoglobal\edef#2{#1}%
@@ -2539,7 +2552,7 @@
 %D    \else % no test on empty
 %D      \dodoglobal\edef#2{#1,#2}%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The faster alternatives are:
 
@@ -2551,7 +2564,7 @@
 
 %D The old ones are:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\addtocommalist#1#2%
 %D   {\ifx#2\empty
 %D      \dodoglobal\edef#2{#1}%
@@ -2587,7 +2600,7 @@
 %D    \doremovefromcommalist{}{#1}{#2}%
 %D    \dofrontstrip#2%
 %D    \dodoglobal\edef#2{#2}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Significantly faster (especially for longer lists):
 
@@ -2636,9 +2649,9 @@
 %D Slow but seldom used, so for the moment we stick to this
 %D implementation.
 %D
-%D \starttypen
+%D \starttyping
 %D \substituteincommalist{old}{new}{list}
-%D \stoptypen
+%D \stoptyping
 
 \def\substituteincommalist#1#2#3% old, new, list (slooow)
   {\edef\!!stringb{#1}%
@@ -2678,21 +2691,21 @@
 %D The next macro can be used to replace an indexed element
 %D in a commalist:
 %D
-%D \starttypen
+%D \starttyping
 %D \replaceincommalist\MyList{2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Element~2 will be replaced by the current meaning of the macro
 %D \type {\newcommalistelement}. The old meaning is saved in
 %D \type {\commalistelement}. The replacement honors grouped items,
 %D like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\MyList{a,b,c,d,e,f}   \replaceincommalist\MyList{3}
 %D \def\MyList{a,b,c,d,e,f}   \replaceincommalist\MyList{3}
 %D \def\MyList{a,{b,c},d,e,f} \replaceincommalist\MyList{3}
 %D \def\MyList{a,b,c,{d,e,f}} \replaceincommalist\MyList{3}
-%D \stoptypen
+%D \stoptyping
 
 \let\newcommalistelement\empty
 
@@ -2756,9 +2769,9 @@
 %D
 %D We can convert point into centimeters with:
 %D
-%D \starttypen
+%D \starttyping
 %D \PtToCm{dimension}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Splitting the value and the unit is done by:
 
@@ -2803,10 +2816,10 @@
 
 %D We also support:
 %D
-%D \starttypen
+%D \starttyping
 %D \numberofpoints   {dimension}
 %D \dimensiontocount {dimension} {\count}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Both macros return a rounded number.
 
@@ -2842,10 +2855,10 @@
 %D
 %D Premature and a bit of beta, we offer:
 %D
-%D \starttypen
+%D \starttyping
 %D \pushmacro\macro
 %D \popmacro\macro
-%D \stoptypen
+%D \stoptyping
 %D
 %D Beware: global!
 
@@ -2921,11 +2934,11 @@
 %D corrected value is available in \type{\localhsize}, which
 %D needs to be calculated with \type{\setlocalhsize} first.
 %D
-%D \starttypen
+%D \starttyping
 %D \setlocalhsize        \hbox to \localhsize{...}
 %D \setlocalhsize[-1em]  \hbox to \localhsize{...}
 %D \setlocalhsize[.5ex]  \hbox to \localhsize{...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These examples show us that an optional can be used. The
 %D value provided is added to \type{\localhsize}.
@@ -2953,9 +2966,9 @@
 %D (definitely and fortunately) no feature of \TEX, we have to
 %D step through the token list ourselves.
 %D
-%D \starttypen
+%D \starttyping
 %D \processtokens {before} {between} {after} {space} {tokens}
-%D \stoptypen
+%D \stoptyping
 %D
 %D An example of a call is:
 %D
@@ -2967,7 +2980,7 @@
 %D
 %D This results in:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D The list of tokens may contain spaces, while \type{\\},
 %D \type{{}} and \type{\ } are handled as space too.
@@ -3073,7 +3086,7 @@
 
 %D Faster but spoiling inheritance (copying parameters):
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doifelsevaluesomething#1#2#3%
 %D   {\expandafter\ifx\csname#1\endcsname\empty#3\else#2\fi}
 %D
@@ -3082,7 +3095,7 @@
 %D
 %D \def\doifvaluenothing#1#2%
 %D   {\expandafter\ifx\csname#1\endcsname\empty#2\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Slightly more efficient:
 
@@ -3230,11 +3243,11 @@
 %D compare filenames. The next three alternatives upcase their
 %D arguments before comparing them.
 %D
-%D \starttypen
+%D \starttyping
 %D \DOIF     {string1} {string2} {...}
 %D \DOIFNOT  {string1} {string2} {...}
 %D \DOIFELSE {string1} {string2} {then ...}{else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We have to use a two||step implementation, because the
 %D expansion has to take place outside \type{\uppercase}.
@@ -3283,16 +3296,16 @@
 %D \DVI||file, which passes them to for instance a PostScript
 %D file.
 %D
-%D \starttypen
+%D \starttyping
 %D \stripspaces\from\one\to\two
-%D \stoptypen
+%D \stoptyping
 %D
 %D Both the old string \type{\one} and the new one \type{\two}
 %D are expanded. This command is a special case of:
 %D
-%D \starttypen
+%D \starttyping
 %D \stripcharacter\char\from\one\to\two
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we can see below, spaces following a control sequence are
 %D to enclosed in \type{{}}.
@@ -3331,9 +3344,9 @@
 %D take care of such executions and when not defined, gobbles
 %D the unwanted arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \executeifdefined{name}\gobbleoneargument
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can of course gobble more arguments using the
 %D appropriate gobbling command.
@@ -3379,9 +3392,9 @@
 %D
 %D An also fully expandable variant is the following:
 %D
-%D \starttypen
+%D \starttyping
 %D \executeifdefinedcs{a}{b}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In dit geval zijn beide argumenten csnames.
 
@@ -3391,9 +3404,9 @@
 %D We considered an alternative implementation accepting
 %D commands directly, like:
 %D
-%D \starttypen
-%D \executeifdefined\naam\gobblefivearguments
-%D \stoptypen
+%D \starttyping
+%D \executeifdefined\name\gobblefivearguments
+%D \stoptyping
 %D
 %D For the moment we don't need this one, so we stick to the
 %D faster one.
@@ -3404,10 +3417,10 @@
 %D The following macros were requested by Simon. Watch the
 %D global variant.
 %D
-%D \starttypen
+%D \starttyping
 %D          \executeandforget\SomeCommand
 %D \doglobal\executeandforget\AnotherCommand
-%D \stoptypen
+%D \stoptyping
 
 \def\executeandforget#1%
   {\global\let\@@expanded#1%
@@ -3420,9 +3433,9 @@
 %D The next command checks a string on the presence of a space
 %D and executed a command accordingly.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifsomespaceelse {tekst} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We use this command in \CONTEXT\ for determing if an
 %D argument must be broken into words when made interactive.
@@ -3451,9 +3464,9 @@
 %D an interface aspect of \CONTEXT. The first command can be
 %D used to adapt a \DIMENSION.
 %D
-%D \starttypen
+%D \starttyping
 %D \adaptdimension {dimension} {value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When the value is preceed by a \type{+} or minus, the
 %D dimension is advanced accordingly, otherwise it gets the
@@ -3488,9 +3501,9 @@
 %D maat. This time we take the value as it is, and don't look
 %D explicitly at the preceding sign.
 %D
-%D \starttypen
+%D \starttyping
 %D \balancedimensions {dimension 1} {dimension 2} {value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When a positive value is given, the first dimension is
 %D incremented, the second ond is decremented. A negative value
@@ -3512,19 +3525,19 @@
 %D \type{\processcommalist} command. This time we don't handle
 %D nesting but accept arbitrary seperators.
 %D
-%D \starttypen
+%D \starttyping
 %D \processseparatedlist[list][separator]\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D One can think of things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \processseparatedlist[alfa+beta+gamma][+]\message
-%D \stoptypen
+%D \stoptyping
 
 %D First we show the simple alternative:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\processseparatedlist[#1][#2]#3%
 %D   {\def\doprocessseparatedlist##1##2#2%
 %D      {\if]##1%
@@ -3540,7 +3553,7 @@
 %D       \fi\fi\fi
 %D       \next}%
 %D    \doprocessseparatedlist#1#2]#2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, we want to handle all situations, like:
 %D
@@ -3579,16 +3592,16 @@
 %D An even more general list processing macro is the
 %D following one:
 %D
-%D \starttypen
+%D \starttyping
 %D \processlist{beginsym}{endsym}{separator}\docommando list
-%D \stoptypen
+%D \stoptyping
 %D
 %D This one supports arbitrary open and close symbols as well
 %D as user defined separators.
 %D
-%D \starttypen
+%D \starttyping
 %D \processlist(){=>}\docommando(a=>b=>c=>d)
-%D \stoptypen
+%D \stoptyping
 
 \def\processlist#1#2#3#4%
   {\def\doprocesslist##1#2%
@@ -3627,9 +3640,9 @@
 %D containing keywords. Assignments are treated accordingly,
 %D keywords are treated by \type{\command}.
 %D
-%D \starttypen
+%D \starttyping
 %D \processassignlist[...=...,...=...,...]\commando
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command can be integrated in \type{\getparameters}, but
 %D we decided best not to do so.
@@ -3649,10 +3662,10 @@
 % %D Sometimes \type{\fi}'s can get into the way. We can reach
 % %D over such a troublemaker with:
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \DoAfterFi{some commands}
 % %D \DoAfterFiFi{some commands}
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D It saves us a \type{\next} construction. Skipping
 % %D \type{\else...\fi} is more tricky, so this one is not
@@ -3668,10 +3681,10 @@
 %D When manipulating data(bases) and for instance generating
 %D index entries, the next three macros can be of help:
 %D
-%D \starttypen
+%D \starttyping
 %D \untextargument{...}\to\name
 %D \untexcommand  {...}\to\name
-%D \stoptypen
+%D \stoptyping
 %D
 %D They remove braces and backslashes and give us something to
 %D sort.
@@ -3698,10 +3711,10 @@
 %D used big points (\TEX's bp). The next macros convert points
 %D and scaled points into big points.
 %D
-%D \starttypen
+%D \starttyping
 %D \ScaledPointsToBigPoints      {number} \target
 %D \ScaledPointsToWholeBigPoints {number} \target
-%D \stoptypen
+%D \stoptyping
 %D
 %D The magic factor $72/72.27$ can be found in most \TEX\
 %D related books.
@@ -3766,9 +3779,9 @@
 %D Points can be stripped from their suffix by using
 %D \type{\withoutpt}. The next macro enveloppes this macro.
 %D
-%D \starttypen
+%D \starttyping
 %D \PointsToReal {dimension} \target
-%D \stoptypen
+%D \stoptyping
 
 \def\PointsToReal#1#2%
   {\scratchdimen#1%
@@ -3781,9 +3794,9 @@
 %D first token gets the whole first line. We can prevent this
 %D by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \dontleavehmode
-%D \stoptypen
+%D \stoptyping
 %D
 %D This command is used in for instance the language module
 %D \type{lang-ini}.
@@ -3806,10 +3819,10 @@
 %D
 %D The names tell what they do:
 %D
-%D \starttypen
+%D \starttyping
 %D \uppercasestring somestring\to\somestring
 %D \lowercasestring somestring\to\somestring
-%D \stoptypen
+%D \stoptyping
 %D
 %D the first argument may be a \type{\macro}.
 
@@ -3825,16 +3838,16 @@
 %D With the next macro we enter a critical area of macro
 %D expansion. What we want is a macro that looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \handletokens some tokens\with \somemacro
-%D \stoptypen
+%D \stoptyping
 %D
 %D At first sight the next implementation will suffice, but
 %D running this one shows that we loose the spaces. This is no
 %D surprise because we grab arguments and spaces preceding those
 %D are just ignored.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\nohandletokens#1\end%
 %D   {}
 %D
@@ -3850,13 +3863,13 @@
 %D \long\def\handletokens#1\with#2%
 %D   {\let\docommando=#2\relax
 %D    \dohandletokens#1\endoftoken\end}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A second approach therefore grabs the individual characters
 %D by using \type{\afterassignment}, in which case the space is
 %D read in as space.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dodohandletokens%
 %D   {\ifx\next\end \else
 %D      \docommando{\next}%
@@ -3869,17 +3882,17 @@
 %D \long\def\handletokens#1\with#2%
 %D   {\let\docommando=#2%
 %D    \dohandletokens#1\end}
-%D \stoptypen
+%D \stoptyping
 
 %D A bonus example:
 %D
-%D \starttypen
+%D \starttyping
 %D \hbox{\handletokens tekst en meer tekst\with\ruledhbox}
 %D
 %D \def\weetikveel#1{\if#1\blankspace\space\else\ruledhbox{#1}\fi}
 %D
 %D \hbox{\handletokens tekst en meer tekst\with\weetikveel}
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {counttoken,counttokens}
@@ -3887,10 +3900,10 @@
 %D For the few occasions that we want to know the number of
 %D specific tokens in a string, we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \counttoken  token\in string\to \count
 %D \counttokens          string\to \count
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro, that for instance is used in \type{cont-tab},
 %D takes a real counter. The macro can be preceded by \type
@@ -3974,7 +3987,7 @@
 %D Careful reading shows that inside an \type{\edef} macro's
 %D that are \type{\let} are not expanded!
 %D
-%D \unprotect\haalbuffer[next]\protect
+%D \unprotect\getbuffer[next]\protect
 %D
 %D That's why we finally end up with a macro that looks
 %D ahead by using an assignment, this time by using \type
@@ -3996,7 +4009,7 @@
 %D This alternatives does not handle grouped tokens well, so
 %D next we had (for a short moment):
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dodohandletokens#1%
 %D  {\ifx\nexthandledtoken\blankspace
 %D     \dododohandletokens{ }%
@@ -4005,12 +4018,12 @@
 %D     \dododohandletokens{#1}%
 %D     \expandafter\dohandletokens
 %D   \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This one failed on a trailing space, something we
 %D encounter in \JAVASCRIPT\ cleaning.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dodohandletokens#1%
 %D   {\ifx\nexthandledtoken\blankspace
 %D      \dododohandletokens{ }%
@@ -4019,7 +4032,7 @@
 %D      \dododohandletokens{#1}%
 %D      \expandafter\dohandletokens
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D So, now we have:
 
@@ -4037,17 +4050,17 @@
 %D
 %D \def\xxx#1{[#1]}
 %D
-%D \startregels
+%D \startlines
 %D \handletokens         abc\with\xxx
 %D \handletokens       a b c\with\xxx
 %D \handletokens     a  b  c\with\xxx
 %D \handletokens      a{bc}d\with\xxx
 %D \handletokens a\space bc \with\xxx
-%D \stopregels
+%D \stoplines
 %D
 %D And our previous example shows up as:
 %D
-%D \haalbuffer[example]
+%D \getbuffer[example]
 
 %D \macros
 %D   {iftrialtypesetting}
@@ -4065,7 +4078,7 @@
 %D
 %D The next four macros are rather self explaining:
 %D
-%D \starttypen
+%D \starttyping
 %D \startlocal
 %D   whatever assignments
 %D \stoplocal
@@ -4073,7 +4086,7 @@
 %D \startglobal
 %D   whatever assignments
 %D \stopglobal
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are meant for those who know the difference
 %D between local and global assignments and are aware of the
@@ -4133,10 +4146,10 @@
 %D longer compatible, although in many cases things go ok.
 %D Beware of verbatim, i.e. catcode changes.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\starthans%
 %D   {\processcontent{stophans}\test{\message{\test}\wait}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro is first used in the tabulation macros.
 
@@ -4188,13 +4201,13 @@
 %D supported. The sorting algorithm is very simple, so the list
 %D should not be too long or sorting will be very slow.
 %D
-%D \starttypen
+%D \starttyping
 %D \sortcommalist[10,2,4,5,6,1,2,3,4,10,20]\donumericcompare
 %D
 %D \def\test{10,2,4,5,6,1,2,3,4,10,20}
 %D
 %D \sortcommacommand[\test]\donumericcompare
-%D \stoptypen
+%D \stoptyping
 %D
 %D In both cases, the result is available in the macro \type
 %D {\sortedcommalist}.
@@ -4330,13 +4343,13 @@
 %D
 %D The next assignments are all valid:
 %D
-%D \starttypen
+%D \starttyping
 %D \setdimensionwithunit\scratchdimen{10}  {cm}
 %D \setdimensionwithunit\scratchdimen{10cm}{cm}
 %D \setdimensionwithunit\scratchdimen{10cm}{}
 %D \freezedimensionwithunit\SomeWidth{\textwidth}
 %D \freezedimensionwithunit\SomeDepth{\dp\strutbox}
-%D \stoptypen
+%D \stoptyping
 %D
 %D As an alternative for the next macro we can use a global
 %D assignment inside a box. The \type{\empty}'s permits
@@ -4433,9 +4446,9 @@
 %D number, especially in full expandable macros where using
 %D \type {\relax} would lead to disasters.
 %D
-%D \starttypen
+%D \starttyping
 %D \ifodd\purenumber{...}\space ... \else ... \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here we use a space as number delimiter in combination
 %D with a space- and relax-less \type {\purenumber}. This
@@ -4447,25 +4460,25 @@
 %D \macros
 %D   {filterfromvalue}
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue{xx}{{A}{B}{C}}
 %D
 %D \filterfromvalue{xx}{3}{3}
 %D \filterfromvalue{xx}{3}{2}
 %D \filterfromvalue{xx}{3}{1}
-%D \stoptypen
+%D \stoptyping
 %D
 %D An alternative is to store 'max' in the list, say:
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue{xx}{3{A}{B}{C}}
 %D
 %D \filterfromvalues{3}{xx}{3}
 %D \filterfromvalues{3}{xx}{2}
 %D \filterfromvalues{3}{xx}{1}
-%D \stoptypen
+%D \stoptyping
 %D
-%D I'll implement this when I'm in \citaat {writing dirty
+%D I'll implement this when I'm in \quotation {writing dirty
 %D macros mood}.
 
 \def\filterfromvalue#1#2#3% value max n
@@ -4530,11 +4543,11 @@
 %D \macros
 %D   {definemeasure}
 %D
-%D \starttypen
+%D \starttyping
 %D \definemeasure[mywidth][\dimexpr(\textwidth-1cm)]
 %D
 %D ... \measure{mywidth} ...
-%D \stoptypen
+%D \stoptyping
 
 \def\??dm{@@dm} % brrr
 
@@ -4564,4 +4577,4 @@
      \expandafter\thirdoffourarguments
    \fi}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-gen.tex b/tex/context/base/syst-gen.tex
index 5fd300d94..3bb38de2c 100644
--- a/tex/context/base/syst-gen.tex
+++ b/tex/context/base/syst-gen.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-gen,
+%D   [       filefile=syst-gen,
 %D        version=1996.03.20,
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=General,
@@ -31,14 +31,14 @@
 %D want to prevent it being loaded more than once. This can be
 %D done using:
 %D
-%D \starttypen
+%D \starttyping
 %D \abortinputifdefined\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\command} is a command defined in the module
 %D to be loaded only once.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\abortinputifdefined#1%
 %D   {\ifx#1\undefined
 %D      \let\next=\relax
@@ -46,7 +46,7 @@
 %D      \let\next=\endinput
 %D    \fi
 %D    \next}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro can be speed up in terms of speed as well as
 %D memory. Because this is a nice example of a bit strange
@@ -54,31 +54,31 @@
 %D
 %D If we perform such actions directly, we can say:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifx\somecommand\undefined
 %D   \let\next=\relax
 %D \else
 %D   \let\next=\endinput
 %D \fi
 %D \next
-%D \stoptypen
+%D \stoptyping
 %D
 %D We need the \type{\next} because we need to end the
 %D \type{\fi}. The efficient one is:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifx\somecommand\undefined
 %D \else
 %D   \expandafter\endinput
 %D \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because \type{\endinput} comes into action after the current
 %D line, we can also say:
 %D
-%D \starttypen
+%D \starttyping
 %D \ifx\somecommand\undefined \else \endinput \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we define a macro, we tend to use a format which
 %D shows as besat as can how things are done. \TEX\ however
@@ -104,9 +104,9 @@
 %D However, the command that is needed for this is not yet
 %D defined.
 %D
-%D \starttypen
+%D \starttyping
 %D \writestatus{laden}{Context Systeem Macro's (a)}
-%D \stoptypen
+%D \stoptyping
 
 %D The next few macros are needed in case this module is
 %D used outside \CONTEXT.
@@ -132,11 +132,11 @@
 %D This is done by \type{\unprotect} and \type{\protect}, for
 %D instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \unprotect
 %D \def\!test{test}
 %D \protect
-%D \stoptypen
+%D \stoptyping
 %D
 %D The defined command \type{\!test} can of course only be
 %D called upon when we are in the \type{\unprotect}'ed state,
@@ -411,9 +411,9 @@
 %D don't expand them before interpretation. Such commands can
 %D be enclosed with \type{\expanded}, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \expanded{\setupsomething[\alfa]}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such situations occur for instance when \type{\alfa} is a
 %D commalist or when data stored in macros is fed to index of
@@ -461,10 +461,10 @@
 %D lot of \type {\expandafter}'s. They expand the arguments
 %D after the first command.
 %D
-%D \starttypen
+%D \starttyping
 %D \expandoneargafter \command{\abc}
 %D \expandtwoargsafter\command{\abc}{\def}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These commands expect the arguments to be macros.
 
@@ -510,9 +510,9 @@
 %D character. Disturbing spaces and line endings, which are
 %D normally interpreted as spaces too, are skipped.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifnextcharelse {karakter} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This macro differs from the original in the use of \type
 %D {\localnext} because we don't want clashes with \type
@@ -554,10 +554,10 @@
 %D \type{\reinspectnextcharacter}. The chain reaction is
 %D visually compatible with the next sequence:
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\def\reinspectnextcharacter %
 %D   {\futurelet\nexttoken\inspectnextcharacter}
-%D \stoptypen
+%D \stoptyping
 %D
 %D However complicated it may look, I'm still glad I stumbled
 %D into this construction. Saving and restoring \type {\:} is
@@ -584,7 +584,7 @@
 %D \type{\def} and \type{\let}. Every macro programmer sooner
 %D or later wants macros like these.
 %D
-%D \starttypen
+%D \starttyping
 %D \setvalue   {name}{...} = \def\name{...}
 %D \setgvalue  {name}{...} = \gdef\name{...}
 %D \setevalue  {name}{...} = \edef\name{...}
@@ -593,7 +593,7 @@
 %D \letgvalue  {name}=\... = \global\let\name=\...
 %D \getvalue   {name}      = \name
 %D \resetvalue {name}      = \def\name{}
-%D \stoptypen
+%D \stoptyping
 %D
 %D As we will see, \CONTEXT\ uses these commands many times,
 %D which is mainly due to its object oriented and parameter
@@ -630,17 +630,17 @@
 %D Sometimes prefixing the macro with \type{\donottest} leads
 %D to defining an auxiliary macro, like
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosomecommand {... ... ...}
 %D \def\somecommand   {\donottest\dosomecommand}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This double definition can be made transparant by using
 %D \type{\unexpanded}, as in:
 %D
-%D \starttypen
+%D \starttyping
 %D \unexpanded\def\somecommand{... ... ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The protection mechanism uses:
 
@@ -673,11 +673,11 @@
 %D a negative impact on searching in the hash table. Because
 %D some simple testing does not show differences, we just use:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\unexpanded#1#2%
 %D   {\@EA#1\@EA#2\@EA{\@EA\donottest\csname\s!do\string#2\endcsname}%
 %D    \@EA#1\csname\s!do\string#2\endcsname}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Well, in fact we use the bit more versatile alternative. The
 %D \type {\honorunexpanded} can be used to \type {\string}
@@ -730,10 +730,10 @@
 %D
 %D And so the definition in our example turns out to be:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\csname do\somecommand\endcsname{... ... ...}
 %D \def\somecommand{\donottest\csname do\somecommand\endcsname}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In which \type{do\somecommand} is hidden from the user and
 %D cannot lead to confusion. It's still permitted to define
@@ -753,13 +753,13 @@
 %D \type{\undefined}. To garantee correct working of the next
 %D set of macros, \type{\undefined} may never be defined!
 %D
-%D \starttypen
+%D \starttyping
 %D \doifundefined      {string}    {...}
 %D \doifdefined        {string}    {...}
 %D \doifundefinedelse  {string}    {then ...} {else ...}
 %D \doifdefinedelse    {string}    {then ...} {else ...}
 %D \doifalldefinedelse {commalist} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Every macroname that \TEX\ builds gets an entry in the hash
 %D table, which is of limited size. It is expected that e-\TeX\
@@ -770,11 +770,11 @@
 %D name to be build by using \type{\csname} and
 %D \type{\endcsname} and testing the \type{\name} directly.
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\ifx\csname NameA\endcsname\relax ... \else ... \fi
 %D
 %D \ifx\NameB\undefined ... \else ... \fi
-%D \stoptypen
+%D \stoptyping
 %D
 %D I became aware of this when I mistakenly testen the first
 %D one against \type{\undefined}. When \TEX\ build a name using
@@ -783,11 +783,11 @@
 %D quickest way to check these things is asking \TEX\ to show
 %D the meaning of the names:
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\show\csname NameA\endcsname
 %D
 %D \show\NameB
-%D \stoptypen
+%D \stoptyping
 %D
 %D The main reason why this never will be a big problem is that
 %D when one uses the \type{\csname} way, one probably has to do
@@ -804,7 +804,7 @@
 %D Our first implementation of \type{\ifundefined} was
 %D straightforward and readable:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\ifundefined#1%
 %D   {\expandafter\ifx\csname#1\endcsname\relax}%
 %D
@@ -836,7 +836,7 @@
 %D    \else
 %D      \endgroup#3%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When this module was optimized, timing showed that the
 %D next alternative can be upto twice as fast, especially when
@@ -960,7 +960,7 @@
 %D Before we start using this variant, we used another one,
 %D which is even a bit faster. This one looked like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\p!doifundefined%
 %D   {\begingroup
 %D    \let\donottest=\dontprocesstest
@@ -972,18 +972,18 @@
 %D    \else
 %D      \endgroup#3%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A even more previous version used \type{\bgroup} and
 %D \type {\egroup}. In math mode however, \type{$1{x}2$} differs
 %D from \type{$1x2$}. This can been seen when one compares the
 %D output of:
 %D
-%D \starttypen
+%D \starttyping
 %D $\kern10pt\showthe\lastkern$
 %D $\kern10pt{\showthe\lastkern}$
 %D $\kern10pt\begingroup\showthe\lastkern\endgroup$
-%D \stoptypen
+%D \stoptyping
 %D
 %D Also in math mode, one can better use \type {\begingroup}
 %D and companion instead of \type {\bgroup}.
@@ -1054,11 +1054,11 @@
 %D runtime redefinition, expansion etc. While \MODULA\ taught
 %D me to structure, \TEX\ taught me to think recursive.
 %D
-%D \starttypen
+%D \starttyping
 %D \doif     {string1} {string2} {...}
 %D \doifnot  {string1} {string2} {...}
 %D \doifelse {string1} {string2} {then ...}{else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When expansion gives problems, we can precede the
 %D troublemaker with \type{\donottest}.
@@ -1066,14 +1066,14 @@
 %D This implementatie does not use the construction which is
 %D more robust for nested conditionals.
 %D
-%D \starttypen
+%D \starttyping
 %D \ifx\!!stringa\!!stringb
 %D   \def\next{#3}%
 %D \else
 %D   \def\next{#4}%
 %D \fi
 %D \next
-%D \stoptypen
+%D \stoptyping
 %D
 %D In practice, this alternative is at least 20\% slower than
 %D the alternative used here. The few cases in which we
@@ -1204,7 +1204,7 @@
 %D auxiliary macro also proved to be slower, so we definitely
 %D did not choose for:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\p!doifelse#1#2%
 %D   {\let\donottest=\dontprocesstest
 %D    \edef\!!stringa{#1}%
@@ -1220,7 +1220,7 @@
 %D
 %D \long\def\doifelse#1#2#3#4%
 %D   {\p!doifelse{#1}{#2}#3\else#4\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Optimizations like this are related of course to the
 %D bottlenecks in \TEX. It seems that restoring saved meanings
@@ -1231,11 +1231,11 @@
 %D
 %D We complete our set of conditionals with:
 %D
-%D \starttypen
+%D \starttyping
 %D \doifempty     {string} {...}
 %D \doifnotempty  {string} {...}
 %D \doifemptyelse {string} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This time, the string is not expanded.
 
@@ -1270,15 +1270,15 @@
 %D set of strings. Depending on the result, some action is
 %D taken.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifinset     {string} {string,...} {...}
 %D \doifnotinset  {string} {string,...} {...}
 %D \doifinsetelse {string} {string,...} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The second argument is the comma separated set of strings.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifinsetelse#1#2#3#4%
 %D   {\doifelse{#1}{}
 %D      {#4}
@@ -1299,7 +1299,7 @@
 %D
 %D \long\def\doifnotinset#1#2#3%
 %D   {\doifinsetelse{#1}{#2}{}{#3}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because this macro is called quite often we've spent some
 %D time optimizing it. This time, the gain in speed is due to
@@ -1456,16 +1456,16 @@
 %D Probably the most time consuming tests are those that test
 %D for overlap in sets of strings.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifcommon     {string,...} {string,...} {...}
 %D \doifnotcommon  {string,...} {string,...} {...}
 %D \doifcommonelse {string,...} {string,...} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We show the slower alternative first, because it shows us
 %D how things are done.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifcommonelse#1#2#3#4%
 %D   {\donefalse
 %D    \def\p!docommoncheck##1%
@@ -1488,7 +1488,7 @@
 %D
 %D \long\def\doifnotcommon#1#2#3%
 %D   {\doifcommonelse{#1}{#2}{}{#3}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The processing time is shortened by getting the auxiliary
 %D macro to the outermost level and using less \type{\edef}'s.
@@ -1644,9 +1644,9 @@
 %D We've already seen some macros that take care of comma
 %D separated lists. Such list can be processed with
 %D
-%D \starttypen
+%D \starttyping
 %D \processcommalist[string,string,...]\commando
-%D \stoptypen
+%D \stoptyping
 %D
 %D The user supplied command \type{\commando} receives one
 %D argument: the string. This command permits nesting and
@@ -1702,7 +1702,7 @@
 %D however are treated. We have to check for the special case
 %D \type{[{a,b,c}]}.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\processcommalist[%
 %D   {\futurelet\nexttoken\docheckcommaitem}
 %D
@@ -1729,7 +1729,7 @@
 %D      {#2{##1}\doprocesscommaitem}%
 %D    \doprocesscommaitem#1,]\relax
 %D    \global\advance\commalevel -1 }
-%D \stoptypen
+%D \stoptyping
 %D
 %D However, this is not a the most straightforward solution!
 %D We can misuse one of \TEX's hidden features, and prepend
@@ -1778,32 +1778,32 @@
 
 %D The previous examples lead to:
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D When a list is saved in a macro, we can use a construction
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \expandafter\processcommalist\expandafter[\list]\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D Such solutions suit most situations, but we wanted a bit
 %D more.
 %D
-%D \starttypen
+%D \starttyping
 %D \processcommacommand[string,\stringset,string]\commando
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\stringset} is a predefined set, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\first{aap,noot,mies}
 %D \def\second{laatste}
 %D
 %D \processcommacommand[\first]\message
 %D \processcommacommand[\first,second,third]\message
 %D \processcommacommand[\first,between,\second]\message
-%D \stoptypen
+%D \stoptyping
 %D
 %D Commands that are part of the list are expanded, so the
 %D use of this macro has its limits.
@@ -1814,15 +1814,15 @@
 %D The argument to \type{\command} is not delimited. Because
 %D we often use \type{[]} as delimiters, we also have:
 %D
-%D \starttypen
+%D \starttyping
 %D \processcommalistwithparameters[string,string,...]\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\command} looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\command[#1]{... #1 ...}
-%D \stoptypen
+%D \stoptyping
 
 \def\processcommalistwithparameters[#1]#2%
   {\def\docommand##1{#2[##1]}%
@@ -1838,16 +1838,16 @@
 %D items, some actions is taken. These macros can be nested
 %D without problems.
 %D
-%D \starttypen
+%D \starttyping
 %D \processaction           [x]     [a=>\a,b=>\b,c=>\c]
 %D \processfirstactioninset [x,y,z] [a=>\a,b=>\b,c=>\c]
 %D \processallactionsinset  [x,y,z] [a=>\a,b=>\b,c=>\c]
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can supply both a \type{default} action and an action
 %D to be undertaken when an \type{unknown} value is met:
 %D
-%D \starttypen
+%D \starttyping
 %D \processallactionsinset
 %D   [x,y,z]
 %D   [      a=>\a,
@@ -1855,7 +1855,7 @@
 %D          c=>\c,
 %D    default=>\default,
 %D    unknown=>\unknown{... \commalistelement ...}]
-%D \stoptypen
+%D \stoptyping
 %D
 %D When \type{#1} is empty, this macro scans list \type{#2} for
 %D the keyword \type{default} and executed the related action
@@ -1876,7 +1876,7 @@
 %D direct result of the support of nesting. Protection is only
 %D applied in \type{\processaction}.
 %D
-%D \starttypen
+%D \starttyping
 %D \newcount\processlevel
 %D
 %D \def\processaction[#1]#2[#3]%
@@ -1946,7 +1946,7 @@
 %D          \processcommalist[#3]\p!dodoprocessaction}%
 %D       \processcommalist[#1]{\getvalue{\s!do\the\processlevel}}%
 %D       \advance\processlevel by -1 }}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The gain of speed in the (again) next implementation is
 %D around 20\%, depending on the application.
@@ -2241,9 +2241,9 @@
 %D next character. This macro get this character and puts it in
 %D \type{\firstcharacter}.
 %D
-%D \starttypen
+%D \starttyping
 %D \getfirstcharacter {string}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A two step expansion is used to prevent problems with
 %D complicated arguments, for instance arguments that
@@ -2276,15 +2276,15 @@
 %D We can check for the presence of a substring in a given
 %D sequence of characters.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifinsetelse {substring} {string} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D An application of this command can be found further on.
 %D Like before, we first show some alternatives, like the one
 %D we started with:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\p!doifinstringelse#1#2#3#4%
 %D   {\def\pp!doifinstringelse##1#1##2##3\war%
 %D      {\if##2@%
@@ -2296,11 +2296,11 @@
 %D
 %D \def\doifinstringelse%
 %D   {\ExpandBothAfter\p!doifinstringelse}
-%D \stoptypen
+%D \stoptyping
 %D
 %D After this we came to:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\p!doifinstringelse#1#2%
 %D   {\def\pp!doifinstringelse##1#1##2##3\war%
 %D      {\if##2@}%
@@ -2312,7 +2312,7 @@
 %D    \else
 %D      #3%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Sometimes the second argument is passed as a macro. By
 %D postponing the expansion of this macro, we gain quite some
@@ -2349,7 +2349,7 @@
      \@EA\gobbleoneargument
    \fi}
 
-%D \starttypen
+%D \starttyping
 %D \beginTEX
 %D
 %D \long\def\p!doifinstringelse#1#2%
@@ -2367,7 +2367,7 @@
 %D    \expanded{\pp!doifinstringelse#2#1@@\noexpand\war}} % expand #2 here
 %D
 %D \endETEX
-%D \stoptypen
+%D \stoptyping
 %D
 %D And then \unknown\ after a couple of years, we ran into a
 %D situation where \type {##2} was something \type {{bla}}. So
@@ -2418,9 +2418,9 @@
 %D typesetting! This is mainly due to the fact that passing
 %D (expanded) strings is much slower that passing a macro.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifincsnameelse {substring} {\string} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Where \type{\doifinstringelse} does as much expansion as
 %D possible, the latter alternative does minimal (one level)
@@ -2460,24 +2460,24 @@
 %D test possible, exept from a less robust 10||step
 %D \type{\if}||ladder or some tricky \type{\lcode} checking.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifnumberelse {string} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The macro accepts \type{123}, \type{abc}, \type{{}},
 %D \type{\getal} and \type{\the\count...}. This macro is a
 %D rather dirty one.
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifnumberelse#1#2#3%
 %D   {\begingroup\donefalse
 %D    \ifcase1#1\or\or\or\or\or\or\or\or\or\else\donetrue\fi
 %D    \ifdone\endgroup#2\else\endgroup#3\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Or better:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifnumberelse#1%
 %D   {\begingroup\donefalse
 %D    \ifcase1#1\or\or\or\or\or\or\or\or\or\else\donetrue\fi
@@ -2486,11 +2486,11 @@
 %D    \else
 %D      \endgroup\expandafter\secondoftwoarguments
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A previous implementation was:
 %D
-%D \starttypen
+%D \starttyping
 %D \long\def\doifnumberelse#1#2#3%
 %D   {\getfirstcharacter{#1}%
 %D    \@EA\p!doifinstringelse\@EA{\firstcharacter}{1234567890}%
@@ -2498,21 +2498,21 @@
 %D    \else
 %D      #3%
 %D    \fi}
-%D \starttypen
+%D \starttyping
 %D
 %D And before we had \type{\p!doifinstringelse} available, we
 %D used:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doifnumberelse#1%
 %D   {\getfirstcharacter{#1}%
 %D    \rawdoifinsetelse{\firstcharacter}{1,2,3,4,5,6,7,8,9,0}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation using \type {\ifcase} is much faster, but
 %D the next one is not, not even when testing milion calls.
 %D
-%D \starttypen
+%D \starttyping
 %D \newif\ifitsanumber
 %D
 %D \long\def\isitanumber#1%
@@ -2521,7 +2521,7 @@
 %D
 %D \long\def\doifnumberelse#1#2#3%
 %D   {\isitanumber{#1}\ifitsanumber#2\else#3\fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D After a while the next evolved and this one is the one we
 %D will use. This one is some 5\% faster than the group/done
@@ -2552,12 +2552,12 @@
 %D compare anything. Expandable macros are permitted as search
 %D string.
 %D
-%D \starttypen
+%D \starttyping
 %D \makerawcommalist[string,string,...]\stringlist
 %D \rawdoifinsetelse{string}{string,...}{...}{...}
 %D \rawprocesscommalist[string,string,...]\commando
 %D \rawprocessaction[x][a=>\a,b=>\b,c=>\c]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Spaces embedded in the list, for instance after commas,
 %D spoil the search process. The gain in speed depends on the
@@ -2566,7 +2566,7 @@
 %D
 %D The slow alternative looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\makerawcommalist[#1]#2%
 %D   {\def\appendtocommalist##1%
 %D      {\doifelse{#2}{}
@@ -2574,7 +2574,7 @@
 %D         {\edef#2{#2,##1}}}%
 %D    \def#2{}%
 %D    \processcommalist[#1]\appendtocommalist}
-%D \stoptypen
+%D \stoptyping
 %D
 %D But we prefer:
 
@@ -2687,11 +2687,11 @@
 % %D macros are used for interfacing. The next alternative can be used
 % %D for
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \processunexpandedcommalist
 % %D   [\alfa\beta,\gamma,\delta\epsilon]
 % %D   \handleitem
-% %D \stoptypen
+% %D \stoptyping
 % %D
 % %D This time nesting is not supported.
 %
@@ -2732,13 +2732,13 @@
 %D multi||linguality into account. For the moment we keep
 %D things simple and single||lingual.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosetvalue   {label}    {variable}   {value}
 %D \dosetevalue  {label}    {variable}   {value}
 %D \dosetgvalue  {label}    {variable}   {value}
 %D \docopyvalue  {to label} {from label} {variable}
 %D \doresetvalue {label}    {variable}
-%D \stoptypen
+%D \stoptyping
 %D
 %D These macros are in fact auxiliary ones and are not meant
 %D for use outside the assignment macros.
@@ -2774,22 +2774,22 @@
 %D
 %D Assignments can be realized with:
 %D
-%D \starttypen
+%D \starttyping
 %D \doassign[label][variable=value]
 %D \undoassign[label][variable=value]
-%D \stoptypen
+%D \stoptyping
 %D
 %D and:
 %D
-%D \starttypen
+%D \starttyping
 %D \doassignempty[label][variable=value]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Assignments like \type{\doassign} are compatible with:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\labelvariable{value}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We do check for the presence of an \type{=} and loudly
 %D complain of it's missed. We will redefine this macro later
@@ -2839,54 +2839,54 @@
 %D ideal of user friendly interfacing, so we take some further
 %D steps.
 %D
-%D \starttypen
+%D \starttyping
 %D \getparameters    [label] [...=...,...=...]
 % %D \forgetparameters [label] [...=...,...=...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again, the label identifies the category a variable
 %D belongs to. The second argument can be a comma separated
 %D list of assignments.
 %D
-%D \starttypen
+%D \starttyping
 %D \getparameters
 %D   [demo]
 %D   [alfa=1,
 %D    beta=2]
-%D \stoptypen
+%D \stoptyping
 %D
 %D is equivalent to
 %D
-%D \starttypen
+%D \starttyping
 %D \def\demoalfa{1}
 %D \def\demobeta{2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D
 %D In the pre||multi||lingual stadium \CONTEXT\ took the next
 %D approach. With
 %D
-%D \starttypen
+%D \starttyping
 %D \def\??demo {@@demo}
 %D \def\!!alfa {alfa}
 %D \def\!!beta {beta}
-%D \stoptypen
+%D \stoptyping
 %D
 %D calling
 %D
-%D \starttypen
+%D \starttyping
 %D \getparameters
 %D   [\??demo]
 %D   [\!!alfa=1,
 %D    \!!beta=2]
-%D \stoptypen
+%D \stoptyping
 %D
 %D lead to:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\@@demoalfa{1}
 %D \def\@@demobeta{2}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because we want to be able to distinguish the \type{!!}
 %D pre||tagged user supplied variables from internal
@@ -2999,9 +2999,9 @@
 %D Sometimes we explicitly want variables to default to an
 %D empty string, so we welcome:
 %D
-%D \starttypen
+%D \starttyping
 %D \getemptyparameters [label] [...=...,...=...]
-%D \stoptypen
+%D \stoptyping
 
 \def\getemptyparameters[#1]#2[#3]%
   {\def\p!dogetemptyparameter##1%
@@ -3017,24 +3017,24 @@
 %D standard command for ruled boxes. Is situations like this
 %D we can use:
 %D
-%D \starttypen
+%D \starttyping
 %D \copyparameters [to-label] [from-label] [name1,name2,...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D For instance
 %D
-%D \starttypen
+%D \starttyping
 %D \copyparameters
 %D   [internal][external]
 %D   [alfa,beta]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Leads to:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\internalalfa {\externalalfa}
 %D \def\internalbeta {\externalbeta}
-%D \stoptypen
+%D \stoptyping
 %D
 %D By using \type{\docopyvalue} we've prepared this command
 %D for use in a multi||lingual environment.
@@ -3051,19 +3051,19 @@
 %D A lot of \CONTEXT\ commands take optional arguments, for
 %D instance:
 %D
-%D \starttypen
+%D \starttyping
 %D \dothisorthat[alfa,beta]
 %D \dothisorthat[first=foo,second=bar]
 %D \dothisorthat[alfa,beta][first=foo,second=bar]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although a combined solution is possible, we prefer a
 %D seperation. The next command takes care of propper
 %D handling of such multi||faced commands.
 %D
-%D \starttypen
+%D \starttyping
 %D \doifassignmentelse {...} {then ...} {else ...}
-%D \stoptypen
+%D \stoptyping
 
 % not robust
 %
@@ -3090,9 +3090,9 @@
 %D Combining both in one \type{\if}||macro would lead to
 %D problems with nested \type{\if}'s.
 %D
-%D \starttypen
+%D \starttyping
 %D \checkparameters[argument]
-%D \stoptypen
+%D \stoptyping
 
 \newif\ifparameters
 
@@ -3110,10 +3110,10 @@
 %D It's possible to get an element from a commalist or a
 %D command representing a commalist.
 %D
-%D \starttypen
+%D \starttyping
 %D \getfromcommalist    [string] [n]
 %D \getfromcommacommand [string,\strings,string,...] [n]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The difference betwee the two of them is the same as the
 %D difference between \type{\processcomma...}. The found string
@@ -3122,10 +3122,10 @@
 %D We can calculate the size of a comma separated list by
 %D using:
 %D
-%D \starttypen
+%D \starttyping
 %D \getcommalistsize    [string,string,...]
 %D \getcommacommandsize [string,\strings,string,...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Afterwards, the length is available in the macro
 %D \type{\commalistsize} (not a \COUNTER).
@@ -3183,7 +3183,7 @@
 %D macro for those cases. The indirect call however slows
 %D down the other cases.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\p!dogetfirstfromcommalist    [#1,#2]{\def\commalistelement{#1}}
 %D \def\p!dogetsecondfromcommalist[#1,#2,#3]{\def\commalistelement{#2}}
 %D \let\p!dogetotherfromcommalist=\getfromcommalist
@@ -3198,7 +3198,7 @@
 %D    \else
 %D      \p!dogetotherfromcommalist[#1][#3]%
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Even worse, this alternative does not strip preceding
 %D spaces, which is what we want. So, we stick to the slow
@@ -3225,7 +3225,7 @@
 %D
 %D reports:
 %D
-%D \haalbuffer
+%D \getbuffer
 
 %D \macros
 %D   {dogetcommalistelement,dogetcommacommandelement}
@@ -3233,9 +3233,9 @@
 %D For low level (fast) purposes, we can also use the next
 %D alternative, which can handle 8~elements at most.
 %D
-%D \starttypen
+%D \starttyping
 %D \dogetcommalistelement1\from a,b,c\to\commalistelement
-%D \stoptypen
+%D \stoptyping
 
 \def\dodogetcommalistelement#1\from#2,#3,#4,#5,#6,#7,#8\to#9%
   {\edef#9{\ifcase#1\relax\or#2\or#3\or#4\or#5\or#6\or#7\or#8\fi}}
@@ -3262,30 +3262,30 @@
 %D \TEX' internal scanner for grabbing everything between
 %D arguments. Forgive me the funny names.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosingleargument\commando    = \commando[#1]
 %D \dodoubleargument\commando    = \commando[#1][#2]
 %D \dotripleargument\commando    = \commando[#1][#2][#3]
 %D \doquadrupleargument\commando = \commando[#1][#2][#3][#4]
 %D \doquintupleargument\commando = \commando[#1][#2][#3][#4][#5]
 %D \dosixtupleargument\commando  = \commando[#1][#2][#3][#4][#5][#6]
-%D \doseventupleargument\commando= \commando[#1][#2][#3][#4][#5][#6][#7]
-%D \stoptypen
+%D \doseventupleargument\command= \commando[#1][#2][#3][#4][#5][#6][#7]
+%D \stoptyping
 %D
 %D These macros are used in the following way:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosetupsomething[#1][#2]%
 %D   {... #1 ... #2 ...}
 %D
 %D \def\setupsomething%
 %D   {\dodoubleargument\dosetupsomething}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The implementation can be surprisingly simple and needs no
 %D further explanation, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosingleargument#1[#2]%
 %D   {#1[#2]}
 %D \def\dotripleargument#1[#2]#3[#4]#5[#6]%
@@ -3294,7 +3294,7 @@
 %D   {\def\dodoquintupleargument[##1]##2[##3]##4[##5]##6[##7]##8[##9]%
 %D      {#1[##1][##3][##5][##7][##9]}%
 %D    \dodoquintupleargument}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because \TEX\ accepts 9~arguments at most, we have to use
 %D two||step solution when getting five or more arguments.
@@ -3338,7 +3338,7 @@
 %D The empty argument supplying macros mentioned before, look
 %D like:
 %D
-%D \starttypen
+%D \starttyping
 %D \dosingleempty    \command
 %D \dodoubleempty    \command
 %D \dotripleempty    \command
@@ -3346,15 +3346,15 @@
 %D \doquintupleempty \command
 %D \dosixtupleempty  \command
 %D \doseventupleempty\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D So \type{\dodoubleempty} leades to:
 %D
-%D \starttypen
+%D \starttyping
 %D \command[#1][#2]
 %D \command[#1][]
 %D \command[][]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Depending of the generousity of the user. Afterwards one can
 %D use the \type{\if...argument} boolean. For novice: watch
@@ -3656,32 +3656,32 @@
 %D These maybe too mysterious macros enable us to handle more
 %D than one setup at once.
 %D
-%D \starttypen
+%D \starttyping
 %D \dosingleargumentwithset \command[#1]
 %D \dodoubleargumentwithset \command[#1][#2]
 %D \dotripleargumentwithset \command[#1][#2][#3]
 %D \dodoubleemptywithset    \command[#1][#2]
 %D \dotripleemptywithset    \command[#1][#2][#3]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The first macro calls \type{\command[##1]} for each string
 %D in the set~\type{#1}. The second one calls for
 %D \type{\commando[##1][#2]} and the third, well one may guess.
 %D These commands support constructions like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dodefinesomething[#1][#2]%
 %D   {\getparameters[\??xx#1][#2]}
 %D
 %D \def\definesomething%
 %D   {\dodoubleargumentwithset\dodefinesomething}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Which accepts calls like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definesomething[alfa,beta,...][variable=...,...]
-%D \stoptypen
+%D \stoptyping
 %D
 %D Now a whole bunch of variables like \type{\@@xxalfavariable}
 %D and \type{\@@xxbetavariable} is defined.
@@ -3727,9 +3727,9 @@
 %D The next macro can be very useful when using \type{\csname}
 %D like in:
 %D
-%D \starttypen
+%D \starttyping
 %D \csname if\strippedcsname\something\endcsname
-%D \stoptypen
+%D \stoptyping
 %D
 %D This expands to \type{\ifsomething}.
 
@@ -3743,35 +3743,35 @@
 %D prefixed by \type{\complex}, a command without one gets the
 %D prefix \type{\simple}. Commands like this can be defined by:
 %D
-%D \starttypen
+%D \starttyping
 %D \complexorsimple\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D When \type{\command} is followed by a \type{[setup]}, then
 %D
-%D \starttypen
+%D \starttyping
 %D \complexcommand [setup]
-%D \stoptypen
+%D \stoptyping
 %D
 %D executes, else we get
 %D
-%D \starttypen
+%D \starttyping
 %D \simplecommand
-%D \stoptypen
+%D \stoptyping
 %D
 %D An alternative for \type{\complexorsimple} is:
 %D
-%D \starttypen
+%D \starttyping
 %D \complexorsimpleempty {command}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Depending on the presence of \type{[setup]}, this one
 %D leads to one of:
 %D
-%D \starttypen
+%D \starttyping
 %D \complexcommando [setup]
 %D \complexcommando []
-%D \stoptypen
+%D \stoptyping
 %D
 %D Many \CONTEXT\ commands started as complex or simple ones,
 %D but changed into more versatile (more object oriented) ones
@@ -3880,16 +3880,16 @@
 
 %D These commands are called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \definecomplexorsimple\command
-%D \stoptypen
+%D \stoptyping
 %D
 %D Of course, we must have available
 %D
-%D \starttypen
+%D \starttyping
 %D \def\complexcommand[#1]{...}
 %D \def\simplecommand     {...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Using this construction saves a few string now and then.
 
@@ -3904,32 +3904,32 @@
 %D We won't go into details here, but the general form of
 %D this using this command is:
 %D
-%D \starttypen
+%D \starttyping
 %D \definestartstopcommand\somecommand\e!specifier{arg}{arg}%
 %D   {do something with arg}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This expands to something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\somecommand arg \startspecifier arg \stopspecifier%
 %D   {do something with arg}
-%D \stoptypen
+%D \stoptyping
 %D
 %D The arguments can be anything reasonable, but double
 %D \type{#}'s are needed in the specification part, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definestartstopcommand\somecommand\e!specifier{[##1][##2]}{##3}%
 %D   {do #1 something #2 with #3 arg}
-%D \stoptypen
+%D \stoptyping
 %D
 %D which becomes:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\somecommand[#1][#2]\startspecifier#3\stopspecifier%
 %D   {do #1 something #2 with #3 arg}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We will see some real applications of this command in the
 %D core modules.
@@ -3955,19 +3955,19 @@
 %D optional arguments between \type{[]}. The next two commands
 %D handle the ones with \type{{}}. They are called as:
 %D
-%D \starttypen
+%D \starttyping
 %D \dosinglegroupempty    \ineedONEargument
 %D \dodoublegroupempty    \ineedTWOarguments
 %D \dotriplegroupempty    \ineedTHREEarguments
 %D \doquadruplegroupempty \ineedFOURarguments
 %D \doquintuplegroupempty \ineedFIVEarguments
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\ineedONEargument} takes one and the others
 %D two and three arguments. These macro's were first needed in
 %D \PPCHTEX.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dogetgroupargument#1#2% redefined in mult-ini
 %D   {\def\nextnextargument%
 %D      {\ifx\nextargument\bgroup
@@ -3989,7 +3989,7 @@
 %D       \fi%\fi\fi                 % so let's get rid of it
 %D       \nextargument}%
 %D    \futurelet\nextargument\nextnextargument}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In order to catch \type {\nextargument}'s that expand to
 %D \type {\if} and friends, in practice we will use a
@@ -4153,7 +4153,7 @@
 %D These macros can explictly take care of spaces, which means
 %D that the next definition and calls are valid:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\test#1#2#3{[#1#2#3]}
 %D
 %D \dotriplegroupempty\test {a}{b}{c}
@@ -4165,7 +4165,7 @@
 %D \dotriplegroupempty\test
 %D   {a}
 %D   {b}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And alike.
 
@@ -4226,11 +4226,11 @@
 %D we will also introduce a mechanism for message passing. For
 %D the moment we stick to the core macros:
 %D
-%D \starttypen
+%D \starttyping
 %D \writestring {string}
 %D \writeline
 %D \writestatus {category} {message}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Messages are formatted. One can provide the maximum with
 %D of the identification string with the macro
@@ -4305,14 +4305,14 @@
 
 %D Because we're grouped, we could have initialized at forehand:
 %D
-%D \starttypen
+%D \starttyping
 %D \statuscounter\statuswidth
-%D \stoptypen
+%D \stoptyping
 
 %D The next implementation saves only some 10 words of format
 %D memory, but we hardly gain any speed.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\dosplitstatus#1#2#3#4#5#6#7#8#9%
 %D   {#1#2#3#4#5#6#7#8#9\dodosplitstatus}
 %D
@@ -4326,7 +4326,7 @@
 %D         \space\space\space\space\space
 %D         \space\space\space\space\space\end
 %D         \space:\space#2}}
-%D \stoptypen
+%D \stoptyping
 
 %D Okay then. More obscure but slightly faster: no split grabs
 %D the do split part and skipping the else branch has to happen
@@ -4371,4 +4371,4 @@
 %D Well, the real final command is the one that resets the
 %D unprotected characters \type{@}, \type{?} and \type{!}.
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-new.tex b/tex/context/base/syst-new.tex
index 6a167dfa3..516c31095 100644
--- a/tex/context/base/syst-new.tex
+++ b/tex/context/base/syst-new.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=supp-new,
+%D   [       filefile=supp-new,
 %D        version=1997.01.03,
 %D          title=\CONTEXT\ Support Macros,
 %D       subtitle=New Ones,
@@ -18,7 +18,7 @@
 
 % moved from core-ntb
 
-\def\v!oddeven#1{\ifodd#1\v!oneven\else\v!even\fi}
+\def\v!oddeven#1{\ifodd#1\v!odd\else\v!even\fi}
 
 % For myself
 
@@ -274,7 +274,7 @@
 % \def\maximizespacing%
 %   {\maximizeskip\blankoskipamount
 %    \maximizeskip\parskip
-%    \maximizeskip\tussenwit
+%    \maximizeskip\ctxparskip
 %    \maximizeskip\baselineskip
 %    \maximizeskip\bigskipamount
 %    \maximizeskip\medskipamount
@@ -381,10 +381,10 @@
 %D the next macros to add|/|subtract a series of dimensions
 %D to a register or macro.
 %D
-%D \starttypen
-%D \adddimenregister 10pt 5pt \papierbreedte \to \somedimen
-%D \adddimenmacro    10pt 5pt \papierbreedte \to \bagger
-%D \stoptypen
+%D \starttyping
+%D \adddimenregister 10pt 5pt \paperwidth \to \somedimen
+%D \adddimenmacro    10pt 5pt \paperwidth \to \bagger
+%D \stoptyping
 
 \newdimen\dimentoaddto
 
@@ -412,18 +412,18 @@
 %D
 %D This macro is use as:
 %D
-%D \starttypen
-%D \freezedimenmacro\linkermargeafstand
-%D \stoptypen
+%D \starttyping
+%D \freezedimenmacro\leftmargindistance
+%D \stoptyping
 
 \def\freezedimenmacro#1%
   {\scratchdimen#1\edef#1{\the\scratchdimen}}
 
 %D The next one is slower:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\freezedimenmacro#1{\edef#1{\the\dimexpr(#1)}}
-%D \stoptypen
+%D \stoptyping
 
 % \newcount\rawrecursecounter
 %
@@ -443,12 +443,12 @@
 %    \dodorawrecurse}
 
 %D The next macro negates a macro (dimension or number, or actually, whatever.
-%D It's a typical example of \if usage:
+%D It's a typical example of \type {\if} usage:
 %D
-%D \starttypen
+%D \starttyping
 %D \if-\whatever \else-\whatever\fi => else => -whatever
 %D \if--\whatever\else-\whatever\fi => then =>  whatever
-%D \stoptypen
+%D \stoptyping
 
 \def\negated#1{\if-#1\else-#1\fi} % does only work in macros or text
 
@@ -606,4 +606,4 @@
 \def\appendvalue #1{\@EA\appended\@EA \def\csname#1\endcsname}
 \def\appendgvalue#1{\@EA\appended\@EA\gdef\csname#1\endcsname}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-omg.tex b/tex/context/base/syst-omg.tex
index 3e5b4a536..23c11df12 100644
--- a/tex/context/base/syst-omg.tex
+++ b/tex/context/base/syst-omg.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-omg,
+%D   [       filefile=syst-omg,
 %D        version=2000.09.09,
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=A couple of Omega goodies,
@@ -110,4 +110,4 @@
 
 \fi
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/syst-pln.tex b/tex/context/base/syst-pln.tex
index a80f624c6..b2744859f 100644
--- a/tex/context/base/syst-pln.tex
+++ b/tex/context/base/syst-pln.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-pln,
+%D   [       filefile=syst-pln,
 %D        version=2001.11.16, % 1999.03.17,  % an oldie: 1995.10.10
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Efficient \PLAIN\ \TEX\ loading,
@@ -104,10 +104,10 @@
 %D In plain \TEX\ the following explanation about the register
 %D allocation mechanism is given:
 %D
-%D \startsmaller
+%D \startnarrower
 %D The following counters are reserved:
 %D
-%D \starttabulatie
+%D \starttabulate
 %D \NC 0--9 \NC page numbering \NC \NR
 %D \NC 10   \NC count allocation \NC \NR
 %D \NC 11   \NC dimen allocation \NC \NR
@@ -122,7 +122,7 @@
 %D \NC 20   \NC insert allocation \NC \NR
 %D \NC 21   \NC the most recently allocated number \NC \NR
 %D \NC 22   \NC constant $-1$ \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D New counters are allocated starting with 23, 24, etc. Other
 %D registers are allocated starting with 10. This leaves 0
@@ -146,7 +146,7 @@
 %D with respect to registers 0, 2, 4, 6, 8, 255. This will
 %D prevent \quote {save stack buildup} that might otherwise
 %D occur.
-%D \stopsmaller
+%D \stopnarrower
 %D
 %D We well overload some macros in \ETEX\ mode.
 
@@ -169,10 +169,10 @@
 
 \def\wlog{\immediate\write\m@ne} % write on log file (only)
 
-%D \startsmaller
+%D \startnarrower
 %D Here are abbreviations for the names of scratch registers
 %D that don't need to be allocated.
-%D \stopsmaller
+%D \stopnarrower
 
 \countdef \count@   = 255
 \dimendef \dimen@   =   0
@@ -181,7 +181,7 @@
 \skipdef  \skip@    =   0
 \toksdef  \toks@    =   0
 
-%D \startsmaller
+%D \startnarrower
 %D Now, we define \type {\newcount}, \type {\newbox}, etc. so
 %D that you can say \newcount\foo and \type {\foo} will be
 %D defined (with \type {\countdef}) to be the next counter. To
@@ -189,7 +189,7 @@
 %D \type {\allocationnumber}. Since there's no \type {\boxdef}
 %D command, \type {\chardef} is used to define a \type
 %D {\newbox}, \type {\newinsert}, \type {\newfam}, and so on.
-%D \stopsmaller
+%D \stopnarrower
 
 \def\newcount   {\alloc@0\count   \countdef \insc@unt}
 \def\newdimen   {\alloc@1\dimen   \dimendef \insc@unt}
@@ -237,16 +237,16 @@
 %D We define \type {\newif} a la plain \TEX, but will
 %D redefine it later. As Knuth says:
 %D
-%D \startsmaller
+%D \startnarrower
 %D And here's a different sort of allocation: for example,
 %D
-%D \starttypen
+%D \starttyping
 %D \newif\iffoo
-%D \stoptypen
+%D \stoptyping
 %D
 %D creates \type {\footrue}, \type {\foofalse} to go
 %D with \type {\iffoo}.
-%D \stopsmaller
+%D \stopnarrower
 
 \def\newif#1%
   {\count@\escapechar
diff --git a/tex/context/base/syst-prm.tex b/tex/context/base/syst-prm.tex
index bb34cb4d8..48536a256 100644
--- a/tex/context/base/syst-prm.tex
+++ b/tex/context/base/syst-prm.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-prm,
+%D   [       filefile=syst-prm,
 %D        version=1999.03.17,
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Primitive Behavior, 
diff --git a/tex/context/base/syst-tex.tex b/tex/context/base/syst-tex.tex
index 00a785c7d..8128e4ff4 100644
--- a/tex/context/base/syst-tex.tex
+++ b/tex/context/base/syst-tex.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=syst-pln,
+%D   [       filefile=syst-pln,
 %D        version=1999.03.17,  % an oldie: 1995.10.10
 %D          title=\CONTEXT\ System Macros,
 %D       subtitle=Efficient \PLAIN\ \TEX\ loading,
@@ -115,7 +115,7 @@
 %D By bypassing fonts, some definitions become less valid so
 %D we have to redefine them afterwards.
 %D
-%D \starttypen
+%D \starttyping
 %D \let\normalbordermatrix=\bordermatrix
 %D
 %D \def\bordermatrix%
@@ -124,7 +124,7 @@
 %D    \global\p@renwd=\wd0\relax
 %D    \egroup
 %D    \normalbordermatrix}
-%D \stoptypen
+%D \stoptyping
 
 %D Now we are ready for loading \PLAIN\ \TEX. Of couse we use
 %D \type{\normalinput} and not \type{\input}.
diff --git a/tex/context/base/thrd-ran.tex b/tex/context/base/thrd-ran.tex
index 63b3e1371..7a186204b 100644
--- a/tex/context/base/thrd-ran.tex
+++ b/tex/context/base/thrd-ran.tex
@@ -98,10 +98,10 @@
 % %D The next macro is not needed in \CONTEXT, which provides
 % %D the \type {\withoutpt} macro.
 % %D
-% %D \starttypen
+% %D \starttyping
 % %D \def\pointless{\expandafter\PoinTless\the}
 % %D {\catcode`p=12 \catcode`t=12 \gdef\PoinTless#1pt{#1}}
-% %D \stoptypen
+% %D \stoptyping
 %
 % \catcode`\@=\randomi
 % \global\randomi=0
@@ -165,4 +165,4 @@
      \expandafter\getr@nval
    \fi}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/thrd-trg.tex b/tex/context/base/thrd-trg.tex
index 32e042b38..3fce672d5 100644
--- a/tex/context/base/thrd-trg.tex
+++ b/tex/context/base/thrd-trg.tex
@@ -111,4 +111,4 @@
 
 %D Usage: \type {\calculatesin{10}} and \type {\calculatedsin{10}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/type-akb.tex b/tex/context/base/type-akb.tex
index af2ba760c..196b13be5 100644
--- a/tex/context/base/type-akb.tex
+++ b/tex/context/base/type-akb.tex
@@ -17,17 +17,17 @@
 %D and maps to the standard postscript fonts conforming the
 %D psnfss system as used by \LaTeX.
 %D
-%D \starttypen
-%D \setupencoding[default=texnansi]
+%D \starttyping
+%D \setupencoding[defaultdefault=texnansi]
 %D \usetypescript[adobekb][\defaultencoding]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The following is not needed since the file is already
 %D registered:
 %D
-%D \starttypen
+%D \starttyping
 %D \usetypescriptfile[akb]
-%D \stoptypen
+%D \stoptyping
 
 \starttypescript [adobekb] [8r]
 
@@ -199,4 +199,4 @@
 
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-cbg.tex b/tex/context/base/type-cbg.tex
new file mode 100644
index 000000000..4f8070ba6
--- /dev/null
+++ b/tex/context/base/type-cbg.tex
@@ -0,0 +1,349 @@
+%D \module
+%D   [       file=type-cbg,
+%D        version=2004.08.23,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=CB Greek,
+%D         author={Giuseppe Bilotta, Hans Hagen},
+%D           date=\currentdate,
+%D      copyright=PRAGMA-ADE]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% legend:
+%
+% g=greek
+% r=regular s=sansserif t=typewriter
+% m=medium x=boldextended t=monospaced
+% n=normal o=oblique i=italic u=uprightitalic c=smallcaps
+
+% ruby script to make small zip file:
+%
+% zipfile = 'cbsmall.zip'
+%
+% fontfiles = Array.new
+%
+% fontfiles.push(Dir.glob("fonts/{tfm,vf,afm,type1}/public/cb/{gr,gs,gt}{m,s,t}{n,o,i,u,c}{0800,1000,1200}.{tfm,afm,pfb}"))
+% fontfiles.push(Dir.glob("fonts/{map,enc,lig}/{dvips,pdftex,dvipdfm,dvipdfmx}/cb/{cbgreek,cbsmall}.{map,enc,lig}"))
+%
+% File.delete(zipfile) if FileTest.file?(zipfile)
+% system("zip -r -9 cbsmall #{fontfiles.join(' ')}")
+
+\starttypescript [serif] [cbgreek] [name]
+
+  \definefontsynonym [CBGreek-Regular-Medium-Normal]              [grmn1000]
+  \definefontsynonym [CBGreek-Regular-Medium-Oblique]             [grmo1000]
+  \definefontsynonym [CBGreek-Regular-Medium-Italic]              [grmi1000]
+  \definefontsynonym [CBGreek-Regular-Medium-UprightItalic]       [grmu1000]
+  \definefontsynonym [CBGreek-Regular-Medium-Caps]                [grmc1000]
+  \definefontsynonym [CBGreek-Regular-Medium-Leipzig]             [grml1000]
+  \definefontsynonym [CBGreek-Regular-Medium-Roman]               [grmr1000]
+
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Normal]        [grxn1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Oblique]       [grxo1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Italic]        [grxi1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-UprightItalic] [grxu1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Caps]          [grxc1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Leipzig]       [grxl1000]
+  \definefontsynonym [CBGreek-Regular-BoldExtended-Roman]         [grxr1000]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek] [name]
+
+  \definefontsynonym [CBGreek-Sans-Medium-Normal]              [gsmn1000]
+  \definefontsynonym [CBGreek-Sans-Medium-Oblique]             [gsmo1000]
+  \definefontsynonym [CBGreek-Sans-Medium-Italic]              [gsmi1000]
+  \definefontsynonym [CBGreek-Sans-Medium-UprightItalic]       [gsmu1000]
+  \definefontsynonym [CBGreek-Sans-Medium-Caps]                [gsmc1000]
+  \definefontsynonym [CBGreek-Sans-Medium-Leipzig]             [gsml1000]
+  \definefontsynonym [CBGreek-Sans-Medium-Roman]               [gsmr1000]
+
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Normal]        [gsxn1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Oblique]       [gsxo1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Italic]        [gsxi1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-UprightItalic] [gsxu1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Caps]          [gsxc1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Leipzig]       [gsxl1000]
+  \definefontsynonym [CBGreek-Sans-BoldExtended-Roman]         [gsxr1000]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek] [name]
+
+  \definefontsynonym [CBGreek-Mono-Medium-Normal]        [gttn1000]
+  \definefontsynonym [CBGreek-Mono-Medium-Oblique]       [gtto1000]
+  \definefontsynonym [CBGreek-Mono-Medium-Italic]        [gtti1000]
+  \definefontsynonym [CBGreek-Mono-Medium-UprightItalic] [gttu1000]
+  \definefontsynonym [CBGreek-Mono-Medium-Caps]          [gttc1000]
+  \definefontsynonym [CBGreek-Mono-Medium-Leipzig]       [gttl1000]
+  \definefontsynonym [CBGreek-Mono-Medium-Roman]         [gttr1000]
+
+\stoptypescript
+
+\starttypescript [serif] [cbgreek] [name]
+
+  \definefontsynonym [Serif]            [CBGreek-Regular-Medium-Normal]
+  \definefontsynonym [SerifSlanted]     [CBGreek-Regular-Medium-Oblique]
+  \definefontsynonym [SerifItalic]      [CBGreek-Regular-Medium-Italic]
+  \definefontsynonym [SerifCaps]        [CBGreek-Regular-Medium-Caps]
+  \definefontsynonym [SerifBold]        [CBGreek-Regular-BoldExtended-Normal]
+  \definefontsynonym [SerifBoldSlanted] [CBGreek-Regular-BoldExtended-Oblique]
+  \definefontsynonym [SerifBoldItalic]  [CBGreek-Regular-BoldExtended-Italic]
+  \definefontsynonym [SerifBoldCaps]    [CBGreek-Regular-BoldExtended-Caps]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek] [name]
+
+  \definefontsynonym [Sans]            [CBGreek-Sans-Medium-Normal]
+  \definefontsynonym [SansSlanted]     [CBGreek-Sans-Medium-Oblique]
+  \definefontsynonym [SansItalic]      [CBGreek-Sans-Medium-Italic]
+  \definefontsynonym [SansCaps]        [CBGreek-Sans-Medium-Caps]
+  \definefontsynonym [SansBold]        [CBGreek-Sans-BoldExtended-Normal]
+  \definefontsynonym [SansBoldSlanted] [CBGreek-Sans-BoldExtended-Oblique]
+  \definefontsynonym [SansBoldItalic]  [CBGreek-Sans-BoldExtended-Italic]
+  \definefontsynonym [SansBoldCaps]    [CBGreek-Sans-BoldExtended-Caps]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek] [name]
+
+  \definefontsynonym [Mono]        [CBGreek-Typewriter-Medium-Normal]
+  \definefontsynonym [MonoSlanted] [CBGreek-Typewriter-Medium-Oblique]
+  \definefontsynonym [MonoItalic]  [CBGreek-Typewriter-Medium-Italic]
+  \definefontsynonym [MonoCaps]    [CBGreek-Typewriter-Medium-Caps]
+
+\stoptypescript
+
+% Please note that we use Bold Extended instead of Bold
+
+\starttypescript [serif] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [rm]
+    [tf=grmn0500 sa 1,sl=grmo0500 sa 1,it=grmi0500 sa 1,
+     bf=grxn0500 sa 1,bs=grxo0500 sa 1,bi=grxi0500 sa 1,
+     sc=grmc0500 sa 1]
+
+  \definebodyfont [6pt] [rm]
+    [tf=grmn0600,sl=grmo0600,it=grmi0600,
+     bf=grxn0600,bs=grxo0600,bi=grxi0600,
+     sc=grmc0600]
+
+  \definebodyfont [7pt] [rm]
+    [tf=grmn0700,sl=grmo0700,it=grmi0700,
+     bf=grxn0700,bs=grxo0700,bi=grxi0700,
+     sc=grmc0700]
+
+  \definebodyfont [8pt] [rm]
+    [tf=grmn0800,sl=grmo0800,it=grmi0800,
+     bf=grxn0800,bs=grxo0800,bi=grxi0800,
+     sc=grmc0800]
+
+  \definebodyfont [9pt] [rm]
+    [tf=grmn0900,sl=grmo0900,it=grmi0900,
+     bf=grxn0900,bs=grxo0900,bi=grxi0900,
+     sc=grmc0900]
+
+  \definebodyfont [10pt] [rm]
+    [tf=grmn1000,sl=grmo1000,it=grmi1000,
+     bf=grxn1000,bs=grxo1000,bi=grxi1000,
+     sc=grmc1000]
+
+  \definebodyfont [11pt] [rm]
+    [tf=grmn1095,sl=grmo1095,it=grmi1095,
+     bf=grxn1095,bs=grxo1095,bi=grxi1095,
+     sc=grmc1095]
+
+  \definebodyfont [12pt] [rm]
+    [tf=grmn1200,sl=grmo1200,it=grmi1200,
+     bf=grxn1200,bs=grxo1200,bi=grxi1200,
+     sc=grmc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [rm]
+    [tf=grmn1440 sa 1,sl=grmo1440 sa 1,it=grmi1440 sa 1,
+     bf=grxn1440 sa 1,bs=grxo1440 sa 1,bi=grxi1440 sa 1,
+     sc=grmc1440 sa 1]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [ss]
+    [tf=gsmn0500 sa 1,sl=gsmo0500 sa 1,it=gsmi0500 sa 1,
+     bf=gsxn0500 sa 1,bs=gsxo0500 sa 1,bi=gsxi0500 sa 1,
+     sc=gsmc0500 sa 1]
+
+  \definebodyfont [6pt] [ss]
+    [tf=gsmn0600,sl=gsmo0600,it=gsmi0600,
+     bf=gsxn0600,bs=gsxo0600,bi=gsxi0600,
+     sc=gsmc0600]
+
+  \definebodyfont [7pt] [ss]
+    [tf=gsmn0700,sl=gsmo0700,it=gsmi0700,
+     bf=gsxn0700,bs=gsxo0700,bi=gsxi0700,
+     sc=gsmc0700]
+
+  \definebodyfont [8pt] [ss]
+    [tf=gsmn0800,sl=gsmo0800,it=gsmi0800,
+     bf=gsxn0800,bs=gsxo0800,bi=gsxi0800,
+     sc=gsmc0800]
+
+  \definebodyfont [9pt] [ss]
+    [tf=gsmn0900,sl=gsmo0900,it=gsmi0900,
+     bf=gsxn0900,bs=gsxo0900,bi=gsxi0900,
+     sc=gsmc0900]
+
+  \definebodyfont [10pt] [ss]
+    [tf=gsmn1000,sl=gsmo1000,it=gsmi1000,
+     bf=gsxn1000,bs=gsxo1000,bi=gsxi1000,
+     sc=gsmc1000]
+
+  \definebodyfont [11pt] [ss]
+    [tf=gsmn1095,sl=gsmo1095,it=gsmi1095,
+     bf=gsxn1095,bs=gsxo1095,bi=gsxi1095,
+     sc=gsmc1095]
+
+  \definebodyfont [12pt] [ss]
+    [tf=gsmn1200,sl=gsmo1200,it=gsmi1200,
+     bf=gsxn1200,bs=gsxo1200,bi=gsxi1200,
+     sc=gsmc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [ss]
+    [tf=gsmn1440 sa 1,sl=gsmo1440 sa 1,it=gsmi1440 sa 1,
+     bf=gsxn1440 sa 1,bs=gsxo1440 sa 1,bi=gsxi1440 sa 1,
+     sc=gsmc1440 sa 1]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek-all] [size]
+
+  \definebodyfont [4pt,5pt] [tt]
+    [tf=gttn0500 sa 1,sl=gtto0500 sa 1,it=gtti0500 sa 1,
+     sc=gttc0500 sa 1]
+
+  \definebodyfont [6pt] [tt]
+    [tf=gttn0600,sl=gtto0600,it=gtti0600,
+     sc=gttc0600]
+
+  \definebodyfont [7pt] [tt]
+    [tf=gttn0700,sl=gtto0700,it=gtti0700,
+     sc=gttc0700]
+
+  \definebodyfont [8pt] [tt]
+    [tf=gttn0800,sl=gtto0800,it=gtti0800,
+     sc=gttc0800]
+
+  \definebodyfont [9pt] [tt]
+    [tf=gttn0900,sl=gtto0900,it=gtti0900,
+     sc=gttc0900]
+
+  \definebodyfont [10pt] [tt]
+    [tf=gttn1000,sl=gtto1000,it=gtti1000,
+     sc=gttc1000]
+
+  \definebodyfont [11pt] [tt]
+    [tf=gttn1095,sl=gtto1095,it=gtti1095,
+     sc=gttc1095]
+
+  \definebodyfont [12pt] [tt]
+    [tf=gttn1200,sl=gtto1200,it=gtti1200,
+     sc=gttc1200]
+
+  \definebodyfont [14.4pt,17.3pt,20.7pt] [tt]
+    [tf=gttn1440 sa 1,sl=gtto1440 sa 1,it=gtti1440 sa 1,
+     sc=gttc1440 sa 1]
+
+\stoptypescript
+
+\starttypescript [serif] [cbgreek-some] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [rm]
+    [tf=grmn0800 sa 1,sl=grmo0800 sa 1,it=grmi0800 sa 1,
+     bf=grxn0800 sa 1,bs=grxo0800 sa 1,bi=grxi0800 sa 1,
+     sc=grmc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [rm]
+    [tf=grmn1000 sa 1,sl=grmo1000 sa 1,it=grmi1000 sa 1,
+     bf=grxn1000 sa 1,bs=grxo1000 sa 1,bi=grxi1000 sa 1,
+     sc=grmc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [rm]
+    [tf=grmn1200 sa 1,sl=grmo1200 sa 1,it=grmi1200 sa 1,
+     bf=grxn1200 sa 1,bs=grxo1200 sa 1,bi=grxi1200 sa 1,
+     sc=grmc1200 sa 1]
+
+\stoptypescript
+
+\starttypescript [sans] [cbgreek-some] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [ss]
+    [tf=gsmn0800 sa 1,sl=gsmo0800 sa 1,it=gsmi0800 sa 1,
+     bf=gsxn0800 sa 1,bs=gsxo0800 sa 1,bi=gsxi0800 sa 1,
+     sc=gsmc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [ss]
+    [tf=gsmn1000 sa 1,sl=gsmo1000 sa 1,it=gsmi1000 sa 1,
+     bf=gsxn1000 sa 1,bs=gsxo1000 sa 1,bi=gsxi1000 sa 1,
+     sc=gsmc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [ss]
+    [tf=gsmn1200 sa 1,sl=gsmo1200 sa 1,it=gsmi1200 sa 1,
+     bf=gsxn1200 sa 1,bs=gsxo1200 sa 1,bi=gsxi1200 sa 1,
+     sc=gsmc1200 sa 1]
+
+\stoptypescript
+
+\starttypescript [mono] [cbgreek-some] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt,9pt] [tt]
+    [tf=gttn0800 sa 1,sl=gtto0800 sa 1,it=gtti0800 sa 1,
+     sc=gttc0800 sa 1]
+
+  \definebodyfont [10pt,11pt] [tt]
+    [tf=gttn1000 sa 1,sl=gtto1000 sa 1,it=gtti1000 sa 1,
+     sc=gttc1000 sa 1]
+
+  \definebodyfont [12pt,14.4pt,17.3pt,20.7pt] [tt]
+    [tf=gttn1200 sa 1,sl=gtto1200 sa 1,it=gtti1200 sa 1,
+     sc=gttc1200 sa 1]
+
+\stoptypescript
+
+\starttypescript [map] [cbgreek]
+  \loadmapfile [cbgreek.map]
+% \loadmapfile [cbsmall.map]
+\stoptypescript
+
+\starttypescript [cbgreek-all]
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-all]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [cbgreek-all]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [cbgreek-all]
+
+\stoptypescript
+
+\starttypescript [cbgreek-some] % lowercase, patched HH
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [cbgreek-some]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [cbgreek-some]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [cbgreek-some]
+
+\stoptypescript
+
+\starttypescript [cbgreek] % lowercase, patched HH
+
+  \definebodyfontenvironment [cbgreek] [default] []
+
+  \definetypeface [cbgreek] [rm] [serif] [cbgreek] [default]
+  \definetypeface [cbgreek] [ss] [sans]  [cbgreek] [default]
+  \definetypeface [cbgreek] [tt] [mono]  [cbgreek] [default]
+
+\stoptypescript
+
+\endinput
diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex
index 1ecd20247..18ca0c927 100644
--- a/tex/context/base/type-enc.tex
+++ b/tex/context/base/type-enc.tex
@@ -1257,4 +1257,4 @@
 
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex
index d86f8c41f..b9dfd0049 100644
--- a/tex/context/base/type-exa.tex
+++ b/tex/context/base/type-exa.tex
@@ -201,4 +201,4 @@
 
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex
index 8c8b3d345..342fe59b9 100644
--- a/tex/context/base/type-ini.tex
+++ b/tex/context/base/type-ini.tex
@@ -1,6 +1,3 @@
-% wat te doen met casual, evt `cs', danwel een manier om te
-% mappen (zie showcase)
-
 %D \module
 %D   [       file=type-ini,
 %D        version=2001.03.05,
@@ -14,6 +11,9 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+% wat te doen met casual, evt `cs', danwel een manier om te
+% mappen (zie showcase)
+
 \writestatus{loading}{Context Typescript Macros (ini)}
 
 \unprotect
@@ -43,8 +43,12 @@
 \let\@@typescripttwo  \empty \let\typescripttwo  \empty
 \let\@@typescriptthree\empty \let\typescriptthree\empty
 
-\unexpanded\def\usetypescript
-  {\dotripleempty\dousetypescript}
+% method 2 is for Hans van der Meer
+
+\chardef\typescriptmethod\plusone % 1: empty==all==true  2: empty==false
+
+\unexpanded\def\usetypescript     {\chardef\typescriptmethod\plusone\dotripleempty\dousetypescript}
+\unexpanded\def\usetypescriptexact{\chardef\typescriptmethod\plustwo\dotripleempty\dousetypescript}
 
 \def\dousetypescript[#1][#2][#3]%
   {\expanded{\dodousetypescript[#1][#2][#3]}}
@@ -56,12 +60,14 @@
    \pushmacro\typescriptone
    \pushmacro\typescripttwo
    \pushmacro\typescriptthree
+   \pushmacro\typescriptmethod
    \pushmacro\stoptypescript
    \typescriptfoundfalse
    \writestatus\m!fonts{[\@@typescriptone] [\@@typescripttwo] [\@@typescriptthree]}%
    \processcommacommand[\typescriptfiles]\dododousetypescript
    \firsttypescriptpassfalse % testen
    \popmacro\stoptypescript
+   \popmacro\typescriptmethod
    \popmacro\typescriptthree
    \popmacro\typescripttwo
    \popmacro\typescriptone
@@ -98,9 +104,7 @@
 
 \def\truetypescript#1%
   {\expandafter\ifx\csname\??tm#1\endcsname\relax
-     #1%
-   \else
-     \@EA\truetypescript\csname\??tm#1\endcsname
+     #1\else\@EA\truetypescript\csname\??tm#1\endcsname
    \fi}
 
 \endTEX
@@ -109,9 +113,7 @@
 
 \def\truetypescript#1%
   {\ifcsname\??tm#1\endcsname
-     \@EA\truetypescript\csname\??tm#1\endcsname
-   \else
-     #1%
+     \@EA\truetypescript\csname\??tm#1\endcsname\else#1%
    \fi}
 
 \endETEX
@@ -126,51 +128,13 @@
 
 \prependtoks\firsttypescriptpasstrue\to\everyjob
 
-% \def\dochecktypescript#1#2#3% script use value
-%   {\donefalse
-%    \doifelsenothing{#1}\donetrue
-%      {\doifelse{#2}{all}\donetrue
-%         {\doifelse{#1}{all}\donetrue
-%            {\fullexpandtwoargsafter\doifcommonelse{#1}{#2}\donetrue\donefalse
-%             \ifdone\let#3\commalistelement\fi}}}}
-%
-% \def\starttypescript%
-%   {\dotripleempty\dostarttypescript}
-%
-% \long\def\dostarttypescript[#1][#2][#3]#4\stoptypescript
-%   {\iffirstargument
-%      \let\typescriptone  \@@typescriptone
-%      \let\typescripttwo  \@@typescripttwo
-%      \let\typescriptthree\@@typescriptthree
-%      \dochecktypescript{#1}\@@typescriptone  \typescriptone   \ifdone
-%      \dochecktypescript{#2}\@@typescripttwo  \typescripttwo   \ifdone
-%      \dochecktypescript{#3}\@@typescriptthree\typescriptthree \ifdone
-%        %\writestatus
-%        \debuggerinfo
-%          {typescript}
-%          {\currenttypefile: use=scr (val)
-%             [\@@typescriptone  =#1 (\typescriptone)]
-%             [\@@typescripttwo  =#2 (\typescripttwo)]
-%             [\@@typescriptthree=#3 (\typescriptthree)]}%
-%         #4\typescriptfoundtrue
-%      \fi\fi\fi
-%    \else\iffirsttypescriptpass
-%      \pushmacro\fontclass
-%      #4%
-%      \popmacro\fontclass
-%    \else
-%      % skip this since it may do unwanted resets, like
-%      % setting symbolic font names to unknown, especially
-%      % in run time user type scripts
-%    \fi\fi}
-
 \def\typescript@@all{all}
 
 \def\dochecktypescript#1#2#3% script use value
   {\donefalse
    \def\@@typescriptcheck{#1}%
    \ifx\@@typescriptcheck\empty
-     \donetrue
+     \ifcase\typescriptmethod\or\donetrue\else\donefalse\fi
    \else\ifx#2\typescript@@all
      \donetrue
    \else\ifx\@@typescriptcheck\typescript@@all
@@ -183,44 +147,6 @@
 \def\starttypescript
   {\dotripleempty\dostarttypescript}
 
-% \long\def\dostarttypescript[#1][#2][#3]% #4\stoptypescript
-%   {\iffirstargument
-%      \let\typescriptone  \@@typescriptone
-%      \let\typescripttwo  \@@typescripttwo
-%      \let\typescriptthree\@@typescriptthree
-%      \dochecktypescript{#1}\@@typescriptone  \typescriptone
-%      \ifdone
-%        \dochecktypescript{#2}\@@typescripttwo  \typescripttwo
-%        \ifdone
-%          \dochecktypescript{#3}\@@typescriptthree\typescriptthree
-%          \ifdone
-%            %\debuggerinfo
-%            %  {typescript}
-%            %  {\currenttypefile: use=scr (val)
-%            %     [\@@typescriptone  =#1 (\typescriptone)]
-%            %     [\@@typescripttwo  =#2 (\typescripttwo)]
-%            %     [\@@typescriptthree=#3 (\typescriptthree)]}%
-%            \typescriptfoundtrue
-%            \let\next\dostarttypescriptA
-%          \else
-%            \let\next\dostarttypescriptC
-%          \fi
-%        \else
-%          \let\next\dostarttypescriptC
-%        \fi
-%      \else
-%        \let\next\dostarttypescriptC
-%      \fi
-%    \else\iffirsttypescriptpass
-%      \let\next\dostarttypescriptB
-%    \else
-%      % skip this since it may do unwanted resets, like
-%      % setting symbolic font names to unknown, especially
-%      % in run time user type scripts
-%      \let\next\dostarttypescriptC
-%    \fi\fi
-%    \next}
-
 \newif\iftracetypescripts
 
 \long\def\dostarttypescript[#1][#2][#3]% #4\stoptypescript
@@ -280,13 +206,13 @@
 % 2 reported
 % 3 preloaded
 
-% flags ipv \c!status, more flag values
+% flags ipv \c!state, more flag values
 
 % \def\preloadmapfile[#1]%
 %   {\def\docommando##1%
 %      {\doifinstringelse{.}{##1}
 %         {\writestatus{pdftex}{compensate map file: ##1}%
-%          \setxvalue{##1 \c!status}{3}%
+%          \setxvalue{##1 \c!state}{3}%
 %          \doglobal\removefromcommalist{##1}\allfontmapsfiles}
 %         {\expanded{\docommando{##1.\f!fontmapextension}}}}%
 %    \expanded{\processcommalist[#1]}\docommando}
@@ -304,7 +230,7 @@
 \def\dopreloadmapfile#1%
   {\doifinstringelse{.}{#1}
      {\writestatus\m!fonts{assuming map file: #1}%
-      \setxvalue{#1 \c!status}{3}%
+      \setxvalue{#1 \c!state}{3}%
       \doglobal\removefromcommalist{#1}\allfontmapsfiles}
      {\expanded{\dopreloadmapfile{#1.\f!fontmapextension}}}}
 
@@ -344,16 +270,16 @@
 \fi \fi
 
 \def\doloadfontmapfile#1%
-  {\ifundefined{#1 \c!status}%
+  {\ifundefined{#1 \c!state}%
      \writestatus\m!fonts{using map file: #1}%
      \doloadmapfile{+}{#1}%
-     \setxvalue{#1 \c!status}{1}%
+     \setxvalue{#1 \c!state}{1}%
    \fi}
 
 \def\doreportfontmapfile#1%
-  {\ifundefined{#1 \c!status}%
+  {\ifundefined{#1 \c!state}%
      \writestatus\m!fonts{needs map file: #1}%
-     \setxvalue{#1 \c!status}{2}%
+     \setxvalue{#1 \c!state}{2}%
     \fi}
 
 \def\loadallfontmapfiles
@@ -468,7 +394,7 @@
    \ifmmode\mr\else\tf\fi} % needed ?
 
 \def\usetypefile[#1]% recurses on path !
-  {\readfile{\f!typeprefix#1}{}{}}% \relax\relax}
+  {\readfile{\f!typeprefix#1}\donothing\donothing}
 
 %D For backward compatibility we reimplement the font file
 %D loading macro.
@@ -504,4 +430,4 @@
 
 % \usetypescript [berry] [ec]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex
index f02dd49dc..97d42d9bf 100644
--- a/tex/context/base/type-map.tex
+++ b/tex/context/base/type-map.tex
@@ -129,4 +129,4 @@
   \loadmapfile[fourier-utopia-expert.map]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-pre.tex b/tex/context/base/type-pre.tex
index 0122a58e7..10413eae8 100644
--- a/tex/context/base/type-pre.tex
+++ b/tex/context/base/type-pre.tex
@@ -272,4 +272,4 @@
   \usetypescript [berry] [ec]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-run.tex b/tex/context/base/type-run.tex
index 2e9f02a84..5070c791e 100644
--- a/tex/context/base/type-run.tex
+++ b/tex/context/base/type-run.tex
@@ -11,23 +11,22 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\unprotect 
+\unprotect
 
-\gdef\typetypescript%
+\gdef\typetypescript
   {\dotripleempty\dotypetypescript}
 
 \gdef\dotypetypescript[#1][#2][#3]%
   {\bgroup
-   \def\dochecktypescript##1##2% script use 
+   \def\dochecktypescript##1##2% script use
      {\doifelsenothing{##1##2}
         {\donetrue}
-        {\donefalse
-         \ExpandBothAfter\doifcommonelse{##1}{##2}\donetrue\donefalse}}
+        {\ExpandBothAfter\doifcommonelse{##1}{##2}\donetrue\donefalse}}
    \edef\typescriptone  {\truetypescript{#1}}%
    \edef\typescripttwo  {\truetypescript{#2}}%
    \edef\typescriptthree{\truetypescript{#3}}%
    \def\starttypescript
-     {\bgroup 
+     {\bgroup
       \obeylines % else we loose the first line due to lookahead
       \dotripleempty\dostarttypescript}
    \def\dostarttypescript[##1][##2][##3]%
@@ -38,7 +37,7 @@
         \def\next%
           {\def\stoptypescript%
              {\egroup\type{\stoptypescript}}
-           % what follows now is quite ugly 
+           % what follows now is quite ugly
            \skipfirstverbatimlinefalse
            \processdisplayverbatim{\stoptypescript}%
            \type{\starttypescript}
@@ -46,8 +45,8 @@
            \doifsomething{##2}{\type{[##2]}}
            \doifsomething{##3}{\type{[##3]}}}
       \fi\fi\fi
-      \next}  
+      \next}
   \processcommacommand[\typescriptfiles]\dodousetypescript
   \egroup}
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/type-siz.tex b/tex/context/base/type-siz.tex
index 9dff7caba..5394e3631 100644
--- a/tex/context/base/type-siz.tex
+++ b/tex/context/base/type-siz.tex
@@ -67,73 +67,73 @@
   [4pt]
   [        \s!text=4pt, \s!script=4pt, \s!scriptscript=4pt,
               \c!x=4pt,     \c!xx=4pt,
-          \c!groot=6pt,  \c!klein=4pt]
+          \c!big=6pt,  \c!small=4pt]
 
 \definebodyfontenvironment
   [5pt]
   [        \s!text=5pt, \s!script=5pt, \s!scriptscript=5pt,
               \c!x=5pt,     \c!xx=5pt,
-          \c!groot=7pt,  \c!klein=5pt]
+          \c!big=7pt,  \c!small=5pt]
 
 \definebodyfontenvironment
   [6pt]
   [        \s!text=6pt, \s!script=5pt, \s!scriptscript=5pt,
               \c!x=5pt,     \c!xx=5pt,
-          \c!groot=8pt,  \c!klein=5pt]
+          \c!big=8pt,  \c!small=5pt]
 
 \definebodyfontenvironment
   [7pt]
   [        \s!text=7pt, \s!script=6pt, \s!scriptscript=5pt,
               \c!x=6pt,     \c!xx=5pt,
-          \c!groot=9pt,  \c!klein=5pt]
+          \c!big=9pt,  \c!small=5pt]
 
 \definebodyfontenvironment
   [8pt]
   [        \s!text=8pt, \s!script=6pt, \s!scriptscript=5pt,
               \c!x=6pt,     \c!xx=5pt,
-          \c!groot=10pt, \c!klein=6pt]
+          \c!big=10pt, \c!small=6pt]
 
 \definebodyfontenvironment
   [9pt]
   [        \s!text=9pt, \s!script=7pt, \s!scriptscript=5pt,
               \c!x=7pt,     \c!xx=5pt,
-          \c!groot=11pt, \c!klein=7pt]
+          \c!big=11pt, \c!small=7pt]
 
 \definebodyfontenvironment
   [10pt]
   [        \s!text=10pt, \s!script=7pt, \s!scriptscript=5pt,
               \c!x=8pt,      \c!xx=6pt,
-          \c!groot=12pt,  \c!klein=8pt]
+          \c!big=12pt,  \c!small=8pt]
 
 \definebodyfontenvironment
   [11pt]
   [        \s!text=11pt, \s!script=8pt, \s!scriptscript=6pt,
               \c!x=9pt,      \c!xx=7pt,
-          \c!groot=13pt,  \c!klein=9pt]
+          \c!big=13pt,  \c!small=9pt]
 
 \definebodyfontenvironment
   [12pt]
   [        \s!text=12pt, \s!script=9pt, \s!scriptscript=7pt,
               \c!x=10pt,     \c!xx=8pt,
-          \c!groot=14pt,  \c!klein=10pt]
+          \c!big=14pt,  \c!small=10pt]
 
 \definebodyfontenvironment
   [13pt]
   [        \s!text=13pt, \s!script=10pt, \s!scriptscript=8pt,
               \c!x=11pt,     \c!xx=9pt,
-          \c!groot=16pt,  \c!klein=11pt]
+          \c!big=16pt,  \c!small=11pt]
 
 \definebodyfontenvironment
   [14pt]
   [        \s!text=14pt, \s!script=10pt, \s!scriptscript=7pt,
               \c!x=12pt,     \c!xx=10pt,
-          \c!groot=16pt,  \c!klein=12pt]
+          \c!big=16pt,  \c!small=12pt]
 
 \definebodyfontenvironment
   [16pt]
   [        \s!text=16pt, \s!script=12pt, \s!scriptscript=9pt,
               \c!x=13pt,     \c!xx=11pt,
-          \c!groot=18pt,  \c!klein=14pt]
+          \c!big=18pt,  \c!small=14pt]
 
 \stoptypescript
 
@@ -668,4 +668,4 @@
 
 \stoptypescript
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/type-spe.tex b/tex/context/base/type-spe.tex
index 51fc51b4a..a113a7652 100644
--- a/tex/context/base/type-spe.tex
+++ b/tex/context/base/type-spe.tex
@@ -39,4 +39,4 @@
   \usemathcollection[fou]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex
index eca368acf..0b4ed6e81 100644
--- a/tex/context/base/type-syn.tex
+++ b/tex/context/base/type-syn.tex
@@ -348,4 +348,4 @@
   \definefontsynonym [MathBeta]      [Palatino-Math-SymbolsB]
 \stoptypescript
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/typo-ini.tex b/tex/context/base/typo-ini.tex
index f6f3e88f9..15a206b4d 100644
--- a/tex/context/base/typo-ini.tex
+++ b/tex/context/base/typo-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=typo-ini,
+%D   [       filefile=typo-ini,
 %D        version=2000.16.09,
 %D          title=\CONTEXT\ Typographic Macros,
 %D       subtitle=Initialization,
@@ -8,33 +8,33 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 %D Since \CONTEXT\ is dealing with typographics, isn't
 %D September 2000 a bit late to start writing this module? It
 %D may seem so, but since more and more languages are
 %D supported, we think it is time to isolate language specific
 %D typographic extensions in modules. The first language that
-%D demands this is Chinese, and more will follow.  
+%D demands this is Chinese, and more will follow.
 
 \writestatus{loading}{Context Typographic Macros (ini)}
 
-\unprotect 
+\unprotect
 
-%D \macros 
+%D \macros
 %D   {ifvertical}
-%D 
+%D
 %D The following switch can be used to signal macros that they
-%D should adapt their behaviour. 
+%D should adapt their behaviour.
 
-\newif\ifvertical
+\newif\ifvertical % maybe also ifreverse
 
-%D \macros 
+%D \macros
 %D   {vhbox}
 %D
-%D A stupid but useful macro. 
+%D A stupid but useful macro.
 
 \def\vhbox{\ifvertical\vbox\else\hbox\fi}
 
-\protect \endinput 
+\protect \endinput
diff --git a/tex/context/base/unic-000.tex b/tex/context/base/unic-000.tex
index 047814cb8..77c3ea08c 100644
--- a/tex/context/base/unic-000.tex
+++ b/tex/context/base/unic-000.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-000,
+%D   [       filefile=unic-000,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Macros,
 %D       subtitle=Vector 0,
@@ -221,4 +221,4 @@
   \fi
 \stopunicodevector
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex
index d91dfe673..bed946307 100644
--- a/tex/context/base/unic-001.tex
+++ b/tex/context/base/unic-001.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-001,
+%D   [       filefile=unic-001,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Macros,
 %D       subtitle=Vector 1,
@@ -284,4 +284,4 @@
   \fi
 \stopunicodevector
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/unic-002.tex b/tex/context/base/unic-002.tex
index 5790fa76a..167419371 100644
--- a/tex/context/base/unic-002.tex
+++ b/tex/context/base/unic-002.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-002,
+%D   [       filefile=unic-002,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Macros,
 %D       subtitle=Vector 2,
@@ -45,4 +45,4 @@
   \fi\fi
 \stopunicodevector
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/unic-032.tex b/tex/context/base/unic-032.tex
index 75009566e..f86e37f6e 100644
--- a/tex/context/base/unic-032.tex
+++ b/tex/context/base/unic-032.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-032,
+%D   [       filefile=unic-032,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Macros,
 %D       subtitle=Vector 32,
diff --git a/tex/context/base/unic-033.tex b/tex/context/base/unic-033.tex
index 5ff0d2e4d..090146d66 100644
--- a/tex/context/base/unic-033.tex
+++ b/tex/context/base/unic-033.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-033,
+%D   [       filefile=unic-033,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Macros,
 %D       subtitle=Vector 33,
diff --git a/tex/context/base/unic-exp.tex b/tex/context/base/unic-exp.tex
index a6d39ea78..b7678ce9d 100644
--- a/tex/context/base/unic-exp.tex
+++ b/tex/context/base/unic-exp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-exp,
+%D   [       filefile=unic-exp,
 %D        version=2002.12.05,
 %D          title=\CONTEXT\ \UNICODE\ Support,
 %D       subtitle=\UNICODE\ vector expansion,
@@ -68,4 +68,4 @@
 
 \expandunivector[0,1,2,32,33]
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/unic-ini.tex b/tex/context/base/unic-ini.tex
index 00c8f85d2..a1e33202d 100644
--- a/tex/context/base/unic-ini.tex
+++ b/tex/context/base/unic-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=unic-ini,
+%D   [       filefile=unic-ini,
 %D        version=2002.12.03,
 %D          title=\CONTEXT\ \UNICODE\ Support,
 %D       subtitle=\UNICODE\ \& UTF-8 support,
@@ -28,12 +28,12 @@
 %D macros below deal with conversions. Thanks to Taco for
 %D providing the following conversion rules.
 %D
-%D \starttabulatie[|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|]
 %D \NC  $b_1$  \NC  $b_2$  \NC  $b_3$  \NC  $b_4$  \NC     unicode     \NC \NR
 %D \NC192---223\NC128---191\NC         \NC         \NC   0x80---0x7FF  \NC \NR
 %D \NC224---239\NC128---191\NC128---191\NC         \NC  0x800---0xFFFF \NC \NR
 %D \NC240---247\NC128---191\NC128---191\NC128---191\NC0x10000---0x1FFFF\NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D In \UTF-8 the characters in the range 128---191 are illegal
 %D as first characters. The characters 254 and 255 are
@@ -43,12 +43,12 @@
 %D The unicode number for an \UTF-8 sequence can be calculated
 %D as follows:
 %D
-%D \starttabulatie[|mc|m|mc|m|mc|m|mc|m|]
+%D \starttabulate[|mc|m|mc|m|mc|m|mc|m|]
 %D \NC       b_1     \NC \NC             \NC \NC           \NC \NC         \NC if     b_1<=127\NC \NR
 %D \NC    64(b_1-192)\NC+\NC    (b_2-128)\NC \NC           \NC \NC         \NC if 192<=b1<=223\NC \NR
 %D \NC  4096(b_1-224)\NC+\NC  64(b_2-128)\NC+\NC  (b_3-128)\NC \NC         \NC if 224<=b1<=239\NC \NR
 %D \NC262144(b_1-240)\NC+\NC4096(b_2-128)\NC+\NC64(b_3-128)\NC+\NC(b_4-128)\NC if 240<=b1<=247\NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D A lot of information abou tunicode can be found on the
 %D web (search for Markus Kuhn and unicode and you'll
@@ -58,7 +58,7 @@
 %D We need the \type {`} in order to turn a character into a
 %D number.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utftwounicode#1#2%
 %D   {\number\numexpr    (64*(\numexpr (#1-192))+%
 %D                           (\numexpr(`#2-128)))}
@@ -73,7 +73,7 @@
 %D                      4096*(\numexpr(`#1-128))+
 %D                        64*(\numexpr(`#2-128))+%
 %D                           (\numexpr(`#3-128)))}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we map the unicode number on one of the 256 char wide
 %D unicode tables, we need to do a bit of div and mod. Watch
@@ -84,10 +84,10 @@
 %D also makes it possible to avoid scratch counters, so that we
 %D get fast and fully expandable conversions.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utfdiv#1{\number\numexpr((#1-128)/256)}
 %D \def\utfmod#1{\number\numexpr((#1)-(256*(\utfdiv{#1})))}
-%D \stoptypen
+%D \stoptyping
 %D
 %D So far for the readable alternatives. When using \type
 %D {\numexpr} you should be aware of rather unexpected look
@@ -109,7 +109,7 @@
 
 %D The definitions now become:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utftwounicode#1#2%
 %D   {\number\numexpr(\utf@a*(\numexpr (#1-\utf@d))+%
 %D                           (\numexpr(`#2-\utf@g)))}
@@ -124,18 +124,18 @@
 %D                    \utf@b*(\numexpr(`#2-\utf@g))+
 %D                    \utf@a*(\numexpr(`#3-\utf@g))+%
 %D                           (\numexpr(`#4-\utf@g)))}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utfdiv#1{\number\numexpr((#1-\utf@g)/\utf@h)}
 %D \def\utfmod#1{\number\numexpr((#1)-(\utf@h*(\utfdiv{#1})))}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Depending on the usage, you can rely on parenthesis only:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utftwounicode#1#2%
 %D   {\numexpr(\utf@a*(#1-\utf@d)+%
 %D                    `#2-\utf@g)}
@@ -150,7 +150,7 @@
 %D            \utf@b*(`#2-\utf@g)+%
 %D            \utf@a*(`#3-\utf@g)+%
 %D                    `#4-\utf@g)}
-%D \stoptypen
+%D \stoptyping
 
 \def\utfdiv#1{\number\numexpr((#1-\utf@g)/\utf@h)}
 \def\utfmod#1{\number\numexpr(#1-\utf@h*((#1-\utf@g)/\utf@h))}
@@ -163,7 +163,7 @@
 %D a few handlers. They all call the general \type
 %D {\unicodechar} conversion macro.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utftwouniglph#1#2%
 %D   {\unicodechar{\utftwounicode  {#1}{#2}}}
 %D
@@ -172,13 +172,13 @@
 %D
 %D \def\utffouruniglph#1#2#3#4%
 %D   {\unicodechar{\utffourunicode {#1}{#2}{#3}{#4}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Because the unicode number is used a few times per
 %D conversion, we can expand it once (\type {\the} and \type
 %D {\number} make sure of this). This saves us another 10\%.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utftwouniglph#1#2%
 %D   {\@EA\unicodechar\@EA{\the\utftwounicode{#1}{#2}}}
 %D
@@ -187,7 +187,7 @@
 %D
 %D \def\utffouruniglph#1#2#3#4%
 %D   {\@EA\unicodechar\@EA{\the\utffourunicode{#1}{#2}{#3}{#4}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can rewrite these macros to faster alternatives: the
 %D less arguments we pass, the faster the conversion will be,
@@ -229,7 +229,7 @@
 %D \def\TraceUnic#1%
 %D   {\chardef\utfunicodetracer#1\relax\enableregime[utf]Å°}
 %D
-%D \starttabulatie[|c|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|c|]
 %D \NC option   \NC number\NC mapping\NC glyph\NC string\NC example    \NC \NR
 %D \NC 0        \NC       \NC        \NC \star\NC       \NC \TraceUnic0\NC \NR
 %D \NC 1        \NC \star \NC        \NC      \NC       \NC \TraceUnic1\NC \NR
@@ -241,7 +241,7 @@
 %D \NC 7        \NC       \NC        \NC      \NC \star \NC \TraceUnic7\NC \NR
 %D \NC 8        \NC \star \NC        \NC      \NC       \NC \TraceUnic8\NC \NR
 %D \NC otherwise\NC       \NC        \NC \star\NC       \NC \TraceUnic9\NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 
 %D \macros
 %D   {unicodechar}
@@ -305,11 +305,11 @@
 
 %D The character itself is accessed and typeset by:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utfunihash#1%
 %D   {\executeifdefined{\@@univector\utfdiv{#1}}%
 %D      \gobbleoneargument{\utfmod{#1}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Again, we can provide a faster alternative, because inside
 %D the conditional executer, the argument is expanded twice,
@@ -318,16 +318,16 @@
 %D forehand. Just to remind you: \type {#1} is the \UNICODE\
 %D number.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\utfunihash#1%
 %D   {\@EA\executeifdefined\@EA{\@EA\@@univector\number\utfdiv{#1}}%
 %D      {\unknownchar\gobbleoneargument}{\utfmod{#1}}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In order to save calculation time, I decided to change
 %D this definition into:
 
-%D \starttypen
+%D \starttyping
 %D \def\utfunihash#1%
 %D   {\@EA\doutfunihash\@EA{\number\utfdiv{#1}}{#1}}
 %D
@@ -337,11 +337,11 @@
 %D    \else
 %D      \unknownchar
 %D    \fi}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Or leaner and meaner:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\doutfunihash#1#2%
 %D   {\csname
 %D      \ifcsname\@@univector\number#1\endcsname
@@ -350,7 +350,7 @@
 %D        \@@unknownchar
 %D      \fi
 %D    \endcsname}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And finaly it became:
 
@@ -431,7 +431,7 @@
 %D inside the name constructor, we prevent problems with
 %D partial expansion in macros and special cases.
 %D
-%D \starttypen
+%D \starttyping
 %D \startunicodevector 0
 %D   \ifcase\numexpr(#1-159)\or
 %D     \@@unknownchar\or % NO-BREAK SPACE
@@ -441,7 +441,7 @@
 %D     \@@unknowncharacter
 %D   \fi
 %D \stopunicodevector
-%D \stoptypen
+%D \stoptyping
 %D
 %D In vector \type {unix-000} you will find another
 %D optimizations. By using as less tokens as possible, we limit
@@ -554,4 +554,4 @@
 
 \useunicodevector[0,1,2,32,33] \useregime[utf]
 
-\protect  \endinput
\ No newline at end of file
+\protect  \endinput
diff --git a/tex/context/base/verb-eif.tex b/tex/context/base/verb-eif.tex
index 16ee611e1..af19cc9bc 100644
--- a/tex/context/base/verb-eif.tex
+++ b/tex/context/base/verb-eif.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-eif,
+%D   [       filefile=verb-eif,
 %D        version=2000.08.23,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty Eiffel Verbatim,
diff --git a/tex/context/base/verb-ini.tex b/tex/context/base/verb-ini.tex
index ce859bee9..996dc46e6 100644
--- a/tex/context/base/verb-ini.tex
+++ b/tex/context/base/verb-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-ini,
+%D   [       filefile=verb-ini,
 %D        version=1997.12.22,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Initialization,
@@ -58,18 +58,18 @@
 %D verbatim mode with some strange active character, we will
 %D use the following construction for display verbatim:
 %D
-%D \starttypen
+%D \starttyping
 %D \starttyping
 %D The Dutch word 'typen' stands for 'typing', therefore in the Dutch version
 %D one will not find the word 'verbatim'.
 %D \stoptyping
-%D \stoptypen
+%D \stoptyping
 %D
 %D In \CONTEXT\ files can be typed with \type{\typefile} and
 %D inline verbatim can be accomplished with \type{\type}. This
 %D last command comes in many flavors:
 %D
-%D \starttypen
+%D \starttyping
 %D We can say \type<<something>> or \type{something}. The first one is a bit
 %D longer but also supports slanted typing, which accomplished by typing
 %D \type<<a <<slanted>> word>>. We can also use commands to enhance the text
@@ -77,7 +77,7 @@
 %D to accept also \LaTeX\ alike verbatim, which means that \type+something+
 %D and \type|something| are valid commands too. Of course we want the grouped
 %D alternatives to process \type{hello {\bf big} world} with braces.
-%D \stoptypen
+%D \stoptyping
 %D
 %D In the core modules, we will build this support on top of
 %D this module. There these commands can be tuned with
@@ -220,25 +220,25 @@
 %D braces are implemented in the core module. This commands
 %D takes one argument: the closing command.
 %D
-%D \starttypen
+%D \starttyping
 %D \processinlineverbatim{\closingcommand}
-%D \stoptypen
+%D \stoptyping
 %D
 %D One can define his own verbatim commands, which can be very
 %D simple:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\Verbatim {\processinlineverbatim\relax}
-%D \stoptypen
+%D \stoptyping
 %D
 %D or a bit more more complex:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\GroupedVerbatim%
 %D   {\bgroup
 %D    \dosomeusefullthings
 %D    \processinlineverbatim\egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Before entering inline verbatim mode, we take care of the
 %D unwanted \TAB, \NEWLINE\ and \NEWPAGE\ characters and
@@ -310,29 +310,29 @@
 %D \def\doverbatimgoodbreak
 %D   {\nobreak\hrule width 3cm \par\penalty\linepenalty}
 %D
-%D \starttypen
+%D \starttyping
 %D test
 %D test
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D test
 %D test
 %D test
 %D test
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D test
 %D
 %D test
 %D test
 %D test
-%D \stoptypen
+%D \stoptyping
 %D
 %D \egroup
 %D
@@ -424,9 +424,9 @@
 %D By default the rest of the first line is ignored. We can
 %D turn this feature off by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D \skipfirstverbatimlinefalse
-%D \stoptypen
+%D \stoptyping
 
 \newif\ifskipfirstverbatimline \skipfirstverbatimlinetrue
 
@@ -436,22 +436,22 @@
 %D We can define a display verbatim environment with the
 %D command \type{\processdisplayverbatim} in the following way:
 %D
-%D \starttypen
+%D \starttyping
 %D \processdisplayverbatim{\closingcommand}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \noindent For instance, we can define a simple command like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\BeginVerbatim {\processdisplayverbatim{EndVerbatim}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D \noindent But we can also do more advance things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\BeginVerbatim {\bigskip \processdisplayverbatim{\EndVerbatim}}
 %D \def\EndVerbatim   {\bigskip}
-%D \stoptypen
+%D \stoptyping
 %D
 %D When we compare these examples, we see that the backslash in
 %D the closing command is optional. One is free in actually
@@ -686,10 +686,10 @@
 %D
 %D The next alternative was okay when memory was still low.
 %D
-%D \starttypen
+%D \starttyping
 %D \def\makeallother
 %D   {\dorecurse{255}{\catcode\recurselevel=\@@other}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Today we prebuild a token list:
 
@@ -798,9 +798,9 @@
 %D them into vertical skips. This default behavior can be
 %D overruled by:
 %D
-%D \starttypen
+%D \starttyping
 %D \obeyemptylines
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although it would cost us only a few lines of code, we
 %D decided not to take care of multiple empty lines. When a
@@ -947,9 +947,9 @@
 %D look for \EOF\ and when we've met, we make sure it does not
 %D turn into an empty line.
 %D
-%D \starttypen
+%D \starttyping
 %D \processfileverbatim{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We reserve a dedicated file handle.
 
@@ -1052,10 +1052,10 @@
 %D The following two macros can be set to achieve special
 %D effects, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \convertargument\StartFake{something}\to\firstverbatimfileline
 %D \convertargument\StopFake\to\firstverbatimfileline
-%D \stoptypen
+%D \stoptyping
 %D
 %D These hooks were needed for typesetting flowchart
 %D definitions verbatim, since the temporary files does not
@@ -1099,9 +1099,9 @@
 %D The first step in defining a pretty interpreter is to assign
 %D each character that needs special attention a number, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \setpretty \`A 21
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here the macro \type{\setpretty} makes the character
 %D \type{A} active, and sets it meaning to the auxiliary macro
@@ -1128,18 +1128,18 @@
 
 %D This interpreter is installed by saying
 %D
-%D \starttypen
+%D \starttyping
 %D \installprettyhandler 21 \SOMEprettyone
-%D \stoptypen
+%D \stoptyping
 
 \def\installprettyhandler#1 #2%
   {\letvalue{\!!PRETTY#1}#2}
 
 %D Such an interpreter gets the character number:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\SOMEprettyone#1{...\getpretty{#1}...}
-%D \stoptypen
+%D \stoptyping
 %D
 %D where \type{\getpretty} equals \type{\char}. We can't
 %D use \type{\let} here because we have to get rid of the
@@ -1177,7 +1177,7 @@
 %D \type{\newpretty} and its associates.
 %D
 %D \bgroup
-%D \steltypenin[file][optie=tex,palet=colorpretty]
+%D \setuptyping[file][optionoptie=tex,paletpalet=colorpretty]
 %D
 %D \startbuffer
 %D \bgroup
@@ -1225,7 +1225,7 @@
 %D \installnewpretty b \blue
 %D \stopbuffer
 %D
-%D \haalbuffer[pretty]
+%D \getbuffer[pretty]
 %D
 %D \startbuffer
 %D %%\ r{Red
@@ -1334,16 +1334,13 @@
    \prettynaturalfont{\restorecatcodes\scantokens{\ignorespaces#1}}%
    \egroup}
 
-% new, test first
-%
-% \def\naturaltextext#1\relax
-%   {\bgroup
-%    \prettynaturalfont
-%    \def\ascii{#1}%
-%    \setnormalcatcodes
-%    \restorecatcodes
-%    \scantokens\expandafter{\ascii}\ifhmode\unskip\fi
-%    \egroup}
+\def\naturaltextext#1\relax
+  {\bgroup
+   \def\ascii{#1}%
+   \setnormalcatcodes
+   \restorecatcodes
+   \prettynaturalfont{\scantokens\expandafter{\ascii}\ifhmode\unskip\fi}%
+   \egroup}
 
 \endETEX
 
@@ -1365,7 +1362,7 @@
 %D \stopTEX
 %D \stopbuffer
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D This is keyed in as:
 %D
@@ -1400,10 +1397,10 @@
 %D When implementing new pretty macros, one only needs to
 %D define something like:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\TEXtypezero%
 %D   {\handlenewpretty\TEXtypethree}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here the number states the category (in our examples the
 %D backslash). The second argument takes care of normal
@@ -1496,10 +1493,10 @@
 %D The \PERL\ and \METAPOST\ interpreters will also handle
 %D reserved words. Sets of identifiers are defined like:
 %D
-%D \starttypen
+%D \starttyping
 %D \useprettyidentifiers \MODULAidentifiers \MODULAsetspecials
 %D   if then else elsif case while do repeat until ...
-%D \stoptypen
+%D \stoptyping
 %D
 %D New entries can be added to existing sets by repeatedly
 %D using this command.
@@ -1538,12 +1535,12 @@
 %D repetitive loading, one should load the modules before the
 %D first call to the macros.
 %D
-%D \starttypen
+%D \starttyping
 %D \input verb-tex.tex
 %D \input verb-pl.tex
 %D \input verb-mp.tex
 %D \input verb-jv.tex
-%D \stoptypen
+%D \stoptyping
 %D
 %D In \CONTEXT\ we follow a different thread, and therefore all
 %D macros in the additional modules use \type {\gdef}'s and
@@ -1611,7 +1608,7 @@
 %D text and files verbatim. The inline alternative also accepts
 %D user supplied delimiters.
 %D
-%D \starttypen
+%D \starttyping
 %D \type{text}
 %D
 %D \starttyping
@@ -1619,15 +1616,15 @@
 %D \stoptyping
 %D
 %D \typefile{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can turn on the options by:
 %D
-%D \starttypen
+%D \starttyping
 %D \controlspacetrue
 %D \verbatimtabstrue
 %D \prettyverbatimtrue
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here is the implementation:
 
@@ -1667,18 +1664,18 @@
 
 %D In \CONTEXT\ users say things like:
 %D
-%D \starttypen
+%D \starttyping
 %D \definetyping [TEX]  [option=TEX]
 %D \definetyping [MP]   [option=MP]
 %D \definetyping [PL]   [option=PL]
 %D \definetyping [JV]   [option=JV]
-%D \stoptypen
+%D \stoptyping
 %D
 %D or
 %D
-%D \starttypen
+%D \starttyping
 %D \setuptyping[file][option=color]
-%D \stoptypen
+%D \stoptyping
 %D
 %D That way \CONTEXT\ selects the appropriate interpreter
 %D itself, but more on that in another module. In other
@@ -1769,19 +1766,19 @@
 %D the verbatim part of the text was typeset with the following
 %D commands for the examples:
 %D
-%D \starttypen
-%D \def\starttypen% We simplify the \ConTeXt\ macro.
+%D \starttyping
+%D \def\starttyping% We simplify the \ConTeXt\ macro.
 %D   {\bgroup
 %D    \everypar{} % We disable some troublesome mechanisms.
 %D    \advance\leftskip by 1em
-%D    \processdisplayverbatim{\stoptypen}}
+%D    \processdisplayverbatim{\stoptyping}}
 %D
-%D \let\stoptypen=\egroup
-%D \stoptypen
+%D \let\stoptyping=\egroup
+%D \stoptyping
 %D
 %D We also used:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\startdefinition%
 %D   {\bgroup
 %D    \everypar{} % Again we disable some troublesome mechanisms.
@@ -1793,13 +1790,13 @@
 %D
 %D \def\stopdefinition%
 %D   {\egroup}
-%D \stoptypen
+%D \stoptyping
 %D
 %D And because we have both \type{\EveryPar} and
 %D \type{\EveryLine} available, we can implement a dual
 %D numbering mechanism:
 %D
-%D \starttypen
+%D \starttyping
 %D \newcount\paragraphcounter
 %D \newcount\linecounter
 %D
@@ -1822,20 +1819,20 @@
 %D          \hss \the\linecounter}%
 %D       \egroup
 %D       \hskip1em}}
-%D \stoptypen
+%D \stoptyping
 %D
 %D One may have noticed that the \type{\EveryPar} is only
 %D executed once, because we consider each piece of verbatim
 %D as one paragraph. When one wants to take the empty lines
 %D into account, the following assignments are appropriate:
 %D
-%D \starttypen
+%D \starttyping
 %D \EveryLine
 %D   {\iflinepar
 %D      \showparagraphcounter
 %D    \fi
 %D    \showlinecounter}
-%D \stoptypen
+%D \stoptyping
 %D
 %D In this case, nothing has to be assigned to \type{\EveryPar},
 %D maybe except of just another extra numbering scheme. The
@@ -1851,49 +1848,49 @@
 %D
 %D Now let's summarize the most important commands.
 %D
-%D \starttypen
+%D \starttyping
 %D \processinlineverbatim{\closingcommand}
 %D \processdisplayverbatim{\closingcommand}
 %D \processfileverbatim{filename}
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can satisfy our own specific needs with the following
 %D interfacing macro's:
 %D
-%D \starttypen
+%D \starttyping
 %D \obeyspaces  \obeytabs  \obeylines  \obeypages  \obeycharacters
-%D \stoptypen
+%D \stoptyping
 %D
 %D We can influence the verbatim environment with the following
 %D macro:
 %D
-%D \starttypen
+%D \starttyping
 %D \obeyemptylines
-%D \stoptypen
+%D \stoptyping
 %D
 %D Some needs are fulfilled already with:
 %D
-%D \starttypen
+%D \starttyping
 %D \setcontrolspace  \settabskips
-%D \stoptypen
+%D \stoptyping
 %D
 %D lines can be enhanced with ornaments using:
 %D
-%D \starttypen
+%D \starttyping
 %D \everypar  \everyline  \iflinepar
-%D \stoptypen
+%D \stoptyping
 %D
 %D and pretty verbatim support is implemented by:
 %D
-%D \starttypen
+%D \starttyping
 %D \beginofpretty[#1] ... \endofpretty
-%D \stoptypen
+%D \stoptyping
 %D
 %D and some setup macro, like:
 %D
-%D \starttypen
+%D \starttyping
 %D \setupprettyIDENTIFIERtype
-%D \stoptypen
+%D \stoptyping
 %D
 %D The color support macro can be redefined by the user. The
 %D parameter \type{#1} can be one of the four 'fixed'
@@ -1903,9 +1900,9 @@
 %D using \type{specials}. One can toggle between color and
 %D grayscale with:
 %D
-%D \starttypen
+%D \starttyping
 %D \setgrayverbatim  \setcolorverbatim
-%D \stoptypen
+%D \stoptyping
 
 %D \macros
 %D   {permitshiftedendofverbatim}
@@ -2081,4 +2078,4 @@
 %D
 %D \typebuffer \getbuffer
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/verb-js.tex b/tex/context/base/verb-js.tex
index e8c2e6b5d..a0910ef15 100644
--- a/tex/context/base/verb-js.tex
+++ b/tex/context/base/verb-js.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-js,
+%D   [       filefile=verb-js,
 %D        version=1998.02.07,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \JAVASCRIPT\ Verbatim,
diff --git a/tex/context/base/verb-jv.tex b/tex/context/base/verb-jv.tex
index d55394d2c..b540931c5 100644
--- a/tex/context/base/verb-jv.tex
+++ b/tex/context/base/verb-jv.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-jv,
+%D   [       filefile=verb-jv,
 %D        version=2002.02.27,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \JAVA\ Verbatim,
diff --git a/tex/context/base/verb-mp.tex b/tex/context/base/verb-mp.tex
index c7ab2071f..2d07049aa 100644
--- a/tex/context/base/verb-mp.tex
+++ b/tex/context/base/verb-mp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-mp,
+%D   [       filefile=verb-mp,
 %D        version=1997.12.22,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \METAPOST\ Verbatim,
diff --git a/tex/context/base/verb-pas.tex b/tex/context/base/verb-pas.tex
index 4b9698022..5bb0dfe60 100644
--- a/tex/context/base/verb-pas.tex
+++ b/tex/context/base/verb-pas.tex
@@ -1,15 +1,15 @@
 %D \module
-%D   [       file=verb-pas,
+%D   [       filefile=verb-pas,
 %D        version=1999.12.09,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \PASCAL\ and \MODULA\ Verbatim,
 %D         author=Berend de Boer,
 %D           date=\currentdate,
-%D      copyright={Berend de Boer \& Hans Hagen]
+%D      copyright={Berend de Boer \& Hans Hagen}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 % This module will be cleaned up a bit in the process of more
 % flexible verbatim options.
@@ -21,20 +21,20 @@
 %D \startbuffer
 %D \startPAS
 %D program Hello;
-%D 
+%D
 %D begin
 %D   writeln('hello world.');
 %D end.
 %D \stopPAS
-%D \stopbuffer 
+%D \stopbuffer
 %D
-%D Berend's preferences: 
+%D Berend's preferences:
 %D
 %D \startbuffer[setup]
 %D \setuptyping
 %D   [DELPHI]
 %D   [palet=,icommand=\bf,vcommand=,ccommand=\it]
-%D \stopbuffer 
+%D \stopbuffer
 
 \ifx\undefined\setupprettyPLtype \input verb-pl \relax \fi
 
@@ -50,7 +50,7 @@
    \setpretty`\#=32
    \setpretty`\%=41
    \setpretty`\:=41
-   \setpretty`\/=43 
+   \setpretty`\/=43
    \setpretty`\*=44
    \setpretty`\{=45 \setpretty`\}=46 }
 
@@ -65,7 +65,7 @@
   {\PLsetcontrols
    \def\flushrestofverbatimline%
      {\endPLtypesix
-      \ifinPASslashslashcomment 
+      \ifinPASslashslashcomment
         \PASstopslashslashcomment
       \fi
       \PLverbosefalse
@@ -219,7 +219,7 @@
 
 \useprettyidentifiers \PASidentifiers \PASsetspecials
   forward
- 
+
 % Extended Pascal keywords (ISO/IEC 10206)
 
 \useprettyidentifiers \PASidentifiers \PASsetspecials
@@ -240,13 +240,13 @@
 % Object Pascal directives (draft September 20, 1993)
 
 \useprettyidentifiers \PASidentifiers \PASsetspecials
-  override 
+  override
 
 % Delphi keywords
 
 \useprettyidentifiers \PASidentifiers \PASsetspecials
-  as asm dispinterface except exports finalization finally 
-  initialization inline library object out raise resourcestring 
+  as asm dispinterface except exports finalization finally
+  initialization inline library object out raise resourcestring
   shl shr string threadvar try unit uses xor
 
 % Delphi directives
@@ -255,12 +255,12 @@
 
 \useprettyidentifiers \PASidentifiers \PASsetspecials
   absolute assembler automated cdecl contains default dispid
-  dynamic external far implements index message name near 
-  nodefault overload override package pascal private protected 
-  public published readonly register reintroduce requires 
-  resident safecall stdcall stored virtual writeonly  
+  dynamic external far implements index message name near
+  nodefault overload override package pascal private protected
+  public published readonly register reintroduce requires
+  resident safecall stdcall stored virtual writeonly
 
 \useprettyidentifiers \PASvariables \PASsetspecials
   not-yet-defined
 
-\protect \endinput  
+\protect \endinput
diff --git a/tex/context/base/verb-pl.tex b/tex/context/base/verb-pl.tex
index cbe82d49f..4ef6da579 100644
--- a/tex/context/base/verb-pl.tex
+++ b/tex/context/base/verb-pl.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-pl,
+%D   [       filefile=verb-pl,
 %D        version=1997.12.22,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \PERL\ Verbatim,
diff --git a/tex/context/base/verb-sql.tex b/tex/context/base/verb-sql.tex
index 59218dc59..2c629f301 100644
--- a/tex/context/base/verb-sql.tex
+++ b/tex/context/base/verb-sql.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-sql,
+%D   [       filefile=verb-sql,
 %D        version=2000.05.09,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \SQL\ Verbatim,
@@ -13,8 +13,8 @@
 
 \writestatus{loading}{Context Support Macros / Pretty SQL Verbatim}
 
-%D \citaat {He, I want pretty pretting too!}, Berend cried out
-%D one day, \citaat {But now for \SQL.}. This query language 
+%D \quotation {He, I want pretty pretting too!}, Berend cried out
+%D one day, \quotation {But now for \SQL.}. This query language 
 %D shows code like: 
 %D 
 %D \startbuffer
@@ -29,18 +29,18 @@
 %D
 %D and this should become something pretty like:
 %D
-%D \haalbuffer
+%D \getbuffer
 %D
 %D or, with Berend's preferences: 
 %D
 %D \startbuffer[setup]
-%D \steltypenin
+%D \setuptyping
 %D   [SQL]
-%D   [tekst=ja,palet=,icommando=\bf,vcommando=,ccommando=\it]
+%D   [text=yes,palet=,icommand=\bf,vcommand=,ccommand=\it]
 %D \stopbuffer 
 %D
-%D \haalbuffer[setup]
-%D \haalbuffer
+%D \getbuffer[setup]
+%D \getbuffer
 %D
 %D This kind of pretty printing is accomplished by: 
 %D
diff --git a/tex/context/base/verb-tex.tex b/tex/context/base/verb-tex.tex
index 0ccf1e218..d1e830ce7 100644
--- a/tex/context/base/verb-tex.tex
+++ b/tex/context/base/verb-tex.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-tex,
+%D   [       filefile=verb-tex,
 %D        version=1997.12.22,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty \TEX\ verbatim,
@@ -18,7 +18,7 @@
 %D natural and less complicated. 
 
 %D \startTEX
-%D \definetyping[niceTEX][option=TEX,palet=graypretty]
+%D \definetyping[niceTEX][option=TEX,paletpalet=graypretty]
 %D
 %D \startniceTEX
 %D \message{A vivid look at TeX}
@@ -58,10 +58,10 @@
 
 %D We use a maximum of four colors because more colors will
 %D distract too much. In the following table we show the
-%D logical names of the colors, their color and \kap{RGB} values.
+%D logical names of the colors, their color and \cap{RGB} values.
 %D
-%D \plaatstabel{geen}
-%D \starttabel[|l|l|c|c|c|c|]
+%D \placetable{geen}
+%D \starttable[|l|l|c|c|c|c|]
 %D \HL
 %D \FC\bf identifier \MC\bf color \MC\bf r \MC\bf g \MC\bf b \MC\bf bw \LC\SR
 %D \HL
@@ -70,7 +70,7 @@
 %D \FC prettythree   \MC yellow   \MC 0.0  \MC 0.0  \MC 0.9  \MC 0.60  \LC\MR
 %D \FC prettyfour    \MC blue     \MC 0.8  \MC 0.8  \MC 0.6  \MC 0.75  \LC\LR
 %D \HL
-%D \stoptabel
+%D \stoptable
 %D 
 %D Outside \CONTEXT\ these colors are defined in
 %D \type{verb-ini}, in \CONTEXT\ their definitions can be found
diff --git a/tex/context/base/verb-xml.tex b/tex/context/base/verb-xml.tex
index 52304fc53..6738d422b 100644
--- a/tex/context/base/verb-xml.tex
+++ b/tex/context/base/verb-xml.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=verb-xml,
+%D   [       filefile=verb-xml,
 %D        version=2000.05.09,
 %D          title=\CONTEXT\ Verbatim Macros,
 %D       subtitle=Pretty XML verbatim,
@@ -55,7 +55,7 @@
 %D   [margin=1cm,
 %D   before={\switchtobodyfont[9pt]\blank[medium]},
 %D   after={\switchtobodyfont[11pt]\blank[medium]},
-%D   letter=\ss]
+%D   style=\ss]
 %D
 
 \ifx\XMLlinebreak\undefined
diff --git a/tex/context/base/x-chemml.tex b/tex/context/base/x-chemml.tex
index 8475fe81a..e34248cf5 100644
--- a/tex/context/base/x-chemml.tex
+++ b/tex/context/base/x-chemml.tex
@@ -1,20 +1,20 @@
 %D \module
-%D   [       file=m-chemml,
+%D   [       filefile=m-chemml,
 %D        version=2001.09.12,
 %D          title=\CONTEXT\ XML Modules,
-%D       subtitle=Loading \CHEMML\ Filters, 
+%D       subtitle=Loading CHEMML Filters,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-\useXMLfilter[cml] 
+\useXMLfilter[cml]
 
-%D Structural formulas are codes in a \PPCHTEX\ way; this 
-%D will change -)  
+%D Structural formulas are codes in a \PPCHTEX\ way; this
+%D will change -)
 %D
 %D \startbuffer
 %D <dchem>
@@ -60,23 +60,23 @@
 %D
 %D \typebuffer
 
-% \ifx\XMLgtoks\undefined \newtoks\XMLgtoks \fi 
-% \ifx\XMLttoks\undefined \newtoks\XMLttoks \fi 
-% 
+% \ifx\XMLgtoks\undefined \newtoks\XMLgtoks \fi
+% \ifx\XMLttoks\undefined \newtoks\XMLttoks \fi
+%
 % \defineXMLenvironment [structure]
 %   {\startchemical\ignorespaces}
 %   {\relax\stopchemical}
-% 
-% \def\chemicalXMLg#1% \defineXMLcollect [graphic] \XMLgtoks 
+%
+% \def\chemicalXMLg#1% \defineXMLcollect [graphic] \XMLgtoks
 %   {\doifelsenothing{\the\XMLgtoks}
 %      {\doglobal\appendtoks #1\to\XMLgtoks\ignorespaces}
 %      {\doglobal\appendtoks,#1\to\XMLgtoks\ignorespaces}}
-% 
+%
 % \def\chemicalXMLt#1%
 %   {\doifelsenothing{\the\XMLttoks}
 %      {\doglobal\appendtoks #1\to\XMLttoks\ignorespaces}
 %      {\doglobal\appendtoks,#1\to\XMLttoks\ignorespaces}}
-% 
+%
 % \defineXMLenvironment [component] [type=]
 %   {\global\XMLgtoks\emptytoks
 %    \global\XMLttoks\emptytoks
@@ -85,21 +85,21 @@
 %    \ignorespaces}
 %   {\expanded{\chemical[\the\XMLgtoks][\the\XMLttoks]}%
 %    \ignorespaces}
-% 
-% \defineXMLargument [oxidation] [sign=,n=1] \chemicalXMLo % +/- 1..7 
-% 
+%
+% \defineXMLargument [oxidation] [sign=,n=1] \chemicalXMLo % +/- 1..7
+%
 % \def\chemicalXMLo#1%
 %   {\expanded{\chemicalXMLt
 %      {\noexpand\chemicaloxidation{\XMLop{sign}}{\XMLop{n}}{#1}}}%
 %    \ignorespaces}
-% 
-% \defineXMLenvironment [annotation] [location=] 
+%
+% \defineXMLenvironment [annotation] [location=]
 %   {\bgroup
 %    \defineXMLenvironmentsave[text]{\ignorespaces}{\ignorespaces}%
 %    \defineXMLenvironmentsave[caption]{\ignorespaces}{\ignorespaces}%
 %    \ignorespaces}
 %   {\scratchtoks{\chemicalright}%
-%    \processaction 
+%    \processaction
 %      [\XMLop{location}]
 %      [ t=>\scratchtoks{\chemicaltop},
 %        b=>\scratchtoks{\chemicalbottom},
@@ -115,29 +115,29 @@
 %       lb=>\scratchtoks{\chemicalleftbottom},
 %       rt=>\scratchtoks{\chemicalrighttop},
 %       rb=>\scratchtoks{\chemicalrightbottom},
-%        x=>\scratchtoks{\chemicaltighttext}, 
+%        x=>\scratchtoks{\chemicaltighttext},
 %       sl=>\scratchtoks{\chemicalsmashedleft},
 %       sm=>\scratchtoks{\chemicalsmashedmiddle},
-%       sr=>\scratchtoks{\chemicalsmashedright}]% 
+%       sr=>\scratchtoks{\chemicalsmashedright}]%
 %     \expanded{\chemicalXMLt
 %       {\the\scratchtoks{\XMLflush{text}}{\XMLflush{caption}}}}%
 %    \egroup
 %    \ignorespaces}
-% 
+%
 % \defineXMLenvironment [forever]
-%   {\chemicalXMLt{\[}\ignorespaces} 
-%   {\chemicalXMLt{\]}\ignorespaces} 
+%   {\chemicalXMLt{\[}\ignorespaces}
+%   {\chemicalXMLt{\]}\ignorespaces}
 
-\ifx\XMLgtoks\undefined \newtoks\XMLgtoks \fi 
-\ifx\XMLttoks\undefined \newtoks\XMLttoks \fi 
+\ifx\XMLgtoks\undefined \newtoks\XMLgtoks \fi
+\ifx\XMLttoks\undefined \newtoks\XMLttoks \fi
 
 \startXMLmapping [cml]
 
-% this will be a more natural method; this also triggers it 
+% this will be a more natural method; this also triggers it
 
-\installXMLunknownremapping 
+\installXMLunknownremapping
 
-% extensions 
+% extensions
 
 \remapXMLsequence [structure] [CPA] \doCMLstructure
 \remapXMLsequence [component] [CPA] \doCMLcomponent
@@ -152,7 +152,7 @@
 \def\doCMLstructure#1#2%
   {\startchemical\ignorespaces#2\unskip\stopchemical}
 
-\def\doCMLgraphic#1#2% 
+\def\doCMLgraphic#1#2%
   {\doifelsenothing{\the\XMLgtoks}
      {\uppercase{\doglobal\appendtoks #2\to\XMLgtoks\ignorespaces}}
      {\uppercase{\doglobal\appendtoks,#2\to\XMLgtoks\ignorespaces}}%
@@ -173,11 +173,11 @@
 
 \def\doCMLannotation#1#2%
   {\getXMLarguments{cml}{location="" #1}%
-   \def\dodoCMLannotation##1% 
+   \def\dodoCMLannotation##1%
      {\doCMLtext\empty{##1%
         {\let\doCMLtext   \secondoftwoarguments\processXMLRchild{text}{#2}}%
         {\let\doCMLcaption\unmapXMLdata        \processXMLRchild{caption}{#2}}}}%
-   \processaction 
+   \processaction
      [\XMLpar{cml}{location}{r}]
      [ t=>\dodoCMLannotation\chemicaltop,
        b=>\dodoCMLannotation\chemicalbottom,
@@ -193,7 +193,7 @@
       lb=>\dodoCMLannotation\chemicalleftbottom,
       rt=>\dodoCMLannotation\chemicalrighttop,
       rb=>\dodoCMLannotation\chemicalrightbottom,
-       x=>\dodoCMLannotation\chemicaltighttext, 
+       x=>\dodoCMLannotation\chemicaltighttext,
       sl=>\dodoCMLannotation\chemicalsmashedleft,
       sm=>\dodoCMLannotation\chemicalsmashedmiddle,
       sr=>\dodoCMLannotation\chemicalsmashedright]%
@@ -209,4 +209,4 @@
 
 \stopXMLmapping
 
-\endinput 
+\endinput
diff --git a/tex/context/base/x-contml.tex b/tex/context/base/x-contml.tex
index e50fed733..b20821191 100644
--- a/tex/context/base/x-contml.tex
+++ b/tex/context/base/x-contml.tex
@@ -4,7 +4,7 @@
 %M \definefilesynonym [context] [x-contml.xsd]
 
 %D \module
-%D   [       file=x-contml,
+%D   [       filefile=x-contml,
 %D        version=mid 2001,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Basic \CONTEXT\ commands,
@@ -97,7 +97,7 @@
 %D
 %D \showelements [context] [references]
 
-\defineXMLpickup [context:pageref] [label=] {\op}     {[\XMLop{label}]}
+\defineXMLpickup [context:pageref] [label=] {\at}     {[\XMLop{label}]}
 \defineXMLpickup [context:textref] [label=] {\in}     {[\XMLop{label}]}
 \defineXMLpickup [context:lineref] [label=] {\inline} {[\XMLop{label}]}
 
@@ -201,10 +201,8 @@
 
 \defineXMLenvironment [context:itemize] [type=,packed=]
   {\let\XMLoptions\empty
-   \doifsomethingXMLop{type}
-     {\addtocommalist{\XMLop{type}}\XMLoptions}
-   \doifXMLop{packed}{yes}
-     {\addtocommalist{packed}\XMLoptions}
+   \doifsomethingXMLop{type}{\addtocommalist{\XMLop{type}}\XMLoptions}%
+   \doifXMLop{packed}{yes}{\addtocommalist{packed}\XMLoptions}%
    \expanded{\startitemize[\XMLoptions]}}
   {\stopitemize}
 
@@ -212,6 +210,28 @@
   {\expanded{\item[\XMLop{label}]}}
   {\endgraf}
 
+%D \elements {externalfigure}
+%D
+%D \startbuffer
+%D The previous examples already demonstrated how we can include a graphic:
+%D
+%D <verbatim>
+%D <line><externalfigure file="koe" width="5cm" /></line>
+%D </verbatim>
+%D \stopbuffer
+%D
+%D \showelements [context] [externalfigure]
+
+\defineXMLsingular [context:externalfigure] [\??ef] [base=,label=,file=]
+  {\bgroup % \getXMLta \expandXMLta \expandXMLtp{file}%
+   \expandXMLta
+   \getXMLta % expand entities first
+   \doifelsenothing{\XMLtp{label}}
+     {\expanded{\externalfigure[\XMLtp{file}][\XMLta]}}
+     {\doifsomething{\XMLtp{base}}{\usefigurebase[\XMLtp{base}]}%
+      \expanded{\externalfigure[\XMLtp{label}][\XMLta]}}
+   \egroup}
+
 %D \elements {fixed}
 %D
 %D \startbuffer
@@ -236,12 +256,12 @@
   {\bgroup
    \defineXMLsave[context:caption]
    \defineXMLsave[context:content]}
-  {\expanded{\startfixed[\XMLop{location}]}
-   \doifXMLdataelse{context:caption}
-     {\startcombination[1*1]
-        {\XMLflush{context:content}} {\XMLflush{context:caption}}
-      \stopcombination}
-     {\XMLflush{context:content}}
+  {\expanded{\startfixed[\XMLop{location}]}%
+     \doifXMLdataelse{context:caption}
+       {\startcombination[1*1]
+          {\XMLflush{context:content}} {\XMLflush{context:caption}}
+        \stopcombination}
+       {\XMLflush{context:content}}%
    \stopfixed
    \egroup}
 
@@ -272,27 +292,6 @@
         {\XMLflush{context:caption}} {\XMLflush{context:content}}}
    \egroup}
 
-%D \elements {externalfigure}
-%D
-%D \startbuffer
-%D The previous examples already demonstrated how we can include a graphic:
-%D
-%D <verbatim>
-%D <line><externalfigure file="koe" width="5cm" /></line>
-%D </verbatim>
-%D \stopbuffer
-%D
-%D \showelements [context] [externalfigure]
-
-\defineXMLsingular [context:externalfigure] [\??ef] [base=,label=,file=]
-  {\bgroup % \getXMLta \expandXMLta \expandXMLtp{file}%
-   \expandXMLta \getXMLta % expand entities first
-   \doifelsenothing{\XMLtp{label}}
-     {\expanded{\externalfigure[\XMLtp{file}][\XMLta]}}
-     {\doifsomething{\XMLtp{base}}{\usefigurebase[\XMLtp{base}]}%
-      \expanded{\externalfigure[\XMLtp{label}][\XMLta]}}
-   \egroup}
-
 %D \elements {quotation,quote}
 %D
 %D \startbuffer
@@ -478,4 +477,4 @@
 \defineXMLpickup [combinationcaption]
   {\appendtoks\bgroup}{\egroup\to\scratchtoks}
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/x-corres.tex b/tex/context/base/x-corres.tex
index 259c07e95..23c1b05d4 100644
--- a/tex/context/base/x-corres.tex
+++ b/tex/context/base/x-corres.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=x-corres,
+%D   [       filefile=x-corres,
 %D        version=2003.12.15, % replaces keep-02a cum suis
 %D          title=\CONTEXT\ XML Modules,
 %D       subtitle=Handling Correspondence Base,
@@ -133,4 +133,4 @@
       \processcommacommand[#1]\processXMLfile}%
    \egroup}
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/x-dir-01.tex b/tex/context/base/x-dir-01.tex
index 5c24eb033..6be410376 100644
--- a/tex/context/base/x-dir-01.tex
+++ b/tex/context/base/x-dir-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-dir-01,
+%D   [      filefile=x-dir-01,
 %D        version=2003.05.10, % around that time -)
 %D          title=\CONTEXT\ Directory Handling,
 %D       subtitle=Overview (1),
@@ -142,4 +142,4 @@
 
   \ifnum\NOfEntries=0 There are no files found that match the pattern. \fi
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/x-fig-00.tex b/tex/context/base/x-fig-00.tex
index 0afc6aea3..b25eece3e 100644
--- a/tex/context/base/x-fig-00.tex
+++ b/tex/context/base/x-fig-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-00,
+%D   [      filefile=x-fig-00,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Loading,
@@ -23,7 +23,7 @@
 %D
 %D A figure base coded this way looks like: 
 %D 
-%D \starttypen
+%D \starttyping
 %D <!-- texexec --pdf --use=fig-01 figtest.xml --> 
 %D 
 %D <figurelibrary language="nl"> 
@@ -50,28 +50,28 @@
 %D   </figure>
 %D 
 %D </figurelibrary> 
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D You can convert this base into a \PDF\ file using 
 %D \TEXEXEC\ and another module in this suite. 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D texexec --pdf --use=fig-make yourfile.xml
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D You can now select a graphic from this file using the 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \externalfigure[a dutch cow][width=4cm]
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D This module overloads this command so that a figure is 
 %D it first searched in the list of databases. 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D \usemodule     [fig-base]
 %D \usefigurebases[yourfile]
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The special keyword \type {reset} can be used to reset 
 %D this list.
@@ -170,7 +170,7 @@
      \else
        \let\figurepathlist\figurefilebasepath
        \normalcalculateexternalfigure
-         [#1][#2][\figurefilebase.pdf][\c!pagina=\figurefilepage,#4][#5][#6]%
+         [#1][#2][\figurefilebase.pdf][\c!page=\figurefilepage,#4][#5][#6]%
      \fi
    \fi}
 
diff --git a/tex/context/base/x-fig-01.tex b/tex/context/base/x-fig-01.tex
index 173139a86..7c8c82594 100644
--- a/tex/context/base/x-fig-01.tex
+++ b/tex/context/base/x-fig-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-01,
+%D   [      filefile=x-fig-01,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Generation,
@@ -19,34 +19,34 @@
 %D variable). You can apply this style to a database by
 %D saying:
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=fig-make yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D
 %D The following modes are supported:
 %D
-%D \starttabulatie[|lT|l|]
+%D \starttabulate[|lT|l|]
 %D \NC letter  \NC map the preview on letter size  \NC \NR
 %D \NC compact \NC use an alternative presentation \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The resulting file has the following characteristics:
 %D
-%D \startopsomming[opelkaar]
-%D \som  the document is split into three sections: first each
+%D \startitemize[packed]
+%D \item  the document is split into three sections: first each
 %D       figure is shown at its own page, then an overview of
 %D       figures is shown with some data alongside, and
 %D       finally an index and table of contents shows up
-%D \som  there is no title page, which means that one can
+%D \item  there is no title page, which means that one can
 %D       access a figure by page number without offset
-%D \som  the document is opened at the first overview page,
+%D \item  the document is opened at the first overview page,
 %D       that is, when the viewer supports it
-%D \som  the graphic is shown 3~times: on a page of its own,
+%D \item  the graphic is shown 3~times: on a page of its own,
 %D       scaled to a fixed dimension, and relative to a4 or
 %D       letter paper size
-%D \som  the labels can be accessed in an index and list at
+%D \item  the labels can be accessed in an index and list at
 %D       the end of the document
-%D \stopopsomming
+%D \stopitemize
 %D
 %D We use named destinations, which means that one can
 %D access a figure by name from an external application.
diff --git a/tex/context/base/x-fig-02.tex b/tex/context/base/x-fig-02.tex
index 0fec27981..322f804c2 100644
--- a/tex/context/base/x-fig-02.tex
+++ b/tex/context/base/x-fig-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-02,
+%D   [      filefile=x-fig-02,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Inclusion (I),
@@ -16,23 +16,23 @@
 %D This module enables non||\ConTeXt\  users to access the 
 %D database. For this, you need to run  
 %D 
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=fig-fake yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D 
 %D The resulting file, \type {yourfile.fig}, can be loaded 
 %D in the normal way. The figures can be accessed with: 
 %D
-%D \starttypen
+%D \starttyping
 %D \getfigurefile{label} 
 %D \getfigurepage{label} 
-%D \stoptypen
+%D \stoptyping
 %D
 %D A a bonus, the following macro is defined: 
 %D
-%D \starttypen
+%D \starttyping
 %D \includefigurefile width 10cm {label}
-%D \stoptypen
+%D \stoptyping
 
 \usemodule[fig-00]
 
diff --git a/tex/context/base/x-fig-03.tex b/tex/context/base/x-fig-03.tex
index bf5ea226c..8cf5fe92a 100644
--- a/tex/context/base/x-fig-03.tex
+++ b/tex/context/base/x-fig-03.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-03,
+%D   [      filefile=x-fig-03,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Inclusion (II),
diff --git a/tex/context/base/x-mathml.tex b/tex/context/base/x-mathml.tex
index ed8e25866..54ad91edc 100644
--- a/tex/context/base/x-mathml.tex
+++ b/tex/context/base/x-mathml.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-mathml,
+%D   [       filefile=m-mathml,
 %D        version=1999.12.20,
 %D          title=\CONTEXT\ XML Modules,
 %D       subtitle=Loading \MATHML\ Filters,
@@ -45,4 +45,4 @@
      \advance\xmlmathlevel-1\relax
    \fi}
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/x-physml.tex b/tex/context/base/x-physml.tex
index 0b9799a34..e82801a93 100644
--- a/tex/context/base/x-physml.tex
+++ b/tex/context/base/x-physml.tex
@@ -1,16 +1,16 @@
 %D \module
-%D   [       file=m-physml,
+%D   [       filefile=m-physml,
 %D        version=2001.09.04,
 %D          title=\CONTEXT\ XML Modules,
-%D       subtitle=Loading \PHYSML\ Filters, 
+%D       subtitle=Loading PHYSML Filters,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
-\usemodule[units] \useXMLfilter[pml,pmu] 
+\usemodule[units] \useXMLfilter[pml,pmu]
 
-\endinput 
+\endinput
diff --git a/tex/context/base/x-res-00.tex b/tex/context/base/x-res-00.tex
index 46a278768..be4eca9b8 100644
--- a/tex/context/base/x-res-00.tex
+++ b/tex/context/base/x-res-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-res-00,
+%D   [      filefile=x-res-00,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Resource Libraries,
diff --git a/tex/context/base/x-res-01.tex b/tex/context/base/x-res-01.tex
index d28baecf4..574196a86 100644
--- a/tex/context/base/x-res-01.tex
+++ b/tex/context/base/x-res-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-01,
+%D   [      filefile=x-fig-01,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Generation,
@@ -17,34 +17,34 @@
 %D (\TEXEXEC\ will set this variable). You can apply this
 %D style to a database by saying:
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=fig-make yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D
 %D The following modes are supported:
 %D
-%D \starttabulatie[|lT|l|]
+%D \starttabulate[|lT|l|]
 %D \NC letter  \NC map the preview on letter size  \NC \NR
 %D \NC compact \NC use an alternative presentation \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D The resulting file has the following characteristics:
 %D
-%D \startopsomming[opelkaar]
-%D \som  the document is split into three sections: first each
+%D \startitemize[packed]
+%D \item  the document is split into three sections: first each
 %D       figure is shown at its own page, then an overview of
 %D       figures is shown with some data alongside, and
 %D       finally an index and table of contents shows up
-%D \som  there is no title page, which means that one can
+%D \item  there is no title page, which means that one can
 %D       access a figure by page number without offset
-%D \som  the document is opened at the first overview page,
+%D \item  the document is opened at the first overview page,
 %D       that is, when the viewer supports it
-%D \som  the graphic is shown 3~times: on a page of its own,
+%D \item  the graphic is shown 3~times: on a page of its own,
 %D       scaled to a fixed dimension, and relative to a4 or
 %D       letter paper size
-%D \som  the labels can be accessed in an index and list at
+%D \item  the labels can be accessed in an index and list at
 %D       the end of the document
-%D \stopopsomming
+%D \stopitemize
 %D
 %D We use named destinations, which means that one can
 %D access a figure by name from an external application.
@@ -448,4 +448,4 @@
 
 \processXMLfilegrouped{\jobfullname} \page
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/x-res-02.tex b/tex/context/base/x-res-02.tex
index 5ef8e901d..99102afb7 100644
--- a/tex/context/base/x-res-02.tex
+++ b/tex/context/base/x-res-02.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-res-02,
+%D   [      filefile=x-res-02,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Inclusion (I),
@@ -14,23 +14,23 @@
 %D This module enables non||\ConTeXt\  users to access the
 %D database. For this, you need to run
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=fig-fake yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D
 %D The resulting file, \type {yourfile.fig}, can be loaded
 %D in the normal way. The figures can be accessed with:
 %D
-%D \starttypen
+%D \starttyping
 %D \getfigurefile{label}
 %D \getfigurepage{label}
-%D \stoptypen
+%D \stoptyping
 %D
 %D A a bonus, the following macro is defined:
 %D
-%D \starttypen
+%D \starttyping
 %D \includefigurefile width 10cm {label}
-%D \stoptypen
+%D \stoptyping
 
 \usemodule[res-00]
 
diff --git a/tex/context/base/x-res-03.tex b/tex/context/base/x-res-03.tex
index bf5ea226c..8cf5fe92a 100644
--- a/tex/context/base/x-res-03.tex
+++ b/tex/context/base/x-res-03.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-03,
+%D   [      filefile=x-fig-03,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Inclusion (II),
diff --git a/tex/context/base/x-res-04.tex b/tex/context/base/x-res-04.tex
index 578be1a7e..de7882639 100644
--- a/tex/context/base/x-res-04.tex
+++ b/tex/context/base/x-res-04.tex
@@ -14,7 +14,7 @@
 % application
 
 %D \module
-%D   [      file=x-fig-04,
+%D   [      filefile=x-fig-04,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Figure Base Loading,
@@ -36,7 +36,7 @@
 %D
 %D A figure base coded this way looks like:
 %D
-%D \starttypen
+%D \starttyping
 %D <!-- texexec --pdf --use=fig-01 figtest.xml -->
 %D
 %D <figurelibrary language="nl">
@@ -63,28 +63,28 @@
 %D   </figure>
 %D
 %D </figurelibrary>
-%D \stoptypen
+%D \stoptyping
 %D
 %D You can convert this base into a \PDF\ file using
 %D \TEXEXEC\ and another module in this suite.
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=fig-make yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D
 %D You can now select a graphic from this file using the
 %D
-%D \starttypen
+%D \starttyping
 %D \externalfigure[a dutch cow][width=4cm]
-%D \stoptypen
+%D \stoptyping
 %D
 %D This module overloads this command so that a figure is
 %D it first searched in the list of databases.
 %D
-%D \starttypen
+%D \starttyping
 %D \usemodule     [fig-base]
 %D \usefigurebases[yourfile]
-%D \stoptypen
+%D \stoptyping
 %D
 %D The special keyword \type {reset} can be used to reset
 %D this list.
diff --git a/tex/context/base/x-res-08.tex b/tex/context/base/x-res-08.tex
index d8a8bd07a..994775cc9 100644
--- a/tex/context/base/x-res-08.tex
+++ b/tex/context/base/x-res-08.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-08,
+%D   [      filefile=x-fig-08,
 %D        version=2002.06.27,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Resource Reporting,
@@ -88,7 +88,7 @@
          \writtenXMLelement{\XMLrlprefix height}{\figureheight}}}}
 
 \def\XMLfeedbackexternalfigure
-  {\doifmodeelse{*\v!figuur}%
+  {\doifmodeelse{*\v!figure}%
      {\XMLfeedbackresource{found}}%
      {\XMLfeedbackresource{missing}}%
    {figure}}
diff --git a/tex/context/base/x-res-09.tex b/tex/context/base/x-res-09.tex
index 608236156..1502effa0 100644
--- a/tex/context/base/x-res-09.tex
+++ b/tex/context/base/x-res-09.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-09,
+%D   [      filefile=x-fig-09,
 %D        version=2002.06.27,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Resource Reporting (2),
diff --git a/tex/context/base/x-res-10.tex b/tex/context/base/x-res-10.tex
index f23c50358..94d3acb67 100644
--- a/tex/context/base/x-res-10.tex
+++ b/tex/context/base/x-res-10.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-10,
+%D   [      filefile=x-fig-10,
 %D        version=2003.08.02,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Resource Dummy Generation,
diff --git a/tex/context/base/x-res-11.tex b/tex/context/base/x-res-11.tex
index c58f868c0..2f0052d66 100644
--- a/tex/context/base/x-res-11.tex
+++ b/tex/context/base/x-res-11.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-fig-11,
+%D   [      filefile=x-fig-11,
 %D        version=2003.02.08,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Resource Reporting (3),
@@ -48,11 +48,11 @@
 
 \unprotect 
 
-\setuplayout[\v!midden]
+\setuplayout[\v!middle]
 
 \startsetups[rl:figure]
 
-  \externalfigure[\XMLflush{rl:file}][\c!breedte=4cm]
+  \externalfigure[\XMLflush{rl:file}][\c!width=4cm]
  
 \stopsetups
 
@@ -79,7 +79,7 @@
 
 \startsetups[rl:usage]
 
-  \startfiguretext {\v!geen} {\setups[rl:figure]}
+  \startfiguretext {\v!none} {\setups[rl:figure]}
     \setups[rl:table]
   \stopfiguretext 
 
@@ -89,16 +89,16 @@
 
   \useMPlibrary[nav]
 
-  \setupcolors[\c!status=\v!start]
+  \setupcolors[\c!state=\v!start]
 
-  \setupinteraction[\c!status=\v!start]
+  \setupinteraction[\c!state=\v!start]
 
   \useattachment[whatever][\outputfilename.zip]
 
   \startlocalsetups[rl:attach:button]
 
     \inframed
-      [\c!offset=\v!overlay,\c!kader=\v!uit]
+      [\c!offset=\v!overlay,\c!frame=\v!off]
       {\attachment[whatever]}
 
   \stoplocalsetups
diff --git a/tex/context/base/x-res-50.tex b/tex/context/base/x-res-50.tex
index a36647a20..086dc0f68 100644
--- a/tex/context/base/x-res-50.tex
+++ b/tex/context/base/x-res-50.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-res-50,
+%D   [      filefile=x-res-50,
 %D        version=2004.02.18,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=Multimedia Presentation,
@@ -14,7 +14,7 @@
 %D This is a preliminary module, using a preliminary xml media format that
 %D looks as follows (record is embedded in resource library element):
 %D
-%D \starttypen
+%D \starttyping
 %D <rl:mediaclip label="sample 1">
 %D   <rl:name>Sample One</rl:name>
 %D   <rl:mime>application/x-shockwave-flash</rl:mime>
@@ -31,17 +31,17 @@
 %D   <rl:file>mb.mp3</rl:file>
 %D   <rl:picture>mb.jpg</rl:picture>
 %D </rl:mediaclip>
-%D \stoptypen
+%D \stoptyping
 %D
-%D \starttypen
+%D \starttyping
 %D texexec --pdf --use=med-show yourfile.xml
-%D \stoptypen
+%D \stoptyping
 %D
 %D Bonus:
 %D
-%D \starttypen
+%D \starttyping
 %D --arg="url=http://localhost:8881/e:/media"
-%D \stoptypen
+%D \stoptyping
 
 % output=pdftex
 
@@ -422,4 +422,4 @@
 
 \doifelsenothing{\inputfilename}
   {\processXMLfile{mediaclient.xml}}
-  {\processXMLfile{\inputfilename}}
\ No newline at end of file
+  {\processXMLfile{\inputfilename}}
diff --git a/tex/context/base/x-sch-00.tex b/tex/context/base/x-sch-00.tex
index 97b266d5e..9504d3056 100644
--- a/tex/context/base/x-sch-00.tex
+++ b/tex/context/base/x-sch-00.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-sch-00,
+%D   [      filefile=x-sch-00,
 %D        version=2001.10.02,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=XML Schema Basics,
diff --git a/tex/context/base/x-sch-01.tex b/tex/context/base/x-sch-01.tex
index d954b1730..22626d30f 100644
--- a/tex/context/base/x-sch-01.tex
+++ b/tex/context/base/x-sch-01.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [      file=x-sch-01,
+%D   [      filefile=x-sch-01,
 %D        version=2001.10.04,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=XML Schema Presentation,
@@ -15,9 +15,9 @@
 %D implemented in \type {x-sch-00}. This is an experimental 
 %D style, more will follow. 
 %D 
-%D \starttypen 
+%D \starttyping 
 %D texexec --use=sch-01 x-fig-00.xsd --pdf
-%D \stoptypen 
+%D \stoptyping 
 
 \doifnothing  {\jobfilename}        {\end} 
 \doiffileelse {\jobfilename.xsd} {} {\end} 
diff --git a/tex/context/base/x-xml-01.tex b/tex/context/base/x-xml-01.tex
index 093261e22..b2571b266 100644
--- a/tex/context/base/x-xml-01.tex
+++ b/tex/context/base/x-xml-01.tex
@@ -1,7 +1,7 @@
 % output=pdftex modes=packed
 
 %D \module
-%D   [      file=x-xml-01,
+%D   [      filefile=x-xml-01,
 %D        version=2001.10.10,
 %D          title=\CONTEXT\ XML Style File,
 %D       subtitle=Formatting X?? files,
@@ -106,4 +106,4 @@
 
   \dontcomplain \showXMLfile{\inputfilename}
 
-\stoptext
\ No newline at end of file
+\stoptext
diff --git a/tex/context/base/x-xml-02.tex b/tex/context/base/x-xml-02.tex
index c5b52573c..d05314155 100644
--- a/tex/context/base/x-xml-02.tex
+++ b/tex/context/base/x-xml-02.tex
@@ -1,7 +1,7 @@
 % output=pdftex modes=letter
 
 %D \module
-%D   [      file=x-xml-02,
+%D   [      filefile=x-xml-02,
 %D        version=2001.10.10,
 %D          title=\CONTEXT\ XML Style File,
 %D       subtitle=Pretty Printing, 
diff --git a/tex/context/base/xtag-ent.tex b/tex/context/base/xtag-ent.tex
index ef98e7eb1..15c412390 100644
--- a/tex/context/base/xtag-ent.tex
+++ b/tex/context/base/xtag-ent.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-ent,
+%D   [       filefile=xtag-ent,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=A bunch of Entities,
@@ -122,4 +122,4 @@
 \defineXMLentity [zcaron]  {\zcaron} % unofficial
 
 \defineXMLentity [dots]    {\unknown}
-\defineXMLentity [amp]     {\&}
\ No newline at end of file
+\defineXMLentity [amp]     {\&}
diff --git a/tex/context/base/xtag-exp.tex b/tex/context/base/xtag-exp.tex
index d60d1e0a0..9efb02453 100644
--- a/tex/context/base/xtag-exp.tex
+++ b/tex/context/base/xtag-exp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-exp,
+%D   [       filefile=xtag-exp,
 %D        version=2001.08.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Expansion Related Things,
@@ -52,7 +52,7 @@
    \appendtoks  \forcefileexpansiontrue \to \everyenableXML
    \let\enableXMLfiledata\relax}
 
-\setupXMLprocessing[\c!status=\v!start]
+\setupXMLprocessing[\c!state=\v!start]
 
 \appendtoks
   \ifproductionrun \enableXMLfiledata \fi
@@ -82,4 +82,4 @@
    \setxvalue{\@@crk\string#1}{\the\scratchtoks}%
    \normalmarks#1{\the\scratchtoks}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index bf119f551..242cdb721 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-ext,
+%D   [       filefile=xtag-ext,
 %D        version=2001.03.21,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Extra Macros,
@@ -27,11 +27,11 @@
 %D will not conflict (don't confuse this with \XML\
 %D namespaces.)
 %D
-%D \starttypen
+%D \starttyping
 %D \startXMLmapping [tag] | [-] [tag] | [+] [tag]
 %D   definitions
 %D \stopXMLmapping
-%D \stoptypen
+%D \stoptyping
 %D
 %D When a \type {[+]} is specified, the mappings will
 %D nest.
@@ -97,11 +97,11 @@
 %D
 %D Imagine something:
 %D
-%D \starttypen
+%D \starttyping
 %D \defineXMLenvironment [something]
 %D   {\startXMLmapping[whatever]}
 %D   {\stopXMLmapping}
-%D \stoptypen
+%D \stoptyping
 %D
 %D Here the \type {\stopXMLmapping} will never be reached
 %D because we are in a mapping. Therefore we need:
@@ -272,4 +272,4 @@
 \def\writtenXMLend      #1{</#1>}
 \def\writtenXMLempty    #1{<#1/>}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/xtag-hyp.tex b/tex/context/base/xtag-hyp.tex
index 5328899c5..d364b6d67 100644
--- a/tex/context/base/xtag-hyp.tex
+++ b/tex/context/base/xtag-hyp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-hyp,
+%D   [       filefile=xtag-hyp,
 %D        version=2003.11.24,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=hyphenation support,
@@ -46,4 +46,4 @@
 % \hyphenatedword{pati\ediaeresis ntenorganisatie}
 % \hyphenatedword{pati\ediaeresis ntenplatform}
 %
-% \stoptext
\ No newline at end of file
+% \stoptext
diff --git a/tex/context/base/xtag-ini.tex b/tex/context/base/xtag-ini.tex
index 2968c572d..4efbc037c 100644
--- a/tex/context/base/xtag-ini.tex
+++ b/tex/context/base/xtag-ini.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-ini,
+%D   [       filefile=xtag-ini,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Initialization,
@@ -372,9 +372,9 @@
 %D called an empty element. The following definitions are
 %D equivalent:
 %D
-%D \starttypen
+%D \starttyping
 %D <eerste></eerste>  <eerste/>  <eerste />
-%D \stoptypen
+%D \stoptyping
 %D
 %D Empty elements can have arguments too. Conforming the
 %D standard, each key must have a value. These are separated
@@ -382,15 +382,15 @@
 %D \type {"} or \type {'}. There may be spaces around the
 %D equal sign.
 %D
-%D \starttypen
+%D \starttyping
 %D <eerste a= "b" c ="d" />  <eerste a = "b" c="d"/>
-%D \stoptypen
+%D \stoptyping
 %D
 %D Officially the following definition is not valid:
 %D
-%D \starttypen
+%D \starttyping
 %D <eerste>some text</eerste>  <eerste/>  <eerste />
-%D \stoptypen
+%D \stoptyping
 %D
 %D Although we can handle both cases independently, this is
 %D seldom needed.
@@ -398,27 +398,27 @@
 %D Processing instructions are identified by a~\type {?} and are
 %D like empty elements.
 %D
-%D \starttypen
+%D \starttyping
 %D <?doel a="b" c="d"?> <?doel a="b" c="d" ?>
-%D \stoptypen
+%D \stoptyping
 %D
 %D Comment is formatted as follows.
 %D
-%D \starttypen
+%D \starttyping
 %D <!-- comment -->
-%D \stoptypen
+%D \stoptyping
 %D
 %D Verbatim code inits purest form is called \type {CDATA} and
 %D is embedded in the following ugly and therefore recognizable
 %D way:
 %D
-%D \starttypen
+%D \starttyping
 %D <![CDATA[
 %D Dit is nogal verbatim !
 %D Dit is nogal verbatim !
 %D Dit is nogal verbatim !
 %D ]]>
-%D \stoptypen
+%D \stoptyping
 
 %D The parser is implemented as a multi||step macro. Because
 %D \type {!} and \type {?} should be picked up correctly, we
@@ -875,6 +875,11 @@
      \csname\@@XMLdepth:\the\numexpr(\XMLdepth-#1)\endcsname
    \fi}
 
+% \def\XMLpureancestor#1% test for relax insertion
+%   {\ifcase\numexpr(\XMLdepth-#1)\or
+%      \csname\@@XMLdepth:\the\numexpr(\XMLdepth-#1)\endcsname
+%    \fi}
+
 \def\XMLparent{\XMLancestor\plusone}
 \def\XMLself  {\XMLancestor\zerocount}
 
@@ -980,12 +985,12 @@
 %
 % \defineXMLenvironment[two]
 %   {\beginXMLelement
-%    \starttabulate
+%    \starttabulatie
 %    \NC ancestor 1 \NC \XMLancestor{1} \NC \NR
 %    \NC ancestor 2 \NC \XMLancestor{2} \NC \NR
 %    \NC ancestor 3 \NC \XMLancestor{3} \NC \NR
 %    \NC ancestor 4 \NC \XMLancestor{4} \NC \NR
-%    \stoptabulate}
+%    \stoptabulatie}
 %   {\endXMLelement}
 %
 % \startbuffer
@@ -1029,14 +1034,14 @@
 %D   <x:one> <x:two> <one> <two> </two> </one> </x:two> </x:one>
 %D   \stopbuffer
 %D
-%D   fallback A: \setXMLfallbacklevel0 \processXMLbuffer
-%D   fallback B: \setXMLfallbacklevel1 \processXMLbuffer
-%D   fallback C: \setXMLfallbacklevel2 \processXMLbuffer
+%D   fallback A: \setXMLfallbackmode0 \processXMLbuffer
+%D   fallback B: \setXMLfallbackmode1 \processXMLbuffer
+%D   fallback C: \setXMLfallbackmode2 \processXMLbuffer
 
 %D Here we do the namespace (re)mapping. More examples are
 %D provided in the manual.
 %D
-%D \starttypen
+%D \starttyping
 %D \supportXMLnamespace  [test] % needed to get a namespace working
 %D \skipXMLnamespace     [test] % slow
 %D \ignoreXMLnamespace   [test] % faster
@@ -1047,7 +1052,7 @@
 %D \remapXMLurlspace     [http://www.pragma-ade.com/dtd/context]  [context]
 %D \autoXMLnamespace     [context] % fallback
 %D \autoXMLnamespace     [whatever] % second fall back
-%D \stoptypen
+%D \stoptyping
 
 \newtoks\autoXMLnamespaces
 
@@ -1861,12 +1866,12 @@
 
 %D This is equivalent to:
 %D
-%D \starttypen
+%D \starttyping
 %D \def\resetXMLelement[#1]% handy in case only singular
 %D   {\@EA\let\csname\@@XMLelement:#1\endcsname \donothing
 %D    \@EA\let\csname\@@XMLelement:/#1\endcsname\donothing
 %D    \@EA\let\csname\@@XMLelement:#1/\endcsname\donothing}
-%D \stoptypen
+%D \stoptyping
 
 % push is (not yet) a real push, so:
 
@@ -1966,8 +1971,101 @@
   \presetXMLarguments\rawXMLidentifier
 \to \everyXMLelement
 
+%D We now overload the previously defined argument setter by one
+%D that is faster when definitions are surrounded by
+%D
+%D \starttyping
+%D \startXMLcompiling ... \stopXMLcompiling
+%D \stoptyping
+%D
+%D This method is twice as fast on (for instance) 100K calls to
+%D an empty element with 10 arguments.
+
+% \long\def\prepareXMLargument#1#2#3%
+%   {\scratchtoks\expandafter{\the\scratchtoks\@EA\def\csname#1#2\endcsname{#3}}}
+
+% \long\def\prepareXMLargument#1#2#3%
+%   {\scratchtoks\@EA\@EA\@EA{\@EA\the\@EA\scratchtoks\@EA\def\csname\@@XMLvariable:#1:#2\endcsname{#3}}}
+
+\let\@@globalprefix\empty
+
+\long\def\prepareXMLargument#1#2#3%
+  {\expanded{\scratchtoks
+     {\the\scratchtoks
+      \def\@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname{#3}%
+      \ifx\@@globalprefix\empty\else
+        \let\@EA\noexpand\csname\@@XMLvariable:\@@globalprefix:#2\endcsname
+            \@EA\noexpand\csname\@@XMLvariable:#1:#2\endcsname
+      \fi}}}
+
+\long\def\setXMLargumentsN#1#2#3% element [tag] settings
+  {\doifassignmentelse{#2}
+     {\letbeundefined{\@@XMLmap:#1}%
+      \long\setvalue{\@@XMLpars:#1}{\getrawparameters[\@@XMLvariable:#1:][#2]}}
+     {\long\setvalue{\@@XMLmap:#1}{#2}% later we can init vars by this name
+      \doifsomething{#3}{\long\setvalue{\@@XMLpars:#1}{\getrawparameters[#2][#3]}}}}
+
+\long\def\setXMLargumentsP#1#2#3% element settings empty (we cannot test for assignment)
+  {\letbeundefined{\@@XMLmap:#1}%
+   \ifx\@@globalprefix\empty\else
+     \@EA\let\csname\@@XMLglobal:#1\endcsname\@@globalprefix
+   \fi
+   \bgroup
+%     \def\XMLinheritance{\noexpand\XMLinheritance}
+     \def\XMLop##1{\noexpand\XMLpar{#1}{##1}{}}%
+     \def\XMLpar{\noexpand\XMLpar}%
+     \def\XMLanc{\noexpand\XMLanc}%
+     \def\XMLinh{\noexpand\XMLinh}%
+     \xdef\!!XMLattr{[#1][#2]}%
+     \scratchtoks\emptytoks
+     \@EA\dogetparameters\@EA\prepareXMLargument\!!XMLattr
+     \xdef\globalnext{\the\scratchtoks}%
+   \egroup
+   \letvalue{\@@XMLpars:#1}\globalnext
+   \globallet\globalnext\relax}
+
+\def\defineXMLattributeset{\dodoubleargument\dodefineXMLattributeset}
+\def\extendXMLattributeset{\dodoubleargument\doextendXMLattributeset}
+
+\def\dodefineXMLattributeset[#1][#2]{\setvalue   {\@@XMLpars::#1}{#2}}
+\def\doextendXMLattributeset[#1][#2]{\appendvalue{\@@XMLpars::#1}{,#2}}
+
+\def\XMLattributeset  #1{\executeifdefined{\@@XMLpars::#1}\empty}
+%def\XMLinheritance   #1{\executeifdefined{\@@XMLpars:#1}\empty}
+\def\showXMLattributes#1{\showvalue{\@@XMLpars:#1}}
+
+\chardef\@@precompile\zerocount
+
+\def\setXMLarguments
+  {\ifcase\@@precompile
+     \expandafter\setXMLargumentsN
+   \else
+     \expandafter\setXMLargumentsP
+   \fi}
+
+\def\docopyXMLargument
+  {\@EA\@EA\@EA\let\@EA\@EA
+     \csname\@@XMLvariable:\csname\@@XMLglobal:\currentXMLelement\endcsname:\@@XMLname\endcsname
+     \csname\@@XMLvariable:\@@XMLclass                                     :\@@XMLname\endcsname}
+
+\def\startXMLcompiling
+  {\dosingleargument\dostartXMLcompiling}
+
+\def\dostartXMLcompiling[#1]%
+  {\iffirstargument
+     \copyXMLargumentindeed % when needed, from now on -)
+     \def\@@globalprefix{#1}%
+   \fi
+   \chardef\@@precompile\plusone}
+
+\def\stopXMLcompiling
+  {\chardef\@@precompile\zerocount
+   \let\@@globalprefix\empty}
+
+%D Interesting what kind of things are needed \unknown
+
 \appendtoks
-  \disablelanguagespecifics % interesting what kind of things are needed ...
+  \disablelanguagespecifics
 \to \everyenableXML
 
 \long\def\longempty{}
@@ -2179,6 +2277,190 @@
 \def\setXMLpar#1#2%
   {\@EA\def\csname\@@XMLvariable:#1:#2\endcsname}
 
+% ancestor arguments:
+%
+% \defineXMLenvironment
+%   [fo:root]
+%   [test=unset]
+%   {\beginXMLelement}
+%   {\endXMLelement}
+%
+% \defineXMLenvironment
+%   [fo:block-container]
+%   [test=oeps]
+%   {\beginXMLelement}
+%   {\endXMLelement}
+%
+% \defineXMLenvironment
+%   [fo:block]
+%   {\beginXMLelement
+%    \begingroup}
+%   {\endgroup
+%    \XMLanc{test}{}
+%    \endXMLelement}
+%
+% \startXMLdata
+% <fo:root>
+%     <fo:block-container test='first'><fo:block test='second'>second:</fo:block></fo:block-container>
+%     <fo:block>unset:</fo:block>
+%     <fo:block test='outer'><fo:block test='nested'><fo:block>deep:</fo:block>nested:</fo:block>outer:</fo:block>
+%     <fo:block test='last'>last:</fo:block>
+% </fo:root>
+% \stopXMLdata
+%
+% \startXMLdata
+% <fo:root>
+%     <fo:block-container test='first'><fo:block>second:</fo:block></fo:block-container>
+%     <fo:block>unset:</fo:block>
+%     <fo:block test='second'><fo:block><fo:block>deep:</fo:block>nested:</fo:block>outer:</fo:block>
+%     <fo:block>last:</fo:block>
+% </fo:root>
+% \stopXMLdata
+%
+% \startXMLdata
+% <fo:root>
+%     <fo:block-container test='first'><fo:block>second:</fo:block></fo:block-container>
+%     <fo:block>unset:</fo:block>
+%     <fo:block><fo:block><fo:block>deep:</fo:block>nested:</fo:block>outer:</fo:block>
+%     <fo:block>last:</fo:block>
+% </fo:root>
+% \stopXMLdata
+
+% dit werkt alleen ok in niet <a> <b> <b> ... situaties omdat anders
+% de laatste b de attributen van de vorige heeft:
+
+\def\XMLanc#1%
+  {\ifcsname\@@XMLvariable:\currentXMLelement:#1\endcsname % \ownXMLelement
+     \csname\@@XMLvariable:\currentXMLelement:#1\endcsname % \ownXMLelement
+     \@EA\gobblethreearguments
+   \else
+     \@EA\pXMLanc
+   \fi\XMLdepth{#1}}
+
+\def\pXMLanc#1%
+  {\@EA\ppXMLanc\@EA{\the\numexpr(#1-\plusone)}}
+
+\def\ppXMLanc#1#2#3%
+  {\ifcsname\@@XMLdepth:#1\endcsname % is er altijd dus redundant
+     \ifcsname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname
+       \csname\@@XMLvariable:\csname\@@XMLdepth:#1\endcsname:#2\endcsname
+       \@EAEAEA\gobblethreearguments
+     \else
+       \@EAEAEA\pppXMLanc
+     \fi
+   \else
+     \@EA\pppXMLanc
+   \fi{#1}{#2}{#3}}
+
+\def\pppXMLanc#1%
+  {\ifnum#1>\zerocount
+     \@EA\pXMLanc
+   \else
+     \@EA\thirdofthreearguments
+   \fi{#1}}
+
+%D Experimental: local and global attributes, don't ask -)
+%D
+%D \starttyping
+%D \gXMLpar{element}{global}{attribute}{default}
+%D \gXMLatt{element}{attribute}
+%D \lXMLatt{element}{attribute}
+%D \lcXMLatt{atribute}
+%D \gcXMLatt{atribute}
+%D \stoptyping
+
+\def\gXMLpar#1#2#3#4% #2 can be auto: \csname\@@XMLglobal:#1\endcsname
+  {\ifcsname\@@XMLvariable:#1:#3\endcsname
+     \csname\@@XMLvariable:#1:#3\endcsname
+   \else\ifcsname\@@XMLvariable:#2:#3\endcsname
+     \csname\@@XMLvariable:#2:#3\endcsname
+   \else
+     #4%
+   \fi\fi}
+
+\def\gXMLatt#1#2% element tag
+  {\csname
+     \ifcsname\@@XMLvariable:#1:#2\endcsname
+       \@@XMLvariable:#1:#2%
+     \else\ifcsname\@@XMLglobal:#1\endcsname
+       \ifcsname\@@XMLvariable:\csname\@@XMLglobal:#1\endcsname:#2\endcsname
+         \@@XMLvariable:\csname\@@XMLglobal:#1\endcsname:#2%
+       \else
+         \s!empty
+       \fi
+     \else
+       \s!empty
+     \fi\fi
+   \endcsname}
+
+\def\lXMLatt#1#2% element tag
+  {\ifcsname\@@XMLvariable:#1:#2\endcsname
+     \csname\@@XMLvariable:#1:#2\endcsname
+   \else
+     \s!empty
+   \fi}
+
+\def\gcXMLatt{\gXMLatt\currentXMLelement} % tag
+\def\lcXMLatt{\lXMLatt\currentXMLelement} % tag
+
+%D Experimental (not sure if this will stay):
+%D
+%D \starttyping
+%D \startdefineXMLhandlers[one,two]
+%D
+%D   \defineXMLenvironment[a=b,c=\XMLop{a}]
+%D     {}{}
+%D
+%D \stopdefineXMLhandlers
+%D \stoptyping
+
+\long\def\startdefineXMLhandlers
+  {\bgroup\catcode`\^^M=\@@space
+   \dodoubleempty\dostartdefineXMLhandlers}
+
+\long\def\dostartdefineXMLhandlers[#1][#2]#3#4\stopdefineXMLhandlers % #2 is dummy
+  {\egroup
+   \long\def\dodefineXMLhandlers##1{#3[##1]#4}%
+   \processcommalist[#1]\dodefineXMLhandlers}
+
+\let\currentXMLhandler\s!unknown
+
+% \long\def\dostartdefineXMLhandlers[#1][#2]#3#4[#5]#6\stopdefineXMLhandlers % #2 is dummy
+%   {\egroup
+%    \pushmacro\XMLop
+%    \pushmacro\XMLpar
+%    \pushmacro\currentXMLhandler
+%    \long\def\dodefineXMLhandlers##1%
+%      {\edef\currentXMLhandler{##1}%
+%       \def\XMLop####1{\noexpand\XMLpar{##1}{####1}{}}%
+%       \def\XMLpar{\noexpand\XMLpar}%
+%       \def\XMLanc{\noexpand\XMLanc}%
+%       \edef\!!stringa{[##1][#5]}%
+%       \expandafter#3\!!stringa#6}%
+%    \processcommalist[#1]\dodefineXMLhandlers
+%    \popmacro\currentXMLhandler
+%    \popmacro\XMLpar
+%    \popmacro\XMLop}
+
+\long\def\dostartdefineXMLhandlers[#1][#2]#3#4[#5]#6\stopdefineXMLhandlers % #2 is dummy
+  {\egroup
+   \long\def\dodefineXMLhandlers##1%
+     {\bgroup
+        \edef\currentXMLhandler{##1}%
+        \def\XMLop####1{\noexpand\XMLpar{##1}{####1}{}}%
+        \def\XMLpar{\noexpand\XMLpar}%
+        \def\XMLanc{\noexpand\XMLanc}%
+        \def\XMLinh{\noexpand\XMLinh}%
+        \xdef\!!XMLattr{[##1][#5]}%
+      \egroup
+      \expandafter#3\!!XMLattr#6}%
+   \processcommalist[#1]\dodefineXMLhandlers}
+
+\def\XMLpav#1#2#3#4% #4 useless
+  {\XMLval{#1}{\XMLpar{#2}{#3}{}}{\XMLpar{#2}{#3}{#4}}}
+
+%D A few weird ones:
+
 \def\TEXpar#1#2%
   {\csname#1\interfaced{#2}\endcsname}
 
@@ -2281,7 +2563,7 @@
 \def\XMLtp#1% texpar
   {\csname\ifcsname\@@XMLmapmap\interfaced{#1}\endcsname
      \@@XMLmapmap\interfaced{#1}\else\s!empty
-   \endcsname\fi}
+   \fi\endcsname}
 
 \def\doifelseXMLop#1{\doifelse{\XMLop{#1}}}
 \def\doifXMLop    #1{\doif    {\XMLop{#1}}}
@@ -2538,7 +2820,7 @@
 \def\doXMLifequalelse#1#2%
   {\@EA\@@ifequal#1\relax\@@and#2\relax\@@then}
 
-%D \starttypen
+%D \starttyping
 %D \defineXMLenvironment[test][a=1]
 %D   {\XMLownifequalelse{a}{2}{YES}{NO}}
 %D   {}
@@ -2550,8 +2832,8 @@
 %D \startXMLdata
 %D <test a="1">test</test>
 %D \stopXMLdata
-%D \stoptypen
+%D \stoptyping
 
 \def\XMLyes#1{\XMLownifequalelse{#1}{yes}{#1}{}}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/xtag-map.tex b/tex/context/base/xtag-map.tex
index 423a5a36d..26565996b 100644
--- a/tex/context/base/xtag-map.tex
+++ b/tex/context/base/xtag-map.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-map,
+%D   [       filefile=xtag-map,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Remapping,
@@ -298,22 +298,22 @@
 %D macros, that both deal with elements. We distinguish
 %D between normal and empty elements.
 %D
-%D \starttypen
+%D \starttyping
 %D \remapXMLsequence [name] [result map] \unexpandablecommand
 %D \remapXMLsequence [name] [result map] \unexpandablecommand
-%D \stoptypen
+%D \stoptyping
 %D
 %D The \MATHML\ module demonstrates how these can be used.
 %D The element is converted into a sequence with one or more
 %D of the following components.
 %D
-%D \starttypen
+%D \starttyping
 %D { \command {parameters} {argument} }
-%D \stoptypen
+%D \stoptyping
 %D
 %D The following combinations are supported.
 %D
-%D \starttabulatie[|c|c|c|c|c|]
+%D \starttabulate[|c|c|c|c|c|]
 %D \NC GCPA \NC grouped \NC command \NC parameters \NC argument \NC \NR
 %D \NC GCP  \NC grouped \NC command \NC parameters \NC          \NC \NR
 %D \NC GCA  \NC grouped \NC command \NC            \NC argument \NC \NR
@@ -323,7 +323,7 @@
 %D \NC CA   \NC         \NC command \NC            \NC argument \NC \NR
 %D \NC C    \NC         \NC command \NC            \NC          \NC \NR
 %D \NC G    \NC grouped \NC         \NC            \NC          \NC \NR
-%D \stoptabulatie
+%D \stoptabulate
 %D
 %D Empty elements (singular ones) never get an argument,
 %D which makes sense, since they have at most parameters.
@@ -382,9 +382,9 @@
 %D The remapping is taken care of by the following macro,
 %D which takes three arguments.
 %D
-%D \starttypen
+%D \starttyping
 %D \XMLremapdata{before}{after}{content}
-%D \stoptypen
+%D \stoptyping
 %D
 %D After the remapping, the content is executed (expanded)
 %D under the normal \TEX\ catcode regime. The intermediate
diff --git a/tex/context/base/xtag-meb.tex b/tex/context/base/xtag-meb.tex
index 88bedb00f..ba370cadf 100644
--- a/tex/context/base/xtag-meb.tex
+++ b/tex/context/base/xtag-meb.tex
@@ -1,4 +1,4 @@
-% filtered  from html files by Patrick Ion
+% filtered from html files by Patrick Ion
 %
 % ISOAMSB Characters Extended
 %
diff --git a/tex/context/base/xtag-mmc.tex b/tex/context/base/xtag-mmc.tex
index 9da718b27..c8623487f 100644
--- a/tex/context/base/xtag-mmc.tex
+++ b/tex/context/base/xtag-mmc.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-mmc,
+%D   [       filefile=xtag-mmc,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Math ML,
@@ -43,7 +43,7 @@
 \remapXMLsequence [cn]      [CPA] \MMLcCN
 \remapXMLsequence [csymbol] [CPA] \MMLcCSYMBOL
 
-\setupMMLappearance[polar][\c!variant=\v!a] % a|b|c
+\setupMMLappearance[polar][\c!alternative=\v!a] % a|b|c
 
 \def\MMLcpolar#1%
   {\doifdefinedelse{MMLcdopolar\@@MMLpolarvariant}
@@ -66,10 +66,10 @@
 
 % float will be obsolete, an is replace by e-notation
 
-\setupMMLappearance[float][\c!symbool=\v!nee] % \v!ja|dot
+\setupMMLappearance[float][\c!symbol=\v!no] % \v!yes|dot
 
 \def\MMLcfloat#1%
-  {\doifelse\@@MMLfloatsymbool\v!nee
+  {\doifelse\@@MMLfloatsymbool\v!no
      {{\rm#1}} % make sure that e shows up ok
      {% we should ignore \entities !
       \beforesplitstring#1\at e\to\first
@@ -83,10 +83,10 @@
 
 % we now have:
 
-\setupMMLappearance[enotation][\c!symbool=\v!nee] % \v!ja|dot
+\setupMMLappearance[enotation][\c!symbol=\v!no] % \v!yes|dot
 
 \def\MMLcenotation#1%
-  {\doifelse\@@MMLenotationsymbool\v!nee
+  {\doifelse\@@MMLenotationsymbool\v!no
      {\def\MMLcsep%
         {\unskip{\rm e}\ignorespaces}}
      {\def\MMLcsep##1\empty
@@ -156,18 +156,18 @@ complex-cartesian=>\let\next\MMLccartesian,
      {\let\next\firstofoneargument}
   \next}
 
-\setupMMLappearance[base][\c!symbool=\v!cijfers] % cijfers|letters|tekst|nee
+\setupMMLappearance[base][\c!symbol=\v!numbers] % cijfers|letters|tekst|nee
 
 \def\MMLcCNinteger#1%
   {\doifXMLparelse{cn}{base}
      {\def\MMLcCNbase{\XMLpar{cn}{base}{}}%
-      \doifelse\@@MMLbasesymbool\v!nee
+      \doifelse\@@MMLbasesymbool\v!no
         {\MMLcCNbasedata{#1}}
         {\MMLcCNbasedata{#1}_{\hbox{$\rm\scriptscriptstyle
          \processaction
            [\@@MMLbasesymbool]
-           [\v!letters=>\MMLcCNbasestring BODH,
-              \v!tekst=>\MMLcCNbasestring{BIN}{OCT}{DEC}{HEX},
+           [\v!characters=>\MMLcCNbasestring BODH,
+              \v!text=>\MMLcCNbasestring{BIN}{OCT}{DEC}{HEX},
             \s!unknown=>\MMLcCNbase]$}}}}
      {#1}}
 
@@ -346,7 +346,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsequence [declare] [CPA] \MMLcDECLARE
 
-\setupMMLappearance[declare][\c!status=\v!start]
+\setupMMLappearance[declare][\c!state=\v!start]
 
 \def\MMLcDECLARE#1#2%
   {\doif\@@MMLdeclarestatus\v!start
@@ -362,7 +362,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsequence [lambda] [CPA] \MMLcLAMBDA
 
-\setupMMLappearance[lambda][\c!variant=b]
+\setupMMLappearance[lambda][\c!alternative=b]
 
 \def\MMLcLAMBDA#1#2%
   {\doifelse\@@MMLlambdavariant\v!a
@@ -410,7 +410,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 \remapXMLsequence [piece]     [CPA] \MMLcPIECE
 \remapXMLsequence [otherwise] [CPA] \MMLcOTHERWISE
 
-\setupMMLappearance[piece][\c!scheider=]
+\setupMMLappearance[piece][\c!separator=]
 
 \def\MMLcPIECEWISE#1#2%
   {\cases{#2}}
@@ -425,7 +425,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 %\def\MMLcOTHERWISE#1#2%
 %  {#2\@col@amp@\mathematics{\getXMLentity{otherwise}}\crcr}
 
-\def\MMLcPIECEseparator{\doif\@@MMLpiecescheider\v!ja,}
+\def\MMLcPIECEseparator{\doif\@@MMLpiecescheider\v!yes,}
 
 \def\MMLcPIECE#1#2%
   {\withnexttwoXMLRelements
@@ -451,7 +451,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [divide] [CPA] \MMLcDIVIDE
 
-\setupMMLappearance [divide] [\c!niveau=\!!maxcard]
+\setupMMLappearance [divide] [\c!level=\!!maxcard]
 
 \def\MMLcDIVIDE#1#2%
   {\withnexttwoXMLRelements
@@ -479,14 +479,14 @@ complex-cartesian=>\let\next\MMLccartesian,
 \remapXMLsingular [minus] [CPA] \MMLcMINUS
 \remapXMLsingular [plus]  [CPA] \MMLcPLUS
 
-\setupMMLappearance[sign][\c!reductie=\v!ja]
+\setupMMLappearance[sign][\c!reduction=\v!yes]
 
 \def\MMLcMINUS % expandafter needed ?
-  {\doifelse\@@MMLsignreductie\v!ja
+  {\doifelse\@@MMLsignreductie\v!yes
      {\expandafter\MMLcMINUSyes}{\expandafter\MMLcMINUSno}}
 
 \def\MMLcPLUS % expandafter needed ?
-  {\doifelse\@@MMLsignreductie\v!ja
+  {\doifelse\@@MMLsignreductie\v!yes
      {\expandafter\MMLcPLUSyes}{\expandafter\MMLcPLUSno}}
 
 \def\MMLcMINUSno#1#2#3\empty
@@ -517,14 +517,14 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [power] [CPA] \MMLcPOWER
 
-\setupMMLappearance[power][\c!reductie=\v!ja]
+\setupMMLappearance[power][\c!reduction=\v!yes]
 
 \let\MMLpowerelement\empty
 
 \def\MMLcPOWER#1#2%
   {\withnexttwoXMLRelements
      {\doifXMLRchildelse{apply}{\firstXMLRelement}
-        {\doifelse\@@MMLpowerreductie\v!ja
+        {\doifelse\@@MMLpowerreductie\v!yes
            {\collectXMLRchild{apply}{\firstXMLRelement}%
             \@EA\doifXMLRchildelse\@EA{\MMLcfunctionlist}{\the\XMLRtoks}
               {\let\MMLpowerelement\secondXMLRelement
@@ -541,11 +541,11 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [times] [CPA] \MMLcTIMES
 
-\setupMMLappearance[times][\c!symbool=\v!nee]
+\setupMMLappearance[times][\c!symbol=\v!no]
 
 \def\MMLcTIMES#1#2#3\empty
   {\setMMLcreset{\MMLcfunctionlist,\MMLcconstructlist}%
-   \doifelse\@@MMLtimessymbool\v!ja
+   \doifelse\@@MMLtimessymbool\v!yes
      {\encapsulateXMLR{}{\times}{}{#3\empty}}
      {\doifelse\@@MMLtimessymbool{dot}
         {\encapsulateXMLR{}{\cdot}{}{#3\empty}}
@@ -560,11 +560,11 @@ complex-cartesian=>\let\next\MMLccartesian,
 %          \MMLcreset\processXMLRchildren{#3}}}
 %      {\sqrt{\MMLcreset\processXMLRchildren{#3}}}}
 
-\setupMMLappearance[root][\c!symbool=\v!ja]
+\setupMMLappearance[root][\c!symbol=\v!yes]
 
 \def\MMLcROOT#1#2#3\empty
   {\doifXMLRchildelse{degree}{#3}\donetrue\donefalse
-   \doif\@@MMLrootsymbool\v!nee\donefalse
+   \doif\@@MMLrootsymbool\v!no\donefalse
    \ifdone
      \root\processXMLRchild{degree}{#3}\of
        {\let\MMLcDEGREE\ignoreXMLRelement
@@ -678,7 +678,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 \remapXMLsingular [approx]     [CPA] \MMLcAPPROX
 \remapXMLsingular [factorof]   [CPA] \MMLcFACTOROF
 
-\setupMMLappearance[relation][\c!uitlijnen=\v!nee]
+\setupMMLappearance[relation][\c!align=\v!no]
 
 \def\noMMLcrelation#1#2%
   {\encapsulatenextXMLRelements{}{#1}{}#2\empty}
@@ -720,11 +720,11 @@ complex-cartesian=>\let\next\MMLccartesian,
   {\MMLcreset
    \processaction
      [\@@MMLrelationuitlijnen]
-     [\v!laatste=>\let\next\lastMMLcrelation ,
-       \v!eerste=>\let\next\firstMMLcrelation,
-           \v!ja=>\let\next\leftMMLcrelation ,
-        \v!links=>\let\next\leftMMLcrelation ,
-       \v!rechts=>\let\next\rightMMLcrelation,
+     [\v!last=>\let\next\lastMMLcrelation ,
+       \v!first=>\let\next\firstMMLcrelation,
+           \v!yes=>\let\next\leftMMLcrelation ,
+        \v!left=>\let\next\leftMMLcrelation ,
+       \v!right=>\let\next\rightMMLcrelation,
       \s!default=>\let\next\noMMLcrelation   ,
       \s!unknown=>\let\next\noMMLcrelation   ]
    \next{#1}{#2}}
@@ -749,12 +749,12 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 %%% calculus and vector calculus
 
-\setupMMLappearance[int][\c!plaats=\v!boven]
+\setupMMLappearance[int][\c!location=\v!top]
 
 \remapXMLsingular [int] [CPA] \MMLcINT
 
 \def\doMMLlimits#1%
-  {\doifelsevalue{@@MML#1\c!plaats}\v!boven\limits\nolimits}
+  {\doifelsevalue{@@MML#1\c!location}\v!top\limits\nolimits}
 
 \def\MMLcINT#1#2#3\empty
   {\pushmacro\xmlr
@@ -783,7 +783,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [diff] [CPA] \MMLcDIFF
 
-\setupMMLappearance[diff][\c!plaats=\v!boven]
+\setupMMLappearance[diff][\c!location=\v!top]
 
 \def\MMLcDIFF#1#2#3\empty
   {\pushmacro\xmlr
@@ -794,7 +794,7 @@ complex-cartesian=>\let\next\MMLccartesian,
          \collectXMLRchild{bvar}{#3}%
          \let\MMLcDEGREE\superMMLcelement
          \expanded{\processXMLRchild{degree}{\the\XMLRtoks}}%
-         \doif\@@MMLdiffplaats\v!boven
+         \doif\@@MMLdiffplaats\v!top
            {\doifXMLRchildelse{ci}{#3}
               {\processXMLRchild{ci}{#3}}
               {\doifMMLfunctionelse{#3}
@@ -803,7 +803,7 @@ complex-cartesian=>\let\next\MMLccartesian,
         {\let\MMLcDEGREE\superMMLcelement
          \begingroup\rm\getXMLentity{mathematicald}\endgroup
          \processXMLRchild{bvar}{#3}}%
-      \doifnot\@@MMLdiffplaats\v!boven
+      \doifnot\@@MMLdiffplaats\v!top
         {\left(\MMLcreset\processXMLRchild{apply,ci}{#3}\right)}}
      {\processXMLRchildren{#3}^\prime}%
    \popmacro\xmlr}
@@ -928,8 +928,8 @@ complex-cartesian=>\let\next\MMLccartesian,
 \def\MMLcSUM    {\MMLcSUMandPRODUCT{sum}\sum}
 \def\MMLcPRODUCT{\MMLcSUMandPRODUCT{product}\prod}
 
-\setupMMLappearance[sum][\c!plaats=\v!boven]
-\setupMMLappearance[product][\c!plaats=\v!boven]
+\setupMMLappearance[sum][\c!location=\v!top]
+\setupMMLappearance[product][\c!location=\v!top]
 
 \def\stackMMLsubscripts#1%
   {\vbox
@@ -959,7 +959,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [limit] [CPA] \MMLcLIMIT
 
-\setupMMLappearance[limit][\c!plaats=\v!boven]
+\setupMMLappearance[limit][\c!location=\v!top]
 
 \def\MMLcLIMIT#1#2#3\empty
   {\pushmacro\xmlr
@@ -1004,13 +1004,13 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsingular [log] [CPA] \MMLcLOG
 
-\setupMMLappearance[log][\c!plaats=\v!rechts]
+\setupMMLappearance[log][\c!location=\v!right]
 
 \def\MMLcLOG#1#2#3\empty
   {\pushmacro\MMLcLOGBASE
    \let\MMLcLOGBASE\secondoftwoarguments
    \doifXMLRchildelse{logbase}{#3}
-     {\doifelse\@@MMLlogplaats\v!links
+     {\doifelse\@@MMLlogplaats\v!left
         {\mathop{{}^{\processXMLRchild{logbase}{#3}}\!\getXMLentity{log}}}
         {\getXMLentity{log}_{\processXMLRchild{logbase}{#3}}}}
      {\getXMLentity{log}}%
@@ -1047,7 +1047,7 @@ complex-cartesian=>\let\next\MMLccartesian,
 \remapXMLsingular [sech]    [CPA] \MMLcSECH
 \remapXMLsingular [arcsech] [CPA] \MMLcARCSECH
 
-\setupMMLappearance[function][\c!reductie=\v!ja]
+\setupMMLappearance[function][\c!reduction=\v!yes]
 
 \def\doMMLcfunction#1%
   {\doifnextcharelse\xmlr{\dodoMMLcfunction{#1}}{\getXMLentity{#1}}}
@@ -1060,7 +1060,7 @@ complex-cartesian=>\let\next\MMLccartesian,
   {\ifx\MMLpowerelement\empty\else
      ^{\MMLcreset\MMLpowerelement\empty}\!\let\MMLpowerelement\empty
    \fi
-   \doifelse\@@MMLfunctionreductie\v!ja
+   \doifelse\@@MMLfunctionreductie\v!yes
      {\doifXMLRchildelse{apply}{#1}
         {\collectXMLRchild{apply}{#1}%
          \@EA\doifXMLRchildelse\@EA{\MMLcfunctionlist}{\the\XMLRtoks}
@@ -1121,12 +1121,12 @@ complex-cartesian=>\let\next\MMLccartesian,
 
 \remapXMLsequence [vector] [CPA] \MMLcVECTOR
 
-\setupMMLappearance[vector][\c!richting=\v!horizontaal] % \v!vertikaal
+\setupMMLappearance[vector][\c!direction=\v!horizontal] % \v!vertical
 
 \def\MMLcVECTOR#1#2%
    {\countXMLRchildren{#2}%
     \ifnum\nofXMLRchildren>1
-      \doifelse\@@MMLvectorrichting\v!horizontaal
+      \doifelse\@@MMLvectorrichting\v!horizontal
         {\encapsulateXMLR{\left(}{\MMLccomma}{\right)}{#2}}
         {\collectbetweenXMLR{\crcr}{#2}%
          \MMLcreset\left(\matrix{\the\XMLRtoks}\right)}%
diff --git a/tex/context/base/xtag-mml.tex b/tex/context/base/xtag-mml.tex
index cb2ccaea7..7496fd4f9 100644
--- a/tex/context/base/xtag-mml.tex
+++ b/tex/context/base/xtag-mml.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-mml,
+%D   [       filefile=xtag-mml,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Math ML,
diff --git a/tex/context/base/xtag-mmp.tex b/tex/context/base/xtag-mmp.tex
index 13d488e5e..0acef509a 100644
--- a/tex/context/base/xtag-mmp.tex
+++ b/tex/context/base/xtag-mmp.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-mmp,
+%D   [       filefile=xtag-mmp,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Math ML,
@@ -196,9 +196,9 @@
 \def\doMMPpbackground#1#2%
   {\doifXMLparelse{#1}{background}
      {\inframed
-        [\c!kader=\v!uit,
-         \c!achtergrond=\v!kleur,
-         \c!achtergrondkleur=\XMLpar{#1}{background}{}]
+        [\c!frame=\v!off,
+         \c!background=\v!color,
+         \c!backgroundcolor=\XMLpar{#1}{background}{}]
         {#2}}
      {#2}}
 
@@ -222,7 +222,7 @@
 \remapXMLsequence [msup] [CPA] \MMLpSUP
 \remapXMLsequence [msub] [CPA] \MMLpSUB
 
-\setupMMLappearance[scripts][\c!variant=\v!a]
+\setupMMLappearance[scripts][\c!alternative=\v!a]
 
 \def\MMLpSUBP#1#2%
   {\withnexttwoXMLRelements
@@ -323,12 +323,12 @@
    \getXMLarguments{mtable}
      {columnalign="" columnspacing=".25ex" rowspacing=".25ex"
       frame="" color="" background="" #1}%
-   \setupTABLE[\c!kader=\v!uit]%
-   \MMLpTABLEmapper{background}{\c!achtergrondkleur}{}%
-   \MMLpTABLEmapper{color}{\c!kleur}{}%
-   \MMLpTABLEmapper{frame}{\c!kader}
+   \setupTABLE[\c!frame=\v!off]%
+   \MMLpTABLEmapper{background}{\c!backgroundcolor}{}%
+   \MMLpTABLEmapper{color}{\c!color}{}%
+   \MMLpTABLEmapper{frame}{\c!frame}
      {\MMLpREMAP{none}{off}\MMLpREMAP{solid}{on}}%
-   \MMLpTABLEmapper{columnalign}{\c!uitlijnen}
+   \MMLpTABLEmapper{columnalign}{\c!align}
      {\MMLpREMAP{left}{right}%
       \MMLpREMAP{right}{left}%
       \MMLpREMAP{center}{middle}}%
@@ -336,7 +336,7 @@
    \let\MMLpTABLEoffset\MMLpunit
    \let\MMLpTR\doMMLpTR
    \let\MMLpTD\doMMLpTD
-   \bTABLE[\c!achtergrond=\v!kleur,\c!offset=\MMLpTABLEoffset]#2\eTABLE
+   \bTABLE[\c!background=\v!color,\c!offset=\MMLpTABLEoffset]#2\eTABLE
    \endgroup}
 
 \def\doMMLpTR#1#2%
@@ -349,15 +349,15 @@
      {columnalign="" columnspacing="" rowspacing=""
       frame="" color="" background="" #1}%
    \let\theMMLpTABLEmap\empty
-   \MMLpTABLEmap{background}{\c!achtergrondkleur}{}%
-   \MMLpTABLEmap{color}{\c!kleur}{}%
-   \MMLpTABLEmap{frame}{\c!kader}
+   \MMLpTABLEmap{background}{\c!backgroundcolor}{}%
+   \MMLpTABLEmap{color}{\c!color}{}%
+   \MMLpTABLEmap{frame}{\c!frame}
      {\MMLpREMAP{none}{off}\MMLpREMAP{solid}{on}}%
-   \MMLpTABLEmap{columnalign}{\c!uitlijnen}
+   \MMLpTABLEmap{columnalign}{\c!align}
      {\MMLpREMAP{left}{right}\MMLpREMAP{right}{left}}%
    \@EA\bTD\@EA[\theMMLpTABLEmap]$\ignorespaces#2\unskip$\eTD}
 
-\setupMMLappearance[mtable][\c!variant=\v!a]
+\setupMMLappearance[mtable][\c!alternative=\v!a]
 
 \def\MMLpTABLE
   {\doifelse\@@MMLmtablevariant\v!a
diff --git a/tex/context/base/xtag-pml.tex b/tex/context/base/xtag-pml.tex
index 7371ec165..7ad02f4f4 100644
--- a/tex/context/base/xtag-pml.tex
+++ b/tex/context/base/xtag-pml.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-pml,
+%D   [       filefile=xtag-pml,
 %D        version=2001.09.04,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Physics ML,
diff --git a/tex/context/base/xtag-pmu.tex b/tex/context/base/xtag-pmu.tex
index 425257b49..5198fd01a 100644
--- a/tex/context/base/xtag-pmu.tex
+++ b/tex/context/base/xtag-pmu.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-pmu,
+%D   [       filefile=xtag-pmu,
 %D        version=2001.06.10,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Units,
diff --git a/tex/context/base/xtag-pre.tex b/tex/context/base/xtag-pre.tex
index 71ea6d04f..5491c3e7c 100644
--- a/tex/context/base/xtag-pre.tex
+++ b/tex/context/base/xtag-pre.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-pre,
+%D   [       filefile=xtag-pre,
 %D        version=2000.12.20,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Predefined Things,
@@ -92,8 +92,8 @@
 \def\setupXMLfile{\dodoubleargument\getparameters[\??xf]}
 
 \setupXMLfile
-  [\c!tussen=\blanko,
-   \c!niveau=1]
+  [\c!inbetween=\blank,
+   \c!level=1]
 
 \fetchruntimecommand\showXMLfile  {\f!xtagprefix\s!run}
 \fetchruntimecommand\showXMLbuffer{\f!xtagprefix\s!run}
@@ -116,20 +116,20 @@
 
 %D The comment escape has the form:
 %D
-%D \starttypen
+%D \starttyping
 %D <!-- a couple of remarks -->
-%D \stoptypen
+%D \stoptyping
 
 \defineXMLescape [--] {\gobbleuntil{-->}}
 
 %D The \type {CDATA} escape is kind of unique in its
 %D strange syntax.
 %D
-%D \starttypen
+%D \starttyping
 %D <!CDATA[it starts here
 %D whatever you like to be shown verbatim
 %D and ends here]]>
-%D \stoptypen
+%D \stoptyping
 %D
 %D Watch this rather obscure definition (we need to pass an
 %D \type {[} to the macro.
@@ -155,11 +155,11 @@
 \defineXMLescape [CDATA]
   {\executeifdefined{XMLcdatamethod\number\XMLcdatamethod}{\begingroup\processXMLcdata}}
 
-%D \starttypen
+%D \starttyping
 %D <!ENTITY crap "very new [&#x7B;] crap">
 %D <!ENTITY crap SYSTEM "crapfile.xml">
 %D <!ENTITY crap SYSTEM "crapfile.pdf" NDATA ignoredanyway>
-%D \stoptypen
+%D \stoptyping
 
 \defineXMLescape [ENTITY] \handleXMLentityescape
 
@@ -275,7 +275,7 @@
 %D because the possibility to process \CONTEXT\ commands is
 %D gone.
 
-\setupXMLprocessing[\c!commando=\v!ja]
+\setupXMLprocessing[\c!command=\v!yes]
 
 %\def\contextXMLcommand#1%
 %  {\doif\@@xpcommando\v!ja
@@ -286,7 +286,7 @@
 %      \popmacro\disableXML}}
 
 \def\contextXMLcommand#1% we don't use #1 here
-  {\doif\@@xpcommando\v!ja
+  {\doif\@@xpcommand\v!yes
      {\disableXML\scantokens\@EA{\currentXMLprocess}\enableXML}}
 
 %D The indirect method (using the macro \type
@@ -295,9 +295,9 @@
 %D definition, and given that \ETEX\ is used, we can now
 %D say:
 %D
-%D \starttypen
+%D \starttyping
 %D <?context-command {\bf Start Of Some \TeX\ Text} ?>
-%D \stoptypen
+%D \stoptyping
 %D
 %D A non||\ETEX\ solution is also possible, using buffers,
 %D but for the moment we assume that \ETEX\ is used.
@@ -359,24 +359,24 @@
 
 %D Say that a file contains blocks like the following:
 %D
-%D \starttypen
+%D \starttyping
 %D <?context-block begin whatevername ?>
 %D
 %D <to/> <be> <or/> maybe <not/> so much <to/> </be>
 %D
 %D <?context-block end whatevername ?>
-%D \stoptypen
+%D \stoptyping
 %D
 %D The following commands will show only this block:
 %D
-%D \starttypen
+%D \starttyping
 %D \videXMLcontextblock[whatevername] \showXMLfile{yourfile}
-%D \stoptypen
+%D \stoptyping
 %D
 %D You can also mark blocks in the following way, thereby
 %D saving yourself some work:
 %D
-%D \starttypen
+%D \starttyping
 %D <?context-block what ?>
 %D
 %D <what>What do you want?</what>
@@ -386,7 +386,7 @@
 %D <how>How do you want?</how>
 %D
 %D <?context-block done ?>
-%D \stoptypen
+%D \stoptyping
 
 % yet undocumented and experimental
 
diff --git a/tex/context/base/xtag-prs.tex b/tex/context/base/xtag-prs.tex
new file mode 100644
index 000000000..71ef03cef
--- /dev/null
+++ b/tex/context/base/xtag-prs.tex
@@ -0,0 +1,42 @@
+%D \module
+%D   [       filefile=xtag-prs,
+%D        version=2004.08.18,
+%D          title=\CONTEXT\ XML Support,
+%D       subtitle=Parsing,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\unprotect
+
+\def\analyzefunction#1%
+  {\expanded{\doanalyzefunction#1\relax\relax(#1)}\empty\relax\end}
+
+\def\doanalyzefunction#1#2(#3)#4\relax#5\end
+  {\ifx#4\empty
+     \let\functionname\empty
+   \else
+     \def\functionname{#1#2}%
+   \fi
+   \getfunctionargs#3,\empty,\empty,\empty,\empty,\empty,\empty,\empty,\empty\relax}
+
+\def\getfunctionargs#1,#2,#3,#4,#5,#6,#7,#8,#9\relax
+  {\edef\functionA{#1}\edef\functionB{#2}%
+   \edef\functionC{#3}\edef\functionD{#4}%
+   \edef\functionE{#5}\edef\functionF{#6}%
+   \edef\functionG{#7}\edef\functionH{#8}}
+
+% \analyzefunction{x}                                     [\functionname][a:\functionA/b:\functionB/c:\functionC/d:\functionD] \endgraf
+% \analyzefunction{sin(x)}                                [\functionname][a:\functionA/b:\functionB/c:\functionC/d:\functionD] \endgraf
+% \analyzefunction{1pt,2pt,3pt,4pt}                       [\functionname][a:\functionA/b:\functionB/c:\functionC/d:\functionD] \endgraf
+% \analyzefunction{rect(1pt,2pt,3pt,4pt)}                 [\functionname][a:\functionA/b:\functionB/c:\functionC/d:\functionD] \endgraf
+% \analyzefunction{1pt,2pt,3pt,4pt,5pt,6pt,7pt,8pt}       [\functionname][e:\functionE/f:\functionF/g:\functionG/h:\functionH] \endgraf
+% \analyzefunction{rect(1pt,2pt,3pt,4pt,5pt,6pt,7pt,8pt)} [\functionname][e:\functionE/f:\functionF/g:\functionG/h:\functionH] \endgraf
+
+% todo [#1][settings][maxwidth,maxheight,method=] with method=x y xy [1]
+
+\protect \endinput
diff --git a/tex/context/base/xtag-raw.tex b/tex/context/base/xtag-raw.tex
index 8c190d943..e93c8be87 100644
--- a/tex/context/base/xtag-raw.tex
+++ b/tex/context/base/xtag-raw.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-raw,
+%D   [       filefile=xtag-raw,
 %D        version=2002.03.21,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=reducing specials,
diff --git a/tex/context/base/xtag-rng.tex b/tex/context/base/xtag-rng.tex
index a3a529f7f..1b8a32ab2 100644
--- a/tex/context/base/xtag-rng.tex
+++ b/tex/context/base/xtag-rng.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-rng,
+%D   [       filefile=xtag-rng,
 %D        version=2002.10.29,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Relax NG, 
@@ -16,9 +16,9 @@
 %D The following commands picks up a named block from the
 %D given file and pretty prints it. 
 %D
-%D \starttypen 
+%D \starttyping 
 %D \showRNGcomponent [eximple.rng] [request]
-%D \stoptypen
+%D \stoptyping
 %D
 %D If needed, you adapt the colors used by redefining the
 %D \type {xtag} color palet. 
diff --git a/tex/context/base/xtag-run.tex b/tex/context/base/xtag-run.tex
index a1ad21bdf..a990468b7 100644
--- a/tex/context/base/xtag-run.tex
+++ b/tex/context/base/xtag-run.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-run,
+%D   [       filefile=xtag-run,
 %D        version=2001.01.10,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Visualization,
@@ -94,10 +94,10 @@
 \doglobal\newif\ifXMLunspacepretty
 
 \gdef\@XMLelement#1%
-  {\ifnum\XMLlevel<\@@xfniveau\relax
+  {\ifnum\XMLlevel<\@@xflevel\relax
      \ifnum\kindofXMLelement=2\else
        \doglobal\increment\@XMLnofelements\relax
-       \ifcase\@XMLnofelements\else\@@xftussen\fi
+       \ifcase\@XMLnofelements\else\@@xfinbetween\fi
      \fi
    \fi
    % no, too fragile: \hangindent2em
@@ -131,10 +131,10 @@
    \ifcase\kindofXMLelement\or
      \getvalue{\@@XMLshow::\currentXMLelement}\relax
    \fi
-   \ifnum\XMLlevel<\@@xfniveau\relax
+   \ifnum\XMLlevel<\@@xflevel\relax
      \ifnum\kindofXMLelement=1\else
        \doglobal\increment\@XMLnofelements\relax
-       \ifcase\@XMLnofelements\else\@@xftussen\fi
+       \ifcase\@XMLnofelements\else\@@xfinbetween\fi
      \fi
    \fi
    \ifXMLunspacepretty\ignorespaces\fi}
@@ -222,9 +222,9 @@
    \nohyphens
    \dontcomplain
    \XMLlevel\zerocount
-   \increment\@@xfniveau % hack
+   \increment\@@xflevel % hack
    \tttf
-   \startopelkaar[\v!blanko]
+   \startpacked[\v!blank]
      \ifautoXMLshow \let\executeXMLelement\autoshowXMLelement \fi
      \let\executeXMLentity\@XMLentity
      \enableXML\verbatimXML
@@ -233,7 +233,7 @@
      \veryraggedright
      \readfile{\truefilename{#1}}\donothing\donothing\endgraf
      \removelastskip % really needed
-   \stopopelkaar
+   \stoppacked
    \egroup}
 
 \gdef\showXMLtext#1%
@@ -243,7 +243,7 @@
    % so far for hack
    \dontcomplain
    \XMLlevel\maxcard
-   \increment\@@xfniveau % hack
+   \increment\@@xflevel % hack
    \tttf
    \ifautoXMLshow \let\executeXMLelement\autoshowXMLelement \fi
    \let\executeXMLentity\@XMLentity
@@ -302,4 +302,4 @@
       \fi}%
     \egroup}
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput
diff --git a/tex/context/base/xtag-utf.tex b/tex/context/base/xtag-utf.tex
index e1faa04d2..76be30ba3 100644
--- a/tex/context/base/xtag-utf.tex
+++ b/tex/context/base/xtag-utf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-utf,
+%D   [       filefile=xtag-utf,
 %D        version=2002.06.24,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=UTF-8 support,
@@ -18,4 +18,4 @@
 
 \enableregime[utf]
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/tex/context/base/xtag-xsd.tex b/tex/context/base/xtag-xsd.tex
index ba885d5ff..c6875d069 100644
--- a/tex/context/base/xtag-xsd.tex
+++ b/tex/context/base/xtag-xsd.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-xsd,
+%D   [       filefile=xtag-xsd,
 %D        version=2001.10.04,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=Schemas, 
@@ -16,9 +16,9 @@
 %D The following commands picks up a named block from the
 %D given file and pretty prints it. 
 %D
-%D \starttypen 
+%D \starttyping 
 %D \showXSDcomponent [x-exa-tx.xsd] [sequence]
-%D \stoptypen
+%D \stoptyping
 %D
 %D If needed, you adapt the colors used by redefining the
 %D \type {xtag} color palet. 
diff --git a/tex/context/base/xtag-xsl.tex b/tex/context/base/xtag-xsl.tex
index 4d844c8e1..1c27fd447 100644
--- a/tex/context/base/xtag-xsl.tex
+++ b/tex/context/base/xtag-xsl.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=xtag-xsl,
+%D   [       filefile=xtag-xsl,
 %D        version=2002.03.07,
 %D          title=\CONTEXT\ XML Support,
 %D       subtitle=XSLT processing,
diff --git a/tex/context/config/cont-usr.tex b/tex/context/config/cont-usr.tex
index 6c6c2f121..0e0f59881 100644
--- a/tex/context/config/cont-usr.tex
+++ b/tex/context/config/cont-usr.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=cont-usr,
+%D   [       filefile=cont-usr,
 %D        version=1997.10.05,
 %D          title=\CONTEXT\ User Format Specifications,
 %D       subtitle=System Specific Setups,
@@ -26,11 +26,8 @@
 %D Thomas Esser's \TETEX\ distribution.) This list will be
 %D adapted to the actual situation.
 
-%definefilesynonym [lang-cz.pat]  [czhyph.tex]   % is bound to latex (tl 8+)
-\definefilesynonym [lang-cz.pat]  [czhyphen.tex]
 \definefilesynonym [lang-da.pat]  [dkhyph.tex]
 \definefilesynonym [lang-de.pat]  [dehyphn.tex]
-\definefilesynonym [lang-en.pat]  [ushyph1.tex]
 \definefilesynonym [lang-es.pat]  [eshyph.tex]
 \definefilesynonym [lang-fi.pat]  [fihyph.tex]
 \definefilesynonym [lang-fr.pat]  [frhyph.tex]
@@ -38,29 +35,30 @@
 \definefilesynonym [lang-hu.pat]  [huhyph.tex]
 \definefilesynonym [lang-it.pat]  [ithyph.tex]
 \definefilesynonym [lang-la.pat]  [lahyph7.tex]
-\definefilesynonym [lang-nl.pat]  [nehyph.tex]
 \definefilesynonym [lang-no.pat]  [nohyph.tex]
 \definefilesynonym [lang-pl.pat]  [plhyph.tex]
 \definefilesynonym [lang-pt.pat]  [pthyph.tex]
 \definefilesynonym [lang-ro.pat]  [rohyph.tex]
-\definefilesynonym [lang-ru.pat]  [ruenhyph.tex]
-%definefilesynonym [lang-sk.pat]  [skhyph.tex] % is bound to latex (tl 8+)
-\definefilesynonym [lang-sk.pat]  [skhyphen.tex]
-\definefilesynonym [lang-sv.pat]  [sehyph.tex]
-\definefilesynonym [lang-tr.pat]  [trhyph.tex]
-\definefilesynonym [lang-ua.pat]  [ukrenhyp.tex]
-\definefilesynonym [lang-uk.pat]  [ukhyphen.tex]
-\definefilesynonym [lang-us.pat]  [ushyph.tex]
+\definefilesynonym [lang-ru.pat]  [ruenhyph.tex] % sic: ruen
+\definefilesynonym [lang-sl.pat]  [sihyph.tex]   % sic: sl/si
+\definefilesynonym [lang-sv.pat]  [svhyph.tex]   % was [sehyph.tex]
+\definefilesynonym [lang-tr.pat]  [tkhyph.tex]   % was [trhyph.tex]
+\definefilesynonym [lang-ua.pat]  [ukrenhyp.tex] % sic ukren
+\definefilesynonym [lang-uk.pat]  [ukhyph.tex]
 
-%D Ah, something changed in 2003 with respect to ushyph.tex, so let's
-%D fall back when needed. I first noticed this during a workshop at  the
-%D practical tex conference 2004 in sf. Yet another proof of a mess in
-%D filenames.
+\definefilesynonym [lang-nl.pat]  [nlhyphen.tex] % symbolic name, see below
+\definefilesynonym [lang-af.pat]  [nlhyphen.tex] % symbolic name, see below
+
+\definefilesynonym [lang-en.pat]  [ushyphen.tex] % symbolic name, see below
+\definefilesynonym [lang-us.pat]  [ushyphen.tex] % symbolic name, see below
 
- \doiffileelse{ushyph.tex}  {\definefilesynonym[lang-us.pat][ushyph.tex]}
-{\doiffileelse{ushyph1.tex} {\definefilesynonym[lang-us.pat][ushyph1.tex]}
-{\doiffileelse{ushyph2.tex} {\definefilesynonym[lang-us.pat][ushyph2.tex]}
-                            {\definefilesynonym[lang-us.pat][ukhyph.tex]}}}
+\definefilesynonym [lang-cz.pat]  [czhyphen.tex] % in a different part of the tree, sigh
+\definefilesynonym [lang-sk.pat]  [skhyphen.tex] % in a different part of the tree, sigh
+
+%definefilesynonym [lang-cz.hyp]  [czhyphen.ex]  % in a different part of the tree, sigh
+%definefilesynonym [lang-sk.hyp]  [skhyphen.ex]  % in a different part of the tree, sigh
+
+\definefilesynonym [lang-deo.pat] [dehypht.tex]  % old german patterns
 
 %D When the dutch spelling changed, new patterns were
 %D constructed. For long these were named \type {dutch96.pat}.
@@ -70,56 +68,71 @@
 %D files as well as their coding is one of the dark areas of
 %D \TEX\ distributions.
 
- \doiffileelse{nehyph96.tex}   {\definefilesynonym[lang-nl.pat][nehyph96.tex]}
-{\doiffileelse{dutch96.pat}    {\definefilesynonym[lang-nl.pat][dutch96.pat]}
-                               {\definefilesynonym[lang-nl.pat][nehyph.tex]}}
+ \doiffileelse{nehyph96.tex} {\definefilesynonym[nlhyphen.tex][nehyph96.tex]}
+{\doiffileelse{dutch96.pat}  {\definefilesynonym[nlhyphen.tex][dutch96.pat]}
+                             {\definefilesynonym[nlhyphen.tex][nehyph.tex]}}
+
+%D Ah, something changed in 2003 with respect to ushyph.tex, so let's
+%D fall back when needed. I first noticed this during a workshop at  the
+%D practical tex conference 2004 in sf. Yet another proof of a mess in
+%D filenames. So, we now use \type {ushyphen} as name and do some
+%D searching.
+
+ \doiffileelse{ushyph.tex}  {\definefilesynonym[ushyphen.tex][ushyph.tex]}
+{\doiffileelse{ushyph1.tex} {\definefilesynonym[ushyphen.tex][ushyph1.tex]}
+{\doiffileelse{ushyph2.tex} {\definefilesynonym[ushyphen.tex][ushyph2.tex]}
+                            {\definefilesynonym[ushyphen.tex][ukhyph.tex]}}}
 
-%D Pattern files are (can be) encoded! And, alas, not all
-%D pattern files are self contained, which is why (for the
-%D moment) we specify encodings here.
+%D In order to get 8 bit characters hyphenated, we need to load
+%D patterns under the right circumstances. In some countries, more
+%D than one font encoding is in use. I can add more defaults here
+%D if users let me know what encoding they use.
+
+\installlanguage [\s!nl] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!fr] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!de] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
+\installlanguage [\s!it] [\s!mapping={texnansi,ec},\s!encoding={texnansi,ec}]
 
-\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 \installlanguage [\s!hr] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-%installlanguage [\s!pl] [\s!mapping=pl0,\s!encoding=pl0]
 \installlanguage [\s!pl] [\s!mapping={pl0,ec},\s!encoding={pl0,ec}]
+\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 \installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
-
-%D Sometimes these are not wanted:
-
-%\definefilesynonym [lang-deo.pat] [dehypht.tex]  % old patterns
-%\definefilesynonym [lang-nlx.pat] [dutch96.pat]  % new patterns
+\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}]
 
 %D Additional languages can be defined here. Beware of
 %D encoding incompatibilities. Please take a look at the
 %D \type {cont-en.tex}, \type {cont-nl.tex}, enz.\ files
-%D first. Normally you don't have to change a byte.
-
-% \installlanguage [\s!af] [\c!status=\v!start] % afrikaans
-% \installlanguage [\s!cz] [\c!status=\v!start] % czech
-% \installlanguage [\s!da] [\c!status=\v!start] % danish
-% \installlanguage [\s!de] [\c!status=\v!start] % german
-% \installlanguage [\s!en] [\c!status=\v!start] % english us
-% \installlanguage [\s!es] [\c!status=\v!start] % spanish
-% \installlanguage [\s!fi] [\c!status=\v!start] % finnish
-% \installlanguage [\s!fr] [\c!status=\v!start] % french
-% \installlanguage [\s!hr] [\c!status=\v!start] % croatian
-% \installlanguage [\s!hu] [\c!status=\v!start] % hungarian
-% \installlanguage [\s!it] [\c!status=\v!start] % italian
-% \installlanguage [\s!la] [\c!status=\v!start] % latin
-% \installlanguage [\s!nl] [\c!status=\v!start] % dutch
-% \installlanguage [\s!no] [\c!status=\v!start] % norwegian
-% \installlanguage [\s!pl] [\c!status=\v!start] % polish
-% \installlanguage [\s!pt] [\c!status=\v!start] % portuguese
-% \installlanguage [\s!ro] [\c!status=\v!start] % romanian
-% \installlanguage [\s!ru] [\c!status=\v!start] % russian
-% \installlanguage [\s!sk] [\c!status=\v!start] % slovak
-% \installlanguage [\s!sv] [\c!status=\v!start] % swedish
-% \installlanguage [\s!tr] [\c!status=\v!start] % turkish
-% \installlanguage [\s!ua] [\c!status=\v!start] % ukrainian
-% \installlanguage [\s!uk] [\c!status=\v!start] % english uk
-
-% \installlanguage [deo]   [\c!status=\v!start] % old german
-% \installlanguage [nlx]   [\c!status=\v!start] % dutch 8 bit
+%D first. Normally you don't have to change a byte. If you
+%D want to play safe, use \typ {texexec --make --alone
+%D --all}.
+
+% \installlanguage [\s!af] [\c!state=\v!start] % afrikaans
+% \installlanguage [\s!cz] [\c!state=\v!start] % czech
+% \installlanguage [\s!da] [\c!state=\v!start] % danish
+% \installlanguage [\s!de] [\c!state=\v!start] % german
+% \installlanguage [\s!en] [\c!state=\v!start] % english us
+% \installlanguage [\s!es] [\c!state=\v!start] % spanish
+% \installlanguage [\s!fi] [\c!state=\v!start] % finnish
+% \installlanguage [\s!fr] [\c!state=\v!start] % french
+% \installlanguage [\s!hr] [\c!state=\v!start] % croatian
+% \installlanguage [\s!hu] [\c!state=\v!start] % hungarian
+% \installlanguage [\s!it] [\c!state=\v!start] % italian
+% \installlanguage [\s!la] [\c!state=\v!start] % latin
+% \installlanguage [\s!nl] [\c!state=\v!start] % dutch
+% \installlanguage [\s!no] [\c!state=\v!start] % norwegian
+% \installlanguage [\s!pl] [\c!state=\v!start] % polish
+% \installlanguage [\s!pt] [\c!state=\v!start] % portuguese
+% \installlanguage [\s!ro] [\c!state=\v!start] % romanian
+% \installlanguage [\s!ru] [\c!state=\v!start] % russian
+% \installlanguage [\s!sk] [\c!state=\v!start] % slovak
+% \installlanguage [\s!sl] [\c!state=\v!start] % slovenian
+% \installlanguage [\s!sv] [\c!state=\v!start] % swedish
+% \installlanguage [\s!tr] [\c!state=\v!start] % turkish
+% \installlanguage [\s!ua] [\c!state=\v!start] % ukrainian
+% \installlanguage [\s!uk] [\c!state=\v!start] % english uk
+% \installlanguage [\s!vn] [\c!state=\v!start] % vietnamese
+
+% \installlanguage [deo]   [\c!state=\v!start] % old german
 
 %D The next lines can be used for setting the language to be
 %D used at startup time.
@@ -143,6 +156,7 @@
 % \setupcurrentlanguage[\s!ro]
 % \setupcurrentlanguage[\s!ru]
 % \setupcurrentlanguage[\s!sk]
+% \setupcurrentlanguage[\s!sl]
 % \setupcurrentlanguage[\s!sv]
 % \setupcurrentlanguage[\s!tr]
 % \setupcurrentlanguage[\s!ua]
diff --git a/tex/context/sample/sample.tex b/tex/context/sample/sample.tex
index 6e18f08d5..9eeae96b2 100644
--- a/tex/context/sample/sample.tex
+++ b/tex/context/sample/sample.tex
@@ -24,6 +24,20 @@ books and audio cd's.
                                               Everything You Need to Know About American
                                               History but Never Learned, \endgraf
                                               HarperCollins, 2003 \NC \NR
+\NC thuan.tex   \NC Trinh Xuan Thuan      \NC Chaos and Harmony, Perspectives on Scientific
+                                              Revolutions of the Twentieth Century, \endgraf
+                                              Oxford University Press, 2001 \NC \NR
 \stoptabulate
 
+% Tufte: This quote will always produce hyphenated text, apart from the content,
+% it's a pretty good test case for protruding.
+
+% Ward: I should find a quote in the extremely well written Rare Earth as well.
+
+% A Short History of Nearly Everything: I wish that I had the memory to remember this book
+% verbatim.
+
+% Chaos and Harmony: very nice and well written book, but the typography is rather bad:
+% quite visible inter-character spacing in a text that can be typeset quite well by \TeX.
+
 \stoptext
\ No newline at end of file
diff --git a/tex/context/sample/thuan.tex b/tex/context/sample/thuan.tex
new file mode 100644
index 000000000..e38c58489
--- /dev/null
+++ b/tex/context/sample/thuan.tex
@@ -0,0 +1,10 @@
+Had our solar system included two suns, the problem would have
+involved three bodies (the two suns and each planet), and chaos
+would have been immediately obvious. Planets would have had
+erratic and unpredictable orbits, and creatures living on one
+of these planets would never have been able to percieve the
+slightest harmony. Nor would it have occurred to them that the
+universe might be ruled by laws and that it is up to man's
+intellect to discover them. Besides, it is not at all obvious
+that life and conscience could even emerge in such a chaotic
+system.
\ No newline at end of file
diff --git a/tex/generic/context/m-metapo.tex b/tex/generic/context/m-metapo.tex
index 5a1baa3d3..e54e14682 100644
--- a/tex/generic/context/m-metapo.tex
+++ b/tex/generic/context/m-metapo.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=m-metapo,
+%D   [       filefile=m-metapo,
 %D        version=1999.03.26,
 %D          title=\LATEX\ Modules, 
 %D       subtitle=\METAPOST\ Inclusion,
@@ -41,7 +41,7 @@
 
 %D An example of using this module is given below: 
 %D 
-%D \starttypen
+%D \starttyping
 %D \documentclass[10pt]{article}
 %D 
 %D \usepackage{graphicx}
@@ -51,7 +51,7 @@
 %D   \includeMPgraphics{somefile.1}
 %D   \includeMPgraphics[angle=90]{somefile.2}
 %D \end{document}
-%D \stoptypen
+%D \stoptyping
 %D
 %D This module needs \type {supp-mps} and \type {supp-mis}, 
 %D that both are present in the \CONTEXT\ path.
diff --git a/tex/generic/context/mptopdf.tex b/tex/generic/context/mptopdf.tex
index 8929ac1e4..424768bca 100644
--- a/tex/generic/context/mptopdf.tex
+++ b/tex/generic/context/mptopdf.tex
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=mptopdf,
+%D   [       filefile=mptopdf,
 %D        version=2000.03.27,
 %D          title=\METAPOST,
 %D       subtitle=conversion to \PDF, 
@@ -17,15 +17,15 @@
 %D
 %D First generate a format, which in \WEBC\ looks like:
 %D
-%D \starttypen 
+%D \starttyping 
 %D pdftex --ini mptopdf 
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D or: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D texexec --make --tex=pdftex --format=mptopdf --alone 
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D Since this conversion only works with \PDFTEX\ or \PDFETEX, 
 %D the session is aborted when another \TEX\ is used. When 
@@ -34,9 +34,9 @@
 %D
 %D The conversion itself is accomplished by: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D pdftex &mptopdf \relax filename.number 
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The \type {\relax} is needed since we don't want to process
 %D the file directly. Instead we pick up the filename using
@@ -46,20 +46,20 @@
 %D available in the file \type {filename.pdf}. This conversion
 %D process is roughly compatible with: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D texexec --pdf --fig=c --result=filename filename.number
-%D \stoptypen 
+%D \stoptyping 
 %D
 %D This uses \CONTEXT, and is therefore slower. Therefore, 
 %D we provide a small \PERL\ script that does a faster job, 
 %D using the minimal format. Given that a format is 
 %D generated, one can say: 
 %D
-%D \starttypen 
+%D \starttyping 
 %D mptopdf somefile  
 %D mptopdf somefile.123
 %D mptopdf mp*.* 
-%D \stoptypen 
+%D \stoptyping 
 %D 
 %D The results are copied into files named \type 
 %D {somefile-number}. This mechanism will also be available