7 files changed, 223 insertions, 150 deletions
diff --git a/tex/context/modules/common/s-abbreviations-extras.tex b/tex/context/modules/common/s-abbreviations-extras.tex
new file mode 100644
index 000000000..7ee6e1553
--- /dev/null
+++ b/tex/context/modules/common/s-abbreviations-extras.tex
@@ -0,0 +1,56 @@
+%D \module
+%D   [       file=s-abbrevations-extras.tex, % was: s-abr-01
+%D        version=1996.01.01,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=General Abbreviated Extras,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\startmodule[abbreviations-extras]
+
+\def\SystemSpecialA#1{$\langle\it#1\rangle$}
+\def\SystemSpecialB#1{{\tttf<#1>}}
+
+\unexpanded\def\CATCODE     {\SystemSpecialA{catcode}}
+\unexpanded\def\CATCODES    {\SystemSpecialA{catcodes}}
+\unexpanded\def\DIMENSION   {\SystemSpecialA{dimension}}
+\unexpanded\def\DIMENSIONS  {\SystemSpecialA{dimensions}}
+\unexpanded\def\COUNTER     {\SystemSpecialA{counter}}
+\unexpanded\def\COUNTERS    {\SystemSpecialA{counters}}
+\unexpanded\def\HBOX        {\SystemSpecialA{hbox}}
+\unexpanded\def\HBOXES      {\SystemSpecialA{hboxes}}
+\unexpanded\def\VBOX        {\SystemSpecialA{vbox}}
+\unexpanded\def\VBOXES      {\SystemSpecialA{vboxes}}
+\unexpanded\def\BOX         {\SystemSpecialA{box}}
+\unexpanded\def\BOXES       {\SystemSpecialA{boxes}}
+\unexpanded\def\TOKENLIST   {\SystemSpecialA{token list}}
+\unexpanded\def\TOKENLISTS  {\SystemSpecialA{token lists}}
+\unexpanded\def\NEWLINE     {\SystemSpecialA{newline}}
+\unexpanded\def\SKIP        {\SystemSpecialA{skip}}
+\unexpanded\def\SKIPS       {\SystemSpecialA{skips}}
+\unexpanded\def\MUSKIP      {\SystemSpecialA{muskip}}
+\unexpanded\def\MUSKIPS     {\SystemSpecialA{muskips}}
+\unexpanded\def\MARK        {\SystemSpecialA{mark}}
+\unexpanded\def\MARKS       {\SystemSpecialA{marks}}
+
+\unexpanded\def\SPACE       {\SystemSpecialB{space}}
+\unexpanded\def\EOF         {\SystemSpecialB{eof}}
+\unexpanded\def\TAB         {\SystemSpecialB{tab}}
+\unexpanded\def\NEWPAGE     {\SystemSpecialB{newpage}}
+\unexpanded\def\NEWLINE     {\SystemSpecialB{newline}}
+
+\unexpanded\def\LUWATEEKH   {لُواتيخ} % kh ī t ā w [u] l
+\unexpanded\def\luwateekh   {luwātīkh}
+
+\doifmodeelse {mkiv} {
+    \unexpanded\def\THANH{H\agrave n Th\ecircumflexacute\ Th\agrave nh}
+} {
+    \unexpanded\def\THANH{H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}
+}
+
+\stopmodule
diff --git a/tex/context/modules/common/s-abr-01.tex b/tex/context/modules/common/s-abbreviations-logos.tex
index fd6c66419..f1966f544 100644
--- a/tex/context/modules/common/s-abr-01.tex
+++ b/tex/context/modules/common/s-abbreviations-logos.tex
@@ -1,8 +1,8 @@
 %D \module
-%D   [      file=s-abr-01,
+%D   [       file=s-abbrevations-logos.tex, % was: s-abr-01
 %D        version=1996.01.01,
 %D          title=\CONTEXT\ Style File,
-%D       subtitle=General Abbreviations 1,
+%D       subtitle=General Abbreviated Logos,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
@@ -11,13 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\unprotect
-
-\setupsorting[logo][\c!style=\v!capital]
-
-\setupcapitals[\c!title=\v!no]
-
-\protect
+\startmodule[abbreviations-logos]
 
 \logo [MKI]           {MkI}   % joke
 \logo [MKII]          {MkII}
@@ -31,52 +25,53 @@
 \logo [MPII]          {MpII}
 \logo [MPIV]          {MpIV}
 
-%logo [FGA]           {fga}
-%logo [FGBBS]         {fgbbs}
 \logo [ACROBAT]       {Acro\-bat}
-\logo [APA]           {apa}
 \logo [AFM]           {afm}
-\logo [API]           {api}
+\logo [AI]            {ai}
 \logo [ALEPH]         {Aleph} % {\mathematics{\aleph}}
 \logo [ALGOL]         {ALGOL}
 \logo [AMS]           {ams}
 \logo [AMSLATEX]      {\AmSLaTeX}
 \logo [AMSTEX]        {\AmSTeX}
 \logo [ANSI]          {ansi}
-\logo [ARABTEX]       {Arab\TeX}
+\logo [APA]           {apa}
+\logo [API]           {api}
+\logo [ARABTEX]       {Arab\TeXsuffix}
 \logo [ASCII]         {ascii}
-\logo [ASCIITEX]      {ascii\TeX}
 \logo [ASCIIMATH]     {AsciiMath}
-\logo [BACHOTEX]      {Bacho\TeX}
-\logo [BIBTEX]        {bib\TeX}
-\logo [MLBIBTEX]      {MLbib\TeX}
+\logo [ASCIITEX]      {ascii\TeXsuffix}
+\logo [BACHOTEX]      {Bacho\TeXsuffix}
+\logo [BIBTEX]        {bib\TeXsuffix}
 \logo [BLUESKY]       {BlueSky}
 \logo [BMP]           {bmp}
 \logo [BSD]           {bsd}
-\logo [CCODE]         {C}
-\logo [CPLUSPLUS]     {C\high{++}}
 \logo [CALCMATH]      {CalcMath}
-\logo [CLD]           {cld}
+\logo [CCODE]         {C}
 \logo [CD]            {cd}
-\logo [CPU]           {cpu}
 \logo [CDROM]         {cdrom}
 \logo [CID]           {cid}
 \logo [CJK]           {cjk}
-\logo [CMR]           {cmr}
 \logo [CLD]           {cld}
+\logo [CLD]           {cld}
+\logo [CMR]           {cmr}
 \logo [CMYK]          {cmyk}
+\logo [CNC]           {cnc}
 \logo [CODHOST]       {CodHost}
 \logo [CONTEXT]       {\ConTeXt}
-\logo [CONTEXTWIKI]   {\ConTeXt\ Wiki}
 \logo [CONTEXTGROUP]  {\ConTeXt\ Group}
+\logo [CONTEXTWIKI]   {\ConTeXt\ Wiki}
+\logo [CPLUSPLUS]     {C\high{++}}
+\logo [CPU]           {cpu}
 \logo [CSS]           {css}
 \logo [CTAN]          {ctan}
 \logo [CTXTOOLS]      {ctxtools}
 \logo [CWEB]          {cweb}
-\logo [CSTUG]         {cstug}
-\logo [DANTE]         {Dante}
+\logo [DAC]           {dac}
+\logo [DECTEN]        {dec-10}
 \logo [DISTILLER]     {distiller}
-\logo [DRATEX]        {Dra\TeX}
+\logo [DNA]           {dna}
+\logo [DPI]           {dpi}
+\logo [DRATEX]        {Dra\TeXsuffix}
 \logo [DSC]           {dsc}
 \logo [DTD]           {dtd}
 \logo [DTK]           {dtk}
@@ -94,15 +89,15 @@
 \logo [EC]            {ec}
 \logo [EIFFEL]        {Eiffel}
 \logo [EMACS]         {emacs}
-\logo [EMTEX]         {em\TeX}
+\logo [EMTEX]         {em\TeXsuffix}
 \logo [ENCODING]      {enc}
-\logo [ENCTEX]        {enc\TeX}
-\logo [EPUB]          {ePub}
+\logo [ENCTEX]        {enc\TeXsuffix}
 \logo [EPS]           {eps}
+\logo [EPUB]          {ePub}
 \logo [ETEX]          {\eTeX}
-\logo [EUROBACHOTEX]  {EuroBacho\TeX}
+\logo [EUROBACHOTEX]  {EuroBacho\TeXsuffix}
 \logo [EUROMATH]      {EuroMath}
-\logo [EUROTEX]       {Euro\TeX}
+\logo [EUROTEX]       {Euro\TeXsuffix}
 \logo [EXAMPLE]       {eXaMpLe}
 \logo [EXAMPLED]      {exampled}
 \logo [EXAMPLEQ]      {exampleq}
@@ -110,14 +105,18 @@
 \logo [EXAMPLET]      {examplet}
 \logo [EXAMPLEX]      {examplex}
 \logo [EXIMPLE]       {eXiMpLe}
-\logo [FLAC]          {flac}
 \logo [FAQ]           {faq}
 \logo [FDF]           {fdf}
+\logo [FFI]           {ffi}
+%logo [FGA]           {fga}
+%logo [FGBBS]         {fgbbs}
+\logo [FLAC]          {flac}
 \logo [FONTFORGE]     {FontForge}
 \logo [FOXET]         {foXet}
-\logo [FPTEX]         {fp\TeX}
+\logo [FPTEX]         {fp\TeXsuffix}
 \logo [FREEBSD]       {FreeBSD}
 \logo [FTP]           {ftp}
+\logo [GCC]           {gcc}
 \logo [GHOSTSCRIPT]   {Ghost\-script}
 \logo [GHOSTVIEW]     {Ghost\-view}
 \logo [GIF]           {gif}
@@ -125,31 +124,30 @@
 \logo [GNUPLOT]       {gnuplot}
 \logo [GS]            {Ghost\-Script}
 \logo [GUST]          {Gust}
-\logo [GCC]           {gcc}
-\logo [GWTEX]         {gw\TeX}
+\logo [GWTEX]         {gw\TeXsuffix}
 \logo [HSB]           {hsb} % ?
 \logo [HSV]           {hsv}
 \logo [HTML]          {html}
 \logo [HTTP]          {http}
+\logo [HTTPS]         {https}
 \logo [HZ]            {hz}
 \logo [IBM]           {ibm}
 \logo [IMAGEMAGICK]   {ImageMagick}
-\logo [INITEX]        {ini\TeX}
-\logo [INRSTEX]       {inrs\TeX}
+\logo [INITEX]        {ini\TeXsuffix}
+\logo [INRSTEX]       {inrs\TeXsuffix}
 \logo [IO]            {io}
 \logo [IRCNET]        {IRCnet}
 \logo [ISO]           {iso}
 \logo [JAVA]          {Java}
 \logo [JAVASCRIPT]    {Java\-Script}
+\logo [JBIG]          {jbig}
 \logo [JPEG]          {jpeg}
 \logo [JPG]           {jpg}
-\logo [JBIG]          {jbig}
+\logo [JSON]          {json}
 \logo [KPATHSEA]      {kpathsea}
 \logo [KPSE]          {kpse}
-\logo [KVM]           {kvm}
 \logo [KPSEWHICH]     {kpsewhich}
-\logo [MKTEXLSR]      {mktexlsr}
-\logo [MYSQL]         {MySQL}
+\logo [KVM]           {kvm}
 \logo [LAMSTEX]       {\LamSTeX}
 \logo [LATEX]         {\LaTeX}
 \logo [LATEXTE]       {\LaTeX2e}
@@ -157,61 +155,67 @@
 \logo [LCD]           {lcd}
 \logo [LINUX]         {linux}
 \logo [LISP]          {Lisp}
+\logo [LMX]           {lmx}
 \logo [LPEG]          {lpeg}
 \logo [LUA]           {Lua}
 \logo [LUAJIT]        {LuaJIT}
-\logo [LUAJITTEX]     {Luajit\TeX}
-\logo [LUATEX]        {Lua\TeX}
+\logo [LUAJITTEX]     {Luajit\TeXsuffix}
+\logo [LUATEX]        {Lua\TeXsuffix}
 \logo [LUATOOLS]      {luatools}
-\logo [LMX]           {lmx}
 \logo [MACOSX]        {MacOSX}
-\logo [MACROTEX]      {Macro\TeX}
+\logo [MACROTEX]      {Macro\TeXsuffix}
 \logo [MAKEMPY]       {MakeMPY}
 \logo [MAPPING]       {map}
 \logo [MAPS]          {Maps}
 \logo [MATHML]        {MathML}
 \logo [METAFONT]      {\MetaFont}
+\logo [METAFUN]       {\MetaFun}
 \logo [METAPOST]      {\MetaPost}
-\logo [METATEX]       {Meta\TeX}
-\logo [MIKTEX]        {Mik\TeX}
-\logo [MINGW]         {MingW}
-\logo [MLTEX]         {ml\TeX}
+\logo [METATEX]       {Meta\TeXsuffix}
 \logo [METATYPE]      {MetaType1}
+\logo [MICROSOFT]     {Microsoft}
+\logo [MIKTEX]        {Mik\TeXsuffix}
+\logo [MINGW]         {MingW}
+\logo [MKTEXLSR]      {mktexlsr}
+\logo [MLBIBTEX]      {MLbib\TeXsuffix}
+\logo [MLTEX]         {ml\TeXsuffix}
 \logo [MODULA]        {Modula}
 \logo [MOV]           {mov}
 \logo [MPEG]          {mpeg}
+\logo [MPLIB]         {mplib}
 \logo [MPS]           {mps}
 \logo [MPTOPDF]       {mptopdf}
-\logo [MPLIB]         {mplib}
 \logo [MSDOS]         {msdos}
-\logo [MICROSOFT]     {Microsoft}
 \logo [MSWINDOWS]     {MS~Windows}
 \logo [MSWORD]        {MS~Word}
+\logo [MSEXCEL]       {MS~Excel}
 \logo [MTXRUN]        {mtxrun}
 \logo [MTXTOOLS]      {mtxtools}
+\logo [MYSQL]         {MySQL}
 \logo [NETPBM]        {NetPBM}
 \logo [NTG]           {ntg}
 \logo [NTS]           {nts}
+\logo [NGINX]         {nginx}
 \logo [OFM]           {ofm}
 \logo [OMEGA]         {Omega}
 \logo [OPENMATH]      {OpenMath}
 \logo [OPENTYPE]      {OpenType}
 \logo [OPI]           {opi}
-\logo [OTEX]          {Oriental \TeX}
+\logo [OTEX]          {Oriental \TeXsuffix}
 \logo [OTF]           {otf}
 \logo [OTP]           {otp}
 \logo [OVF]           {ovf}
 \logo [PASCAL]        {Pascal}
-\logo [PCTEX]         {pc\TeX}
-\logo [PFA]           {pfa}
-\logo [PFB]           {pfb}
+\logo [PCTEX]         {pc\TeXsuffix}
 \logo [PDF]           {pdf}
-\logo [PDFETEX]       {pdfe\TeX}
-\logo [PDFTEX]        {pdf\TeX}
+\logo [PDFETEX]       {pdfe\TeXsuffix}
+\logo [PDFTEX]        {pdf\TeXsuffix}
 \logo [PDFTOOLS]      {pdftools}
 \logo [PDFTOPS]       {pdftops}
 \logo [PERL]          {Perl}
 \logo [PERLTK]        {Perl/Tk}
+\logo [PFA]           {pfa}
+\logo [PFB]           {pfb}
 \logo [PICTEX]        {\PiCTeX}
 \logo [PK]            {pk}
 \logo [PLAIN]         {Plain}
@@ -228,50 +232,56 @@
 \logo [PSTOPAGE]      {pstopage}
 \logo [PSTOPDF]       {pstopdf}
 \logo [PSTRICKS]      {pstricks}
+\logo [RAID]          {raid}
 \logo [RAM]           {ram}
+\logo [RCA]           {RCA}
 \logo [READER]        {Acro\-bat Reader}
 \logo [RELAXNG]       {Relax\kern.125emNG}
 \logo [RGB]           {rgb}
 \logo [RLXTOOLS]      {rlxtools}
 \logo [RUBY]          {Ruby}
+\logo [RSYNC]         {Rsync}
 \logo [SCITE]         {SciTE}
 \logo [SGML]          {sgml}
 \logo [SI]            {si}
 \logo [SQL]           {sql}
 \logo [SSD]           {ssd}
-\logo [SVG]           {svg}
 \logo [STIX]          {Stix}
 \logo [SUMATRAPDF]    {SumatraPDF}
+\logo [SVG]           {svg}
+\logo [SVN]           {svn}
 \logo [SWIG]          {swig}
 \logo [SWIGLIB]       {SwigLib}
+\logo [SYNCTEX]       {Sync\TeX}
 \logo [TABLE]         {\TaBlE}
 \logo [TCPIP]         {tcp/ip}
-\logo [TDS]           {tds}  % no sc te
-\logo [TEI]           {tei}  % no sc te
-\logo [TETEX]         {te\TeX}  % no sc te
+\logo [TDS]           {tds}           % no sc te
+\logo [TEI]           {tei}           % no sc te
+\logo [TETEX]         {te\TeXsuffix}  % no sc te
 \logo [TEX]           {\TeX}
-\logo [TEXADRES]      {\TeX adress}
-\logo [TEXBASE]       {\TeX base}
-\logo [TEXEDIT]       {\TeX edit}
-\logo [TEXEXEC]       {\TeX exec}
-\logo [TEXFONT]       {\TeX font}
-\logo [TEXFORM]       {\TeX form}
-\logo [TEXLIVE]       {\TeX Live}
-\logo [TEXLUA]        {\TeX Lua}
+\logo [TEXADRES]      {\TeXprefix adress}
+\logo [TEXBASE]       {\TeXprefix base}
+\logo [TEXEDIT]       {\TeXprefix edit}
+\logo [TEXEXEC]       {\TeXprefix exec}
+\logo [TEXFONT]       {\TeXprefix font}
+\logo [TEXFORM]       {\TeXprefix form}
+\logo [TEXGYRE]       {\TeX\ Gyre}
+\logo [TEXLIVE]       {\TeXprefix Live}
+\logo [TEXLUA]        {\TeXprefix Lua}
 \logo [TEXMF]         {texmf}
 \logo [TEXMFSTART]    {texmfstart}
 \logo [TEXNL]         {tex-nl}
-\logo [TEXSHOW]       {\TeX show}
-\logo [TEXSPELL]      {\TeX spell}
-\logo [TEXGYRE]       {\TeX\ Gyre}
+\logo [TEXSHOW]       {\TeXprefix show}
+\logo [TEXSPELL]      {\TeXprefix spell}
 \logo [TEXSYNC]       {texsync}
 \logo [TEXTMATE]      {TextMate}
-\logo [TEXTOOLS]      {\TeX tools}
-\logo [TEXUTIL]       {\TeX util}
-\logo [TEXWORK]       {\TeX work}
-\logo [TEXWORKS]      {\TeX works}
-\logo [TEXXET]        {\TeX\XeT}   \def\XeT{XeT}
+\logo [TEXTOOLS]      {\TeXprefix tools}
+\logo [TEXUTIL]       {\TeXprefix util}
+\logo [TEXWORK]       {\TeXprefix work}
+\logo [TEXWORKS]      {\TeXprefix works}
+\logo [TEXXET]        {\TeX\XeT}          \def\XeT{XeT}
 \logo [TFM]           {tfm}
+\logo [THREED]        {3D}
 \logo [TIF]           {tif}
 \logo [TIFF]          {tiff}
 \logo [TIFFINFO]      {tiffinfo}
@@ -292,10 +302,12 @@
 \logo [URI]           {uri}
 \logo [URL]           {url}
 \logo [USA]           {usa}
+\logo [USB]           {usb}
 \logo [USENET]        {usenet}
 \logo [UTF]           {utf}
-\logo [USB]           {usb}
+\logo [VAX]           {vax}
 \logo [VF]            {vf}
+\logo [VMWARE]        {VMWare}
 \logo [WDT]           {wdt}
 \logo [WEB]           {web}
 \logo [WEBC]          {web2c}
@@ -303,8 +315,8 @@
 \logo [WINDOWS]       {Windows}
 \logo [WINNT]         {WinNT}
 \logo [WINNX]         {Win9x}
-\logo [WWW]           {www}
 \logo [WTHREEC]       {W3C}
+\logo [WWW]           {www}
 \logo [WYSIWYG]       {wysiwyg}
 \logo [XDVI]          {Xdvi}
 \logo [XETEX]         {\XeTeX}
@@ -313,60 +325,16 @@
 \logo [XINDY]         {Xindy}
 \logo [XITS]          {Xits}
 \logo [XML]           {xml}
-\logo [XPATH]         {xpath}
 \logo [XMLTOOLS]      {xmltools}
-\logo [XPDFETEX]      {xpdfe\TeX}
+\logo [XPATH]         {xpath}
+\logo [XPDFETEX]      {xpdfe\TeXsuffix}
 \logo [XSL]           {xsl}
 \logo [XSLFO]         {xsl-fo}
 \logo [XSLT]          {xslt}
 \logo [XSLTPROC]      {xsltproc}
 \logo [XYPIC]         {XYPIC} % wrong logo
-\logo [VMWARE]        {VMWare}
 \logo [YandY]         {y\&y}
+\logo [YOUTUBE]       {YouTube}
 \logo [ZIP]           {zip}
 
-\def\METAFUN       {\MetaFun}
-
-\logo [METAFUN]    {\MetaFun}
-
-\def\SystemSpecialA#1{$\langle\it#1\rangle$}
-\def\SystemSpecialB#1{{\tttf<#1>}}
-
-\unexpanded\def\CATCODE     {\SystemSpecialA{catcode}}
-\unexpanded\def\CATCODES    {\SystemSpecialA{catcodes}}
-\unexpanded\def\DIMENSION   {\SystemSpecialA{dimension}}
-\unexpanded\def\DIMENSIONS  {\SystemSpecialA{dimensions}}
-\unexpanded\def\COUNTER     {\SystemSpecialA{counter}}
-\unexpanded\def\COUNTERS    {\SystemSpecialA{counters}}
-\unexpanded\def\HBOX        {\SystemSpecialA{hbox}}
-\unexpanded\def\HBOXES      {\SystemSpecialA{hboxes}}
-\unexpanded\def\VBOX        {\SystemSpecialA{vbox}}
-\unexpanded\def\VBOXES      {\SystemSpecialA{vboxes}}
-\unexpanded\def\BOX         {\SystemSpecialA{box}}
-\unexpanded\def\BOXES       {\SystemSpecialA{boxes}}
-\unexpanded\def\TOKENLIST   {\SystemSpecialA{token list}}
-\unexpanded\def\TOKENLISTS  {\SystemSpecialA{token lists}}
-\unexpanded\def\NEWLINE     {\SystemSpecialA{newline}}
-\unexpanded\def\SKIP        {\SystemSpecialA{skip}}
-\unexpanded\def\SKIPS       {\SystemSpecialA{skips}}
-\unexpanded\def\MUSKIP      {\SystemSpecialA{muskip}}
-\unexpanded\def\MUSKIPS     {\SystemSpecialA{muskips}}
-\unexpanded\def\MARK        {\SystemSpecialA{mark}}
-\unexpanded\def\MARKS       {\SystemSpecialA{marks}}
-
-\unexpanded\def\SPACE       {\SystemSpecialB{space}}
-\unexpanded\def\EOF         {\SystemSpecialB{eof}}
-\unexpanded\def\TAB         {\SystemSpecialB{tab}}
-\unexpanded\def\NEWPAGE     {\SystemSpecialB{newpage}}
-\unexpanded\def\NEWLINE     {\SystemSpecialB{newline}}
-
-\unexpanded\def\LUWATEEKH   {لُواتيخ} % kh ī t ā w [u] l
-\unexpanded\def\luwateekh   {luwātīkh}
-
-\doifmodeelse {mkiv} {
-    \unexpanded\def\THANH{H\agrave n Th\ecircumflexacute\ Th\agrave nh}
-} {
-    \unexpanded\def\THANH{H\`an Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh}
-}
-
-\endinput
+\stopmodule
diff --git a/tex/context/modules/common/s-abr-02.tex b/tex/context/modules/common/s-abbreviations-mixed.mkiv
index 8bb6a2898..f7b2121d0 100644
--- a/tex/context/modules/common/s-abr-02.tex
+++ b/tex/context/modules/common/s-abbreviations-mixed.mkiv
@@ -1,8 +1,8 @@
 %D \module
-%D   [      file=s-abr-02,
+%D   [      file= s-abbreviations-mixed, % was: s-abr-04
 %D        version=1996.01.01,
 %D          title=\CONTEXT\ Style File,
-%D       subtitle=General Abbreviations 2,
+%D       subtitle=General Abbreviations Mixed,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
@@ -11,12 +11,18 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\usemodule[abr-01]
-
 \unprotect
 
-\setupsorting[logo][\c!style=\v!smallcaps]
+\setupsorting
+  [logo]
+  [\c!style=\font_style_pseudoMixedCapped]
+
+\protect
+
+\startmodule[abbreviations-mixed]
+
+\usemodule[abbreviations-logos]
+\usemodule[abbreviations-extras]
 
-\setupcapitals[\c!title=\v!no]
+\stopmodule
 
-\protect \endinput
diff --git a/tex/context/modules/common/s-abr-04.tex b/tex/context/modules/common/s-abbreviations-pseudocaps.mkiv
index 23940b526..fa8606a7b 100644
--- a/tex/context/modules/common/s-abr-04.tex
+++ b/tex/context/modules/common/s-abbreviations-pseudocaps.mkiv
@@ -1,8 +1,8 @@
 %D \module
-%D   [      file=s-abr-04,
+%D   [      file= s-abbreviations-pseudocaps, % was: s-abr-01
 %D        version=1996.01.01,
 %D          title=\CONTEXT\ Style File,
-%D       subtitle=General Abbreviations 2,
+%D       subtitle=General Abbreviations Pseudocaps,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
@@ -11,14 +11,20 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\usemodule[abr-01]
-
 \unprotect
 
-% \definealternativestyle [\v!mixed]   [\font_style_pseudoMixedCapped] [\font_style_pseudoMixedCapped]
+\setupsorting
+  [logo]
+  [\c!style=\v!capital]
+
+\setupcapitals
+  [\c!title=\v!no]
+
+\protect
 
-\setupsorting[logo][\c!style=\font_style_pseudoMixedCapped]
+\startmodule[abbreviations-pseudocaps]
 
-% \setupcapitals[\c!title=\v!no]
+\usemodule[abbreviations-logos]
+\usemodule[abbreviations-extras]
 
-\protect \endinput
+\stopmodule
diff --git a/tex/context/modules/common/s-abbreviations-smallcaps.mkiv b/tex/context/modules/common/s-abbreviations-smallcaps.mkiv
new file mode 100644
index 000000000..2ce86ca33
--- /dev/null
+++ b/tex/context/modules/common/s-abbreviations-smallcaps.mkiv
@@ -0,0 +1,31 @@
+%D \module
+%D   [      file= s-abbreviations-smallcaps, % was: s-abr-02
+%D        version=1996.01.01,
+%D          title=\CONTEXT\ Style File,
+%D       subtitle=General Abbreviations Smallcaps,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\unprotect
+
+\setupsorting
+  [logo]
+  [\c!style=\v!smallcaps]
+
+\setupcapitals
+  [\c!title=\v!no]
+
+\protect
+
+\startmodule[abbreviations-smallcaps]
+
+\usemodule[abbreviations-logos]
+\usemodule[abbreviations-extras]
+
+\stopmodule
+
diff --git a/tex/context/modules/common/s-abr-03.tex b/tex/context/modules/common/s-abbreviations-words.mkiv
index 8247b68a9..2b7d7cedc 100644
--- a/tex/context/modules/common/s-abr-03.tex
+++ b/tex/context/modules/common/s-abbreviations-words.mkiv
@@ -1,8 +1,8 @@
 %D \module
-%D   [      file=s-abr-03,
+%D   [      file= s-abbreviations-words, % was: s-abr-32
 %D        version=1998.08.10,
 %D          title=\CONTEXT\ Style File,
-%D       subtitle=General Abbreviations 3,
+%D       subtitle=General Abbreviations Words,
 %D         author=Hans Hagen,
 %D           date=\currentdate,
 %D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
@@ -11,12 +11,18 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\usemodule[abr-01]
-
 \unprotect
 
-\setupsorting[logo][\c!style=\v!WORD]
+\setupsorting
+  [logo]
+  [\c!style=\v!WORD]
 
 \protect
 
-\endinput
+\startmodule[abbreviations-words]
+
+\usemodule[abbreviations-logos]
+\usemodule[abbreviations-extras]
+
+\stopmodule
+
diff --git a/tex/context/modules/common/s-mod.ctx b/tex/context/modules/common/s-mod.ctx
index 09ecf714c..0560c6cfb 100644
--- a/tex/context/modules/common/s-mod.ctx
+++ b/tex/context/modules/common/s-mod.ctx
@@ -17,7 +17,7 @@
     </ctx:flags>
     <ctx:process>
         <ctx:resources>
-            <ctx:module>mod-01</ctx:module>
+            <ctx:module>module-basic</ctx:module>
         </ctx:resources>
     </ctx:process>
 </ctx:job>