context-typescripts (4nov11)

git-svn-id: svn://tug.org/texlive/trunk@24492 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2011-11-04 23:16:14 +0000
committer: Karl Berry <karl@freefriends.org> 2011-11-04 23:16:14 +0000
commit: e8ebecb6ccc3bdfe30c9ead5e953a3feb398a503 (patch)
tree: 0f470fc33001b1c9db3f6de522537b42001697ba
parent: b19d9736b1233678daaf4e8d5538b129be4de268 (diff)
71 files changed, 1122 insertions, 5202 deletions
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
index 1389302ef99..7a6f2e8dfc9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=type-aller,
-%D      version=2010.09.13,
+%D      version=2011.08.28,
 %D        title=\CONTEXT\ Typescript Macros,
 %D     subtitle=Aller Font Definitions,
 %D       author=Wolfgang Schuster,
@@ -8,7 +8,7 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2011  Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 \starttypescriptcollection [aller]
 
 \starttypescript [\s!sans] [aller,aller-light,aller-display]
-    \definefontsynonym [Aller-Regular]      [\s!file:Aller]              [\s!features=\s!default]
-    \definefontsynonym [Aller-Italic]       [\s!file:Aller Italic]       [\s!features=\s!default]
-    \definefontsynonym [Aller-Bold]         [\s!file:Aller Bold]         [\s!features=\s!default]
-    \definefontsynonym [Aller-BoldItalic]   [\s!file:Aller Bold Italic]  [\s!features=\s!default]
-    \definefontsynonym [Aller-Display]      [\s!file:Aller Display]      [\s!features=\s!default]
-    \definefontsynonym [Aller-LightRegular] [\s!file:Aller Light]        [\s!features=\s!default]
-    \definefontsynonym [Aller-LightItalic]  [\s!file:Aller Light Italic] [\s!features=\s!default]
+    \definefontsynonym [Aller-Regular]      [\s!file:Aller_Rg]     [\s!features=\s!default]
+    \definefontsynonym [Aller-Italic]       [\s!file:Aller_It]     [\s!features=\s!default]
+    \definefontsynonym [Aller-Bold]         [\s!file:Aller_Bd]     [\s!features=\s!default]
+    \definefontsynonym [Aller-BoldItalic]   [\s!file:Aller_BdIt]   [\s!features=\s!default]
+    \definefontsynonym [Aller-Display]      [\s!file:AllerDisplay] [\s!features=\s!default]
+    \definefontsynonym [Aller-LightRegular] [\s!file:Aller_Lt]     [\s!features=\s!default]
+    \definefontsynonym [Aller-LightItalic]  [\s!file:Aller_LtIt]   [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [\s!sans] [aller]
@@ -41,6 +41,7 @@
     \definefontsynonym [\s!SansItalic]     [Aller-Italic]     [\s!features=\s!default]
     \definefontsynonym [\s!SansBold]       [Aller-Bold]       [\s!features=\s!default]
     \definefontsynonym [\s!SansBoldItalic] [Aller-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SansCaps]       [Aller-Regular]    [\s!features=\s!smallcaps]
 \stoptypescript
 
 \starttypescript [\s!sans] [aller-light]
@@ -55,7 +56,7 @@
 \stoptypescript
 
 \starttypescript [aller,aller-light,aller-display]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [default]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
     \quittypescriptscanning
 \stoptypescript
 
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
index 9d9d9c684ec..2a23e9249d9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=type-aller,
-%D      version=2010.09.13,
+%D      version=2011.08.28,
 %D        title=\CONTEXT\ Typescript Macros,
 %D     subtitle=Aller Font Definitions,
 %D       author=Wolfgang Schuster,
@@ -8,7 +8,7 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2011  Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@
 \starttypescriptcollection [aller]
 
 \starttypescript [\s!sans] [aller,aller-light,aller-display]
-    \definefontsynonym [Aller-Regular]      [\s!file:aller]            [\s!features=\s!default]
-    \definefontsynonym [Aller-Italic]       [\s!file:alleritalic]      [\s!features=\s!default]
-    \definefontsynonym [Aller-Bold]         [\s!file:allerbold]        [\s!features=\s!default]
-    \definefontsynonym [Aller-BoldItalic]   [\s!file:allerbolditalic]  [\s!features=\s!default]
-    \definefontsynonym [Aller-Display]      [\s!file:allerdisplay]     [\s!features=\s!default]
-    \definefontsynonym [Aller-LightRegular] [\s!file:allerlight]       [\s!features=\s!default]
-    \definefontsynonym [Aller-LightItalic]  [\s!file:allerlightitalic] [\s!features=\s!default]
+    \definefontsynonym [Aller-Regular]      [\s!file:allerrg]      [\s!features=\s!default]
+    \definefontsynonym [Aller-Italic]       [\s!file:allerit]      [\s!features=\s!default]
+    \definefontsynonym [Aller-Bold]         [\s!file:allerbd]      [\s!features=\s!default]
+    \definefontsynonym [Aller-BoldItalic]   [\s!file:allerbdit]    [\s!features=\s!default]
+    \definefontsynonym [Aller-Display]      [\s!file:allerdisplay] [\s!features=\s!default]
+    \definefontsynonym [Aller-LightRegular] [\s!file:allerlt]      [\s!features=\s!default]
+    \definefontsynonym [Aller-LightItalic]  [\s!file:allerltit]    [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [\s!sans] [aller]
@@ -41,6 +41,7 @@
     \definefontsynonym [\s!SansItalic]     [Aller-Italic]     [\s!features=\s!default]
     \definefontsynonym [\s!SansBold]       [Aller-Bold]       [\s!features=\s!default]
     \definefontsynonym [\s!SansBoldItalic] [Aller-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SansCaps]       [Aller-Regular]    [\s!features=\s!smallcaps]
 \stoptypescript
 
 \starttypescript [\s!sans] [aller-light]
@@ -55,7 +56,7 @@
 \stoptypescript
 
 \starttypescript [aller,aller-light,aller-display]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [default]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
     \quittypescriptscanning
 \stoptypescript
 
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
index 770f6bc2f4c..84f8a67beb7 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=type-anivers,
-%D      version=2010.10.27,
+%D      version=2011.08.28,
 %D        title=\CONTEXT\ Typescript Macros,
 %D     subtitle=Anivers Font Definitions,
 %D       author=Wolfgang Schuster,
@@ -8,7 +8,7 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2011  Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
index bdbdf836fdc..0ab5642a7d9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-anivers.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=type-anivers,
-%D      version=2010.10.27,
+%D      version=2011.08.28,
 %D        title=\CONTEXT\ Typescript Macros,
 %D     subtitle=Anivers Font Definitions,
 %D       author=Wolfgang Schuster,
@@ -8,7 +8,7 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2011  Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
deleted file mode 100644
index d032068a367..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkii
+++ /dev/null
@@ -1,268 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index bdcd2e6b1c9..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
+++ /dev/null
@@ -1,268 +0,0 @@
-%D \module
-%D   [     file=type-apostrophiclab,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Apostrophic Laboratories Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:amerikaalternates] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [amerika]
-    \definefontsynonym [AmerikaSans-Regular] [name:amerikasans] [features=default]
-\stoptypescript
-
-% Ashby
-
-\starttypescript [sans] [ashby]
-    \definefontsynonym [Ashby-Light]           [name:ashbylight]           [features=default]
-    \definefontsynonym [Ashby-LightItalic]     [name:ashbylightitalic]     [features=default]
-    \definefontsynonym [Ashby-Regular]         [name:ashbybook]            [features=default]
-    \definefontsynonym [Ashby-Italic]          [name:ashbybookitalic]      [features=default]
-    \definefontsynonym [Ashby-Medium]          [name:ashbymedium]          [features=default]
-    \definefontsynonym [Ashby-MediumItalic]    [name:ashbymediumitalic]    [features=default]
-    \definefontsynonym [Ashby-Bold]            [name:ashbybold]            [features=default]
-    \definefontsynonym [Ashby-BoldItalic]      [name:ashbybolditalic]      [features=default]
-    \definefontsynonym [Ashby-Black]           [name:ashbyblack]           [features=default]
-    \definefontsynonym [Ashby-BlackItalic]     [name:ashbyblackitalic]     [features=default]
-    \definefontsynonym [Ashby-ExtraBold]       [name:ashbyextrabold]       [features=default]
-    \definefontsynonym [Ashby-ExtraBoldItalic] [name:ashbyextrabolditalic] [features=default]
-\stoptypescript
-
-% Charrington
-
-\starttypescript [serif] [charrington]
-    \definefontsynonym [Charrington-Regular]   [name:charrington]          [features=default]
-    \definefontsynonym [Charrington-Bold]      [name:charringtonbold]      [features=default]
-    \definefontsynonym [Charrington-Narrow]    [name:charringtonnarrow]    [features=default]
-    \definefontsynonym [Charrington-Outer]     [name:charringtonouter]     [features=default]
-    \definefontsynonym [Charrington-Posh]      [name:charringtonposh]      [features=default]
-    \definefontsynonym [Charrington-Roughened] [name:charringtonroughened] [features=default]
-    \definefontsynonym [Charrington-Semibold]  [name:charringtonsemibold]  [features=default]
-    \definefontsynonym [Charrington-Strewn]    [name:charringtonstrewn]    [features=default]
-    \definefontsynonym [Charrington-Superwide] [name:charringtonsuperwide] [features=default]
-    \definefontsynonym [Charrington-Upper]     [name:charringtonupper]     [features=default]
-    \definefontsynonym [Charrington-Wide]      [name:charringtonwide]      [features=default]
-\stoptypescript
-
-% Covington / Covington SC
-
-\starttypescript [serif] [covington]
-    \definefontsynonym [Covington-Regular]          [name:covington]                 [features=default]
-    \definefontsynonym [Covington-Italic]           [name:covingtonitalic]           [features=default]
-    \definefontsynonym [Covington-Bold]             [name:covingtonbold]             [features=default]
-    \definefontsynonym [Covington-BoldItalic]       [name:covingtonbolditalic]       [features=default]
-    \definefontsynonym [Covington-Condensed]        [name:covingtoncond]             [features=default]
-    \definefontsynonym [Covington-CondItalic]       [name:covingtonconditalic]       [features=default]
-    \definefontsynonym [Covington-CondBold]         [name:covingtoncondbold]         [features=default]
-    \definefontsynonym [Covington-CondBoldItalic]   [name:covingtoncondbolditalic]   [features=default]
-    \definefontsynonym [Covington-Exp]              [name:covingtonexp]              [features=default]
-    \definefontsynonym [Covington-ExpItalic]        [name:covingtonexpitalic]        [features=default]
-    \definefontsynonym [Covington-ExpBold]          [name:covingtonexpbold]          [features=default]
-    \definefontsynonym [Covington-ExpBoldItalic]    [name:covingtonexpbolditalic]    [features=default]
-    \definefontsynonym [Covington-RevItalic]        [name:covingtonrevitalic]        [features=default]
-    \definefontsynonym [Covington-RevBoldItalic]    [name:covingtonrevbolditalic]    [features=default]
-    \definefontsynonym [Covington-SC]               [name:covingtonsc]               [features=default]
-    \definefontsynonym [Covington-SCItalic]         [name:covingtonscitalic]         [features=default]
-    \definefontsynonym [Covington-SCBold]           [name:covingtonscbold]           [features=default]
-    \definefontsynonym [Covington-SCBoldItalic]     [name:covingtonscbolditalic]     [features=default]
-    \definefontsynonym [Covington-SCCond]           [name:covingtonsccond]           [features=default]
-    \definefontsynonym [Covington-SCCondItalic]     [name:covingtonscconditalic]     [features=default]
-    \definefontsynonym [Covington-SCCondBold]       [name:covingtonsccondbold]       [features=default]
-    \definefontsynonym [Covington-SCCondBoldItalic] [name:covingtonsccondbolditalic] [features=default]
-    \definefontsynonym [Covington-SCExp]            [name:covingtonscexp]            [features=default]
-    \definefontsynonym [Covington-SCExpItalic]      [name:covingtonscexpitalic]      [features=default]
-    \definefontsynonym [Covington-SCExpBold]        [name:covingtonscexpbold]        [features=default]
-    \definefontsynonym [Covington-SCExpBoldItalic]  [name:covingtonscexpbolditalic]  [features=default]
-    \definefontsynonym [Covington-SCRevItalic]      [name:covingtonscrevitalic]      [features=default]
-    \definefontsynonym [Covington-SCRevBoldItalic]  [name:covingtonscrevbolditalic]  [features=default]
-    \definefontsynonym [Covington-SCShadow]         [name:covingtonscshadow]         [features=default]
-    \definefontsynonym [Covington-SCShadowItalic]   [name:covingtonscshadowitalic]   [features=default]
-    \definefontsynonym [Covington-Shadow]           [name:covingtonshadow]           [features=default]
-    \definefontsynonym [Covington-ShadowItalic]     [name:covingtonshadowitalic]     [features=default]
-\stoptypescript
-
-% Day Roman
-
-\starttypescript [serif] [dayroman]
-    \definefontsynonym [DayRoman-Regular] [name:dayroman]       [features=default]
-    \definefontsynonym [DayRoman-Expert]  [name:dayromanexpert] [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:florencesansitalic]           [features=default]
-    \definefontsynonym [Florencesans-Bold]             [name:florencesansbold]             [features=default]
-    \definefontsynonym [Florencesans-BoldItalic]       [name:florencesansbolditalic]       [features=default]
-    \definefontsynonym [Florencesans-Black]            [name:florencesansblack]            [features=default]
-    \definefontsynonym [Florencesans-BlackItalic]      [name:florencesansblackitalic]      [features=default]
-    \definefontsynonym [Florencesans-Comp]             [name:florencesanscomp]             [features=default]
-    \definefontsynonym [Florencesans-CompItalic]       [name:florencesanscompitalic]       [features=default]
-    \definefontsynonym [Florencesans-CompBold]         [name:florencesanscompbold]         [features=default]
-    \definefontsynonym [Florencesans-CompBoldItalic]   [name:florencesanscompbolditalic]   [features=default]
-    \definefontsynonym [Florencesans-Condensed]        [name:florencesanscond]             [features=default]
-    \definefontsynonym [Florencesans-CondItalic]       [name:florencesansconditalic]       [features=default]
-    \definefontsynonym [Florencesans-CondBold]         [name:florencesanscondbold]         [features=default]
-    \definefontsynonym [Florencesans-CondBoldItalic]   [name:florencesanscondbolditalic]   [features=default]
-    \definefontsynonym [Florencesans-Exp]              [name:florencesansexp]              [features=default]
-    \definefontsynonym [Florencesans-ExpItalic]        [name:florencesansexpitalic]        [features=default]
-    \definefontsynonym [Florencesans-ExpBold]          [name:florencesansexpbold]          [features=default]
-    \definefontsynonym [Florencesans-ExpBoldItalic]    [name:florencesansexpbolditalic]    [features=default]
-    \definefontsynonym [Florencesans-Outline]          [name:florencesansoutline]          [features=default]
-    \definefontsynonym [Florencesans-OutlineItalic]    [name:florencesansoutlineitalic]    [features=default]
-    \definefontsynonym [Florencesans-RevBoldItalic]    [name:florencesansrevbolditalic]    [features=default]
-    \definefontsynonym [Florencesans-RevItalic]        [name:florencesansrevitalic]        [features=default]
-    \definefontsynonym [Florencesans-SC]               [name:florencesanssc]               [features=default]
-    \definefontsynonym [Florencesans-SCBlack]          [name:florencesansscblack]          [features=default]
-    \definefontsynonym [Florencesans-SCBlackItalic]    [name:florencesansscblackitalic]    [features=default]
-    \definefontsynonym [Florencesans-SCBold]           [name:florencesansscBold]           [features=default]
-    \definefontsynonym [Florencesans-SCBoldItalic]     [name:florencesansscbolditalic]     [features=default]
-    \definefontsynonym [Florencesans-SCComp]           [name:florencesanssccomp]           [features=default]
-    \definefontsynonym [Florencesans-SCCompBold]       [name:florencesanssccompbold]       [features=default]
-    \definefontsynonym [Florencesans-SCCompBoldItalic] [name:florencesanssccompbolditalic] [features=default]
-    \definefontsynonym [Florencesans-SCCompItalic]     [name:florencesanssccompitalic]     [features=default]
-    \definefontsynonym [Florencesans-SCCond]           [name:florencesanssccond]           [features=default]
-    \definefontsynonym [Florencesans-SCCondBold]       [name:florencesanssccondbold]       [features=default]
-    \definefontsynonym [Florencesans-SCCondBoldItalic] [name:florencesanssccondbolditalic] [features=default]
-    \definefontsynonym [Florencesans-SCCondItalic]     [name:florencesansscconditalic]     [features=default]
-    \definefontsynonym [Florencesans-SCExp]            [name:florencesansscexp]            [features=default]
-    \definefontsynonym [Florencesans-SCExpBold]        [name:florencesansscexpbold]        [features=default]
-    \definefontsynonym [Florencesans-SCExpBoldItalic]  [name:florencesansscexpbolditalic]  [features=default]
-    \definefontsynonym [Florencesans-SCExpItalic]      [name:florencesansscexpitalic]      [features=default]
-    \definefontsynonym [Florencesans-SCItalic]         [name:florencesansscItalic]         [features=default]
-    \definefontsynonym [Florencesans-SCOutline]        [name:florencesansscoutline]        [features=default]
-    \definefontsynonym [Florencesans-SCOutlineItalic]  [name:florencesansscoutlineitalic]  [features=default]
-    \definefontsynonym [Florencesans-SCRevBoldItalic]  [name:florencesansscrevbolditalic]  [features=default]
-    \definefontsynonym [Florencesans-SCRevItalic]      [name:florencesansscrevitalic]      [features=default]
-    \definefontsynonym [Florencesans-SCShaded]         [name:florencesansscshaded]         [features=default]
-    \definefontsynonym [Florencesans-SCShadedItalic]   [name:florencesansscShadeditalic]   [features=default]
-    \definefontsynonym [Florencesans-Shaded]           [name:florencesansshaded]           [features=default]
-    \definefontsynonym [Florencesans-ShadedItalic]     [name:florencesansshadeditalic]     [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:ladycopra]          [features=default]
-    \definefontsynonym [LadyCopra-Alternate] [name:ladycopraalternate] [features=default]
-    \definefontsynonym [LadyCopra-Narrow]    [name:ladycopranarrow]    [features=default]
-    \definefontsynonym [LadyCopra-Wide]      [name:ladycoprawide]      [features=default]
-\stoptypescript
-
-% Lady Ice / Lady Ice Extra / Lady Ice Revisited
-
-\starttypescript [sans] [ladyice]
-    \definefontsynonym [LadyIce-Regular]          [name:ladyice]                 [features=default]
-    \definefontsynonym [LadyIce-Italic]           [name:ladyiceitalic]           [features=default]
-    \definefontsynonym [LadyIce-Bold]             [name:ladyicebold]             [features=default]
-    \definefontsynonym [LadyIce-Caps]             [name:ladyicescbold]           [features=default]
-    \definefontsynonym [LadyIce-CapsBold]         [name:ladyicesmallcaps]        [features=default]
-    \definefontsynonym [LadyIce-Condensed]        [name:ladyicecondensed]        [features=default]
-    \definefontsynonym [LadyIce-3D]               [name:ladyice3d]               [features=default]
-    \definefontsynonym [LadyIce-3DItalic]         [name:ladyice3ditalic]         [features=default]
-    \definefontsynonym [LadyIce-Expanded]         [name:ladyiceexpanded]         [features=default]
-    \definefontsynonym [LadyIce-ExtraLight]       [name:ladyiceextralight]       [features=default]
-    \definefontsynonym [LadyIce-ExtraLightItalic] [name:ladyiceextralightitalic] [features=default]
-    \definefontsynonym [LadyIce-Light]            [name:ladyicelight]            [features=default]
-    \definefontsynonym [LadyIce-LightItalic]      [name:ladyicelightitalic]      [features=default]
-    \definefontsynonym [LadyIce-Revisited]        [name:ladyicerevisited]        [features=default]
-    \definefontsynonym [LadyIce-RevisitedBold]    [name:ladyicerevisitedbold]    [features=default]
-    \definefontsynonym [LadyIce-RevisitedUpper]   [name:ladyicerevisitedupper]   [features=default]
-\stoptypescript
-
-% Steinem
-
-\starttypescript [sans] [steinem]
-    \definefontsynonym [Steinem-Regular]    [name:steinem]           [features=default]
-    \definefontsynonym [Steinem-Italic]     [name:steinemitalic]     [features=default]
-    \definefontsynonym [Steinem-Bold]       [name:steinembold]       [features=default]
-    \definefontsynonym [Steinem-BoldItalic] [name:steinembolditalic] [features=default]
-    \definefontsynonym [Steinem-Unicode]    [name:steinemunicode]    [features=default]
-\stoptypescript
-
-% Street Corner
-
-\starttypescript [sans] [streetcorner]
-    \definefontsynonym [StreetCorner-Regular]           [name:streetcorner]                [features=default]
-    \definefontsynonym [StreetCorner-Italic]            [name:streetcorneroblique]         [features=default]
-    \definefontsynonym [StreetCorner-Bold]              [name:streetcornerbold]            [features=default]
-    \definefontsynonym [StreetCorner-Extend]            [name:streetcornerextend]          [features=default]
-    \definefontsynonym [StreetCorner-Hyperextend]       [name:streetcornerhyperextend]     [features=default]
-    \definefontsynonym [StreetCorner-Narrow]            [name:streetcornernarrow]          [features=default]
-    \definefontsynonym [StreetCorner-Narrower]          [name:streetcornernarrower]        [features=default]
-    \definefontsynonym [StreetCorner-Semibold]          [name:streetcornersemibold]        [features=default]
-    \definefontsynonym [StreetCorner-Slab]              [name:streetcornerslab]            [features=default]
-    \definefontsynonym [StreetCorner-SlabBold]          [name:streetcornerslabbold]        [features=default]
-    \definefontsynonym [StreetCorner-SlabExtend]        [name:streetcornerslabextend]      [features=default]
-    \definefontsynonym [StreetCorner-SlabHyperextend]   [name:streetcornerslabhyperextend] [features=default]
-    \definefontsynonym [StreetCorner-SlabNarrow]        [name:streetcornerslabnarrow]      [features=default]
-    \definefontsynonym [StreetCorner-SlabNarrower]      [name:streetcornerslabnarrower]    [features=default]
-    \definefontsynonym [StreetCorner-CornerSlabOblique] [name:streetcornerslaboblique]     [features=default]
-    \definefontsynonym [StreetCorner-SlabSemibold]      [name:streetcornerslabsemibold]    [features=default]
-    \definefontsynonym [StreetCorner-CornerSlabUpper]   [name:streetcornerslabupper]       [features=default]
-    \definefontsynonym [StreetCorner-SlabUpperOblique]  [name:streetcornerslabupperobl]    [features=default]
-    \definefontsynonym [StreetCorner-Thin]              [name:streetcornerthin]            [features=default]
-    \definefontsynonym [StreetCorner-Upper]             [name:streetcornerupper]           [features=default]
-    \definefontsynonym [StreetCorner-UpperExtend]       [name:streetcornerupperextend]     [features=default]
-    \definefontsynonym [StreetCorner-UpperNarrow]       [name:streetcorneruppernarrow]     [features=default]
-    \definefontsynonym [StreetCorner-UpperNarrower]     [name:streetcorneruppernarrower]   [features=default]
-    \definefontsynonym [StreetCorner-UpperOblique]      [name:streetcornerupperoblique]    [features=default]
-\stoptypescript
-
-% Usenet
-
-\starttypescript [serif] [usenet]
-    \definefontsynonym [Usenet-Regular]      [name:usenet]           [features=default]
-    \definefontsynonym [Usenet-Alternatives] [name:usenetalternates] [features=default]
-\stoptypescript
-
-% Youthanasia
-
-\starttypescript [sans] [youthanasia]
-    \definefontsynonym [Youthanasia-Regular] [name:youthanasia]       [features=default]
-    \definefontsynonym [Youthanasia-Italic]  [name:youthanasiaitalic] [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
deleted file mode 100644
index 38ff74986c0..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
+++ /dev/null
@@ -1,251 +0,0 @@
-%D \module
-%D   [     file=type-apostrophiclab,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Apostrophic Laboratories Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Devroye
-
-\starttypescript [serif] [devroye]
-    \setups[font:falback:serif]
-    \definefontsynonym [Serif] [Devroye-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [devroye]
-    \definetypeface [devroye] [rm] [serif] [devroye] [default]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Komikaze
-
-\starttypescript [sans] [komikaze]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Komikaze-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [komikaze]
-    \definetypeface [komikaze] [ss] [sans] [komikaze] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Labrit
-
-\starttypescript [serif] [labrit]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Labrit-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [labrit]
-    \definetypeface [labrit] [rm] [serif] [labrit] [default]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Usenet
-
-\starttypescript [serif] [usenet]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Usenet-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [usenet]
-    \definetypeface [usenet] [rm] [serif] [usenet] [default]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Zebrra
-
-\starttypescript [serif] [zebrra]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Zebrra-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [zebrra]
-    \definetypeface [zebrra] [rm] [serif] [zebrra] [default]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index 722c80306c4..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
+++ /dev/null
@@ -1,505 +0,0 @@
-%D \module
-%D   [     file=type-arkandis,
-%D      version=2010.08.03,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Arkandis Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [arkandis]
-
-% Accanthis
-
-\starttypescript [\s!serif] [accanthis]
-    \definefontsynonym [Accanthis-Regular]    [\s!file:AccanthisADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Accanthis-Italic]     [\s!file:AccanthisADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Accanthis-Bold]       [\s!file:AccanthisADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Accanthis-BoldItalic] [\s!file:AccanthisADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Accanthis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Accanthis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Accanthis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Accanthis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis]
-    \definetypeface [accanthis] [rm] [\s!serif] [accanthis] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Accanthis No2
-
-\starttypescript [\s!serif] [accanthis-two]
-    \definefontsynonym [AccanthisTwo-Regular]    [\s!file:AccanthisADFStdNo2-Regular]    [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-Italic]     [\s!file:AccanthisADFStdNo2-Italic]     [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-Bold]       [\s!file:AccanthisADFStdNo2-Bold]       [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-BoldItalic] [\s!file:AccanthisADFStdNo2-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis-two]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [AccanthisTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [AccanthisTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [AccanthisTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [AccanthisTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis-two]
-    \definetypeface [accanthis-two] [rm] [\s!serif] [accanthis-two] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Accanthis No3
-
-\starttypescript [\s!serif] [accanthis-three]
-    \definefontsynonym [AccanthisThree-Regular]    [\s!file:AccanthisADFStdNo3-Regular]    [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-Italic]     [\s!file:AccanthisADFStdNo3-Italic]     [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-Bold]       [\s!file:AccanthisADFStdNo3-Bold]       [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-BoldItalic] [\s!file:AccanthisADFStdNo3-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis-three]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [AccanthisThree-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [AccanthisThree-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [AccanthisThree-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [AccanthisThree-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis-three]
-    \definetypeface [accanthis-three] [rm] [\s!serif] [accanthis-three] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Baskervald
-
-\starttypescript [\s!serif] [baskervald]
-    \definefontsynonym [Baskervald-Regular]     [\s!file:BaskervaldADFStd-Regular]      [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Italic]      [\s!file:BaskervaldADFStd-Italic]       [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Bold]        [\s!file:BaskervaldADFStd-Bold]         [\s!features=\s!default]
-    \definefontsynonym [Baskervald-BoldItalic]  [\s!file:BaskervaldADFStd-BoldItalic]   [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Heavy]       [\s!file:BaskervaldADFStdHeavy]         [\s!features=\s!default]
-    \definefontsynonym [Baskervald-HeavyItalic] [\s!file:BaskervaldADFStdHeavy-Oblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [baskervald]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Baskervald-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Baskervald-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Baskervald-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Baskervald-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [baskervald]
-    \definetypeface [baskervald] [rm] [\s!serif] [baskervald] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Berenis
-
-\starttypescript [\s!serif] [berenis]
-    \definefontsynonym [Berenis-Condensed]        [\s!file:BerenisADFCd-Book]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-ItalicCond]       [\s!file:BerenisADFCd-Italic]      [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldCond]         [\s!file:BerenisADFCd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldItalicCond]   [\s!file:BerenisADFCd-BoldItalic]  [\s!features=\s!default]
-    \definefontsynonym [Berenis-Regular]          [\s!file:BerenisADF-Book]          [\s!features=\s!default]
-    \definefontsynonym [Berenis-Italic]           [\s!file:BerenisADF-Italic]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-Medium]           [\s!file:BerenisADFMed-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumItalic]     [\s!file:BerenisADFMed-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumBold]       [\s!file:BerenisADFMed-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumBoldItalic] [\s!file:BerenisADFMed-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Berenis-Bold]             [\s!file:BerenisADF-Bold]          [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldItalic]       [\s!file:BerenisADF-BoldItalic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [berenis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Berenis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Berenis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Berenis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Berenis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [berenis]
-    \definetypeface [berenis] [rm] [\s!serif] [berenis] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Berenis No2
-
-\starttypescript [\s!serif] [berenis-two]
-    \definefontsynonym [BerenisTwo-Condensed]      [\s!file:BerenisADFNo2Cd-Book]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-ItalicCond]     [\s!file:BerenisADFNo2Cd-Italic]      [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldCond]       [\s!file:BerenisADFNo2Cd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldItalicCond] [\s!file:BerenisADFNo2Cd-BoldItalic]  [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Regular]        [\s!file:BerenisADFNo2-Book]          [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Italic]         [\s!file:BerenisADFNo2-Italic]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Bold]           [\s!file:BerenisADFNo2-Bold]          [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldItalic]     [\s!file:BerenisADFNo2-BoldItalic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [berenis-two]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [BerenisTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [BerenisTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [BerenisTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [BerenisTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [berenis-two]
-    \definetypeface [berenis-two] [rm] [\s!serif] [berenis-two] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Gillius ADF
-
-\starttypescript [\s!sans] [gillius]
-    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [\s!features=\s!default]
-    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [\s!features=\s!default]
-    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [\s!features=\s!default]
-    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [gillius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Gillius-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Gillius-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Gillius-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Gillius-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [gillius]
-    \definetypeface [gillius] [ss] [\s!sans] [gillius] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Gillius No2
-
-\starttypescript [\s!sans] [gillius-two]
-    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [gillius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GilliusTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [GilliusTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [GilliusTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [GilliusTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [gillius-two]
-    \definetypeface [gillius-two] [ss] [\s!sans] [gillius-two] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Ikarius
-
-\starttypescript [\s!sans] [ikarius]
-    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [ikarius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Ikarius-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Ikarius-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Ikarius-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Ikarius-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [ikarius]
-    \definetypeface [ikarius] [ss] [\s!sans] [ikarius] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Ikarius No2
-
-\starttypescript [\s!sans] [ikarius-two]
-    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [ikarius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [IkariusTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [IkariusTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [IkariusTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [IkariusTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [ikarius-two]
-    \definetypeface [ikarius-two] [ss] [\s!sans] [ikarius-two] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Irianis
-
-\starttypescript [\s!serif] [irianis]
-    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [irianis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Irianis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Irianis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Irianis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Irianis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [irianis]
-    \definetypeface [irianis] [rm] [\s!serif] [irianis] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Libris
-
-\starttypescript [\s!sans] [libris]
-    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [libris]
-    \definefontsynonym [Sans]           [Libris-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Libris-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Libris-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Libris-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [libris]
-    \definetypeface [libris] [ss] [\s!sans] [libris] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Mekanus
-
-\starttypescript [\s!serif] [mekanus]
-    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [mekanus]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Mekanus-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Mekanus-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Mekanus-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Mekanus-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [mekanus]
-    \definetypeface [mekanus] [rm] [\s!serif] [mekanus] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Romande
-
-\starttypescript [\s!serif] [romande]
-    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [\s!features=\s!default]
-    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [\s!features=\s!default]
-    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [\s!features=\s!default]
-    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [\s!features=\s!default]
-    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [\s!features=\s!default]
-    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [romande]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Romande-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Romande-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Romande-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Romande-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [SerifCaps]       [Romande-Smallcaps]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [romande]
-    \definetypeface [romande] [rm] [\s!serif] [romande] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Switzera
-
-\starttypescript [\s!sans] [switzera]
-    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [\s!features=\s!default]
-    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [\s!features=\s!default]
-    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [\s!features=\s!default]
-    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [switzera]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Switzera-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Switzera-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Switzera-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Switzera-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [switzera]
-    \definetypeface [switzera] [ss] [\s!sans] [switzera] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Tribun
-
-\starttypescript [\s!serif] [tribun]
-    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [\s!features=\s!default]
-    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [\s!features=\s!default]
-    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [\s!features=\s!default]
-    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [tribun]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Tribun-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Tribun-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Tribun-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Tribun-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [tribun]
-    \definetypeface [tribun] [rm] [\s!serif] [tribun] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Universalis
-
-\starttypescript [\s!sans] [universalis]
-    \definefontsynonym [Universalis-Condensed]      [\s!file:UniversalisADFCdStd-Regular]   [\s!features=\s!default]
-    \definefontsynonym [Universalis-ItalicCond]     [\s!file:UniversalisADFCdStd-Oblique]   [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldCond]       [\s!file:UniversalisADFCdStd-Bold]      [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldItalicCond] [\s!file:UniversalisADFCdStd-BdOblique] [\s!features=\s!default]
-    \definefontsynonym [Universalis-Regular]        [\s!file:UniversalisADFStd-Regular]     [\s!features=\s!default]
-    \definefontsynonym [Universalis-Italic]         [\s!file:UniversalisADFStd-Oblique]     [\s!features=\s!default]
-    \definefontsynonym [Universalis-Bold]           [\s!file:UniversalisADFStd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldItalic]     [\s!file:UniversalisADFStd-BoldOblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [universalis]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Universalis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Universalis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Universalis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Universalis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [universalis]
-    \definetypeface [universalis] [ss] [\s!sans] [universalis] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Verana
-
-\starttypescript [\s!serif] [verana]
-    \definefontsynonym [Verana-Regular]    [\s!file:Verana-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Verana-Italic]     [\s!file:Verana-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Verana-Bold]       [\s!file:Verana-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Verana-BoldItalic] [\s!file:Verana-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [verana]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Verana-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Verana-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Verana-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Verana-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [verana]
-    \definefontsynonym [VeranaSans-Regular]      [\s!file:VeranaSans-Regular]       [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Italic]       [\s!file:VeranaSans-Oblique]       [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Bold]         [\s!file:VeranaSans-Bold]          [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-BoldItalic]   [\s!file:VeranaSans-BoldOblique]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Demi]         [\s!file:VeranaSansDemi-Regular]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-DemiItalic]   [\s!file:VeranaSansDemi-Oblique]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Medium]       [\s!file:VeranaSansMedium-Regular] [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-MediumItalic] [\s!file:VeranaSansMedium-Oblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [verana]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [VeranaSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [VeranaSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [VeranaSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [VeranaSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [verana]
-    \definetypeface [verana] [rm] [\s!serif] [verana] [\s!default]
-    \definetypeface [verana] [ss] [\s!sans]  [verana] [\s!default]
-    \definetypeface [verana] [tt] [\s!mono]  [modern] [\s!default]
-    \definetypeface [verana] [nn] [\s!math]  [modern] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 722c80306c4..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
+++ /dev/null
@@ -1,505 +0,0 @@
-%D \module
-%D   [     file=type-arkandis,
-%D      version=2010.08.03,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Arkandis Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [arkandis]
-
-% Accanthis
-
-\starttypescript [\s!serif] [accanthis]
-    \definefontsynonym [Accanthis-Regular]    [\s!file:AccanthisADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Accanthis-Italic]     [\s!file:AccanthisADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Accanthis-Bold]       [\s!file:AccanthisADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Accanthis-BoldItalic] [\s!file:AccanthisADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Accanthis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Accanthis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Accanthis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Accanthis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis]
-    \definetypeface [accanthis] [rm] [\s!serif] [accanthis] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Accanthis No2
-
-\starttypescript [\s!serif] [accanthis-two]
-    \definefontsynonym [AccanthisTwo-Regular]    [\s!file:AccanthisADFStdNo2-Regular]    [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-Italic]     [\s!file:AccanthisADFStdNo2-Italic]     [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-Bold]       [\s!file:AccanthisADFStdNo2-Bold]       [\s!features=\s!default]
-    \definefontsynonym [AccanthisTwo-BoldItalic] [\s!file:AccanthisADFStdNo2-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis-two]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [AccanthisTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [AccanthisTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [AccanthisTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [AccanthisTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis-two]
-    \definetypeface [accanthis-two] [rm] [\s!serif] [accanthis-two] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Accanthis No3
-
-\starttypescript [\s!serif] [accanthis-three]
-    \definefontsynonym [AccanthisThree-Regular]    [\s!file:AccanthisADFStdNo3-Regular]    [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-Italic]     [\s!file:AccanthisADFStdNo3-Italic]     [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-Bold]       [\s!file:AccanthisADFStdNo3-Bold]       [\s!features=\s!default]
-    \definefontsynonym [AccanthisThree-BoldItalic] [\s!file:AccanthisADFStdNo3-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [accanthis-three]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [AccanthisThree-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [AccanthisThree-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [AccanthisThree-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [AccanthisThree-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [accanthis-three]
-    \definetypeface [accanthis-three] [rm] [\s!serif] [accanthis-three] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Baskervald
-
-\starttypescript [\s!serif] [baskervald]
-    \definefontsynonym [Baskervald-Regular]     [\s!file:BaskervaldADFStd-Regular]      [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Italic]      [\s!file:BaskervaldADFStd-Italic]       [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Bold]        [\s!file:BaskervaldADFStd-Bold]         [\s!features=\s!default]
-    \definefontsynonym [Baskervald-BoldItalic]  [\s!file:BaskervaldADFStd-BoldItalic]   [\s!features=\s!default]
-    \definefontsynonym [Baskervald-Heavy]       [\s!file:BaskervaldADFStdHeavy]         [\s!features=\s!default]
-    \definefontsynonym [Baskervald-HeavyItalic] [\s!file:BaskervaldADFStdHeavy-Oblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [baskervald]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Baskervald-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Baskervald-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Baskervald-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Baskervald-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [baskervald]
-    \definetypeface [baskervald] [rm] [\s!serif] [baskervald] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Berenis
-
-\starttypescript [\s!serif] [berenis]
-    \definefontsynonym [Berenis-Condensed]        [\s!file:BerenisADFCd-Book]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-ItalicCond]       [\s!file:BerenisADFCd-Italic]      [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldCond]         [\s!file:BerenisADFCd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldItalicCond]   [\s!file:BerenisADFCd-BoldItalic]  [\s!features=\s!default]
-    \definefontsynonym [Berenis-Regular]          [\s!file:BerenisADF-Book]          [\s!features=\s!default]
-    \definefontsynonym [Berenis-Italic]           [\s!file:BerenisADF-Italic]        [\s!features=\s!default]
-    \definefontsynonym [Berenis-Medium]           [\s!file:BerenisADFMed-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumItalic]     [\s!file:BerenisADFMed-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumBold]       [\s!file:BerenisADFMed-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Berenis-MediumBoldItalic] [\s!file:BerenisADFMed-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Berenis-Bold]             [\s!file:BerenisADF-Bold]          [\s!features=\s!default]
-    \definefontsynonym [Berenis-BoldItalic]       [\s!file:BerenisADF-BoldItalic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [berenis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Berenis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Berenis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Berenis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Berenis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [berenis]
-    \definetypeface [berenis] [rm] [\s!serif] [berenis] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Berenis No2
-
-\starttypescript [\s!serif] [berenis-two]
-    \definefontsynonym [BerenisTwo-Condensed]      [\s!file:BerenisADFNo2Cd-Book]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-ItalicCond]     [\s!file:BerenisADFNo2Cd-Italic]      [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldCond]       [\s!file:BerenisADFNo2Cd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldItalicCond] [\s!file:BerenisADFNo2Cd-BoldItalic]  [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Regular]        [\s!file:BerenisADFNo2-Book]          [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Italic]         [\s!file:BerenisADFNo2-Italic]        [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-Bold]           [\s!file:BerenisADFNo2-Bold]          [\s!features=\s!default]
-    \definefontsynonym [BerenisTwo-BoldItalic]     [\s!file:BerenisADFNo2-BoldItalic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [berenis-two]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [BerenisTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [BerenisTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [BerenisTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [BerenisTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [berenis-two]
-    \definetypeface [berenis-two] [rm] [\s!serif] [berenis-two] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Gillius ADF
-
-\starttypescript [\s!sans] [gillius]
-    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [\s!features=\s!default]
-    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [\s!features=\s!default]
-    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [\s!features=\s!default]
-    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [\s!features=\s!default]
-    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [gillius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Gillius-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Gillius-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Gillius-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Gillius-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [gillius]
-    \definetypeface [gillius] [ss] [\s!sans] [gillius] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Gillius No2
-
-\starttypescript [\s!sans] [gillius-two]
-    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [\s!features=\s!default]
-    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [gillius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GilliusTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [GilliusTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [GilliusTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [GilliusTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [gillius-two]
-    \definetypeface [gillius-two] [ss] [\s!sans] [gillius-two] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Ikarius
-
-\starttypescript [\s!sans] [ikarius]
-    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [ikarius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Ikarius-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Ikarius-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Ikarius-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Ikarius-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [ikarius]
-    \definetypeface [ikarius] [ss] [\s!sans] [ikarius] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Ikarius No2
-
-\starttypescript [\s!sans] [ikarius-two]
-    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [\s!features=\s!default]
-    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [ikarius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [IkariusTwo-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [IkariusTwo-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [IkariusTwo-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [IkariusTwo-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [ikarius-two]
-    \definetypeface [ikarius-two] [ss] [\s!sans] [ikarius-two] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Irianis
-
-\starttypescript [\s!serif] [irianis]
-    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [irianis]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Irianis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Irianis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Irianis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Irianis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [irianis]
-    \definetypeface [irianis] [rm] [\s!serif] [irianis] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Libris
-
-\starttypescript [\s!sans] [libris]
-    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [libris]
-    \definefontsynonym [Sans]           [Libris-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Libris-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Libris-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Libris-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [libris]
-    \definetypeface [libris] [ss] [\s!sans] [libris] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Mekanus
-
-\starttypescript [\s!serif] [mekanus]
-    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [mekanus]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Mekanus-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Mekanus-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Mekanus-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Mekanus-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [mekanus]
-    \definetypeface [mekanus] [rm] [\s!serif] [mekanus] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Romande
-
-\starttypescript [\s!serif] [romande]
-    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [\s!features=\s!default]
-    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [\s!features=\s!default]
-    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [\s!features=\s!default]
-    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [\s!features=\s!default]
-    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [\s!features=\s!default]
-    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [romande]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Romande-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Romande-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Romande-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Romande-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [SerifCaps]       [Romande-Smallcaps]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [romande]
-    \definetypeface [romande] [rm] [\s!serif] [romande] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Switzera
-
-\starttypescript [\s!sans] [switzera]
-    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [\s!features=\s!default]
-    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [\s!features=\s!default]
-    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [\s!features=\s!default]
-    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [\s!features=\s!default]
-    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [\s!features=\s!default]
-    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [switzera]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Switzera-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Switzera-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Switzera-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Switzera-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [switzera]
-    \definetypeface [switzera] [ss] [\s!sans] [switzera] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Tribun
-
-\starttypescript [\s!serif] [tribun]
-    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [\s!features=\s!default]
-    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [\s!features=\s!default]
-    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [\s!features=\s!default]
-    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [\s!features=\s!default]
-    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [\s!features=\s!default]
-    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [tribun]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Tribun-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Tribun-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Tribun-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Tribun-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [tribun]
-    \definetypeface [tribun] [rm] [\s!serif] [tribun] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Universalis
-
-\starttypescript [\s!sans] [universalis]
-    \definefontsynonym [Universalis-Condensed]      [\s!file:UniversalisADFCdStd-Regular]   [\s!features=\s!default]
-    \definefontsynonym [Universalis-ItalicCond]     [\s!file:UniversalisADFCdStd-Oblique]   [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldCond]       [\s!file:UniversalisADFCdStd-Bold]      [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldItalicCond] [\s!file:UniversalisADFCdStd-BdOblique] [\s!features=\s!default]
-    \definefontsynonym [Universalis-Regular]        [\s!file:UniversalisADFStd-Regular]     [\s!features=\s!default]
-    \definefontsynonym [Universalis-Italic]         [\s!file:UniversalisADFStd-Oblique]     [\s!features=\s!default]
-    \definefontsynonym [Universalis-Bold]           [\s!file:UniversalisADFStd-Bold]        [\s!features=\s!default]
-    \definefontsynonym [Universalis-BoldItalic]     [\s!file:UniversalisADFStd-BoldOblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [universalis]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Universalis-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SansItalic]     [Universalis-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SansBold]       [Universalis-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SansBoldItalic] [Universalis-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [universalis]
-    \definetypeface [universalis] [ss] [\s!sans] [universalis] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Verana
-
-\starttypescript [\s!serif] [verana]
-    \definefontsynonym [Verana-Regular]    [\s!file:Verana-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Verana-Italic]     [\s!file:Verana-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Verana-Bold]       [\s!file:Verana-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Verana-BoldItalic] [\s!file:Verana-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [verana]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Verana-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Verana-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Verana-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Verana-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [verana]
-    \definefontsynonym [VeranaSans-Regular]      [\s!file:VeranaSans-Regular]       [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Italic]       [\s!file:VeranaSans-Oblique]       [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Bold]         [\s!file:VeranaSans-Bold]          [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-BoldItalic]   [\s!file:VeranaSans-BoldOblique]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Demi]         [\s!file:VeranaSansDemi-Regular]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-DemiItalic]   [\s!file:VeranaSansDemi-Oblique]   [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-Medium]       [\s!file:VeranaSansMedium-Regular] [\s!features=\s!default]
-    \definefontsynonym [VeranaSans-MediumItalic] [\s!file:VeranaSansMedium-Oblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [verana]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [VeranaSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [VeranaSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [VeranaSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [VeranaSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [verana]
-    \definetypeface [verana] [rm] [\s!serif] [verana] [\s!default]
-    \definetypeface [verana] [ss] [\s!sans]  [verana] [\s!default]
-    \definetypeface [verana] [tt] [\s!mono]  [modern] [\s!default]
-    \definetypeface [verana] [nn] [\s!math]  [modern] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkii
new file mode 100644
index 00000000000..f5eccdb9b93
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkii
@@ -0,0 +1,71 @@
+%D \module
+%D   [     file=type-audimat,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Audimat Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [audimat]
+
+\starttypescript [\s!sans] [audimat]
+    \definefontsynonym [Audimat-Regular]    [\s!file:AUdimat-Regular]    [\s!features=\s!default]
+    \definefontsynonym [Audimat-Italic]     [\s!file:AUdimat-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Audimat-Bold]       [\s!file:AUdimat-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Audimat-BoldItalic] [\s!file:AUdimat-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [audimat]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Audimat-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Audimat-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Audimat-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Audimat-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [audimat]
+    \definefontsynonym [AudimatMono-Light]       [\s!file:AUDIML__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-LightItalic] [\s!file:AUDIMLO_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-LightCaps]   [\s!file:AUDIMSCL] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Regular]     [\s!file:AUDIMRG_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Italic]      [\s!file:AUDIMO__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Smallcaps]   [\s!file:AUDIMSC_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Bold]        [\s!file:AUDIMB__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-BoldItalic]  [\s!file:AUDIMBO_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-BoldCaps]    [\s!file:AUDIMSCB] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [audimat]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [AudimatMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [AudimatMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [AudimatMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [AudimatMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [audimat]
+    \definetypeface [audimat] [ss] [\s!sans] [audimat] [\s!default]
+    \definetypeface [audimat] [tt] [\s!mono] [audimat] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkiv
new file mode 100644
index 00000000000..71dedfc11ee
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-audimat.mkiv
@@ -0,0 +1,71 @@
+%D \module
+%D   [     file=type-audimat,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Audimat Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [audimat]
+
+\starttypescript [\s!sans] [audimat]
+    \definefontsynonym [Audimat-Regular]    [\s!file:audimatregular]    [\s!features=\s!default]
+    \definefontsynonym [Audimat-Italic]     [\s!file:audimatitalic]     [\s!features=\s!default]
+    \definefontsynonym [Audimat-Bold]       [\s!file:audimatbold]       [\s!features=\s!default]
+    \definefontsynonym [Audimat-BoldItalic] [\s!file:audimatbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [audimat]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Audimat-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Audimat-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Audimat-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Audimat-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [audimat]
+    \definefontsynonym [AudimatMono-Light]       [\s!file:audiml__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-LightItalic] [\s!file:audimlo_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-LightCaps]   [\s!file:audimscl] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Regular]     [\s!file:audimrg_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Italic]      [\s!file:audimo__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Smallcaps]   [\s!file:audimsc_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-Bold]        [\s!file:audimb__] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-BoldItalic]  [\s!file:audimbo_] [\s!features=\s!default]
+    \definefontsynonym [AudimatMono-BoldCaps]    [\s!file:audimscb] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [audimat]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [AudimatMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [AudimatMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [AudimatMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [AudimatMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [audimat]
+    \definetypeface [audimat] [ss] [\s!sans] [audimat] [\s!default]
+    \definetypeface [audimat] [tt] [\s!mono] [audimat] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkii
new file mode 100644
index 00000000000..cde84402f2d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkii
@@ -0,0 +1,49 @@
+%D \module
+%D   [     file=type-axel,
+%D      version=2011.08.28,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Axel Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [axel]
+
+\starttypescript [\s!sans] [axel]
+    \definefontsynonym [Axel-Regular]  [\s!file:Axel-Regular]   [\s!features=\s!default]
+    \definefontsynonym [Axel-Bold]     [\s!file:Axel-Bold]      [\s!features=\s!default]
+    \definefontsynonym [Axel-Caps]     [\s!file:AxelSC-Regular] [\s!features=\s!default]
+    \definefontsynonym [Axel-BoldCaps] [\s!file:AxelSC-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [axel]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Axel-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Axel-Bold]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansCaps] [Axel-Caps]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [axel]
+    \definetypeface [axel] [ss] [\s!sans] [axel] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkiv
new file mode 100644
index 00000000000..f069f7cbbe4
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-axel.mkiv
@@ -0,0 +1,49 @@
+%D \module
+%D   [     file=type-axel,
+%D      version=2011.08.28,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Axel Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [axel]
+
+\starttypescript [\s!sans] [axel]
+    \definefontsynonym [Axel-Regular]  [\s!file:axelregular]   [\s!features=\s!default]
+    \definefontsynonym [Axel-Bold]     [\s!file:axelbold]      [\s!features=\s!default]
+    \definefontsynonym [Axel-Caps]     [\s!file:axelscregular] [\s!features=\s!default]
+    \definefontsynonym [Axel-BoldCaps] [\s!file:axelscbold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [axel]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Axel-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Axel-Bold]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansCaps] [Axel-Caps]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [axel]
+    \definetypeface [axel] [ss] [\s!sans] [axel] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkii
new file mode 100644
index 00000000000..87dca6e8b3a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkii
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-azuro,
+%D      version=2011.08.28,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Azuro Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [azuro]
+
+\starttypescript [\s!sans] [azuro]
+    \definefontsynonym [Azuro-Regular]    [\s!file:Azuro-Regular]    [\s!features=\s!default]
+    \definefontsynonym [Azuro-Italic]     [\s!file:Azuro-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Azuro-Bold]       [\s!file:Azuro-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Azuro-BoldItalic] [\s!file:Azuro-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [azuro]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Azuro-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Azuro-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Azuro-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Azuro-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [azuro]
+    \definetypeface [azuro] [ss] [\s!sans] [azuro] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkiv
new file mode 100644
index 00000000000..8cc012d918e
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-azuro.mkiv
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-azuro,
+%D      version=2011.08.28,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Azuro Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [azuro]
+
+\starttypescript [\s!sans] [azuro]
+    \definefontsynonym [Azuro-Regular]    [\s!file:azuroregular]    [\s!features=\s!default]
+    \definefontsynonym [Azuro-Italic]     [\s!file:azuroitalic]     [\s!features=\s!default]
+    \definefontsynonym [Azuro-Bold]       [\s!file:azurobold]       [\s!features=\s!default]
+    \definefontsynonym [Azuro-BoldItalic] [\s!file:azurobolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [azuro]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Azuro-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Azuro-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Azuro-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Azuro-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [azuro]
+    \definetypeface [azuro] [ss] [\s!sans] [azuro] [\s!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
deleted file mode 100644
index 2e8b710c605..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
+++ /dev/null
@@ -1,88 +0,0 @@
-%D \module
-%D   [     file=type-baar,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Baar Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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 [\s!sans] [metanoia]
-    \definefontsynonym [Metanoia-Regular]    [\s!file:baarmrg_] [features=default]
-    \definefontsynonym [Metanoia-Italic]     [\s!file:baarmi__] [features=default]
-    \definefontsynonym [Metanoia-Bold]       [\s!file:baarmb__] [features=default]
-    \definefontsynonym [Metanoia-BoldItalic] [\s!file:baarmbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [metanoia]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Metanoia-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Metanoia-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Metanoia-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Metanoia-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [philos]
-    \definefontsynonym [Philos-Regular]    [\s!file:baarprg_] [features=default]
-    \definefontsynonym [Philos-Italic]     [\s!file:baarpi__] [features=default]
-    \definefontsynonym [Philos-Bold]       [\s!file:baarpb__] [features=default]
-    \definefontsynonym [Philos-BoldItalic] [\s!file:baarpbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [philos]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Philos-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Philos-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Philos-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Philos-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [sophia]
-    \definefontsynonym [Sophia-Regular]    [\s!file:baarsrg_] [features=default]
-    \definefontsynonym [Sophia-Italic]     [\s!file:baarsi__] [features=default]
-    \definefontsynonym [Sophia-Bold]       [\s!file:baarsb__] [features=default]
-    \definefontsynonym [Sophia-BoldItalic] [\s!file:baarsbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [sophia]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Sophia-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Sophia-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Sophia-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Sophia-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [metanoia,philos,sophia]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 2e8b710c605..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
+++ /dev/null
@@ -1,88 +0,0 @@
-%D \module
-%D   [     file=type-baar,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Baar Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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 [\s!sans] [metanoia]
-    \definefontsynonym [Metanoia-Regular]    [\s!file:baarmrg_] [features=default]
-    \definefontsynonym [Metanoia-Italic]     [\s!file:baarmi__] [features=default]
-    \definefontsynonym [Metanoia-Bold]       [\s!file:baarmb__] [features=default]
-    \definefontsynonym [Metanoia-BoldItalic] [\s!file:baarmbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [metanoia]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Metanoia-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Metanoia-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Metanoia-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Metanoia-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [philos]
-    \definefontsynonym [Philos-Regular]    [\s!file:baarprg_] [features=default]
-    \definefontsynonym [Philos-Italic]     [\s!file:baarpi__] [features=default]
-    \definefontsynonym [Philos-Bold]       [\s!file:baarpb__] [features=default]
-    \definefontsynonym [Philos-BoldItalic] [\s!file:baarpbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [philos]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Philos-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Philos-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Philos-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Philos-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [sophia]
-    \definefontsynonym [Sophia-Regular]    [\s!file:baarsrg_] [features=default]
-    \definefontsynonym [Sophia-Italic]     [\s!file:baarsi__] [features=default]
-    \definefontsynonym [Sophia-Bold]       [\s!file:baarsb__] [features=default]
-    \definefontsynonym [Sophia-BoldItalic] [\s!file:baarsbi_] [features=default]
-\stoptypescript
-
-\starttypescript [\s!sans] [sophia]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Sophia-Regular]    [features=default]
-    \definefontsynonym [\s!SansItalic]     [Sophia-Italic]     [features=default]
-    \definefontsynonym [\s!SansBold]       [Sophia-Bold]       [features=default]
-    \definefontsynonym [\s!SansBoldItalic] [Sophia-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [metanoia,philos,sophia]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 896612212f6..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
+++ /dev/null
@@ -1,79 +0,0 @@
-%D \module
-%D   [     file=type-bera,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Bera Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [bera]
-
-\starttypescript [\s!serif] [bera]
-    \definefontsynonym [BeraSerif-Regular] [\s!name:BeraSerif-Roman] [\s!features=\s!default]
-    \definefontsynonym [BeraSerif-Bold]    [\s!name:BeraSerif-Bold]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [bera]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]     [BeraSerif-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold] [BeraSerif-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [bera]
-    \definefontsynonym [BeraSans-Regular]    [\s!name:BeraSans-Roman]       [\s!features=\s!default]
-    \definefontsynonym [BeraSans-Italic]     [\s!name:BeraSans-Oblique]     [\s!features=\s!default]
-    \definefontsynonym [BeraSans-Bold]       [\s!name:BeraSans-Bold]        [\s!features=\s!default]
-    \definefontsynonym [BeraSans-BoldItalic] [\s!name:BeraSans-BoldOblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [bera]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [BeraSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [BeraSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [BeraSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [BeraSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [bera]
-    \definefontsynonym [BeraSansMono-Regular]    [\s!name:BeraSansMono-Roman]   [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-Italic]     [\s!name:BeraSansMono-Oblique] [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-Bold]       [\s!name:BeraSansMono-Bold]    [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-BoldItalic] [\s!name:BeraSansMono-BoldOb]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [bera]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [BeraSansMono-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [BeraSansMono-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [BeraSansMono-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [BeraSansMono-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [bera]
-    \definetypeface [bera] [rm] [\s!serif] [bera]   [\s!default]
-    \definetypeface [bera] [ss] [\s!sans]  [bera]   [\s!default]
-    \definetypeface [bera] [tt] [\s!mono]  [bera]   [\s!default]
-    \definetypeface [bera] [mm] [\s!math]  [modern] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 0e3eed3bb51..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
+++ /dev/null
@@ -1,79 +0,0 @@
-%D \module
-%D   [     file=type-bera,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Bera Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [bera]
-
-\starttypescript [\s!serif] [bera]
-    \definefontsynonym [BeraSerif-Regular] [\s!name:beraserifroman] [\s!features=\s!default]
-    \definefontsynonym [BeraSerif-Bold]    [\s!name:beraserifbold]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [bera]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]     [BeraSerif-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold] [BeraSerif-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [bera]
-    \definefontsynonym [BeraSans-Regular]    [\s!name:berasansroman]       [\s!features=\s!default]
-    \definefontsynonym [BeraSans-Italic]     [\s!name:berasansoblique]     [\s!features=\s!default]
-    \definefontsynonym [BeraSans-Bold]       [\s!name:berasansbold]        [\s!features=\s!default]
-    \definefontsynonym [BeraSans-BoldItalic] [\s!name:berasansboldoblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [bera]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [BeraSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [BeraSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [BeraSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [BeraSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [bera]
-    \definefontsynonym [BeraSansMono-Regular]    [\s!name:berasansmonoroman]   [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-Italic]     [\s!name:berasansmonooblique] [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-Bold]       [\s!name:berasansmonobold]    [\s!features=\s!default]
-    \definefontsynonym [BeraSansMono-BoldItalic] [\s!name:berasansmonoboldob]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [bera]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [BeraSansMono-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [BeraSansMono-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [BeraSansMono-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [BeraSansMono-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [bera]
-    \definetypeface [bera] [rm] [\s!serif] [bera]   [\s!default]
-    \definetypeface [bera] [ss] [\s!sans]  [bera]   [\s!default]
-    \definetypeface [bera] [tt] [\s!mono]  [bera]   [\s!default]
-    \definetypeface [bera] [mm] [\s!math]  [modern] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 7c397fc1142..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
+++ /dev/null
@@ -1,133 +0,0 @@
-%D \module
-%D   [     file=type-cmu,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Computer Modern Unicode Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [computer-modern-unicode]
-
-\starttypescript [\s!serif,\s!sans,\s!mono] [computer-modern-unicode]
-    \definefontsynonym [CMUSerif-Regular]             [\s!file:cmunrm]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Italic]              [\s!file:cmunti]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Slanted]             [\s!file:cmunsl]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Bold]                [\s!file:cmunbx]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-BoldItalic]          [\s!file:cmunbi]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-BoldNonextended]     [\s!file:cmunrb]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-BoldSlanted]         [\s!file:cmunbl]   [\s!features=\s!default]
-    \definefontsynonym [SMCSerif-ExtraBold]           [\s!file:cmunrb]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-UprightItalic]       [\s!file:cmunui]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Regular]              [\s!file:cmunss]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Italic]               [\s!file:cmunsi]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Bold]                 [\s!file:cmunsx]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-BoldItalic]           [\s!file:cmunso]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Condensed]            [\s!file:cmunssdc] [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Light]          [\s!file:cmunbtl]  [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-LightSlanted]   [\s!file:cmunbto]  [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Regular]        [\s!file:cmuntt]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Italic]         [\s!file:cmunit]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Slanted]        [\s!file:cmunst]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Bold]           [\s!file:cmuntb]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-BoldItalic]     [\s!file:cmuntx]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Variable]       [\s!file:cmunvt]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-VariableItalic] [\s!file:cmunvi]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [CMUSerif-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [CMUSerif-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [CMUSerif-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [CMUSerif-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [CMUSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [CMUSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [CMUSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [CMUSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [CMUTypewriter-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [CMUTypewriter-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [CMUTypewriter-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [CMUTypewriter-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [computer-modern-unicode,cmu]
-    \definetypeface [\typescriptone] [rm] [\s!serif] [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [ss] [\s!sans]  [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [tt] [\s!mono]  [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [mm] [\s!math]  [modern]                  [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\starttypescript [\s!sans] [cmu-bright]
-    \definefontsynonym [CMUBright-Roman]          [\s!file:cmunbmr] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-Italic]         [\s!file:cmunbmo] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-Bold]           [\s!file:cmunbbx] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-BoldItalic]     [\s!file:cmunbxo] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-SemiBold]       [\s!file:cmunbsr] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-SemiBoldItalic] [\s!file:cmunbso] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [cmu-bright]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [CMUBright-Roman]      [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [CMUBright-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [CMUBright-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [CMUBright-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [cmu-bright]
-    \definetypeface [cmu-bright] [ss] [\s!sans] [cmu-bright] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\starttypescript [\s!serif] [cmu-concrete]
-    \definefontsynonym [CMUConcrete-Roman]      [\s!file:cmunorm] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-Ialic]      [\s!file:cmunoti] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-Bold]       [\s!file:cmunobx] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-BoldItalic] [\s!file:cmunobi] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [cmu-concrete]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [Serif]           [CMUConcrete-Roman]      [\s!features=\s!default]
-    \definefontsynonym [SerifItalic]     [CMUConcrete-Ialic]      [\s!features=\s!default]
-    \definefontsynonym [SerifBold]       [CMUConcrete-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SerifBoldItalic] [CMUConcrete-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [cmu-concrete]
-    \definetypeface [cmu-concrete] [rm] [\s!serif] [cmu-concrete]            [\s!default]
-    \definetypeface [cmu-concrete] [ss] [\s!sans]  [computer-modern-unicode] [\s!default]
-    \definetypeface [cmu-concrete] [tt] [\s!mono]  [computer-modern-unicode] [\s!default]
-    \definetypeface [cmu-concrete] [mm] [\s!math]  [modern]                  [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 7c397fc1142..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
+++ /dev/null
@@ -1,133 +0,0 @@
-%D \module
-%D   [     file=type-cmu,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Computer Modern Unicode Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [computer-modern-unicode]
-
-\starttypescript [\s!serif,\s!sans,\s!mono] [computer-modern-unicode]
-    \definefontsynonym [CMUSerif-Regular]             [\s!file:cmunrm]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Italic]              [\s!file:cmunti]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Slanted]             [\s!file:cmunsl]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-Bold]                [\s!file:cmunbx]   [\s!features=\s!default]
-    \definefontsynonym [CMUSerif-BoldItalic]          [\s!file:cmunbi]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-BoldNonextended]     [\s!file:cmunrb]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-BoldSlanted]         [\s!file:cmunbl]   [\s!features=\s!default]
-    \definefontsynonym [SMCSerif-ExtraBold]           [\s!file:cmunrb]   [\s!features=\s!default]
-    \definefontsynonym [CMSUerif-UprightItalic]       [\s!file:cmunui]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Regular]              [\s!file:cmunss]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Italic]               [\s!file:cmunsi]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Bold]                 [\s!file:cmunsx]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-BoldItalic]           [\s!file:cmunso]   [\s!features=\s!default]
-    \definefontsynonym [CMUSans-Condensed]            [\s!file:cmunssdc] [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Light]          [\s!file:cmunbtl]  [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-LightSlanted]   [\s!file:cmunbto]  [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Regular]        [\s!file:cmuntt]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Italic]         [\s!file:cmunit]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Slanted]        [\s!file:cmunst]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Bold]           [\s!file:cmuntb]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-BoldItalic]     [\s!file:cmuntx]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-Variable]       [\s!file:cmunvt]   [\s!features=\s!default]
-    \definefontsynonym [CMUTypewriter-VariableItalic] [\s!file:cmunvi]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [CMUSerif-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [CMUSerif-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [CMUSerif-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [CMUSerif-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [CMUSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [CMUSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [CMUSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [CMUSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [computer-modern-unicode]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [CMUTypewriter-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [CMUTypewriter-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [CMUTypewriter-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [CMUTypewriter-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [computer-modern-unicode,cmu]
-    \definetypeface [\typescriptone] [rm] [\s!serif] [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [ss] [\s!sans]  [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [tt] [\s!mono]  [computer-modern-unicode] [\s!default]
-    \definetypeface [\typescriptone] [mm] [\s!math]  [modern]                  [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\starttypescript [\s!sans] [cmu-bright]
-    \definefontsynonym [CMUBright-Roman]          [\s!file:cmunbmr] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-Italic]         [\s!file:cmunbmo] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-Bold]           [\s!file:cmunbbx] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-BoldItalic]     [\s!file:cmunbxo] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-SemiBold]       [\s!file:cmunbsr] [\s!features=\s!default]
-    \definefontsynonym [CMUBright-SemiBoldItalic] [\s!file:cmunbso] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [cmu-bright]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [CMUBright-Roman]      [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [CMUBright-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [CMUBright-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [CMUBright-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [cmu-bright]
-    \definetypeface [cmu-bright] [ss] [\s!sans] [cmu-bright] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\starttypescript [\s!serif] [cmu-concrete]
-    \definefontsynonym [CMUConcrete-Roman]      [\s!file:cmunorm] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-Ialic]      [\s!file:cmunoti] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-Bold]       [\s!file:cmunobx] [\s!features=\s!default]
-    \definefontsynonym [CMUConcrete-BoldItalic] [\s!file:cmunobi] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [cmu-concrete]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [Serif]           [CMUConcrete-Roman]      [\s!features=\s!default]
-    \definefontsynonym [SerifItalic]     [CMUConcrete-Ialic]      [\s!features=\s!default]
-    \definefontsynonym [SerifBold]       [CMUConcrete-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SerifBoldItalic] [CMUConcrete-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [cmu-concrete]
-    \definetypeface [cmu-concrete] [rm] [\s!serif] [cmu-concrete]            [\s!default]
-    \definetypeface [cmu-concrete] [ss] [\s!sans]  [computer-modern-unicode] [\s!default]
-    \definetypeface [cmu-concrete] [tt] [\s!mono]  [computer-modern-unicode] [\s!default]
-    \definetypeface [cmu-concrete] [mm] [\s!math]  [modern]                  [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 0e530935e28..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
+++ /dev/null
@@ -1,109 +0,0 @@
-%D \module
-%D   [     file=type-dejavu,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=DejaVu Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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/}
-
-\starttypescript [\s!serif] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSerif-Regular]        [\s!file:DejaVuSerif]                     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-Italic]         [\s!file:DejaVuSerif-Italic]              [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-Bold]           [\s!file:DejaVuSerif-Bold]                [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-BoldItalic]     [\s!file:DejaVuSerif-BoldItalic]          [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Regular]    [\s!file:DejaVuSerifCondensed]            [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Bold]       [\s!file:DejaVuSerifCondensed-Bold]       [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Italic]     [\s!file:DejaVuSerifCondensed-Italic]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-BoldItalic] [\s!file:DejaVuSerifCondensed-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [dejavu]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Serif]           [DejaVuSerif-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [DejaVuSerif-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [DejaVuSerif-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [DejaVuSerif-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [dejavu-cond]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Serif]           [DejaVuSerifCond-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [DejaVuSerifCond-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [DejaVuSerifCond-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [DejaVuSerifCond-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSans-Regular]        [\s!file:DejaVuSans]                      [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-Italic]         [\s!file:DejaVuSans-Oblique]              [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-Bold]           [\s!file:DejaVuSans-Bold]                 [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-BoldItalic]     [\s!file:DejaVuSans-BoldOblique]          [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Regular]    [\s!file:DejaVuSansCondensed]             [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Bold]       [\s!file:DejaVuSansCondensed-Bold]        [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Italic]     [\s!file:DejaVuSansCondensed-Oblique]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-BoldItalic] [\s!file:DejaVuSansCondensed-BoldOblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [DejaVuSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [DejaVuSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [DejaVuSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [DejaVuSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu-cond]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [DejaVuSansCond-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [DejaVuSansCond-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [DejaVuSansCond-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [DejaVuSansCond-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [dejavu]
-    \definefontsynonym [DejaVuMono-Regular]    [\s!file:DejaVuSansMono]             [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-Italic]     [\s!file:DejaVuSansMono-Oblique]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-Bold]       [\s!file:DejaVuSansMono-Bold]        [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-BoldItalic] [\s!file:DejaVuSansMono-BoldOblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [dejavu]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [DejaVuMono-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [DejaVuMono-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [DejaVuMono-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [DejaVuMono-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [dejavu,dejavu-cond]
-    \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
-    \definetypeface [\typescriptone] [ss] [\s!sans]  [\typescriptone] [\s!default]
-    \definetypeface [\typescriptone] [tt] [\s!mono]  [dejavu]         [\s!default]
-    \definetypeface [\typescriptone] [mm] [\s!math]  [palatino]       [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 28e8b668755..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
+++ /dev/null
@@ -1,109 +0,0 @@
-%D \module
-%D   [     file=type-dejavu,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=DejaVu Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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/}
-
-\starttypescript [\s!serif] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSerif-Regular]        [\s!file:dejavuserif]                    [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-Italic]         [\s!file:dejavuserifitalic]              [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-Bold]           [\s!file:dejavuserifbold]                [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerif-BoldItalic]     [\s!file:dejavuserifbolditalic]          [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Regular]    [\s!file:dejavuserifcondensed]           [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Bold]       [\s!file:dejavuserifcondensedbold]       [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-Italic]     [\s!file:dejavuserifcondenseditalic]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSerifCond-BoldItalic] [\s!file:dejavuserifcondensedbolditalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [dejavu]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Serif]           [DejaVuSerif-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [DejaVuSerif-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [DejaVuSerif-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [DejaVuSerif-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [dejavu-cond]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Serif]           [DejaVuSerifCond-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [DejaVuSerifCond-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [DejaVuSerifCond-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [DejaVuSerifCond-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSans-Regular]        [\s!file:dejavusans]                     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-Italic]         [\s!file:dejavusansoblique]              [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-Bold]           [\s!file:dejavusansbold]                 [\s!features=\s!default]
-    \definefontsynonym [DejaVuSans-BoldItalic]     [\s!file:dejavusansboldoblique]          [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Regular]    [\s!file:dejavusanscondensed]            [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Bold]       [\s!file:dejavusanscondensedbold]        [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-Italic]     [\s!file:dejavusanscondensedoblique]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuSansCond-BoldItalic] [\s!file:dejavusanscondensedboldoblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [DejaVuSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [DejaVuSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [DejaVuSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [DejaVuSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [dejavu-cond]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [DejaVuSansCond-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [DejaVuSansCond-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [DejaVuSansCond-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [DejaVuSansCond-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [dejavu]
-    \definefontsynonym [DejaVuMono-Regular]    [\s!file:dejavusansmono]            [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-Italic]     [\s!file:dejavusansmonooblique]     [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-Bold]       [\s!file:dejavusansmonobold]        [\s!features=\s!default]
-    \definefontsynonym [DejaVuMono-BoldItalic] [\s!file:dejavusansmonoboldoblique] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [dejavu]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [DejaVuMono-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [DejaVuMono-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [DejaVuMono-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [DejaVuMono-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [dejavu,dejavu-cond]
-    \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
-    \definetypeface [\typescriptone] [ss] [\s!sans]  [\typescriptone] [\s!default]
-    \definetypeface [\typescriptone] [tt] [\s!mono]  [dejavu]         [\s!default]
-    \definetypeface [\typescriptone] [mm] [\s!math]  [palatino]       [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index a3abc6787f7..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkii
+++ /dev/null
@@ -1,315 +0,0 @@
-%D \module
-%D   [     file=type-exljbris,
-%D      version=2011.01.01,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Exljbris Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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]
-
-%D Anivers
-
-\starttypescript [\s!sans] [anivers]
-    \definefontsynonym [Anivers-Regular] [\s!file:Anivers_Regular]   [\s!features=\s!default]
-    \definefontsynonym [Anivers-Italic]  [\s!file:Anivers_Italic]    [\s!features=\s!default]
-    \definefontsynonym [Anivers-Bold]    [\s!file:Anivers_Bold]      [\s!features=\s!default]
-    \definefontsynonym [Anivers-Caps]    [\s!file:Anivers_SmallCaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [anivers]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [Anivers-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [Anivers-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]   [Anivers-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]   [Anivers-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [anivers]
-    \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Calluna
-
-\starttypescript [\s!serif] [calluna]
-    \definefontsynonym [Calluna-Regular]    [\s!file:Calluna-Regular] [\s!features=\s!default]
-    \definefontsynonym [Calluna-Italic]     [\s!file:Calluna-It]      [\s!features=\s!default]
-    \definefontsynonym [Calluna-Bold]       [\s!file:Calluna-Bold]    [\s!features=\s!default]
-    \definefontsynonym [Calluna-BoldItalic] [\s!file:Calluna-BoldIt]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [calluna]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]            [Calluna-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]      [Calluna-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]        [Calluna-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic]  [Calluna-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \definefontsynonym [CallunaSans-Regular]    [\s!file:CallunaSansRegular]    [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Italic]     [\s!file:CallunaSansItalic]     [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Bold]       [\s!file:CallunaSansBold]       [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-BoldItalic] [\s!file:CallunaSansBoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]            [CallunaSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]      [CallunaSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]        [CallunaSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic]  [CallunaSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [calluna]
-    \definetypeface [calluna] [rm] [\s!serif] [calluna]  [\s!default]
-    \definetypeface [calluna] [ss] [\s!sans]  [calluna]  [\s!default]
-    \definetypeface [calluna] [tt] [\s!mono]  [modern]   [\s!default]
-    \definetypeface [calluna] [mm] [\s!math]  [palatino] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Delicious
-
-\starttypescript [\s!sans] [delicious]
-    \definefontsynonym [Delicious-Regular]    [\s!file:Delicious-Roman]      [\s!features=\s!default]
-    \definefontsynonym [Delicious-Italic]     [\s!file:Delicious-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Delicious-Bold]       [\s!file:Delicious-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Delicious-BoldItalic] [\s!file:Delicious-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Delicious-Caps]       [\s!file:Delicious-SmallCaps]  [\s!features=\s!default]
-    \definefontsynonym [Delicious-Heavy]      [\s!file:Delicious-Heavy]      [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [delicious]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Delicious-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Delicious-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Delicious-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Delicious-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [delicious]
-    \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Diavlo
-
-\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definefontsynonym [DiavloLight-Regular]  [\s!file:Diavlo_LIGHT_II_37]  [\s!features=\s!default]
-    \definefontsynonym [DiavloBook-Regular]   [\s!file:Diavlo_BOOK_II_37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloMedium-Regular] [\s!file:Diavlo_MEDIUM_II_37] [\s!features=\s!default]
-    \definefontsynonym [DiavloBold-Regular]   [\s!file:Diavlo_BOLD_II_37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloBlack-Regular]  [\s!file:Diavlo_BLACK_II_37]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBook-Regular]   [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-light]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloLight-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBook-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-medium]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloMedium-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-bold]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBold-Regular]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Fertigo Pro
-
-\starttypescript [\s!sans] [fertigo]
-    \definefontsynonym [FertigoPro-Regular] [\s!file:Fertigo_PRO]       [\s!features=\s!default]
-    \definefontsynonym [FertigoPro-Italic]  [\s!file:FertigoPro_Italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fertigo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [FertigoPro-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [FertigoPro-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fertigo]
-    \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Fontin, Fontin Sans
-
-\starttypescript [\s!serif] [fontin]
-    \definefontsynonym [Fontin-Regular] [\s!file:Fontin-Regular]   [\s!features=\s!default]
-    \definefontsynonym [Fontin-Italic]  [\s!file:Fontin-Italic]    [\s!features=\s!default]
-    \definefontsynonym [Fontin-Bold]    [\s!file:Fontin-Bold]      [\s!features=\s!default]
-    \definefontsynonym [Fontin-Caps]    [\s!file:Fontin-SmallCaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [fontin]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [Fontin-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [Fontin-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]   [Fontin-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]   [Fontin-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \definefontsynonym [FontinSans-Regular]    [\s!file:Fontin_Sans_R_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Italic]     [\s!file:Fontin_Sans_I_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Bold]       [\s!file:Fontin_Sans_B_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-BoldItalic] [\s!file:Fontin_Sans_BI_45b] [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Caps]       [\s!file:Fontin_Sans_SC_45b] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [FontinSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [FontinSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [FontinSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [FontinSans-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fontin]
-    \definetypeface [fontin] [rm] [\s!serif] [fontin]   [\s!default]
-    \definetypeface [fontin] [ss] [\s!sans]  [fontin]   [\s!default]
-    \definetypeface [fontin] [tt] [\s!mono]  [modern]   [\s!default] [rscale=1.1]
-    \definetypeface [fontin] [mm] [\s!math]  [palatino] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Museo, Museo Sans
-
-\starttypescript [\s!serif] [museo]
-    \definefontsynonym [Museo-300] [\s!file:Museo300-Regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-500] [\s!file:Museo500-Regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-700] [\s!file:Museo700-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [museo]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]     [Museo-500] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \definefontsynonym [MuseoSans-Regular] [\s!file:MuseoSans_500]        [\s!features=\s!default]
-    \definefontsynonym [MuseoSans-Italic]  [\s!file:MuseoSans_500_Italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [MuseoSans-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [MuseoSans-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [museo]
-    \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
-    \definetypeface [museo] [ss] [\s!sans]  [museo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Museo Slab
-
-\starttypescript [\s!serif] [museo-slab]
-    \definefontsynonym [MuseoSlab-Regular] [\s!file:Museo_Slab_500]       [\s!features=\s!default]
-    \definefontsynonym [MuseoSlab-Italic]  [\s!file:Museo_Slab_500italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [museo-slab]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [MuseoSlab-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [MuseoSlab-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [museo-slab]
-    \definetypeface [museo-slab] [rm] [\s!serif] [museo-slab] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Tallys
-
-\starttypescript [\s!serif] [tallys]
-    \definefontsynonym [Tallys-Regular] [\s!file:Tallys_15] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [tallys]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [tallys]
-    \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 33a2e68d2c1..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
+++ /dev/null
@@ -1,315 +0,0 @@
-%D \module
-%D   [     file=type-exljbris,
-%D      version=2011.01.01,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Exljbris Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%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]
-
-%D Anivers
-
-\starttypescript [\s!sans] [anivers]
-    \definefontsynonym [Anivers-Regular] [\s!file:aniversregular]   [\s!features=\s!default]
-    \definefontsynonym [Anivers-Italic]  [\s!file:aniversitalic]    [\s!features=\s!default]
-    \definefontsynonym [Anivers-Bold]    [\s!file:aniversbold]      [\s!features=\s!default]
-    \definefontsynonym [Anivers-Caps]    [\s!file:aniverssmallcaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [anivers]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [Anivers-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [Anivers-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]   [Anivers-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]   [Anivers-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [anivers]
-    \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Calluna
-
-\starttypescript [\s!serif] [calluna]
-    \definefontsynonym [Calluna-Regular]    [\s!file:callunaregular] [\s!features=\s!default]
-    \definefontsynonym [Calluna-Italic]     [\s!file:callunait]      [\s!features=\s!default]
-    \definefontsynonym [Calluna-Bold]       [\s!file:callunabold]    [\s!features=\s!default]
-    \definefontsynonym [Calluna-BoldItalic] [\s!file:callunaboldit]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [calluna]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]            [Calluna-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]      [Calluna-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]        [Calluna-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic]  [Calluna-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \definefontsynonym [CallunaSans-Regular]    [\s!file:callunasansregular]    [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Italic]     [\s!file:callunasansitalic]     [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Bold]       [\s!file:callunasansbold]       [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-BoldItalic] [\s!file:callunasansbolditalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]            [CallunaSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]      [CallunaSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]        [CallunaSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic]  [CallunaSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [calluna]
-    \definetypeface [calluna] [rm] [\s!serif] [calluna]  [\s!default]
-    \definetypeface [calluna] [ss] [\s!sans]  [calluna]  [\s!default] [\s!rscale=\v!auto]
-    \definetypeface [calluna] [tt] [\s!mono]  [modern]   [\s!default] [\s!rscale=\v!auto]
-    \definetypeface [calluna] [mm] [\s!math]  [palatino] [\s!default] [\s!rscale=\v!auto]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Delicious
-
-\starttypescript [\s!sans] [delicious]
-    \definefontsynonym [Delicious-Regular]    [\s!file:deliciousroman]      [\s!features=\s!default]
-    \definefontsynonym [Delicious-Italic]     [\s!file:deliciousitalic]     [\s!features=\s!default]
-    \definefontsynonym [Delicious-Bold]       [\s!file:deliciousbold]       [\s!features=\s!default]
-    \definefontsynonym [Delicious-BoldItalic] [\s!file:deliciousbolditalic] [\s!features=\s!default]
-    \definefontsynonym [Delicious-Caps]       [\s!file:delicioussmallcaps]  [\s!features=\s!default]
-    \definefontsynonym [Delicious-Heavy]      [\s!file:deliciousheavy]      [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [delicious]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Delicious-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Delicious-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Delicious-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Delicious-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [delicious]
-    \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Diavlo
-
-\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definefontsynonym [DiavloLight-Regular]  [\s!file:diavlolightii37]  [\s!features=\s!default]
-    \definefontsynonym [DiavloBook-Regular]   [\s!file:diavlobookii37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloMedium-Regular] [\s!file:diavlomediumii37] [\s!features=\s!default]
-    \definefontsynonym [DiavloBold-Regular]   [\s!file:diavloboldii37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloBlack-Regular]  [\s!file:diavloblackii37]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBook-Regular]   [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-light]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloLight-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBook-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-medium]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloMedium-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-bold]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBold-Regular]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Fertigo Pro
-
-\starttypescript [\s!sans] [fertigo]
-    \definefontsynonym [FertigoPro-Regular] [\s!file:fertigopro]       [\s!features=\s!default]
-    \definefontsynonym [FertigoPro-Italic]  [\s!file:Fertigoproitalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fertigo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [FertigoPro-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [FertigoPro-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fertigo]
-    \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Fontin, Fontin Sans
-
-\starttypescript [\s!serif] [fontin]
-    \definefontsynonym [Fontin-Regular] [\s!file:fontinregular]   [\s!features=\s!default]
-    \definefontsynonym [Fontin-Italic]  [\s!file:fontinitalic]    [\s!features=\s!default]
-    \definefontsynonym [Fontin-Bold]    [\s!file:fontinbold]      [\s!features=\s!default]
-    \definefontsynonym [Fontin-Caps]    [\s!file:fontinsmallcaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [fontin]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [Fontin-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [Fontin-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]   [Fontin-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]   [Fontin-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \definefontsynonym [FontinSans-Regular]    [\s!file:fontinsansr45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Italic]     [\s!file:fontinsansi45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Bold]       [\s!file:fontinsansb45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-BoldItalic] [\s!file:fontinsansbi45b] [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Caps]       [\s!file:fontinsanssc45b] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [FontinSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [FontinSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [FontinSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [FontinSans-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fontin]
-    \definetypeface [fontin] [rm] [\s!serif] [fontin]   [\s!default]
-    \definetypeface [fontin] [ss] [\s!sans]  [fontin]   [\s!default]
-    \definetypeface [fontin] [tt] [\s!mono]  [modern]   [\s!default] [rscale=1.1]
-    \definetypeface [fontin] [mm] [\s!math]  [palatino] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Museo, Museo Sans
-
-\starttypescript [\s!serif] [museo]
-    \definefontsynonym [Museo-300] [\s!file:museo300regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-500] [\s!file:museo500regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-700] [\s!file:museo700regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [museo]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]     [Museo-500] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \definefontsynonym [MuseoSans-Regular] [\s!file:museosans500]       [\s!features=\s!default]
-    \definefontsynonym [MuseoSans-Italic]  [\s!file:museosans500italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [MuseoSans-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [MuseoSans-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [museo]
-    \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
-    \definetypeface [museo] [ss] [\s!sans]  [museo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Museo Slab
-
-\starttypescript [\s!serif] [museo-slab]
-    \definefontsynonym [MuseoSlab-Regular] [\s!file:museoslab500]       [\s!features=\s!default]
-    \definefontsynonym [MuseoSlab-Italic]  [\s!file:museoslab500italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [museo-slab]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [MuseoSlab-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [MuseoSlab-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [museo-slab]
-    \definetypeface [museo-slab] [rm] [\s!serif] [museo-slab] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-%D Tallys
-
-\starttypescript [\s!serif] [tallys]
-    \definefontsynonym [Tallys-Regular] [\s!file:tallys15] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [tallys]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [tallys]
-    \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 7699f07e693..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkii
+++ /dev/null
@@ -1,32 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index 862872d8c56..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
+++ /dev/null
@@ -1,32 +0,0 @@
-%D \module
-%D   [     file=type-fontsite,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Fontsite Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:bergamostdregular]    [features=default]
-    \definefontsynonym [Bergamo-Italic]     [name:bergamostditalic]     [features=default]
-    \definefontsynonym [Bergamo-Bold]       [name:bergamostdbold]       [features=default]
-    \definefontsynonym [Bergamo-BoldItalic] [name:bergamostdbolditalic] [features=default]
-\stoptypescript
-
-% Carto Gothic
-
-\starttypescript [sans] [cartogothic]
-    \definefontsynonym [CartoGothic-Regular]    [name:cartogothicstdbook]       [features=default]
-    \definefontsynonym [CartoGothic-Italic]     [name:cartogothicstditalic]     [features=default]
-    \definefontsynonym [CartoGothic-Bold]       [name:cartogothicstdbold]       [features=default]
-    \definefontsynonym [CartoGothic-BoldItalic] [name:cartogothicstdbolditalic] [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
deleted file mode 100644
index 92c91c10bac..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
+++ /dev/null
@@ -1,52 +0,0 @@
-%D \module
-%D   [     file=type-fontsite,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Fontsite Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index e6fe8003abb..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkii
+++ /dev/null
@@ -1,92 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index fa016ef770c..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
+++ /dev/null
@@ -1,92 +0,0 @@
-%D \module
-%D   [     file=type-gfs,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=GFS Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:gfsambrosiaregular] [features=default]
-\stoptypescript
-
-% Artemisia
-
-\starttypescript [serif] [artemisia]
-    \definefontsynonym [Artemisia-Regular]    [name:gfsartemisiaregular]    [features=default]
-    \definefontsynonym [Artemisia-Italic]     [name:gfsartemisiaitalic]     [features=default]
-    \definefontsynonym [Artemisia-Bold]       [name:gfsartemisiabold]       [features=default]
-    \definefontsynonym [Artemisia-BoldItalic] [name:gfsartemisiabolditalic] [features=default]
-\stoptypescript
-
-% Bodoni
-
-\starttypescript [serif] [bodoni]
-    \definefontsynonym [Bodoni-Regular]    [name:gfsbodoniregular]    [features=default]
-    \definefontsynonym [Bodoni-Italic]     [name:gfsbodoniitalic]     [features=default]
-    \definefontsynonym [Bodoni-Bold]       [name:gfsbodonibold]       [features=default]
-    \definefontsynonym [Bodoni-BoldItalic] [name:gfsbodonibolditalic] [features=default]
-\stoptypescript
-
-% Didot
-
-\starttypescript [serif] [didot]
-    \definefontsynonym [Didot-Regular]    [name:gfsdidotregular]    [features=default]
-    \definefontsynonym [Didot-Italic]     [name:gfsdidotitalic]     [features=default]
-    \definefontsynonym [Didot-Bold]       [name:gfsdidotbold]       [features=default]
-    \definefontsynonym [Didot-BoldItalic] [name:gfsdidotbolditalic] [features=default]
-\stoptypescript
-
-% Elpis
-
-\starttypescript [serif] [elpis]
-    \definefontsynonym [Elpis-Regular] [name:gfselpisregular] [features=default]
-\stoptypescript
-
-% Eustace
-
-\starttypescript [serif] [eustace]
-    \definefontsynonym [Eustace-Regular] [name:gfseustaceregular] [features=default]
-\stoptypescript
-
-% Fleischman
-
-\starttypescript [serif] [fleischman]
-    \definefontsynonym [Fleischman-Regular] [name:gfsfleischmanregular] [features=default]
-\stoptypescript
-
-% Jackson
-
-\starttypescript [serif] [jackson]
-    \definefontsynonym [Jackson-Regular] [name:gfsjacksonregular] [features=default]
-\stoptypescript
-
-% Neohellenic
-
-\starttypescript [sans] [neohellenic]
-    \definefontsynonym [Neohellenic-Regular]    [name:gfsneohellenicregular]    [features=default]
-    \definefontsynonym [Neohellenic-Italic]     [name:gfsneohellenicitalic]     [features=default]
-    \definefontsynonym [Neohellenic-Bold]       [name:gfsneohellenicbold]       [features=default]
-    \definefontsynonym [Neohellenic-BoldItalic] [name:gfsneohellenicbolditalic] [features=default]
-\stoptypescript
-
-% Nicefore
-
-\starttypescript [sans] [nicefore]
-    \definefontsynonym [Nicefore-Regular] [name:gfsnicefore] [features=default]
-\stoptypescript
-
-% Theokritos
-
-\starttypescript [serif] [theokritos]
-    \definefontsynonym [Theokritos-Regular] [name:gfstheokritosregular] [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
deleted file mode 100644
index 7e820666864..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
+++ /dev/null
@@ -1,163 +0,0 @@
-%D \module
-%D   [     file=type-gfs,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=GFS Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Elpis
-
-\starttypescript [serif] [elpis]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Elpis-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [elpis]
-    \definetypeface [elpis] [rm] [serif] [elpis] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Eustace
-
-\starttypescript [serif] [eustace]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Eustace-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [eustace]
-    \definetypeface [eustace] [rm] [serif] [eustace] [default]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% Nicefore
-
-\starttypescript [sans] [nicefore]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Nicefore-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [nicefore]
-    \definetypeface [nicefore] [ss] [sans] [nicefore] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-% Theokritos
-
-\starttypescript [serif] [theokritos]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Theokritos-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [theokritos]
-    \definetypeface [theokritos] [rm] [serif] [theokritos] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-gfs}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkii
new file mode 100644
index 00000000000..64c055e08ec
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkii
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-goudysans,
+%D      version=2011.09.18,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Goudy Sans Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [goudysans]
+
+\starttypescript [\s!sans] [goudysans]
+    \definefontsynonym [GoudySans-Regular]    [\s!file:goudsrg_] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-Italic]     [\s!file:goudsi__] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-Bold]       [\s!file:goudsb__] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-BoldItalic] [\s!file:goudsbi_] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [goudysans]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [GoudySans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [GoudySans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [GoudySans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [GoudySans-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [goudysans]
+    \definetypeface [goudysans] [ss] [\s!sans] [goudysans] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkiv
new file mode 100644
index 00000000000..64c055e08ec
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.mkiv
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-goudysans,
+%D      version=2011.09.18,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Goudy Sans Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [goudysans]
+
+\starttypescript [\s!sans] [goudysans]
+    \definefontsynonym [GoudySans-Regular]    [\s!file:goudsrg_] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-Italic]     [\s!file:goudsi__] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-Bold]       [\s!file:goudsb__] [\s!features=\s!default]
+    \definefontsynonym [GoudySans-BoldItalic] [\s!file:goudsbi_] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [goudysans]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [GoudySans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [GoudySans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [GoudySans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [GoudySans-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [goudysans]
+    \definetypeface [goudysans] [ss] [\s!sans] [goudysans] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkii
new file mode 100644
index 00000000000..de3d5966b6a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkii
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-junicode,
+%D      version=2011.09.18,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Junicode Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [goudysans]
+
+\starttypescript [\s!serif] [junicode]
+    \definefontsynonym [Junicode-Regular]    [\s!file:Junicode-Regular]    [\s!features=\s!default]
+    \definefontsynonym [Junicode-Italic]     [\s!file:Junicode-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Junicode-Bold]       [\s!file:Junicode-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Junicode-BoldItalic] [\s!file:Junicode-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [junicode]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [Junicode-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [Junicode-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [Junicode-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [Junicode-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [junicode]
+    \definetypeface [junicode] [rm] [\s!serif] [junicode] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkiv
new file mode 100644
index 00000000000..08557cb44b7
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.mkiv
@@ -0,0 +1,50 @@
+%D \module
+%D   [     file=type-junicode,
+%D      version=2011.09.18,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Junicode Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [goudysans]
+
+\starttypescript [\s!serif] [junicode]
+    \definefontsynonym [Junicode-Regular]    [\s!file:junicoderegular]    [\s!features=\s!default]
+    \definefontsynonym [Junicode-Italic]     [\s!file:junicodeitalic]     [\s!features=\s!default]
+    \definefontsynonym [Junicode-Bold]       [\s!file:junicodebold]       [\s!features=\s!default]
+    \definefontsynonym [Junicode-BoldItalic] [\s!file:junicodebolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [junicode]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [Junicode-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [Junicode-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [Junicode-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [Junicode-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [junicode]
+    \definetypeface [junicode] [rm] [\s!serif] [junicode] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\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
deleted file mode 100644
index ac2e5a27bfb..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
+++ /dev/null
@@ -1,34 +0,0 @@
-%D \module
-%D   [     file=type-junicode,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Junicode Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkii
new file mode 100644
index 00000000000..3acaf5a620a
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkii
@@ -0,0 +1,53 @@
+%D \module
+%D   [     file=type-justus,
+%D      version=2011.09.20,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Justus Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [justus]
+
+\starttypescript [\s!serif] [justus]
+    \definefontsynonym [Justus-Regular] [\s!file:Justus-Roman]      [\s!features=\s!default]
+    \definefontsynonym [Justus-Italic]  [\s!file:Justus-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Justus-Bold]    [\s!file:Justus-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Justus-Caps]    [\s!file:Justus-Versalitas] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [justus]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]       [Justus-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic] [Justus-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]   [Justus-Bold]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]   [Justus-Caps]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [justus]
+    \definetypeface [justus] [rm] [\s!serif] [justus] [\s!default]
+    \definetypeface [justus] [ss] [\s!sans]  [modern] [\s!default]
+    \definetypeface [justus] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [justus] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkiv
new file mode 100644
index 00000000000..a6ab743f452
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-justus.mkiv
@@ -0,0 +1,53 @@
+%D \module
+%D   [     file=type-justus,
+%D      version=2011.09.20,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Justus Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [justus]
+
+\starttypescript [\s!serif] [justus]
+    \definefontsynonym [Justus-Regular] [\s!file:justusroman]      [\s!features=\s!default]
+    \definefontsynonym [Justus-Italic]  [\s!file:justusitalic]     [\s!features=\s!default]
+    \definefontsynonym [Justus-Bold]    [\s!file:justusbold]       [\s!features=\s!default]
+    \definefontsynonym [Justus-Caps]    [\s!file:justusversalitas] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [justus]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]       [Justus-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic] [Justus-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]   [Justus-Bold]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]   [Justus-Caps]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [justus]
+    \definetypeface [justus] [rm] [\s!serif] [justus] [\s!default]
+    \definetypeface [justus] [ss] [\s!sans]  [modern] [\s!default]
+    \definetypeface [justus] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [justus] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\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
deleted file mode 100644
index b1c83a6ab57..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
+++ /dev/null
@@ -1,47 +0,0 @@
-%D \module
-%D   [     file=type-justus,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Justus Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkii
new file mode 100644
index 00000000000..6aee33b5f06
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkii
@@ -0,0 +1,48 @@
+%D \module
+%D   [     file=type-kontrapunkt,
+%D      version=2011.09.20,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Kontrapunkt Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [kontrapunkt]
+
+\starttypescript [\s!serif] [kontrapunkt]
+    \definefontsynonym [Kontrapunkt-Regular] [\s!file:Kontrapunkt-Light]       [\s!features=\s!default]
+    \definefontsynonym [Kontrapunkt-Italic]  [\s!file:Kontrapunkt-LightItalic] [\s!features=\s!default]
+    \definefontsynonym [Kontrapunkt-Bold]    [\s!file:Kontrapunkt-Bold]        [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [kontrapunkt]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]       [Kontrapunkt-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic] [Kontrapunkt-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]   [Kontrapunkt-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [kontrapunkt]
+    \definetypeface [kontrapunkt] [rm] [\s!serif] [kontrapunkt] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkiv
new file mode 100644
index 00000000000..0a235e272be
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.mkiv
@@ -0,0 +1,48 @@
+%D \module
+%D   [     file=type-kontrapunkt,
+%D      version=2011.09.20,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Kontrapunkt Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [kontrapunkt]
+
+\starttypescript [\s!serif] [kontrapunkt]
+    \definefontsynonym [Kontrapunkt-Regular] [\s!file:kontrapunktlight]       [\s!features=\s!default]
+    \definefontsynonym [Kontrapunkt-Italic]  [\s!file:kontrapunktlightitalic] [\s!features=\s!default]
+    \definefontsynonym [Kontrapunkt-Bold]    [\s!file:kontrapunktbold]        [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [kontrapunkt]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]       [Kontrapunkt-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic] [Kontrapunkt-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]   [Kontrapunkt-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [kontrapunkt]
+    \definetypeface [kontrapunkt] [rm] [\s!serif] [kontrapunkt] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\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
deleted file mode 100644
index eadd025b6d4..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
+++ /dev/null
@@ -1,32 +0,0 @@
-%D \module
-%D   [     file=type-kontrapunkt,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Kontrapunkt Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index 77f49642d48..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%D \module
-%D   [     file=type-leftist,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Leftist Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\stoptypescript
-
-\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
deleted file mode 100644
index 7a324471e1d..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkii
+++ /dev/null
@@ -1,27 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index 6bd0e58cbe8..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
+++ /dev/null
@@ -1,27 +0,0 @@
-%D \module
-%D   [     file=type-linuxlibertine,
-%D      version=2009.07.23,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Linux Libertine Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:linuxlibertineo]           [features=default]
-    \definefontsynonym [LinuxLibertine-Italic]     [name:linuxlibertineoitalic]     [features=default]
-    \definefontsynonym [LinuxLibertine-Bold]       [name:linuxlibertineobold]       [features=default]
-    \definefontsynonym [LinuxLibertine-BoldItalic] [name:linuxlibertineobolditalic] [features=default]
-    \definefontsynonym [LinuxLibertine-Caps]       [name:linuxlibertineocapitals]   [features=default]
-\stoptypescript
-
-\starttypescript [sans] [linuxbiolinum]
-    \definefontsynonym [LinuxBiolinum-Regular] [name:linuxbiolinumo]     [features=default]
-    \definefontsynonym [LinuxBiolinum-Bold]    [name:linuxbiolinumobold] [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
deleted file mode 100644
index 527ef801e54..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-%D \module
-%D   [     file=type-linuxlibertine,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Linux Libertine Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-linuxlibertine}
-
-\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
deleted file mode 100644
index bcb7b4b3eab..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkii
+++ /dev/null
@@ -1,50 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index 247daca6dc4..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-mgopen,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=MgOpen Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:mgopencanonica]           [features=default]
-    \definefontsynonym [MgOpenCanonica-Italic]     [name:mgopencanonicaitalic]     [features=default]
-    \definefontsynonym [MgOpenCanonica-Bold]       [name:mgopencanonicabold]       [features=default]
-    \definefontsynonym [MgOpenCanonica-BoldItalic] [name:mgopencanonicabolditalic] [features=default]
-\stoptypescript
-
-% Cosmetica
-
-\starttypescript [sans] [mgopen-cosmetica]
-    \definefontsynonym [MgOpenCosmetica-Regular]    [name:mgopencosmetica]            [features=default]
-    \definefontsynonym [MgOpenCosmetica-Italic]     [name:mgopencosmeticaoblique]     [features=default]
-    \definefontsynonym [MgOpenCosmetica-Bold]       [name:mgopencosmeticabold]        [features=default]
-    \definefontsynonym [MgOpenCosmetica-BoldItalic] [name:mgopencosmeticaboldoblique] [features=default]
-\stoptypescript
-
-% Moderna
-
-\starttypescript [sans] [mgopen-moderna]
-    \definefontsynonym [MgOpenModerna-Regular]    [name:mgopenmoderna]            [features=default]
-    \definefontsynonym [MgOpenModerna-Italic]     [name:mgopenmodernaoblique]     [features=default]
-    \definefontsynonym [MgOpenModerna-Bold]       [name:mgopenmodernabold]        [features=default]
-    \definefontsynonym [MgOpenModerna-BoldItalic] [name:mgopenmodernaboldoblique] [features=default]
-\stoptypescript
-
-% Modata
-
-\starttypescript [sans] [mgopen-modata]
-    \definefontsynonym [MgOpenModata-Regular]    [name:mgopenmodata]            [features=default]
-    \definefontsynonym [MgOpenModata-Italic]     [name:mgopenmodataoblique]     [features=default]
-    \definefontsynonym [MgOpenModata-Bold]       [name:mgopenmodatabold]        [features=default]
-    \definefontsynonym [MgOpenModata-BoldItalic] [name:mgopenmodataboldoblique] [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
deleted file mode 100644
index 200df28405c..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%D \module
-%D   [     file=type-mgopen,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=MgOpen Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-mgopen}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkii
new file mode 100644
index 00000000000..ea6c627a8c0
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkii
@@ -0,0 +1,58 @@
+%D \module
+%D   [     file=type-miso,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Miso Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+%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}
+
+\starttypescriptcollection [miso]
+
+\starttypescript [\s!sans] [miso-light,miso]
+    \definefontsynonym [Miso-Light]   [\s!file:miso-light] [\s!features=\s!default]
+    \definefontsynonym [Miso-Regular] [\s!file:miso]       [\s!features=\s!default]
+    \definefontsynonym [Miso-Bold]    [\s!file:miso-bold]  [\s!features=\s!default]
+\stoptypescript
+
+
+\starttypescript [\s!sans] [miso-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Miso-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Miso-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [miso]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Miso-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Miso-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [miso-light,miso]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkiv
new file mode 100644
index 00000000000..4a9581b1384
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-miso.mkiv
@@ -0,0 +1,58 @@
+%D \module
+%D   [     file=type-miso,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Miso Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+%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}
+
+\starttypescriptcollection [miso]
+
+\starttypescript [\s!sans] [miso-light,miso]
+    \definefontsynonym [Miso-Light]   [\s!file:misolight] [\s!features=\s!default]
+    \definefontsynonym [Miso-Regular] [\s!file:miso]      [\s!features=\s!default]
+    \definefontsynonym [Miso-Bold]    [\s!file:misobold]  [\s!features=\s!default]
+\stoptypescript
+
+
+\starttypescript [\s!sans] [miso-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Miso-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Miso-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [miso]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Miso-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Miso-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [miso-light,miso]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\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
deleted file mode 100644
index 3e4dcfd6ec0..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%D \module
-%D   [     file=type-miso,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Miso Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index ad086908507..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-nichtlustig,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Nichtlustig Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index 5ffbfdad8bf..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-optical.tex
+++ /dev/null
@@ -1,254 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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-richtype.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
deleted file mode 100644
index 16a54a89be3..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
+++ /dev/null
@@ -1,36 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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:RTKlara 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
deleted file mode 100644
index b2161e67dcd..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
+++ /dev/null
@@ -1,36 +0,0 @@
-%D \module
-%D   [     file=type-richtype,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Richtype Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:rtfrancescabold]   [features=default]
-    \definefontsynonym [Francesca-Italic]  [name:rtfrancescaitalic] [features=default]
-\stoptypescript
-
-% Klara
-
-\starttypescript [serif] [klara]
-    \definefontsynonym [KlaraSerif-Regular] [name:rtklara]       [features=default]
-    \definefontsynonym [KlaraSerif-Bold]    [name:rtklarabold]   [features=default]
-    \definefontsynonym [KlaraSerif-Italic]  [name:rtklaraitalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [klara]
-    \definefontsynonym [KlaraSans-Regular] [name:rtklarasans]       [features=default]
-    \definefontsynonym [KlaraSans-Bold]    [name:rtklarasansbold]   [features=default]
-    \definefontsynonym [KlaraSans-Italic]  [name:rtklarasansitalic] [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
deleted file mode 100644
index 12a55cb6fe3..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
+++ /dev/null
@@ -1,57 +0,0 @@
-%D \module
-%D   [     file=type-richtype,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Richtype Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-richtype}
-
-\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
deleted file mode 100644
index 82768f5321b..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
+++ /dev/null
@@ -1,28 +0,0 @@
-%D \module
-%D   [     file=type-samba,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Samba Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index 2c79e6aec4f..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkii
+++ /dev/null
@@ -1,53 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%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
deleted file mode 100644
index 3174f8e7308..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
+++ /dev/null
@@ -1,53 +0,0 @@
-%D \module
-%D   [     file=type-smeltery,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=SMeltery Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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:audimatregular]    [features=default]
-    \definefontsynonym [Audimat-Italic]     [name:audimatitalic]     [features=default]
-    \definefontsynonym [Audimat-Bold]       [name:audimatbold]       [features=default]
-    \definefontsynonym [Audimat-BoldItalic] [name:audimatbolditalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [audimat]
-    \definefontsynonym [AudimatMono-Light]       [name:audimatmonolight]          [features=default]
-    \definefontsynonym [AudimatMono-LightItalic] [name:audimatmonolightoblique]   [features=default]
-    \definefontsynonym [AudimatMono-LightCaps]   [name:audimatmonosmallcapslight] [features=default]
-    \definefontsynonym [AudimatMono-Regular]     [name:audimatmono]               [features=default]
-    \definefontsynonym [AudimatMono-Italic]      [name:audimatmonooblique]        [features=default]
-    \definefontsynonym [AudimatMono-Bold]        [name:audimatmonobold]           [features=default]
-    \definefontsynonym [AudimatMono-BoldItalic]  [name:audimatmonoboldoblique]    [features=default]
-    \definefontsynonym [AudimatMono-Smallcaps]   [name:audimatmonosmallcaps]      [features=default]
-    \definefontsynonym [AudimatMono-BoldCaps]    [name:audimatmonosmallcapsbold]  [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
deleted file mode 100644
index aa7c092af24..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
+++ /dev/null
@@ -1,80 +0,0 @@
-%D \module
-%D   [     file=type-smeltery,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=SMeltery Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\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]
-    \quittypescriptscanning
-\stoptypescript
-
-% TRottoir
-
-\starttypescript [sans] [trottoir]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Trottoir-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [trottoir]
-    \definetypeface [trottoir] [ss] [sans] [trottoir] [default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-smeltery}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkii
new file mode 100644
index 00000000000..4488e277796
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkii
@@ -0,0 +1,52 @@
+%D \module
+%D   [     file=type-ubuntu,
+%D      version=2011.09.23,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Ubuntu Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\unprotect
+
+\starttypescriptcollection [ubuntu]
+
+\starttypescript [\s!sans] [ubuntu]
+    \definefontsynonym [Ununtu-Regular]    [\s!file:Ubuntu-R]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-Italic]     [\s!file:Ubuntu-I]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-Bold]       [\s!file:Ubuntu-B]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-BoldItalic] [\s!file:Ubuntu-BI] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [ubuntu]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Ununtu-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Ubuntu-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Ubuntu-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Ubuntu-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [ubuntu]
+    \definetypeface [ubuntu] [ss] [\s!sans] [ubuntu] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\protect \endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkiv
new file mode 100644
index 00000000000..0658e8f7efa
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-ubuntu.mkiv
@@ -0,0 +1,52 @@
+%D \module
+%D   [     file=type-ubuntu,
+%D      version=2011.09.23,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Ubuntu Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\unprotect
+
+\starttypescriptcollection [ubuntu]
+
+\starttypescript [\s!sans] [ubuntu]
+    \definefontsynonym [Ununtu-Regular]    [\s!file:ubuntur]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-Italic]     [\s!file:ubuntui]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-Bold]       [\s!file:ubuntub]  [\s!features=\s!default]
+    \definefontsynonym [Ubuntu-BoldItalic] [\s!file:ubuntubi] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [ubuntu]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Ununtu-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Ubuntu-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Ubuntu-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Ubuntu-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [ubuntu]
+    \definetypeface [ubuntu] [ss] [\s!sans] [ubuntu] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\protect \endinput
+\ No newline at end of file
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkii
new file mode 100644
index 00000000000..2f1abcdf243
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkii
@@ -0,0 +1,60 @@
+%D \module
+%D   [     file=type-uqammaq,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Uqammaq Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [uqammaq]
+
+\starttypescript [\s!sans] [uqammaq,uqammaq-light,uqammaq-bold]
+    \definefontsynonym [Uqammaq-Light]   [\s!file:Uqammaq Light]   [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Regular] [\s!file:Uqammaq Regular] [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Bold]    [\s!file:Uqammaq Bold]    [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Heavy]   [\s!file:Uqammaq Heavy]   [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq-bold]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Bold]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [uqammaq,uqammaq-light,uqammaq-bold]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkiv
new file mode 100644
index 00000000000..667ec785b06
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.mkiv
@@ -0,0 +1,60 @@
+%D \module
+%D   [     file=type-uqammaq,
+%D      version=2011.09.21,
+%D        title=\CONTEXT\ Typescript Macros,
+%D     subtitle=Uqammaq Font Definitions,
+%D       author=Wolfgang Schuster,
+%D         date=\currentdate,
+%D    copyright=Wolfgang Schuster,
+%D      license=GNU General Public License]
+
+%C Copyright (C) 2011  Wolfgang Schuster
+%C
+%C This program is free software: you can redistribute it and/or modify
+%C it under the terms of the GNU General Public License as published by
+%C the Free Software Foundation, either version 3 of the License, or
+%C any later version.
+%C
+%C This program is distributed in the hope that it will be useful,
+%C but WITHOUT ANY WARRANTY; without even the implied warranty of
+%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%C GNU General Public License for more details.
+%C
+%C You should have received a copy of the GNU General Public License
+%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+\starttypescriptcollection [uqammaq]
+
+\starttypescript [\s!sans] [uqammaq,uqammaq-light,uqammaq-bold]
+    \definefontsynonym [Uqammaq-Light]   [\s!file:uqammaqlight]   [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Regular] [\s!file:uqammaqregular] [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Bold]    [\s!file:uqammaqbold]    [\s!features=\s!default]
+    \definefontsynonym [Uqammaq-Heavy]   [\s!file:uqammaqheavy]   [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [uqammaq-bold]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Uqammaq-Bold]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Uqammaq-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [uqammaq,uqammaq-light,uqammaq-bold]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\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
deleted file mode 100644
index 0d8dbf32932..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
+++ /dev/null
@@ -1,44 +0,0 @@
-%D \module
-%D   [     file=type-uqammaq,
-%D      version=2009.08.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Uqammaq Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%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]
-    \quittypescriptscanning
-\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
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex
+++ /dev/null
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
deleted file mode 100644
index 3c785b6fdab..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
+++ /dev/null
@@ -1,155 +0,0 @@
-%D \module
-%D   [     file=type-vista,
-%D      version=2011.01.01,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Vista Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [vista]
-
-% Cambria
-
-\starttypescript [\s!serif] [cambria]
-    \definefontsynonym [Cambria-Regular]    [\s!file:CAMBRIA]  [\s!features=\s!default]
-    \definefontsynonym [Cambria-Italic]     [\s!file:CAMBRIAI] [\s!features=\s!default]
-    \definefontsynonym [Cambria-Bold]       [\s!file:CAMBRIAB] [\s!features=\s!default]
-    \definefontsynonym [Cambria-BoldItalic] [\s!file:CAMBRIAZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [cambria]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Cambria-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Cambria-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Cambria-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Cambria-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]       [Cambria-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-\starttypescript [cambria]
-    \definetypeface [cambria] [rm] [\s!serif] [cambria] [\s!default]
-    \definetypeface [cambria] [mm] [\s!math ] [cambria] [\s!default]
-\stoptypescript
-
-% Constantia
-
-\starttypescript [\s!serif] [constantia]
-    \definefontsynonym [Constantia-Regular]    [\s!file:CONSTAN]  [\s!features=\s!default]
-    \definefontsynonym [Constantia-Italic]     [\s!file:CONSTANI] [\s!features=\s!default]
-    \definefontsynonym [Constantia-Bold]       [\s!file:CONSTANB] [\s!features=\s!default]
-    \definefontsynonym [Constantia-BoldItalic] [\s!file:CONSTANZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [constantia]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Constantia-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Constantia-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Constantia-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Constantia-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]       [Constantia-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-\starttypescript [constantia]
-    \definetypeface [constantia] [rm] [\s!serif] [constantia] [\s!default]
-\stoptypescript
-
-% Calibri
-
-\starttypescript [\s!sans] [calibri]
-    \definefontsynonym [Calibri-Regular]    [\s!file:CALIBRI]  [\s!features=\s!default]
-    \definefontsynonym [Calibri-Italic]     [\s!file:CALIBRII] [\s!features=\s!default]
-    \definefontsynonym [Calibri-Bold]       [\s!file:CALIBRIB] [\s!features=\s!default]
-    \definefontsynonym [Calibri-BoldItalic] [\s!file:CALIBRIZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calibri]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Calibri-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Calibri-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Calibri-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Calibri-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Calibri-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Candara
-
-\starttypescript [\s!sans] [candara]
-    \definefontsynonym [Candara-Regular]    [\s!file:CANDARA]  [\s!features=\s!default]
-    \definefontsynonym [Candara-Italic]     [\s!file:CANDARAI] [\s!features=\s!default]
-    \definefontsynonym [Candara-Bold]       [\s!file:CANDARAB] [\s!features=\s!default]
-    \definefontsynonym [Candara-BoldItalic] [\s!file:CANDARAZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [candara]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Candara-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Candara-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Candara-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Candara-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Candara-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Corbel
-
-\starttypescript [\s!sans] [corbel]
-    \definefontsynonym [Corbel-Regular]    [\s!file:CORBEL]  [\s!features=\s!default]
-    \definefontsynonym [Corbel-Italic]     [\s!file:CORBELI] [\s!features=\s!default]
-    \definefontsynonym [Corbel-Bold]       [\s!file:CORBELB] [\s!features=\s!default]
-    \definefontsynonym [Corbel-BoldItalic] [\s!file:CORBELZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [corbel]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Corbel-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Corbel-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Corbel-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Corbel-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Corbel-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Consolas
-
-\starttypescript [\s!mono] [consolas]
-    \definefontsynonym [Consolas-Regular]    [\s!file:CONSOLA]  [\s!features=\s!default]
-    \definefontsynonym [Consolas-Italic]     [\s!file:CONSOLAI] [\s!features=\s!default]
-    \definefontsynonym [Consolas-Bold]       [\s!file:CONSOLAB] [\s!features=\s!default]
-    \definefontsynonym [Consolas-BoldItalic] [\s!file:CONSOLAZ] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [consolas]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [Consolas-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [Consolas-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [Consolas-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [Consolas-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!MonoCaps]       [Consolas-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-\starttypescript [calibri,candara,corbel]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-\stoptypescript
-
-\starttypescript [consolas]
-    \definetypeface [\typescriptone] [tt] [\s!mono] [\typescriptone] [\s!default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\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
deleted file mode 100644
index 23c51d3cddc..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
+++ /dev/null
@@ -1,150 +0,0 @@
-%D \module
-%D   [     file=type-vista,
-%D      version=2011.01.01,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Vista Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [vista]
-
-% Cambria
-
-\starttypescript [\s!serif] [cambria]
-    \definefontsynonym [Cambria-Regular]    [\s!file:cambria]  [\s!features=\s!default]
-    \definefontsynonym [Cambria-Italic]     [\s!file:cambriai] [\s!features=\s!default]
-    \definefontsynonym [Cambria-Bold]       [\s!file:cambriab] [\s!features=\s!default]
-    \definefontsynonym [Cambria-BoldItalic] [\s!file:cambriaz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [cambria]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Cambria-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Cambria-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Cambria-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Cambria-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]       [Cambria-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Constantia
-
-\starttypescript [\s!serif] [constantia]
-    \definefontsynonym [Constantia-Regular]    [\s!file:constan]  [\s!features=\s!default]
-    \definefontsynonym [Constantia-Italic]     [\s!file:constani] [\s!features=\s!default]
-    \definefontsynonym [Constantia-Bold]       [\s!file:constanb] [\s!features=\s!default]
-    \definefontsynonym [Constantia-BoldItalic] [\s!file:constanz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [constantia]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Constantia-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Constantia-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Constantia-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Constantia-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]       [Constantia-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Calibri
-
-\starttypescript [\s!sans] [calibri]
-    \definefontsynonym [Calibri-Regular]    [\s!file:calibri]  [\s!features=\s!default]
-    \definefontsynonym [Calibri-Italic]     [\s!file:calibrii] [\s!features=\s!default]
-    \definefontsynonym [Calibri-Bold]       [\s!file:calibrib] [\s!features=\s!default]
-    \definefontsynonym [Calibri-BoldItalic] [\s!file:calibriz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calibri]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Calibri-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Calibri-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Calibri-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Calibri-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Calibri-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Candara
-
-\starttypescript [\s!sans] [candara]
-    \definefontsynonym [Candara-Regular]    [\s!file:candara]  [\s!features=\s!default]
-    \definefontsynonym [Candara-Italic]     [\s!file:candarai] [\s!features=\s!default]
-    \definefontsynonym [Candara-Bold]       [\s!file:candarab] [\s!features=\s!default]
-    \definefontsynonym [Candara-BoldItalic] [\s!file:candaraz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [candara]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Candara-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Candara-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Candara-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Candara-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Candara-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Corbel
-
-\starttypescript [\s!sans] [corbel]
-    \definefontsynonym [Corbel-Regular]    [\s!file:corbel]  [\s!features=\s!default]
-    \definefontsynonym [Corbel-Italic]     [\s!file:corbeli] [\s!features=\s!default]
-    \definefontsynonym [Corbel-Bold]       [\s!file:corbelb] [\s!features=\s!default]
-    \definefontsynonym [Corbel-BoldItalic] [\s!file:corbelz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [corbel]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Corbel-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Corbel-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Corbel-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Corbel-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Corbel-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-% Consolas
-
-\starttypescript [\s!mono] [consolas]
-    \definefontsynonym [Consolas-Regular]    [\s!file:consola]  [\s!features=\s!default]
-    \definefontsynonym [Consolas-Italic]     [\s!file:consolai] [\s!features=\s!default]
-    \definefontsynonym [Consolas-Bold]       [\s!file:consolab] [\s!features=\s!default]
-    \definefontsynonym [Consolas-BoldItalic] [\s!file:consolaz] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [consolas]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [Consolas-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [Consolas-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [Consolas-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [Consolas-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!MonoCaps]       [Consolas-Regular]    [\s!features=\s!smallcaps]
-\stoptypescript
-
-\starttypescript [cambria,constantia]
-    \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
-\stoptypescript
-
-\starttypescript [calibri,candara,corbel]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-\stoptypescript
-
-\starttypescript [consolas]
-    \definetypeface [\typescriptone] [tt] [\s!mono] [\typescriptone] [\s!default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
index 6f6cfe1565d..a4258f60cdb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
@@ -26,6 +26,13 @@
 \starttypescriptcollection [vollkorn]
 
 \starttypescript [\s!serif] [vollkorn]
+    \definefontsynonym [Vollkorn-Regular]    [\s!file:Vollkorn-Regular]    [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-Italic]     [\s!file:Vollkorn-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-Bold]       [\s!file:Vollkorn-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-BoldItalic] [\s!file:Vollkorn-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [vollkorn]
     \setups[\s!font:\s!fallback:\s!serif]
     \definefontsynonym [Serif]           [Vollkorn-Regular]    [\s!features=\s!default]
     \definefontsynonym [SerifItalic]     [Vollkorn-Italic]     [\s!features=\s!default]
@@ -33,13 +40,6 @@
     \definefontsynonym [SerifBoldItalic] [Vollkorn-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [\s!serif] [vollkorn]
-    \definefontsynonym [Vollkorn-Regular]    [\s!file:Vollkorn-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Italic]     [\s!file:Vollkorn-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Bold]       [\s!file:Vollkorn-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-BoldItalic] [\s!file:Vollkorn-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
 \starttypescript [vollkorn]
     \definetypeface [vollkorn] [rm] [\s!serif] [vollkorn] [\s!default]
     \definetypeface [vollkorn] [ss] [\s!sans]  [modern]   [\s!default]
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
index 610e386bbe6..63fe8d477c9 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
@@ -26,6 +26,13 @@
 \starttypescriptcollection [vollkorn]
 
 \starttypescript [\s!serif] [vollkorn]
+    \definefontsynonym [Vollkorn-Regular]    [\s!file:vollkornregular]    [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-Italic]     [\s!file:vollkornitalic]     [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-Bold]       [\s!file:vollkornbold]       [\s!features=\s!default]
+    \definefontsynonym [Vollkorn-BoldItalic] [\s!file:vollkornbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [vollkorn]
     \setups[\s!font:\s!fallback:\s!serif]
     \definefontsynonym [Serif]           [Vollkorn-Regular]    [\s!features=\s!default]
     \definefontsynonym [SerifItalic]     [Vollkorn-Italic]     [\s!features=\s!default]
@@ -33,13 +40,6 @@
     \definefontsynonym [SerifBoldItalic] [Vollkorn-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [\s!serif] [vollkorn]
-    \definefontsynonym [Vollkorn-Regular]    [\s!file:vollkornregular]    [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Italic]     [\s!file:vollkornitalic]     [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Bold]       [\s!file:vollkornbold]       [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-BoldItalic] [\s!file:vollkornbolditalic] [\s!features=\s!default]
-\stoptypescript
-
 \starttypescript [vollkorn]
     \definetypeface [vollkorn] [rm] [\s!serif] [vollkorn] [\s!default]
     \definetypeface [vollkorn] [ss] [\s!sans]  [modern]   [\s!default]
author	Karl Berry <karl@freefriends.org>	2011-11-04 23:16:14 +0000
committer	Karl Berry <karl@freefriends.org>	2011-11-04 23:16:14 +0000
commit	e8ebecb6ccc3bdfe30c9ead5e953a3feb398a503 (patch)
tree	0f470fc33001b1c9db3f6de522537b42001697ba
parent	b19d9736b1233678daaf4e8d5538b129be4de268 (diff)