here is context 2010.05.24 13:05

git-svn-id: svn://tug.org/texlive/trunk@18445 c570f23f-e606-0410-a88d-b1316a301751

16 files changed, 1651 insertions, 836 deletions

diff --git a/Master/texmf-dist/context/data/scite/cont-cs-scite.properties b/Master/texmf-dist/context/data/scite/cont-cs-scite.properties
index fbc653e57cc..ddf42aacdd6 100644
--- a/Master/texmf-dist/context/data/scite/cont-cs-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-cs-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.cs=\
-CAP Cap Caps MESIC Rimskecislice SLOVA \
-SLOVO Slova Slovo VSEDNIDEN Znak Znaky \
-aktualnicislonadpisu aktualnidatum appendix barva bilemisto bublinkovanapoveda \
-bypassblocks cap cernalinka cernelinky chapter chem \
-cisla cislonadpisu citace citovat completecombinedlist completelistoffloats \
-completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum \
-definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetype \
-definetypeface definuj definujbarvu definujblok definujbloksekce definujbuffer \
-definujfont definujformatodkazu definujinterakcnimenu definujinterakcnimenu definujkombinovanyseznam definujkonverzi \
-definujlogo definujnadpis definujobrazeksymbol definujodkaz definujodsazovani definujodstavce \
-definujopis definujoramovani definujoramovanytext definujpaletu definujplvouciobjekt definujpodpole \
-definujpole definujpopis definujpopisek definujprekryv definujpreskok definujprofil \
-definujprogram definujprostredizakladnihofontu definujrejstrik definujsablonutabulky definujsekci definujseznam \
-definujseznamodkazu definujskupinubarev definujstartstop definujsymbol definujsynonumumfontu definujsynonyma \
-definujtabelaci definujtext definujtrideni definujupravu definujvelikostpapiru definujverzi \
-definujvycet definujvystup definujzakladnifont definujzasobnikpoli definujznaceni description \
-dodrzujprofil dodrzujverzi dodrzujverziprofilu dvoustrannypapir emptylines enumeration \
-externiobraz footnotetext forceblocks framedtext hl hlavnijazyk \
-indentation ininner inouter instalacejazyka interakcnilista interakcnitlacitka \
-jazyk jdidolu jdina jdinabox klonujpole komentar \
-konvertujcislo kopirujpole korekcebilehomista labeling listsymbol loadsorts \
-loadsynonyms mapfontsize marginalnilinka marginalnitext matematika mediaeval \
-meritko mesic mezera mrizka nadpis nadruhyokraj \
-nadtrzeni nadtrzeno name naokraj nastavbarvu nastavbarvy \
-nastavbilamista nastavblok nastavbloksekce nastavbuffer nastavcernelinky nastavcislonadpisu \
-nastavcislostrany nastavcislovani nastavcislovaniodstavcu nastavcislovaniradku nastavcislovanistran nastavcitaci \
-nastavdefinicipoznamekpodcarou nastavdeleniplvoucichobjektu nastavdelitko nastavdolnitexty nastavexterniobrazy nastavhorejsek \
-nastavhornitexty nastavinterakci nastavinterakcnilistu nastavinterakcnimenu nastavinterakcniobrazovku nastavjazyk \
-nastavkapitalky nastavkombinovanyseznam nastavkomentar nastavlegendu nastavmarginalie nastavmarginalniblok \
-nastavmarginalnilinky nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazeni \
-nastavodsazovani nastavodstavce nastavopis nastavoramovanetexty nastavoramovani nastavorez \
-nastavotoceni nastavpaletu nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni \
-nastavpole nastavpolozky nastavpopisek nastavpopisky nastavpopisy nastavpozadi \
-nastavpozadi nastavpoznamkypodcarou nastavprechodstrany nastavpreskok nastavprofily nastavprogramy \
-nastavprostredizakladnihofontu nastavpublikace nastavradkovani nastavradky nastavrastr nastavrejstrik \
-nastavrovnice nastavsadusymbolu nastavsekci nastavseznam nastavseznamodkazu nastavsirkucary \
-nastavsloupce nastavspodek nastavspojeni nastavsynchronizaci nastavsynchronizacnilistu nastavsynonyma \
-nastavsystem nastavtab nastavtabelaci nastavtabulky nastavtenkelinky nastavtext \
-nastavtexthlavicky nastavtextovelinky nastavtextpopisku nastavtexttexty nastavtextyupati nastavtextyzahlavi \
-nastavtlacitka nastavtoleranci nastavtrideni nastavtype nastavumisteniprotejsku nastavumistovani \
-nastavupati nastavupravu nastavurl nastavusporadani nastavvelikostpapiru nastavverze \
-nastavvsechnapole nastavvycty nastavvyplnovelinky nastavvyplnoveradky nastavvystup nastavvzhled \
-nastavzahlavi nastavzakladnifont nastavzarovnani nastavznaceni nastavzuzeni nastrane \
-nejakyradek nekde nextsection nivy nizky nocap \
-nop obrazovka odkaz odkaz odkaznadatum odkaznastranu \
-odkaznatext odsazovani okr opis opissoubor oramovani \
-oref orez otocit oznacverzi paragraph parovastrana \
-part pis placefloat placelistoffloats placelistofsorts placelistofsynonyms \
-placereferencelist podtrzeni podtrzeno pol pole polozka \
-polozky popisky porovnejpaletu porovnejskupinubarev pozadi pozice \
-poznamka poznamkapodcarou pref prelozit premistinamrizku prepninazakladnifont \
-preskoc preskrtnuti preskrtnuto prizpusobivepole prizpusobvzhled program \
-propojeneznaceni propojenydokument propojenyrejstrik publikace ran ref \
-register reservefloat reset resettextcontent resetznaceni rimskecislice \
-rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky section sedabarva \
-seeregister settextcontent setupfonthandling setupfontsynonym setupforms setupinterlinespace2 \
-setupitemgroup setuplistalternative setuppaper setupstrut sloupec slovovpravo \
-sort spodek stanovcharakteristickuseznamu stanovcislonadpisu startalignment startbarva \
-startbuffer startbuffer startcitace startcolumns startcombination startdescription \
-startdocument startenumeration startfakt startfigure startfloattext startformula \
-startframedtext starthiding startinteraktivnimenu startitemgroup startkomentar startkomponenta \
-startlegend startline startlinecorrection startlinenumbering startlines startlocal \
-startlocalenvironment startlocalfootnotes startmakeup startmarginalnilinka startmarginblock startnamemakeup \
-startnarrower startopposite startoverlay startoverview startparagraph startpositioning \
-startpostponing startpozadi startprodukt startprofile startprojekt startprostredi \
-startregister startsymbolset startsynchronization starttable starttables starttabulate \
-starttextovalinka starttyping startunpacked startverze startzhustene stopalignment \
-stopbarva stopbuffer stopbuffer stopcitace stopcolumns stopcombination \
-stopdescription stopdocument stopenumeration stopfakt stopfigure stopfloattext \
-stopformula stopframedtext stophiding stopinteraktivnimenu stopitemgroup stopkomentar \
-stopkomponenta stoplegend stopline stoplinecorrection stoplinenumbering stoplines \
-stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginalnilinka stopmarginblock \
-stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph \
-stoppositioning stoppostponing stoppozadi stopprodukt stopprofile stopprojekt \
-stopprostredi stopsymbolset stopsynchronization stoptable stoptables stoptabulate \
-stoptextovalinka stoptyping stopunpacked stopverze stopzhustene strana \
-sub subject subsection subsubject subsubsection subsubsubject \
-sym symbol synchronizacnilista synchronizovat synonym tab \
-tecky tenkalinka tenkelinky tex texthlavicky textovalinka \
-textpopisku title tlacitko tref tvrdemezery typebuffer \
-typstrany ukazbarvu ukazexterniobrazy ukazmrizku ukaznastaveni ukazpaletu \
-ukazpodpery ukazpole ukazpostredizakladnihofontu ukazramecek ukazsadusymbolu ukazskupinubarev \
-ukazupravu ukazvytisk ukazvzhled ukazzakladnifont umistikombinovanyseznam umistikombinovanyseznam \
-umistilegendu umistiloga umistilokalnipoznamkypodcarou umistinadsebe umistinamrizku umistipodrovnici \
-umistipoznamkypodcarou umistirejstrik umistirejstrik umistirovnici umistiseznam umistivedlesebe \
-umistizalozky usedirectory usetypescript usetypescriptfile uzijURL uzijbloky \
-uzijexternidokument uzijexterniobraz uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani \
-uzijmodul uzijodkazy uzijprikazy uzijspeciality uzijsymbol verze \
-vl vlasovalinka vlevo vpravo vradku vsedniden \
-vyberbloky vyberpapir vyberverzi vyplnenytext vyplnovelinky vyplnovepole \
-vyplnovyradek vysoky zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto \
-zadnedalsibloky zadnedalsisoubory zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni \
-zadnyseznam zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam \
-zaramovani zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole \
-zhustene ziskejbuffer ziskejznaceni zlomek znaceni znak \
-znaky zpracujbloky zpracujstranu zrcadlit zref 
\ No newline at end of file
+keywordclass.macros.context.cs=CAP Cap Caps MESIC Rimskecislice SLOVA SLOVO Slova Slovo VSEDNIDEN Znak Znaky aktualnicislonadpisu aktualnidatum appendix barva bilemisto bublinkovanapoveda bypassblocks cap cernalinka cernelinky chapter chem cisla cislonadpisu citace citovat completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetype definetypeface definuj definujbarvu definujblok definujbloksekce definujbuffer definujfont definujformatodkazu definujinterakcnimenu definujinterakcnimenu definujkombinovanyseznam definujkonverzi definujlogo definujnadpis definujobrazeksymbol definujodkaz definujodsazovani definujodstavce definujopis definujoramovani definujoramovanytext definujpaletu definujplvouciobjekt definujpodpole definujpole definujpopis definujpopisek definujprekryv definujpreskok definujprofil definujprogram definujprostredizakladnihofontu definujrejstrik definujsablonutabulky definujsekci definujseznam definujseznamodkazu definujskupinubarev definujstartstop definujsymbol definujsynonumumfontu definujsynonyma definujtabelaci definujtext definujtrideni definujupravu definujvelikostpapiru definujverzi definujvycet definujvystup definujzakladnifont definujzasobnikpoli definujznaceni description dodrzujprofil dodrzujverzi dodrzujverziprofilu dvoustrannypapir emptylines enumeration externiobraz footnotetext forceblocks framedtext hl hlavnijazyk indentation ininner inouter instalacejazyka interakcnilista interakcnitlacitka jazyk jdidolu jdina jdinabox klonujpole komentar konvertujcislo kopirujpole korekcebilehomista labeling listsymbol loadsorts loadsynonyms mapfontsize marginalnilinka marginalnitext matematika mediaeval meritko mesic mezera mrizka nadpis nadruhyokraj name naokraj nastavbarvu nastavbarvy nastavbilamista nastavblok nastavbloksekce nastavbuffer nastavcernelinky nastavcislonadpisu nastavcislostrany nastavcislovani nastavcislovaniodstavcu nastavcislovaniradku nastavcislovanistran nastavcitaci nastavdefinicipoznamekpodcarou nastavdeleniplvoucichobjektu nastavdelitko nastavdolnitexty nastavexterniobrazy nastavhorejsek nastavhornitexty nastavinterakci nastavinterakcnilistu nastavinterakcnimenu nastavinterakcniobrazovku nastavjazyk nastavkapitalky nastavkombinovanyseznam nastavkomentar nastavlegendu nastavmarginalie nastavmarginalniblok nastavmarginalnilinky nastavmeziradkovoumezeru nastavnadpis nastavnadpisy nastavodkazovani nastavodsazeni nastavodsazovani nastavodstavce nastavopis nastavoramovanetexty nastavoramovani nastavorez nastavotoceni nastavpaletu nastavplvouciobjekt nastavplvouciobjekty nastavpodcislostrany nastavpodtrzeni nastavpole nastavpolozky nastavpopisek nastavpopisky nastavpopisy nastavpozadi nastavpozadi nastavpoznamkypodcarou nastavprechodstrany nastavpreskok nastavprofily nastavprogramy nastavprostredizakladnihofontu nastavpublikace nastavradkovani nastavradky nastavrastr nastavrejstrik nastavrovnice nastavsadusymbolu nastavsekci nastavseznam nastavseznamodkazu nastavsirkucary nastavsloupce nastavspodek nastavspojeni nastavsynchronizaci nastavsynchronizacnilistu nastavsynonyma nastavsystem nastavtab nastavtabelaci nastavtabulky nastavtenkelinky nastavtext nastavtexthlavicky nastavtextovelinky nastavtextpopisku nastavtexttexty nastavtextyupati nastavtextyzahlavi nastavtlacitka nastavtoleranci nastavtrideni nastavtype nastavumisteniprotejsku nastavumistovani nastavupati nastavupravu nastavurl nastavusporadani nastavvelikostpapiru nastavverze nastavvsechnapole nastavvycty nastavvyplnovelinky nastavvyplnoveradky nastavvystup nastavvzhled nastavzahlavi nastavzakladnifont nastavzarovnani nastavznaceni nastavzuzeni nastrane nejakyradek nekde nextsection nivy nizky nocap nop obrazovka odkaz odkaz odkaznadatum odkaznastranu odkaznatext odsazovani okr opis opissoubor oramovani oref orez otocit overbar overbars overstrike overstrikes oznacverzi paragraph parovastrana part pis placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist pol pole polozka polozky popisky porovnejpaletu porovnejskupinubarev pozadi pozice poznamka poznamkapodcarou pref prelozit premistinamrizku prepninazakladnifont preskoc prizpusobivepole prizpusobvzhled program propojeneznaceni propojenydokument propojenyrejstrik publikace ran ref register reservefloat reset resettextcontent resetznaceni rimskecislice rozdelplvouciobjekt rozpojeneznaceni roztazene schovejbloky section sedabarva seeregister settextcontent setupfonthandling setupfontsynonym setupforms setupinterlinespace2 setupitemgroup setuplistalternative setuppaper setupstrut sloupec slovovpravo sort spodek stanovcharakteristickuseznamu stanovcislonadpisu startalignment startbarva startbuffer startbuffer startcitace startcolumns startcombination startdescription startdocument startenumeration startfakt startfigure startfloattext startformula startframedtext starthiding startinteraktivnimenu startitemgroup startkomentar startkomponenta startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginalnilinka startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startpozadi startprodukt startprofile startprojekt startprostredi startregister startsymbolset startsynchronization starttable starttables starttabulate starttextovalinka starttyping startunpacked startverze startzhustene stopalignment stopbarva stopbuffer stopbuffer stopcitace stopcolumns stopcombination stopdescription stopdocument stopenumeration stopfakt stopfigure stopfloattext stopformula stopframedtext stophiding stopinteraktivnimenu stopitemgroup stopkomentar stopkomponenta stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginalnilinka stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stoppozadi stopprodukt stopprofile stopprojekt stopprostredi stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextovalinka stoptyping stopunpacked stopverze stopzhustene strana sub subject subsection subsubject subsubsection subsubsubject sym symbol synchronizacnilista synchronizovat synonym tab tecky tenkalinka tenkelinky tex texthlavicky textovalinka textpopisku title tlacitko tref tvrdemezery typebuffer typstrany ukazbarvu ukazexterniobrazy ukazmrizku ukaznastaveni ukazpaletu ukazpodpery ukazpole ukazpostredizakladnihofontu ukazramecek ukazsadusymbolu ukazskupinubarev ukazupravu ukazvytisk ukazvzhled ukazzakladnifont umistikombinovanyseznam umistikombinovanyseznam umistilegendu umistiloga umistilokalnipoznamkypodcarou umistinadsebe umistinamrizku umistipodrovnici umistipoznamkypodcarou umistirejstrik umistirejstrik umistirovnici umistiseznam umistivedlesebe umistizalozky underbar underbars usedirectory usetypescript usetypescriptfile uzijURL uzijbloky uzijexternidokument uzijexterniobraz uzijexternisoubor uzijexternisoubory uzijexternizvuk uzijkodovani uzijmodul uzijodkazy uzijprikazy uzijspeciality uzijsymbol verze vl vlasovalinka vlevo vpravo vradku vsedniden vyberbloky vyberpapir vyberverzi vyplnenytext vyplnovelinky vyplnovepole vyplnovyradek vysoky zablokujinterakcnimenu zachovejbloky zadnamezera zadnebilemisto zadnedalsibloky zadnedalsisoubory zadnehorniadolniradky zadneodsazovani zadnezahlaviaupati zadneznaceni zadnyseznam zalozka zapisdorejstriku zapisdoseznamu zapisdoseznamuodkazu zapismeziseznam zaramovani zarovnanonastred zarovnanovlevo zarovnanovpravo zasobnikpoli zaznamovepole zhustene ziskejbuffer ziskejznaceni zlomek znaceni znak znaky zpracujbloky zpracujstranu zrcadlit zref 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-de-scite.properties b/Master/texmf-dist/context/data/scite/cont-de-scite.properties
index f749bfe9713..b0e05b91aa5 100644
--- a/Master/texmf-dist/context/data/scite/cont-de-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-de-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.de=\
-Buchstabe Buchstaben CAP Cap Caps MONAT \
-Roemischezahlen WOCHENTAG WOERTER WORT Woerter Wort \
-amgitterausrichten amgitterneuausrichten appendix aufseite ausfuellfeld ausfuelltext \
-ausschnitt bearbeitebloecke bearbeiteseite behaltebloecke bei benutzekodierung \
-benutzespezielles beschrifteversion beschriftung bestimmekopfnummer bestimmelistencharakeristika bildschirm \
-blanko bookmark bruch buchstabe buchstaben but \
-bypassblocks cap chapter chem completecombinedlist completelistoffloats \
-completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum \
-definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineoutput \
-defineschriftsynonym definetype definetypeface definiereabbsymbol definiereabsaetze definiereabschnitt \
-definiereabschnittsblock definierebeschreibung definierebeschreibungen definierebeschriftung definiereblanko definiereblock \
-definiereeinzug definierefarbe definierefarbengruppe definierefeld definierefeldstapel definierefliesstext \
-definierefliesstextumgebung definieregleitobjekt definiereinteraktionsmenue definiereinteraktionsmenue definierekonversion definierelabel \
-definiereliste definierelogo definieren definierenummerierung definiereoverlay definierepalette \
-definierepapierformat definiereprofil definiereprogramme definierepuffer definierereferenz definierereferenzformat \
-definierereferenzliste definiereregister definiereschrift definieresortieren definierestartstop definieresubfeld \
-definieresymbol definieresynonyme definieretabellenvorlage definieretabulator definieretext definieretippen \
-definiereueberschrift definiereumbruch definiereumrahmt definiereumrahmtertext definiereversion definierezusammengestellteliste \
-description doppelseite doppelseitigespapier drehen duennelinie duennerumriss \
-durchgestrichen durchstreichen einezeile einziehen emptylines entknuepfebeschriftung \
-enumeration externeabbildung farbe feld feldstapel festesspatium \
-folgeprofil folgeprofilversion folgeversion footnotetext forceblocks format \
-framedtext fussnote gefuelltesrechteck gefuelltezeile gestreckt gitter \
-graufarbe haarlinie hauptsprache heutigesdatum heutigeskopfnummer hintergrund \
-hl hoch holebeschriftung holepuffer imlinken imrechten \
-imumriss in inaktiviereinteraktionsmenue inanderermarginale indentation ininner \
-inmarginalie inouter installieresprache interaktionsbalken interaktionsknopfe inzeile \
-irgendwo its keinebeschriftung keinebloeckemehr keinedateienmehr keinekopfundfusszeilen \
-keineliste keinspatium keinzeilenobenundunten keinzwischenraum kleinerdurchschuss klonierefeld \
-knopf kommentar konvertierezahl kopf kopfnummer kopierefeld \
-korrigierezwischenraum labeling labels labeltext linksbuendig listsymbol \
-loadsorts loadsynonyms mapfontsize mar marginallinie marginaltext \
-mathematik mediaeval monat nachunten name nextsection \
-nichteinziehen nocap nop notiz paragraph part \
-passelayoutan passendfeld placefloat placelistoffloats placelistofsorts placelistofsynonyms \
-placereferencelist platzierebookmarks platziereformel platzierefussnoten platzierelegende platziereliste \
-platzierelogo platzierelokalefussnoten platzierenebeneinander platziereregister platziereregister platziereuntereinander \
-platziereunterformel platzierezusammengestellteliste platzierezusammengestellteliste pos position posten \
-programm publikation punkt ran rechteck rechtecke \
-rechtsbuendig ref referenz register registrierefelder reservefloat \
-resettextcontent roemischezahlen ruecksetzten ruecksetztenbeschriftung schreibezumregister schreibezurliste \
-schreibezurreferenzliste schreibezwischenliste section seeregister seite seitenreferenz \
-seitentyp settext setupfonthandling setupfontsynonym setupforms setupinterlinespace2 \
-setupitemgroup setuplistalternative setuppaper setupstrut showsymbolset sort \
-spalte spatium spiegeln sprache startalignment startbuffer \
-startbuffer startcolumns startcombination startdescription startdocument startenumeration \
-startfarbe startfigure startfloattext startformula startframedtext startgeg \
-starthiding starthintergrund startinteraktionsmenue startitemgroup startkleinerdurchschuss startkommentar \
-startkomponente startlegend startline startlinecorrection startlinenumbering startlines \
-startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginallinie startmarginblock \
-startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph \
-startpositioning startpostponing startprodukt startprofile startprojekt startregister \
-startsymbolset startsynchronization starttable starttables starttabulate starttextlinie \
-starttyping startumgebung startunpacked startversion startzitat stelleabsaetzeein \
-stelleabsatznummerierungein stelleabschnittein stelleabschnittsblockein stelleanordnenein stelleausgabeein stelleausrichtungein \
-stelleausschnittein stellebeschreibungein stellebeschriftungein stellebilderunterschriftein stellebildunterschriftein stellebindestrichein \
-stelleblankoein stelleblockein stelledrehenein stelleduennerumrissein stelleeinziehenein stelleeinzuegein \
-stelleengerein stelleexterneabbildungenein stellefarbeein stellefarbenein stellefeldein stellefelderin \
-stellefliesstextein stellefliesstextumgebungein stelleformelnein stellefussnotendefinitionein stellefussnotenein stellefusszeileein \
-stellefusszeilentextein stellegefuelltesrechteckein stellegefuelltezeileein stellegegenueberplatzierenein stellegleitobjekteein stellegleitobjektein \
-stellehintergruendeein stellehintergrundein stelleinmarginalieein stelleinteraktionein stelleinteraktionsbalkenein stelleinteraktionsbildschirmein \
-stelleinteraktionsmenueein stelleknopfein stellekombinationein stellekommentarein stellekopfzahlein stellekopfzeileein \
-stellekopfzeilentextein stellelabeltextein stellelayoutein stellelegendeein stellelinienbreiteein stellelisteein \
-stellemarginalblockein stellemarginallinieein stellenobenein stellenummerierungein stellepaletteein stellepapierformatein \
-stelleplatziegeteiltegleitobjekt stellepositionierenein stellepostenein stelleprofilein stelleprogrammein stellepublikationein \
-stellepufferein stellerasterein stellerechteckein stellereferenzierenein stellereferenzlisteein stelleregisterein \
-stelleseitennummerein stelleseitennummeriernungein stelleseitenuebergangein stellesortierenein stellespaltenein stellespatiumein \
-stellespracheein stellesymbolsetein stellesynchronisationein stellesynchronisationsbalkenein stellesynonymein stellesystemein \
-stelletabein stelletabellenein stelletabulatorein stelletextein stelletextobenein stelletexttexteein \
-stelletextumrissein stelletextuntenein stelletipein stelletippenein stelletoleranzein stelleueberschriftein \
-stelleueberschriftenein stelleueberschrifttextein stelleumbruchein stelleumrahmtein stelleumrahmtetexteein stelleuntenein \
-stelleunterseitennummerein stelleunterstreichenein stelleurlein stelleversalienein stelleversionein stellezeilenabstandein \
-stellezeilenein stellezeilennumerierungein stellezitierenein stellezusammengestelltelisteein stellezwischenraumein stopalignment \
-stopbuffer stopbuffer stopcolumns stopcombination stopdescription stopdocument \
-stopenumeration stopfarbe stopfigure stopfloattext stopformula stopframedtext \
-stopgeg stophiding stophintergrund stopinteraktionsmenue stopitemgroup stopkleinerdurchschuss \
-stopkommentar stopkomponente stoplegend stopline stoplinecorrection stoplinenumbering \
-stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginallinie \
-stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview \
-stopparagraph stoppositioning stoppostponing stopprodukt stopprofile stopprojekt \
-stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextlinie \
-stoptyping stopumgebung stopunpacked stopversion stopzitat sub \
-subject subsection subsubject subsubsection subsubsubject sym \
-symbol synchronisationsbalken synchronisieren synonym tab teilegleitobjekt \
-tex textlinie textreferenz tief tiho tip \
-tippedatei tippen tippepuffer title tooltip ueber \
-ueberschrifttext uebersetzten ueberstreichen ueberstrichen umrahmt unterstreichen \
-unterstrichen usedirectory usetypescript usetypescriptfile verbergebloecke vergleichefarbengruppe \
-vergleichepalette verknuepfebeschriftung verknuepfedokument verknuepfregister version verweis \
-verweisdatum verwendeURL verwendebefehl verwendebloecke verwendeexteresdokument verwendeexterneabbildung \
-verwendeexternedatei verwendeexternedateien verwendeexternestonstueck verwendemodul verwendereferenzen verwendesymbole \
-vl von waehlebloeckeaus waehlepapieraus waehleversionaus wechselezumfliesstext \
-wochentag wortrechts zeigedruck zeigeeinstellungen zeigeexterneabbildungen zeigefarbe \
-zeigefarbengruppe zeigefelder zeigefliesstext zeigefliesstextumgebung zeigegitter zeigelayout \
-zeigepalette zeigerahmen zeigestruts zeigeumbruch zentriert ziffern \
-zitat zitieren zu zurbox zwischenraum 
\ No newline at end of file
+keywordclass.macros.context.de=Buchstabe Buchstaben CAP Cap Caps MONAT Roemischezahlen WOCHENTAG WOERTER WORT Woerter Wort amgitterausrichten amgitterneuausrichten appendix aufseite ausfuellfeld ausfuelltext ausschnitt bearbeitebloecke bearbeiteseite behaltebloecke bei benutzekodierung benutzespezielles beschrifteversion beschriftung bestimmekopfnummer bestimmelistencharakeristika bildschirm blanko bookmark bruch buchstabe buchstaben but bypassblocks cap chapter chem completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineoutput defineschriftsynonym definetype definetypeface definiereabbsymbol definiereabsaetze definiereabschnitt definiereabschnittsblock definierebeschreibung definierebeschreibungen definierebeschriftung definiereblanko definiereblock definiereeinzug definierefarbe definierefarbengruppe definierefeld definierefeldstapel definierefliesstext definierefliesstextumgebung definieregleitobjekt definiereinteraktionsmenue definiereinteraktionsmenue definierekonversion definierelabel definiereliste definierelogo definieren definierenummerierung definiereoverlay definierepalette definierepapierformat definiereprofil definiereprogramme definierepuffer definierereferenz definierereferenzformat definierereferenzliste definiereregister definiereschrift definieresortieren definierestartstop definieresubfeld definieresymbol definieresynonyme definieretabellenvorlage definieretabulator definieretext definieretippen definiereueberschrift definiereumbruch definiereumrahmt definiereumrahmtertext definiereversion definierezusammengestellteliste description doppelseite doppelseitigespapier drehen duennelinie duennerumriss einezeile einziehen emptylines entknuepfebeschriftung enumeration externeabbildung farbe feld feldstapel festesspatium folgeprofil folgeprofilversion folgeversion footnotetext forceblocks format framedtext fussnote gefuelltesrechteck gefuelltezeile gestreckt gitter graufarbe haarlinie hauptsprache heutigesdatum heutigeskopfnummer hintergrund hl hoch holebeschriftung holepuffer imlinken imrechten imumriss in inaktiviereinteraktionsmenue inanderermarginale indentation ininner inmarginalie inouter installieresprache interaktionsbalken interaktionsknopfe inzeile irgendwo its keinebeschriftung keinebloeckemehr keinedateienmehr keinekopfundfusszeilen keineliste keinspatium keinzeilenobenundunten keinzwischenraum kleinerdurchschuss klonierefeld knopf kommentar konvertierezahl kopf kopfnummer kopierefeld korrigierezwischenraum labeling labels labeltext linksbuendig listsymbol loadsorts loadsynonyms mapfontsize mar marginallinie marginaltext mathematik mediaeval monat nachunten name nextsection nichteinziehen nocap nop notiz overbar overbars overstrike overstrikes paragraph part passelayoutan passendfeld placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist platzierebookmarks platziereformel platzierefussnoten platzierelegende platziereliste platzierelogo platzierelokalefussnoten platzierenebeneinander platziereregister platziereregister platziereuntereinander platziereunterformel platzierezusammengestellteliste platzierezusammengestellteliste pos position posten programm publikation punkt ran rechteck rechtecke rechtsbuendig ref referenz register registrierefelder reservefloat resettextcontent roemischezahlen ruecksetzten ruecksetztenbeschriftung schreibezumregister schreibezurliste schreibezurreferenzliste schreibezwischenliste section seeregister seite seitenreferenz seitentyp settext setupfonthandling setupfontsynonym setupforms setupinterlinespace2 setupitemgroup setuplistalternative setuppaper setupstrut showsymbolset sort spalte spatium spiegeln sprache startalignment startbuffer startbuffer startcolumns startcombination startdescription startdocument startenumeration startfarbe startfigure startfloattext startformula startframedtext startgeg starthiding starthintergrund startinteraktionsmenue startitemgroup startkleinerdurchschuss startkommentar startkomponente startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginallinie startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodukt startprofile startprojekt startregister startsymbolset startsynchronization starttable starttables starttabulate starttextlinie starttyping startumgebung startunpacked startversion startzitat stelleabsaetzeein stelleabsatznummerierungein stelleabschnittein stelleabschnittsblockein stelleanordnenein stelleausgabeein stelleausrichtungein stelleausschnittein stellebeschreibungein stellebeschriftungein stellebilderunterschriftein stellebildunterschriftein stellebindestrichein stelleblankoein stelleblockein stelledrehenein stelleduennerumrissein stelleeinziehenein stelleeinzuegein stelleengerein stelleexterneabbildungenein stellefarbeein stellefarbenein stellefeldein stellefelderin stellefliesstextein stellefliesstextumgebungein stelleformelnein stellefussnotendefinitionein stellefussnotenein stellefusszeileein stellefusszeilentextein stellegefuelltesrechteckein stellegefuelltezeileein stellegegenueberplatzierenein stellegleitobjekteein stellegleitobjektein stellehintergruendeein stellehintergrundein stelleinmarginalieein stelleinteraktionein stelleinteraktionsbalkenein stelleinteraktionsbildschirmein stelleinteraktionsmenueein stelleknopfein stellekombinationein stellekommentarein stellekopfzahlein stellekopfzeileein stellekopfzeilentextein stellelabeltextein stellelayoutein stellelegendeein stellelinienbreiteein stellelisteein stellemarginalblockein stellemarginallinieein stellenobenein stellenummerierungein stellepaletteein stellepapierformatein stelleplatziegeteiltegleitobjekt stellepositionierenein stellepostenein stelleprofilein stelleprogrammein stellepublikationein stellepufferein stellerasterein stellerechteckein stellereferenzierenein stellereferenzlisteein stelleregisterein stelleseitennummerein stelleseitennummeriernungein stelleseitenuebergangein stellesortierenein stellespaltenein stellespatiumein stellespracheein stellesymbolsetein stellesynchronisationein stellesynchronisationsbalkenein stellesynonymein stellesystemein stelletabein stelletabellenein stelletabulatorein stelletextein stelletextobenein stelletexttexteein stelletextumrissein stelletextuntenein stelletipein stelletippenein stelletoleranzein stelleueberschriftein stelleueberschriftenein stelleueberschrifttextein stelleumbruchein stelleumrahmtein stelleumrahmtetexteein stelleuntenein stelleunterseitennummerein stelleunterstreichenein stelleurlein stelleversalienein stelleversionein stellezeilenabstandein stellezeilenein stellezeilennumerierungein stellezitierenein stellezusammengestelltelisteein stellezwischenraumein stopalignment stopbuffer stopbuffer stopcolumns stopcombination stopdescription stopdocument stopenumeration stopfarbe stopfigure stopfloattext stopformula stopframedtext stopgeg stophiding stophintergrund stopinteraktionsmenue stopitemgroup stopkleinerdurchschuss stopkommentar stopkomponente stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginallinie stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodukt stopprofile stopprojekt stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextlinie stoptyping stopumgebung stopunpacked stopversion stopzitat sub subject subsection subsubject subsubsection subsubsubject sym symbol synchronisationsbalken synchronisieren synonym tab teilegleitobjekt tex textlinie textreferenz tief tiho tip tippedatei tippen tippepuffer title tooltip ueber ueberschrifttext uebersetzten umrahmt underbar underbars usedirectory usetypescript usetypescriptfile verbergebloecke vergleichefarbengruppe vergleichepalette verknuepfebeschriftung verknuepfedokument verknuepfregister version verweis verweisdatum verwendeURL verwendebefehl verwendebloecke verwendeexteresdokument verwendeexterneabbildung verwendeexternedatei verwendeexternedateien verwendeexternestonstueck verwendemodul verwendereferenzen verwendesymbole vl von waehlebloeckeaus waehlepapieraus waehleversionaus wechselezumfliesstext wochentag wortrechts zeigedruck zeigeeinstellungen zeigeexterneabbildungen zeigefarbe zeigefarbengruppe zeigefelder zeigefliesstext zeigefliesstextumgebung zeigegitter zeigelayout zeigepalette zeigerahmen zeigestruts zeigeumbruch zentriert ziffern zitat zitieren zu zurbox zwischenraum 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-en-scite.properties b/Master/texmf-dist/context/data/scite/cont-en-scite.properties
index 72414c1132f..a83042bf6eb 100644
--- a/Master/texmf-dist/context/data/scite/cont-en-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-en-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.en=\
-CAP Cap Caps Character Characters MONTH \
-Romannumerals WEEKDAY WORD WORDS Word Words \
-about adaptlayout appendix at atpage background \
-blackrule blackrules blank bookmark but button \
-bypassblocks cap chapter character characters chem \
-clip clonefield color column comment comparecolorgroup \
-comparepalet completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister \
-convertnumber copyfield correctwhitespace coupledocument coupledregister couplemarking \
-couplepage couplepaper coupleregister crlf currentdate currentheadnumber \
-date decouplemarking define defineblank defineblock definebodyfont \
-definebodyfontDEF definebodyfontREF definebodyfontenvironment definebuffer definecolor definecolorgroup \
-definecombinedlist defineconversion definedescription definedfont defineenumeration definefield \
-definefieldstack definefiguresymbol definefloat definefont definefontfeature definefonthandling \
-definefontsynonym defineframed defineframedtext definehead defineindenting defineinteractionmenu \
-defineinteractionmenu definelabel definelist definelogo definemakeup definemarking \
-defineoutput defineoverlay definepalet definepapersize defineparagraphs defineprofile \
-defineprogram definereference definereferenceformat definereferencelist defineregister definesection \
-definesectionblock definesorting definestartstop definesubfield definesymbol definesynonyms \
-definetabletemplate definetabulate definetext definetype definetypeface definetyping \
-defineversion description determineheadnumber determinelistcharacteristics disableinteractionmenu emptylines \
-enumeration externalfigure field fieldstack fillinfield fillinline \
-fillinrules fillintext fitfield fixedspaces followprofile followprofileversion \
-followversion footnote footnotetext forceblocks fraction framed \
-framedtext from getbuffer getmarking godown goto \
-gotobox graycolor grid hairline head headnumber \
-headtext hideblocks high hl in indentation \
-indenting inframed ininner inleft inline inmargin \
-inothermargin inouter inright installlanguage interactionbar interactionbuttons \
-item items its keepblocks labeling labels \
-labeltext language leftaligned listsymbol loadsorts loadsynonyms \
-logfields lohi low mainlanguage mapfontsize mar \
-marginrule margintext marking markversion mathematics mediaeval \
-midaligned mirror month moveongrid name nextsection \
-nocap noheaderandfooterlines noindenting nolist nomarking nomoreblocks \
-nomorefiles nop nospace note notopandbottomlines nowhitespace \
-numbers overbar overbars overstrike overstrikes packed \
-page pagereference pagetype paragraph part periods \
-placebookmarks placecombinedlist placecombinedlist placefloat placefootnotes placeformula \
-placelegend placelist placelistoffloats placelistofsorts placelistofsynonyms placelocalfootnotes \
-placelogos placeongrid placeontopofeachother placereferencelist placeregister placeregister \
-placesidebyside placesubformula position processblocks processpage program \
-publication quotation quote ran ref reference \
-referral referraldate register reservefloat reset resetmarking \
-resettextcontent rightaligned romannumerals rotate scale screen \
-section seeregister selectblocks selectpaper selectversion settextcontent \
-setupalign setuparranging setupbackground setupbackgrounds setupblackrules setupblank \
-setupblock setupbodyfont setupbodyfontenvironment setupbottom setupbottomtexts setupbuffer \
-setupbuttons setupcapitals setupcaption setupcaptions setupclipping setupcolor \
-setupcolors setupcolumns setupcombinations setupcombinedlist setupcomment setupdescriptions \
-setupenumerations setupexternalfigures setupfield setupfields setupfillinlines setupfillinrules \
-setupfloat setupfloats setupfloatsplitting setupfonthandling setupfontsynonym setupfooter \
-setupfootertexts setupfootnotedefinition setupfootnotes setupforms setupformulae setupframed \
-setupframedtexts setuphead setupheader setupheadertexts setupheadnumber setupheads \
-setupheadtext setuphyphenmark setupindentations setupindenting setupinmargin setupinteraction \
-setupinteractionbar setupinteractionmenu setupinteractionscreen setupinterlinespace setupinterlinespace2 setupitemgroup \
-setupitems setuplabeltext setuplanguage setuplayout setuplegend setuplinenumbering \
-setuplines setuplinewidth setuplist setuplistalternative setupmakeup setupmarginblocks \
-setupmarginrules setupmarking setupnarrower setupnumbering setupoppositeplacing setupoutput \
-setuppagenumber setuppagenumbering setuppagetransitions setuppalet setuppaper setuppapersize \
-setupparagraphnumbering setupparagraphs setuppositioning setupprofiles setupprograms setuppublications \
-setupquote setupreferencelist setupreferencing setupregister setuprotate setupscreens \
-setupsection setupsectionblock setupsorting setupspacing setupstrut setupsubpagenumber \
-setupsymbolset setupsynchronization setupsynchronizationbar setupsynonyms setupsystem setuptab \
-setuptables setuptabulate setuptext setuptextrules setuptexttexts setupthinrules \
-setuptolerance setuptop setuptoptexts setuptype setuptyping setupunderbar \
-setupurl setupversions setupwhitespace showbodyfont showbodyfontenvironment showcolor \
-showcolorgroup showexternalfigures showfields showframe showgrid showlayout \
-showmakeup showpalet showprint showsetups showstruts showsymbolset \
-someline somewhere sort space splitfloat startalignment \
-startbackground startbuffer startbuffer startcolor startcolumns startcombination \
-startcomment startcomponent startdescription startdocument startenumeration startenvironment \
-startfact startfigure startfloattext startformula startframedtext starthiding \
-startinteractionmenu startitemgroup startlegend startline startlinecorrection startlinenumbering \
-startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock \
-startmarginrule startnamemakeup startnarrower startopposite startoverlay startoverview \
-startpacked startparagraph startpositioning startpostponing startproduct startprofile \
-startproject startquotation startregister startsymbolset startsynchronization starttable \
-starttables starttabulate starttextrule starttyping startunpacked startversion \
-stopalignment stopbackground stopbuffer stopbuffer stopcolor stopcolumns \
-stopcombination stopcomment stopcomponent stopdescription stopdocument stopenumeration \
-stopenvironment stopfact stopfigure stopfloattext stopformula stopframedtext \
-stophiding stopinteractionmenu stopitemgroup stoplegend stopline stoplinecorrection \
-stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup \
-stopmarginblock stopmarginrule stopnamemakeup stopnarrower stopopposite stopoverlay \
-stopoverview stoppacked stopparagraph stoppositioning stoppostponing stopproduct \
-stopprofile stopproject stopquotation stopsymbolset stopsynchronization stoptable \
-stoptables stoptabulate stoptextrule stoptyping stopunpacked stopversion \
-stretched sub subject subsection subsubject subsubsection \
-subsubsubject switchtobodyfont sym symbol synchronizationbar synchronize \
-synonym tab tex textreference textrule thinrule \
-thinrules title tooltip translate typ type \
-typebuffer typefile underbar underbars useURL useblocks \
-usecommands usedirectory useencoding useexternaldocument useexternalfigure useexternalfile \
-useexternalfiles useexternalsoundtrack usemodule usereferences usespecials usesymbols \
-usetypescript usetypescriptfile version vl weekday whitespace \
-wordright writebetweenlist writetolist writetoreferencelist writetoregister 
\ No newline at end of file
+keywordclass.macros.context.en=CAP Cap Caps Character Characters MONTH Romannumerals WEEKDAY WORD WORDS Word Words about adaptlayout appendix at atpage background blackrule blackrules blank bookmark but button bypassblocks cap chapter character characters chem clip clonefield color column comment comparecolorgroup comparepalet completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister convertnumber copyfield correctwhitespace coupledocument coupledregister couplemarking couplepage couplepaper coupleregister crlf currentdate currentheadnumber date decouplemarking define defineblank defineblock definebodyfont definebodyfontDEF definebodyfontREF definebodyfontenvironment definebuffer definecolor definecolorgroup definecombinedlist defineconversion definedescription definedfont defineenumeration definefield definefieldstack definefiguresymbol definefloat definefont definefontfeature definefonthandling definefontsynonym defineframed defineframedtext definehead defineindenting defineinteractionmenu defineinteractionmenu definelabel definelist definelogo definemakeup definemarking defineoutput defineoverlay definepalet definepapersize defineparagraphs defineprofile defineprogram definereference definereferenceformat definereferencelist defineregister definesection definesectionblock definesorting definestartstop definesubfield definesymbol definesynonyms definetabletemplate definetabulate definetext definetype definetypeface definetyping defineversion description determineheadnumber determinelistcharacteristics disableinteractionmenu emptylines enumeration externalfigure field fieldstack fillinfield fillinline fillinrules fillintext fitfield fixedspaces followprofile followprofileversion followversion footnote footnotetext forceblocks fraction framed framedtext from getbuffer getmarking godown goto gotobox graycolor grid hairline head headnumber headtext hideblocks high hl in indentation indenting inframed ininner inleft inline inmargin inothermargin inouter inright installlanguage interactionbar interactionbuttons item items its keepblocks labeling labels labeltext language leftaligned listsymbol loadsorts loadsynonyms logfields lohi low mainlanguage mapfontsize mar marginrule margintext marking markversion mathematics mediaeval midaligned mirror month moveongrid name nextsection nocap noheaderandfooterlines noindenting nolist nomarking nomoreblocks nomorefiles nop nospace note notopandbottomlines nowhitespace numbers overbar overbars overstrike overstrikes packed page pagereference pagetype paragraph part periods placebookmarks placecombinedlist placecombinedlist placefloat placefootnotes placeformula placelegend placelist placelistoffloats placelistofsorts placelistofsynonyms placelocalfootnotes placelogos placeongrid placeontopofeachother placereferencelist placeregister placeregister placesidebyside placesubformula position processblocks processpage program publication quotation quote ran ref reference referral referraldate register reservefloat reset resetmarking resettextcontent rightaligned romannumerals rotate scale screen section seeregister selectblocks selectpaper selectversion settextcontent setupalign setuparranging setupbackground setupbackgrounds setupblackrules setupblank setupblock setupbodyfont setupbodyfontenvironment setupbottom setupbottomtexts setupbuffer setupbuttons setupcapitals setupcaption setupcaptions setupclipping setupcolor setupcolors setupcolumns setupcombinations setupcombinedlist setupcomment setupdescriptions setupenumerations setupexternalfigures setupfield setupfields setupfillinlines setupfillinrules setupfloat setupfloats setupfloatsplitting setupfonthandling setupfontsynonym setupfooter setupfootertexts setupfootnotedefinition setupfootnotes setupforms setupformulae setupframed setupframedtexts setuphead setupheader setupheadertexts setupheadnumber setupheads setupheadtext setuphyphenmark setupindentations setupindenting setupinmargin setupinteraction setupinteractionbar setupinteractionmenu setupinteractionscreen setupinterlinespace setupinterlinespace2 setupitemgroup setupitems setuplabeltext setuplanguage setuplayout setuplegend setuplinenumbering setuplines setuplinewidth setuplist setuplistalternative setupmakeup setupmarginblocks setupmarginrules setupmarking setupnarrower setupnumbering setupoppositeplacing setupoutput setuppagenumber setuppagenumbering setuppagetransitions setuppalet setuppaper setuppapersize setupparagraphnumbering setupparagraphs setuppositioning setupprofiles setupprograms setuppublications setupquote setupreferencelist setupreferencing setupregister setuprotate setupscreens setupsection setupsectionblock setupsorting setupspacing setupstrut setupsubpagenumber setupsymbolset setupsynchronization setupsynchronizationbar setupsynonyms setupsystem setuptab setuptables setuptabulate setuptext setuptextrules setuptexttexts setupthinrules setuptolerance setuptop setuptoptexts setuptype setuptyping setupunderbar setupurl setupversions setupwhitespace showbodyfont showbodyfontenvironment showcolor showcolorgroup showexternalfigures showfields showframe showgrid showlayout showmakeup showpalet showprint showsetups showstruts showsymbolset someline somewhere sort space splitfloat startalignment startbackground startbuffer startbuffer startcolor startcolumns startcombination startcomment startcomponent startdescription startdocument startenumeration startenvironment startfact startfigure startfloattext startformula startframedtext starthiding startinteractionmenu startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmarginrule startnamemakeup startnarrower startopposite startoverlay startoverview startpacked startparagraph startpositioning startpostponing startproduct startprofile startproject startquotation startregister startsymbolset startsynchronization starttable starttables starttabulate starttextrule starttyping startunpacked startversion stopalignment stopbackground stopbuffer stopbuffer stopcolor stopcolumns stopcombination stopcomment stopcomponent stopdescription stopdocument stopenumeration stopenvironment stopfact stopfigure stopfloattext stopformula stopframedtext stophiding stopinteractionmenu stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmarginrule stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stoppacked stopparagraph stoppositioning stoppostponing stopproduct stopprofile stopproject stopquotation stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptextrule stoptyping stopunpacked stopversion stretched sub subject subsection subsubject subsubsection subsubsubject switchtobodyfont sym symbol synchronizationbar synchronize synonym tab tex textreference textrule thinrule thinrules title tooltip translate typ type typebuffer typefile underbar underbars useURL useblocks usecommands usedirectory useencoding useexternaldocument useexternalfigure useexternalfile useexternalfiles useexternalsoundtrack usemodule usereferences usespecials usesymbols usetypescript usetypescriptfile version vl weekday whitespace wordright writebetweenlist writetolist writetoreferencelist writetoregister 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-fr-scite.properties b/Master/texmf-dist/context/data/scite/cont-fr-scite.properties
index caa7069dbb0..606be2efaba 100644
--- a/Master/texmf-dist/context/data/scite/cont-fr-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-fr-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.fr=\
-CAP Cap Caps Caractere Caracteres Chiffresromains \
-JOURSEMAINE MOIS MOT MOTS Mot Mots \
-a adaptedisposition ajustechamp alaligne alapage aligneadroite \
-aligneagauche aligneaumilieu appendix arriereplan baha barreinteraction \
-barresynchronisation bas bouton boutonsinteraction but cacheblocs \
-cap caractere caracteres champ changepolicecorps chapter \
-chem chiffresromains citation citer clip clonechamp \
-colonne commentaire comparegroupecouleur comparepalette completecombinedlist completelistoffloats \
-completelistofsorts completelistofsynonyms completeregistre composeenalinea concernant convertitnumero \
-copitchamp corrigeespaceblanc couleur couleurgrise coupledocument coupledregister \
-couplemarquage couplepapier coupleregistre crlf dactylographier dans \
-dansautremarge dansdroite dansgauche dansmarge date datecourante \
-daterecommandation de decouplemarquage definebodyfontDEF definebodyfontREF definedfont \
-definefontfeature definefonthandling defineframed defineframedtext definetypeface definit \
-definitbloc definitblocsection definitbuffer definitchamp definitcompoalinea definitconversion \
-definitcouleur definitdactylo definitdemarrestoppe definitdescription definitenumeration definitenvironnementpolicecorps \
-definitetiquette definitflottant definitformatreference definitgroupecouleur definitliste definitlisteimbriquee \
-definitlistereference definitlogo definitmakeup definitmarquage definitmenuinteraction definitmenuinteraction \
-definitnotepdp definitpalette definitparagraphes definitpilechamp definitpolice definitpolicecorps \
-definitprofil definitprogramme definitreference definitregistre definitrevetement definitsection \
-definitsortie definitsouschamp definitsymbole definitsymbolefigure definitsynonymepolice definitsynonymes \
-definittabulation definittaillepapier definittete definittexte definittrametableau definittri \
-definittype definitversion definitvide definitvide demarreciter deplacesurgrille \
-description determinecaracteristiqueliste determinenumerotete echelle ecran ecritdansliste \
-ecritdanslistereference ecritentreliste ecritregistre el element elements \
-emptylines enumeration espace espaceblanc espacesfixes etiquettes \
-etire fichierdactylo figureexterne forceblocs fraction framed \
-framedtext gardeblocs grille groupe haut hl \
-indentation inframed inhibemenuinteraction ininner inouter installelangue \
-joursemaine labeling labeltexte langue langueprincipale ligneh \
-lignenoire ligneregleetexte lignesnoires listesymbole loadsorts loadsynonyms \
-logchamp mapfontsize mar margereglee marquage marquageversion \
-marquepage mathematique mediaeval mois montrecadre montrechamps \
-montrecouleur montredisposition montreedition montreenvironnementpolicecorps montrefiguresexternes montregrille \
-montregroupecouleur montrejeusymboles montremakeup montrepalette montrepolicecorps montrereglages \
-montrestruts motdroit name nextsection nocap nop \
-note notepdp numeros numerotete numerotetecourant obtientmarquage \
-oriente overbar overbars page pagedouble paragraph \
-part pasplusdeblocs pasplusdefichiers periodes pilechamp placecoteacote \
-placeflottant placeformule placelegende placelesunsaudessusdesautres placeliste placelisteinmbriquee \
-placelisteinmbriquee placelistereference placelistoffloats placelistofsorts placelistofsynonyms placelogos \
-placemarquespages placenotespdp placenotespdplocales placeregistre placeregistre placesousformule \
-placesurgrille position prendbuffer programme publication qqpart \
-ran raz razmarquage recommandation ref reference \
-referencepage referencetexte reflete register reglealignement reglealineas \
-reglearrangement reglearriereplan reglearriereplans reglebarreinteraction reglebarresynchronisation reglebloc \
-regleblocmarge regleblocsection regleboutons reglebuffer reglecapitales reglechamp \
-reglechamps regleclipping reglecolonnes reglecombinaisons reglecommentaire reglecompoetroite \
-reglecomposeenalinea reglecouleur reglecouleurs regledactylo regledansmarge regledescriptions \
-regledisposition regleecraninteraction regleecrans regleelements regleencadre regleentete \
-regleenumerations regleenvironnementpolicecorps regleepaisseurligne regleespaceblanc regleespacement regleespacementinterligne \
-reglefiguresexternes regleflottant regleflottants regleformulaires regleformules regleinf \
-regleinteraction regleintitule regleintitules reglejeusymboles reglelabeltexte reglelangue \
-reglelegende reglelignes reglelignesnoires reglelignesreglestexte regleliste reglelisteimbriquee \
-reglelistereference reglemakeup reglemargereglee reglemarquage reglemarquagehyphenation reglemenuinteraction \
-reglenotepdp reglenumeropage reglenumerotation reglenumerotationligne reglenumerotationpage reglenumerotationparagraphe \
-reglenumerotete regleoriente reglepalette reglepapier regleparagraphes reglepdp \
-regleplacementopposition reglepolicecorps reglepositionnement regleprofils regleprogrammes reglepublications \
-reglereferencage regleregistre regleremplitligne regleremplitlignesreglees reglesection regleseparationflottant \
-reglesortie reglesouslignage reglesousnumeropage reglestrut reglesup reglesynchronisation \
-reglesynonymes reglesysteme regletab regletableaux regletabulation regletaillepapier \
-regletete regletetes regletexte regletextesentete regletextesinf regletextespdp \
-regletextessup regletextestexte regletextetete regletolerance regletraitsfins regletransitionspage \
-regletri regletype regleurl regleversions remplitchamp remplitligne \
-remplitlignesreglees remplittexte reservefloat resettextcontent sansalinea sansespace \
-sansespaceblanc sanslignesenteteetpdp sanslignessupetinf sansliste sansmarquage sauteblocs \
-section seeregister selectionneblocs selectionnepapier selectionneversion separeflottant \
-settext setupfonthandling setupfontsynonym setupframedtexts setupinterlinespace2 setupitemgroup \
-setuplistalternative sort sousligne souslignetout startalignment startarriereplan \
-startbuffer startbuffer startcitation startcolumns startcombination startcommentaire \
-startcomposant startcouleur startdescription startdocument startenumeration startenvironement \
-startfait startfigure startfloattext startformula startframedtext startgroupe \
-starthiding startitemgroup startlegend startligneregleetexte startline startlinecorrection \
-startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup \
-startmargereglee startmarginblock startmenuinteraction startnamemakeup startnarrower startopposite \
-startoverlay startoverview startparagraph startpositioning startpostponing startproduit \
-startprofile startprojet startregister startsymbolset startsynchronization starttable \
-starttables starttabulate starttyping startunpacked startversion stopalignment \
-stoparriereplan stopbuffer stopbuffer stopcitation stopcolumns stopcombination \
-stopcommentaire stopcomposant stopcouleur stopdescription stopdocument stopenumeration \
-stopenvironement stopfait stopfigure stopfloattext stopformula stopframedtext \
-stopgroupe stophiding stopitemgroup stoplegend stopligneregleetexte stopline \
-stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes \
-stopmakeup stopmargereglee stopmarginblock stopmenuinteraction stopnamemakeup stopnarrower \
-stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing \
-stopproduit stopprofile stopprojet stopsymbolset stopsynchronization stoptable \
-stoptables stoptabulate stoptyping stopunpacked stopversion sub \
-subject subsection subsubject subsubsection subsubsubject suggestion \
-suivantprofil suivantversion suivantversionprofil surligne surlignetout sym \
-symbole synchronise synonym tab tapebuffer tapepage \
-tete tex textemarge textenotepdp textetete title \
-traduire traiteblocs traitepage traitfin traitsfins typ \
-uneligne usedirectory usetypescript usetypescriptfile utiliseURL utiliseblocs \
-utilisecommandes utilisedocumentexterne utiliseencodage utilisefichierexterne utilisefichiersexternes utilisefigureexterne \
-utilisemodule utilisepsiteaudioexterne utilisereferences utilisespecialites utilisesymboles va \
-vaalaboite vaenbas version vide vl 
\ No newline at end of file
+keywordclass.macros.context.fr=CAP Cap Caps Caractere Caracteres Chiffresromains JOURSEMAINE MOIS MOT MOTS Mot Mots a adaptedisposition ajustechamp alaligne alapage aligneadroite aligneagauche aligneaumilieu appendix arriereplan baha barreinteraction barresynchronisation bas bouton boutonsinteraction but cacheblocs cap caractere caracteres champ changepolicecorps chapter chem chiffresromains citation citer clip clonechamp colonne commentaire comparegroupecouleur comparepalette completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregistre composeenalinea concernant convertitnumero copitchamp corrigeespaceblanc couleur couleurgrise coupledocument coupledregister couplemarquage couplepapier coupleregistre crlf dactylographier dans dansautremarge dansdroite dansgauche dansmarge date datecourante daterecommandation de decouplemarquage definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineframed defineframedtext definetypeface definit definitbloc definitblocsection definitbuffer definitchamp definitcompoalinea definitconversion definitcouleur definitdactylo definitdemarrestoppe definitdescription definitenumeration definitenvironnementpolicecorps definitetiquette definitflottant definitformatreference definitgroupecouleur definitliste definitlisteimbriquee definitlistereference definitlogo definitmakeup definitmarquage definitmenuinteraction definitmenuinteraction definitnotepdp definitpalette definitparagraphes definitpilechamp definitpolice definitpolicecorps definitprofil definitprogramme definitreference definitregistre definitrevetement definitsection definitsortie definitsouschamp definitsymbole definitsymbolefigure definitsynonymepolice definitsynonymes definittabulation definittaillepapier definittete definittexte definittrametableau definittri definittype definitversion definitvide definitvide demarreciter deplacesurgrille description determinecaracteristiqueliste determinenumerotete echelle ecran ecritdansliste ecritdanslistereference ecritentreliste ecritregistre el element elements emptylines enumeration espace espaceblanc espacesfixes etiquettes etire fichierdactylo figureexterne forceblocs fraction framed framedtext gardeblocs grille groupe haut hl indentation inframed inhibemenuinteraction ininner inouter installelangue joursemaine labeling labeltexte langue langueprincipale ligneh lignenoire ligneregleetexte lignesnoires listesymbole loadsorts loadsynonyms logchamp mapfontsize mar margereglee marquage marquageversion marquepage mathematique mediaeval mois montrecadre montrechamps montrecouleur montredisposition montreedition montreenvironnementpolicecorps montrefiguresexternes montregrille montregroupecouleur montrejeusymboles montremakeup montrepalette montrepolicecorps montrereglages montrestruts motdroit name nextsection nocap nop note notepdp numeros numerotete numerotetecourant obtientmarquage oriente overbar overbars overstrike overstrikes page pagedouble paragraph part pasplusdeblocs pasplusdefichiers periodes pilechamp placecoteacote placeflottant placeformule placelegende placelesunsaudessusdesautres placeliste placelisteinmbriquee placelisteinmbriquee placelistereference placelistoffloats placelistofsorts placelistofsynonyms placelogos placemarquespages placenotespdp placenotespdplocales placeregistre placeregistre placesousformule placesurgrille position prendbuffer programme publication qqpart ran raz razmarquage recommandation ref reference referencepage referencetexte reflete register reglealignement reglealineas reglearrangement reglearriereplan reglearriereplans reglebarreinteraction reglebarresynchronisation reglebloc regleblocmarge regleblocsection regleboutons reglebuffer reglecapitales reglechamp reglechamps regleclipping reglecolonnes reglecombinaisons reglecommentaire reglecompoetroite reglecomposeenalinea reglecouleur reglecouleurs regledactylo regledansmarge regledescriptions regledisposition regleecraninteraction regleecrans regleelements regleencadre regleentete regleenumerations regleenvironnementpolicecorps regleepaisseurligne regleespaceblanc regleespacement regleespacementinterligne reglefiguresexternes regleflottant regleflottants regleformulaires regleformules regleinf regleinteraction regleintitule regleintitules reglejeusymboles reglelabeltexte reglelangue reglelegende reglelignes reglelignesnoires reglelignesreglestexte regleliste reglelisteimbriquee reglelistereference reglemakeup reglemargereglee reglemarquage reglemarquagehyphenation reglemenuinteraction reglenotepdp reglenumeropage reglenumerotation reglenumerotationligne reglenumerotationpage reglenumerotationparagraphe reglenumerotete regleoriente reglepalette reglepapier regleparagraphes reglepdp regleplacementopposition reglepolicecorps reglepositionnement regleprofils regleprogrammes reglepublications reglereferencage regleregistre regleremplitligne regleremplitlignesreglees reglesection regleseparationflottant reglesortie reglesouslignage reglesousnumeropage reglestrut reglesup reglesynchronisation reglesynonymes reglesysteme regletab regletableaux regletabulation regletaillepapier regletete regletetes regletexte regletextesentete regletextesinf regletextespdp regletextessup regletextestexte regletextetete regletolerance regletraitsfins regletransitionspage regletri regletype regleurl regleversions remplitchamp remplitligne remplitlignesreglees remplittexte reservefloat resettextcontent sansalinea sansespace sansespaceblanc sanslignesenteteetpdp sanslignessupetinf sansliste sansmarquage sauteblocs section seeregister selectionneblocs selectionnepapier selectionneversion separeflottant settext setupfonthandling setupfontsynonym setupframedtexts setupinterlinespace2 setupitemgroup setuplistalternative sort startalignment startarriereplan startbuffer startbuffer startcitation startcolumns startcombination startcommentaire startcomposant startcouleur startdescription startdocument startenumeration startenvironement startfait startfigure startfloattext startformula startframedtext startgroupe starthiding startitemgroup startlegend startligneregleetexte startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmargereglee startmarginblock startmenuinteraction startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startproduit startprofile startprojet startregister startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversion stopalignment stoparriereplan stopbuffer stopbuffer stopcitation stopcolumns stopcombination stopcommentaire stopcomposant stopcouleur stopdescription stopdocument stopenumeration stopenvironement stopfait stopfigure stopfloattext stopformula stopframedtext stopgroupe stophiding stopitemgroup stoplegend stopligneregleetexte stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmargereglee stopmarginblock stopmenuinteraction stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopproduit stopprofile stopprojet stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversion sub subject subsection subsubject subsubsection subsubsubject suggestion suivantprofil suivantversion suivantversionprofil sym symbole synchronise synonym tab tapebuffer tapepage tete tex textemarge textenotepdp textetete title traduire traiteblocs traitepage traitfin traitsfins typ underbar underbars uneligne usedirectory usetypescript usetypescriptfile utiliseURL utiliseblocs utilisecommandes utilisedocumentexterne utiliseencodage utilisefichierexterne utilisefichiersexternes utilisefigureexterne utilisemodule utilisepsiteaudioexterne utilisereferences utilisespecialites utilisesymboles va vaalaboite vaenbas version vide vl 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-it-scite.properties b/Master/texmf-dist/context/data/scite/cont-it-scite.properties
index 0a6a31425f2..da5df24007d 100644
--- a/Master/texmf-dist/context/data/scite/cont-it-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-it-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.it=\
-CAP Cap Caps GIORNOSETTIMANA Lettera Lettere \
-MESE Numeriromani PAROLA PAROLE Parola Parole \
-accoppiacarta accoppiadocumento accoppiamarcatura accoppiapagina accoppiaregistro adattacampo \
-adattalayout al allineacentro allineadestra allineasinistra ap \
-apagina appendix barrainterazione barrasincronizzazione bastablocchi bastafile \
-cambiaafontdeltesto campi camporiempimento cap capello chapter \
-chim circondato citazione clip clonacampo colonna \
-colore coloregrigio commento completecombinedlist completelistoffloats completelistofsorts \
-completelistofsynonyms completeregister confrontagruppocolori confrontatavolozza convertinumero copiacampo \
-correggispaziobianco coupledregister crlf da daqualcheparte data \
-datadioggi datareferral definebodyfontDEF definebodyfontREF definedfont definefontfeature \
-definefonthandling definetypeface definisci definisciambientefontdeltesto definisciblocco definiscibloccosezione \
-definiscibuffer definiscicampo definiscicapoversi definiscicolore definisciconversione definiscidescrizione \
-definiscidimensionicarta definiscielenco definiscielencocombinato definiscienumerazione definiscietichetta definiscifigurasimbolo \
-definiscifont definiscifontdeltesto definisciformatoriferimento definiscigruppocolori definisciincorniciato definisciiniziatermina \
-definiscilistariferimenti definiscilogo definiscimakeup definiscimarcatura definiscimenuinterazione definiscimenuinterazione \
-definiscimodellotabella definiscioggettomobile definisciordinamento definiscioutput definisciprofilo definisciprogramma \
-definisciregistro definiscirientro definisciriferimento definiscirigovuoto definiscisezione definiscisimbolo \
-definiscisinonimi definiscisinonimofont definiscisottocampo definiscisovrapposizione definiscistackcampi definiscitabulato \
-definiscitavolozza definiscitesta definiscitesto definiscitestoincorniciato definiscitype definiscityping \
-definisciversion description determinacarattersticheelenco determinanumerotesta disabilitamenuinterazione el \
-elaborablocchi elaborapagina elementi elemento emptylines enumeration \
-etichette figuraesterna fondo forzablocchi framedtext frazione \
-giornosettimana griglia hl impaccato impostaallineamento impostaambientefontdeltesto \
-impostaampiezzariga impostabarrainterazione impostabarrasincronizzazione impostablocchimargine impostablocco impostabloccosezione \
-impostabuffer impostacampi impostacampo impostacapoversi impostacaption impostacaptions \
-impostacima impostaclippling impostacolonne impostacolore impostacolori impostacombinazioni \
-impostacommento impostadefinizionenotepdp impostadescrizioni impostadimensionicarta impostaelementi impostaelenco \
-impostaelencocombinato impostaenumerazioni impostafigureesterne impostafondo impostafontdeltesto impostaforms \
-impostaformule impostaincorniciato impostainmargine impostainstestazione impostainterazione impostainterlinea \
-impostalayout impostalegenda impostalineemargine impostalineenere impostalineeriempimento impostalineesottili \
-impostalineetesto impostalingua impostalistariferimenti impostamaiuscole impostamakeup impostamarcatura \
-impostamenuinterazione impostamenzione impostanotepdp impostanumerazione impostanumerazionecapoversi impostanumerazionepagina \
-impostanumerazionerighe impostanumeropagina impostanumerosottopagina impostanumerotesta impostaoggettimobili impostaoggettomobile \
-impostaordinamento impostaoutput impostaparranging impostapdp impostapiustretto impostaposizionamento \
-impostaposizionamentoopposti impostaprofili impostaprogrammi impostapubblicazioni impostapulsanti impostaregistro \
-impostarientri impostarientro impostariferimento impostarighe impostarigheriempimento impostarigovuoto \
-impostarotazione impostaschermi impostaschermointerazione impostasegnosillabazione impostasetsimboli impostasezione \
-impostasfondi impostasfondo impostasincronizzazione impostasinonimi impostasistema impostasottolinea \
-impostaspaziatura impostaspaziobianco impostaspezzamentooggettomobile impostastrut impostatab impostatabelle \
-impostatabulato impostatavolozza impostatesta impostateste impostatesticima impostatestifondo \
-impostatestiincorniciati impostatestiintestazioni impostatestipdp impostatesto impostatestoetichette impostatestointestazioni \
-impostatestotesti impostatolleranza impostatransizionepagina impostatype impostatyping impostaurl \
-impostaversioni in inaltromargine incorniciato indentation indestra \
-ininner inmargine inouter inriga insinistra installalingua \
-intorno labeling lettera lettere lineamargine lineanera \
-lineasottile lineatesto lineenere lineeriempimento lineesottili lingua \
-linguaprincipale listsymbol loadsorts loadsynonyms logcampi mapfontsize \
-mar marcatura marcaversione matematica mediaeval menzione \
-mese mettielenco mettielencocombinato mettielencocombinato mettifiancoafianco mettiformula \
-mettiingriglia mettilegenda mettiloghi mettinotepdp mettinotepdplocali mettiregistro \
-mettiregistro mettisegnalibro mettisottoformula mettiunosullaltro mostraambientefontdeltesto mostracampi \
-mostracolore mostracornice mostrafiguresterne mostrafontdeltesto mostragriglia mostragruppocolori \
-mostraimpostazioni mostralyout mostramakeup mostrasetsimboli mostrastampa mostrastruts \
-mostratavolozza name nascondiblocchi nextsection nienteelenco nientelineecimafondo \
-nientelineintestazionepdp nientemarcatura nienterientro nientespazio nientespaziobianco nocap \
-nop nota notapdp numeri numeriromani numerotesta \
-numerotestacorrente pagina paragraph paroladestra part ped \
-pedap placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist \
-posizione prendibuffer prendimarcatura programma pubblicazione pulsante \
-pulsantinterazione punti qualcheriga ran referral register \
-reimposta reimpostamarcatura reservefloat resettextcontent rientro rif \
-riferimento riferimentopagina riferimentotesto riflessione rigariempimento rigovuoto \
-ruota saltablocchi sbarrati sbarrato scala schermo \
-scrividentroelenco scriviinelenco scriviinlistariferimenti scriviinregistro section seeregister \
-segnalibro seguiprofilo seguiversione seguiversioneprofilo selezionablocchi selezionacarta \
-selezionaversione separamarcatura settext setupfonthandling setupfontsynonym setupinterlinespace2 \
-setupitemgroup setuplistalternative setuppaper sfondo sim simbolo \
-sincronizza sopralinea sopralinee sort sottolinea sottolinee \
-spazifissi spazio spaziobianco spezzaoggettomobile spostaagriglia stackcampi \
-startalignment startambiente startbuffer startbuffer startcitazione startcolore \
-startcolumns startcombination startcommento startcomponenet startdescription startdocument \
-startenumeration startfatto startfigure startfloattext startformula startframedtext \
-starthiding startimpaccato startitemgroup startlegend startline startlineamargine \
-startlineatesto startlinecorrection startlinenumbering startlines startlocal startlocalenvironment \
-startlocalfootnotes startmakeup startmarginblock startmenuinterattivo startnamemakeup startnarrower \
-startopposite startoverlay startoverview startparagraph startpositioning startpostponing \
-startprodotto startprofile startprogetto startregister startsfondo startsymbolset \
-startsynchronization starttable starttables starttabulate starttyping startunpacked \
-startversione stirato stopalignment stopambiente stopbuffer stopbuffer \
-stopcitazione stopcolore stopcolumns stopcombination stopcommento stopcomponenet \
-stopdescription stopdocument stopenumeration stopfatto stopfigure stopfloattext \
-stopformula stopframedtext stophiding stopimpaccato stopitemgroup stoplegend \
-stopline stoplineamargine stoplineatesto stoplinecorrection stoplinenumbering stoplines \
-stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmenuinterattivo \
-stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph \
-stoppositioning stoppostponing stopprodotto stopprofile stopprogetto stopsfondo \
-stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping \
-stopunpacked stopversione sub subject subsection subsubject \
-subsubsection subsubsubject synonym tab testa testoetichetta \
-testoinmargine testoinstestazioni testonotapdp testoriempimento tex tieniblocchi \
-tipopagina title tooltip traduci typ type \
-typebuffer typefile usaURL usablocco usacodifica usacolonnasonoraesterna \
-usacomandi usadocumentoesterno usafiguraesterna usafileesterni usafileesterno usamodulo \
-usariferimenti usasimboli usaspecialita usedirectory usetypescript usetypescriptfile \
-vaia vaiabox vaigiu versione vl 
\ No newline at end of file
+keywordclass.macros.context.it=CAP Cap Caps GIORNOSETTIMANA Lettera Lettere MESE Numeriromani PAROLA PAROLE Parola Parole accoppiacarta accoppiadocumento accoppiamarcatura accoppiapagina accoppiaregistro adattacampo adattalayout al allineacentro allineadestra allineasinistra ap apagina appendix barrainterazione barrasincronizzazione bastablocchi bastafile cambiaafontdeltesto campi camporiempimento cap capello chapter chim circondato citazione clip clonacampo colonna colore coloregrigio commento completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister confrontagruppocolori confrontatavolozza convertinumero copiacampo correggispaziobianco coupledregister crlf da daqualcheparte data datadioggi datareferral definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface definisci definisciambientefontdeltesto definisciblocco definiscibloccosezione definiscibuffer definiscicampo definiscicapoversi definiscicolore definisciconversione definiscidescrizione definiscidimensionicarta definiscielenco definiscielencocombinato definiscienumerazione definiscietichetta definiscifigurasimbolo definiscifont definiscifontdeltesto definisciformatoriferimento definiscigruppocolori definisciincorniciato definisciiniziatermina definiscilistariferimenti definiscilogo definiscimakeup definiscimarcatura definiscimenuinterazione definiscimenuinterazione definiscimodellotabella definiscioggettomobile definisciordinamento definiscioutput definisciprofilo definisciprogramma definisciregistro definiscirientro definisciriferimento definiscirigovuoto definiscisezione definiscisimbolo definiscisinonimi definiscisinonimofont definiscisottocampo definiscisovrapposizione definiscistackcampi definiscitabulato definiscitavolozza definiscitesta definiscitesto definiscitestoincorniciato definiscitype definiscityping definisciversion description determinacarattersticheelenco determinanumerotesta disabilitamenuinterazione el elaborablocchi elaborapagina elementi elemento emptylines enumeration etichette figuraesterna fondo forzablocchi framedtext frazione giornosettimana griglia hl impaccato impostaallineamento impostaambientefontdeltesto impostaampiezzariga impostabarrainterazione impostabarrasincronizzazione impostablocchimargine impostablocco impostabloccosezione impostabuffer impostacampi impostacampo impostacapoversi impostacaption impostacaptions impostacima impostaclippling impostacolonne impostacolore impostacolori impostacombinazioni impostacommento impostadefinizionenotepdp impostadescrizioni impostadimensionicarta impostaelementi impostaelenco impostaelencocombinato impostaenumerazioni impostafigureesterne impostafondo impostafontdeltesto impostaforms impostaformule impostaincorniciato impostainmargine impostainstestazione impostainterazione impostainterlinea impostalayout impostalegenda impostalineemargine impostalineenere impostalineeriempimento impostalineesottili impostalineetesto impostalingua impostalistariferimenti impostamaiuscole impostamakeup impostamarcatura impostamenuinterazione impostamenzione impostanotepdp impostanumerazione impostanumerazionecapoversi impostanumerazionepagina impostanumerazionerighe impostanumeropagina impostanumerosottopagina impostanumerotesta impostaoggettimobili impostaoggettomobile impostaordinamento impostaoutput impostaparranging impostapdp impostapiustretto impostaposizionamento impostaposizionamentoopposti impostaprofili impostaprogrammi impostapubblicazioni impostapulsanti impostaregistro impostarientri impostarientro impostariferimento impostarighe impostarigheriempimento impostarigovuoto impostarotazione impostaschermi impostaschermointerazione impostasegnosillabazione impostasetsimboli impostasezione impostasfondi impostasfondo impostasincronizzazione impostasinonimi impostasistema impostasottolinea impostaspaziatura impostaspaziobianco impostaspezzamentooggettomobile impostastrut impostatab impostatabelle impostatabulato impostatavolozza impostatesta impostateste impostatesticima impostatestifondo impostatestiincorniciati impostatestiintestazioni impostatestipdp impostatesto impostatestoetichette impostatestointestazioni impostatestotesti impostatolleranza impostatransizionepagina impostatype impostatyping impostaurl impostaversioni in inaltromargine incorniciato indentation indestra ininner inmargine inouter inriga insinistra installalingua intorno labeling lettera lettere lineamargine lineanera lineasottile lineatesto lineenere lineeriempimento lineesottili lingua linguaprincipale listsymbol loadsorts loadsynonyms logcampi mapfontsize mar marcatura marcaversione matematica mediaeval menzione mese mettielenco mettielencocombinato mettielencocombinato mettifiancoafianco mettiformula mettiingriglia mettilegenda mettiloghi mettinotepdp mettinotepdplocali mettiregistro mettiregistro mettisegnalibro mettisottoformula mettiunosullaltro mostraambientefontdeltesto mostracampi mostracolore mostracornice mostrafiguresterne mostrafontdeltesto mostragriglia mostragruppocolori mostraimpostazioni mostralyout mostramakeup mostrasetsimboli mostrastampa mostrastruts mostratavolozza name nascondiblocchi nextsection nienteelenco nientelineecimafondo nientelineintestazionepdp nientemarcatura nienterientro nientespazio nientespaziobianco nocap nop nota notapdp numeri numeriromani numerotesta numerotestacorrente overbar overbars overstrike overstrikes pagina paragraph paroladestra part ped pedap placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist posizione prendibuffer prendimarcatura programma pubblicazione pulsante pulsantinterazione punti qualcheriga ran referral register reimposta reimpostamarcatura reservefloat resettextcontent rientro rif riferimento riferimentopagina riferimentotesto riflessione rigariempimento rigovuoto ruota saltablocchi scala schermo scrividentroelenco scriviinelenco scriviinlistariferimenti scriviinregistro section seeregister segnalibro seguiprofilo seguiversione seguiversioneprofilo selezionablocchi selezionacarta selezionaversione separamarcatura settext setupfonthandling setupfontsynonym setupinterlinespace2 setupitemgroup setuplistalternative setuppaper sfondo sim simbolo sincronizza sort spazifissi spazio spaziobianco spezzaoggettomobile spostaagriglia stackcampi startalignment startambiente startbuffer startbuffer startcitazione startcolore startcolumns startcombination startcommento startcomponenet startdescription startdocument startenumeration startfatto startfigure startfloattext startformula startframedtext starthiding startimpaccato startitemgroup startlegend startline startlineamargine startlineatesto startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmenuinterattivo startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodotto startprofile startprogetto startregister startsfondo startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversione stirato stopalignment stopambiente stopbuffer stopbuffer stopcitazione stopcolore stopcolumns stopcombination stopcommento stopcomponenet stopdescription stopdocument stopenumeration stopfatto stopfigure stopfloattext stopformula stopframedtext stophiding stopimpaccato stopitemgroup stoplegend stopline stoplineamargine stoplineatesto stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmenuinterattivo stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodotto stopprofile stopprogetto stopsfondo stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversione sub subject subsection subsubject subsubsection subsubsubject synonym tab testa testoetichetta testoinmargine testoinstestazioni testonotapdp testoriempimento tex tieniblocchi tipopagina title tooltip traduci typ type typebuffer typefile underbar underbars usaURL usablocco usacodifica usacolonnasonoraesterna usacomandi usadocumentoesterno usafiguraesterna usafileesterni usafileesterno usamodulo usariferimenti usasimboli usaspecialita usedirectory usetypescript usetypescriptfile vaia vaiabox vaigiu versione vl 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-nl-scite.properties b/Master/texmf-dist/context/data/scite/cont-nl-scite.properties
index e3254a5b489..688c8a7c034 100644
--- a/Master/texmf-dist/context/data/scite/cont-nl-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-nl-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.nl=\
-CAP Cap Caps Letter Letters MAAND \
-Romeins WEEKDAG WOORD WOORDEN Woord Woorden \
-about achtergrond appendix bepaalkopnummer bepaallijstkenmerken blanko \
-blokje blokjes blokkeerinteractiemenu bookmark breuk but \
-button cap chapter chem cijfers citaat \
-citeer clip commentaar completecombinedlist completelistoffloats completelistofsorts \
-completelistofsynonyms converteernummer copieerveld corrigeerwitruimte coupledregister crlf \
-datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling \
-definetypeface definieer definieeralineas definieerbeeldmerk definieerblanko definieerblok \
-definieerbuffer definieerconversie definieerfiguursymbool definieerfont definieerfontsynoniem definieerinteractiemenu \
-definieerinteractiemenu definieerkadertekst definieerkleur definieerkleurgroep definieerkop definieerkorps \
-definieerkorpsomgeving definieerlijst definieermarkering definieeromlijnd definieeropmaak definieeroverlay \
-definieerpalet definieerpapierformaat definieerplaatsblok definieerprofiel definieerprogramma definieerreferentie \
-definieerreferentieformaat definieerreferentielijst definieerregister definieersamengesteldelijst definieersectie definieersectieblok \
-definieersorteren definieerstartstop definieersubveld definieersymbool definieersynoniemen definieertabelvorm \
-definieertabulatie definieertekst definieertype definieertypen definieeruitvoer definieerveld \
-definieerveldstapel definieerversie description doordefinieren doorlabelen doornummeren \
-doorspringen doorstreep doorstrepen dunnelijn dunnelijnen eenregel \
-enumeration ergens externfiguur forceerblokken framedtext gebruikURL \
-gebruikblokken gebruikcommandos gebruikexterndocument gebruikexternefile gebruikexternefiles gebruikexternfiguur \
-gebruikexterngeluidsfragment gebruikmodule gebruikreferenties gebruikspecials gebruiksymbolen gebruiktypescript \
-gebruiktypescriptfile geenblokkenmeer geenbovenenonderregels geenfilesmeer geenhoofdenvoetregels geenlijst \
-geenmarkering geenspatie geenwitruimte grijskleur haalbuffer haalmarkering \
-haarlijn handhaafblokken hl hoofdtaal hoog huidigedatum \
-huidigekopnummer in inanderemarge inbinnen inbuiten indentation \
-inlijnd inlinker inmarge inrechter inregel inspringen \
-installeertaal interactiebalk interactiebuttons invullijnen invulregel invultekst \
-invulveld items its kantlijn kenmerk kenmerkdatum \
-kleur kloonveld kolom kop kopnummer koppeldocument \
-koppelmarkering koppelpagina koppelpapier koppelregister koptekst laag \
-labeling labels labeltekst laho legeregels letter \
-letters lijstsymbool loadsorts loadsynonyms maand mapfontsize \
-mar margetekst markeer markeerversie mediaeval naar \
-naarbox name nextsection nietinspringen nocap noot \
-nop omlaag omlijnd onderstreep onderstrepen ontkoppelmarkering \
-op opelkaar oppagina overstreep overstrepen pagina \
-paginareferentie paragraph part paslayoutaan passeerblokken passendveld \
-plaatsbeeldmerken plaatsbookmarks plaatsformule plaatslegenda plaatslijst plaatslokalevoetnoten \
-plaatsnaastelkaar plaatsonderelkaar plaatsopgrid plaatsplaatsblok plaatsreferentielijst plaatsregister \
-plaatsregister plaatssamengesteldelijst plaatssamengesteldelijst plaatssubformule plaatsvoetnoten placelistoffloats \
-placelistofsorts placelistofsynonyms positioneer programma publicatie punten \
-ran ref referentie regellinks regelmidden regelrechts \
-register registreervelden reservefloat reset resetmarkering resettextcontent \
-romeins rooster roteer schaal scherm schrijfnaarlijst \
-schrijfnaarreferentielijst schrijfnaarregister schrijftussenlijst section seeregister selecteerblokken \
-selecteerpapier selecteerversie setupfonthandling setupfontsynonym setupinterlinespace2 setuplistalternative \
-som soortpagina sort spatie spiegel splitsplaatsblok \
-startachtergrond startalignment startbuffer startbuffer startcitaat startcolumns \
-startcombination startcommentaar startdescription startdocument startenumeration startfigure \
-startfloattext startformula startframedtext startgeg starthiding startinteractiemenu \
-startitemgroup startkantlijn startkleur startlegend startline startlinecorrection \
-startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup \
-startmarginblock startnamemakeup startnarrower startomgeving startonderdeel startopelkaar \
-startopposite startoverlay startoverview startparagraph startpositioning startpostponing \
-startprodukt startprofile startprojekt startregister startsymbolset startsynchronization \
-starttable starttables starttabulate starttekstlijn starttyping startunpacked \
-startversie stelachtergrondenin stelachtergrondin stelalineasin stelarrangerenin stelblankoin \
-stelblokin stelblokjesin stelblokkopjein stelblokkopjesin stelbovenin stelboventekstenin \
-stelbufferin stelbuttonsin stelciterenin stelclipin stelcombinatiesin stelcommentaarin \
-steldoordefinierenin steldoornummerenin steldoorspringenin steldunnelijnenin stelexternefigurenin stelformulesin \
-stelformulierenin stelhoofdin stelhoofdtekstenin stelinmargein stelinspringenin stelinteractiebalkin \
-stelinteractiein stelinteractiemenuin stelinteractieschermin stelinterliniein stelinvullijnenin stelinvulregelsin \
-stelitemgroepin stelitemsin stelkadertekstenin stelkantlijnin stelkapitalenin stelkleurenin \
-stelkleurin stelkolommenin stelkopin stelkopnummerin stelkoppeltekenin stelkoppenin \
-stelkoptekstin stelkorpsin stelkorpsomgevingin stellabeltekstin stellayoutin stellegendain \
-stellijndiktein stellijstin stelmargeblokkenin stelmarkeringin stelnaastplaatsenin stelnummerenin \
-stelomlijndin stelonderin stelonderstrepenin stelondertekstenin stelopmaakin stelpaginanummerin \
-stelpaginanummeringin stelpaginaovergangenin stelpaletin stelpapierformaatin stelpapierin stelparagraafnummerenin \
-stelplaatsblokin stelplaatsblokkenin stelplaatsbloksplitsenin stelpositionerenin stelprofielenin stelprogrammasin \
-stelpublicatiesin stelrastersin stelreferentielijstin stelrefererenin stelregelnummerenin stelregelsin \
-stelregisterin stelroterenin stelsamengesteldelijstin stelsectieblokin stelsectiein stelsmallerin \
-stelsorterenin stelspatieringin stelstrutin stelsubpaginanummerin stelsymboolsetin stelsynchronisatiebalkin \
-stelsynchronisatiein stelsynoniemenin stelsysteemin steltaalin steltabellenin steltabin \
-steltabulatiein steltekstin steltekstinhoudin steltekstlijnenin stelteksttekstenin steltolerantiein \
-steltypein steltypenin steluitlijnenin steluitvoerin stelurlin stelveldenin \
-stelveldin stelversiesin stelvoetin stelvoetnootdefinitiein stelvoetnotenin stelvoettekstenin \
-stelwitruimtein stopachtergrond stopalignment stopbuffer stopbuffer stopcitaat \
-stopcolumns stopcombination stopcommentaar stopdescription stopdocument stopenumeration \
-stopfigure stopfloattext stopformula stopframedtext stopgeg stophiding \
-stopinteractiemenu stopitemgroup stopkantlijn stopkleur stoplegend stopline \
-stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes \
-stopmakeup stopmarginblock stopnamemakeup stopnarrower stopomgeving stoponderdeel \
-stopopelkaar stopopposite stopoverlay stopoverview stopparagraph stoppositioning \
-stoppostponing stopprodukt stopprofile stopprojekt stopsymbolset stopsynchronization \
-stoptable stoptables stoptabulate stoptekstlijn stoptyping stopunpacked \
-stopversie sub subject subsection subsubject subsubsection \
-subsubsubject suggestie switchnaarkorps sym symbool synchronisatiebalk \
-synchroniseer synonym taal tab tekstlijn tekstreferentie \
-tex title toonexternefiguren toongrid tooninstellingen toonkader \
-toonkleur toonkleurgroep toonkorps toonkorpsomgeving toonlayout toonopmaak \
-toonpalet toonprint toonstruts toonsymboolset toonvelden typ \
-type typebuffer typefile uit uitgerekt usecodering \
-usedirectory vastespaties veld veldstapel verbergblokken vergelijkkleurgroep \
-vergelijkpalet verplaatsopgrid versie vertaal verwerkblokken verwerkpagina \
-vl voetnoot voetnoottekst volgprofiel volgprofielversie volgversie \
-volledigregister weekdag wiskunde witruimte woordrechts 
\ No newline at end of file
+keywordclass.macros.context.nl=CAP Cap Caps Letter Letters MAAND Romeins WEEKDAG WOORD WOORDEN Woord Woorden about achtergrond appendix bepaalkopnummer bepaallijstkenmerken blanko blokje blokjes blokkeerinteractiemenu bookmark breuk but button cap chapter chem cijfers citaat citeer clip commentaar completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms converteernummer copieerveld corrigeerwitruimte coupledregister crlf datum definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface definieer definieeralineas definieerbeeldmerk definieerblanko definieerblok definieerbuffer definieerconversie definieerfiguursymbool definieerfont definieerfontsynoniem definieerinteractiemenu definieerinteractiemenu definieerkadertekst definieerkleur definieerkleurgroep definieerkop definieerkorps definieerkorpsomgeving definieerlijst definieermarkering definieeromlijnd definieeropmaak definieeroverlay definieerpalet definieerpapierformaat definieerplaatsblok definieerprofiel definieerprogramma definieerreferentie definieerreferentieformaat definieerreferentielijst definieerregister definieersamengesteldelijst definieersectie definieersectieblok definieersorteren definieerstartstop definieersubveld definieersymbool definieersynoniemen definieertabelvorm definieertabulatie definieertekst definieertype definieertypen definieeruitvoer definieerveld definieerveldstapel definieerversie description doordefinieren doorlabelen doornummeren doorspringen dunnelijn dunnelijnen eenregel enumeration ergens externfiguur forceerblokken framedtext gebruikURL gebruikblokken gebruikcommandos gebruikexterndocument gebruikexternefile gebruikexternefiles gebruikexternfiguur gebruikexterngeluidsfragment gebruikmodule gebruikreferenties gebruikspecials gebruiksymbolen gebruiktypescript gebruiktypescriptfile geenblokkenmeer geenbovenenonderregels geenfilesmeer geenhoofdenvoetregels geenlijst geenmarkering geenspatie geenwitruimte grijskleur haalbuffer haalmarkering haarlijn handhaafblokken hl hoofdtaal hoog huidigedatum huidigekopnummer in inanderemarge inbinnen inbuiten indentation inlijnd inlinker inmarge inrechter inregel inspringen installeertaal interactiebalk interactiebuttons invullijnen invulregel invultekst invulveld items its kantlijn kenmerk kenmerkdatum kleur kloonveld kolom kop kopnummer koppeldocument koppelmarkering koppelpagina koppelpapier koppelregister koptekst laag labeling labels labeltekst laho legeregels letter letters lijstsymbool loadsorts loadsynonyms maand mapfontsize mar margetekst markeer markeerversie mediaeval naar naarbox name nextsection nietinspringen nocap noot nop omlaag omlijnd ontkoppelmarkering op opelkaar oppagina overbar overbars overstrike overstrikes pagina paginareferentie paragraph part paslayoutaan passeerblokken passendveld plaatsbeeldmerken plaatsbookmarks plaatsformule plaatslegenda plaatslijst plaatslokalevoetnoten plaatsnaastelkaar plaatsonderelkaar plaatsopgrid plaatsplaatsblok plaatsreferentielijst plaatsregister plaatsregister plaatssamengesteldelijst plaatssamengesteldelijst plaatssubformule plaatsvoetnoten placelistoffloats placelistofsorts placelistofsynonyms positioneer programma publicatie punten ran ref referentie regellinks regelmidden regelrechts register registreervelden reservefloat reset resetmarkering resettextcontent romeins rooster roteer schaal scherm schrijfnaarlijst schrijfnaarreferentielijst schrijfnaarregister schrijftussenlijst section seeregister selecteerblokken selecteerpapier selecteerversie setupfonthandling setupfontsynonym setupinterlinespace2 setuplistalternative som soortpagina sort spatie spiegel splitsplaatsblok startachtergrond startalignment startbuffer startbuffer startcitaat startcolumns startcombination startcommentaar startdescription startdocument startenumeration startfigure startfloattext startformula startframedtext startgeg starthiding startinteractiemenu startitemgroup startkantlijn startkleur startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startnamemakeup startnarrower startomgeving startonderdeel startopelkaar startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodukt startprofile startprojekt startregister startsymbolset startsynchronization starttable starttables starttabulate starttekstlijn starttyping startunpacked startversie stelachtergrondenin stelachtergrondin stelalineasin stelarrangerenin stelblankoin stelblokin stelblokjesin stelblokkopjein stelblokkopjesin stelbovenin stelboventekstenin stelbufferin stelbuttonsin stelciterenin stelclipin stelcombinatiesin stelcommentaarin steldoordefinierenin steldoornummerenin steldoorspringenin steldunnelijnenin stelexternefigurenin stelformulesin stelformulierenin stelhoofdin stelhoofdtekstenin stelinmargein stelinspringenin stelinteractiebalkin stelinteractiein stelinteractiemenuin stelinteractieschermin stelinterliniein stelinvullijnenin stelinvulregelsin stelitemgroepin stelitemsin stelkadertekstenin stelkantlijnin stelkapitalenin stelkleurenin stelkleurin stelkolommenin stelkopin stelkopnummerin stelkoppeltekenin stelkoppenin stelkoptekstin stelkorpsin stelkorpsomgevingin stellabeltekstin stellayoutin stellegendain stellijndiktein stellijstin stelmargeblokkenin stelmarkeringin stelnaastplaatsenin stelnummerenin stelomlijndin stelonderin stelonderstrepenin stelondertekstenin stelopmaakin stelpaginanummerin stelpaginanummeringin stelpaginaovergangenin stelpaletin stelpapierformaatin stelpapierin stelparagraafnummerenin stelplaatsblokin stelplaatsblokkenin stelplaatsbloksplitsenin stelpositionerenin stelprofielenin stelprogrammasin stelpublicatiesin stelrastersin stelreferentielijstin stelrefererenin stelregelnummerenin stelregelsin stelregisterin stelroterenin stelsamengesteldelijstin stelsectieblokin stelsectiein stelsmallerin stelsorterenin stelspatieringin stelstrutin stelsubpaginanummerin stelsymboolsetin stelsynchronisatiebalkin stelsynchronisatiein stelsynoniemenin stelsysteemin steltaalin steltabellenin steltabin steltabulatiein steltekstin steltekstinhoudin steltekstlijnenin stelteksttekstenin steltolerantiein steltypein steltypenin steluitlijnenin steluitvoerin stelurlin stelveldenin stelveldin stelversiesin stelvoetin stelvoetnootdefinitiein stelvoetnotenin stelvoettekstenin stelwitruimtein stopachtergrond stopalignment stopbuffer stopbuffer stopcitaat stopcolumns stopcombination stopcommentaar stopdescription stopdocument stopenumeration stopfigure stopfloattext stopformula stopframedtext stopgeg stophiding stopinteractiemenu stopitemgroup stopkantlijn stopkleur stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopnamemakeup stopnarrower stopomgeving stoponderdeel stopopelkaar stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodukt stopprofile stopprojekt stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptekstlijn stoptyping stopunpacked stopversie sub subject subsection subsubject subsubsection subsubsubject suggestie switchnaarkorps sym symbool synchronisatiebalk synchroniseer synonym taal tab tekstlijn tekstreferentie tex title toonexternefiguren toongrid tooninstellingen toonkader toonkleur toonkleurgroep toonkorps toonkorpsomgeving toonlayout toonopmaak toonpalet toonprint toonstruts toonsymboolset toonvelden typ type typebuffer typefile uit uitgerekt underbar underbars usecodering usedirectory vastespaties veld veldstapel verbergblokken vergelijkkleurgroep vergelijkpalet verplaatsopgrid versie vertaal verwerkblokken verwerkpagina vl voetnoot voetnoottekst volgprofiel volgprofielversie volgversie volledigregister weekdag wiskunde witruimte woordrechts 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-pe-scite.properties b/Master/texmf-dist/context/data/scite/cont-pe-scite.properties
index a9756b04c44..a1769572557 100644
--- a/Master/texmf-dist/context/data/scite/cont-pe-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-pe-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.pe=\
-CAP Cap Caps Character Characters MONTH \
-Romannumerals WEEKDAY WORD WORDS Word Words \
-appendix cap chapter chem completecombinedlist completelistoffloats \
-completelistofsorts completelistofsynonyms coupledregister crlf definebodyfontDEF definebodyfontREF \
-definedfont definefontfeature definefonthandling definetypeface description enumeration \
-framedtext indentation its labeling loadsorts loadsynonyms \
-mapfontsize mediaeval name nextsection nocap paragraph \
-part placelistoffloats placelistofsorts placelistofsynonyms ran register \
-reservefloat resettextcontent section seeregister setupcapitals setupfonthandling \
-setupfontsynonym setupinterlinespace2 setuplistalternative setupurl sort startalignment \
-startbuffer startbuffer startcolumns startcombination startdescription startdocument \
-startenumeration startfigure startfloattext startformula startframedtext starthiding \
-startitemgroup startlegend startline startlinecorrection startlinenumbering startlines \
-startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startnamemakeup \
-startnarrower startopposite startoverlay startoverview startparagraph startpositioning \
-startpostponing startprofile startregister startsymbolset startsynchronization starttable \
-starttables starttabulate starttyping startunpacked startتوضیح startتولید \
-startحقیقت startخط‌حاشیه startخط‌متن startرنگ startفشرده startمحیط \
-startمنوی‌پانل startمولفه startنسخه startنقل‌قول startپروژه startپس‌زمینه \
-stopalignment stopbuffer stopbuffer stopcolumns stopcombination stopdescription \
-stopdocument stopenumeration stopfigure stopfloattext stopformula stopframedtext \
-stophiding stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering \
-stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock \
-stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph \
-stoppositioning stoppostponing stopprofile stopsymbolset stopsynchronization stoptable \
-stoptables stoptabulate stoptyping stopunpacked stopتوضیح stopتولید \
-stopحقیقت stopخط‌حاشیه stopخط‌متن stopرنگ stopفشرده stopمحیط \
-stopمنوی‌پانل stopمولفه stopنسخه stopنقل‌قول stopپروژه stopپس‌زمینه \
-sub subject subsection subsubject subsubsection subsubsubject \
-synonym title tooltip typ useURL usedirectory \
-آیتم آیتمها آینه اجباربلوکها از ازکارانداختن‌منوی‌پانل \
-استفاده‌بلوکها استفاده‌دستخط‌تایپ استفاده‌رمزینه استفاده‌شکل‌خارجی استفاده‌فرمانها استفاده‌قطعه‌موزیک‌خارجی \
-استفاده‌مدول استفاده‌مرجعها استفاده‌نمادها استفاده‌نوشتارخارجی استفاده‌ویژگیها استفاده‌پرونده‌خارجی \
-استفاده‌پرونده‌دستخط‌تایپ استفاده‌پرونده‌های‌خارجی اعدادلاتین اما انتخاب‌برگ انتخاب‌بلوکها \
-انتخاب‌نسخه انتقال‌به‌توری بارگذاری‌آرایش بارگذاری‌آیتمها بارگذاری‌ارجاع بارگذاری‌اندازه‌برگ \
-بارگذاری‌باریکتر بارگذاری‌بافر بارگذاری‌بالا بارگذاری‌بخش بارگذاری‌بردباری بارگذاری‌برنامه‌ها \
-بارگذاری‌برگ بارگذاری‌بست بارگذاری‌بلوک بارگذاری‌بلوکهای‌حاشیه بارگذاری‌بلوک‌بخش بارگذاری‌تایپ \
-بارگذاری‌تایپ‌کردن بارگذاری‌تب بارگذاری‌ترتیب بارگذاری‌ترتیب بارگذاری‌ترکیب‌ها بارگذاری‌تطابق \
-بارگذاری‌تعریف‌پانوشت بارگذاری‌تنظیم بارگذاری‌ته‌برگ بارگذاری‌تورفتگی بارگذاری‌تورفتگیها بارگذاری‌توضیح \
-بارگذاری‌ثبت بارگذاری‌جدولها بارگذاری‌جدول‌بندی بارگذاری‌خالی بارگذاری‌خروجی بارگذاری‌خطها \
-بارگذاری‌خطهای‌حاشیه بارگذاری‌خطهای‌سیاه بارگذاری‌خطهای‌متن بارگذاری‌خطها‌ی‌نازک بارگذاری‌درج‌درخطها بارگذاری‌درج‌مخالف \
-بارگذاری‌درون‌حاشیه بارگذاری‌دوران بارگذاری‌دکمه‌ها بارگذاری‌راهنما بارگذاری‌رنگ بارگذاری‌رنگها \
-بارگذاری‌زبان بارگذاری‌ستونها بارگذاری‌سر بارگذاری‌سربرگ بارگذاری‌سرها بارگذاری‌سیستم \
-بارگذاری‌شرح بارگذاری‌شرح بارگذاری‌شرحها بارگذاری‌شماره‌زیرصفحه بارگذاری‌شماره‌سر بارگذاری‌شماره‌صفحه \
-بارگذاری‌شماره‌گذاری بارگذاری‌شماره‌گذاریها بارگذاری‌شماره‌گذاری‌صفحه بارگذاری‌شماره‌گذاری‌پاراگراف بارگذاری‌شماره‌‌گذاری‌خط بارگذاری‌شناور \
-بارگذاری‌شناورها بارگذاری‌شکافتن‌شناورها بارگذاری‌شکلهای‌خارجی بارگذاری‌طرح بارگذاری‌طرح‌بندی بارگذاری‌عرض‌خط \
-بارگذاری‌فاصله‌بین‌خط بارگذاری‌فرمولها بارگذاری‌فضای‌سفید بارگذاری‌فضا‌گذاری بارگذاری‌قالبی بارگذاری‌قلم‌متن \
-بارگذاری‌لوح بارگذاری‌لیست بارگذاری‌لیست‌ترکیبی بارگذاری‌لیست‌مرجع بارگذاری‌مترادفها بارگذاری‌متن \
-بارگذاری‌متنهای‌بالا بارگذاری‌متن‌سر بارگذاری‌متن‌سربرگ بارگذاری‌متن‌قالبی بارگذاری‌متن‌متنها بارگذاری‌متن‌پانوشت \
-بارگذاری‌متن‌پایین بارگذاری‌مجموعه‌نماد بارگذاری‌محیط‌قلم‌متن بارگذاری‌منوی‌پانل بارگذاری‌مکان‌گذاری بارگذاری‌میدان \
-بارگذاری‌میدانها بارگذاری‌میله‌تطابق بارگذاری‌میله‌زیر بارگذاری‌میله‌پانل بارگذاری‌نسخه‌ها بارگذاری‌نشانه‌شکستن \
-بارگذاری‌نشانه‌گذاری بارگذاری‌نشرها بارگذاری‌نقل بارگذاری‌پاراگرافها بارگذاری‌پانل بارگذاری‌پانوشتها \
-بارگذاری‌پایین بارگذاری‌پرده‌ها بارگذاری‌پرده‌پانل بارگذاری‌پروفایلها بارگذاری‌پرکردن‌خطها بارگذاری‌پس‌زمینه \
-بارگذاری‌پس‌زمینه‌ها بارگذاری‌چیدن بارگذاری‌گذارصفحه بارگذاری‌گروه‌آیتم بازنشانی بازنشانی‌نشانه‌گذاری \
-باگذاری‌متن‌برچسب بدون‌بلوکهای‌بیشتر بدون‌تورفتگی بدون‌خط‌بالاوپایین بدون‌خط‌سروته‌برگ بدون‌فایلهای‌بیشتر \
-بدون‌فضا بدون‌فضای‌سفید بدون‌لیست بدون‌نشانه‌گذاری برنامه بروبه \
-بروبه‌جعبه بروپایین برچسبها بلند بلوکهای‌پردازش بلوکها‌پنهان \
-بنویس‌بین‌لیست بنویس‌درثبت بنویس‌درلیست‌مرجع بنویس‌در‌لیست تاریخ تاریخ‌جاری \
-تاریخ‌رجوع تایپ تایپ‌بافر تایپ‌پرونده تب ترجمه \
-تطابق تعریف تعریف‌آرایش تعریف‌آرم تعریف‌الگوی‌جدول تعریف‌اندازه‌برگ \
-تعریف‌بافر تعریف‌بخش تعریف‌برنامه تعریف‌برچسب تعریف‌بلوک تعریف‌بلوک‌بخش \
-تعریف‌تایپ تعریف‌تایپ‌کردن تعریف‌تبدیل تعریف‌ترتیب تعریف‌توده‌میدان تعریف‌تورفتگی \
-تعریف‌ثبت تعریف‌جدول‌بندی تعریف‌خالی تعریف‌خروجی تعریف‌رنگ تعریف‌زیرمیدان \
-تعریف‌سر تعریف‌شرح تعریف‌شروع‌پایان تعریف‌شماره‌بندی تعریف‌شمایل‌مرجع تعریف‌شناور \
-تعریف‌قالبی تعریف‌قلم تعریف‌قلم‌متن تعریف‌لوح تعریف‌لیست تعریف‌لیست‌ترکیبی \
-تعریف‌لیست‌مرجع تعریف‌مترادفها تعریف‌مترادف‌قلم تعریف‌متن تعریف‌متن‌قالبی تعریف‌محیط‌قلم‌بدنه \
-تعریف‌مرجع تعریف‌منوی‌پانل تعریف‌منوی‌پانل تعریف‌میدان تعریف‌نسخه تعریف‌نشانه‌گذاری \
-تعریف‌نماد تعریف‌نمادشکل تعریف‌پاراگرافها تعریف‌پروفایل تعریف‌پوشش تعریف‌گروه‌رنگ \
-تعیین‌شماره‌سر تعیین‌محتوای‌متن تعیین‌مشخصات‌لیست تغییربه‌قلم‌بدنه تنظیم‌راست تنظیم‌طرح‌بندی \
-تنظیم‌وسط تورفتگی توری توضیح تک ثبت‌زوج \
-ثبت‌کامل جداسازی‌نشانه‌گذاری حاش حرف حرفها حفظ‌بلوکها \
-خالی خطهای‌سیاه خطهای‌نازک خطها‌خالی خط‌حاشیه خط‌زدن \
-خط‌زدنها خط‌سیاه خط‌متن خط‌مو خط‌نازک خ‌ا \
-خ‌ع در درج‌آرمها درج‌ثبت درج‌ثبت درج‌درخط \
-درج‌درخطها درج‌درمتن درج‌درمیدان درج‌در‌بالای‌یکدیگر درج‌در‌توری درج‌راهنما \
-درج‌زیرفرمول درج‌شناور درج‌فرمول درج‌لیست درج‌لیست‌مختلط درج‌لیست‌مختلط \
-درج‌لیست‌مرجع درج‌پانوشتها درج‌پانوشتهای‌موضعی درج‌چوب‌خط درج‌کنار‌به‌کنار درحاشیه \
-درحاشیه‌دیگر درخارجی درخط درداخلی درراست درصفحه \
-درقالبی درمورد درون درچپ دریافت‌بافر دریافت‌نشانه \
-دوران دکمه دکمه‌پانل رج رجوع رنگ \
-رنگ‌خاکستری روزهفته ریاضی زبان زبان‌اصلی ستون \
-سر شماره‌سر شماره‌سرجاری شماره‌مبدل شماره‌ها شکافتن‌شناور \
-شکل‌خارجی صفحه صفحه‌زوج صفحه‌پردازش عبوربلوکها فشرده \
-فضا فضاهای‌ثابت فضای‌سفید فضای‌سفیدصحیح قالبی لوح‌مقایسه \
-ماه متن‌برچسب متن‌حاشیه متن‌سر متن‌پانوشت مرجع \
-مرجع‌صفحه مرجع‌متن مقایسه‌گروه‌رنگ مقیاس منفی مکان \
-میدان میدانهای‌گزارش میدان‌شبیه‌سازی میدان‌پشته میدان‌کپی میله‌تطابق \
-میله‌رو میله‌زیر میله‌ها‌رو میله‌پانل میله‌‌های‌زیر نسخه \
-نسخه‌نشانه نشانه‌گذاری نشانه‌گذاری‌زوج نشر نصب‌زبان نقطه‌ها \
-نقل نقل‌قول نم نماد نمادلیست نمایش‌آرایش \
-نمایش‌بارگذاریها نمایش‌بستها نمایش‌توری نمایش‌رنگ نمایش‌شکلهای‌خارجی نمایش‌طرح‌بندی \
-نمایش‌قالب نمایش‌قلم‌بدنه نمایش‌لوح نمایش‌مجموعه‌علامت نمایش‌محیط‌قلم‌بدنه نمایش‌میدانها \
-نمایش‌چاپ نمایش‌گروه‌رنگ نوشتارزوج نوع‌صفحه پابا پانوشت \
-پایین پرده پرکردن‌میدان پس‌زمینه پیروی‌نسخه پیروی‌نسخه‌پروفایل \
-پیروی‌پروفایل چوبخط چپ‌چین کاغذزوج کسر کشیده \
-کلمه‌راست گیره یادداشت یک‌جا یک‌خط 
\ No newline at end of file
+keywordclass.macros.context.pe=CAP Cap Caps Character Characters MONTH Romannumerals WEEKDAY WORD WORDS Word Words appendix cap chapter chem completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms coupledregister crlf definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling definetypeface description enumeration framedtext indentation its labeling loadsorts loadsynonyms mapfontsize mediaeval name nextsection nocap overbar overbars overstrike overstrikes paragraph part placelistoffloats placelistofsorts placelistofsynonyms ran register reservefloat resettextcontent section seeregister setupcapitals setupfonthandling setupfontsynonym setupinterlinespace2 setuplistalternative setupurl sort startalignment startbuffer startbuffer startcolumns startcombination startdescription startdocument startenumeration startfigure startfloattext startformula startframedtext starthiding startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprofile startregister startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startتوضیح startتولید startحقیقت startخط‌حاشیه startخط‌متن startرنگ startفشرده startمحیط startمنوی‌پانل startمولفه startنسخه startنقل‌قول startپروژه startپس‌زمینه stopalignment stopbuffer stopbuffer stopcolumns stopcombination stopdescription stopdocument stopenumeration stopfigure stopfloattext stopformula stopframedtext stophiding stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprofile stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopتوضیح stopتولید stopحقیقت stopخط‌حاشیه stopخط‌متن stopرنگ stopفشرده stopمحیط stopمنوی‌پانل stopمولفه stopنسخه stopنقل‌قول stopپروژه stopپس‌زمینه sub subject subsection subsubject subsubsection subsubsubject synonym title tooltip typ underbar underbars useURL usedirectory آیتم آیتمها آینه اجباربلوکها از ازکارانداختن‌منوی‌پانل استفاده‌بلوکها استفاده‌دستخط‌تایپ استفاده‌رمزینه استفاده‌شکل‌خارجی استفاده‌فرمانها استفاده‌قطعه‌موزیک‌خارجی استفاده‌مدول استفاده‌مرجعها استفاده‌نمادها استفاده‌نوشتارخارجی استفاده‌ویژگیها استفاده‌پرونده‌خارجی استفاده‌پرونده‌دستخط‌تایپ استفاده‌پرونده‌های‌خارجی اعدادلاتین اما انتخاب‌برگ انتخاب‌بلوکها انتخاب‌نسخه انتقال‌به‌توری بارگذاری‌آرایش بارگذاری‌آیتمها بارگذاری‌ارجاع بارگذاری‌اندازه‌برگ بارگذاری‌باریکتر بارگذاری‌بافر بارگذاری‌بالا بارگذاری‌بخش بارگذاری‌بردباری بارگذاری‌برنامه‌ها بارگذاری‌برگ بارگذاری‌بست بارگذاری‌بلوک بارگذاری‌بلوکهای‌حاشیه بارگذاری‌بلوک‌بخش بارگذاری‌تایپ بارگذاری‌تایپ‌کردن بارگذاری‌تب بارگذاری‌ترتیب بارگذاری‌ترتیب بارگذاری‌ترکیب‌ها بارگذاری‌تطابق بارگذاری‌تعریف‌پانوشت بارگذاری‌تنظیم بارگذاری‌ته‌برگ بارگذاری‌تورفتگی بارگذاری‌تورفتگیها بارگذاری‌توضیح بارگذاری‌ثبت بارگذاری‌جدولها بارگذاری‌جدول‌بندی بارگذاری‌خالی بارگذاری‌خروجی بارگذاری‌خطها بارگذاری‌خطهای‌حاشیه بارگذاری‌خطهای‌سیاه بارگذاری‌خطهای‌متن بارگذاری‌خطها‌ی‌نازک بارگذاری‌درج‌درخطها بارگذاری‌درج‌مخالف بارگذاری‌درون‌حاشیه بارگذاری‌دوران بارگذاری‌دکمه‌ها بارگذاری‌راهنما بارگذاری‌رنگ بارگذاری‌رنگها بارگذاری‌زبان بارگذاری‌ستونها بارگذاری‌سر بارگذاری‌سربرگ بارگذاری‌سرها بارگذاری‌سیستم بارگذاری‌شرح بارگذاری‌شرح بارگذاری‌شرحها بارگذاری‌شماره‌زیرصفحه بارگذاری‌شماره‌سر بارگذاری‌شماره‌صفحه بارگذاری‌شماره‌گذاری بارگذاری‌شماره‌گذاریها بارگذاری‌شماره‌گذاری‌صفحه بارگذاری‌شماره‌گذاری‌پاراگراف بارگذاری‌شماره‌‌گذاری‌خط بارگذاری‌شناور بارگذاری‌شناورها بارگذاری‌شکافتن‌شناورها بارگذاری‌شکلهای‌خارجی بارگذاری‌طرح بارگذاری‌طرح‌بندی بارگذاری‌عرض‌خط بارگذاری‌فاصله‌بین‌خط بارگذاری‌فرمولها بارگذاری‌فضای‌سفید بارگذاری‌فضا‌گذاری بارگذاری‌قالبی بارگذاری‌قلم‌متن بارگذاری‌لوح بارگذاری‌لیست بارگذاری‌لیست‌ترکیبی بارگذاری‌لیست‌مرجع بارگذاری‌مترادفها بارگذاری‌متن بارگذاری‌متنهای‌بالا بارگذاری‌متن‌سر بارگذاری‌متن‌سربرگ بارگذاری‌متن‌قالبی بارگذاری‌متن‌متنها بارگذاری‌متن‌پانوشت بارگذاری‌متن‌پایین بارگذاری‌مجموعه‌نماد بارگذاری‌محیط‌قلم‌متن بارگذاری‌منوی‌پانل بارگذاری‌مکان‌گذاری بارگذاری‌میدان بارگذاری‌میدانها بارگذاری‌میله‌تطابق بارگذاری‌میله‌زیر بارگذاری‌میله‌پانل بارگذاری‌نسخه‌ها بارگذاری‌نشانه‌شکستن بارگذاری‌نشانه‌گذاری بارگذاری‌نشرها بارگذاری‌نقل بارگذاری‌پاراگرافها بارگذاری‌پانل بارگذاری‌پانوشتها بارگذاری‌پایین بارگذاری‌پرده‌ها بارگذاری‌پرده‌پانل بارگذاری‌پروفایلها بارگذاری‌پرکردن‌خطها بارگذاری‌پس‌زمینه بارگذاری‌پس‌زمینه‌ها بارگذاری‌چیدن بارگذاری‌گذارصفحه بارگذاری‌گروه‌آیتم بازنشانی بازنشانی‌نشانه‌گذاری باگذاری‌متن‌برچسب بدون‌بلوکهای‌بیشتر بدون‌تورفتگی بدون‌خط‌بالاوپایین بدون‌خط‌سروته‌برگ بدون‌فایلهای‌بیشتر بدون‌فضا بدون‌فضای‌سفید بدون‌لیست بدون‌نشانه‌گذاری برنامه بروبه بروبه‌جعبه بروپایین برچسبها بلند بلوکهای‌پردازش بلوکها‌پنهان بنویس‌بین‌لیست بنویس‌درثبت بنویس‌درلیست‌مرجع بنویس‌در‌لیست تاریخ تاریخ‌جاری تاریخ‌رجوع تایپ تایپ‌بافر تایپ‌پرونده تب ترجمه تطابق تعریف تعریف‌آرایش تعریف‌آرم تعریف‌الگوی‌جدول تعریف‌اندازه‌برگ تعریف‌بافر تعریف‌بخش تعریف‌برنامه تعریف‌برچسب تعریف‌بلوک تعریف‌بلوک‌بخش تعریف‌تایپ تعریف‌تایپ‌کردن تعریف‌تبدیل تعریف‌ترتیب تعریف‌توده‌میدان تعریف‌تورفتگی تعریف‌ثبت تعریف‌جدول‌بندی تعریف‌خالی تعریف‌خروجی تعریف‌رنگ تعریف‌زیرمیدان تعریف‌سر تعریف‌شرح تعریف‌شروع‌پایان تعریف‌شماره‌بندی تعریف‌شمایل‌مرجع تعریف‌شناور تعریف‌قالبی تعریف‌قلم تعریف‌قلم‌متن تعریف‌لوح تعریف‌لیست تعریف‌لیست‌ترکیبی تعریف‌لیست‌مرجع تعریف‌مترادفها تعریف‌مترادف‌قلم تعریف‌متن تعریف‌متن‌قالبی تعریف‌محیط‌قلم‌بدنه تعریف‌مرجع تعریف‌منوی‌پانل تعریف‌منوی‌پانل تعریف‌میدان تعریف‌نسخه تعریف‌نشانه‌گذاری تعریف‌نماد تعریف‌نمادشکل تعریف‌پاراگرافها تعریف‌پروفایل تعریف‌پوشش تعریف‌گروه‌رنگ تعیین‌شماره‌سر تعیین‌محتوای‌متن تعیین‌مشخصات‌لیست تغییربه‌قلم‌بدنه تنظیم‌راست تنظیم‌طرح‌بندی تنظیم‌وسط تورفتگی توری توضیح تک ثبت‌زوج ثبت‌کامل جداسازی‌نشانه‌گذاری حاش حرف حرفها حفظ‌بلوکها خالی خطهای‌سیاه خطهای‌نازک خطها‌خالی خط‌حاشیه خط‌سیاه خط‌متن خط‌مو خط‌نازک خ‌ا خ‌ع در درج‌آرمها درج‌ثبت درج‌ثبت درج‌درخط درج‌درخطها درج‌درمتن درج‌درمیدان درج‌در‌بالای‌یکدیگر درج‌در‌توری درج‌راهنما درج‌زیرفرمول درج‌شناور درج‌فرمول درج‌لیست درج‌لیست‌مختلط درج‌لیست‌مختلط درج‌لیست‌مرجع درج‌پانوشتها درج‌پانوشتهای‌موضعی درج‌چوب‌خط درج‌کنار‌به‌کنار درحاشیه درحاشیه‌دیگر درخارجی درخط درداخلی درراست درصفحه درقالبی درمورد درون درچپ دریافت‌بافر دریافت‌نشانه دوران دکمه دکمه‌پانل رج رجوع رنگ رنگ‌خاکستری روزهفته ریاضی زبان زبان‌اصلی ستون سر شماره‌سر شماره‌سرجاری شماره‌مبدل شماره‌ها شکافتن‌شناور شکل‌خارجی صفحه صفحه‌زوج صفحه‌پردازش عبوربلوکها فشرده فضا فضاهای‌ثابت فضای‌سفید فضای‌سفیدصحیح قالبی لوح‌مقایسه ماه متن‌برچسب متن‌حاشیه متن‌سر متن‌پانوشت مرجع مرجع‌صفحه مرجع‌متن مقایسه‌گروه‌رنگ مقیاس منفی مکان میدان میدانهای‌گزارش میدان‌شبیه‌سازی میدان‌پشته میدان‌کپی میله‌تطابق میله‌پانل نسخه نسخه‌نشانه نشانه‌گذاری نشانه‌گذاری‌زوج نشر نصب‌زبان نقطه‌ها نقل نقل‌قول نم نماد نمادلیست نمایش‌آرایش نمایش‌بارگذاریها نمایش‌بستها نمایش‌توری نمایش‌رنگ نمایش‌شکلهای‌خارجی نمایش‌طرح‌بندی نمایش‌قالب نمایش‌قلم‌بدنه نمایش‌لوح نمایش‌مجموعه‌علامت نمایش‌محیط‌قلم‌بدنه نمایش‌میدانها نمایش‌چاپ نمایش‌گروه‌رنگ نوشتارزوج نوع‌صفحه پابا پانوشت پایین پرده پرکردن‌میدان پس‌زمینه پیروی‌نسخه پیروی‌نسخه‌پروفایل پیروی‌پروفایل چوبخط چپ‌چین کاغذزوج کسر کشیده کلمه‌راست گیره یادداشت یک‌جا یک‌خط 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/cont-ro-scite.properties b/Master/texmf-dist/context/data/scite/cont-ro-scite.properties
index da9af1b3ae1..47fd2b9c3ce 100644
--- a/Master/texmf-dist/context/data/scite/cont-ro-scite.properties
+++ b/Master/texmf-dist/context/data/scite/cont-ro-scite.properties
@@ -1,97 +1 @@
-keywordclass.macros.context.ro=\
-CAP CUVANT CUVINTE Cap Caps Cuvant \
-Cuvinte LUNA Litera Litere Numereromane ZIDINSAPTAMANA \
-adapteazaaspect adubuffer adumarcaje afiseazaaspect afiseazacampuri afiseazaculoare \
-afiseazafiguriexterne afiseazafonttext afiseazagrid afiseazagrupculoare afiseazamakeup afiseazamediufonttext \
-afiseazapaleta afiseazarama afiseazasetari afiseazasetsimboluri afiseazastruts afiseazatiparire \
-aliniat aliniatcentru aliniatdreapta aliniatstanga appendix ascundeblocuri \
-barainteractiune barasincronizare barasus blanc but butoaneinteractiune \
-buton camp campumplere cap chapter chem \
-citat clip cloneazacamp coloana comentariu comparagrupculoare \
-comparapaleta completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister \
-convertestenumar copiazacamp corecteazaspatiualb coupledregister crlf culoare \
-culoaregri cupleazadocument cupleazamarcaje cupleazaregistru cuvantdreapta data \
-datacurenta datareferit decupleazamarcaje definebodyfontDEF definebodyfontREF definedfont \
-definefontfeature definefonthandling defineste definestealiat definesteantet definesteblanc \
-definestebloc definesteblocsectiune definestebuffer definestecamp definesteconversie definesteculoare \
-definestedescriere definestedimensiunehartie definesteenumerare definesteeticheta definestefloat definestefont \
-definestefonttext definesteformatreferinte definestegrupculori definesteinconjurare definestelista definestelistacombinata \
-definestelistareferinte definestelogo definestemakeup definestemarcaje definestemediulfonttext definestemeniuinteractiune \
-definestemeniuinteractiune definesteoutput definesteoverlay definestepaleta definesteparagraf definesteprofil \
-definesteprogram definestereferinte definesteregistru definestesablontabel definestesectiune definestesimbol \
-definestesimbolfigura definestesinonim definestesinonimfont definestesortare definestestartstop definestestivacampuri \
-definestesubcamp definestetabulatori definestetext definestetexteinconjurate definestetextinconjurat definestetyping \
-definesteversiune definetype definetypeface description despre determinacaracteristicilelistei \
-determinanumartitlu dezactiveazameniuinteractiune din dute dutebox ecran \
-el element element emptylines enumeration etichete \
-faraaliniat farafisiere faraliniiantetsisubsol faraliniisussijos faralista faramarcaje \
-faraspatiu faraspatiualb figuraexterna firdepar folosesteURL folosestebloc \
-folosestecodificarea folosestecomenzi folosestedocumentextern folosestefiguraexterna folosestefisiereexterne folosestefisierextern \
-folosestemodul folosestemuzicaexterna folosestereferinte folosestesimboluri folosestespeciale footnotetext \
-forteazablocuri fractie framed framedtext fundal gatablocuri \
-grid hartiedubla hl impachetat impartefloat in \
-inalt inaltamargine indentation indreapta inframed ininner \
-injos inlinie inouter instalarelimba instanga intins \
-jos jossus la labeling lapagina limba \
-limbaprincipala liniemargine linieneagra liniepeste liniesubtire linieumplere \
-liniinegre liniipeste liniisubtiri listsymbol litera litere \
-loadsorts loadsynonyms logcampuri luna mapfontsize mar \
-marcaje marcheazaversiune marginal matematica mediaeval minicitat \
-mutapegrid name nextsection nocap nop nota \
-notasubsol numartitlu numartitlucurent numere numereromane olinie \
-pagina paginadubla paragraph part pastreazablocuri placefloat \
-placelistoffloats placelistofsorts placelistofsynonyms placereferencelist plaseazapegrid plaseazasemnecarte \
-potrivestecamp pozitie proceseazabloc proceseazapagina program publicatie \
-puncte punedeasuprafiecareia punefatainfata puneformula punelegenda punelista \
-punelistacombinata punelistacombinata punelogouri punenotesubsol punenotesubsollocale puneregistru \
-puneregistru punesubformula ran ref referinta referintapagina \
-referintatext referit reflexie register reservefloat reset \
-reseteazamarcaje resettextcontent riglatext rigleumplere roteste saripesteblocuri \
-scala scriebuffer scrieinlista scrieinlistareferinte scrieinregistru scrieintreliste \
-section seeregister selecteazablocuri selecteazahartie selecteazaversiune semncarte \
-setarebarasincronizare setarelimba setareoutput setarepozitie setaresincronizare seteazaaliniat \
-seteazaaliniate seteazaalinierea seteazaantet seteazaaranjareapag seteazaaspect seteazabarainteractiune \
-seteazablanc seteazabloc seteazablocsectiune seteazablocurimarginale seteazabuffer seteazabutoane \
-seteazacamp seteazacampuri seteazaclipping seteazacoloane seteazacombinari seteazacomentariu \
-seteazaculoare seteazaculori seteazadefinireanotasubsol seteazadescriere seteazadimensiunihartie seteazaecrane \
-seteazaecraninteractiune seteazaelemente seteazaenumerare seteazafiguriexterne seteazafloat seteazafloats \
-seteazafonttext seteazaformulare seteazaformule seteazafundal seteazafundaluri seteazagrosimelinie \
-seteazaimpartireafloat seteazainconjurat seteazaingust seteazainteractiunea seteazajos seteazalegenda \
-seteazalegenda seteazalegendele seteazaliniesilabe seteazaliniesubtire seteazalinii seteazaliniimargine \
-seteazaliniinegre seteazaliniiumplere seteazalista seteazalistacombinata seteazalistareferinte seteazamajuscule \
-seteazamakeup seteazamarcaje seteazamarginal seteazamediulfonttext seteazameniuinteractiune seteazaminicitat \
-seteazanotasubsol seteazanumarpagina seteazanumarsubpagina seteazanumartitlu seteazanumerotare seteazanumerotarelinii \
-seteazanumerotarepagina seteazanumerotareparagrafe seteazapaleta seteazaparagrafe seteazaplasareaopozita seteazaprofile \
-seteazaprograme seteazapublicatii seteazareferinte seteazaregistru seteazarigletext seteazarigleumplere \
-seteazarotare seteazasectiune seteazasimbol seteazasinonime seteazasistem seteazasortare \
-seteazaspatiu seteazaspatiualb seteazaspatiuinterliniar seteazastrut seteazasublinie seteazasubsol \
-seteazasus seteazatab seteazatabele seteazatabulatori seteazatext seteazatexteantet \
-seteazatextejos seteazatextesubsol seteazatextesus seteazatextetext seteazatexteticheta seteazatexttitlu \
-seteazatitlu seteazatitluri seteazatoleranta seteazatranzitiepagina seteazatype seteazatyping \
-seteazaurl seteazaversiuni settextcontent setupfonthandling setupfontsynonym setupinterlinespace2 \
-setupitemgroup setuplistalternative setuppaper sim simbol sincronizeaza \
-sort spatiifixate spatiu spatiualb startalignment startbuffer \
-startbuffer startcitat startcolumns startcombination startcomentariu startcomponenta \
-startculoare startdescription startdocument startenumeration startfact startfigure \
-startfloattext startformula startframedtext startfundal starthiding startimpachetat \
-startitemgroup startlegend startline startlinecorrection startlinenumbering startlines \
-startliniemargine startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock \
-startmediu startmeniuinteractiune startnamemakeup startnarrower startopposite startoverlay \
-startoverview startparagraph startpositioning startpostponing startprodus startprofile \
-startproiect startregister startriglatext startsymbolset startsynchronization starttable \
-starttables starttabulate starttyping startunpacked startversiune stivacampuri \
-stopalignment stopbuffer stopbuffer stopcitat stopcolumns stopcombination \
-stopcomentariu stopcomponenta stopculoare stopdescription stopdocument stopenumeration \
-stopfact stopfigure stopfloattext stopformula stopframedtext stopfundal \
-stophiding stopimpachetat stopitemgroup stoplegend stopline stoplinecorrection \
-stoplinenumbering stoplines stopliniemargine stoplocal stoplocalenvironment stoplocalfootnotes \
-stopmakeup stopmarginblock stopmediu stopmeniuinteractiune stopnamemakeup stopnarrower \
-stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing \
-stopprodus stopprofile stopproiect stopriglatext stopsymbolset stopsynchronization \
-stoptable stoptables stoptabulate stoptyping stopunpacked stopversiune \
-sub subject sublinie sublinii subsection subsubject \
-subsubsection subsubsubject supralinie synonym tab tex \
-texteticheta textmarginal texttitlu textumplere tippagina title \
-titlu tooltip traduce trecilafonttext typ type \
-typefile undeva urmeazaprofil urmeazaversiune urmeazaversiuneprofil usedirectory \
-usetypescript usetypescriptfile versiune vl zidinsaptamana 
\ No newline at end of file
+keywordclass.macros.context.ro=CAP CUVANT CUVINTE Cap Caps Cuvant Cuvinte LUNA Litera Litere Numereromane ZIDINSAPTAMANA adapteazaaspect adubuffer adumarcaje afiseazaaspect afiseazacampuri afiseazaculoare afiseazafiguriexterne afiseazafonttext afiseazagrid afiseazagrupculoare afiseazamakeup afiseazamediufonttext afiseazapaleta afiseazarama afiseazasetari afiseazasetsimboluri afiseazastruts afiseazatiparire aliniat aliniatcentru aliniatdreapta aliniatstanga appendix ascundeblocuri barainteractiune barasincronizare blanc but butoaneinteractiune buton camp campumplere cap chapter chem citat clip cloneazacamp coloana comentariu comparagrupculoare comparapaleta completecombinedlist completelistoffloats completelistofsorts completelistofsynonyms completeregister convertestenumar copiazacamp corecteazaspatiualb coupledregister crlf culoare culoaregri cupleazadocument cupleazamarcaje cupleazaregistru cuvantdreapta data datacurenta datareferit decupleazamarcaje definebodyfontDEF definebodyfontREF definedfont definefontfeature definefonthandling defineste definestealiat definesteantet definesteblanc definestebloc definesteblocsectiune definestebuffer definestecamp definesteconversie definesteculoare definestedescriere definestedimensiunehartie definesteenumerare definesteeticheta definestefloat definestefont definestefonttext definesteformatreferinte definestegrupculori definesteinconjurare definestelista definestelistacombinata definestelistareferinte definestelogo definestemakeup definestemarcaje definestemediulfonttext definestemeniuinteractiune definestemeniuinteractiune definesteoutput definesteoverlay definestepaleta definesteparagraf definesteprofil definesteprogram definestereferinte definesteregistru definestesablontabel definestesectiune definestesimbol definestesimbolfigura definestesinonim definestesinonimfont definestesortare definestestartstop definestestivacampuri definestesubcamp definestetabulatori definestetext definestetexteinconjurate definestetextinconjurat definestetyping definesteversiune definetype definetypeface description despre determinacaracteristicilelistei determinanumartitlu dezactiveazameniuinteractiune din dute dutebox ecran el element element emptylines enumeration etichete faraaliniat farafisiere faraliniiantetsisubsol faraliniisussijos faralista faramarcaje faraspatiu faraspatiualb figuraexterna firdepar folosesteURL folosestebloc folosestecodificarea folosestecomenzi folosestedocumentextern folosestefiguraexterna folosestefisiereexterne folosestefisierextern folosestemodul folosestemuzicaexterna folosestereferinte folosestesimboluri folosestespeciale footnotetext forteazablocuri fractie framed framedtext fundal gatablocuri grid hartiedubla hl impachetat impartefloat in inalt inaltamargine indentation indreapta inframed ininner injos inlinie inouter instalarelimba instanga intins jos jossus la labeling lapagina limba limbaprincipala liniemargine linieneagra liniesubtire linieumplere liniinegre liniisubtiri listsymbol litera litere loadsorts loadsynonyms logcampuri luna mapfontsize mar marcaje marcheazaversiune marginal matematica mediaeval minicitat mutapegrid name nextsection nocap nop nota notasubsol numartitlu numartitlucurent numere numereromane olinie overbar overbars overstrike overstrikes pagina paginadubla paragraph part pastreazablocuri placefloat placelistoffloats placelistofsorts placelistofsynonyms placereferencelist plaseazapegrid plaseazasemnecarte potrivestecamp pozitie proceseazabloc proceseazapagina program publicatie puncte punedeasuprafiecareia punefatainfata puneformula punelegenda punelista punelistacombinata punelistacombinata punelogouri punenotesubsol punenotesubsollocale puneregistru puneregistru punesubformula ran ref referinta referintapagina referintatext referit reflexie register reservefloat reset reseteazamarcaje resettextcontent riglatext rigleumplere roteste saripesteblocuri scala scriebuffer scrieinlista scrieinlistareferinte scrieinregistru scrieintreliste section seeregister selecteazablocuri selecteazahartie selecteazaversiune semncarte setarebarasincronizare setarelimba setareoutput setarepozitie setaresincronizare seteazaaliniat seteazaaliniate seteazaalinierea seteazaantet seteazaaranjareapag seteazaaspect seteazabarainteractiune seteazablanc seteazabloc seteazablocsectiune seteazablocurimarginale seteazabuffer seteazabutoane seteazacamp seteazacampuri seteazaclipping seteazacoloane seteazacombinari seteazacomentariu seteazaculoare seteazaculori seteazadefinireanotasubsol seteazadescriere seteazadimensiunihartie seteazaecrane seteazaecraninteractiune seteazaelemente seteazaenumerare seteazafiguriexterne seteazafloat seteazafloats seteazafonttext seteazaformulare seteazaformule seteazafundal seteazafundaluri seteazagrosimelinie seteazaimpartireafloat seteazainconjurat seteazaingust seteazainteractiunea seteazajos seteazalegenda seteazalegenda seteazalegendele seteazaliniesilabe seteazaliniesubtire seteazalinii seteazaliniimargine seteazaliniinegre seteazaliniiumplere seteazalista seteazalistacombinata seteazalistareferinte seteazamajuscule seteazamakeup seteazamarcaje seteazamarginal seteazamediulfonttext seteazameniuinteractiune seteazaminicitat seteazanotasubsol seteazanumarpagina seteazanumarsubpagina seteazanumartitlu seteazanumerotare seteazanumerotarelinii seteazanumerotarepagina seteazanumerotareparagrafe seteazapaleta seteazaparagrafe seteazaplasareaopozita seteazaprofile seteazaprograme seteazapublicatii seteazareferinte seteazaregistru seteazarigletext seteazarigleumplere seteazarotare seteazasectiune seteazasimbol seteazasinonime seteazasistem seteazasortare seteazaspatiu seteazaspatiualb seteazaspatiuinterliniar seteazastrut seteazasublinie seteazasubsol seteazasus seteazatab seteazatabele seteazatabulatori seteazatext seteazatexteantet seteazatextejos seteazatextesubsol seteazatextesus seteazatextetext seteazatexteticheta seteazatexttitlu seteazatitlu seteazatitluri seteazatoleranta seteazatranzitiepagina seteazatype seteazatyping seteazaurl seteazaversiuni settextcontent setupfonthandling setupfontsynonym setupinterlinespace2 setupitemgroup setuplistalternative setuppaper sim simbol sincronizeaza sort spatiifixate spatiu spatiualb startalignment startbuffer startbuffer startcitat startcolumns startcombination startcomentariu startcomponenta startculoare startdescription startdocument startenumeration startfact startfigure startfloattext startformula startframedtext startfundal starthiding startimpachetat startitemgroup startlegend startline startlinecorrection startlinenumbering startlines startliniemargine startlocal startlocalenvironment startlocalfootnotes startmakeup startmarginblock startmediu startmeniuinteractiune startnamemakeup startnarrower startopposite startoverlay startoverview startparagraph startpositioning startpostponing startprodus startprofile startproiect startregister startriglatext startsymbolset startsynchronization starttable starttables starttabulate starttyping startunpacked startversiune stivacampuri stopalignment stopbuffer stopbuffer stopcitat stopcolumns stopcombination stopcomentariu stopcomponenta stopculoare stopdescription stopdocument stopenumeration stopfact stopfigure stopfloattext stopformula stopframedtext stopfundal stophiding stopimpachetat stopitemgroup stoplegend stopline stoplinecorrection stoplinenumbering stoplines stopliniemargine stoplocal stoplocalenvironment stoplocalfootnotes stopmakeup stopmarginblock stopmediu stopmeniuinteractiune stopnamemakeup stopnarrower stopopposite stopoverlay stopoverview stopparagraph stoppositioning stoppostponing stopprodus stopprofile stopproiect stopriglatext stopsymbolset stopsynchronization stoptable stoptables stoptabulate stoptyping stopunpacked stopversiune sub subject subsection subsubject subsubsection subsubsubject synonym tab tex texteticheta textmarginal texttitlu textumplere tippagina title titlu tooltip traduce trecilafonttext typ type typefile underbar underbars undeva urmeazaprofil urmeazaversiune urmeazaversiuneprofil usedirectory usetypescript usetypescriptfile versiune vl zidinsaptamana 
\ No newline at end of file
diff --git a/Master/texmf-dist/context/data/scite/context.properties b/Master/texmf-dist/context/data/scite/context.properties
index cd1e8b36723..13fa079c02e 100644
--- a/Master/texmf-dist/context/data/scite/context.properties
+++ b/Master/texmf-dist/context/data/scite/context.properties
@@ -27,6 +27,14 @@
 # if PLAT_WIN
 #   find.command=fgrep -G -n $(find.what) $(find.files)
 
+# Just UTF-8
+
+code.page=65001
+output.code.page=65001
+
+textwrapper.margin=4
+textwrapper.length=68
+
 # ConTeXt: suffixes (really needed)
 
 file.patterns.tex=
@@ -47,12 +55,22 @@ import latex-scite
 # Example : patterns
 
 file.patterns.xml=
-file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx
+file.patterns.example=*.xml;*.xsl;*.xsd;*.fo;*.exa;*.rlb;*.rlg;*.rlv;*.rng;*.xfdf;*.xslt;*.dtd;*.lmx;*.ctx
 
 filter.example=eXaMpLe|$(file.patterns.example)|
 
 lexer.$(file.patterns.example)=xml
 
+# Lua : patterns
+
+file.patterns.lua=*.lua;*.luc;*.cld;*.tuc;*.luj
+
+filter.lua=Lua MkIV|$(file.patterns.lua)|
+lexer.$(file.patterns.lua)=lua
+
+command.compile.$(file.patterns.lua)=mtxrun --script "$(FileNameExt)"
+command.go.$(file.patterns.lua)=mtxrun --script "$(FileNameExt)"
+
 # Commands: some scripts
 
 if PLAT_WIN
@@ -76,7 +94,7 @@ name.metafun.console=$(name.context.console)
 name.example.console=$(name.context.console)
 
 if PLAT_WIN
-    name.context.mtxrun=mtxrun.cmd --autogenerate
+    name.context.mtxrun=mtxrun --autogenerate
 
 if PLAT_GTK
     name.context.mtxrun=mtxrun --autogenerate
@@ -94,13 +112,10 @@ name.example.xmlcheck=tidy -quiet -utf8 -xml -errors
 
 name.metafun.mptopdf=$(name.context.mtxrun) --script mptopdf
 
-# wwwserver --start --port=8061 --url=http://localhost:8061 --forcetemp --direct
-# wwwserver.rb --direct
-
 # if needed one can set MTX_SERVER_ROOT to the root of the documentation
 
 if PLAT_WIN
-    name.context.wwwserver=cmd /c start /min "Context Documentation" $(name.context.mtxrun) --script server --start
+    name.context.wwwserver=cmd /c start /min "Context Documentation" $(name.context.mtxrun) --script server --auto
 
 if PLAT_GTK
     name.context.wwwserver=$(name.context.mtxrun) --script server --start > ~/context-wwwserver.log &
diff --git a/Master/texmf-dist/context/data/scite/scite-ctx.lua b/Master/texmf-dist/context/data/scite/scite-ctx.lua
new file mode 100644
index 00000000000..8e6b6ebab74
--- /dev/null
+++ b/Master/texmf-dist/context/data/scite/scite-ctx.lua
@@ -0,0 +1,838 @@
+-- version   : 1.0.0 - 07/2005 (2008: lua 5.1)
+-- author    : Hans Hagen - PRAGMA ADE - www.pragma-ade.com
+-- copyright : public domain or whatever suits
+-- remark    : part of the context distribution, my first lua code
+
+-- todo: name space for local functions
+
+-- loading: scite-ctx.properties
+
+-- # environment variable
+-- #
+-- #   CTXSPELLPATH=t:/spell
+-- #
+-- # auto language detection
+-- #
+-- #   % version =1.0 language=uk
+-- #   <?xml version='1.0' language='uk' ?>
+
+-- ext.lua.startup.script=$(SciteDefaultHome)/scite-ctx.lua
+--
+-- # extension.$(file.patterns.context)=scite-ctx.lua
+-- # extension.$(file.patterns.example)=scite-ctx.lua
+--
+-- # ext.lua.reset=1
+-- # ext.lua.auto.reload=1
+-- # ext.lua.startup.script=t:/lua/scite-ctx.lua
+--
+-- ctx.menulist.default=\
+--     wrap=wrap_text|\
+--     unwrap=unwrap_text|\
+--     sort=sort_text|\
+--     document=document_text|\
+--     quote=quote_text|\
+--     compound=compound_text|\
+--     check=check_text
+--
+-- ctx.spellcheck.language=auto
+-- ctx.spellcheck.wordsize=4
+-- ctx.spellcheck.wordpath=ENV(CTXSPELLPATH)
+--
+-- ctx.spellcheck.wordfile.all=spell-uk.txt,spell-nl.txt
+--
+-- ctx.spellcheck.wordfile.uk=spell-uk.txt
+-- ctx.spellcheck.wordfile.nl=spell-nl.txt
+-- ctx.spellcheck.wordsize.uk=4
+-- ctx.spellcheck.wordsize.nl=4
+--
+-- command.name.21.*=CTX Action List
+-- command.subsystem.21.*=3
+-- command.21.*=show_menu $(ctx.menulist.default)
+-- command.groupundo.21.*=yes
+-- command.shortcut.21.*=Shift+F11
+--
+-- command.name.22.*=CTX Check Text
+-- command.subsystem.22.*=3
+-- command.22.*=check_text
+-- command.groupundo.22.*=yes
+-- command.shortcut.22.*=Ctrl+L
+--
+-- command.name.23.*=CTX Wrap Text
+-- command.subsystem.23.*=3
+-- command.23.*=wrap_text
+-- command.groupundo.23.*=yes
+-- command.shortcut.23.*=Ctrl+M
+--
+-- # command.21.*=check_text
+-- # command.21.*=dofile e:\context\lua\scite-ctx.lua
+
+-- generic functions
+
+props = props or { } -- setmetatable(props,{ __index = function(k,v) props[k] = "unknown" return "unknown" end } )
+
+local byte, lower, upper, gsub, sub, find, rep, match, gmatch = string.byte, string.lower, string.upper, string.gsub, string.sub, string.find, string.rep, string.match, string.gmatch
+local sort, concat = table.sort, table.concat
+
+local crlf = "\n"
+
+function traceln(str)
+    trace(str .. crlf)
+    io.flush()
+end
+
+function string:grab(delimiter)
+    local list = {}
+    for snippet in self:gmatch(delimiter) do
+        list[#list+1] = snippet
+    end
+    return list
+end
+
+function string:expand()
+    return (self:gsub("ENV%((%w+)%)", os.envvar))
+end
+
+function string:strip()
+    return (self:gsub("^%s*(.-)%s*$", "%1"))
+end
+
+function table.alphasort(list,i)
+    if i and i > 0 then
+        local function alphacmp(a,b)
+            return lower(gsub(sub(a,i),'0',' ')) < lower(gsub(sub(b,i),'0',' '))
+        end
+        sort(list,alphacmp)
+    else
+        local function alphacmp(a,b)
+            return lower(a) < lower(b)
+        end
+        sort(list,alphacmp)
+    end
+end
+
+function io.exists(filename)
+    local ok, result, message = pcall(io.open,filename)
+    if result then
+        io.close(result)
+        return true
+    else
+        return false
+    end
+end
+
+function os.envvar(str)
+    local s = os.getenv(str)
+    if s ~= '' then
+        return s
+    end
+    s = os.getenv(upper(str))
+    if s ~= '' then
+        return s
+    end
+    s = os.getenv(lower(str))
+    if s ~= '' then
+        return s
+    end
+end
+
+-- support functions, maybe editor namespace
+
+-- function column_of_position(position)
+--     local line = editor:LineFromPosition(position)
+--     local oldposition = editor.CurrentPos
+--     local column = 0
+--     editor:GotoPos(position)
+--     while editor.CurrentPos ~= 0 and line == editor:LineFromPosition(editor.CurrentPos) do
+--         editor:CharLeft()
+--         column = column + 1
+--     end
+--     editor:GotoPos(oldposition)
+--     if line > 0 then
+--         return column -1
+--     else
+--         return column
+--     end
+-- end
+
+-- function line_of_position(position)
+--     return editor:LineFromPosition(position)
+-- end
+
+function extend_to_start()
+    local selectionstart = editor.SelectionStart
+    local selectionend = editor.SelectionEnd
+    local line = editor:LineFromPosition(selectionstart)
+    if line > 0 then
+        while line == editor:LineFromPosition(selectionstart-1) do
+            selectionstart = selectionstart - 1
+            editor:SetSel(selectionstart,selectionend)
+        end
+    else
+        selectionstart = 0
+    end
+    editor:SetSel(selectionstart,selectionend)
+    return selectionstart
+end
+
+function extend_to_end() -- editor:LineEndExtend() does not work
+    local selectionstart = editor.SelectionStart
+    local selectionend = editor.SelectionEnd
+    local line = editor:LineFromPosition(selectionend)
+    while line == editor:LineFromPosition(selectionend+1) do
+        selectionend = selectionend + 1
+        editor:SetSel(selectionstart,selectionend)
+    end
+    editor:SetSel(selectionstart,selectionend)
+    return selectionend
+end
+
+function getfiletype()
+    local firstline = editor:GetLine(0)
+    if editor.Lexer == SCLEX_TEX then
+        return 'tex'
+    elseif editor.Lexer == SCLEX_XML then
+        return 'xml'
+    elseif find(firstline,"^%%") then
+        return 'tex'
+    elseif find(firstline,"^<%?xml") then
+        return 'xml'
+    else
+        return 'unknown'
+    end
+end
+
+-- inspired by LuaExt's scite_Files
+
+function get_dir_list(mask)
+    local f
+    if props['PLAT_GTK'] and props['PLAT_GTK'] ~= "" then
+        f = io.popen('ls -1 ' .. mask)
+    else
+        mask = gsub(mask,'/','\\')
+        local tmpfile = 'scite-ctx.tmp'
+        local cmd = 'dir /b "' .. mask .. '" > ' .. tmpfile
+        os.execute(cmd)
+        f = io.open(tmpfile)
+    end
+    local files = {}
+    if not f then -- path check added
+        return files
+    end
+    for line in f:lines() do
+        files[#files+1] = line
+    end
+    f:close()
+    return files
+end
+
+-- banner
+
+do
+
+    print("loading scite-ctx.lua definition file\n")
+    print("-  see scite-ctx.properties for configuring info\n")
+    print("-  ctx.spellcheck.wordpath set to " .. props['ctx.spellcheck.wordpath'])
+    if find(lower(props['ctx.spellcheck.wordpath']),"ctxspellpath") then
+        if os.getenv('ctxspellpath') then
+            print("-  ctxspellpath set to " .. os.getenv('CTXSPELLPATH'))
+        else
+            print("-  'ctxspellpath is not set")
+        end
+        print("-  ctx.spellcheck.wordpath expands to " .. string.expand(props['ctx.spellcheck.wordpath']))
+    end
+    print("\n-  ctx.wraptext.length is set to " .. props['ctx.wraptext.length'])
+    if props['ctx.helpinfo'] ~= '' then
+        print("\n-  key bindings:\n")
+        print((gsub(string.strip(props['ctx.helpinfo']),"%s*\|%s*","\n")))
+    end
+    print("\n-  recognized first lines:\n")
+    print("xml   <?xml version='1.0' language='nl'")
+    print("tex   % language=nl")
+
+end
+
+-- text functions
+
+-- written while listening to Talk Talk
+
+local magicstring = rep("<ctx-crlf/>", 2)
+
+function wrap_text()
+
+    -- We always go to the end of a line, so in fact some of
+    -- the variables set next are not needed.
+
+    local length = props["ctx.wraptext.length"]
+
+    if length == '' then length = 80 else length = tonumber(length) end
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    if startposition == endposition then return end
+
+    editor:LineEndExtend()
+
+    startposition = editor.SelectionStart
+    endposition   = editor.SelectionEnd
+
+    -- local startline   = line_of_position(startposition)
+    -- local endline     = line_of_position(endposition)
+    -- local startcolumn = column_of_position(startposition)
+    -- local endcolumn   = column_of_position(endposition)
+    --
+    -- editor:SetSel(startposition,endposition)
+
+    local startline   = props['SelectionStartLine']
+    local endline     = props['SelectionEndLine']
+    local startcolumn = props['SelectionStartColumn'] - 1
+    local endcolumn   = props['SelectionEndColumn'] - 1
+
+    local replacement = { }
+    local templine    = ''
+    local indentation = rep(' ',startcolumn)
+    local selection   = editor:GetSelText()
+
+    selection = gsub(selection,"[\n\r][\n\r]","\n")
+    selection = gsub(selection,"\n\n+",' ' .. magicstring .. ' ')
+    selection = gsub(selection,"^%s",'')
+
+    for snippet in gmatch(selection,"%S+") do
+        if snippet == magicstring then
+            replacement[#replacement+1] = templine
+            replacement[#replacement+1] = ""
+            templine = ''
+        elseif #templine + #snippet > length then
+            replacement[#replacement+1] = templine
+            templine = indentation .. snippet
+        elseif #templine == 0 then
+            templine = indentation .. snippet
+        else
+            templine = templine .. ' ' .. snippet
+        end
+    end
+
+    replacement[#replacement+1] = templine
+    replacement[1] = gsub(replacement[1],"^%s+",'')
+
+    if endcolumn == 0 then
+        replacement[#replacement+1] = ""
+    end
+
+    editor:ReplaceSel(concat(replacement,"\n"))
+
+end
+
+function unwrap_text()
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    if startposition == endposition then return end
+
+    editor:HomeExtend()
+    editor:LineEndExtend()
+
+    startposition = editor.SelectionStart
+    endposition   = editor.SelectionEnd
+
+    local magicstring = rep("<multiplelines/>", 2)
+    local selection   = gsub(editor:GetSelText(),"[\n\r][\n\r]+", ' ' .. magicstring .. ' ')
+    local replacement = ''
+
+    for snippet in gmatch(selection,"%S+") do
+        if snippet == magicstring then
+            replacement = replacement .. "\n"
+        else
+            replacement = replacement .. snippet .. "\n"
+        end
+    end
+
+    if endcolumn == 0 then replacement = replacement .. "\n" end
+
+    editor:ReplaceSel(replacement)
+
+end
+
+function sort_text()
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    if startposition == endposition then return end
+
+    -- local startcolumn = column_of_position(startposition)
+    -- local endcolumn   = column_of_position(endposition)
+    --
+    -- editor:SetSel(startposition,endposition)
+
+    local startline   = props['SelectionStartLine']
+    local endline     = props['SelectionEndLine']
+    local startcolumn = props['SelectionStartColumn'] - 1
+    local endcolumn   = props['SelectionEndColumn']   - 1
+
+    startposition = extend_to_start()
+    endposition   = extend_to_end()
+
+    local selection = gsub(editor:GetSelText(), "%s*$", '')
+
+    list = string.grab(selection,"[^\n\r]+")
+    table.alphasort(list, startcolumn)
+    local replacement = concat(list, "\n")
+
+    editor:GotoPos(startposition)
+    editor:SetSel(startposition,endposition)
+
+    if endcolumn == 0 then replacement = replacement .. "\n" end
+
+    editor:ReplaceSel(replacement)
+
+end
+
+function uncomment_xml()
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    if startposition == endposition then return end
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    local selection = gsub(editor:GetSelText(), "%<%!%-%-.-%-%-%>", '')
+
+    editor:GotoPos(startposition)
+    editor:SetSel(startposition,endposition)
+
+    editor:ReplaceSel(selection)
+    editor:GotoPos(startposition)
+
+end
+
+function document_text()
+
+    local startposition = editor.SelectionStart
+    local endposition   = editor.SelectionEnd
+
+    if startposition == endposition then return end
+
+    startposition = extend_to_start()
+    endposition   = extend_to_end()
+
+    editor:SetSel(startposition,endposition)
+
+    local filetype = getfiletype()
+
+    local replacement = ''
+    for i = editor:LineFromPosition(startposition), editor:LineFromPosition(endposition) do
+        local str = editor:GetLine(i)
+        if filetype == 'xml' then
+            if find(str,"^<%!%-%- .* %-%->%s*$") then
+                replacement = replacement .. gsub(str,"^<%!%-%- (.*) %-%->(%s*)$","%1\n")
+            elseif find(str,"%S") then
+                replacement = replacement .. '<!-- ' .. gsub(str,"(%s*)$",'') .. " -->\n"
+            else
+                replacement = replacement .. str
+            end
+        else
+            if find(str,"^%%D%s+$") then
+                replacement = replacement .. "\n"
+            elseif find(str,"^%%D ") then
+                replacement = replacement .. gsub(str,"^%%D ",'')
+            else
+                replacement = replacement .. '%D ' .. str
+            end
+        end
+    end
+
+    editor:ReplaceSel(gsub(replacement,"[\n\r]$",''))
+
+end
+
+function quote_text()
+
+    local filetype, leftquotation, rightquotation = getfiletype(), '', ''
+
+    if filetype == 'xml' then
+        leftquotation, rightquotation = "<quotation>", "</quotation>"
+        leftquote, rightquote = "<quotation>", "</quote>"
+    else
+        leftquotation, rightquotation = "\\quotation {", "}"
+        leftquote, rightquote = "\\quote {", "}"
+    end
+
+    local replacement = editor:GetSelText()
+    replacement = gsub(replacement,"\`\`(.-)\'\'", leftquotation .. "%1" .. rightquotation)
+    replacement = gsub(replacement,"\"(.-)\"",     leftquotation .. "%1" .. rightquotation)
+    replacement = gsub(replacement,"\`(.-)\'",     leftquote     .. "%1" .. rightquote    )
+    replacement = gsub(replacement,"\'(.-)\'",     leftquote     .. "%1" .. rightquote    )
+    editor:ReplaceSel(replacement)
+
+end
+
+function compound_text()
+
+    local filetype = getfiletype()
+
+    if filetype == 'xml' then
+        editor:ReplaceSel(gsub(editor:GetSelText(),"(>[^<%-][^<%-]+)([-\/])(%w%w+)","%1<compound token='%2'/>%3"))
+    else
+        editor:ReplaceSel(gsub(editor:GetSelText(),"([^\|])([-\/]+)([^\|])","%1|%2|%3"))
+    end
+
+end
+
+-- written while listening to Alanis Morissette's acoustic
+-- Jagged Little Pill and Tori Amos' Beekeeper after
+-- reinstalling on my good old ATH-7
+
+local language = props["ctx.spellcheck.language"]
+local wordsize = props["ctx.spellcheck.wordsize"]
+local wordpath = props["ctx.spellcheck.wordpath"]
+
+if language == '' then language = 'uk' end
+if wordsize == '' then wordsize = 4    else wordsize = tonumber(wordsize) end
+
+local wordfile = ""
+local wordlist = {}
+local worddone = 0
+
+-- we use wordlist as a hash so that we can add entries without the
+-- need to sort and also use a fast (built in) search
+
+-- function kpsewhich_file(filename,filetype,progname)
+--     local progflag, typeflag = '', ''
+--     local tempname = os.tmpname()
+--     if progname then
+--         progflag = " --progname=" .. progname .. " "
+--     end
+--     if filetype then
+--         typeflag = " --format=" .. filetype .. " "
+--     end
+--     local command = "kpsewhich" .. progflag .. typeflag .. " " .. filename .. " > " .. tempname
+--     os.execute(command)
+--     for line in io.lines(tempname) do
+--         return gsub(line, "\s*$", '')
+--     end
+-- end
+
+function check_text()
+
+    local dlanguage = props["ctx.spellcheck.language"]
+    local dwordsize = props["ctx.spellcheck.wordsize"]
+    local dwordpath = props["ctx.spellcheck.wordpath"]
+
+    if dlanguage ~= '' then dlanguage = tostring(language) end
+    if dwordsize ~= '' then dwordsize = tonumber(wordsize) end
+
+    local firstline, skipfirst = editor:GetLine(0), false
+    local filetype, wordskip, wordgood = getfiletype(), '', ''
+
+    if filetype == 'tex' then
+        wordskip  = "\\"
+    elseif filetype  == 'xml' then
+        wordskip  = "<"
+        wordgood  = ">"
+    end
+
+    if props["ctx.spellcheck.language"] == 'auto' then
+        if filetype == 'tex' then
+            -- % version =1.0 language=uk
+            firstline = gsub(firstline,"^%%%s*",'')
+            firstline = gsub(firstline,"%s*$",'')
+            for key, val in gmatch(firstline,"(%w+)=(%w+)") do
+                if key == "language" then
+                    language = val
+                    traceln("auto document language "  .. "'" .. language .. "' (tex)")
+                end
+            end
+            skipfirst = true
+        elseif filetype == 'xml' then
+            -- <?xml version='1.0' language='uk' ?>
+            firstline = gsub(firstline,"^%<%?xml%s*", '')
+            firstline = gsub(firstline,"%s*%?%>%s*$", '')
+            for key, val in gmatch(firstline,"(%w+)=[\"\'](.-)[\"\']") do
+                if key == "language" then
+                    language = val
+                    traceln("auto document language "  .. "'" .. language .. "' (xml)")
+                end
+            end
+            skipfirst = true
+        end
+    end
+
+    local fname = props["ctx.spellcheck.wordfile." .. language]
+    local fsize = props["ctx.spellcheck.wordsize." .. language]
+
+    if fsize ~= '' then wordsize = tonumber(fsize) end
+
+    if fname ~= '' and fname ~= wordfile then
+        wordfile, worddone, wordlist = fname, 0, {}
+        for filename in gmatch(wordfile,"[^%,]+") do
+            if wordpath ~= '' then
+                filename = string.expand(wordpath) .. '/' .. filename
+            end
+            if io.exists(filename) then
+                traceln("loading " .. filename)
+                for line in io.lines(filename) do
+                    if not find(line,"^[\%\#\-]") then
+                        str = gsub(line,"%s*$", '')
+                        rawset(wordlist,str,true)
+                        worddone = worddone + 1
+                    end
+                end
+            else
+                traceln("unknown file '" .. filename .."'")
+            end
+        end
+        traceln(worddone .. " words loaded")
+    end
+
+    reset_text()
+
+    if worddone == 0 then
+        traceln("no (valid) language or wordfile specified")
+    else
+        traceln("start checking")
+        if wordskip ~= '' then
+            traceln("ignoring " .. wordskip .. "..." .. wordgood)
+        end
+        local i, j, lastpos, startpos, endpos, snippet, len, first = 0, 0, -1, 0, 0, '', 0, 0
+        local ok, skip, ch = false, false, ''
+        if skipfirst then first = #firstline end
+        for k = first, editor.TextLength do
+            ch = editor:textrange(k,k+1)
+            if wordgood ~= '' and ch == wordgood then
+                skip = false
+            elseif ch == wordskip then
+                skip = true
+            end
+            if find(ch,"%w") and not find(ch,"%d") then
+                if not skip then
+                    if ok then
+                        endpos = k
+                    else
+                        startpos = k
+                        endpos = k
+                        ok = true
+                    end
+                end
+            elseif ok and not skip then
+                len = endpos - startpos + 1
+                if len >= wordsize then
+                    snippet = editor:textrange(startpos,endpos+1)
+                    i = i + 1
+                    if wordlist[snippet] or wordlist[lower(snippet)] then
+                        j = j + 1
+                    else
+                        editor:StartStyling(startpos,INDICS_MASK)
+                        editor:SetStyling(len,INDIC2_MASK) -- INDIC0_MASK+2
+                    end
+                end
+                ok = false
+            elseif wordgood == '' then
+                skip = (ch == wordskip)
+            end
+        end
+        traceln(i .. " words checked, " .. (i-j) .. " errors")
+    end
+
+end
+
+function reset_text()
+    editor:StartStyling(0,INDICS_MASK)
+    editor:SetStyling(editor.TextLength,INDIC_PLAIN)
+end
+
+-- menu
+
+local menuactions   = {}
+local menufunctions = {}
+
+function UserListShow(menutrigger, menulist)
+    local menuentries = {}
+    local list = string.grab(menulist,"[^%|]+")
+    menuactions = {}
+    for i=1, #list do
+        if list[i] ~= '' then
+            for key, val in gmatch(list[i],"%s*(.+)=(.+)%s*") do
+                menuentries[#menuentries+1] = key
+                menuactions[key] = val
+            end
+        end
+    end
+    local menustring = concat(menuentries,'|')
+    if menustring == "" then
+        traceln("There are no templates defined for this file type.")
+    else
+        editor.AutoCSeparator = byte('|')
+        editor:UserListShow(menutrigger,menustring)
+        editor.AutoCSeparator = byte(' ')
+    end
+end
+
+function OnUserListSelection(trigger,choice)
+    if menufunctions[trigger] and menuactions[choice] then
+        return menufunctions[trigger](menuactions[choice])
+    else
+        return false
+    end
+end
+
+-- main menu
+
+local menutrigger = 12
+
+function show_menu(menulist)
+    UserListShow(menutrigger, menulist)
+end
+
+function process_menu(action)
+    if not find(action,"%(%)$") then
+        assert(loadstring(action .. "()"))()
+    else
+        assert(loadstring(action))()
+    end
+end
+
+menufunctions[12] = process_menu
+
+-- templates
+
+local templatetrigger = 13
+
+local ctx_template_paths = { "./ctx-templates", "../ctx-templates", "../../ctx-templates" }
+local ctx_auto_templates = false
+local ctx_template_list  = ""
+
+local ctx_path_list      = {}
+local ctx_path_done      = {}
+local ctx_path_name      = {}
+
+function ctx_list_loaded(path)
+    return ctx_path_list[path] and #ctx_path_list[path] > 0
+end
+
+function insert_template(templatelist)
+    if props["ctx.template.scan"] == "yes" then
+        local path    = props["FileDir"]
+        local rescan  = props["ctx.template.rescan"] == "yes"
+        local suffix  = props["ctx.template.suffix." .. props["FileExt"]] -- alas, no suffix expansion here
+        local current = path .. "+" .. props["FileExt"]
+        if rescan then
+            print("re-scanning enabled")
+        end
+        ctx_template_list = ""
+        if not ctx_path_done[path] or rescan then
+            local pattern = "*.*"
+            for i, pathname in ipairs(ctx_template_paths) do
+                print("scanning " .. gsub(path,"\\","/") .. "/" .. pathname)
+                ctx_path_name[path] = pathname
+                ctx_path_list[path] = get_dir_list(pathname .. "/" .. pattern)
+                if ctx_list_loaded(path) then
+                    print("finished locating template files")
+                    break
+                end
+            end
+            if ctx_list_loaded(path) then
+                print(#ctx_path_list[path] .. " template files found")
+            else
+                print("no template files found")
+            end
+        end
+        if ctx_list_loaded(path) then
+            ctx_template_list = ""
+            local pattern = "%." .. suffix .. "$"
+            local n = 0
+            for j, filename in ipairs(ctx_path_list[path]) do
+                if find(filename,pattern) then
+                    n = n + 1
+                    local menuname = gsub(filename,"%..-$","")
+                    if ctx_template_list ~= "" then
+                        ctx_template_list = ctx_template_list .. "|"
+                    end
+                    ctx_template_list = ctx_template_list .. menuname .. "=" .. ctx_path_name[path] .. "/" .. filename
+                end
+            end
+            if not ctx_path_done[path] then
+                print(n .. " suitable template files found")
+            end
+        end
+        ctx_path_done[path] = true
+        if ctx_template_list == "" then
+            ctx_auto_templates = false
+        else
+            ctx_auto_templates = true
+            templatelist = ctx_template_list
+        end
+    else
+        ctx_auto_templates = false
+    end
+    if templatelist ~= "" then
+        UserListShow(templatetrigger, templatelist)
+    end
+end
+
+
+-- ctx.template.[whatever].[filetype]
+-- ctx.template.[whatever].data.[filetype]
+-- ctx.template.[whatever].file.[filetype]
+-- ctx.template.[whatever].list.[filetype]
+
+function process_template_one(action)
+    local text = nil
+    if ctx_auto_templates then
+        local f = io.open(action,"r")
+        if f then
+            text = gsub(f:read("*all"),"\n$","")
+            f:close()
+        else
+            print("unable to auto load template file " .. text)
+            text = nil
+        end
+    end
+    if not text or text == "" then
+        text = props["ctx.template." .. action .. ".file"]
+        if not text or text == "" then
+            text = props["ctx.template." .. action .. ".data"]
+            if not text or text == "" then
+                text = props["ctx.template." .. action]
+            end
+        else
+            local f = io.open(text,"r")
+            if f then
+                text = gsub(f:read("*all"),"\n$","")
+                f:close()
+            else
+                print("unable to load template file " .. text)
+                text = nil
+            end
+        end
+    end
+    if text then
+        text = gsub(text,"\\n","\n")
+        local pos = find(text,"%?")
+        text = gsub(text,"%?","")
+        editor:insert(editor.CurrentPos,text)
+        if pos then
+            editor.CurrentPos = editor.CurrentPos + pos - 1
+            editor.SelectionStart = editor.CurrentPos
+            editor.SelectionEnd = editor.CurrentPos
+            editor:GotoPos(editor.CurrentPos)
+        end
+    end
+end
+
+menufunctions[13] = process_template_one
+menufunctions[14] = process_template_two
+
+-- command.name.26.*=Open Logfile
+-- command.subsystem.26.*=3
+-- command.26.*=open_log
+-- command.save.before.26.*=2
+-- command.groupundo.26.*=yes
+-- command.shortcut.26.*=Ctrl+E
+
+function open_log()
+   scite.Open(props['FileName'] .. ".log")
+end
diff --git a/Master/texmf-dist/context/data/scite/scite-ctx.properties b/Master/texmf-dist/context/data/scite/scite-ctx.properties
index 94a51aeb739..f23508acab4 100644
--- a/Master/texmf-dist/context/data/scite/scite-ctx.properties
+++ b/Master/texmf-dist/context/data/scite/scite-ctx.properties
@@ -12,7 +12,8 @@
 #   <?xml version='1.0' language='uk' ?>
 
 ext.lua.auto.reload=1
-ext.lua.startup.script=$(SciteDefaultHome)/scite-ctx.lua
+#~ ext.lua.startup.script=$(SciteDefaultHome)/scite-ctx.lua
+ext.lua.startup.script=$(SciteUserHome)/scite-ctx.lua
 
 #~ extension.$(file.patterns.context)=scite-ctx.lua
 #~ extension.$(file.patterns.example)=scite-ctx.lua
diff --git a/Master/texmf-dist/context/data/scite/scite-ctx.readme b/Master/texmf-dist/context/data/scite/scite-ctx.readme
index f796e543eb9..c5f5977a669 100644
--- a/Master/texmf-dist/context/data/scite/scite-ctx.readme
+++ b/Master/texmf-dist/context/data/scite/scite-ctx.readme
@@ -1,8 +1,19 @@
-Short note:
-
-- use scite 1.64 of later
-- copy scite-ctx.lua to ..\scite\wscite
-- copy scite-ctx.properties to wherever context.properties lives
-- add "import" to context.properties
-- create path for spell files and put spell files there
-- let environment variable CTXSPELLPATH to spell path
+installation:
+
+-- download scite and install it (take the normal scite, not one that ships with ruby)
+-- copy the texmf-context\context\data\scite\*.properties to c:\users\<youraccount>
+-- copy the texmf-context\context\data\scite\*.lua to the place where scite has its own support files (wscite)
+-- add the line "import context" to your user properties file (entry under menu Options)
+
+running context:
+
+-- add texmf-mswin\bin to your path
+
+or
+
+-- start scite from a cmd that also calls setuptex
+
+spellchecking:
+
+-- create a path for spell files and put spell files there (these are files with just words)
+-- set the environment variable CTXSPELLPATH to this path
diff --git a/Master/texmf-dist/context/data/textadept/context.lua b/Master/texmf-dist/context/data/textadept/context.lua
new file mode 100644
index 00000000000..f386eb87d13
--- /dev/null
+++ b/Master/texmf-dist/context/data/textadept/context.lua
@@ -0,0 +1,710 @@
+--[[
+  Preliminary ConTeXT lexer
+
+  % ConTeXt
+  tex context
+  mkii context
+  mkiv context
+
+  experiment dd 2009/10/28 .. todo:
+
+  -- figure out if tabs instead of splits are possible
+  -- locate an option to enter name in file dialogue (like windows permits)
+  -- nesting of lua somehow does not re-lex while typing (backtrack till begin_...)
+  -- find trick to overload latex lexer (mime_types, metatype trickery)
+  -- convert scite lua scripts to textadept
+  -- check linux and osx versions
+  -- figure out why loading a file fails (lfs too)
+
+  so, this is just an experiment
+
+]]--
+
+local textadept = _G.textadept
+
+module(..., package.seeall)
+
+local context = context
+local lua     = require 'lua'
+
+local P, R, S, V = lpeg.P, lpeg.R, lpeg.S, lpeg.V
+
+--~ local some_words = { "starttext", "stoptext", "writestatus" }
+
+local some_words = {
+ "CAP",
+ "Cap",
+ "Caps",
+ "Character",
+ "Characters",
+ "MONTH",
+ "Romannumerals",
+ "WEEKDAY",
+ "WORD",
+ "WORDS",
+ "Word",
+ "Words",
+ "about",
+ "adaptlayout",
+ "adding",
+ "appendix",
+ "arg",
+ "at",
+ "atpage",
+ "background",
+ "blackrule",
+ "blackrules",
+ "blank",
+ "bookmark",
+ "but",
+ "button",
+ "bypassblocks",
+ "cap",
+ "chapter",
+ "character",
+ "characters",
+ "chem",
+ "clip",
+ "clonefield",
+ "color",
+ "column",
+ "comment",
+ "comparecolorgroup",
+ "comparepalet",
+ "completecombinedlist",
+ "completelistoffloats",
+ "completelistofsorts",
+ "completelistofsynonyms",
+ "completeregister",
+ "convertnumber",
+ "copyfield",
+ "correctwhitespace",
+ "coupledocument",
+ "coupledregister",
+ "couplemarking",
+ "couplepage",
+ "couplepaper",
+ "coupleregister",
+ "crlf",
+ "currentdate",
+ "currentheadnumber",
+ "date",
+ "decouplemarking",
+ "define",
+ "defineblank",
+ "defineblock",
+ "definebodyfont",
+ "definebodyfontenvironment",
+ "definebuffer",
+ "definecolor",
+ "definecolorgroup",
+ "definecombinedlist",
+ "defineconversion",
+ "definedescription",
+ "defineenumeration",
+ "definefield",
+ "definefieldstack",
+ "definefiguresymbol",
+ "definefloat",
+ "definefont",
+ "defineframed",
+ "defineframedtext",
+ "definehead",
+ "defineindenting",
+ "defineinteractionmenu",
+ "defineinteractionmenu",
+ "definelabel",
+ "definelist",
+ "definelogo",
+ "definemakeup",
+ "definemarking",
+ "defineoutput",
+ "defineoverlay",
+ "definepalet",
+ "definepapersize",
+ "defineparagraphs",
+ "defineprofile",
+ "defineprogram",
+ "definerawfont",
+ "definereference",
+ "definereferenceformat",
+ "definereferencelist",
+ "defineregister",
+ "definerule",
+ "definesection",
+ "definesectionblock",
+ "definesorting",
+ "definestartstop",
+ "definesubfield",
+ "definesymbol",
+ "definesynonyms",
+ "definetabletemplate",
+ "definetabulate",
+ "definetext",
+ "definetextposition",
+ "definetextvariable",
+ "definetype",
+ "definetyping",
+ "defineversion",
+ "description",
+ "determineheadnumber",
+ "determinelistcharacteristics",
+ "disableinteractionmenu",
+ "donttest",
+ "emptylines",
+ "enumeration",
+ "externalfigure",
+ "field",
+ "fieldstack",
+ "fillinfield",
+ "fillinline",
+ "fillinrules",
+ "fillintext",
+ "fitfield",
+ "fixedspaces",
+ "followprofile",
+ "followprofileversion",
+ "followversion",
+ "footnote",
+ "footnotetext",
+ "forceblocks",
+ "fraction",
+ "framed",
+ "framedtext",
+ "from",
+ "getbuffer",
+ "getmarking",
+ "godown",
+ "goto",
+ "gotobox",
+ "graycolor",
+ "grid",
+ "hairline",
+ "head",
+ "headnumber",
+ "headtext",
+ "hideblocks",
+ "high",
+ "hl",
+ "in",
+ "indentation",
+ "indenting",
+ "inframed",
+ "ininner",
+ "inleft",
+ "inline",
+ "inmargin",
+ "inothermargin",
+ "inouter",
+ "inright",
+ "installlanguage",
+ "interactionbar",
+ "interactionbuttons",
+ "item",
+ "items",
+ "its",
+ "keepblocks",
+ "labeling",
+ "labels",
+ "labeltext",
+ "language",
+ "leftaligned",
+ "listsymbol",
+ "loadsorts",
+ "loadsynonyms",
+ "logfields",
+ "lohi",
+ "low",
+ "mainlanguage",
+ "mar",
+ "marginrule",
+ "margintext",
+ "marking",
+ "markversion",
+ "mathematics",
+ "mediaeval",
+ "midaligned",
+ "mirror",
+ "month",
+ "moveongrid",
+ "name",
+ "nextsection",
+ "nocap",
+ "noheaderandfooterlines",
+ "noindenting",
+ "nolist",
+ "nomarking",
+ "nomoreblocks",
+ "nomorefiles",
+ "nop",
+ "nospace",
+ "note",
+ "notopandbottomlines",
+ "nowhitespace",
+ "numbers",
+ "overbar",
+ "overbars",
+ "overstrike",
+ "overstrikes",
+ "packed",
+ "page",
+ "pagereference",
+ "pagetype",
+ "paragraph",
+ "part",
+ "periods",
+ "placebookmarks",
+ "placecombinedlist",
+ "placecombinedlist",
+ "placefloat",
+ "placefootnotes",
+ "placeformula",
+ "placelegend",
+ "placelist",
+ "placelistoffloats",
+ "placelistofsorts",
+ "placelistofsynonyms",
+ "placelocalfootnotes",
+ "placelogos",
+ "placeongrid",
+ "placeontopofeachother",
+ "placereferencelist",
+ "placeregister",
+ "placeregister",
+ "placerule",
+ "placesidebyside",
+ "placesubformula",
+ "placetextvariable",
+ "position",
+ "positiontext",
+ "processblocks",
+ "processpage",
+ "program",
+ "publication",
+ "quotation",
+ "quote",
+ "ran",
+ "ref",
+ "reference",
+ "referral",
+ "referraldate",
+ "register",
+ "reservefloat",
+ "reset",
+ "resetmarking",
+ "resettextcontent",
+ "rightaligned",
+ "romannumerals",
+ "rotate",
+ "scale",
+ "screen",
+ "section",
+ "seeregister",
+ "selectblocks",
+ "selectpaper",
+ "selectversion",
+ "settextcontent",
+ "settextvariable",
+ "setupalign",
+ "setuparranging",
+ "setupbackground",
+ "setupbackgrounds",
+ "setupblackrules",
+ "setupblank",
+ "setupblock",
+ "setupbodyfont",
+ "setupbodyfontenvironment",
+ "setupbottom",
+ "setupbottomtexts",
+ "setupbuffer",
+ "setupbuttons",
+ "setupcapitals",
+ "setupcaption",
+ "setupcaptions",
+ "setupclipping",
+ "setupcolor",
+ "setupcolors",
+ "setupcolumns",
+ "setupcombinations",
+ "setupcombinedlist",
+ "setupcomment",
+ "setupdescriptions",
+ "setupenumerations",
+ "setupexternalfigures",
+ "setupfield",
+ "setupfields",
+ "setupfillinlines",
+ "setupfillinrules",
+ "setupfloat",
+ "setupfloats",
+ "setupfloatsplitting",
+ "setupfooter",
+ "setupfootertexts",
+ "setupfootnotedefinition",
+ "setupfootnotes",
+ "setupforms",
+ "setupformulae",
+ "setupframed",
+ "setupframedtexts",
+ "setuphead",
+ "setupheader",
+ "setupheadertexts",
+ "setupheadnumber",
+ "setupheads",
+ "setupheadtext",
+ "setuphyphenmark",
+ "setupindentations",
+ "setupindenting",
+ "setupinmargin",
+ "setupinteraction",
+ "setupinteractionbar",
+ "setupinteractionscreen",
+ "setupinterlinespace",
+ "setupinterlinespace",
+ "setupitemgroup",
+ "setupitems",
+ "setuplabeltext",
+ "setuplanguage",
+ "setuplayout",
+ "setuplegend",
+ "setuplinenumbering",
+ "setuplines",
+ "setuplinewidth",
+ "setuplist",
+ "setuplistalternative",
+ "setupmakeup",
+ "setupmarginblocks",
+ "setupmarginrules",
+ "setupmarking",
+ "setupnarrower",
+ "setupnumbering",
+ "setupoppositeplacing",
+ "setupoutput",
+ "setuppagenumber",
+ "setuppagenumbering",
+ "setuppagetransitions",
+ "setuppalet",
+ "setuppaper",
+ "setuppapersize",
+ "setupparagraphnumbering",
+ "setupparagraphs",
+ "setuppositioning",
+ "setupprofiles",
+ "setupprograms",
+ "setuppublications",
+ "setupquote",
+ "setupreferencelist",
+ "setupreferencing",
+ "setupregister",
+ "setuprotate",
+ "setuprule",
+ "setupscreens",
+ "setupsection",
+ "setupsectionblock",
+ "setupsorting",
+ "setupspacing",
+ "setupstrut",
+ "setupsubpagenumber",
+ "setupsymbolset",
+ "setupsynchronization",
+ "setupsynchronizationbar",
+ "setupsynonyms",
+ "setupsystem",
+ "setuptab",
+ "setuptables",
+ "setuptabulate",
+ "setuptext",
+ "setuptextposition",
+ "setuptextrules",
+ "setuptexttexts",
+ "setuptextvariable",
+ "setupthinrules",
+ "setuptolerance",
+ "setuptop",
+ "setuptoptexts",
+ "setuptype",
+ "setuptyping",
+ "setupunderbar",
+ "setupurl",
+ "setupversions",
+ "setupwhitespace",
+ "showbodyfont",
+ "showbodyfontenvironment",
+ "showcolor",
+ "showcolorgroup",
+ "showexternalfigures",
+ "showfields",
+ "showframe",
+ "showgrid",
+ "showlayout",
+ "showmakeup",
+ "showpalet",
+ "showprint",
+ "showsetups",
+ "showstruts",
+ "showsymbolset",
+ "someline",
+ "somewhere",
+ "sort",
+ "space",
+ "splitfloat",
+ "startalignment",
+ "startbackground",
+ "startbuffer",
+ "startcolor",
+ "startcolumns",
+ "startcombination",
+ "startcomment",
+ "startcomponent",
+ "startdescription",
+ "startdocument",
+ "startenumeration",
+ "startenvironment",
+ "startfact",
+ "startfigure",
+ "startfloattext",
+ "startformula",
+ "startframedtext",
+ "starthiding",
+ "startinteractionmenu",
+ "startitemgroup",
+ "startlegend",
+ "startline",
+ "startlinecorrection",
+ "startlinenumbering",
+ "startlines",
+ "startlocal",
+ "startlocalenvironment",
+ "startlocalfootnotes",
+ "startmakeup",
+ "startmarginblock",
+ "startmarginrule",
+ "startnamemakeup",
+ "startnarrower",
+ "startopposite",
+ "startoverlay",
+ "startoverview",
+ "startpacked",
+ "startparagraph",
+ "startpositioning",
+ "startpostponing",
+ "startproduct",
+ "startprofile",
+ "startproject",
+ "startquotation",
+ "startregister",
+ "startsymbolset",
+ "startsynchronization",
+ "starttable",
+ "starttables",
+ "starttabulate",
+ "starttextrule",
+ "starttyping",
+ "startunpacked",
+ "startversion",
+ "stopalignment",
+ "stopbackground",
+ "stopbuffer",
+ "stopcolor",
+ "stopcolumns",
+ "stopcombination",
+ "stopcomment",
+ "stopcomponent",
+ "stopdescription",
+ "stopdocument",
+ "stopenumeration",
+ "stopenvironment",
+ "stopfact",
+ "stopfigure",
+ "stopfloattext",
+ "stopformula",
+ "stopframedtext",
+ "stophiding",
+ "stopinteractionmenu",
+ "stopitemgroup",
+ "stoplegend",
+ "stopline",
+ "stoplinecorrection",
+ "stoplinenumbering",
+ "stoplines",
+ "stoplocal",
+ "stoplocalenvironment",
+ "stoplocalfootnotes",
+ "stopmakeup",
+ "stopmarginblock",
+ "stopmarginrule",
+ "stopnamemakeup",
+ "stopnarrower",
+ "stopopposite",
+ "stopoverlay",
+ "stopoverview",
+ "stoppacked",
+ "stopparagraph",
+ "stoppositioning",
+ "stoppostponing",
+ "stopproduct",
+ "stopprofile",
+ "stopproject",
+ "stopquotation",
+ "stopsymbolset",
+ "stopsynchronization",
+ "stoptable",
+ "stoptables",
+ "stoptabulate",
+ "stoptextrule",
+ "stoptyping",
+ "stopunpacked",
+ "stopversion",
+ "stretched",
+ "sub",
+ "subject",
+ "subsection",
+ "subsubject",
+ "subsubsection",
+ "subsubsubject",
+ "switchtobodyfont",
+ "switchtorawfont",
+ "sym",
+ "symbol",
+ "synchronizationbar",
+ "synchronize",
+ "synonym",
+ "tab",
+ "tex",
+ "textreference",
+ "textrule",
+ "textvariable",
+ "thinrule",
+ "thinrules",
+ "title",
+ "tooltip",
+ "translate",
+ "typ",
+ "type",
+ "typebuffer",
+ "typefile",
+ "underbar",
+ "underbars",
+ "useURL",
+ "useblocks",
+ "usecommands",
+ "usedirectory",
+ "useencoding",
+ "useexternaldocument",
+ "useexternalfigure",
+ "useexternalfile",
+ "useexternalfiles",
+ "useexternalsoundtrack",
+ "usemodule",
+ "usereferences",
+ "usespecials",
+ "usesymbols",
+ "version",
+ "vl",
+ "weekday",
+ "whitespace",
+ "wordright",
+ "writebetweenlist",
+ "writetolist",
+ "writetoreferencelist",
+ "writetoregister",
+}
+
+local tex_word_match = word_match(word_list(some_words))
+
+--~ local function tex_preamble_match()
+--~     return P(function(input, index)
+--~         if index < 10 then
+--~             local s, e, word = input:find('^(.+)[\n\r]',index)
+--~             if word then
+--~                 local interface = word:match("interface=(..)")
+--~                 if interface then
+--~                     local name = "c:/data/develop/context/lua/textadept/cont-" .. interface .. "-scite.lua"
+--~                     --~ local f = io.open(name,"rb") -- fails
+--~                     if f then
+--~                         local data = f:read("*all")
+--~                         data = data and loadstring(data)
+--~                         data = data and data()
+--~                         if data and type(data) == "table" then
+--~                             some_words = word_list(data)
+--~                             context.LoadTokens()
+--~                         --  InitLexer(context)
+--~                         end
+--~                         f:close()
+--~                     end
+--~                 end
+--~             end
+--~         end
+--~         return false
+--~     end)
+--~ end
+
+local spacing      = token('whitespace', S(" \n\r\t\f")^1)
+--~ local preamble     = token('preamble',   P('%') * tex_preamble_match())
+local comment      = token('comment',    P('%') * (1-S("\n\r"))^0)
+local keyword      = token('keyword',    P('\\') * tex_word_match)
+local command      = token('command',    P('\\') * ((R("az","AZ")+S("@!?"))^1 + P(1)))
+local grouping     = token('grouping',   S("{$}"))
+local specials     = token('specials',   S("#()[]<>=\""))
+local extras       = token('extras',     S("`~%^&_-+/\'|"))
+
+-- LexByLine = true
+
+local startluacode           = token("grouping", P("\\startluacode"))
+local stopluacode            = token("grouping", P("\\stopluacode"))
+--~ local startctxlua            = token("grouping", P("\\ctxlua") * spacing^0 * P("{"))
+--~ local stopctxlua             = token("grouping", P("}"))
+
+--~ local startMPcode            = token("grouping", P("\\startMPcode"))
+--~ local stopMPcode             = token("grouping", P("\\stopMPcode"))
+--~ local startuseMPgraphic      = token("grouping", P("\\startuseMPgraphic"))
+--~ local stopuseMPgraphic       = token("grouping", P("\\stopuseMPgraphic"))
+--~ local startreusableMPgraphic = token("grouping", P("\\startreusableMPgraphic"))
+--~ local stopreusableMPgraphic  = token("grouping", P("\\stopreusableMPgraphic"))
+--~ local startuniqueMPgraphic   = token("grouping", P("\\startuniqueMPgraphic"))
+--~ local stopuniqueMPgraphic    = token("grouping", P("\\stopuniqueMPgraphic"))
+
+function LoadTokens()
+
+    lua.LoadTokens()
+
+    add_token(context, 'whitespace', spacing)
+--~ add_token(context, 'preamble',   preamble)
+    add_token(context, 'comment',    comment)
+    add_token(context, 'keyword',    keyword)
+    add_token(context, 'command',    command)
+    add_token(context, 'grouping',   grouping)
+    add_token(context, 'specials',   specials)
+    add_token(context, 'extras',     extras)
+    add_token(context, 'any_char',   any_char)
+
+    lua.TokenPatterns.any_char = token('default', 1 - stopluacode)
+
+    make_embeddable(lua, context, startluacode, stopluacode)
+--  make_embeddable(lua, context, startctxlua,  stopctxlua) -- no multiple embeddables unless more complex anychar
+    embed_language(context, lua)
+
+--  metapost.LoadTokens()
+--  metapost.TokenPatterns.any_char = token('any_char', 1 - stopMPcode - stopuseMPgraphic - stopreusableMPgraphic - stopuniqueMPgraphic)
+--  make_embeddable(metapost, context, startMPcode,            stopMPcode           )
+--  make_embeddable(metapost, context, startuseMPgraphic,      stopuseMPgraphic     )
+--  make_embeddable(metapost, context, startreusableMPgraphic, stopreusableMPgraphic)
+--  make_embeddable(metapost, context, startuniqueMPgraphic,   stopuniqueMPgraphic  )
+end
+
+local bold   = true
+local italic = true
+
+function LoadStyles()
+    add_style('preamble', style_nothing .. { fore = colors.yellow, bold = bold })
+    add_style('comment',  style_nothing .. { fore = colors.yellow, bold = bold })
+    add_style('keyword',  style_nothing .. { fore = colors.green,  bold = bold, italic = italic })
+    add_style('command',  style_nothing .. { fore = colors.green,  bold = bold })
+    add_style('grouping', style_nothing .. { fore = colors.red,    bold = bold })
+    add_style('specials', style_nothing .. { fore = colors.blue,   bold = bold })
+    add_style('extras',   style_nothing .. { fore = colors.yellow, bold = bold })
+end
+
+--~ textadept.mime_types.extensions["tex"]  = context
+--~ textadept.mime_types.extensions["mkii"] = context
+--~ textadept.mime_types.extensions["mkiv"] = context
diff --git a/Master/texmf-dist/context/data/texworks/TUG/TeXworks.ini b/Master/texmf-dist/context/data/texworks/TUG/TeXworks.ini
new file mode 100644
index 00000000000..8c0a4a43df3
--- /dev/null
+++ b/Master/texmf-dist/context/data/texworks/TUG/TeXworks.ini
@@ -0,0 +1,18 @@
+[General]
+launchOption=1
+locale=en
+syntaxColoring=ConTeXt TeX
+autoIndent=None
+wrapLines=false
+tabWidth=32
+font="Lucida Console,10,-1,5,50,0,0,0,0,0"
+language=None
+scaleOption=1
+previewScale=200
+magnifierSize=2
+circularMagnifier=true
+defaultEngine=ConTeXt MkIV
+binaryPaths=
+autoHideConsole=false
+openDialogDir=
+recentFileList=
diff --git a/Master/texmf-dist/context/data/texworks/TUG/texworks.ini b/Master/texmf-dist/context/data/texworks/TUG/texworks.ini
deleted file mode 100644
index 8ef43433ed1..00000000000
--- a/Master/texmf-dist/context/data/texworks/TUG/texworks.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-[General]
-launchOption=1
-locale=en
-syntaxColoring=ConTeXt TeX
-autoIndent=None
-wrapLines=false
-tabWidth=32
-font="Lucida Console,10,-1,5,50,0,0,0,0,0"
-language=None
-scaleOption=1
-previewScale=200
-magnifierSize=2
-circularMagnifier=true
-defaultEngine=ConTeXt MkIV
-binaryPaths=
-autoHideConsole=false
-openDialogDir=
-recentFileList=
-
-[engines]
-size=6
-1\arguments=--autogenerate, --script, context, $fullname
-1\name=ConTeXt MkIV
-1\program=mtxrun.cmd
-1\showPdf=true
-2\arguments=--autogenerate, --script, check, $fullname
-2\name=ConTeXt MkIV Check
-2\program=mtxrun.cmd
-2\showPdf=false
-3\arguments=--autogenerate, --script, context, --purgeall
-3\name=ConTeXt MkIV Purge
-3\program=mtxrun.cmd
-3\showPdf=false
-4\arguments=/c, start, mtxrun.cmd, --autogenerate, --script, server, --auto
-4\name=ConTeXt MkIV Server
-4\program=cmd.exe
-4\showPdf=false
-5\name=ConTeXt MkIV Update
-5\program=mtxrun.cmd
-5\arguments=--autogenerate, --script, update, --force, --make
-5\showPdf=false
-6\name=ConTeXt MkIV Make
-6\program=mtxrun.cmd
-6\arguments=--autogenerate, --script, context, --generate, --make
-6\showPdf=false
diff --git a/Master/texmf-dist/context/data/texworks/configuration/tools.ini b/Master/texmf-dist/context/data/texworks/configuration/tools.ini
new file mode 100644
index 00000000000..73071028b41
--- /dev/null
+++ b/Master/texmf-dist/context/data/texworks/configuration/tools.ini
@@ -0,0 +1,35 @@
+[001]
+name=ConTeXt MkIV
+program=mtxrun
+arguments=--autogenerate, --script, context, $fullname
+showPdf=true
+
+[002]
+name=ConTeXt MkIV Check
+program=mtxrun
+arguments=--autogenerate, --script, check, $fullname
+showPdf=false
+
+[003]
+name=ConTeXt MkIV Purge
+program=mtxrun
+arguments=--autogenerate, --script, context, --purgeall
+showPdf=false
+
+[004]
+name=ConTeXt MkIV Server
+program=cmd.exe
+arguments=/c, start, mtxrun, --autogenerate, --script, server, --auto
+showPdf=false
+
+[005]
+name=ConTeXt MkIV Update
+program=mtxrun
+arguments=--autogenerate, --script, update, --force, --make
+showPdf=false
+
+[006]
+name=ConTeXt MkIV Make
+program=mtxrun
+arguments=--autogenerate, --script, context, --generate, --make
+showPdf=false