new context package context-typescripts (16jun09)

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

95 files changed, 5373 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/context/third/typescripts/README b/Master/texmf-dist/doc/context/third/typescripts/README
new file mode 100644
index 00000000000..f8ba5f66b26
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/typescripts/README
@@ -0,0 +1,37 @@
+Wolfgang wrote this in http://news.gmane.org/find-root.php?message_id=%3cloom.20090331T223114%2d61%40post.gmane.org%3e
+
+
+== Installing Typescripts ==
+
+Put the typescript in 
+
+texmf-local/tex/context/third/typescrips/
+
+or in the current directory.
+
+
+== Updating Typescripts ==
+
+
+
+== Installing Fonts ==
+
+Put the fonts in 
+
+~/.fonts/
+
+or in the current directory.
+
+
+== Usage ==
+
+\usetypescriptfile[type-...] % load the typescript file
+\usetypescript[...] % load the typescript
+\setupbodyfont[...] 
+
+
+== Example ==
+
+\usetypescriptfile[type-asana]
+\usetypescript[asana]
+\setupbodyfont[asana,11pt]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
new file mode 100644
index 00000000000..ae690f1937f
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-adobe,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Adobe Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:minion]     [MinionPro]
+\definetypescriptprefix [f:myriad]     [MyriadPro]
+\definetypescriptprefix [f:warnockpro] [WarnockPro]
+
+% Minion / Warnock
+
+\starttypescript [serif] [minion,warnockpro]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}-Regular] [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}-It]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}-Bold]    [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}-BoldIt]  [features=default]
+\stoptypescript
+
+% Myriad
+
+\starttypescript [sans] [myriad]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}-Regular] [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}-It]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}-Bold]    [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}-BoldIt]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
new file mode 100644
index 00000000000..38e65ba9925
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-adobe,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Adobe Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:minion]     [minionpro]
+\definetypescriptprefix [f:myriad]     [myriadpro]
+\definetypescriptprefix [f:warnockpro] [warnockpro]
+
+% Minion / Warnock
+
+\starttypescript [serif] [minion,warnockpro]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}regular] [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}it]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]    [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}boldit]  [features=default]
+\stoptypescript
+
+% Myriad
+
+\starttypescript [sans] [myriad]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}regular] [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}it]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]    [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}boldit]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex
new file mode 100644
index 00000000000..6098e211987
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex
@@ -0,0 +1,71 @@
+%D \module
+%D   [       file=type-adobe,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Adobe Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [n:minion]     [Minion]
+\definetypescriptprefix [n:myriad]     [Myriad]
+\definetypescriptprefix [n:warnockpro] [WarnockPro]
+
+\starttypescriptcollection [adobe]
+
+% Minion
+
+\starttypescript [serif] [minion]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [minion]
+    \definetypeface [minion] [rm] [serif] [minion] [default]
+    \definetypeface [minion] [ss] [sans]  [myriad] [default]
+    \definetypeface [minion] [tt] [mono]  [modern] [default]
+    \definetypeface [minion] [mm] [math]  [modern] [default]
+\stoptypescript
+
+% Myriad
+
+\starttypescript [sans] [myriad]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [myriad]
+    \definetypeface [myriad] [rm] [serif] [minion] [default]
+    \definetypeface [myriad] [ss] [sans]  [myriad] [default]
+    \definetypeface [myriad] [tt] [mono]  [modern] [default]
+    \definetypeface [myriad] [mm] [math]  [modern] [default]
+\stoptypescript
+
+% Warnock
+
+\starttypescript [serif] [warnockpro]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [warnockpro]
+    \definetypeface [warnockpro] [rm] [serif] [warnockpro] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-adobe}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
new file mode 100644
index 00000000000..b787d62dd37
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
@@ -0,0 +1,23 @@
+%D \module
+%D   [       file=type-aller,
+%D        version=2008.11.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Aller Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [aller,aller-light,aller-display]
+    \definefontsynonym [Aller-Regular]      [name:Aller]              [features=default]
+    \definefontsynonym [Aller-Italic]       [name:Aller Italic]       [features=default]
+    \definefontsynonym [Aller-Bold]         [name:Aller Bold]         [features=default]
+    \definefontsynonym [Aller-BoldItalic]   [name:Aller Bold Italic]  [features=default]
+    \definefontsynonym [Aller-Display]      [name:Aller Display]      [features=default]
+    \definefontsynonym [Aller-LightRegular] [name:Aller Light]        [features=default]
+    \definefontsynonym [Aller-LightItalic]  [name:Aller Light Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
new file mode 100644
index 00000000000..ba61ddb126f
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
@@ -0,0 +1,23 @@
+%D \module
+%D   [       file=type-aller,
+%D        version=2008.11.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Aller Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [aller,aller-light,aller-display]
+    \definefontsynonym [Aller-Regular]      [name:aller]            [features=default]
+    \definefontsynonym [Aller-Italic]       [name:alleritalic]      [features=default]
+    \definefontsynonym [Aller-Bold]         [name:allerbold]        [features=default]
+    \definefontsynonym [Aller-BoldItalic]   [name:allerbolditalic]  [features=default]
+    \definefontsynonym [Aller-Display]      [name:allerdisplay]     [features=default]
+    \definefontsynonym [Aller-LightRegular] [name:allerlight]       [features=default]
+    \definefontsynonym [Aller-LightItalic]  [name:allerlightitalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex b/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex
new file mode 100644
index 00000000000..69fb116e321
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=type-aller,
+%D        version=2008.11.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Aller Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [aller]
+
+\starttypescript [sans] [aller]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Aller-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Aller-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Aller-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Aller-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [aller-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Aller-LightRegular] [features=default]
+    \definefontsynonym [SansItalic] [Aller-LightItalic]  [features=default]
+\stoptypescript
+
+\starttypescript [sans] [aller-display]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Aller-Display] [features=default]
+\stoptypescript
+
+\starttypescript [aller,aller-light,aller-display]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-aller}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
new file mode 100644
index 00000000000..05fd863f360
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
@@ -0,0 +1,267 @@
+%D \module
+%D   [       file=type-apostrophiclab,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Apostrophic Laboratories Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Amerika / Amerika Sans
+
+\starttypescript [serif] [amerika]
+    \definefontsynonym [AmerikaSerif-Regular]    [name:Amerika]            [features=default]
+    \definefontsynonym [AmerikaSerif-Alternates] [name:Amerika Alternates] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [amerika]
+    \definefontsynonym [AmerikaSans-Regular] [name:Amerika Sans] [features=default]
+\stoptypescript
+
+% Ashby
+
+\starttypescript [sans] [ashby]
+    \definefontsynonym [Ashby-Light]           [name:Ashby Light]             [features=default]
+    \definefontsynonym [Ashby-LightItalic]     [name:Ashby Light Italic]      [features=default]
+    \definefontsynonym [Ashby-Regular]         [name:Ashby Book]              [features=default]
+    \definefontsynonym [Ashby-Italic]          [name:Ashby Book Italic]       [features=default]
+    \definefontsynonym [Ashby-Medium]          [name:Ashby Medium]            [features=default]
+    \definefontsynonym [Ashby-MediumItalic]    [name:Ashby Medium Italic]     [features=default]
+    \definefontsynonym [Ashby-Bold]            [name:Ashby Bold]              [features=default]
+    \definefontsynonym [Ashby-BoldItalic]      [name:Ashby Bold Italic]       [features=default]
+    \definefontsynonym [Ashby-Black]           [name:Ashby Black]             [features=default]
+    \definefontsynonym [Ashby-BlackItalic]     [name:Ashby Black Italic]      [features=default]
+    \definefontsynonym [Ashby-ExtraBold]       [name:Ashby Extra Bold]        [features=default]
+    \definefontsynonym [Ashby-ExtraBoldItalic] [name:Ashby Extra Bold Italic] [features=default]
+\stoptypescript
+
+% Charrington
+
+\starttypescript [serif] [charrington]
+    \definefontsynonym [Charrington-Regular]   [name:Charrington]           [features=default]
+    \definefontsynonym [Charrington-Bold]      [name:Charrington Bold]      [features=default]
+    \definefontsynonym [Charrington-Narrow]    [name:Charrington Narrow]    [features=default]
+    \definefontsynonym [Charrington-Outer]     [name:Charrington Outer]     [features=default]
+    \definefontsynonym [Charrington-Posh]      [name:Charrington Posh]      [features=default]
+    \definefontsynonym [Charrington-Roughened] [name:Charrington Roughened] [features=default]
+    \definefontsynonym [Charrington-Semibold]  [name:Charrington SemiBold]  [features=default]
+    \definefontsynonym [Charrington-Strewn]    [name:Charrington Strewn]    [features=default]
+    \definefontsynonym [Charrington-Superwide] [name:Charrington Superwide] [features=default]
+    \definefontsynonym [Charrington-Upper]     [name:Charrington Upper]     [features=default]
+    \definefontsynonym [Charrington-Wide]      [name:Charrington Wide]      [features=default]
+\stoptypescript
+
+% Covington / Covington SC
+
+\starttypescript [serif] [covington]
+    \definefontsynonym [Covington-Regular]          [name:Covington]                     [features=default]
+    \definefontsynonym [Covington-Italic]           [name:Covington Italic]              [features=default]
+    \definefontsynonym [Covington-Bold]             [name:Covington Bold]                [features=default]
+    \definefontsynonym [Covington-BoldItalic]       [name:Covington Bold Italic]         [features=default]
+    \definefontsynonym [Covington-Condensed]        [name:Covington Cond]                [features=default]
+    \definefontsynonym [Covington-CondItalic]       [name:Covington Cond Italic]         [features=default]
+    \definefontsynonym [Covington-CondBold]         [name:Covington Cond Bold]           [features=default]
+    \definefontsynonym [Covington-CondBoldItalic]   [name:Covington Cond Bold Italic]    [features=default]
+    \definefontsynonym [Covington-Exp]              [name:Covington Exp]                 [features=default]
+    \definefontsynonym [Covington-ExpItalic]        [name:Covington Exp Italic]          [features=default]
+    \definefontsynonym [Covington-ExpBold]          [name:Covington Exp Bold]            [features=default]
+    \definefontsynonym [Covington-ExpBoldItalic]    [name:Covington Exp Bold Italic]     [features=default]
+    \definefontsynonym [Covington-RevItalic]        [name:Covington Rev Italic]          [features=default]
+    \definefontsynonym [Covington-RevBoldItalic]    [name:Covington Rev Bold Italic]     [features=default]
+    \definefontsynonym [Covington-SC]               [name:Covington SC]                  [features=default]
+    \definefontsynonym [Covington-SCItalic]         [name:Covington SC Italic]           [features=default]
+    \definefontsynonym [Covington-SCBold]           [name:Covington SC Bold]             [features=default]
+    \definefontsynonym [Covington-SCBoldItalic]     [name:Covington SC Bold Italic]      [features=default]
+    \definefontsynonym [Covington-SCCond]           [name:Covington SC Cond]             [features=default]
+    \definefontsynonym [Covington-SCCondItalic]     [name:Covington SC Cond Italic]      [features=default]
+    \definefontsynonym [Covington-SCCondBold]       [name:Covington SC Cond Bold]        [features=default]
+    \definefontsynonym [Covington-SCCondBoldItalic] [name:Covington SC Cond Bold Italic] [features=default]
+    \definefontsynonym [Covington-SCExp]            [name:Covington SC Exp]              [features=default]
+    \definefontsynonym [Covington-SCExpItalic]      [name:Covington SC Exp Italic]       [features=default]
+    \definefontsynonym [Covington-SCExpBold]        [name:Covington SC Exp Bold]         [features=default]
+    \definefontsynonym [Covington-SCExpBoldItalic]  [name:Covington SC Exp Bold Italic]  [features=default]
+    \definefontsynonym [Covington-SCRevItalic]      [name:Covington SC Rev Italic]       [features=default]
+    \definefontsynonym [Covington-SCRevBoldItalic]  [name:Covington SC Rev Bold Italic]  [features=default]
+    \definefontsynonym [Covington-SCShadow]         [name:Covington SC Shadow]           [features=default]
+    \definefontsynonym [Covington-SCShadowItalic]   [name:Covington SC Shadow Italic]    [features=default]
+    \definefontsynonym [Covington-Shadow]           [name:Covington Shadow]              [features=default]
+    \definefontsynonym [Covington-ShadowItalic]     [name:Covington Shadow Italic]       [features=default]
+\stoptypescript
+
+% Day Roman
+
+\starttypescript [serif] [dayroman]
+    \definefontsynonym [DayRoman-Regular] [name:Day Roman]          [features=default]
+    \definefontsynonym [DayRoman-Expert]  [name:Day Roman - Expert] [features=default]
+\stoptypescript
+
+% Devroye
+
+\starttypescript [serif] [devroye]
+    \definefontsynonym [Devroye-Regular] [name:Devroye] [features=default]
+\stoptypescript
+
+% Florence Sans / Florence Sans SC
+
+\starttypescript [sans] [florencesans]
+    \definefontsynonym [Florencesans-Regular]          [name:Florencesans]                     [features=default]
+    \definefontsynonym [Florencesans-Italic]           [name:Florencesans Italic]              [features=default]
+    \definefontsynonym [Florencesans-Bold]             [name:Florencesans Bold]                [features=default]
+    \definefontsynonym [Florencesans-BoldItalic]       [name:Florencesans Bold Italic]         [features=default]
+    \definefontsynonym [Florencesans-Black]            [name:Florencesans Black]               [features=default]
+    \definefontsynonym [Florencesans-BlackItalic]      [name:Florencesans Black Italic]        [features=default]
+    \definefontsynonym [Florencesans-Comp]             [name:Florencesans Comp]                [features=default]
+    \definefontsynonym [Florencesans-CompItalic]       [name:Florencesans Comp Italic]         [features=default]
+    \definefontsynonym [Florencesans-CompBold]         [name:Florencesans Comp Bold]           [features=default]
+    \definefontsynonym [Florencesans-CompBoldItalic]   [name:Florencesans Comp Bold Italic]    [features=default]
+    \definefontsynonym [Florencesans-Condensed]        [name:Florencesans Cond]                [features=default]
+    \definefontsynonym [Florencesans-CondItalic]       [name:Florencesans Cond Italic]         [features=default]
+    \definefontsynonym [Florencesans-CondBold]         [name:Florencesans Cond Bold]           [features=default]
+    \definefontsynonym [Florencesans-CondBoldItalic]   [name:Florencesans Cond Bold Italic]    [features=default]
+    \definefontsynonym [Florencesans-Exp]              [name:Florencesans Exp]                 [features=default]
+    \definefontsynonym [Florencesans-ExpItalic]        [name:Florencesans Exp Italic]          [features=default]
+    \definefontsynonym [Florencesans-ExpBold]          [name:Florencesans Exp Bold]            [features=default]
+    \definefontsynonym [Florencesans-ExpBoldItalic]    [name:Florencesans Exp Bold Italic]     [features=default]
+    \definefontsynonym [Florencesans-Outline]          [name:Florencesans Outline]             [features=default]
+    \definefontsynonym [Florencesans-OutlineItalic]    [name:Florencesans Outline Italic]      [features=default]
+    \definefontsynonym [Florencesans-RevBoldItalic]    [name:Florencesans Rev Bold Italic]     [features=default]
+    \definefontsynonym [Florencesans-RevItalic]        [name:Florencesans Rev Italic]          [features=default]
+    \definefontsynonym [Florencesans-SC]               [name:Florencesans SC]                  [features=default]
+    \definefontsynonym [Florencesans-SCBlack]          [name:Florencesans SC Black]            [features=default]
+    \definefontsynonym [Florencesans-SCBlackItalic]    [name:Florencesans SC Black Italic]     [features=default]
+    \definefontsynonym [Florencesans-SCBold]           [name:Florencesans SC Bold]             [features=default]
+    \definefontsynonym [Florencesans-SCBoldItalic]     [name:Florencesans SC Bold Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCComp]           [name:Florencesans SC Comp]             [features=default]
+    \definefontsynonym [Florencesans-SCCompBold]       [name:Florencesans SC Comp Bold]        [features=default]
+    \definefontsynonym [Florencesans-SCCompBoldItalic] [name:Florencesans SC Comp Bold Italic] [features=default]
+    \definefontsynonym [Florencesans-SCCompItalic]     [name:Florencesans SC Comp Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCCond]           [name:Florencesans SC Cond]             [features=default]
+    \definefontsynonym [Florencesans-SCCondBold]       [name:Florencesans SC Cond Bold]        [features=default]
+    \definefontsynonym [Florencesans-SCCondBoldItalic] [name:Florencesans SC Cond Bold Italic] [features=default]
+    \definefontsynonym [Florencesans-SCCondItalic]     [name:Florencesans SC Cond Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCExp]            [name:Florencesans SC Exp]              [features=default]
+    \definefontsynonym [Florencesans-SCExpBold]        [name:Florencesans SC Exp Bold]         [features=default]
+    \definefontsynonym [Florencesans-SCExpBoldItalic]  [name:Florencesans SC Exp Bold Italic]  [features=default]
+    \definefontsynonym [Florencesans-SCExpItalic]      [name:Florencesans SC Exp Italic]       [features=default]
+    \definefontsynonym [Florencesans-SCItalic]         [name:Florencesans SC Italic]           [features=default]
+    \definefontsynonym [Florencesans-SCOutline]        [name:Florencesans SC Outline]          [features=default]
+    \definefontsynonym [Florencesans-SCOutlineItalic]  [name:Florencesans SC Outline Italic]   [features=default]
+    \definefontsynonym [Florencesans-SCRevBoldItalic]  [name:Florencesans SC Rev Bold Italic]  [features=default]
+    \definefontsynonym [Florencesans-SCRevItalic]      [name:Florencesans SC Rev Italic]       [features=default]
+    \definefontsynonym [Florencesans-SCShaded]         [name:Florencesans SC Shaded]           [features=default]
+    \definefontsynonym [Florencesans-SCShadedItalic]   [name:Florencesans SC Shaded Italic]    [features=default]
+    \definefontsynonym [Florencesans-Shaded]           [name:Florencesans Shaded]              [features=default]
+    \definefontsynonym [Florencesans-ShadedItalic]     [name:Florencesans Shaded Italic]       [features=default]
+\stoptypescript
+
+% Komikazba
+
+\starttypescript [sans] [komikazba]
+    \definefontsynonym [Komikazba-Regular] [name:Komikazba] [features=default]
+\stoptypescript
+
+% Komikaze
+
+\starttypescript [sans] [komikaze]
+    \definefontsynonym [Komikaze-Regular] [name:Komikaze] [features=default]
+\stoptypescript
+
+% Labrit
+
+\starttypescript [serif] [labrit]
+    \definefontsynonym [Labrit-Regular] [name:LaBrit] [features=default]
+\stoptypescript
+
+% Lady Copra
+
+\starttypescript [sans] [ladycopra]
+    \definefontsynonym [LadyCopra-Regular]   [name:Lady Copra]           [features=default]
+    \definefontsynonym [LadyCopra-Alternate] [name:Lady Copra Alternate] [features=default]
+    \definefontsynonym [LadyCopra-Narrow]    [name:Lady Copra Narrow]    [features=default]
+    \definefontsynonym [LadyCopra-Wide]      [name:Lady Copra Wide]      [features=default]
+\stoptypescript
+
+% Lady Ice / Lady Ice Extra / Lady Ice Revisited
+
+\starttypescript [sans] [ladyice]
+    \definefontsynonym [LadyIce-Regular]          [name:Lady Ice]                      [features=default]
+    \definefontsynonym [LadyIce-Italic]           [name:Lady Ice Italic]               [features=default]
+    \definefontsynonym [LadyIce-Bold]             [name:Lady Ice Bold]                 [features=default]
+    \definefontsynonym [LadyIce-Caps]             [name:Lady Ice - SC Bold]            [features=default]
+    \definefontsynonym [LadyIce-CapsBold]         [name:Lady Ice - Small Caps]         [features=default]
+    \definefontsynonym [LadyIce-Condensed]        [name:Lady Ice - Condensed]          [features=default]
+    \definefontsynonym [LadyIce-3D]               [name:Lady Ice - 3D]                 [features=default]
+    \definefontsynonym [LadyIce-3DItalic]         [name:Lady Ice - 3D Italic]          [features=default]
+    \definefontsynonym [LadyIce-Expanded]         [name:Lady Ice - Expanded]           [features=default]
+    \definefontsynonym [LadyIce-ExtraLight]       [name:Lady Ice - Extra Light]        [features=default]
+    \definefontsynonym [LadyIce-ExtraLightItalic] [name:Lady Ice - Extra Light Italic] [features=default]
+    \definefontsynonym [LadyIce-Light]            [name:Lady Ice - Light]              [features=default]
+    \definefontsynonym [LadyIce-LightItalic]      [name:Lady Ice - Light Italic]       [features=default]
+    \definefontsynonym [LadyIce-Revisited]        [name:Lady Ice Revisited]            [features=default]
+    \definefontsynonym [LadyIce-RevisitedBold]    [name:Lady Ice Revisited Bold]       [features=default]
+    \definefontsynonym [LadyIce-RevisitedUpper]   [name:Lady Ice Revisited Upper]      [features=default]
+\stoptypescript
+
+% Steinem
+
+\starttypescript [sans] [steinem]
+    \definefontsynonym [Steinem-Regular]    [name:Steinem]             [features=default]
+    \definefontsynonym [Steinem-Italic]     [name:Steinem-Italic]      [features=default]
+    \definefontsynonym [Steinem-Bold]       [name:Steinem-Bold]        [features=default]
+    \definefontsynonym [Steinem-BoldItalic] [name:Steinem-Bold Italic] [features=default]
+    \definefontsynonym [Steinem-Unicode]    [name:Steinem Unicode]     [features=default]
+\stoptypescript
+
+% Street Corner
+
+\starttypescript [sans] [streetcorner]
+    \definefontsynonym [StreetCorner-Regular]           [name:Street Corner]                  [features=default]
+    \definefontsynonym [StreetCorner-Italic]            [name:Street Corner Oblique]          [features=default]
+    \definefontsynonym [StreetCorner-Bold]              [name:Street Corner Bold]             [features=default]
+    \definefontsynonym [StreetCorner-Extend]            [name:Street Corner Extend]           [features=default]
+    \definefontsynonym [StreetCorner-Hyperextend]       [name:Street Corner HyperExtend]      [features=default]
+    \definefontsynonym [StreetCorner-Narrow]            [name:Street Corner Narrow]           [features=default]
+    \definefontsynonym [StreetCorner-Narrower]          [name:Street Corner Narrower]         [features=default]
+    \definefontsynonym [StreetCorner-Semibold]          [name:Street Corner SemiBold]         [features=default]
+    \definefontsynonym [StreetCorner-Slab]              [name:Street Corner Slab]             [features=default]
+    \definefontsynonym [StreetCorner-SlabBold]          [name:Street Corner Slab Bold]        [features=default]
+    \definefontsynonym [StreetCorner-SlabExtend]        [name:Street Corner Slab Extend]      [features=default]
+    \definefontsynonym [StreetCorner-SlabHyperextend]   [name:Street Corner Slab HyperExtend] [features=default]
+    \definefontsynonym [StreetCorner-SlabNarrow]        [name:Street Corner Slab Narrow]      [features=default]
+    \definefontsynonym [StreetCorner-SlabNarrower]      [name:Street Corner Slab Narrower]    [features=default]
+    \definefontsynonym [StreetCorner-CornerSlabOblique] [name:Street Corner Slab Oblique]     [features=default]
+    \definefontsynonym [StreetCorner-SlabSemibold]      [name:Street Corner Slab SemiBold]    [features=default]
+    \definefontsynonym [StreetCorner-CornerSlabUpper]   [name:Street Corner Slab Upper]       [features=default]
+    \definefontsynonym [StreetCorner-SlabUpperOblique]  [name:Street Corner Slab Upper Obl]   [features=default]
+    \definefontsynonym [StreetCorner-Thin]              [name:Street Corner Thin]             [features=default]
+    \definefontsynonym [StreetCorner-Upper]             [name:Street Corner Upper]            [features=default]
+    \definefontsynonym [StreetCorner-UpperExtend]       [name:Street Corner Upper Extend]     [features=default]
+    \definefontsynonym [StreetCorner-UpperNarrow]       [name:Street Corner Upper Narrow]     [features=default]
+    \definefontsynonym [StreetCorner-UpperNarrower]     [name:Street Corner Upper Narrower]   [features=default]
+    \definefontsynonym [StreetCorner-UpperOblique]      [name:Street Corner Upper Oblique]    [features=default]
+\stoptypescript
+
+% Usenet
+
+\starttypescript [serif] [usenet]
+    \definefontsynonym [Usenet-Regular]      [name:Usenet]              [features=default]
+    \definefontsynonym [Usenet-Alternatives] [name:Usenet - Alternates] [features=default]
+\stoptypescript
+
+% Youthanasia
+
+\starttypescript [sans] [youthanasia]
+    \definefontsynonym [Youthanasia-Regular] [name:Youthanasia]        [features=default]
+    \definefontsynonym [Youthanasia-Italic]  [name:Youthanasia Italic] [features=default]
+\stoptypescript
+
+% Zebrra
+
+\starttypescript [serif] [zebrra]
+    \definefontsynonym [Zebrra-Regular] [name:Zebrra] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
new file mode 100644
index 00000000000..05fd863f360
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
@@ -0,0 +1,267 @@
+%D \module
+%D   [       file=type-apostrophiclab,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Apostrophic Laboratories Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Amerika / Amerika Sans
+
+\starttypescript [serif] [amerika]
+    \definefontsynonym [AmerikaSerif-Regular]    [name:Amerika]            [features=default]
+    \definefontsynonym [AmerikaSerif-Alternates] [name:Amerika Alternates] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [amerika]
+    \definefontsynonym [AmerikaSans-Regular] [name:Amerika Sans] [features=default]
+\stoptypescript
+
+% Ashby
+
+\starttypescript [sans] [ashby]
+    \definefontsynonym [Ashby-Light]           [name:Ashby Light]             [features=default]
+    \definefontsynonym [Ashby-LightItalic]     [name:Ashby Light Italic]      [features=default]
+    \definefontsynonym [Ashby-Regular]         [name:Ashby Book]              [features=default]
+    \definefontsynonym [Ashby-Italic]          [name:Ashby Book Italic]       [features=default]
+    \definefontsynonym [Ashby-Medium]          [name:Ashby Medium]            [features=default]
+    \definefontsynonym [Ashby-MediumItalic]    [name:Ashby Medium Italic]     [features=default]
+    \definefontsynonym [Ashby-Bold]            [name:Ashby Bold]              [features=default]
+    \definefontsynonym [Ashby-BoldItalic]      [name:Ashby Bold Italic]       [features=default]
+    \definefontsynonym [Ashby-Black]           [name:Ashby Black]             [features=default]
+    \definefontsynonym [Ashby-BlackItalic]     [name:Ashby Black Italic]      [features=default]
+    \definefontsynonym [Ashby-ExtraBold]       [name:Ashby Extra Bold]        [features=default]
+    \definefontsynonym [Ashby-ExtraBoldItalic] [name:Ashby Extra Bold Italic] [features=default]
+\stoptypescript
+
+% Charrington
+
+\starttypescript [serif] [charrington]
+    \definefontsynonym [Charrington-Regular]   [name:Charrington]           [features=default]
+    \definefontsynonym [Charrington-Bold]      [name:Charrington Bold]      [features=default]
+    \definefontsynonym [Charrington-Narrow]    [name:Charrington Narrow]    [features=default]
+    \definefontsynonym [Charrington-Outer]     [name:Charrington Outer]     [features=default]
+    \definefontsynonym [Charrington-Posh]      [name:Charrington Posh]      [features=default]
+    \definefontsynonym [Charrington-Roughened] [name:Charrington Roughened] [features=default]
+    \definefontsynonym [Charrington-Semibold]  [name:Charrington SemiBold]  [features=default]
+    \definefontsynonym [Charrington-Strewn]    [name:Charrington Strewn]    [features=default]
+    \definefontsynonym [Charrington-Superwide] [name:Charrington Superwide] [features=default]
+    \definefontsynonym [Charrington-Upper]     [name:Charrington Upper]     [features=default]
+    \definefontsynonym [Charrington-Wide]      [name:Charrington Wide]      [features=default]
+\stoptypescript
+
+% Covington / Covington SC
+
+\starttypescript [serif] [covington]
+    \definefontsynonym [Covington-Regular]          [name:Covington]                     [features=default]
+    \definefontsynonym [Covington-Italic]           [name:Covington Italic]              [features=default]
+    \definefontsynonym [Covington-Bold]             [name:Covington Bold]                [features=default]
+    \definefontsynonym [Covington-BoldItalic]       [name:Covington Bold Italic]         [features=default]
+    \definefontsynonym [Covington-Condensed]        [name:Covington Cond]                [features=default]
+    \definefontsynonym [Covington-CondItalic]       [name:Covington Cond Italic]         [features=default]
+    \definefontsynonym [Covington-CondBold]         [name:Covington Cond Bold]           [features=default]
+    \definefontsynonym [Covington-CondBoldItalic]   [name:Covington Cond Bold Italic]    [features=default]
+    \definefontsynonym [Covington-Exp]              [name:Covington Exp]                 [features=default]
+    \definefontsynonym [Covington-ExpItalic]        [name:Covington Exp Italic]          [features=default]
+    \definefontsynonym [Covington-ExpBold]          [name:Covington Exp Bold]            [features=default]
+    \definefontsynonym [Covington-ExpBoldItalic]    [name:Covington Exp Bold Italic]     [features=default]
+    \definefontsynonym [Covington-RevItalic]        [name:Covington Rev Italic]          [features=default]
+    \definefontsynonym [Covington-RevBoldItalic]    [name:Covington Rev Bold Italic]     [features=default]
+    \definefontsynonym [Covington-SC]               [name:Covington SC]                  [features=default]
+    \definefontsynonym [Covington-SCItalic]         [name:Covington SC Italic]           [features=default]
+    \definefontsynonym [Covington-SCBold]           [name:Covington SC Bold]             [features=default]
+    \definefontsynonym [Covington-SCBoldItalic]     [name:Covington SC Bold Italic]      [features=default]
+    \definefontsynonym [Covington-SCCond]           [name:Covington SC Cond]             [features=default]
+    \definefontsynonym [Covington-SCCondItalic]     [name:Covington SC Cond Italic]      [features=default]
+    \definefontsynonym [Covington-SCCondBold]       [name:Covington SC Cond Bold]        [features=default]
+    \definefontsynonym [Covington-SCCondBoldItalic] [name:Covington SC Cond Bold Italic] [features=default]
+    \definefontsynonym [Covington-SCExp]            [name:Covington SC Exp]              [features=default]
+    \definefontsynonym [Covington-SCExpItalic]      [name:Covington SC Exp Italic]       [features=default]
+    \definefontsynonym [Covington-SCExpBold]        [name:Covington SC Exp Bold]         [features=default]
+    \definefontsynonym [Covington-SCExpBoldItalic]  [name:Covington SC Exp Bold Italic]  [features=default]
+    \definefontsynonym [Covington-SCRevItalic]      [name:Covington SC Rev Italic]       [features=default]
+    \definefontsynonym [Covington-SCRevBoldItalic]  [name:Covington SC Rev Bold Italic]  [features=default]
+    \definefontsynonym [Covington-SCShadow]         [name:Covington SC Shadow]           [features=default]
+    \definefontsynonym [Covington-SCShadowItalic]   [name:Covington SC Shadow Italic]    [features=default]
+    \definefontsynonym [Covington-Shadow]           [name:Covington Shadow]              [features=default]
+    \definefontsynonym [Covington-ShadowItalic]     [name:Covington Shadow Italic]       [features=default]
+\stoptypescript
+
+% Day Roman
+
+\starttypescript [serif] [dayroman]
+    \definefontsynonym [DayRoman-Regular] [name:Day Roman]          [features=default]
+    \definefontsynonym [DayRoman-Expert]  [name:Day Roman - Expert] [features=default]
+\stoptypescript
+
+% Devroye
+
+\starttypescript [serif] [devroye]
+    \definefontsynonym [Devroye-Regular] [name:Devroye] [features=default]
+\stoptypescript
+
+% Florence Sans / Florence Sans SC
+
+\starttypescript [sans] [florencesans]
+    \definefontsynonym [Florencesans-Regular]          [name:Florencesans]                     [features=default]
+    \definefontsynonym [Florencesans-Italic]           [name:Florencesans Italic]              [features=default]
+    \definefontsynonym [Florencesans-Bold]             [name:Florencesans Bold]                [features=default]
+    \definefontsynonym [Florencesans-BoldItalic]       [name:Florencesans Bold Italic]         [features=default]
+    \definefontsynonym [Florencesans-Black]            [name:Florencesans Black]               [features=default]
+    \definefontsynonym [Florencesans-BlackItalic]      [name:Florencesans Black Italic]        [features=default]
+    \definefontsynonym [Florencesans-Comp]             [name:Florencesans Comp]                [features=default]
+    \definefontsynonym [Florencesans-CompItalic]       [name:Florencesans Comp Italic]         [features=default]
+    \definefontsynonym [Florencesans-CompBold]         [name:Florencesans Comp Bold]           [features=default]
+    \definefontsynonym [Florencesans-CompBoldItalic]   [name:Florencesans Comp Bold Italic]    [features=default]
+    \definefontsynonym [Florencesans-Condensed]        [name:Florencesans Cond]                [features=default]
+    \definefontsynonym [Florencesans-CondItalic]       [name:Florencesans Cond Italic]         [features=default]
+    \definefontsynonym [Florencesans-CondBold]         [name:Florencesans Cond Bold]           [features=default]
+    \definefontsynonym [Florencesans-CondBoldItalic]   [name:Florencesans Cond Bold Italic]    [features=default]
+    \definefontsynonym [Florencesans-Exp]              [name:Florencesans Exp]                 [features=default]
+    \definefontsynonym [Florencesans-ExpItalic]        [name:Florencesans Exp Italic]          [features=default]
+    \definefontsynonym [Florencesans-ExpBold]          [name:Florencesans Exp Bold]            [features=default]
+    \definefontsynonym [Florencesans-ExpBoldItalic]    [name:Florencesans Exp Bold Italic]     [features=default]
+    \definefontsynonym [Florencesans-Outline]          [name:Florencesans Outline]             [features=default]
+    \definefontsynonym [Florencesans-OutlineItalic]    [name:Florencesans Outline Italic]      [features=default]
+    \definefontsynonym [Florencesans-RevBoldItalic]    [name:Florencesans Rev Bold Italic]     [features=default]
+    \definefontsynonym [Florencesans-RevItalic]        [name:Florencesans Rev Italic]          [features=default]
+    \definefontsynonym [Florencesans-SC]               [name:Florencesans SC]                  [features=default]
+    \definefontsynonym [Florencesans-SCBlack]          [name:Florencesans SC Black]            [features=default]
+    \definefontsynonym [Florencesans-SCBlackItalic]    [name:Florencesans SC Black Italic]     [features=default]
+    \definefontsynonym [Florencesans-SCBold]           [name:Florencesans SC Bold]             [features=default]
+    \definefontsynonym [Florencesans-SCBoldItalic]     [name:Florencesans SC Bold Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCComp]           [name:Florencesans SC Comp]             [features=default]
+    \definefontsynonym [Florencesans-SCCompBold]       [name:Florencesans SC Comp Bold]        [features=default]
+    \definefontsynonym [Florencesans-SCCompBoldItalic] [name:Florencesans SC Comp Bold Italic] [features=default]
+    \definefontsynonym [Florencesans-SCCompItalic]     [name:Florencesans SC Comp Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCCond]           [name:Florencesans SC Cond]             [features=default]
+    \definefontsynonym [Florencesans-SCCondBold]       [name:Florencesans SC Cond Bold]        [features=default]
+    \definefontsynonym [Florencesans-SCCondBoldItalic] [name:Florencesans SC Cond Bold Italic] [features=default]
+    \definefontsynonym [Florencesans-SCCondItalic]     [name:Florencesans SC Cond Italic]      [features=default]
+    \definefontsynonym [Florencesans-SCExp]            [name:Florencesans SC Exp]              [features=default]
+    \definefontsynonym [Florencesans-SCExpBold]        [name:Florencesans SC Exp Bold]         [features=default]
+    \definefontsynonym [Florencesans-SCExpBoldItalic]  [name:Florencesans SC Exp Bold Italic]  [features=default]
+    \definefontsynonym [Florencesans-SCExpItalic]      [name:Florencesans SC Exp Italic]       [features=default]
+    \definefontsynonym [Florencesans-SCItalic]         [name:Florencesans SC Italic]           [features=default]
+    \definefontsynonym [Florencesans-SCOutline]        [name:Florencesans SC Outline]          [features=default]
+    \definefontsynonym [Florencesans-SCOutlineItalic]  [name:Florencesans SC Outline Italic]   [features=default]
+    \definefontsynonym [Florencesans-SCRevBoldItalic]  [name:Florencesans SC Rev Bold Italic]  [features=default]
+    \definefontsynonym [Florencesans-SCRevItalic]      [name:Florencesans SC Rev Italic]       [features=default]
+    \definefontsynonym [Florencesans-SCShaded]         [name:Florencesans SC Shaded]           [features=default]
+    \definefontsynonym [Florencesans-SCShadedItalic]   [name:Florencesans SC Shaded Italic]    [features=default]
+    \definefontsynonym [Florencesans-Shaded]           [name:Florencesans Shaded]              [features=default]
+    \definefontsynonym [Florencesans-ShadedItalic]     [name:Florencesans Shaded Italic]       [features=default]
+\stoptypescript
+
+% Komikazba
+
+\starttypescript [sans] [komikazba]
+    \definefontsynonym [Komikazba-Regular] [name:Komikazba] [features=default]
+\stoptypescript
+
+% Komikaze
+
+\starttypescript [sans] [komikaze]
+    \definefontsynonym [Komikaze-Regular] [name:Komikaze] [features=default]
+\stoptypescript
+
+% Labrit
+
+\starttypescript [serif] [labrit]
+    \definefontsynonym [Labrit-Regular] [name:LaBrit] [features=default]
+\stoptypescript
+
+% Lady Copra
+
+\starttypescript [sans] [ladycopra]
+    \definefontsynonym [LadyCopra-Regular]   [name:Lady Copra]           [features=default]
+    \definefontsynonym [LadyCopra-Alternate] [name:Lady Copra Alternate] [features=default]
+    \definefontsynonym [LadyCopra-Narrow]    [name:Lady Copra Narrow]    [features=default]
+    \definefontsynonym [LadyCopra-Wide]      [name:Lady Copra Wide]      [features=default]
+\stoptypescript
+
+% Lady Ice / Lady Ice Extra / Lady Ice Revisited
+
+\starttypescript [sans] [ladyice]
+    \definefontsynonym [LadyIce-Regular]          [name:Lady Ice]                      [features=default]
+    \definefontsynonym [LadyIce-Italic]           [name:Lady Ice Italic]               [features=default]
+    \definefontsynonym [LadyIce-Bold]             [name:Lady Ice Bold]                 [features=default]
+    \definefontsynonym [LadyIce-Caps]             [name:Lady Ice - SC Bold]            [features=default]
+    \definefontsynonym [LadyIce-CapsBold]         [name:Lady Ice - Small Caps]         [features=default]
+    \definefontsynonym [LadyIce-Condensed]        [name:Lady Ice - Condensed]          [features=default]
+    \definefontsynonym [LadyIce-3D]               [name:Lady Ice - 3D]                 [features=default]
+    \definefontsynonym [LadyIce-3DItalic]         [name:Lady Ice - 3D Italic]          [features=default]
+    \definefontsynonym [LadyIce-Expanded]         [name:Lady Ice - Expanded]           [features=default]
+    \definefontsynonym [LadyIce-ExtraLight]       [name:Lady Ice - Extra Light]        [features=default]
+    \definefontsynonym [LadyIce-ExtraLightItalic] [name:Lady Ice - Extra Light Italic] [features=default]
+    \definefontsynonym [LadyIce-Light]            [name:Lady Ice - Light]              [features=default]
+    \definefontsynonym [LadyIce-LightItalic]      [name:Lady Ice - Light Italic]       [features=default]
+    \definefontsynonym [LadyIce-Revisited]        [name:Lady Ice Revisited]            [features=default]
+    \definefontsynonym [LadyIce-RevisitedBold]    [name:Lady Ice Revisited Bold]       [features=default]
+    \definefontsynonym [LadyIce-RevisitedUpper]   [name:Lady Ice Revisited Upper]      [features=default]
+\stoptypescript
+
+% Steinem
+
+\starttypescript [sans] [steinem]
+    \definefontsynonym [Steinem-Regular]    [name:Steinem]             [features=default]
+    \definefontsynonym [Steinem-Italic]     [name:Steinem-Italic]      [features=default]
+    \definefontsynonym [Steinem-Bold]       [name:Steinem-Bold]        [features=default]
+    \definefontsynonym [Steinem-BoldItalic] [name:Steinem-Bold Italic] [features=default]
+    \definefontsynonym [Steinem-Unicode]    [name:Steinem Unicode]     [features=default]
+\stoptypescript
+
+% Street Corner
+
+\starttypescript [sans] [streetcorner]
+    \definefontsynonym [StreetCorner-Regular]           [name:Street Corner]                  [features=default]
+    \definefontsynonym [StreetCorner-Italic]            [name:Street Corner Oblique]          [features=default]
+    \definefontsynonym [StreetCorner-Bold]              [name:Street Corner Bold]             [features=default]
+    \definefontsynonym [StreetCorner-Extend]            [name:Street Corner Extend]           [features=default]
+    \definefontsynonym [StreetCorner-Hyperextend]       [name:Street Corner HyperExtend]      [features=default]
+    \definefontsynonym [StreetCorner-Narrow]            [name:Street Corner Narrow]           [features=default]
+    \definefontsynonym [StreetCorner-Narrower]          [name:Street Corner Narrower]         [features=default]
+    \definefontsynonym [StreetCorner-Semibold]          [name:Street Corner SemiBold]         [features=default]
+    \definefontsynonym [StreetCorner-Slab]              [name:Street Corner Slab]             [features=default]
+    \definefontsynonym [StreetCorner-SlabBold]          [name:Street Corner Slab Bold]        [features=default]
+    \definefontsynonym [StreetCorner-SlabExtend]        [name:Street Corner Slab Extend]      [features=default]
+    \definefontsynonym [StreetCorner-SlabHyperextend]   [name:Street Corner Slab HyperExtend] [features=default]
+    \definefontsynonym [StreetCorner-SlabNarrow]        [name:Street Corner Slab Narrow]      [features=default]
+    \definefontsynonym [StreetCorner-SlabNarrower]      [name:Street Corner Slab Narrower]    [features=default]
+    \definefontsynonym [StreetCorner-CornerSlabOblique] [name:Street Corner Slab Oblique]     [features=default]
+    \definefontsynonym [StreetCorner-SlabSemibold]      [name:Street Corner Slab SemiBold]    [features=default]
+    \definefontsynonym [StreetCorner-CornerSlabUpper]   [name:Street Corner Slab Upper]       [features=default]
+    \definefontsynonym [StreetCorner-SlabUpperOblique]  [name:Street Corner Slab Upper Obl]   [features=default]
+    \definefontsynonym [StreetCorner-Thin]              [name:Street Corner Thin]             [features=default]
+    \definefontsynonym [StreetCorner-Upper]             [name:Street Corner Upper]            [features=default]
+    \definefontsynonym [StreetCorner-UpperExtend]       [name:Street Corner Upper Extend]     [features=default]
+    \definefontsynonym [StreetCorner-UpperNarrow]       [name:Street Corner Upper Narrow]     [features=default]
+    \definefontsynonym [StreetCorner-UpperNarrower]     [name:Street Corner Upper Narrower]   [features=default]
+    \definefontsynonym [StreetCorner-UpperOblique]      [name:Street Corner Upper Oblique]    [features=default]
+\stoptypescript
+
+% Usenet
+
+\starttypescript [serif] [usenet]
+    \definefontsynonym [Usenet-Regular]      [name:Usenet]              [features=default]
+    \definefontsynonym [Usenet-Alternatives] [name:Usenet - Alternates] [features=default]
+\stoptypescript
+
+% Youthanasia
+
+\starttypescript [sans] [youthanasia]
+    \definefontsynonym [Youthanasia-Regular] [name:Youthanasia]        [features=default]
+    \definefontsynonym [Youthanasia-Italic]  [name:Youthanasia Italic] [features=default]
+\stoptypescript
+
+% Zebrra
+
+\starttypescript [serif] [zebrra]
+    \definefontsynonym [Zebrra-Regular] [name:Zebrra] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
new file mode 100644
index 00000000000..2590b3ec4a6
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
@@ -0,0 +1,235 @@
+%D \module
+%D   [       file=type-apostrophiclab,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Apostrophic Laboratories Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D \startitemize
+%D \item Amerika: \hyphenatedurl{http://apostrophiclab.pedroreina.net/0116-Amerika/amerika.html}
+%D \item Amerika Sans \hyphenatedurl{http://apostrophiclab.pedroreina.net/0151-AmerikaSans/amerikasans.html}
+%D \stopitemize
+
+\starttypescriptcollection [apostrophiclab]
+
+% Amerika / Amerika Sans
+
+\starttypescript [serif] [amerika]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [AmerikaSerif-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [amerika]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [AmerikaSans-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [amerika]
+    \definetypeface [amerika] [rm] [serif] [amerika] [default]
+    \definetypeface [amerika] [ss] [sans]  [amerika] [default]
+\stoptypescript
+
+% Ashby
+
+\starttypescript [sans] [ashby]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Ashby-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Ashby-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Ashby-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Ashby-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [ashby]
+    \definetypeface [ashby] [ss] [sans] [ashby] [default]
+\stoptypescript
+
+% Charrington
+
+\starttypescript [serif] [charrington]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [Charrington-Regular] [features=default]
+    \definefontsynonym [SerifBold] [Charrington-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [charrington]
+    \definetypeface [charrington] [rm] [serif] [charrington] [default]
+\stoptypescript
+
+% Covington / Covington SC
+
+\starttypescript [serif] [covington]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Covington-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Covington-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Covington-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Covington-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [covington]
+    \definetypeface [covington] [rm] [serif] [covington] [default]
+\stoptypescript
+
+% Day Roman
+
+\starttypescript [serif] [dayroman]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [DayRoman-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [dayroman]
+    \definetypeface [dayroman] [rm] [serif] [dayroman] [default]
+\stoptypescript
+
+% Devroye
+
+\starttypescript [serif] [devroye]
+    \setups[font:falback:serif]
+    \definefontsynonym [Serif] [Devroye-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [devroye]
+    \definetypeface [devroye] [rm] [serif] [devroye] [default]
+\stoptypescript
+
+% Florence Sans / Florence Sans SC
+
+\starttypescript [sans] [florencesans]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Florencesans-Regular]     [features=default]
+    \definefontsynonym [SansItalic]     [Florencesans-Italic]      [features=default]
+    \definefontsynonym [SansBold]       [Florencesans-Bold]        [features=default]
+    \definefontsynonym [SansBoldItalic] [Florencesans-BoldItalic]  [features=default]
+\stoptypescript
+
+\starttypescript [florencesans]
+    \definetypeface [florencesans] [ss] [sans] [florencesans] [default]
+\stoptypescript
+
+% Komikazba
+
+\starttypescript [sans] [komikazba]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Komikazba-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [komikazba]
+    \definetypeface [komikazba] [ss] [sans] [komikazba] [default]
+\stoptypescript
+
+% Komikaze
+
+\starttypescript [sans] [komikaze]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Komikaze-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [komikaze]
+    \definetypeface [komikaze] [ss] [sans] [komikaze] [default]
+\stoptypescript
+
+% Labrit
+
+\starttypescript [serif] [labrit]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Labrit-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [labrit]
+    \definetypeface [labrit] [rm] [serif] [labrit] [default]
+\stoptypescript
+
+% Lady Copra
+
+\starttypescript [sans] [ladycopra]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [LadyCopra-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [ladycopra]
+    \definetypeface [ladycopra] [ss] [sans] [ladycopra] [default]
+\stoptypescript
+
+% Lady Ice / Lady Ice Extra / Lady Ice Revisited
+
+\starttypescript [sans] [ladyice]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [LadyIce-Regular] [features=default]
+    \definefontsynonym [SansItalic] [LadyIce-Italic]  [features=default]
+    \definefontsynonym [SansBold]   [LadyIce-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [ladyice]
+    \definetypeface [ladyice] [ss] [sans] [ladyice] [default]
+\stoptypescript
+
+% Steinem
+
+\starttypescript [sans] [steinem]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Steinem-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Steinem-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Steinem-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Steinem-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [steinem]
+    \definetypeface [steinem] [ss] [sans] [steinem] [default]
+\stoptypescript
+
+% Street Corner
+
+\starttypescript [sans] [streetcorner]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [StreetCorner-Regular] [features=default]
+    \definefontsynonym [SansItalic] [StreetCorner-Italic]  [features=default]
+    \definefontsynonym [SansBold]   [StreetCorner-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [streetcorner]
+    \definetypeface [streetcorner] [ss] [sans] [streetcorner] [default]
+\stoptypescript
+
+% Usenet
+
+\starttypescript [serif] [usenet]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Usenet-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [usenet]
+    \definetypeface [usenet] [rm] [serif] [usenet] [default]
+\stoptypescript
+
+% Youthanasia
+
+\starttypescript [sans] [youthanasia]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Youthanasia-Regular] [features=default]
+    \definefontsynonym [SansItalic] [Youthanasia-Italic]  [features=default]
+\stoptypescript
+
+\starttypescript [youthanasia]
+    \definetypeface [youthanasia] [ss] [sans] [youthanasia] [default]
+\stoptypescript
+
+% Zebrra
+
+\starttypescript [serif] [zebrra]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Zebrra-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [zebrra]
+    \definetypeface [zebrra] [rm] [serif] [zebrra] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-apostrophiclab}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
new file mode 100644
index 00000000000..16839346455
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
@@ -0,0 +1,234 @@
+%D \module
+%D   [       file=type-arkandis,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Arkandis Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Accanthis
+
+\starttypescript [serif] [accanthis]
+    \definefontsynonym [Accanthis-Regular]    [name:AccanthisADFStd-Regular]    [features=default]
+    \definefontsynonym [Accanthis-Italic]     [name:AccanthisADFStd-Italic]     [features=default]
+    \definefontsynonym [Accanthis-Bold]       [name:AccanthisADFStd-Bold]       [features=default]
+    \definefontsynonym [Accanthis-BoldItalic] [name:AccanthisADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Accanthis No2
+
+\starttypescript [serif] [accanthis-two]
+    \definefontsynonym [AccanthisTwo-Regular]    [name:AccanthisADFStdNo2-Regular]    [features=default]
+    \definefontsynonym [AccanthisTwo-Italic]     [name:AccanthisADFStdNo2-Italic]     [features=default]
+    \definefontsynonym [AccanthisTwo-Bold]       [name:AccanthisADFStdNo2-Bold]       [features=default]
+    \definefontsynonym [AccanthisTwo-BoldItalic] [name:AccanthisADFStdNo2-BoldItalic] [features=default]
+\stoptypescript
+
+% Baskervald
+
+\starttypescript [serif] [baskervald]
+    \definefontsynonym [Baskervald-Regular]     [name:BaskervaldADFStd-Regular]      [features=default]
+    \definefontsynonym [Baskervald-Italic]      [name:BaskervaldADFStd-Italic]       [features=default]
+    \definefontsynonym [Baskervald-Bold]        [name:BaskervaldADFStd-Bold]         [features=default]
+    \definefontsynonym [Baskervald-BoldItalic]  [name:BaskervaldADFStd-BoldItalic]   [features=default]
+    \definefontsynonym [Baskervald-Heavy]       [name:BaskervaldADFStdHeavy]         [features=default]
+    \definefontsynonym [Baskervald-HeavyItalic] [name:BaskervaldADFStdHeavy-Oblique] [features=default]
+\stoptypescript
+
+% Berenis
+
+\starttypescript [serif] [berenis]
+    \definefontsynonym [Berenis-Condensed]        [name:Berenis ADF Cd Book]         [features=default]
+    \definefontsynonym [Berenis-ItalicCond]       [name:Berenis ADF Cd Italic]       [features=default]
+    \definefontsynonym [Berenis-BoldCond]         [name:Berenis ADF Cd Bold]         [features=default]
+    \definefontsynonym [Berenis-BoldItalicCond]   [name:Berenis ADF Cd Bold Italic]  [features=default]
+    \definefontsynonym [Berenis-Regular]          [name:Berenis ADF Book]            [features=default]
+    \definefontsynonym [Berenis-Italic]           [name:Berenis ADF Italic]          [features=default]
+    \definefontsynonym [Berenis-Medium]           [name:Berenis ADF Med Regular]     [features=default]
+    \definefontsynonym [Berenis-MediumItalic]     [name:Berenis ADF Med Italic]      [features=default]
+    \definefontsynonym [Berenis-MediumBold]       [name:Berenis ADF Med Bold]        [features=default]
+    \definefontsynonym [Berenis-MediumBoldItalic] [name:Berenis ADF Med Bold Italic] [features=default]
+    \definefontsynonym [Berenis-Bold]             [name:Berenis ADF Bold]            [features=default]
+    \definefontsynonym [Berenis-BoldItalic]       [name:Berenis ADF Bold Italic]     [features=default]
+\stoptypescript
+
+% Berenis No2
+
+\starttypescript [serif] [berenis-two]
+    \definefontsynonym [BerenisTwo-Condensed]      [name:Berenis ADF No2 Cd Book]         [features=default]
+    \definefontsynonym [BerenisTwo-ItalicCond]     [name:Berenis ADF No2 Cd Italic]       [features=default]
+    \definefontsynonym [BerenisTwo-BoldCond]       [name:Berenis ADF No2 Cd Bold]         [features=default]
+    \definefontsynonym [BerenisTwo-BoldItalicCond] [name:Berenis ADF No2 Cd Bold Italic]  [features=default]
+    \definefontsynonym [BerenisTwo-Regular]        [name:Berenis ADF No2 Book]            [features=default]
+    \definefontsynonym [BerenisTwo-Italic]         [name:Berenis ADF No2 Italic]          [features=default]
+    \definefontsynonym [BerenisTwo-Bold]           [name:Berenis ADF No2 Bold]            [features=default]
+    \definefontsynonym [BerenisTwo-BoldItalic]     [name:Berenis ADF No2 Bold Italic]     [features=default]
+\stoptypescript
+
+% Gillius ADF
+
+\starttypescript [sans] [gillius]
+    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [features=default]
+    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [features=default]
+    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [features=default]
+    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [features=default]
+    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [features=default]
+    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [features=default]
+    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [features=default]
+    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [features=default]
+\stoptypescript
+
+% Gillius No2
+
+\starttypescript [sans] [gillius-two]
+    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [features=default]
+    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [features=default]
+    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [features=default]
+    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [features=default]
+    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [features=default]
+    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [features=default]
+    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [features=default]
+    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [features=default]
+\stoptypescript
+
+% Ikarius
+
+\starttypescript [sans] [ikarius]
+    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [features=default]
+    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [features=default]
+    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [features=default]
+    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Ikarius No2
+
+\starttypescript [sans] [ikarius-two]
+    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [features=default]
+    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [features=default]
+    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [features=default]
+    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [features=default]
+\stoptypescript
+
+% Irianis
+
+\starttypescript [serif] [irianis]
+    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [features=default]
+    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [features=default]
+    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [features=default]
+    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [features=default]
+    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [features=default]
+    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [features=default]
+    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [features=default]
+    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Libris
+
+\starttypescript [sans] [libris]
+    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [features=default]
+    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [features=default]
+    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [features=default]
+    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Mekanus
+
+\starttypescript [serif] [mekanus]
+    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [features=default]
+    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [features=default]
+    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [features=default]
+    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Romande
+
+\starttypescript [serif] [romande]
+    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [features=default]
+    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [features=default]
+    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [features=default]
+    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [features=default]
+    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [features=default]
+    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [features=default]
+    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [features=default]
+\stoptypescript
+
+% Switzera
+
+\starttypescript [sans] [switzera]
+    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [features=default]
+    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [features=default]
+    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [features=default]
+    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [features=default]
+    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [features=default]
+    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [features=default]
+    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [features=default]
+    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [features=default]
+    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [features=default]
+    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [features=default]
+    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [features=default]
+    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [features=default]
+    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [features=default]
+    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [features=default]
+    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [features=default]
+    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [features=default]
+    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [features=default]
+    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [features=default]
+    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [features=default]
+    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [features=default]
+    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [features=default]
+    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [features=default]
+    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [features=default]
+    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [features=default]
+\stoptypescript
+
+% Tribun
+
+\starttypescript [serif] [tribun]
+    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [features=default]
+    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [features=default]
+    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [features=default]
+    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [features=default]
+    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [features=default]
+    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [features=default]
+    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [features=default]
+    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [features=default]
+\stoptypescript
+
+% Universalis
+
+\starttypescript [sans] [universalis]
+    \definefontsynonym [Universalis-Condensed]      [name:UniversalisADFCdStd-Regular]   [features=default]
+    \definefontsynonym [Universalis-ItalicCond]     [name:UniversalisADFCdStd-Oblique]   [features=default]
+    \definefontsynonym [Universalis-BoldCond]       [name:UniversalisADFCdStd-Bold]      [features=default]
+    \definefontsynonym [Universalis-BoldItalicCond] [name:UniversalisADFCdStd-BdOblique] [features=default]
+    \definefontsynonym [Universalis-Regular]        [name:UniversalisADFStd-Regular]     [features=default]
+    \definefontsynonym [Universalis-Italic]         [name:UniversalisADFStd-Oblique]     [features=default]
+    \definefontsynonym [Universalis-Bold]           [name:UniversalisADFStd-Bold]        [features=default]
+    \definefontsynonym [Universalis-BoldItalic]     [name:UniversalisADFStd-BoldOblique] [features=default]
+\stoptypescript
+
+% Verana
+
+\starttypescript [serif] [verana]
+    \definefontsynonym [Verana-Regular]    [name:Verana-Regular]    [features=default]
+    \definefontsynonym [Verana-Italic]     [name:Verana-Italic]     [features=default]
+    \definefontsynonym [Verana-Bold]       [name:Verana-Bold]       [features=default]
+    \definefontsynonym [Verana-BoldItalic] [name:Verana-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verana]
+    \definefontsynonym [VeranaSans-Regular]      [name:VeranaSans-Regular]       [features=default]
+    \definefontsynonym [VeranaSans-Italic]       [name:VeranaSans-Oblique]       [features=default]
+    \definefontsynonym [VeranaSans-Bold]         [name:VeranaSans-Bold]          [features=default]
+    \definefontsynonym [VeranaSans-BoldItalic]   [name:VeranaSans-BoldOblique]   [features=default]
+    \definefontsynonym [VeranaSans-Demi]         [name:VeranaSansDemi-Regular]   [features=default]
+    \definefontsynonym [VeranaSans-DemiItalic]   [name:VeranaSansDemi-Oblique]   [features=default]
+    \definefontsynonym [VeranaSans-Medium]       [name:VeranaSansMedium-Regular] [features=default]
+    \definefontsynonym [VeranaSans-MediumItalic] [name:VeranaSansMedium-Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
new file mode 100644
index 00000000000..16839346455
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
@@ -0,0 +1,234 @@
+%D \module
+%D   [       file=type-arkandis,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Arkandis Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Accanthis
+
+\starttypescript [serif] [accanthis]
+    \definefontsynonym [Accanthis-Regular]    [name:AccanthisADFStd-Regular]    [features=default]
+    \definefontsynonym [Accanthis-Italic]     [name:AccanthisADFStd-Italic]     [features=default]
+    \definefontsynonym [Accanthis-Bold]       [name:AccanthisADFStd-Bold]       [features=default]
+    \definefontsynonym [Accanthis-BoldItalic] [name:AccanthisADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Accanthis No2
+
+\starttypescript [serif] [accanthis-two]
+    \definefontsynonym [AccanthisTwo-Regular]    [name:AccanthisADFStdNo2-Regular]    [features=default]
+    \definefontsynonym [AccanthisTwo-Italic]     [name:AccanthisADFStdNo2-Italic]     [features=default]
+    \definefontsynonym [AccanthisTwo-Bold]       [name:AccanthisADFStdNo2-Bold]       [features=default]
+    \definefontsynonym [AccanthisTwo-BoldItalic] [name:AccanthisADFStdNo2-BoldItalic] [features=default]
+\stoptypescript
+
+% Baskervald
+
+\starttypescript [serif] [baskervald]
+    \definefontsynonym [Baskervald-Regular]     [name:BaskervaldADFStd-Regular]      [features=default]
+    \definefontsynonym [Baskervald-Italic]      [name:BaskervaldADFStd-Italic]       [features=default]
+    \definefontsynonym [Baskervald-Bold]        [name:BaskervaldADFStd-Bold]         [features=default]
+    \definefontsynonym [Baskervald-BoldItalic]  [name:BaskervaldADFStd-BoldItalic]   [features=default]
+    \definefontsynonym [Baskervald-Heavy]       [name:BaskervaldADFStdHeavy]         [features=default]
+    \definefontsynonym [Baskervald-HeavyItalic] [name:BaskervaldADFStdHeavy-Oblique] [features=default]
+\stoptypescript
+
+% Berenis
+
+\starttypescript [serif] [berenis]
+    \definefontsynonym [Berenis-Condensed]        [name:Berenis ADF Cd Book]         [features=default]
+    \definefontsynonym [Berenis-ItalicCond]       [name:Berenis ADF Cd Italic]       [features=default]
+    \definefontsynonym [Berenis-BoldCond]         [name:Berenis ADF Cd Bold]         [features=default]
+    \definefontsynonym [Berenis-BoldItalicCond]   [name:Berenis ADF Cd Bold Italic]  [features=default]
+    \definefontsynonym [Berenis-Regular]          [name:Berenis ADF Book]            [features=default]
+    \definefontsynonym [Berenis-Italic]           [name:Berenis ADF Italic]          [features=default]
+    \definefontsynonym [Berenis-Medium]           [name:Berenis ADF Med Regular]     [features=default]
+    \definefontsynonym [Berenis-MediumItalic]     [name:Berenis ADF Med Italic]      [features=default]
+    \definefontsynonym [Berenis-MediumBold]       [name:Berenis ADF Med Bold]        [features=default]
+    \definefontsynonym [Berenis-MediumBoldItalic] [name:Berenis ADF Med Bold Italic] [features=default]
+    \definefontsynonym [Berenis-Bold]             [name:Berenis ADF Bold]            [features=default]
+    \definefontsynonym [Berenis-BoldItalic]       [name:Berenis ADF Bold Italic]     [features=default]
+\stoptypescript
+
+% Berenis No2
+
+\starttypescript [serif] [berenis-two]
+    \definefontsynonym [BerenisTwo-Condensed]      [name:Berenis ADF No2 Cd Book]         [features=default]
+    \definefontsynonym [BerenisTwo-ItalicCond]     [name:Berenis ADF No2 Cd Italic]       [features=default]
+    \definefontsynonym [BerenisTwo-BoldCond]       [name:Berenis ADF No2 Cd Bold]         [features=default]
+    \definefontsynonym [BerenisTwo-BoldItalicCond] [name:Berenis ADF No2 Cd Bold Italic]  [features=default]
+    \definefontsynonym [BerenisTwo-Regular]        [name:Berenis ADF No2 Book]            [features=default]
+    \definefontsynonym [BerenisTwo-Italic]         [name:Berenis ADF No2 Italic]          [features=default]
+    \definefontsynonym [BerenisTwo-Bold]           [name:Berenis ADF No2 Bold]            [features=default]
+    \definefontsynonym [BerenisTwo-BoldItalic]     [name:Berenis ADF No2 Bold Italic]     [features=default]
+\stoptypescript
+
+% Gillius ADF
+
+\starttypescript [sans] [gillius]
+    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [features=default]
+    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [features=default]
+    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [features=default]
+    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [features=default]
+    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [features=default]
+    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [features=default]
+    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [features=default]
+    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [features=default]
+\stoptypescript
+
+% Gillius No2
+
+\starttypescript [sans] [gillius-two]
+    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [features=default]
+    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [features=default]
+    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [features=default]
+    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [features=default]
+    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [features=default]
+    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [features=default]
+    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [features=default]
+    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [features=default]
+\stoptypescript
+
+% Ikarius
+
+\starttypescript [sans] [ikarius]
+    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [features=default]
+    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [features=default]
+    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [features=default]
+    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Ikarius No2
+
+\starttypescript [sans] [ikarius-two]
+    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [features=default]
+    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [features=default]
+    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [features=default]
+    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [features=default]
+\stoptypescript
+
+% Irianis
+
+\starttypescript [serif] [irianis]
+    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [features=default]
+    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [features=default]
+    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [features=default]
+    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [features=default]
+    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [features=default]
+    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [features=default]
+    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [features=default]
+    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Libris
+
+\starttypescript [sans] [libris]
+    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [features=default]
+    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [features=default]
+    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [features=default]
+    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Mekanus
+
+\starttypescript [serif] [mekanus]
+    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [features=default]
+    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [features=default]
+    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [features=default]
+    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Romande
+
+\starttypescript [serif] [romande]
+    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [features=default]
+    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [features=default]
+    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [features=default]
+    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [features=default]
+    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [features=default]
+    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [features=default]
+    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [features=default]
+\stoptypescript
+
+% Switzera
+
+\starttypescript [sans] [switzera]
+    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [features=default]
+    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [features=default]
+    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [features=default]
+    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [features=default]
+    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [features=default]
+    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [features=default]
+    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [features=default]
+    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [features=default]
+    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [features=default]
+    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [features=default]
+    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [features=default]
+    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [features=default]
+    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [features=default]
+    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [features=default]
+    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [features=default]
+    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [features=default]
+    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [features=default]
+    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [features=default]
+    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [features=default]
+    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [features=default]
+    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [features=default]
+    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [features=default]
+    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [features=default]
+    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [features=default]
+\stoptypescript
+
+% Tribun
+
+\starttypescript [serif] [tribun]
+    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [features=default]
+    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [features=default]
+    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [features=default]
+    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [features=default]
+    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [features=default]
+    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [features=default]
+    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [features=default]
+    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [features=default]
+\stoptypescript
+
+% Universalis
+
+\starttypescript [sans] [universalis]
+    \definefontsynonym [Universalis-Condensed]      [name:UniversalisADFCdStd-Regular]   [features=default]
+    \definefontsynonym [Universalis-ItalicCond]     [name:UniversalisADFCdStd-Oblique]   [features=default]
+    \definefontsynonym [Universalis-BoldCond]       [name:UniversalisADFCdStd-Bold]      [features=default]
+    \definefontsynonym [Universalis-BoldItalicCond] [name:UniversalisADFCdStd-BdOblique] [features=default]
+    \definefontsynonym [Universalis-Regular]        [name:UniversalisADFStd-Regular]     [features=default]
+    \definefontsynonym [Universalis-Italic]         [name:UniversalisADFStd-Oblique]     [features=default]
+    \definefontsynonym [Universalis-Bold]           [name:UniversalisADFStd-Bold]        [features=default]
+    \definefontsynonym [Universalis-BoldItalic]     [name:UniversalisADFStd-BoldOblique] [features=default]
+\stoptypescript
+
+% Verana
+
+\starttypescript [serif] [verana]
+    \definefontsynonym [Verana-Regular]    [name:Verana-Regular]    [features=default]
+    \definefontsynonym [Verana-Italic]     [name:Verana-Italic]     [features=default]
+    \definefontsynonym [Verana-Bold]       [name:Verana-Bold]       [features=default]
+    \definefontsynonym [Verana-BoldItalic] [name:Verana-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verana]
+    \definefontsynonym [VeranaSans-Regular]      [name:VeranaSans-Regular]       [features=default]
+    \definefontsynonym [VeranaSans-Italic]       [name:VeranaSans-Oblique]       [features=default]
+    \definefontsynonym [VeranaSans-Bold]         [name:VeranaSans-Bold]          [features=default]
+    \definefontsynonym [VeranaSans-BoldItalic]   [name:VeranaSans-BoldOblique]   [features=default]
+    \definefontsynonym [VeranaSans-Demi]         [name:VeranaSansDemi-Regular]   [features=default]
+    \definefontsynonym [VeranaSans-DemiItalic]   [name:VeranaSansDemi-Oblique]   [features=default]
+    \definefontsynonym [VeranaSans-Medium]       [name:VeranaSansMedium-Regular] [features=default]
+    \definefontsynonym [VeranaSans-MediumItalic] [name:VeranaSansMedium-Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.tex b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.tex
new file mode 100644
index 00000000000..7b5b297e7a8
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.tex
@@ -0,0 +1,266 @@
+%D \module
+%D   [       file=type-arkandis,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Arkandis Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [arkandis]
+
+% Accanthis
+
+\starttypescript [serif] [accanthis]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Accanthis-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Accanthis-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Accanthis-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Accanthis-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [accanthis]
+    \definetypeface [accanthis] [rm] [serif] [accanthis] [default]
+\stoptypescript
+
+% Accanthis No2
+
+\starttypescript [serif] [accanthis-two]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [AccanthisTwo-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [AccanthisTwo-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [AccanthisTwo-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [AccanthisTwo-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [accanthis-two]
+    \definetypeface [accanthis-two] [rm] [serif] [accanthis-two] [default]
+\stoptypescript
+
+% Baskervald
+
+\starttypescript [serif] [baskervald]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Baskervald-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Baskervald-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Baskervald-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Baskervald-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [baskervald]
+    \definetypeface [baskervald] [rm] [serif] [baskervald] [default]
+\stoptypescript
+
+% Berenis
+
+\starttypescript [serif] [berenis]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Berenis-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Berenis-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Berenis-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Berenis-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [berenis]
+    \definetypeface [berenis] [rm] [serif] [berenis] [default]
+\stoptypescript
+
+% Berenis No2
+
+\starttypescript [serif] [berenis-two]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [BerenisTwo-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [BerenisTwo-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [BerenisTwo-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [BerenisTwo-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [berenis-two]
+    \definetypeface [berenis-two] [rm] [serif] [berenis-two] [default]
+\stoptypescript
+
+% Gillius ADF
+
+\starttypescript [sans] [gillius]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Gillius-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Gillius-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Gillius-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Gillius-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [gillius]
+    \definetypeface [gillius] [ss] [sans] [gillius] [default]
+\stoptypescript
+
+% Gillius No2
+
+\starttypescript [sans] [gillius-two]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GilliusTwo-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [GilliusTwo-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [GilliusTwo-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [GilliusTwo-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [gillius-two]
+    \definetypeface [gillius-two] [ss] [sans] [gillius-two] [default]
+\stoptypescript
+
+% Ikarius
+
+\starttypescript [sans] [ikarius]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Ikarius-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Ikarius-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Ikarius-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Ikarius-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [ikarius]
+    \definetypeface [ikarius] [ss] [sans] [ikarius] [default]
+\stoptypescript
+
+% Ikarius No2
+
+\starttypescript [sans] [ikarius-two]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [IkariusTwo-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [IkariusTwo-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [IkariusTwo-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [IkariusTwo-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [ikarius-two]
+    \definetypeface [ikarius-two] [ss] [sans] [ikarius-two] [default]
+\stoptypescript
+
+% Irianis
+
+\starttypescript [serif] [irianis]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Irianis-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Irianis-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Irianis-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Irianis-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [irianis]
+    \definetypeface [irianis] [rm] [serif] [irianis] [default]
+\stoptypescript
+
+% Libris
+
+\starttypescript [sans] [libris]
+    \definefontsynonym [Sans]           [Libris-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Libris-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Libris-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Libris-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [libris]
+    \definetypeface [libris] [ss] [sans] [libris] [default]
+\stoptypescript
+
+% Mekanus
+
+\starttypescript [serif] [mekanus]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Mekanus-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Mekanus-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Mekanus-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Mekanus-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mekanus]
+    \definetypeface [mekanus] [rm] [serif] [mekanus] [default]
+\stoptypescript
+
+% Romande
+
+\starttypescript [serif] [romande]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Romande-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Romande-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Romande-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Romande-BoldItalic] [features=default]
+    \definefontsynonym [SerifCaps]       [Romande-Smallcaps]  [features=default]
+\stoptypescript
+
+\starttypescript [romande]
+    \definetypeface [romande] [rm] [serif] [romande] [default]
+\stoptypescript
+
+% Switzera
+
+\starttypescript [sans] [switzera]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Switzera-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Switzera-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Switzera-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Switzera-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [switzera]
+    \definetypeface [switzera] [ss] [sans] [switzera] [default]
+\stoptypescript
+
+% Tribun
+
+\starttypescript [serif] [tribun]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Tribun-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Tribun-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Tribun-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Tribun-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [tribun]
+    \definetypeface [tribun] [rm] [serif] [tribun] [default]
+\stoptypescript
+
+% Universalis
+
+\starttypescript [sans] [universalis]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Universalis-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Universalis-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Universalis-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Universalis-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [universalis]
+    \definetypeface [universalis] [ss] [sans] [universalis] [default]
+\stoptypescript
+
+% Verana
+
+\starttypescript [serif] [verana]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Verana-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Verana-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Verana-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Verana-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verana]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [VeranaSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [VeranaSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [VeranaSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [VeranaSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [verana]
+    \definetypeface [verana] [rm] [serif] [verana] [default]
+    \definetypeface [verana] [ss] [sans]  [verana] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-arkandis}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex b/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex
new file mode 100644
index 00000000000..4c1fa92b2bf
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex
@@ -0,0 +1,38 @@
+%D \module
+%D   [       file=type-asana,
+%D        version=2009.03.25,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Asana Font Definitions,
+%D         author=Aditya Mahajan,
+%D           date=\currentdate,
+%D      copyright=Aditya Mahajan]
+%C
+%C Copyright 2009 Aditya Mahajan.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D Asana math is a \OPENTYPE\ math font that is available freely under the Open
+%D Font License. The font may be downloaded from:
+%D \startitemize
+%D \item Open font library: 
+%D       \hyphenatedurl{http://openfontlibrary.org/media/files/asyropoulos/219}
+%D \item CTAN: 
+%D       \hyphenatedurl{http://www.ctan.org/tex-archive/fonts/Asana-Math/}
+%D \stopitemize
+
+\starttypescriptcollection[asana]
+
+\starttypescript [math] [asana] [name]
+    \definefontsynonym [MathRoman] [name:Asana-Math] [features=math\mathsizesuffix]
+\stoptypescript
+
+\starttypescript [asana]
+    \definetypeface [asana] [rm] [serif] [palatino] [default]
+    \definetypeface [asana] [ss] [sans]  [modern]   [default] [rscale=1.075]
+    \definetypeface [asana] [tt] [mono]  [modern]   [default] [rscale=1.075]
+    \definetypeface [asana] [mm] [math]  [asana]    [default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
new file mode 100644
index 00000000000..9a602efe9b7
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
@@ -0,0 +1,24 @@
+%D \module
+%D   [       file=type-baar,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Baar Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:metanoia] [Baar Metanoia]
+\definetypescriptprefix [f:philos]   [Baar Philos]
+\definetypescriptprefix [f:sophia]   [Baar Sophia]
+
+\starttypescript [sans] [metanoia,philos,sophia]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]            [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]     [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]       [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} BoldItalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
new file mode 100644
index 00000000000..9a602efe9b7
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
@@ -0,0 +1,24 @@
+%D \module
+%D   [       file=type-baar,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Baar Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:metanoia] [Baar Metanoia]
+\definetypescriptprefix [f:philos]   [Baar Philos]
+\definetypescriptprefix [f:sophia]   [Baar Sophia]
+
+\starttypescript [sans] [metanoia,philos,sophia]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]            [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]     [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]       [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} BoldItalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.tex b/Master/texmf-dist/tex/context/third/typescripts/type-baar.tex
new file mode 100644
index 00000000000..8403674dfa4
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.tex
@@ -0,0 +1,39 @@
+%D \module
+%D   [       file=type-baar,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Baar Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D These are typescript for fonts designed by Lutz Baar. The fonts are donation
+%D ware and can be downloaded from
+%D \hyphenatedurl{http://www.menschengeist.de/aidfonts.htm}
+
+\definetypescriptprefix [n:metanoia] [Metanoia]
+\definetypescriptprefix [n:philos]   [Philos]
+\definetypescriptprefix [n:sophia]   [Sophia]
+
+\starttypescriptcollection [baar]
+
+\starttypescript [sans] [metanoia,philos,sophia]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [metanoia,philos,sophia]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-baar}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
new file mode 100644
index 00000000000..9b801fb9de2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-bera,
+%D        version=2008.11.26,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [bera]
+    \definefontsynonym [BeraSerif-Regular] [name:BeraSerif-Roman] [features=default]
+    \definefontsynonym [BeraSerif-Bold]    [name:BeraSerif-Bold]  [features=default]
+\stoptypescript
+
+\starttypescript [sans] [bera]
+    \definefontsynonym [BeraSans-Regular]    [name:BeraSans-Roman]       [features=default]
+    \definefontsynonym [BeraSans-Italic]     [name:BeraSans-Oblique]     [features=default]
+    \definefontsynonym [BeraSans-Bold]       [name:BeraSans-Bold]        [features=default]
+    \definefontsynonym [BeraSans-BoldItalic] [name:BeraSans-BoldOblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [bera]
+    \definefontsynonym [BeraSansMono-Regular]    [name:BeraSansMono-Roman]   [features=default]
+    \definefontsynonym [BeraSansMono-Italic]     [name:BeraSansMono-Oblique] [features=default]
+    \definefontsynonym [BeraSansMono-Bold]       [name:BeraSansMono-Bold]    [features=default]
+    \definefontsynonym [BeraSansMono-BoldItalic] [name:BeraSansMono-BoldOb]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
new file mode 100644
index 00000000000..9b801fb9de2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-bera,
+%D        version=2008.11.26,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [bera]
+    \definefontsynonym [BeraSerif-Regular] [name:BeraSerif-Roman] [features=default]
+    \definefontsynonym [BeraSerif-Bold]    [name:BeraSerif-Bold]  [features=default]
+\stoptypescript
+
+\starttypescript [sans] [bera]
+    \definefontsynonym [BeraSans-Regular]    [name:BeraSans-Roman]       [features=default]
+    \definefontsynonym [BeraSans-Italic]     [name:BeraSans-Oblique]     [features=default]
+    \definefontsynonym [BeraSans-Bold]       [name:BeraSans-Bold]        [features=default]
+    \definefontsynonym [BeraSans-BoldItalic] [name:BeraSans-BoldOblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [bera]
+    \definefontsynonym [BeraSansMono-Regular]    [name:BeraSansMono-Roman]   [features=default]
+    \definefontsynonym [BeraSansMono-Italic]     [name:BeraSansMono-Oblique] [features=default]
+    \definefontsynonym [BeraSansMono-Bold]       [name:BeraSansMono-Bold]    [features=default]
+    \definefontsynonym [BeraSansMono-BoldItalic] [name:BeraSansMono-BoldOb]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.tex b/Master/texmf-dist/tex/context/third/typescripts/type-bera.tex
new file mode 100644
index 00000000000..267a7de04a5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.tex
@@ -0,0 +1,48 @@
+%D \module
+%D   [       file=type-bera,
+%D        version=2008.11.26,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [bera]
+
+\starttypescript [serif] [bera]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [BeraSerif-Regular] [features=default]
+    \definefontsynonym [SerifBold] [BeraSerif-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [bera]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [BeraSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [BeraSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [BeraSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [BeraSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [bera]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [BeraSansMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [BeraSansMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [BeraSansMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [BeraSansMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [bera]
+    \definetypeface [bera] [rm] [serif] [bera]   [default]
+    \definetypeface [bera] [ss] [sans]  [bera]   [default]
+    \definetypeface [bera] [tt] [mono]  [bera]   [default]
+    \definetypeface [bera] [mm] [math]  [modern] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-bera}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
new file mode 100644
index 00000000000..36a4c9217fb
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
@@ -0,0 +1,20 @@
+%D \module
+%D   [       file=type-charissil,
+%D        version=2008.04.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charis SIL Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charissil]
+    \definefontsynonym [CharisSIL-Regular]    [name:Charis SIL]             [features=default]
+    \definefontsynonym [CharisSIL-Italic]     [name:Charis SIL Italic]      [features=default]
+    \definefontsynonym [CharisSIL-Bold]       [name:Charis SIL Bold]        [features=default]
+    \definefontsynonym [CharisSIL-BoldItalic] [name:Charis SIL Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
new file mode 100644
index 00000000000..36a4c9217fb
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
@@ -0,0 +1,20 @@
+%D \module
+%D   [       file=type-charissil,
+%D        version=2008.04.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charis SIL Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charissil]
+    \definefontsynonym [CharisSIL-Regular]    [name:Charis SIL]             [features=default]
+    \definefontsynonym [CharisSIL-Italic]     [name:Charis SIL Italic]      [features=default]
+    \definefontsynonym [CharisSIL-Bold]       [name:Charis SIL Bold]        [features=default]
+    \definefontsynonym [CharisSIL-BoldItalic] [name:Charis SIL Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex
new file mode 100644
index 00000000000..409534135ba
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex
@@ -0,0 +1,27 @@
+%D \module
+%D   [       file=type-charissil,
+%D        version=2008.04.21,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charis SIL Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charissil]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [CharisSIL-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [CharisSIL-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [CharisSIL-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [CharisSIL-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [charissil]
+    \definetypeface [charissil] [rm] [serif] [charissil] [default]
+\stoptypescript
+
+\loadmarkfile{charissil}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
new file mode 100644
index 00000000000..5daeba04058
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
@@ -0,0 +1,22 @@
+%D \module
+%D   [       file=type-charter,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charter Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charter,charter-bold]
+    \definefontsynonym [CharterITC-Regular]     [name:Charter ITC Pro Regular]      [features=default]
+    \definefontsynonym [CharterITC-Bold]        [name:Charter ITC Pro Bold]         [features=default]
+    \definefontsynonym [CharterITC-Italic]      [name:Charter ITC Pro Italic]       [features=default]
+    \definefontsynonym [CharterITC-BoldItalic]  [name:Charter ITC Pro Bold Italic]  [features=default]
+    \definefontsynonym [CharterITC-Black]       [name:Charter ITC Pro Black]        [features=default]
+    \definefontsynonym [CharterITC-BlackItalic] [name:Charter ITC Pro Black Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
new file mode 100644
index 00000000000..5daeba04058
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
@@ -0,0 +1,22 @@
+%D \module
+%D   [       file=type-charter,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charter Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charter,charter-bold]
+    \definefontsynonym [CharterITC-Regular]     [name:Charter ITC Pro Regular]      [features=default]
+    \definefontsynonym [CharterITC-Bold]        [name:Charter ITC Pro Bold]         [features=default]
+    \definefontsynonym [CharterITC-Italic]      [name:Charter ITC Pro Italic]       [features=default]
+    \definefontsynonym [CharterITC-BoldItalic]  [name:Charter ITC Pro Bold Italic]  [features=default]
+    \definefontsynonym [CharterITC-Black]       [name:Charter ITC Pro Black]        [features=default]
+    \definefontsynonym [CharterITC-BlackItalic] [name:Charter ITC Pro Black Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex b/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex
new file mode 100644
index 00000000000..b23f9368ad2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-charter,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Charter Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [charter]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [CharterITC-Regular]    [features=default]
+    \definefontsynonym [SerifBold]       [CharterITC-Bold]       [features=default]
+    \definefontsynonym [SerifItalic]     [CharterITC-Italic]     [features=default]
+    \definefontsynonym [SerifBoldItalic] [CharterITC-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [charter-bold]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [CharterITC-Bold]        [features=default]
+    \definefontsynonym [SerifBold]       [CharterITC-Black]       [features=default]
+    \definefontsynonym [SerifItalic]     [CharterITC-BoldItalic]  [features=default]
+    \definefontsynonym [SerifBoldItalic] [CharterITC-BlackItalic] [features=default]
+\stoptypescript
+
+\starttypescript [charter,charter-bold]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
+\loadmarkfile{type-charter}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
new file mode 100644
index 00000000000..43bcd45c3bf
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
@@ -0,0 +1,59 @@
+%D \module
+%D   [       file=type-cmu,
+%D        version=2008.12.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Computer Modern Unicode Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif,sans,mono] [computer-modern-unicode]
+    \definefontsynonym [CMUSerif-Regular]             [name:CMU Serif Roman]                           [features=default]
+    \definefontsynonym [CMUSerif-Italic]              [name:CMU Serif Italic]                          [features=default]
+    \definefontsynonym [CMUSerif-Slanted]             [name:CMU Serif Roman Slanted]                   [features=default]
+    \definefontsynonym [CMUSerif-Bold]                [name:CMU Serif Bold Extended Roman]             [features=default]
+    \definefontsynonym [CMUSerif-BoldItalic]          [name:CMU Serif Bold Extended Italic]            [features=default]
+    \definefontsynonym [CMSUerif-BoldNonextended]     [name:CMU Serif Roman Bold Nonextended]          [features=default]
+    \definefontsynonym [CMSUerif-BoldSlanted]         [name:CMU Serif Bold Extended Slanted Roman]     [features=default]
+    \definefontsynonym [SMCSerif-ExtraBold]           [name:CMU Serif Roman Bold Nonextended]          [features=default]
+    \definefontsynonym [CMSUerif-UprightItalic]       [name:CMU Serif Upright Italic]                  [features=default]
+    \definefontsynonym [CMUSans-Regular]              [name:CMU Sans Serif]                            [features=default]
+    \definefontsynonym [CMUSans-Italic]               [name:CMU Sans Serif Oblique]                    [features=default]
+    \definefontsynonym [CMUSans-Bold]                 [name:CMU Sans Serif Bold Extended]              [features=default]
+    \definefontsynonym [CMUSans-BoldItalic]           [name:CMU Sans Serif Bold Extended Oblique]      [features=default]
+    \definefontsynonym [CMUSans-Condensed]            [name:CMU Sans Serif Demi Condensed]             [features=default]
+    \definefontsynonym [CMUTypewriter-Light]          [name:CMU Typewriter Text Light]                 [features=default]
+    \definefontsynonym [CMUTypewriter-LightSlanted]   [name:CMU Typewriter Text Light Oblique]         [features=default]
+    \definefontsynonym [CMUTypewriter-Regular]        [name:CMU Typewriter Text Regular]               [features=default]
+    \definefontsynonym [CMUTypewriter-Italic]         [name:CMU Typewriter Text Italic]                [features=default]
+    \definefontsynonym [CMUTypewriter-Slanted]        [name:CMU Typewriter Text Oblique]               [features=default]
+    \definefontsynonym [CMUTypewriter-Bold]           [name:CMU Typewriter Text Bold]                  [features=default]
+    \definefontsynonym [CMUTypewriter-BoldItalic]     [name:CMU Typewriter Text Bold Italic]           [features=default]
+    \definefontsynonym [CMUTypewriter-Variable]       [name:CMU Typewriter Text Variable Width]        [features=default]
+    \definefontsynonym [CMUTypewriter-VariableItalic] [name:CMU Typewriter Text Variable Width Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [cmu-bright]
+    \definefontsynonym [CMUBright-Roman]          [name:CMU Bright Roman]                 [features=default]
+    \definefontsynonym [CMUBright-Italic]         [name:CMU Bright Oblique]               [features=default]
+    \definefontsynonym [CMUBright-Bold]           [name:CMU Bright Bold Extended]         [features=default]
+    \definefontsynonym [CMUBright-BoldItalic]     [name:CMU Bright Bold Extended Oblique] [features=default]
+    \definefontsynonym [CMUBright-SemiBold]       [name:CMU Bright SemiBold]              [features=default]
+    \definefontsynonym [CMUBright-SemiBoldItalic] [name:CMU Bright SemiBold Oblique]      [features=default]
+\stoptypescript
+
+\starttypescript [serif] [cmu-classical]
+    \definefontsynonym [CMUClassicalSerif-Italic] [name:CMU Classical Serif Italic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [cmu-concrete]
+    \definefontsynonym [CMUConcrete-Roman]      [name:CMU Concrete Roman]                [features=default]
+    \definefontsynonym [CMUConcretei-Ialic]     [name:CMU Concrete Italic]               [features=default]
+    \definefontsynonym [CMUConcrete-Bold]       [name:CMU Concrete Bold Extended Roman]  [features=default]
+    \definefontsynonym [CMUConcrete-BoldItalic] [name:CMU Concrete Bold Extended Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
new file mode 100644
index 00000000000..43bcd45c3bf
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
@@ -0,0 +1,59 @@
+%D \module
+%D   [       file=type-cmu,
+%D        version=2008.12.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Computer Modern Unicode Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif,sans,mono] [computer-modern-unicode]
+    \definefontsynonym [CMUSerif-Regular]             [name:CMU Serif Roman]                           [features=default]
+    \definefontsynonym [CMUSerif-Italic]              [name:CMU Serif Italic]                          [features=default]
+    \definefontsynonym [CMUSerif-Slanted]             [name:CMU Serif Roman Slanted]                   [features=default]
+    \definefontsynonym [CMUSerif-Bold]                [name:CMU Serif Bold Extended Roman]             [features=default]
+    \definefontsynonym [CMUSerif-BoldItalic]          [name:CMU Serif Bold Extended Italic]            [features=default]
+    \definefontsynonym [CMSUerif-BoldNonextended]     [name:CMU Serif Roman Bold Nonextended]          [features=default]
+    \definefontsynonym [CMSUerif-BoldSlanted]         [name:CMU Serif Bold Extended Slanted Roman]     [features=default]
+    \definefontsynonym [SMCSerif-ExtraBold]           [name:CMU Serif Roman Bold Nonextended]          [features=default]
+    \definefontsynonym [CMSUerif-UprightItalic]       [name:CMU Serif Upright Italic]                  [features=default]
+    \definefontsynonym [CMUSans-Regular]              [name:CMU Sans Serif]                            [features=default]
+    \definefontsynonym [CMUSans-Italic]               [name:CMU Sans Serif Oblique]                    [features=default]
+    \definefontsynonym [CMUSans-Bold]                 [name:CMU Sans Serif Bold Extended]              [features=default]
+    \definefontsynonym [CMUSans-BoldItalic]           [name:CMU Sans Serif Bold Extended Oblique]      [features=default]
+    \definefontsynonym [CMUSans-Condensed]            [name:CMU Sans Serif Demi Condensed]             [features=default]
+    \definefontsynonym [CMUTypewriter-Light]          [name:CMU Typewriter Text Light]                 [features=default]
+    \definefontsynonym [CMUTypewriter-LightSlanted]   [name:CMU Typewriter Text Light Oblique]         [features=default]
+    \definefontsynonym [CMUTypewriter-Regular]        [name:CMU Typewriter Text Regular]               [features=default]
+    \definefontsynonym [CMUTypewriter-Italic]         [name:CMU Typewriter Text Italic]                [features=default]
+    \definefontsynonym [CMUTypewriter-Slanted]        [name:CMU Typewriter Text Oblique]               [features=default]
+    \definefontsynonym [CMUTypewriter-Bold]           [name:CMU Typewriter Text Bold]                  [features=default]
+    \definefontsynonym [CMUTypewriter-BoldItalic]     [name:CMU Typewriter Text Bold Italic]           [features=default]
+    \definefontsynonym [CMUTypewriter-Variable]       [name:CMU Typewriter Text Variable Width]        [features=default]
+    \definefontsynonym [CMUTypewriter-VariableItalic] [name:CMU Typewriter Text Variable Width Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [cmu-bright]
+    \definefontsynonym [CMUBright-Roman]          [name:CMU Bright Roman]                 [features=default]
+    \definefontsynonym [CMUBright-Italic]         [name:CMU Bright Oblique]               [features=default]
+    \definefontsynonym [CMUBright-Bold]           [name:CMU Bright Bold Extended]         [features=default]
+    \definefontsynonym [CMUBright-BoldItalic]     [name:CMU Bright Bold Extended Oblique] [features=default]
+    \definefontsynonym [CMUBright-SemiBold]       [name:CMU Bright SemiBold]              [features=default]
+    \definefontsynonym [CMUBright-SemiBoldItalic] [name:CMU Bright SemiBold Oblique]      [features=default]
+\stoptypescript
+
+\starttypescript [serif] [cmu-classical]
+    \definefontsynonym [CMUClassicalSerif-Italic] [name:CMU Classical Serif Italic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [cmu-concrete]
+    \definefontsynonym [CMUConcrete-Roman]      [name:CMU Concrete Roman]                [features=default]
+    \definefontsynonym [CMUConcretei-Ialic]     [name:CMU Concrete Italic]               [features=default]
+    \definefontsynonym [CMUConcrete-Bold]       [name:CMU Concrete Bold Extended Roman]  [features=default]
+    \definefontsynonym [CMUConcrete-BoldItalic] [name:CMU Concrete Bold Extended Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.tex b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.tex
new file mode 100644
index 00000000000..c4ebf59e012
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.tex
@@ -0,0 +1,50 @@
+%D \module
+%D   [       file=type-cmu,
+%D        version=2008.12.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Computer Modern Unicode Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [computer-modern-unicode]
+
+\starttypescript [serif] [computer-modern-unicode]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [CMUSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [CMUSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [CMUSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [CMUSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [computer-modern-unicode]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [CMUSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [CMUSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [CMUSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [CMUSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [computer-modern-unicode]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [CMUTypewriter-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [CMUTypewriter-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [CMUTypewriter-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [CMUTypewriter-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [computer-modern-unicode]
+    \definetypeface [computer-modern-unicode] [rm] [serif] [computer-modern-unicode] [default]
+    \definetypeface [computer-modern-unicode] [ss] [sans]  [computer-modern-unicode] [default]
+    \definetypeface [computer-modern-unicode] [tt] [mono]  [computer-modern-unicode] [default]
+    \definetypeface [computer-modern-unicode] [mm] [math]  [modern]                  [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-cmu}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
new file mode 100644
index 00000000000..8e3761bd7dd
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=type-dejavu,
+%D        version=2009.04.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=DejaVu Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [dejavu,dejavu-cond]
+    \definefontsynonym [DejaVuSerif-Regular]        [name:DejaVu Serif]                       [features=default]
+    \definefontsynonym [DejaVuSerif-Italic]         [name:DejaVu Serif Italic]                [features=default]
+    \definefontsynonym [DejaVuSerif-Bold]           [name:DejaVu Serif Bold]                  [features=default]
+    \definefontsynonym [DejaVuSerif-BoldItalic]     [name:DejaVu Serif Bold Italic]           [features=default]
+    \definefontsynonym [DejaVuSerifCond-Regular]    [name:DejaVu Serif Condensed]             [features=default]
+    \definefontsynonym [DejaVuSerifCond-Bold]       [name:DejaVu Serif Condensed Bold]        [features=default]
+    \definefontsynonym [DejaVuSerifCond-Italic]     [name:DejaVu Serif Condensed Italic]      [features=default]
+    \definefontsynonym [DejaVuSerifCond-BoldItalic] [name:DejaVu Serif Condensed Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [dejavu,dejavu-cond]
+    \definefontsynonym [DejaVuSans-Regular]        [name:DejaVu Sans]                        [features=default]
+    \definefontsynonym [DejaVuSans-Italic]         [name:DejaVu Sans Oblique]                [features=default]
+    \definefontsynonym [DejaVuSans-Bold]           [name:DejaVu Sans Bold]                   [features=default]
+    \definefontsynonym [DejaVuSans-BoldItalic]     [name:DejaVu Sans Bold Oblique]           [features=default]
+    \definefontsynonym [DejaVuSansCond-Regular]    [name:DejaVu Sans Condensed]              [features=default]
+    \definefontsynonym [DejaVuSansCond-Bold]       [name:DejaVu Sans Condensed Bold]         [features=default]
+    \definefontsynonym [DejaVuSansCond-Italic]     [name:DejaVu Sans Condensed Oblique]      [features=default]
+    \definefontsynonym [DejaVuSansCond-BoldItalic] [name:DejaVu Sans Condensed Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [dejavu]
+    \definefontsynonym [DejaVuMono-Regular]    [name:DejaVu Sans Mono]              [features=default]
+    \definefontsynonym [DejaVuMono-Italic]     [name:DejaVu Sans Mono Oblique]      [features=default]
+    \definefontsynonym [DejaVuMono-Bold]       [name:DejaVu Sans Mono Bold]         [features=default]
+    \definefontsynonym [DejaVuMono-BoldItalic] [name:DejaVu Sans Mono Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
new file mode 100644
index 00000000000..8e3761bd7dd
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=type-dejavu,
+%D        version=2009.04.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=DejaVu Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [dejavu,dejavu-cond]
+    \definefontsynonym [DejaVuSerif-Regular]        [name:DejaVu Serif]                       [features=default]
+    \definefontsynonym [DejaVuSerif-Italic]         [name:DejaVu Serif Italic]                [features=default]
+    \definefontsynonym [DejaVuSerif-Bold]           [name:DejaVu Serif Bold]                  [features=default]
+    \definefontsynonym [DejaVuSerif-BoldItalic]     [name:DejaVu Serif Bold Italic]           [features=default]
+    \definefontsynonym [DejaVuSerifCond-Regular]    [name:DejaVu Serif Condensed]             [features=default]
+    \definefontsynonym [DejaVuSerifCond-Bold]       [name:DejaVu Serif Condensed Bold]        [features=default]
+    \definefontsynonym [DejaVuSerifCond-Italic]     [name:DejaVu Serif Condensed Italic]      [features=default]
+    \definefontsynonym [DejaVuSerifCond-BoldItalic] [name:DejaVu Serif Condensed Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [dejavu,dejavu-cond]
+    \definefontsynonym [DejaVuSans-Regular]        [name:DejaVu Sans]                        [features=default]
+    \definefontsynonym [DejaVuSans-Italic]         [name:DejaVu Sans Oblique]                [features=default]
+    \definefontsynonym [DejaVuSans-Bold]           [name:DejaVu Sans Bold]                   [features=default]
+    \definefontsynonym [DejaVuSans-BoldItalic]     [name:DejaVu Sans Bold Oblique]           [features=default]
+    \definefontsynonym [DejaVuSansCond-Regular]    [name:DejaVu Sans Condensed]              [features=default]
+    \definefontsynonym [DejaVuSansCond-Bold]       [name:DejaVu Sans Condensed Bold]         [features=default]
+    \definefontsynonym [DejaVuSansCond-Italic]     [name:DejaVu Sans Condensed Oblique]      [features=default]
+    \definefontsynonym [DejaVuSansCond-BoldItalic] [name:DejaVu Sans Condensed Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [dejavu]
+    \definefontsynonym [DejaVuMono-Regular]    [name:DejaVu Sans Mono]              [features=default]
+    \definefontsynonym [DejaVuMono-Italic]     [name:DejaVu Sans Mono Oblique]      [features=default]
+    \definefontsynonym [DejaVuMono-Bold]       [name:DejaVu Sans Mono Bold]         [features=default]
+    \definefontsynonym [DejaVuMono-BoldItalic] [name:DejaVu Sans Mono Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.tex b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.tex
new file mode 100644
index 00000000000..357cd6c1465
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.tex
@@ -0,0 +1,70 @@
+%D \module
+%D   [       file=type-dejavu,
+%D        version=2009.04.02,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=DejaVu Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D The DejaVu fonts are a font family based on the Vera Fonts but provide a
+%D wider character range. They are available under a free font license and can
+%D be downloaded from \hyphenatedurl{http://dejavu-fonts.org/}
+
+\starttypescriptcollection [dejavu]
+
+\starttypescript [serif] [dejavu]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif]           [DejaVuSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [DejaVuSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [DejaVuSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [DejaVuSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [dejavu-cond]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Serif]           [DejaVuSerifCond-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [DejaVuSerifCond-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [DejaVuSerifCond-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [DejaVuSerifCond-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [dejavu]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [DejaVuSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [DejaVuSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [DejaVuSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [DejaVuSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [dejavu-cond]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [DejaVuSansCond-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [DejaVuSansCond-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [DejaVuSansCond-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [DejaVuSansCond-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [dejavu]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [DejaVuMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [DejaVuMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [DejaVuMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [DejaVuMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [dejavu,dejavu-cond]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+    \definetypeface [\typescriptone] [ss] [sans]  [\typescriptone] [default]
+    \definetypeface [\typescriptone] [tt] [mono]  [dejavu]         [default]
+    \definetypeface [\typescriptone] [mm] [math]  [palatino]       [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-dejavu}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
new file mode 100644
index 00000000000..e7ceddb1ac1
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
@@ -0,0 +1,23 @@
+%D \module
+%D   [       file=type-droid,
+%D        version=2008.07.28,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Droid Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif,sans,mono] [droid]
+    \definefontsynonym [DroidSerif-Regular]    [name:Droid Serif]             [features=default]
+    \definefontsynonym [DroidSerif-Italic]     [name:Droid Serif Italic]      [features=default]
+    \definefontsynonym [DroidSerif-Bold]       [name:Droid Serif Bold]        [features=default]
+    \definefontsynonym [DroidSerif-BoldItalic] [name:Droid Serif Bold Italic] [features=default]
+    \definefontsynonym [DroidSans-Regular]     [name:Droid Sans]              [features=default]
+    \definefontsynonym [DroidSans-Bold]        [name:Droid Sans Bold]         [features=default]
+    \definefontsynonym [DroidMono-Regular]     [name:Droid Sans Mono]         [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
new file mode 100644
index 00000000000..2288bd3053a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
@@ -0,0 +1,23 @@
+%D \module
+%D   [       file=type-droid,
+%D        version=2008.07.28,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Droid Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif,sans,mono] [droid]
+    \definefontsynonym [DroidSerif-Regular]    [name:droidserif]           [features=default]
+    \definefontsynonym [DroidSerif-Italic]     [name:droidserifitalic]     [features=default]
+    \definefontsynonym [DroidSerif-Bold]       [name:droidserifbold]       [features=default]
+    \definefontsynonym [DroidSerif-BoldItalic] [name:droidserifbolditalic] [features=default]
+    \definefontsynonym [DroidSans-Regular]     [name:droidsans]            [features=default]
+    \definefontsynonym [DroidSans-Bold]        [name:droidsansbold]        [features=default]
+    \definefontsynonym [DroidMono-Regular]     [name:droidsansmono]        [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex b/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex
new file mode 100644
index 00000000000..5b775567547
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex
@@ -0,0 +1,45 @@
+%D \module
+%D   [       file=type-droid,
+%D        version=2008.07.28,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Droid Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [droid]
+
+\starttypescript [serif] [droid]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [DroidSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [DroidSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [DroidSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [DroidSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [droid]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [DroidSans-Regular] [features=default]
+    \definefontsynonym [SansBold] [DroidSans-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [mono] [droid]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono] [DroidMono-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [droid]
+    \definetypeface [droid] [rm] [serif] [droid]  [default]
+    \definetypeface [droid] [ss] [sans]  [droid]  [default]
+    \definetypeface [droid] [tt] [mono]  [droid]  [default]
+    \definetypeface [droid] [mm] [math]  [modern] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-droid}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
new file mode 100644
index 00000000000..f3c13d9ee6f
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
@@ -0,0 +1,82 @@
+%D \module
+%D   [       file=type-exljbris,
+%D        version=2009.04.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Exljbris Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Anivers
+
+\starttypescript [sans] [anivers]
+    \definefontsynonym [Anivers-Regular] [name:Anivers Regular] [features=default]
+\stoptypescript
+
+% Delicious
+
+\starttypescript [sans] [delicious]
+    \definefontsynonym [Delicious-Regular]    [name:Delicious-Roman]      [features=default]
+    \definefontsynonym [Delicious-Italic]     [name:Delicious-Italic]     [features=default]
+    \definefontsynonym [Delicious-Bold]       [name:Delicious-Bold]       [features=default]
+    \definefontsynonym [Delicious-BoldItalic] [name:Delicious-BoldItalic] [features=default]
+    \definefontsynonym [Delicious-Caps]       [name:Delicious-SmallCaps]  [features=default]
+    \definefontsynonym [Delicious-Heavy]      [name:Delicious-Heavy]      [features=default]
+\stoptypescript
+
+% Diavlo
+
+\starttypescript [sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+    \definefontsynonym [DiavloLight-Regular]  [name:Diavlo Light Regular]  [features=default]
+    \definefontsynonym [DiavloBook-Regular]   [name:Diavlo Book Regular]   [features=default]
+    \definefontsynonym [DiavloMedium-Regular] [name:Diavlo Medium Regular] [features=default]
+    \definefontsynonym [DiavloBold-Regular]   [name:Diavlo Bold Regular]   [features=default]
+    \definefontsynonym [DiavloBlack-Regular]  [name:Diavlo Black Regular]  [features=default]
+\stoptypescript
+
+% Fertigo Pro
+
+\starttypescript [sans] [fertigo]
+    \definefontsynonym [FertigoPro-Regular] [name:Fertigo Pro Regular] [features=default]
+\stoptypescript
+
+% Fontin, Fontin Sans
+
+\starttypescript [serif] [fontin]
+    \definefontsynonym [Fontin-Regular] [name:Fontin Regular]   [features=default]
+    \definefontsynonym [Fontin-Italic]  [name:Fontin Italic]    [features=default]
+    \definefontsynonym [Fontin-Bold]    [name:Fontin Bold]      [features=default]
+    \definefontsynonym [Fontin-Caps]    [name:Fontin SmallCaps] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [fontin]
+    \definefontsynonym [FontinSans-Regular]    [name:Fontin Sans Regular]     [features=default]
+    \definefontsynonym [FontinSans-Italic]     [name:Fontin Sans Italic]      [features=default]
+    \definefontsynonym [FontinSans-Bold]       [name:Fontin Sans Bold]        [features=default]
+    \definefontsynonym [FontinSans-BoldItalic] [name:Fontin Sans Bold Italic] [features=default]
+    \definefontsynonym [FontinSans-Caps]       [name:Fontin Sans Small Caps]  [features=default]
+\stoptypescript
+
+% Museo, Museo Sans
+
+\starttypescript [serif] [museo]
+    \definefontsynonym [Museo-300] [name:Museo 300] [features=default]
+    \definefontsynonym [Museo-500] [name:Museo 500] [features=default]
+    \definefontsynonym [Museo-700] [name:Museo 700] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [museo]
+    \definefontsynonym [MuseoSans-500]        [name:Museo Sans 500]        [features=default]
+    \definefontsynonym [MuseoSans-500-Italic] [name:Museo Sans 500 Italic] [features=default]
+\stoptypescript
+
+% Tallys
+
+\starttypescript [serif] [tallys]
+    \definefontsynonym [Tallys-Regular] [name:Tallys] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
new file mode 100644
index 00000000000..52e0e3e3642
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
@@ -0,0 +1,82 @@
+%D \module
+%D   [       file=type-exljbris,
+%D        version=2009.04.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Exljbris Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Anivers
+
+\starttypescript [sans] [anivers]
+    \definefontsynonym [Anivers-Regular] [name:aniversregular] [features=default]
+\stoptypescript
+
+% Delicious
+
+\starttypescript [sans] [delicious]
+    \definefontsynonym [Delicious-Regular]    [name:deliciousroman]      [features=default]
+    \definefontsynonym [Delicious-Italic]     [name:deliciousitalic]     [features=default]
+    \definefontsynonym [Delicious-Bold]       [name:deliciousbold]       [features=default]
+    \definefontsynonym [Delicious-BoldItalic] [name:deliciousbolditalic] [features=default]
+    \definefontsynonym [Delicious-Caps]       [name:delicioussmallcaps]  [features=default]
+    \definefontsynonym [Delicious-Heavy]      [name:deliciousheavy]      [features=default]
+\stoptypescript
+
+% Diavlo
+
+\starttypescript [sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+    \definefontsynonym [DiavloLight-Regular]  [name:Diavlo Light Regular]  [features=default]
+    \definefontsynonym [DiavloBook-Regular]   [name:Diavlo Book Regular]   [features=default]
+    \definefontsynonym [DiavloMedium-Regular] [name:Diavlo Medium Regular] [features=default]
+    \definefontsynonym [DiavloBold-Regular]   [name:Diavlo Bold Regular]   [features=default]
+    \definefontsynonym [DiavloBlack-Regular]  [name:Diavlo Black Regular]  [features=default]
+\stoptypescript
+
+% Fertigo Pro
+
+\starttypescript [sans] [fertigo]
+    \definefontsynonym [FertigoPro-Regular] [name:fertigoproregular] [features=default]
+\stoptypescript
+
+% Fontin, Fontin Sans
+
+\starttypescript [serif] [fontin]
+    \definefontsynonym [Fontin-Regular] [name:fontinregular]   [features=default]
+    \definefontsynonym [Fontin-Italic]  [name:fontinitalic]    [features=default]
+    \definefontsynonym [Fontin-Bold]    [name:fontinbold]      [features=default]
+    \definefontsynonym [Fontin-Caps]    [name:fontinsmallcaps] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [fontin]
+    \definefontsynonym [FontinSans-Regular]    [name:fontinsansregular]    [features=default]
+    \definefontsynonym [FontinSans-Italic]     [name:fontinsansitalic]     [features=default]
+    \definefontsynonym [FontinSans-Bold]       [name:fontinsansbold]       [features=default]
+    \definefontsynonym [FontinSans-BoldItalic] [name:fontinsansbolditalic] [features=default]
+    \definefontsynonym [FontinSans-Caps]       [name:fontinsanssmallcaps]  [features=default]
+\stoptypescript
+
+% Museo, Museo Sans
+
+\starttypescript [serif] [museo]
+    \definefontsynonym [Museo-300] [name:museo300] [features=default]
+    \definefontsynonym [Museo-500] [name:museo500] [features=default]
+    \definefontsynonym [Museo-700] [name:museo700] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [museo]
+    \definefontsynonym [MuseoSans-500]        [name:museosans500]       [features=default]
+    \definefontsynonym [MuseoSans-500-Italic] [name:museosans500italic] [features=default]
+\stoptypescript
+
+% Tallys
+
+\starttypescript [serif] [tallys]
+    \definefontsynonym [Tallys-Regular] [name:tallys] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
new file mode 100644
index 00000000000..12447382f7e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
@@ -0,0 +1,177 @@
+%D \module
+%D   [       file=type-exljbris,
+%D        version=2009.04.04,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Exljbris Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D exljbris is a collection of fonts by Jos Buivenga. The fonts are
+%D \startitemize
+%D \head Anivers \par
+%D       Anivers is a sans serif font that comes in regular, small caps,
+%D       italic, and bold. Anivers Regular is free.
+%D \head Delicious \par
+%D       Delicious is a sans serif font that comes in regular, small caps,
+%D       italic, and bold. All variants are free.
+%D \head Diavlo \par
+%D       Diavlo is a sans serif font that comes in light, book, medium,
+%D       bold, and black. All variants are free. 
+%D \head Fertigo Pro \par
+%D       Fertigo Pro is a sans serif font that comes in regular weight. It
+%D       is available freely.
+%D \head Fontin and Fontin Sans \par
+%D       Fontin is a serif font and Fontin Sans is a matching sans serif
+%D       font. Both come in regular, small caps, italic, and bold. Both
+%D       fonts can be downloaded freely.
+%D \head Museo and Museo Sans \par
+%D       Museo is a serif font and Museo Sans is a serif font. Both fonts comes
+%D       in five weights (100 300 500 700 900). Museo Sans also has each
+%D       weight in italic.
+%D
+%D       For Museo, three weights are free (300 500 700) and two are paid
+%D       (100 900). For Museo Sans, regular and italic at weight 500 are
+%D       free; other eight are paid.
+%D \head Tallys \par
+%D       Tallys is a serif font that comes in regular. It can be downloaded
+%D       freely.
+%D \stopitemize
+%D
+%D More details, including links for download, are available at
+%D \hypenatedurl{http://www.josbuivenga.demon.nl}
+
+\starttypescriptcollection [exljbris]
+
+% Anivers
+
+\starttypescript [sans] [anivers]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Anivers-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [anivers]
+    \definetypeface [anivers] [ss] [sans] [anivers] [default]
+\stoptypescript
+
+% Delicious
+
+\starttypescript [sans] [delicious]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Delicious-Regular]
+    \definefontsynonym [SansItalic]     [Delicious-Italic]
+    \definefontsynonym [SansBold]       [Delicious-Bold]
+    \definefontsynonym [SansBoldItalic] [Delicious-BoldItalic]
+    \definefontsynonym [SansCaps]       [Delicious-Caps]
+\stoptypescript
+
+\starttypescript [delicious]
+    \definetypeface [delicious] [ss] [sans] [delicious] [default]
+\stoptypescript
+
+% Diavlo
+
+\starttypescript [sans] [diavlo]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [DiavloBook-Regular]   [features=default]
+    \definefontsynonym [SansBold] [DiavloMedium-Regular] [features=default]  
+\stoptypescript
+
+\starttypescript [sans] [diavlo-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [DiavloLight-Regular] [features=default]
+    \definefontsynonym [SansBold] [DiavloBook-Regular]  [features=default]  
+\stoptypescript
+
+\starttypescript [sans] [diavlo-medium]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [DiavloMedium-Regular] [features=default]
+    \definefontsynonym [SansBold] [DiavloBlack-Regular]  [features=default]  
+\stoptypescript
+
+\starttypescript [sans] [diavlo-bold]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [DiavloBold-Regular]  [features=default]
+    \definefontsynonym [SansBold] [DiavloBlack-Regular] [features=default]  
+\stoptypescript
+
+\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+% Fertigo Pro
+
+\starttypescript [sans] [fertigo]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [FertigoPro-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [fertigo]
+    \definetypeface [fertigo] [ss] [sans] [fertigo] [default]
+\stoptypescript
+
+% Fontin, Fontin Sans
+
+\starttypescript [serif] [fontin]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Fontin-Regular]
+    \definefontsynonym [SerifItalic]     [Fontin-Italic]
+    \definefontsynonym [SerifBold]       [Fontin-Bold]
+    \definefontsynonym [SerifBoldItalic] [SerifBold]
+    \definefontsynonym [SerifCaps]       [Fontin-Caps]
+\stoptypescript
+
+\starttypescript [sans] [fontin]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [FontinSans-Regular]
+    \definefontsynonym [SansItalic]     [FontinSans-Italic]
+    \definefontsynonym [SansBold]       [FontinSans-Bold]
+    \definefontsynonym [SansBoldItalic] [FontinSans-BoldItalic]
+    \definefontsynonym [SansCaps]       [FontinSans-Caps]
+\stoptypescript
+
+\starttypescript [fontin]
+    \definetypeface [fontin] [rm] [serif] [fontin]   [default]
+    \definetypeface [fontin] [ss] [sans]  [fontin]   [default]
+    \definetypeface [fontin] [tt] [mono]  [modern]   [default] [rscale=1.1]
+    \definetypeface [fontin] [mm] [math]  [palatino] [default]
+\stoptypescript
+
+% Museo, Museo Sans
+
+\starttypescript [serif] [museo]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [Museo-500] [features=default]
+    \definefontsynonym [SerifBold] [Museo-700] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [museo]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [MuseoSans-500]        [features=default]
+    \definefontsynonym [SansItalic] [MuseoSans-500-Italic] [features=default]
+\stoptypescript
+
+\starttypescript [museo]
+    \definetypeface [museo] [rm] [serif] [museo] [default]
+    \definetypeface [museo] [ss] [sans]  [museo] [default]
+\stoptypescript
+
+% Tallys
+
+\starttypescript [serif] [tallys]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Tallys-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [tallys]
+    \definetypeface [tallys] [rm] [serif] [tallys] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-exljbris}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
new file mode 100644
index 00000000000..64abbe3fef2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
@@ -0,0 +1,31 @@
+%D \module
+%D   [       file=type-fontsite,
+%D        version=2009.04.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Fontsite Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Bergamo
+
+\starttypescript [serif] [bergamo]
+    \definefontsynonym [Bergamo-Regular]    [name:BergamoStd-Regular]    [features=default]
+    \definefontsynonym [Bergamo-Italic]     [name:BergamoStd-Italic]     [features=default]
+    \definefontsynonym [Bergamo-Bold]       [name:BergamoStd-Bold]       [features=default]
+    \definefontsynonym [Bergamo-BoldItalic] [name:BergamoStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Carto Gothic
+
+\starttypescript [sans] [cartogothic]
+    \definefontsynonym [CartoGothic-Regular]    [name:CartoGothicStd-Book]       [features=default]
+    \definefontsynonym [CartoGothic-Italic]     [name:CartoGothicStd-Italic]     [features=default]
+    \definefontsynonym [CartoGothic-Bold]       [name:CartoGothicStd-Bold]       [features=default]
+    \definefontsynonym [CartoGothic-BoldItalic] [name:CartoGothicStd-BoldItalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
new file mode 100644
index 00000000000..64abbe3fef2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
@@ -0,0 +1,31 @@
+%D \module
+%D   [       file=type-fontsite,
+%D        version=2009.04.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Fontsite Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Bergamo
+
+\starttypescript [serif] [bergamo]
+    \definefontsynonym [Bergamo-Regular]    [name:BergamoStd-Regular]    [features=default]
+    \definefontsynonym [Bergamo-Italic]     [name:BergamoStd-Italic]     [features=default]
+    \definefontsynonym [Bergamo-Bold]       [name:BergamoStd-Bold]       [features=default]
+    \definefontsynonym [Bergamo-BoldItalic] [name:BergamoStd-BoldItalic] [features=default]
+\stoptypescript
+
+% Carto Gothic
+
+\starttypescript [sans] [cartogothic]
+    \definefontsynonym [CartoGothic-Regular]    [name:CartoGothicStd-Book]       [features=default]
+    \definefontsynonym [CartoGothic-Italic]     [name:CartoGothicStd-Italic]     [features=default]
+    \definefontsynonym [CartoGothic-Bold]       [name:CartoGothicStd-Bold]       [features=default]
+    \definefontsynonym [CartoGothic-BoldItalic] [name:CartoGothicStd-BoldItalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
new file mode 100644
index 00000000000..c3f1984557e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
@@ -0,0 +1,49 @@
+%D \module
+%D   [       file=type-fontsite,
+%D        version=2009.04.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Fontsite Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D \hypenatedurl{http://www.fontsite.com/download-free-fonts/}
+
+\starttypescriptcollection [fontsite]
+
+% Bergamo
+
+\starttypescript [serif] [bergamo]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Bergamo-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Bergamo-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Bergamo-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Bergamo-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [bergamo]
+    \definetypeface [bergamo] [rm] [serif] [bergamo] [default]
+\stoptypescript
+
+% Carto Gothic
+
+\starttypescript [sans] [cartogothic]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [CartoGothic-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [CartoGothic-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [CartoGothic-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [CartoGothic-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [cartogothic]
+    \definetypeface [cartogothic] [ss] [sans] [cartogothic] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-fontsite}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
new file mode 100644
index 00000000000..fbe92a2dda0
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
@@ -0,0 +1,91 @@
+%D \module
+%D   [       file=type-gfs,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=GFS Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Ambrosia
+
+\starttypescript [serif] [ambrosia]
+    \definefontsynonym [Ambrosia-Regular] [name:GFSAmbrosia-Regular] [features=default]
+\stoptypescript
+
+% Artemisia
+
+\starttypescript [serif] [artemisia]
+    \definefontsynonym [Artemisia-Regular]    [name:GFSArtemisia-Regular]    [features=default]
+    \definefontsynonym [Artemisia-Italic]     [name:GFSArtemisia-Italic]     [features=default]
+    \definefontsynonym [Artemisia-Bold]       [name:GFSArtemisia-Bold]       [features=default]
+    \definefontsynonym [Artemisia-BoldItalic] [name:GFSArtemisia-BoldItalic] [features=default]
+\stoptypescript
+
+% Bodoni
+
+\starttypescript [serif] [bodoni]
+    \definefontsynonym [Bodoni-Regular]    [name:GFSBodoni-Regular]    [features=default]
+    \definefontsynonym [Bodoni-Italic]     [name:GFSBodoni-Italic]     [features=default]
+    \definefontsynonym [Bodoni-Bold]       [name:GFSBodoni-Bold]       [features=default]
+    \definefontsynonym [Bodoni-BoldItalic] [name:GFSBodoni-BoldItalic] [features=default]
+\stoptypescript
+
+% Didot
+
+\starttypescript [serif] [didot]
+    \definefontsynonym [Didot-Regular]    [name:GFSDidot-Regular]    [features=default]
+    \definefontsynonym [Didot-Italic]     [name:GFSDidot-Italic]     [features=default]
+    \definefontsynonym [Didot-Bold]       [name:GFSDidot-Bold]       [features=default]
+    \definefontsynonym [Didot-BoldItalic] [name:GFSDidot-BoldItalic] [features=default]
+\stoptypescript
+
+% Elpis
+
+\starttypescript [serif] [elpis]
+    \definefontsynonym [Elpis-Regular] [name:GFSElpis-Regular] [features=default]
+\stoptypescript
+
+% Eustace
+
+\starttypescript [serif] [eustace]
+    \definefontsynonym [Eustace-Regular] [name:GFSEustace-Regular] [features=default]
+\stoptypescript
+
+% Fleischman
+
+\starttypescript [serif] [fleischman]
+    \definefontsynonym [Fleischman-Regular] [name:GFSFleischman-Regular] [features=default]
+\stoptypescript
+
+% Jackson
+
+\starttypescript [serif] [jackson]
+    \definefontsynonym [Jackson-Regular] [name:GFSJackson-Regular] [features=default]
+\stoptypescript
+
+% Neohellenic
+
+\starttypescript [sans] [neohellenic]
+    \definefontsynonym [Neohellenic-Regular]    [name:GFSNeohellenic-Regular]    [features=default]
+    \definefontsynonym [Neohellenic-Italic]     [name:GFSNeohellenic-Italic]     [features=default]
+    \definefontsynonym [Neohellenic-Bold]       [name:GFSNeohellenic-Bold]       [features=default]
+    \definefontsynonym [Neohellenic-BoldItalic] [name:GFSNeohellenic-BoldItalic] [features=default]
+\stoptypescript
+
+% Nicefore
+
+\starttypescript [sans] [nicefore]
+    \definefontsynonym [Nicefore-Regular] [name:GFSNicefore] [features=default]
+\stoptypescript
+
+% Theokritos
+
+\starttypescript [serif] [theokritos]
+    \definefontsynonym [Theokritos-Regular] [name:GFS Theokritos Regular] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
new file mode 100644
index 00000000000..fbe92a2dda0
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
@@ -0,0 +1,91 @@
+%D \module
+%D   [       file=type-gfs,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=GFS Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Ambrosia
+
+\starttypescript [serif] [ambrosia]
+    \definefontsynonym [Ambrosia-Regular] [name:GFSAmbrosia-Regular] [features=default]
+\stoptypescript
+
+% Artemisia
+
+\starttypescript [serif] [artemisia]
+    \definefontsynonym [Artemisia-Regular]    [name:GFSArtemisia-Regular]    [features=default]
+    \definefontsynonym [Artemisia-Italic]     [name:GFSArtemisia-Italic]     [features=default]
+    \definefontsynonym [Artemisia-Bold]       [name:GFSArtemisia-Bold]       [features=default]
+    \definefontsynonym [Artemisia-BoldItalic] [name:GFSArtemisia-BoldItalic] [features=default]
+\stoptypescript
+
+% Bodoni
+
+\starttypescript [serif] [bodoni]
+    \definefontsynonym [Bodoni-Regular]    [name:GFSBodoni-Regular]    [features=default]
+    \definefontsynonym [Bodoni-Italic]     [name:GFSBodoni-Italic]     [features=default]
+    \definefontsynonym [Bodoni-Bold]       [name:GFSBodoni-Bold]       [features=default]
+    \definefontsynonym [Bodoni-BoldItalic] [name:GFSBodoni-BoldItalic] [features=default]
+\stoptypescript
+
+% Didot
+
+\starttypescript [serif] [didot]
+    \definefontsynonym [Didot-Regular]    [name:GFSDidot-Regular]    [features=default]
+    \definefontsynonym [Didot-Italic]     [name:GFSDidot-Italic]     [features=default]
+    \definefontsynonym [Didot-Bold]       [name:GFSDidot-Bold]       [features=default]
+    \definefontsynonym [Didot-BoldItalic] [name:GFSDidot-BoldItalic] [features=default]
+\stoptypescript
+
+% Elpis
+
+\starttypescript [serif] [elpis]
+    \definefontsynonym [Elpis-Regular] [name:GFSElpis-Regular] [features=default]
+\stoptypescript
+
+% Eustace
+
+\starttypescript [serif] [eustace]
+    \definefontsynonym [Eustace-Regular] [name:GFSEustace-Regular] [features=default]
+\stoptypescript
+
+% Fleischman
+
+\starttypescript [serif] [fleischman]
+    \definefontsynonym [Fleischman-Regular] [name:GFSFleischman-Regular] [features=default]
+\stoptypescript
+
+% Jackson
+
+\starttypescript [serif] [jackson]
+    \definefontsynonym [Jackson-Regular] [name:GFSJackson-Regular] [features=default]
+\stoptypescript
+
+% Neohellenic
+
+\starttypescript [sans] [neohellenic]
+    \definefontsynonym [Neohellenic-Regular]    [name:GFSNeohellenic-Regular]    [features=default]
+    \definefontsynonym [Neohellenic-Italic]     [name:GFSNeohellenic-Italic]     [features=default]
+    \definefontsynonym [Neohellenic-Bold]       [name:GFSNeohellenic-Bold]       [features=default]
+    \definefontsynonym [Neohellenic-BoldItalic] [name:GFSNeohellenic-BoldItalic] [features=default]
+\stoptypescript
+
+% Nicefore
+
+\starttypescript [sans] [nicefore]
+    \definefontsynonym [Nicefore-Regular] [name:GFSNicefore] [features=default]
+\stoptypescript
+
+% Theokritos
+
+\starttypescript [serif] [theokritos]
+    \definefontsynonym [Theokritos-Regular] [name:GFS Theokritos Regular] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
new file mode 100644
index 00000000000..7951ddc97a6
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
@@ -0,0 +1,152 @@
+%D \module
+%D   [       file=type-gfs,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=GFS Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [gfs]
+
+% Ambrosia
+
+\starttypescript [serif] [ambrosia]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Ambrosia-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [ambrosia]
+    \definetypeface [ambrosia] [rm] [serif] [ambrosia] [default]
+\stoptypescript
+
+% Artemisia
+
+\starttypescript [serif] [artemisia]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Artemisia-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Artemisia-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Artemisia-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Artemisia-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [artemisia]
+    \definetypeface [artemisia] [rm] [serif] [artemisia] [default]
+\stoptypescript
+
+% Bodoni
+
+\starttypescript [serif] [bodoni]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Bodoni-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Bodoni-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Bodoni-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Bodoni-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [bodoni]
+    \definetypeface [bodoni] [rm] [serif] [bodoni] [default]
+\stoptypescript
+
+% Didot
+
+\starttypescript [serif] [didot]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Didot-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Didot-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Didot-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Didot-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [didot]
+    \definetypeface [didot] [rm] [serif] [didot] [default]
+\stoptypescript
+
+% Elpis
+
+\starttypescript [serif] [elpis]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Elpis-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [elpis]
+    \definetypeface [elpis] [rm] [serif] [elpis] [default]
+\stoptypescript
+
+% Eustace
+
+\starttypescript [serif] [eustace]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Eustace-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [eustace]
+    \definetypeface [eustace] [rm] [serif] [eustace] [default]
+\stoptypescript
+
+% Fleischman
+
+\starttypescript [serif] [fleischman]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Fleischman-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [fleischman]
+    \definetypeface [fleischman] [rm] [serif] [fleischman] [default]
+\stoptypescript
+
+% Jackson
+
+\starttypescript [serif] [jackson]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Jackson-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [jackson]
+    \definetypeface [jackson] [rm] [serif] [jackson] [default]
+\stoptypescript
+
+% Neohellenic
+
+\starttypescript [sans] [neohellenic]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Neohellenic-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Neohellenic-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Neohellenic-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Neohellenic-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [neohellenic]
+    \definetypeface [neohellenic] [ss] [sans] [neohellenic] [default]
+\stoptypescript
+
+% Nicefore
+
+\starttypescript [sans] [nicefore]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Nicefore-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [nicefore]
+    \definetypeface [nicefore] [ss] [sans] [nicefore] [default]
+\stoptypescript
+
+% Theokritos
+
+\starttypescript [serif] [theokritos]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Theokritos-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [theokritos]
+    \definetypeface [theokritos] [rm] [serif] [theokritos] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-gfs}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex
new file mode 100644
index 00000000000..c1c1d32d1e0
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-goudysans,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Goudy Sans Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [goudysans]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [GoudySans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [GoudySans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [GoudySans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [GoudySans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [goudysans]
+    \definefontsynonym [GoudySans-Regular]    [name:GoudySans-Regular]    [features=default]
+    \definefontsynonym [GoudySans-Italic]     [name:GoudySans-Italic]     [features=default]
+    \definefontsynonym [GoudySans-Bold]       [name:GoudySans-Bold]       [features=default]
+    \definefontsynonym [GoudySans-BoldItalic] [name:GoudySans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [goudysans]
+    \definetypeface [goudysans] [ss] [sans] [goudysans] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
new file mode 100644
index 00000000000..195cd264d5b
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-junicode,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Junicode Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [junicode]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Junicode-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Junicode-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Junicode-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Junicode-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [junicode]
+    \definefontsynonym [Junicode-Regular]    [name:JunicodeRegular]    [features=default]
+    \definefontsynonym [Junicode-Italic]     [name:JunicodeItalic]     [features=default]
+    \definefontsynonym [Junicode-Bold]       [name:JunicodeBold]       [features=default]
+    \definefontsynonym [Junicode-BoldItalic] [name:JunicodeBoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [junicode]
+    \definetypeface [junicode] [rm] [serif] [junicode] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
new file mode 100644
index 00000000000..faa6a04317b
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
@@ -0,0 +1,45 @@
+%D \module
+%D   [       file=type-justus,
+%D        version=2008.09.18,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Sabon Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [justus]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]       [Justus-Regular] [features=default]
+    \definefontsynonym [SerifItalic] [Justus-Italic]  [features=default]
+    \definefontsynonym [SerifBold]   [Justus-Bold]    [features=default]
+    \definefontsynonym [SerifCaps]   [Justus-Caps]    [features=default]
+\stoptypescript
+
+\starttypescript [serif] [justus-os]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]       [Justus-Oldstyle]       [features=default]
+    \definefontsynonym [SerifBold]   [Justus-Bold]           [features=default]
+    \definefontsynonym [SerifItalic] [Justus-ItalicOldstyle] [features=default]
+    \definefontsynonym [SerifCaps]   [Justus-Caps]           [features=default]
+\stoptypescript
+
+\starttypescript [serif] [justus,justus-os]
+    \definefontsynonym [Justus-Regular]        [name:Justus Roman]           [features=default]
+    \definefontsynonym [Justus-Italic]         [name:Justus Italic]          [features=default]
+    \definefontsynonym [Justus-Bold]           [name:Justus Bold]            [features=default]
+    \definefontsynonym [Justus-Oldstyle]       [name:Justus Oldstyle]        [features=default]
+    \definefontsynonym [Justus-ItalicOldstyle] [name:Justus Italic Oldstyle] [features=default]
+    \definefontsynonym [Justus-Caps]           [name:Justus Versalitas]      [features=default]
+\stoptypescript
+
+\starttypescript [justus,justus-os]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+    \definetypeface [\typescriptone] [ss] [sans]  [modern]         [default]
+    \definetypeface [\typescriptone] [tt] [mono]  [modern]         [default]
+    \definetypeface [\typescriptone] [mm] [math]  [modern]         [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
new file mode 100644
index 00000000000..88eb6143764
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
@@ -0,0 +1,30 @@
+%D \module
+%D   [       file=type-kontrapunkt,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Kontrapunkt Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [kontrapunkt]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]       [Kontrapunkt-Regular] [features=default]
+    \definefontsynonym [SerifItalic] [Kontrapunkt-Italic]  [features=default]
+    \definefontsynonym [SerifBold]   [Kontrapunkt-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [serif] [kontrapunkt]
+    \definefontsynonym [Kontrapunkt-Regular] [name:Kontrapunkt-Light]       [features=default]
+    \definefontsynonym [Kontrapunkt-Italic]  [name:Kontrapunkt-LightItalic] [features=default]
+    \definefontsynonym [Kontrapunkt-Bold]    [name:Kontrapunkt-Bold]        [features=default]
+\stoptypescript
+
+\starttypescript [kontrapunkt]
+    \definetypeface [kontrapunkt] [rm] [serif] [kontrapunkt] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex b/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
new file mode 100644
index 00000000000..eb7e5cb2e43
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-leftist,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Leftist Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [leftist]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [LeftistMono-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [leftist]
+    \definefontsynonym [LeftistMono-Regular] [name:Leftist Mono Serif] [features=default]
+\stoptypescript
+
+\starttypescript [leftist]
+    \definetypeface [leftist] [rm] [serif] [leftist] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
new file mode 100644
index 00000000000..c6a285cbdfa
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-liberation,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Liberation Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [liberation]
+    \definefontsynonym [LiberationSerif-Regular]    [name:Liberation Serif]             [features=default]
+    \definefontsynonym [LiberationSerif-Italic]     [name:Liberation Serif Italic]      [features=default]
+    \definefontsynonym [LiberationSerif-Bold]       [name:Liberation Serif Bold]        [features=default]
+    \definefontsynonym [LiberationSerif-BoldItalic] [name:Liberation Serif Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [liberation]
+    \definefontsynonym [LiberationSans-Regular]    [name:Liberation Sans]             [features=default]
+    \definefontsynonym [LiberationSans-Italic]     [name:Liberation Sans Italic]      [features=default]
+    \definefontsynonym [LiberationSans-Bold]       [name:Liberation Sans Bold]        [features=default]
+    \definefontsynonym [LiberationSans-BoldItalic] [name:Liberation Sans Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [liberation]
+    \definefontsynonym [LiberationMono-Regular]    [name:Liberation Mono]             [features=default]
+    \definefontsynonym [LiberationMono-Italic]     [name:Liberation Mono Italic]      [features=default]
+    \definefontsynonym [LiberationMono-Bold]       [name:Liberation Mono Bold]        [features=default]
+    \definefontsynonym [LiberationMono-BoldItalic] [name:Liberation Mono Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
new file mode 100644
index 00000000000..c6a285cbdfa
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-liberation,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Liberation Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [liberation]
+    \definefontsynonym [LiberationSerif-Regular]    [name:Liberation Serif]             [features=default]
+    \definefontsynonym [LiberationSerif-Italic]     [name:Liberation Serif Italic]      [features=default]
+    \definefontsynonym [LiberationSerif-Bold]       [name:Liberation Serif Bold]        [features=default]
+    \definefontsynonym [LiberationSerif-BoldItalic] [name:Liberation Serif Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [liberation]
+    \definefontsynonym [LiberationSans-Regular]    [name:Liberation Sans]             [features=default]
+    \definefontsynonym [LiberationSans-Italic]     [name:Liberation Sans Italic]      [features=default]
+    \definefontsynonym [LiberationSans-Bold]       [name:Liberation Sans Bold]        [features=default]
+    \definefontsynonym [LiberationSans-BoldItalic] [name:Liberation Sans Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [liberation]
+    \definefontsynonym [LiberationMono-Regular]    [name:Liberation Mono]             [features=default]
+    \definefontsynonym [LiberationMono-Italic]     [name:Liberation Mono Italic]      [features=default]
+    \definefontsynonym [LiberationMono-Bold]       [name:Liberation Mono Bold]        [features=default]
+    \definefontsynonym [LiberationMono-BoldItalic] [name:Liberation Mono Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex
new file mode 100644
index 00000000000..8452b450adf
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex
@@ -0,0 +1,50 @@
+%D \module
+%D   [       file=type-liberation,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Liberation Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [liberation]
+
+\starttypescript [serif] [liberation]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [LiberationSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [LiberationSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [LiberationSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [LiberationSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [liberation]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [LiberationSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [LiberationSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [LiberationSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [LiberationSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [liberation]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [LiberationMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [LiberationMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [LiberationMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [LiberationMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [liberation]
+    \definetypeface [liberation] [rm] [serif] [liberation] [default]
+    \definetypeface [liberation] [ss] [sans]  [liberation] [default]
+    \definetypeface [liberation] [tt] [mono]  [liberation] [default]
+    \definetypeface [liberation] [mm] [math]  [modern]     [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-liberation}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
new file mode 100644
index 00000000000..33d6c3adfc5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-linuxlibertine,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Linux Libertine Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [linuxlibertine]
+    \definefontsynonym [LinuxLibertine-Regular]    [name:Linux Libertine O]             [features=default]
+    \definefontsynonym [LinuxLibertine-Italic]     [name:Linux Libertine O Italic]      [features=default]
+    \definefontsynonym [LinuxLibertine-Bold]       [name:Linux Libertine O Bold]        [features=default]
+    \definefontsynonym [LinuxLibertine-BoldItalic] [name:Linux Libertine O Bold Italic] [features=default]
+    \definefontsynonym [LinuxLibertine-Caps]       [name:Linux Libertine O Capitals]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [linuxbiolinum]
+    \definefontsynonym [LinuxBiolinum-Regular] [name:Linux Biolinum O]      [features=default]
+    \definefontsynonym [LinuxBiolinum-Bold]    [name:Linux Biolinum O Bold] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
new file mode 100644
index 00000000000..33d6c3adfc5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-linuxlibertine,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Linux Libertine Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [linuxlibertine]
+    \definefontsynonym [LinuxLibertine-Regular]    [name:Linux Libertine O]             [features=default]
+    \definefontsynonym [LinuxLibertine-Italic]     [name:Linux Libertine O Italic]      [features=default]
+    \definefontsynonym [LinuxLibertine-Bold]       [name:Linux Libertine O Bold]        [features=default]
+    \definefontsynonym [LinuxLibertine-BoldItalic] [name:Linux Libertine O Bold Italic] [features=default]
+    \definefontsynonym [LinuxLibertine-Caps]       [name:Linux Libertine O Capitals]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [linuxbiolinum]
+    \definefontsynonym [LinuxBiolinum-Regular] [name:Linux Biolinum O]      [features=default]
+    \definefontsynonym [LinuxBiolinum-Bold]    [name:Linux Biolinum O Bold] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
new file mode 100644
index 00000000000..47efd024c03
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
@@ -0,0 +1,41 @@
+%D \module
+%D   [       file=type-linuxlibertine,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Linux Libertine Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [linuxlibertine]
+
+\starttypescript [serif] [linuxlibertine]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [LinuxLibertine-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [LinuxLibertine-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [LinuxLibertine-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [LinuxLibertine-BoldItalic] [features=default]
+    \definefontsynonym [SerifCaps]       [LinuxLibertine-Caps]       [features=default]
+\stoptypescript
+
+\starttypescript [sans] [linuxbiolinum]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [LinuxBiolinum-Regular] [features=default]
+    \definefontsynonym [SansBold] [LinuxBiolinum-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [linuxlibertine,linuxbiolinum]
+    \definetypeface [\typescriptone] [rm] [serif] [linuxlibertine] [default]
+    \definetypeface [\typescriptone] [ss] [sans]  [linuxbiolinum]  [default]
+    \definetypeface [\typescriptone] [tt] [mono]  [modern]         [default]
+    \definetypeface [\typescriptone] [mm] [math]  [modern]         [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-linuxlibertine}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
new file mode 100644
index 00000000000..daeb5ec5098
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-luxi,
+%D        version=2008.05.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Luxi Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [luxi]
+    \definefontsynonym [LuxiSerif-Regular]    [name:Luxi Serif Regular]      [features=default]
+    \definefontsynonym [LuxiSerif-Italic]     [name:Luxi Serif Oblique]      [features=default]
+    \definefontsynonym [LuxiSerif-Bold]       [name:Luxi Serif Bold]         [features=default]
+    \definefontsynonym [LuxiSerif-BoldItalic] [name:Luxi Serif Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [luxi]
+    \definefontsynonym [LuxiSans-Regular]    [name:Luxi Sans Regular]      [features=default]
+    \definefontsynonym [LuxiSans-Italic]     [name:Luxi Sans Oblique]      [features=default]
+    \definefontsynonym [LuxiSans-Bold]       [name:Luxi Sans Bold]         [features=default]
+    \definefontsynonym [LuxiSans-BoldItalic] [name:Luxi Sans Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [luxi]
+    \definefontsynonym [LuxiMono-Regular]    [name:Luxi Mono Regular]      [features=default]
+    \definefontsynonym [LuxiMono-Italic]     [name:Luxi Mono Oblique]      [features=default]
+    \definefontsynonym [LuxiMono-Bold]       [name:Luxi Mono Bold]         [features=default]
+    \definefontsynonym [LuxiMono-BoldItalic] [name:Luxi Mono Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
new file mode 100644
index 00000000000..daeb5ec5098
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-luxi,
+%D        version=2008.05.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Luxi Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [luxi]
+    \definefontsynonym [LuxiSerif-Regular]    [name:Luxi Serif Regular]      [features=default]
+    \definefontsynonym [LuxiSerif-Italic]     [name:Luxi Serif Oblique]      [features=default]
+    \definefontsynonym [LuxiSerif-Bold]       [name:Luxi Serif Bold]         [features=default]
+    \definefontsynonym [LuxiSerif-BoldItalic] [name:Luxi Serif Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [luxi]
+    \definefontsynonym [LuxiSans-Regular]    [name:Luxi Sans Regular]      [features=default]
+    \definefontsynonym [LuxiSans-Italic]     [name:Luxi Sans Oblique]      [features=default]
+    \definefontsynonym [LuxiSans-Bold]       [name:Luxi Sans Bold]         [features=default]
+    \definefontsynonym [LuxiSans-BoldItalic] [name:Luxi Sans Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [luxi]
+    \definefontsynonym [LuxiMono-Regular]    [name:Luxi Mono Regular]      [features=default]
+    \definefontsynonym [LuxiMono-Italic]     [name:Luxi Mono Oblique]      [features=default]
+    \definefontsynonym [LuxiMono-Bold]       [name:Luxi Mono Bold]         [features=default]
+    \definefontsynonym [LuxiMono-BoldItalic] [name:Luxi Mono Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex
new file mode 100644
index 00000000000..c636112c060
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex
@@ -0,0 +1,50 @@
+%D \module
+%D   [       file=type-luxi,
+%D        version=2008.05.12,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Luxi Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection[luxi]
+
+\starttypescript [serif] [luxi]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [LuxiSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [LuxiSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [LuxiSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [LuxiSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [luxi]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [LuxiSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [LuxiSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [LuxiSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [LuxiSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [luxi]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [LuxiMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [LuxiMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [LuxiMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [LuxiMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [luxi]
+    \definetypeface [luxi] [rm] [serif] [luxi]   [default]
+    \definetypeface [luxi] [ss] [sans]  [luxi]   [default]
+    \definetypeface [luxi] [tt] [mono]  [luxi]   [default]
+    \definetypeface [luxi] [mm] [math]  [modern] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-luxi}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
new file mode 100644
index 00000000000..31d44745ac9
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
@@ -0,0 +1,49 @@
+%D \module
+%D   [       file=type-mgopen,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=MgOpen Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Canonica
+
+\starttypescript [serif] [mgopen-canonica]
+    \definefontsynonym [MgOpenCanonica-Regular]    [name:MgOpen Canonica]             [features=default]
+    \definefontsynonym [MgOpenCanonica-Italic]     [name:MgOpen Canonica Italic]      [features=default]
+    \definefontsynonym [MgOpenCanonica-Bold]       [name:MgOpen Canonica Bold]        [features=default]
+    \definefontsynonym [MgOpenCanonica-BoldItalic] [name:MgOpen Canonica Bold Italic] [features=default]
+\stoptypescript
+
+% Cosmetica
+
+\starttypescript [sans] [mgopen-cosmetica]
+    \definefontsynonym [MgOpenCosmetica-Regular]    [name:MgOpen Cosmetica]              [features=default]
+    \definefontsynonym [MgOpenCosmetica-Italic]     [name:MgOpen Cosmetica Oblique]      [features=default]
+    \definefontsynonym [MgOpenCosmetica-Bold]       [name:MgOpen Cosmetica Bold]         [features=default]
+    \definefontsynonym [MgOpenCosmetica-BoldItalic] [name:MgOpen Cosmetica Bold Oblique] [features=default]
+\stoptypescript
+
+% Moderna
+
+\starttypescript [sans] [mgopen-moderna]
+    \definefontsynonym [MgOpenModerna-Regular]    [name:MgOpen Moderna]              [features=default]
+    \definefontsynonym [MgOpenModerna-Italic]     [name:MgOpen Moderna Oblique]      [features=default]
+    \definefontsynonym [MgOpenModerna-Bold]       [name:MgOpen Moderna Bold]         [features=default]
+    \definefontsynonym [MgOpenModerna-BoldItalic] [name:MgOpen Moderna Bold Oblique] [features=default]
+\stoptypescript
+
+% Modata
+
+\starttypescript [sans] [mgopen-modata]
+    \definefontsynonym [MgOpenModata-Regular]    [name:MgOpen Modata]              [features=default]
+    \definefontsynonym [MgOpenModata-Italic]     [name:MgOpen Modata Oblique]      [features=default]
+    \definefontsynonym [MgOpenModata-Bold]       [name:MgOpen Modata Bold]         [features=default]
+    \definefontsynonym [MgOpenModata-BoldItalic] [name:MgOpen Modata Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
new file mode 100644
index 00000000000..31d44745ac9
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
@@ -0,0 +1,49 @@
+%D \module
+%D   [       file=type-mgopen,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=MgOpen Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Canonica
+
+\starttypescript [serif] [mgopen-canonica]
+    \definefontsynonym [MgOpenCanonica-Regular]    [name:MgOpen Canonica]             [features=default]
+    \definefontsynonym [MgOpenCanonica-Italic]     [name:MgOpen Canonica Italic]      [features=default]
+    \definefontsynonym [MgOpenCanonica-Bold]       [name:MgOpen Canonica Bold]        [features=default]
+    \definefontsynonym [MgOpenCanonica-BoldItalic] [name:MgOpen Canonica Bold Italic] [features=default]
+\stoptypescript
+
+% Cosmetica
+
+\starttypescript [sans] [mgopen-cosmetica]
+    \definefontsynonym [MgOpenCosmetica-Regular]    [name:MgOpen Cosmetica]              [features=default]
+    \definefontsynonym [MgOpenCosmetica-Italic]     [name:MgOpen Cosmetica Oblique]      [features=default]
+    \definefontsynonym [MgOpenCosmetica-Bold]       [name:MgOpen Cosmetica Bold]         [features=default]
+    \definefontsynonym [MgOpenCosmetica-BoldItalic] [name:MgOpen Cosmetica Bold Oblique] [features=default]
+\stoptypescript
+
+% Moderna
+
+\starttypescript [sans] [mgopen-moderna]
+    \definefontsynonym [MgOpenModerna-Regular]    [name:MgOpen Moderna]              [features=default]
+    \definefontsynonym [MgOpenModerna-Italic]     [name:MgOpen Moderna Oblique]      [features=default]
+    \definefontsynonym [MgOpenModerna-Bold]       [name:MgOpen Moderna Bold]         [features=default]
+    \definefontsynonym [MgOpenModerna-BoldItalic] [name:MgOpen Moderna Bold Oblique] [features=default]
+\stoptypescript
+
+% Modata
+
+\starttypescript [sans] [mgopen-modata]
+    \definefontsynonym [MgOpenModata-Regular]    [name:MgOpen Modata]              [features=default]
+    \definefontsynonym [MgOpenModata-Italic]     [name:MgOpen Modata Oblique]      [features=default]
+    \definefontsynonym [MgOpenModata-Bold]       [name:MgOpen Modata Bold]         [features=default]
+    \definefontsynonym [MgOpenModata-BoldItalic] [name:MgOpen Modata Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
new file mode 100644
index 00000000000..c94bddeb58b
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
@@ -0,0 +1,75 @@
+%D \module
+%D   [       file=type-mgopen,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=MgOpen Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [mgopen]
+
+% Canonica
+
+\starttypescript [serif] [mgopen-canonica]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [MgOpenCanonica-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [MgOpenCanonica-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [MgOpenCanonica-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [MgOpenCanonica-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mgopen-canonica]
+    \definetypeface [mgopen-canonica] [rm] [serif] [mgopen-canonica] [default]
+\stoptypescript
+
+% Cosmetica
+
+\starttypescript [sans] [mgopen-cosmetica]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [MgOpenCosmetica-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [MgOpenCosmetica-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [MgOpenCosmetica-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [MgOpenCosmetica-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mgopen-cosmetica]
+    \definetypeface [mgopen-cosmetica] [ss] [sans] [mgopen-cosmetica] [default]
+\stoptypescript
+
+% Moderna
+
+\starttypescript [sans] [mgopen-moderna]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [MgOpenModerna-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [MgOpenModerna-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [MgOpenModerna-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [MgOpenModerna-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mgopen-moderna]
+    \definetypeface [mgopen-moderna] [ss] [sans] [mgopen-moderna] [default]
+\stoptypescript
+
+% Modata
+
+\starttypescript [sans] [mgopen-modata]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [MgOpenModata-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [MgOpenModata-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [MgOpenModata-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [MgOpenModata-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mgopen-modata]
+    \definetypeface [mgopen-modata] [ss] [sans] [mgopen-modata] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-mgopen}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
new file mode 100644
index 00000000000..44816912e8a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
@@ -0,0 +1,40 @@
+%D \module
+%D   [       file=type-miso,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Miso Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D MISO is an architectural lettering font by Mårten Nettelbladt. It is
+%D available in three weights (light, regular, bold) and can be downloaded from
+%D \hyphenatedurl{http://www.fontsquirrel.com/fonts/Miso}
+
+
+\starttypescript [sans] [miso-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Miso-Light]   [features=default]
+    \definefontsynonym [SansBold] [Miso-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [miso]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Miso-Regular] [features=default]
+    \definefontsynonym [SansBold] [Miso-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [miso-light,miso]
+    \definefontsynonym [Miso-Light]   [name:Miso Light] [features=default]
+    \definefontsynonym [Miso-Regular] [name:Miso]       [features=default]
+    \definefontsynonym [Miso-Bold]    [name:Miso Bold]  [features=default]
+\stoptypescript
+
+\starttypescript [miso-light,miso]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex b/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
new file mode 100644
index 00000000000..614c21c4b4e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
@@ -0,0 +1,47 @@
+%D \module
+%D   [       file=type-nichtlustig,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Nichtlustig Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [nichtlustig]
+
+% NICHTLUSDICK
+
+\starttypescript [sans] [nichtlusdick]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [NICHTLUSDICK] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [nichtlusdick]
+    \definefontsynonym [NICHTLUSDICK] [name:NICHTLUSDICK] [features=default]
+\stoptypescript
+
+\starttypescript [nichtlusdick]
+    \definetypeface [nichtlusdick] [ss] [sans] [nichtlusdick] [default]
+\stoptypescript
+
+% NICHTLUSDUENN
+
+\starttypescript [sans] [nichtlusduenn]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [NICHTLUSDUENN] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [nichtlusduenn]
+    \definefontsynonym [NICHTLUSDUENN] [name:NICHTLUSDUENN] [features=default]
+\stoptypescript
+
+\starttypescript [nichtlusduenn]
+    \definetypeface [nichtlusduenn] [ss] [sans] [nichtlusduenn] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex b/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
new file mode 100644
index 00000000000..25362ff8778
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
@@ -0,0 +1,253 @@
+%D \module
+%D   [       file=type-optical,
+%D        version=2009.03.25,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Adobe Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\startsetups [font:optical:serif]
+
+  \definefontsynonym [SerifCaption-Regular]     [SerifRegular-Regular]
+  \definefontsynonym [SerifCaption-Bold]        [SerifCaption-Regular]
+  \definefontsynonym [SerifCaption-Italic]      [SerifCaption-Regular]
+  \definefontsynonym [SerifCaption-Slanted]     [SerifCaption-Italic]
+  \definefontsynonym [SerifCaption-BoldItalic]  [SerifCaption-Regular]
+  \definefontsynonym [SerifCaption-BoldSlanted] [SerifCaption-BoldItalic]
+
+  \definefontsynonym [SerifRegular-Regular]     [DefaultFont]
+  \definefontsynonym [SerifRegular-Bold]        [SerifRegular-Regular]
+  \definefontsynonym [SerifRegular-Italic]      [SerifRegular-Regular]
+  \definefontsynonym [SerifRegular-Slanted]     [SerifRegular-Italic]
+  \definefontsynonym [SerifRegular-BoldItalic]  [SerifRegular-Regular]
+  \definefontsynonym [SerifRegular-BoldSlanted] [SerifRegular-BoldItalic]
+
+  \definefontsynonym [SerifSubhead-Regular]     [SerifRegular-Regular]
+  \definefontsynonym [SerifSubhead-Bold]        [SerifSubhead-Regular]
+  \definefontsynonym [SerifSubhead-Italic]      [SerifSubhead-Regular]
+  \definefontsynonym [SerifSubhead-Slanted]     [SerifSubhead-Italic]
+  \definefontsynonym [SerifSubhead-BoldItalic]  [SerifSubhead-Regular]
+  \definefontsynonym [SerifSubhead-BoldSlanted] [SerifSubhead-BoldItalic]
+
+  \definefontsynonym [SerifDisplay-Regular]     [SerifRegular-Regular]
+  \definefontsynonym [SerifDisplay-Bold]        [SerifDisplay-Regular]
+  \definefontsynonym [SerifDisplay-Italic]      [SerifDisplay-Regular]
+  \definefontsynonym [SerifDisplay-Slanted]     [SerifDisplay-Italic]
+  \definefontsynonym [SerifDisplay-BoldItalic]  [SerifDisplay-Regular]
+  \definefontsynonym [SerifDisplay-BoldSlanted] [SerifDisplay-BoldItalic]
+
+\stopsetups
+
+\startsetups [font:optical:sans]
+
+  \definefontsynonym [SansCaption-Regular]     [SansRegular-Regular]
+  \definefontsynonym [SansCaption-Bold]        [SansCaption-Regular]
+  \definefontsynonym [SansCaption-Italic]      [SansCaption-Regular]
+  \definefontsynonym [SansCaption-Slanted]     [SansCaption-Italic]
+  \definefontsynonym [SansCaption-BoldItalic]  [SansCaption-Regular]
+  \definefontsynonym [SansCaption-BoldSlanted] [SansCaption-BoldItalic]
+
+  \definefontsynonym [SansRegular-Regular]     [DefaultFont]
+  \definefontsynonym [SansRegular-Bold]        [SansRegular-Regular]
+  \definefontsynonym [SansRegular-Italic]      [SansRegular-Regular]
+  \definefontsynonym [SansRegular-Slanted]     [SansRegular-Italic]
+  \definefontsynonym [SansRegular-BoldItalic]  [SansRegular-Regular]
+  \definefontsynonym [SansRegular-BoldSlanted] [SansRegular-BoldItalic]
+
+  \definefontsynonym [SansSubhead-Regular]     [SansRegular-Regular]
+  \definefontsynonym [SansSubhead-Bold]        [SansSubhead-Regular]
+  \definefontsynonym [SansSubhead-Italic]      [SansSubhead-Regular]
+  \definefontsynonym [SansSubhead-Slanted]     [SansSubhead-Italic]
+  \definefontsynonym [SansSubhead-BoldItalic]  [SansSubhead-Regular]
+  \definefontsynonym [SansSubhead-BoldSlanted] [SansSubhead-BoldItalic]
+
+  \definefontsynonym [SansDisplay-Regular]     [SansRegular-Regular]
+  \definefontsynonym [SansDisplay-Bold]        [SansDisplay-Regular]
+  \definefontsynonym [SansDisplay-Italic]      [SansDisplay-Regular]
+  \definefontsynonym [SansDisplay-Slanted]     [SansDisplay-Italic]
+  \definefontsynonym [SansDisplay-BoldItalic]  [SansDisplay-Regular]
+  \definefontsynonym [SansDisplay-BoldSlanted] [SansDisplay-BoldItalic]
+
+\stopsetups
+
+\starttypescript [serif] [optical] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt] [rm]
+    [tf=SerifCaption-Regular     sa 1,
+     bf=SerifCaption-Bold        sa 1,
+     it=SerifCaption-Italic      sa 1,
+     sl=SerifCaption-Slanted     sa 1,
+     bi=SerifCaption-BoldItalic  sa 1,
+     bs=SerifCaption-BoldSlanted sa 1]
+
+  \definebodyfont [9pt,10pt,11pt,12pt] [rm]
+    [tf=SerifRegular-Regular     sa 1,
+     bf=SerifRegular-Bold        sa 1,
+     it=SerifRegular-Italic      sa 1,
+     sl=SerifRegular-Slanted     sa 1,
+     bi=SerifRegular-BoldItalic  sa 1,
+     bs=SerifRegular-BoldSlanted sa 1]
+
+  \definebodyfont [14.4pt,17.3pt] [rm]
+    [tf=SerifSubhead-Regular     sa 1,
+     bf=SerifSubhead-Bold        sa 1,
+     it=SerifSubhead-Italic      sa 1,
+     sl=SerifSubhead-Slanted     sa 1,
+     bi=SerifSubhead-BoldItalic  sa 1,
+     bs=SerifSubhead-BoldSlanted sa 1]
+
+  \definebodyfont [20.7pt] [rm]
+    [tf=SerifDisplay-Regular     sa 1,
+     bf=SerifDisplay-Bold        sa 1,
+     it=SerifDisplay-Italic      sa 1,
+     sl=SerifDisplay-Slanted     sa 1,
+     bi=SerifDisplay-BoldItalic  sa 1,
+     bs=SerifDisplay-BoldSlanted sa 1]
+
+\stoptypescript
+
+\starttypescript [sans] [optical] [size]
+
+  \definebodyfont [4pt,5pt,6pt,7pt,8pt] [ss]
+    [tf=SansCaption-Regular     sa 1,
+     bf=SansCaption-Bold        sa 1,
+     it=SansCaption-Italic      sa 1,
+     sl=SansCaption-Slanted     sa 1,
+     bi=SansCaption-BoldItalic  sa 1,
+     bs=SansCaption-BoldSlanted sa 1]
+
+  \definebodyfont [9pt,10pt,11pt,12pt] [ss]
+    [tf=SansRegular-Regular     sa 1,
+     bf=SansRegular-Bold        sa 1,
+     it=SansRegular-Italic      sa 1,
+     sl=SansRegular-Slanted     sa 1,
+     bi=SansRegular-BoldItalic  sa 1,
+     bs=SansRegular-BoldSlanted sa 1]
+
+  \definebodyfont [14.4pt,17.3pt] [ss]
+    [tf=SansSubhead-Regular     sa 1,
+     bf=SansSubhead-Bold        sa 1,
+     it=SansSubhead-Italic      sa 1,
+     sl=SansSubhead-Slanted     sa 1,
+     bi=SansSubhead-BoldItalic  sa 1,
+     bs=SansSubhead-BoldSlanted sa 1]
+
+  \definebodyfont [20.7pt] [ss]
+    [tf=SansDisplay-Regular     sa 1,
+     bf=SansDisplay-Bold        sa 1,
+     it=SansDisplay-Italic      sa 1,
+     sl=SansDisplay-Slanted     sa 1,
+     bi=SansDisplay-BoldItalic  sa 1,
+     bs=SansDisplay-BoldSlanted sa 1]
+
+\stoptypescript
+
+\starttypescript [serif] [brioso,minion]
+
+  \definefontsynonym [Serif]           [SerifRegular-Regular]
+  \definefontsynonym [SerifBold]       [SerifRegular-Bold]
+  \definefontsynonym [SerifItalic]     [SerifRegular-Italic]
+  \definefontsynonym [SerifBoldItalic] [SerifRegular-BoldItalic]
+
+\stoptypescript
+
+\starttypescript [sans] [cronos]
+
+  \definefontsynonym [Sans]           [SansRegular-Regular]
+  \definefontsynonym [SansBold]       [SansRegular-Bold]
+  \definefontsynonym [SansItalic]     [SansRegular-Italic]
+  \definefontsynonym [SansBoldItalic] [SansRegular-BoldItalic]
+
+\stoptypescript
+
+\starttypescript [serif] [minion]
+
+  \setups[font:optical:serif]
+
+  \definefontsynonym [SerifCaption-Regular]    [name:MinionPro-Capt]       [features=default]
+  \definefontsynonym [SerifCaption-Bold]       [name:MinionPro-BoldCapt]   [features=default]
+  \definefontsynonym [SerifCaption-Italic]     [name:MinionPro-ItCapt]     [features=default]
+  \definefontsynonym [SerifCaption-BoldItalic] [name:MinionPro-BoldItCapt] [features=default]
+
+  \definefontsynonym [SerifRegular-Regular]    [name:MinionPro-Regular]    [features=default]
+  \definefontsynonym [SerifRegular-Bold]       [name:MinionPro-Bold]       [features=default]
+  \definefontsynonym [SerifRegular-Italic]     [name:MinionPro-It]         [features=default]
+  \definefontsynonym [SerifRegular-BoldItalic] [name:MinionPro-BoldIt]     [features=default]
+
+  \definefontsynonym [SerifSubhead-Regular]    [name:MinionPro-Subh]       [features=default]
+  \definefontsynonym [SerifSubhead-Bold]       [name:MinionPro-BoldSubh]   [features=default]
+  \definefontsynonym [SerifSubhead-Italic]     [name:MinionPro-ItSubh]     [features=default]
+  \definefontsynonym [SerifSubhead-BoldItalic] [name:MinionPro-BoldItSubh] [features=default]
+
+  \definefontsynonym [SerifDisplay-Regular]    [name:MinionPro-Disp]       [features=default]
+  \definefontsynonym [SerifDisplay-Bold]       [name:MinionPro-BoldDisp]   [features=default]
+  \definefontsynonym [SerifDisplay-Italic]     [name:MinionPro-ItDisp]     [features=default]
+  \definefontsynonym [SerifDisplay-BoldItalic] [name:MinionPro-BoldItDisp] [features=default]
+
+\stoptypescript
+
+\starttypescript [serif] [brioso]
+
+  \setups[font:optical:serif]
+
+  \definefontsynonym [SerifCaption-Regular]    [name:BriosoPro-Capt]       [features=default]
+  \definefontsynonym [SerifCaption-Bold]       [name:BriosoPro-BoldCapt]   [features=default]
+  \definefontsynonym [SerifCaption-Italic]     [name:BriosoPro-ItCapt]     [features=default]
+  \definefontsynonym [SerifCaption-BoldItalic] [name:BriosoPro-BoldItCapt] [features=default]
+
+  \definefontsynonym [SerifRegular-Regular]    [name:BriosoPro-Regular]    [features=default]
+  \definefontsynonym [SerifRegular-Bold]       [name:BriosoPro-Bold]       [features=default]
+  \definefontsynonym [SerifRegular-Italic]     [name:BriosoPro-Italic]     [features=default]
+  \definefontsynonym [SerifRegular-BoldItalic] [name:BriosoPro-BoldIt]     [features=default]
+
+  \definefontsynonym [SerifSubhead-Regular]    [name:BriosoPro-Subh]       [features=default]
+  \definefontsynonym [SerifSubhead-Bold]       [name:BriosoPro-BoldSubh]   [features=default]
+  \definefontsynonym [SerifSubhead-Italic]     [name:BriosoPro-ItSubh]     [features=default]
+  \definefontsynonym [SerifSubhead-BoldItalic] [name:BriosoPro-BoldItSubh] [features=default]
+
+  \definefontsynonym [SerifDisplay-Regular]    [name:BriosoPro-Disp]       [features=default]
+  \definefontsynonym [SerifDisplay-Bold]       [name:BriosoPro-BoldDisp]   [features=default]
+  \definefontsynonym [SerifDisplay-Italic]     [name:BriosoPro-ItDisp]     [features=default]
+  \definefontsynonym [SerifDisplay-BoldItalic] [name:BriosoPro-BoldItDisp] [features=default]
+
+\stoptypescript
+
+\starttypescript [sans] [cronos]
+
+  \setups[font:optical:sans]
+
+  \definefontsynonym [SansCaption-Regular]    [name:CronosPro-Capt]       [features=default]
+  \definefontsynonym [SansCaption-Italic]     [name:CronosPro-CaptIt]     [features=default]
+  \definefontsynonym [SansCaption-Bold]       [name:CronosPro-BoldCapt]   [features=default]
+  \definefontsynonym [SansCaption-BoldItalic] [name:CronosPro-BoldCaptIt] [features=default]
+
+  \definefontsynonym [SansRegular-Regular]    [name:CronosPro-Regular]    [features=default]
+  \definefontsynonym [SansRegular-Italic]     [name:CronosPro-Italic]     [features=default]
+  \definefontsynonym [SansRegular-Bold]       [name:CronosPro-Bold]       [features=default]
+  \definefontsynonym [SansRegular-BoldItalic] [name:CronosPro-BoldIt]     [features=default]
+
+  \definefontsynonym [SansSubhead-Regular]    [name:CronosPro-Subh]       [features=default]
+  \definefontsynonym [SansSubhead-Bold]       [name:CronosPro-BoldSubh]   [features=default]
+  \definefontsynonym [SansSubhead-Italic]     [name:CronosPro-SubhIt]     [features=default]
+  \definefontsynonym [SansSubhead-BoldItalic] [name:CronosPro-BoldSubhIt] [features=default]
+
+  \definefontsynonym [SansDisplay-Regular]    [name:CronosPro-Disp]       [features=default]
+  \definefontsynonym [SansDisplay-Bold]       [name:CronosPro-BoldDisp]   [features=default]
+  \definefontsynonym [SansDisplay-Italic]     [name:CronosPro-DispIt]     [features=default]
+  \definefontsynonym [SansDisplay-BoldItalic] [name:CronosPro-BoldDispIt] [features=default]
+
+\stoptypescript
+
+\starttypescript [brioso,minion]
+  \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [optical]
+\stoptypescript
+
+\starttypescript [cronos]
+  \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [optical]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
new file mode 100644
index 00000000000..90eee50d553
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
@@ -0,0 +1,21 @@
+%D \module
+%D   [       file=type-pigiarniq,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Pigiarniq Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definefontsynonym [Pigiarniq-Light]   [name:Pigiarniq Light]  [features=default]
+    \definefontsynonym [Pigiarniq-Regular] [name:Pigiarniq]        [features=default]
+    \definefontsynonym [Pigiarniq-Italic]  [name:Pigiarniq Italic] [features=default]
+    \definefontsynonym [Pigiarniq-Bold]    [name:Pigiarniq Bold]   [features=default]
+    \definefontsynonym [Pigiarniq-Heavy]   [name:Pigiarniq Heavy]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
new file mode 100644
index 00000000000..90eee50d553
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
@@ -0,0 +1,21 @@
+%D \module
+%D   [       file=type-pigiarniq,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Pigiarniq Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definefontsynonym [Pigiarniq-Light]   [name:Pigiarniq Light]  [features=default]
+    \definefontsynonym [Pigiarniq-Regular] [name:Pigiarniq]        [features=default]
+    \definefontsynonym [Pigiarniq-Italic]  [name:Pigiarniq Italic] [features=default]
+    \definefontsynonym [Pigiarniq-Bold]    [name:Pigiarniq Bold]   [features=default]
+    \definefontsynonym [Pigiarniq-Heavy]   [name:Pigiarniq Heavy]  [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex
new file mode 100644
index 00000000000..5682a5651d6
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex
@@ -0,0 +1,43 @@
+%D \module
+%D   [       file=type-pigiarniq,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Pigiarniq Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [pigiarniq]
+
+\starttypescript [sans] [pigiarniq]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [Pigiarniq-Regular] [features=default]
+    \definefontsynonym [SansItalic] [Pigiarniq-Italic]  [features=default]
+    \definefontsynonym [SansBold]   [Pigiarniq-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [pigiarniq-thin]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Pigiarniq-Light]   [features=default]
+    \definefontsynonym [SansBold]       [Pigiarniq-Regular] [features=default]
+    \definefontsynonym [SansBoldItalic] [Pigiarniq-Italic]  [features=default]
+\stoptypescript
+
+\starttypescript [sans] [pigiarniq-bold]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Pigiarniq-Bold]  [features=default]
+    \definefontsynonym [SansBold] [Pigiarniq-Heavy] [features=default]
+\stoptypescript
+
+\starttypescript [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-pigiarniq}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
new file mode 100644
index 00000000000..9166ff72f96
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-richtype,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Richtype Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Francesca
+
+\starttypescript [serif] [francesca]
+    \definefontsynonym [Francesca-Regular] [name:RTFrancesca]        [features=default]
+    \definefontsynonym [Francesca-Bold]    [name:RTFrancesca-Bold]   [features=default]
+    \definefontsynonym [Francesca-Italic]  [name:RTFrancesca-Italic] [features=default]
+\stoptypescript
+
+% Klara
+
+\starttypescript [serif] [klara]
+    \definefontsynonym [KlaraSerif-Regular] [name:RTKlara]        [features=default]
+    \definefontsynonym [KlaraSerif-Bold]    [name:RTKlara-Bold]   [features=default]
+    \definefontsynonym [KlaraSerif-Italic]  [name:RTKlara-Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [klara]
+    \definefontsynonym [KlaraSans-Regular] [name:RT Klara Sans]      [features=default]
+    \definefontsynonym [KlaraSans-Bold]    [name:RTKlaraSans-Bold]   [features=default]
+    \definefontsynonym [KlaraSans-Italic]  [name:RTKlaraSans-Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
new file mode 100644
index 00000000000..9166ff72f96
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-richtype,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Richtype Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Francesca
+
+\starttypescript [serif] [francesca]
+    \definefontsynonym [Francesca-Regular] [name:RTFrancesca]        [features=default]
+    \definefontsynonym [Francesca-Bold]    [name:RTFrancesca-Bold]   [features=default]
+    \definefontsynonym [Francesca-Italic]  [name:RTFrancesca-Italic] [features=default]
+\stoptypescript
+
+% Klara
+
+\starttypescript [serif] [klara]
+    \definefontsynonym [KlaraSerif-Regular] [name:RTKlara]        [features=default]
+    \definefontsynonym [KlaraSerif-Bold]    [name:RTKlara-Bold]   [features=default]
+    \definefontsynonym [KlaraSerif-Italic]  [name:RTKlara-Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [klara]
+    \definefontsynonym [KlaraSans-Regular] [name:RT Klara Sans]      [features=default]
+    \definefontsynonym [KlaraSans-Bold]    [name:RTKlaraSans-Bold]   [features=default]
+    \definefontsynonym [KlaraSans-Italic]  [name:RTKlaraSans-Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
new file mode 100644
index 00000000000..bdd77c80ba8
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
@@ -0,0 +1,54 @@
+%D \module
+%D   [       file=type-richtype,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Richtype Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [richtype]
+
+% Francesca
+
+\starttypescript [serif] [francesca]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]       [Francesca-Regular] [features=default]
+    \definefontsynonym [SerifBold]   [Francesca-Bold]    [features=default]
+    \definefontsynonym [SerifItalic] [Francesca-Italic]  [features=default]
+    \definefontsynonym [SerifCaps]   [Serif]             [features=smallcaps]
+\stoptypescript
+
+\starttypescript [francesca]
+    \definetypeface [francesca] [rm] [serif] [francesca] [default]
+\stoptypescript
+
+% Klara
+
+\starttypescript [serif] [klara]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]       [KlaraSerif-Regular]
+    \definefontsynonym [SerifBold]   [KlaraSerif-Bold]
+    \definefontsynonym [SerifItalic] [KlaraSerif-Italic]
+\stoptypescript
+
+\starttypescript [sans] [klara]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]       [KlaraSans-Regular]
+    \definefontsynonym [SansBold]   [KlaraSans-Bold]
+    \definefontsynonym [SansItalic] [KlaraSans-Italic]
+\stoptypescript
+
+\starttypescript [klara]
+    \definetypeface [klara] [rm] [serif] [klara] [default]
+    \definetypeface [klara] [ss] [sans]  [klara] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-richtype}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex
new file mode 100644
index 00000000000..40d25d639da
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex
@@ -0,0 +1,35 @@
+%D \module
+%D   [       file=type-sabon,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Sabon Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [sabon]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [Sabon-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [Sabon-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [Sabon-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [Sabon-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [sabon]
+    \definefontsynonym [Sabon-Regular]    [name:SabonLTStd-Roman]      [features=default]
+    \definefontsynonym [Sabon-Italic]     [name:SabonLTStd-Italic]     [features=default]
+    \definefontsynonym [Sabon-Bold]       [name:SabonLTStd-Bold]       [features=default]
+    \definefontsynonym [Sabon-BoldItalic] [name:SabonLTStd-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sabon]
+    \definetypeface [sabon] [rm] [serif] [sabon]    [default]
+    \definetypeface [sabon] [ss] [sans]  [modern]   [default]
+    \definetypeface [sabon] [tt] [mono]  [modern]   [default] [rscale=1.075]
+    \definetypeface [sabon] [mm] [math]  [palatino] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
new file mode 100644
index 00000000000..b1d7607dfe5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-samba,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Samba Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [samba]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Samba-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [samba]
+    \definefontsynonym [Samba-Regular] [name:Samba] [features=default]
+\stoptypescript
+
+\starttypescript [samba]
+    \definetypeface [samba] [ss] [sans] [samba] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
new file mode 100644
index 00000000000..69d500c0fa2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
@@ -0,0 +1,52 @@
+%D \module
+%D   [       file=type-smeltery,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=SMeltery Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% AUdimat
+
+\starttypescript [sans] [audimat]
+    \definefontsynonym [Audimat-Regular]    [name:AUdimat Regular]     [features=default]
+    \definefontsynonym [Audimat-Italic]     [name:AUdimat Italic]      [features=default]
+    \definefontsynonym [Audimat-Bold]       [name:AUdimat Bold]        [features=default]
+    \definefontsynonym [Audimat-BoldItalic] [name:AUdimat Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [audimat]
+    \definefontsynonym [AudimatMono-Light]       [name:Audimat Mono Light]          [features=default]
+    \definefontsynonym [AudimatMono-LightItalic] [name:Audimat Mono LightOblique]   [features=default]
+    \definefontsynonym [AudimatMono-LightCaps]   [name:Audimat Mono SmallCapsLight] [features=default]
+    \definefontsynonym [AudimatMono-Regular]     [name:Audimat Mono]                [features=default]
+    \definefontsynonym [AudimatMono-Italic]      [name:Audimat Mono Oblique]        [features=default]
+    \definefontsynonym [AudimatMono-Bold]        [name:Audimat Mono Bold]           [features=default]
+    \definefontsynonym [AudimatMono-BoldItalic]  [name:Audimat Mono BoldOblique]    [features=default]
+    \definefontsynonym [AudimatMono-Smallcaps]   [name:Audimat Mono SmallCaps]      [features=default]
+    \definefontsynonym [AudimatMono-BoldCaps]    [name:Audimat Mono SmallCapsBold]  [features=default]
+\stoptypescript
+
+% GEronto Bis
+
+\starttypescript [serif] [geronto]
+    \definefontsynonym [Geronto-Regular] [name:GErontoBis] [features=default]
+\stoptypescript
+
+% MEgalopolis Extra
+
+\starttypescript [sans] [megalopolis]
+    \definefontsynonym [Megalopolis-Regular] [name:MEgalopolisExtra] [features=default]
+\stoptypescript
+
+% TRottoir
+
+\starttypescript [sans] [trottoir]
+    \definefontsynonym [Trottoir-Regular] [name:Trottoir] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
new file mode 100644
index 00000000000..69d500c0fa2
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
@@ -0,0 +1,52 @@
+%D \module
+%D   [       file=type-smeltery,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=SMeltery Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% AUdimat
+
+\starttypescript [sans] [audimat]
+    \definefontsynonym [Audimat-Regular]    [name:AUdimat Regular]     [features=default]
+    \definefontsynonym [Audimat-Italic]     [name:AUdimat Italic]      [features=default]
+    \definefontsynonym [Audimat-Bold]       [name:AUdimat Bold]        [features=default]
+    \definefontsynonym [Audimat-BoldItalic] [name:AUdimat Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [audimat]
+    \definefontsynonym [AudimatMono-Light]       [name:Audimat Mono Light]          [features=default]
+    \definefontsynonym [AudimatMono-LightItalic] [name:Audimat Mono LightOblique]   [features=default]
+    \definefontsynonym [AudimatMono-LightCaps]   [name:Audimat Mono SmallCapsLight] [features=default]
+    \definefontsynonym [AudimatMono-Regular]     [name:Audimat Mono]                [features=default]
+    \definefontsynonym [AudimatMono-Italic]      [name:Audimat Mono Oblique]        [features=default]
+    \definefontsynonym [AudimatMono-Bold]        [name:Audimat Mono Bold]           [features=default]
+    \definefontsynonym [AudimatMono-BoldItalic]  [name:Audimat Mono BoldOblique]    [features=default]
+    \definefontsynonym [AudimatMono-Smallcaps]   [name:Audimat Mono SmallCaps]      [features=default]
+    \definefontsynonym [AudimatMono-BoldCaps]    [name:Audimat Mono SmallCapsBold]  [features=default]
+\stoptypescript
+
+% GEronto Bis
+
+\starttypescript [serif] [geronto]
+    \definefontsynonym [Geronto-Regular] [name:GErontoBis] [features=default]
+\stoptypescript
+
+% MEgalopolis Extra
+
+\starttypescript [sans] [megalopolis]
+    \definefontsynonym [Megalopolis-Regular] [name:MEgalopolisExtra] [features=default]
+\stoptypescript
+
+% TRottoir
+
+\starttypescript [sans] [trottoir]
+    \definefontsynonym [Trottoir-Regular] [name:Trottoir] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
new file mode 100644
index 00000000000..bdf31151c97
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
@@ -0,0 +1,75 @@
+%D \module
+%D   [       file=type-smeltery,
+%D        version=2009.04.06,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=SMeltery Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [smeltery]
+
+% AUdimat
+
+\starttypescript [sans] [audimat]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Audimat-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Audimat-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Audimat-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Audimat-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [audimat]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [AudimatMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [AudimatMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [AudimatMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [AudimatMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [audimat]
+    \definetypeface [audimat] [ss] [sans] [audimat] [default]
+    \definetypeface [audimat] [tt] [mono] [audimat] [default]
+\stoptypescript
+
+% GEronto Bis
+
+\starttypescript [serif] [geronto]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Geronto-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [geronto]
+    \definetypeface [geronto] [rm] [serif] [geronto] [default] 
+\stoptypescript
+
+% MEgalopolis Extra
+
+\starttypescript [sans] [megalopolis]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Megalopolis-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [megalopolis]
+    \definetypeface [megalopolis] [ss] [sans] [megalopolis] [default]
+\stoptypescript
+
+% TRottoir
+
+\starttypescript [sans] [trottoir]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Trottoir-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [trottoir]
+    \definetypeface [trottoir] [ss] [sans] [trottoir] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-smeltery}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex
new file mode 100644
index 00000000000..3d047c5132a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-tuffy,
+%D        version=2008.07.28,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Tuffy Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [tuffy]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [Tuffy-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [Tuffy-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [Tuffy-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [Tuffy-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [tuffy]
+    \definefontsynonym [Tuffy-Regular]    [name:Tuffy Regular]     [features=default]
+    \definefontsynonym [Tuffy-Italic]     [name:Tuffy Italic]      [features=default]
+    \definefontsynonym [Tuffy-Bold]       [name:Tuffy Bold]        [features=default]
+    \definefontsynonym [Tuffy-BoldItalic] [name:Tuffy Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [tuffy]
+    \definetypeface [tuffy] [ss] [sans] [tuffy] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
new file mode 100644
index 00000000000..7d0a27476fd
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=type-uqammaq,
+%D        version=2008.07.27,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Uqammaq Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [sans] [uqammaq]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Uqammaq-Regular] [features=default]
+    \definefontsynonym [SansBold] [Uqammaq-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [uqammaq-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Uqammaq-Light]   [features=default]
+    \definefontsynonym [SansBold] [Uqammaq-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [uqammaq-bold]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Uqammaq-Bold]  [features=default]
+    \definefontsynonym [SansBold] [Uqammaq-Heavy] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [uqammaq,uqammaq-light,uqammaq-bold]
+    \definefontsynonym [Uqammaq-Light]   [name:Uqammaq Light] [features=default]
+    \definefontsynonym [Uqammaq-Regular] [name:Uqammaq]       [features=default]
+    \definefontsynonym [Uqammaq-Bold]    [name:Uqammaq Bold]  [features=default]
+    \definefontsynonym [Uqammaq-Heavy]   [name:Uqammaq Heavy] [features=default]
+\stoptypescript
+
+\starttypescript [uqammaq,uqammaq-light,uqammaq-bold]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
new file mode 100644
index 00000000000..1df29992dcf
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-vera,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bitstream Vera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [vera]
+    \definefontsynonym [VeraSerif-Regular] [name:Bitstream Vera Serif]      [features=default]
+    \definefontsynonym [VeraSerif-Bold]    [name:Bitstream Vera Serif Bold] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [vera]
+    \definefontsynonym [VeraSans-Regular]    [name:Bitstream Vera Sans]              [features=default]
+    \definefontsynonym [VeraSans-Italic]     [name:Bitstream Vera Sans Oblique]      [features=default]
+    \definefontsynonym [VeraSans-Bold]       [name:Bitstream Vera Sans Bold]         [features=default]
+    \definefontsynonym [VeraSans-BoldItalic] [name:Bitstream Vera Sans Bold Oblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [vera]
+    \definefontsynonym [VeraMono-Regular]    [name:Bitstream Vera Sans Mono]              [features=default]
+    \definefontsynonym [VeraMono-Italic]     [name:Bitstream Vera Sans Mono Oblique]      [features=default]
+    \definefontsynonym [VeraMono-Bold]       [name:Bitstream Vera Sans Mono Bold]         [features=default]
+    \definefontsynonym [VeraMono-BoldItalic] [name:Bitstream Vera Sans Mono Bold Oblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
new file mode 100644
index 00000000000..bfa63220839
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
@@ -0,0 +1,32 @@
+%D \module
+%D   [       file=type-vera,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bitstream Vera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [vera]
+    \definefontsynonym [VeraSerif-Regular] [name:bitstreamveraserifroman] [features=default]
+    \definefontsynonym [VeraSerif-Bold]    [name:bitstreamveraserifbold]  [features=default]
+\stoptypescript
+
+\starttypescript [sans] [vera]
+    \definefontsynonym [VeraSans-Regular]    [name:bitstreamverasansroman]       [features=default]
+    \definefontsynonym [VeraSans-Italic]     [name:bitstreamverasansoblique]     [features=default]
+    \definefontsynonym [VeraSans-Bold]       [name:bitstreamverasansbold]        [features=default]
+    \definefontsynonym [VeraSans-BoldItalic] [name:bitstreamverasansboldoblique] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [vera]
+    \definefontsynonym [VeraMono-Regular]    [name:bitstreamverasansmonoroman]       [features=default]
+    \definefontsynonym [VeraMono-Italic]     [name:bitstreamverasansmonooblique]     [features=default]
+    \definefontsynonym [VeraMono-Bold]       [name:bitstreamverasansmonobold]        [features=default]
+    \definefontsynonym [VeraMono-BoldItalic] [name:bitstreamverasansmonoboldoblique] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex b/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex
new file mode 100644
index 00000000000..bd3a24909ac
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex
@@ -0,0 +1,48 @@
+%D \module
+%D   [       file=type-vera,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Bitstream Vera Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [vera]
+
+\starttypescript [serif] [vera]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]     [VeraSerif-Regular] [features=default]
+    \definefontsynonym [SerifBold] [VeraSerif-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [vera]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [VeraSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [VeraSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [VeraSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [VeraSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [vera]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [VeraMono-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [VeraMono-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [VeraMono-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [VeraMono-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [vera]
+    \definetypeface [vera] [rm] [serif] [vera]   [default]
+    \definetypeface [vera] [ss] [sans]  [vera]   [default]
+    \definetypeface [vera] [tt] [mono]  [vera]   [default]
+    \definetypeface [vera] [mm] [math]  [modern] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-vera}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
new file mode 100644
index 00000000000..88254746a71
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
@@ -0,0 +1,27 @@
+%D \module
+%D   [       file=type-verajja,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Verajja Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [verajja]
+    \definefontsynonym [VerajjaSerif-Regular]    [name:Verajja Serif]             [features=default]
+    \definefontsynonym [VerajjaSerif-Italic]     [name:Verajja Serif Italic]      [features=default]
+    \definefontsynonym [VerajjaSerif-Bold]       [name:Verajja Serif Bold]        [features=default]
+    \definefontsynonym [VerajjaSerif-BoldItalic] [name:Verajja Serif Bold Italic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verajja]
+    \definefontsynonym [VerajjaSans-Regular]    [name:Verajja]             [features=default]
+    \definefontsynonym [VerajjaSans-Italic]     [name:Verajja Italic]      [features=default]
+    \definefontsynonym [VerajjaSans-Bold]       [name:Verajja Bold]        [features=default]
+    \definefontsynonym [VerajjaSans-BoldItalic] [name:Verajja Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
new file mode 100644
index 00000000000..32fa95be460
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
@@ -0,0 +1,27 @@
+%D \module
+%D   [       file=type-verajja,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Verajja Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [verajja]
+    \definefontsynonym [VerajjaSerif-Regular]    [name:verajjaserif]           [features=default]
+    \definefontsynonym [VerajjaSerif-Italic]     [name:verajjaserifitalic]     [features=default]
+    \definefontsynonym [VerajjaSerif-Bold]       [name:verajjaserifbold]       [features=default]
+    \definefontsynonym [VerajjaSerif-BoldItalic] [name:verajjaserifbolditalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verajja]
+    \definefontsynonym [VerajjaSans-Regular]    [name:verajja]           [features=default]
+    \definefontsynonym [VerajjaSans-Italic]     [name:verajjaitalic]     [features=default]
+    \definefontsynonym [VerajjaSans-Bold]       [name:verajjabold]       [features=default]
+    \definefontsynonym [VerajjaSans-BoldItalic] [name:verajjabolditalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex
new file mode 100644
index 00000000000..5dda476c402
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex
@@ -0,0 +1,42 @@
+%D \module
+%D   [       file=type-verajja,
+%D        version=2009.03.24,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Verajja Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [verajja]
+
+\starttypescript [serif] [verajja]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [VerajjaSerif-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [VerajjaSerif-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [VerajjaSerif-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [VerajjaSerif-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [verajja]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [VerajjaSans-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [VerajjaSans-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [VerajjaSans-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [VerajjaSans-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [verajja]
+    \definetypeface [verajja] [rm] [serif] [verajja] [default]
+    \definetypeface [verajja] [ss] [sans]  [verajja] [default]
+    \definetypeface [verajja] [tt] [mono]  [modern]  [default]
+    \definetypeface [verajja] [mm] [math]  [modern]  [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-verajja}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
new file mode 100644
index 00000000000..40a06360e90
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
@@ -0,0 +1,27 @@
+%D \module
+%D   [       file=type-vista,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vista Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:cambria]    [Cambria]
+\definetypescriptprefix [f:constantia] [Constantia]
+\definetypescriptprefix [f:calibri]    [Calibri]
+\definetypescriptprefix [f:candara]    [Candara]
+\definetypescriptprefix [f:corbel]     [Corbel]
+\definetypescriptprefix [f:consolas]   [Consolas]
+
+\starttypescript [serif,sans,mono] [cambria,constantia,calibri,candara,corbel,consolas]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]             [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]      [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]        [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} Bold Italic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
new file mode 100644
index 00000000000..b5ddbacde9d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
@@ -0,0 +1,27 @@
+%D \module
+%D   [       file=type-vista,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vista Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\definetypescriptprefix [f:cambria]    [cambria]
+\definetypescriptprefix [f:constantia] [constantia]
+\definetypescriptprefix [f:calibri]    [calibri]
+\definetypescriptprefix [f:candara]    [candara]
+\definetypescriptprefix [f:corbel]     [corbel]
+\definetypescriptprefix [f:consolas]   [consolas]
+
+\starttypescript [serif,sans,mono] [cambria,constantia,calibri,candara,corbel,consolas]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]           [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}italic]     [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]       [features=default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}bolditalic] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.tex b/Master/texmf-dist/tex/context/third/typescripts/type-vista.tex
new file mode 100644
index 00000000000..587d6bf6c0b
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.tex
@@ -0,0 +1,62 @@
+%D \module
+%D   [       file=type-vista,
+%D        version=2008.06.08,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vista Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [vista]
+
+\definetypescriptprefix [n:cambria]    [Cambria]
+\definetypescriptprefix [n:constantia] [Constantia]
+\definetypescriptprefix [n:calibri]    [Calibri]
+\definetypescriptprefix [n:candara]    [Candara]
+\definetypescriptprefix [n:corbel]     [Corbel]
+\definetypescriptprefix [n:consolas]   [Consolas]
+
+\starttypescript [serif] [cambria,constantia]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [calibri,candara,corbel]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [mono] [consolas]
+    \setups[font:fallback:mono]
+    \definefontsynonym [Mono]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
+    \definefontsynonym [MonoItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
+    \definefontsynonym [MonoBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
+    \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
+\stoptypescript
+
+\starttypescript [cambria,constantia]
+    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
+\stoptypescript
+
+\starttypescript [calibri,candara,corbel]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+\starttypescript [consolas]
+    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-vista}
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex
new file mode 100644
index 00000000000..7f68a5f769f
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex
@@ -0,0 +1,26 @@
+%D \module
+%D   [       file=type-vollkorn,
+%D        version=2009.03.29,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vollkorn Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescript [serif] [vollkorn]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Vollkorn-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [serif] [vollkorn]
+    \definefontsynonym [Vollkorn-Regular] [name:Vollkorn] [features=default]
+\stoptypescript
+
+\starttypescript [vollkorn]
+    \definetypeface [vollkorn] [rm] [serif] [vollkorn] [default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii
new file mode 100644
index 00000000000..6d6a246a2d7
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-yanone,
+%D        version=2009.03.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Yanone Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Al Abdali 8
+
+\starttypescript [sans] [alabdali]
+    \definefontsynonym [Kaffeesatz-Regular] [name:Al Abdali 8] [features=arabic]
+\stoptypescript
+
+% Kaffeesatz
+
+\starttypescript [sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definefontsynonym [Kaffeesatz-Thin]    [name:YanoneKaffeesatz-Thin]    [features=default]
+    \definefontsynonym [Kaffeesatz-Light]   [name:YanoneKaffeesatz-Light]   [features=default]
+    \definefontsynonym [Kaffeesatz-Regular] [name:YanoneKaffeesatz-Regular] [features=default]
+    \definefontsynonym [Kaffeesatz-Bold]    [name:YanoneKaffeesatz-Bold]    [features=default]
+\stoptypescript
+
+% Tagesschrift
+
+\starttypescript [serif] [tagesschrift]
+    \definefontsynonym [Tagesschrift-Regular] [name:Yanone Tagesschrift] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv
new file mode 100644
index 00000000000..45d2c04f9da
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv
@@ -0,0 +1,34 @@
+%D \module
+%D   [       file=type-yanone,
+%D        version=2009.03.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Yanone Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+% Al Abdali 8
+
+\starttypescript [sans] [alabdali]
+    \definefontsynonym [Kaffeesatz-Regular] [name:alabdali8] [features=arabic]
+\stoptypescript
+
+% Kaffeesatz
+
+\starttypescript [sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definefontsynonym [Kaffeesatz-Thin]    [name:yanonekaffeesatzthin]    [features=default]
+    \definefontsynonym [Kaffeesatz-Light]   [name:yanonekaffeesatzlight]   [features=default]
+    \definefontsynonym [Kaffeesatz-Regular] [name:yanonekaffeesatzregular] [features=default]
+    \definefontsynonym [Kaffeesatz-Bold]    [name:yanonekaffeesatzbold]    [features=default]
+\stoptypescript
+
+% Tagesschrift
+
+\starttypescript [serif] [tagesschrift]
+    \definefontsynonym [Tagesschrift-Regular] [name:Yanone Tagesschrift] [features=default]
+\stoptypescript
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex
new file mode 100644
index 00000000000..61ca62497f3
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex
@@ -0,0 +1,68 @@
+%D \module
+%D   [       file=type-yanone,
+%D        version=2009.03.30,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Yanone Collection,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+%D These are typescripts for fonts created by Jan Gerner. They can be
+%D downloaded at\hyphenatedurl{http://www.yanone.de/}
+
+\starttypescriptcollection [yanone]
+
+% Al Abdali 8
+
+\starttypescript [sans] [alabdali]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans] [Kaffeesatz-Bold] [features=arabic]
+\stoptypescript
+
+\starttypescript [alabdali]
+    \definetypeface [alabdali] [ss] [sans] [alabdali] [default]
+\stoptypescript
+
+% Kaffeesatz
+
+\starttypescript [sans] [kaffeesatz]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Kaffeesatz-Regular] [features=default]
+    \definefontsynonym [SansBold] [Kaffeesatz-Bold]    [features=default]
+\stoptypescript
+
+\starttypescript [sans] [kaffeesatz-thin]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Kaffeesatz-Thin]  [features=default]
+    \definefontsynonym [SansBold] [Kaffeesatz-Light] [features=default]
+\stoptypescript
+
+\starttypescript [sans] [kaffeesatz-light]
+    \setups[font:fallback:sans]
+    \definefontsynonym [Sans]     [Kaffeesatz-Light]   [features=default]
+    \definefontsynonym [SansBold] [Kaffeesatz-Regular] [features=default]
+\stoptypescript
+
+\starttypescript [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+\stoptypescript
+
+% Tagesschrift
+
+\starttypescript [serif] [tagesschrift]
+    \setups[font:fallback:serif]
+    \definefontsynonym [Serif] [Tagesschrift-Regular]   [features=default]
+\stoptypescript
+
+\starttypescript [tagesschrift]
+    \definetypeface [tagesschrift] [rm] [serif] [tagesschrift] [default]
+\stoptypescript
+
+\stoptypescriptcollection
+
+\loadmarkfile{type-yanone}
+
+\endinput
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index af81e5c21fe..06a5c2b2e7d 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -62,7 +62,7 @@ my @WorkingTLP = qw(
           context-french context-games context-gnuplot
           context-letter context-lettrine context-lilypond context-mathsets
           context-simplefonts context-simpleslides context-taspresent
-          context-typearea context-vim
+          context-typearea context-typescripts context-vim
           cooking cool coollist coolstr cooltooltips
           coordsys courier-scaled courseoutline coursepaper coverpage
           crop crossreference crosswrd cryst csbulletin csquotes
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1982b4cfed1..6522982a1a0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -154,7 +154,8 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'context-simplefonts',		"&MAKEcopy",
  'context-simpleslides',	"&MAKEcopy",
  'context-taspresent',"&MAKEcopy",
- 'context-typearea',  "&MAKEcopy",
+ 'context-typearea',		"&MAKEcopy",
+ 'context-typescripts',		"&MAKEcopy",
  'context-vim',       "&MAKEcopy",
  'coptic',	"die 'skipping, it has been replaced by cbcoptic'",
  'corridx',	"die 'skipping, Pascal source'",
diff --git a/Master/tlpkg/tlpsrc/collection-context.tlpsrc b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
index 14926c3e100..9c5c32a5ee5 100644
--- a/Master/tlpkg/tlpsrc/collection-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-context.tlpsrc
@@ -24,6 +24,7 @@ depend context-simplefonts
 depend context-simpleslides
 depend context-taspresent
 depend context-typearea
+depend context-typescripts
 depend context-vim
 depend collection-metapost
 depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/context-typearea.tlpsrc b/Master/tlpkg/tlpsrc/context-typearea.tlpsrc
index e874787989f..c1479ecab8d 100644
--- a/Master/tlpkg/tlpsrc/context-typearea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context-typearea.tlpsrc
@@ -1,4 +1,2 @@
-name context-typearea
-category Package
 runpattern d texmf-dist/tex/context/third/typearea
 docpattern d texmf-dist/doc/context/third/typearea
diff --git a/Master/tlpkg/tlpsrc/context-typescripts.tlpsrc b/Master/tlpkg/tlpsrc/context-typescripts.tlpsrc
new file mode 100644
index 00000000000..9847cb99a2a
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/context-typescripts.tlpsrc
@@ -0,0 +1,2 @@
+runpattern d texmf-dist/tex/context/third/typescripts
+docpattern d texmf-dist/doc/context/third/typescripts