context-typescripts (1oct10)

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

91 files changed, 3258 insertions, 2299 deletions

diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
index ae690f1937f..4cb26da2b82 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-adobe,
-%D        version=2008.07.27,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Adobe Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,26 +10,77 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\definetypescriptprefix [f:minion]     [MinionPro]
-\definetypescriptprefix [f:myriad]     [MyriadPro]
-\definetypescriptprefix [f:warnockpro] [WarnockPro]
+\definetypescriptprefix [f:minion]     [minionpro]
+\definetypescriptprefix [f:myriad]     [myriadpro]
+\definetypescriptprefix [f:warnockpro] [warnockpro]
 
-% Minion / Warnock
+\definetypescriptprefix [n:minion]     [Minion]
+\definetypescriptprefix [n:myriad]     [Myriad]
+\definetypescriptprefix [n:warnockpro] [WarnockPro]
 
-\starttypescript [serif] [minion,warnockpro]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}-Regular] [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}-It]      [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}-Bold]    [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}-BoldIt]  [features=default]
+\starttypescriptcollection [adobe]
+
+\starttypescript [\s!serif,\s!sans] [minion,myriad,warnockpro]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!file:\typescriptprefix{f:\typescripttwo}-Regular] [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!file:\typescriptprefix{f:\typescripttwo}-It]      [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!file:\typescriptprefix{f:\typescripttwo}-Bold]    [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!file:\typescriptprefix{f:\typescripttwo}-BoldIt]  [\s!features=\s!default]
+\stoptypescript
+
+% Minion
+
+\starttypescript [\s!serif] [minion]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [minion]
+    \definetypeface [minion] [rm] [\s!serif] [minion] [\s!default]
+    \definetypeface [minion] [ss] [\s!sans]  [myriad] [\s!default]
+    \definetypeface [minion] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [minion] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Myriad
 
-\starttypescript [sans] [myriad]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}-Regular] [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}-It]      [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}-Bold]    [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}-BoldIt]  [features=default]
+\starttypescript [\s!sans] [myriad]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [myriad]
+    \definetypeface [myriad] [rm] [\s!serif] [minion] [\s!default]
+    \definetypeface [myriad] [ss] [\s!sans]  [myriad] [\s!default]
+    \definetypeface [myriad] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [myriad] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+% Warnock
+
+\starttypescript [\s!serif] [warnockpro]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [warnockpro]
+    \definetypeface [warnockpro] [rm] [\s!serif] [warnockpro] [\s!default]
+    \definetypeface [warnockpro] [ss] [\s!sans]  [modern]     [\s!default]
+    \definetypeface [warnockpro] [tt] [\s!mono]  [modern]     [\s!default]
+    \definetypeface [warnockpro] [mm] [\s!math]  [modern]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
index 38e65ba9925..29dedc7fe3c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-adobe,
-%D        version=2008.07.27,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Adobe Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -14,22 +14,73 @@
 \definetypescriptprefix [f:myriad]     [myriadpro]
 \definetypescriptprefix [f:warnockpro] [warnockpro]
 
-% Minion / Warnock
+\definetypescriptprefix [n:minion]     [minion]
+\definetypescriptprefix [n:myriad]     [myriad]
+\definetypescriptprefix [n:warnockpro] [warnockPro]
 
-\starttypescript [serif] [minion,warnockpro]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}regular] [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}it]      [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]    [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}boldit]  [features=default]
+\starttypescriptcollection [adobe]
+
+\starttypescript [\s!serif,\s!sans] [minion,myriad,warnockpro]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!file:\typescriptprefix{f:\typescripttwo}-regular] [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!file:\typescriptprefix{f:\typescripttwo}-it]      [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!file:\typescriptprefix{f:\typescripttwo}-bold]    [\s!features=\s!default]
+    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!file:\typescriptprefix{f:\typescripttwo}-boldit]  [\s!features=\s!default]
+\stoptypescript
+
+% Minion
+
+\starttypescript [\s!serif] [minion]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [minion]
+    \definetypeface [minion] [rm] [\s!serif] [minion] [\s!default]
+    \definetypeface [minion] [ss] [\s!sans]  [myriad] [\s!default]
+    \definetypeface [minion] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [minion] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Myriad
 
-\starttypescript [sans] [myriad]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}regular] [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}it]      [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]    [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}boldit]  [features=default]
+\starttypescript [\s!sans] [myriad]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [myriad]
+    \definetypeface [myriad] [rm] [\s!serif] [minion] [\s!default]
+    \definetypeface [myriad] [ss] [\s!sans]  [myriad] [\s!default]
+    \definetypeface [myriad] [tt] [\s!mono]  [modern] [\s!default]
+    \definetypeface [myriad] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+% Warnock
+
+\starttypescript [\s!serif] [warnockpro]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [\typescriptprefix{n:\typescripttwo}-\s!Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [\typescriptprefix{n:\typescripttwo}-\s!Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [\typescriptprefix{n:\typescripttwo}-\s!Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-\s!BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [warnockpro]
+    \definetypeface [warnockpro] [rm] [\s!serif] [warnockpro] [\s!default]
+    \definetypeface [warnockpro] [ss] [\s!sans]  [modern]     [\s!default]
+    \definetypeface [warnockpro] [tt] [\s!mono]  [modern]     [\s!default]
+    \definetypeface [warnockpro] [mm] [\s!math]  [modern]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex b/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex
deleted file mode 100644
index 6098e211987..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-adobe.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-%D \module
-%D   [       file=type-adobe,
-%D        version=2008.07.27,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Adobe Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\definetypescriptprefix [n:minion]     [Minion]
-\definetypescriptprefix [n:myriad]     [Myriad]
-\definetypescriptprefix [n:warnockpro] [WarnockPro]
-
-\starttypescriptcollection [adobe]
-
-% Minion
-
-\starttypescript [serif] [minion]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [minion]
-    \definetypeface [minion] [rm] [serif] [minion] [default]
-    \definetypeface [minion] [ss] [sans]  [myriad] [default]
-    \definetypeface [minion] [tt] [mono]  [modern] [default]
-    \definetypeface [minion] [mm] [math]  [modern] [default]
-\stoptypescript
-
-% Myriad
-
-\starttypescript [sans] [myriad]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [myriad]
-    \definetypeface [myriad] [rm] [serif] [minion] [default]
-    \definetypeface [myriad] [ss] [sans]  [myriad] [default]
-    \definetypeface [myriad] [tt] [mono]  [modern] [default]
-    \definetypeface [myriad] [mm] [math]  [modern] [default]
-\stoptypescript
-
-% Warnock
-
-\starttypescript [serif] [warnockpro]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [warnockpro]
-    \definetypeface [warnockpro] [rm] [serif] [warnockpro] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-adobe}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkii
index b787d62dd37..3c804f7b2ac 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=2008.11.06,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Aller Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,14 +10,42 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [sans] [aller,aller-light,aller-display]
-    \definefontsynonym [Aller-Regular]      [name:Aller]              [features=default]
-    \definefontsynonym [Aller-Italic]       [name:Aller Italic]       [features=default]
-    \definefontsynonym [Aller-Bold]         [name:Aller Bold]         [features=default]
-    \definefontsynonym [Aller-BoldItalic]   [name:Aller Bold Italic]  [features=default]
-    \definefontsynonym [Aller-Display]      [name:Aller Display]      [features=default]
-    \definefontsynonym [Aller-LightRegular] [name:Aller Light]        [features=default]
-    \definefontsynonym [Aller-LightItalic]  [name:Aller Light Italic] [features=default]
+\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]
+\stoptypescript
+
+\starttypescript [\s!sans] [aller]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Aller-Regular]    [\s!features=\s!default]
+    \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]
+\stoptypescript
+
+\starttypescript [\s!sans] [aller-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]       [Aller-LightRegular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic] [Aller-LightItalic]  [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!sans] [aller-display]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans] [Aller-Display] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [aller,aller-light,aller-display]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-aller.mkiv
index ba61ddb126f..f08ab0d5178 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=2008.11.06,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Aller Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,14 +10,42 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [sans] [aller,aller-light,aller-display]
-    \definefontsynonym [Aller-Regular]      [name:aller]            [features=default]
-    \definefontsynonym [Aller-Italic]       [name:alleritalic]      [features=default]
-    \definefontsynonym [Aller-Bold]         [name:allerbold]        [features=default]
-    \definefontsynonym [Aller-BoldItalic]   [name:allerbolditalic]  [features=default]
-    \definefontsynonym [Aller-Display]      [name:allerdisplay]     [features=default]
-    \definefontsynonym [Aller-LightRegular] [name:allerlight]       [features=default]
-    \definefontsynonym [Aller-LightItalic]  [name:allerlightitalic] [features=default]
+\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]
+\stoptypescript
+
+\starttypescript [\s!sans] [aller]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Aller-Regular]    [\s!features=\s!default]
+    \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]
+\stoptypescript
+
+\starttypescript [\s!sans] [aller-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]       [Aller-LightRegular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic] [Aller-LightItalic]  [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!sans] [aller-display]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans] [Aller-Display] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [aller,aller-light,aller-display]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex b/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex
deleted file mode 100644
index 69fb116e321..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-aller.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%D \module
-%D   [       file=type-aller,
-%D        version=2008.11.06,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Aller Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [aller]
-
-\starttypescript [sans] [aller]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Aller-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Aller-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Aller-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Aller-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [aller-light]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]       [Aller-LightRegular] [features=default]
-    \definefontsynonym [SansItalic] [Aller-LightItalic]  [features=default]
-\stoptypescript
-
-\starttypescript [sans] [aller-display]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Aller-Display] [features=default]
-\stoptypescript
-
-\starttypescript [aller,aller-light,aller-display]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-aller}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
index 05fd863f360..5591c502a4a 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-apostrophiclab,
-%D        version=2009.04.06,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Apostrophic Laboratories Collection,
 %D         author=Wolfgang Schuster,
@@ -13,89 +13,89 @@
 % Amerika / Amerika Sans
 
 \starttypescript [serif] [amerika]
-    \definefontsynonym [AmerikaSerif-Regular]    [name:Amerika]            [features=default]
-    \definefontsynonym [AmerikaSerif-Alternates] [name:Amerika Alternates] [features=default]
+    \definefontsynonym [AmerikaSerif-Regular]    [name:amerika]           [features=default]
+    \definefontsynonym [AmerikaSerif-Alternates] [name:amerikaalternates] [features=default]
 \stoptypescript
 
 \starttypescript [sans] [amerika]
-    \definefontsynonym [AmerikaSans-Regular] [name:Amerika Sans] [features=default]
+    \definefontsynonym [AmerikaSans-Regular] [name:amerikasans] [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]
+    \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: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]
+    \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: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]
+    \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:Day Roman]          [features=default]
-    \definefontsynonym [DayRoman-Expert]  [name:Day Roman - Expert] [features=default]
+    \definefontsynonym [DayRoman-Regular] [name:dayroman]       [features=default]
+    \definefontsynonym [DayRoman-Expert]  [name:dayromanexpert] [features=default]
 \stoptypescript
 
 % Devroye
@@ -107,161 +107,161 @@
 % 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]
+    \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]
+    \definefontsynonym [Komikazba-Regular] [name:komikazba] [features=default]
 \stoptypescript
 
 % Komikaze
 
 \starttypescript [sans] [komikaze]
-    \definefontsynonym [Komikaze-Regular] [name:Komikaze] [features=default]
+    \definefontsynonym [Komikaze-Regular] [name:komikaze] [features=default]
 \stoptypescript
 
 % Labrit
 
 \starttypescript [serif] [labrit]
-    \definefontsynonym [Labrit-Regular] [name:LaBrit] [features=default]
+    \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]
+    \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: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]
+    \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: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]
+    \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: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]
+    \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:Usenet - Alternates] [features=default]
+    \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:Youthanasia Italic] [features=default]
+    \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]
+    \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
index 2590b3ec4a6..136d570a8e3 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-apostrophiclab.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-apostrophiclab,
-%D        version=2009.04.06,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Apostrophic Laboratories Collection,
 %D         author=Wolfgang Schuster,
@@ -32,6 +32,7 @@
 \starttypescript [amerika]
     \definetypeface [amerika] [rm] [serif] [amerika] [default]
     \definetypeface [amerika] [ss] [sans]  [amerika] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Ashby
@@ -46,6 +47,7 @@
 
 \starttypescript [ashby]
     \definetypeface [ashby] [ss] [sans] [ashby] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Charrington
@@ -58,6 +60,7 @@
 
 \starttypescript [charrington]
     \definetypeface [charrington] [rm] [serif] [charrington] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Covington / Covington SC
@@ -83,6 +86,7 @@
 
 \starttypescript [serif] [dayroman]
     \definetypeface [dayroman] [rm] [serif] [dayroman] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Devroye
@@ -94,6 +98,7 @@
 
 \starttypescript [devroye]
     \definetypeface [devroye] [rm] [serif] [devroye] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Florence Sans / Florence Sans SC
@@ -119,6 +124,7 @@
 
 \starttypescript [komikazba]
     \definetypeface [komikazba] [ss] [sans] [komikazba] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Komikaze
@@ -130,6 +136,7 @@
 
 \starttypescript [komikaze]
     \definetypeface [komikaze] [ss] [sans] [komikaze] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Labrit
@@ -141,6 +148,7 @@
 
 \starttypescript [labrit]
     \definetypeface [labrit] [rm] [serif] [labrit] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Lady Copra
@@ -152,6 +160,7 @@
 
 \starttypescript [ladycopra]
     \definetypeface [ladycopra] [ss] [sans] [ladycopra] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Lady Ice / Lady Ice Extra / Lady Ice Revisited
@@ -165,6 +174,7 @@
 
 \starttypescript [ladyice]
     \definetypeface [ladyice] [ss] [sans] [ladyice] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Steinem
@@ -179,6 +189,7 @@
 
 \starttypescript [steinem]
     \definetypeface [steinem] [ss] [sans] [steinem] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Street Corner
@@ -192,6 +203,7 @@
 
 \starttypescript [streetcorner]
     \definetypeface [streetcorner] [ss] [sans] [streetcorner] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Usenet
@@ -203,6 +215,7 @@
 
 \starttypescript [usenet]
     \definetypeface [usenet] [rm] [serif] [usenet] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Youthanasia
@@ -215,6 +228,7 @@
 
 \starttypescript [youthanasia]
     \definetypeface [youthanasia] [ss] [sans] [youthanasia] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Zebrra
@@ -226,6 +240,7 @@
 
 \starttypescript [zebrra]
     \definetypeface [zebrra] [rm] [serif] [zebrra] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
index 16839346455..6857e2b9f41 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-arkandis,
-%D        version=2009.03.24,
+%D        version=2010.08.03,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Arkandis Collection,
 %D         author=Wolfgang Schuster,
@@ -10,225 +10,483 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
+\starttypescriptcollection [arkandis]
+
 % Accanthis
 
-\starttypescript [serif] [accanthis]
-    \definefontsynonym [Accanthis-Regular]    [name:AccanthisADFStd-Regular]    [features=default]
-    \definefontsynonym [Accanthis-Italic]     [name:AccanthisADFStd-Italic]     [features=default]
-    \definefontsynonym [Accanthis-Bold]       [name:AccanthisADFStd-Bold]       [features=default]
-    \definefontsynonym [Accanthis-BoldItalic] [name:AccanthisADFStd-BoldItalic] [features=default]
+\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 [serif] [accanthis-two]
-    \definefontsynonym [AccanthisTwo-Regular]    [name:AccanthisADFStdNo2-Regular]    [features=default]
-    \definefontsynonym [AccanthisTwo-Italic]     [name:AccanthisADFStdNo2-Italic]     [features=default]
-    \definefontsynonym [AccanthisTwo-Bold]       [name:AccanthisADFStdNo2-Bold]       [features=default]
-    \definefontsynonym [AccanthisTwo-BoldItalic] [name:AccanthisADFStdNo2-BoldItalic] [features=default]
+\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 [serif] [baskervald]
-    \definefontsynonym [Baskervald-Regular]     [name:BaskervaldADFStd-Regular]      [features=default]
-    \definefontsynonym [Baskervald-Italic]      [name:BaskervaldADFStd-Italic]       [features=default]
-    \definefontsynonym [Baskervald-Bold]        [name:BaskervaldADFStd-Bold]         [features=default]
-    \definefontsynonym [Baskervald-BoldItalic]  [name:BaskervaldADFStd-BoldItalic]   [features=default]
-    \definefontsynonym [Baskervald-Heavy]       [name:BaskervaldADFStdHeavy]         [features=default]
-    \definefontsynonym [Baskervald-HeavyItalic] [name:BaskervaldADFStdHeavy-Oblique] [features=default]
+\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 [serif] [berenis]
-    \definefontsynonym [Berenis-Condensed]        [name:Berenis ADF Cd Book]         [features=default]
-    \definefontsynonym [Berenis-ItalicCond]       [name:Berenis ADF Cd Italic]       [features=default]
-    \definefontsynonym [Berenis-BoldCond]         [name:Berenis ADF Cd Bold]         [features=default]
-    \definefontsynonym [Berenis-BoldItalicCond]   [name:Berenis ADF Cd Bold Italic]  [features=default]
-    \definefontsynonym [Berenis-Regular]          [name:Berenis ADF Book]            [features=default]
-    \definefontsynonym [Berenis-Italic]           [name:Berenis ADF Italic]          [features=default]
-    \definefontsynonym [Berenis-Medium]           [name:Berenis ADF Med Regular]     [features=default]
-    \definefontsynonym [Berenis-MediumItalic]     [name:Berenis ADF Med Italic]      [features=default]
-    \definefontsynonym [Berenis-MediumBold]       [name:Berenis ADF Med Bold]        [features=default]
-    \definefontsynonym [Berenis-MediumBoldItalic] [name:Berenis ADF Med Bold Italic] [features=default]
-    \definefontsynonym [Berenis-Bold]             [name:Berenis ADF Bold]            [features=default]
-    \definefontsynonym [Berenis-BoldItalic]       [name:Berenis ADF Bold Italic]     [features=default]
+\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 [serif] [berenis-two]
-    \definefontsynonym [BerenisTwo-Condensed]      [name:Berenis ADF No2 Cd Book]         [features=default]
-    \definefontsynonym [BerenisTwo-ItalicCond]     [name:Berenis ADF No2 Cd Italic]       [features=default]
-    \definefontsynonym [BerenisTwo-BoldCond]       [name:Berenis ADF No2 Cd Bold]         [features=default]
-    \definefontsynonym [BerenisTwo-BoldItalicCond] [name:Berenis ADF No2 Cd Bold Italic]  [features=default]
-    \definefontsynonym [BerenisTwo-Regular]        [name:Berenis ADF No2 Book]            [features=default]
-    \definefontsynonym [BerenisTwo-Italic]         [name:Berenis ADF No2 Italic]          [features=default]
-    \definefontsynonym [BerenisTwo-Bold]           [name:Berenis ADF No2 Bold]            [features=default]
-    \definefontsynonym [BerenisTwo-BoldItalic]     [name:Berenis ADF No2 Bold Italic]     [features=default]
+\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 [sans] [gillius]
-    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [features=default]
-    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [features=default]
-    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [features=default]
-    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [features=default]
-    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [features=default]
-    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [features=default]
-    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [features=default]
-    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [features=default]
+\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 [sans] [gillius-two]
-    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [features=default]
-    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [features=default]
-    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [features=default]
-    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [features=default]
-    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [features=default]
-    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [features=default]
-    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [features=default]
-    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [features=default]
+\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 [sans] [ikarius]
-    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [features=default]
-    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [features=default]
-    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [features=default]
-    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [features=default]
+\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 [sans] [ikarius-two]
-    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [features=default]
-    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [features=default]
-    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [features=default]
-    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [features=default]
+\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 [serif] [irianis]
-    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [features=default]
-    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [features=default]
-    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [features=default]
-    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [features=default]
-    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [features=default]
-    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [features=default]
-    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [features=default]
-    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [features=default]
+\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 [sans] [libris]
-    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [features=default]
-    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [features=default]
-    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [features=default]
-    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [features=default]
+\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 [serif] [mekanus]
-    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [features=default]
-    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [features=default]
-    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [features=default]
-    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [features=default]
+\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 [serif] [romande]
-    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [features=default]
-    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [features=default]
-    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [features=default]
-    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [features=default]
-    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [features=default]
-    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [features=default]
-    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [features=default]
+\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 [sans] [switzera]
-    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [features=default]
-    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [features=default]
-    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [features=default]
-    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [features=default]
-    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [features=default]
-    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [features=default]
-    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [features=default]
-    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [features=default]
-    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [features=default]
-    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [features=default]
-    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [features=default]
-    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [features=default]
-    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [features=default]
-    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [features=default]
-    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [features=default]
-    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [features=default]
-    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [features=default]
-    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [features=default]
-    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [features=default]
-    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [features=default]
-    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [features=default]
-    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [features=default]
-    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [features=default]
-    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [features=default]
+\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 [serif] [tribun]
-    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [features=default]
-    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [features=default]
-    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [features=default]
-    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [features=default]
-    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [features=default]
-    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [features=default]
-    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [features=default]
-    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [features=default]
+\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 [sans] [universalis]
-    \definefontsynonym [Universalis-Condensed]      [name:UniversalisADFCdStd-Regular]   [features=default]
-    \definefontsynonym [Universalis-ItalicCond]     [name:UniversalisADFCdStd-Oblique]   [features=default]
-    \definefontsynonym [Universalis-BoldCond]       [name:UniversalisADFCdStd-Bold]      [features=default]
-    \definefontsynonym [Universalis-BoldItalicCond] [name:UniversalisADFCdStd-BdOblique] [features=default]
-    \definefontsynonym [Universalis-Regular]        [name:UniversalisADFStd-Regular]     [features=default]
-    \definefontsynonym [Universalis-Italic]         [name:UniversalisADFStd-Oblique]     [features=default]
-    \definefontsynonym [Universalis-Bold]           [name:UniversalisADFStd-Bold]        [features=default]
-    \definefontsynonym [Universalis-BoldItalic]     [name:UniversalisADFStd-BoldOblique] [features=default]
+\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 [serif] [verana]
-    \definefontsynonym [Verana-Regular]    [name:Verana-Regular]    [features=default]
-    \definefontsynonym [Verana-Italic]     [name:Verana-Italic]     [features=default]
-    \definefontsynonym [Verana-Bold]       [name:Verana-Bold]       [features=default]
-    \definefontsynonym [Verana-BoldItalic] [name:Verana-BoldItalic] [features=default]
+\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 [sans] [verana]
-    \definefontsynonym [VeranaSans-Regular]      [name:VeranaSans-Regular]       [features=default]
-    \definefontsynonym [VeranaSans-Italic]       [name:VeranaSans-Oblique]       [features=default]
-    \definefontsynonym [VeranaSans-Bold]         [name:VeranaSans-Bold]          [features=default]
-    \definefontsynonym [VeranaSans-BoldItalic]   [name:VeranaSans-BoldOblique]   [features=default]
-    \definefontsynonym [VeranaSans-Demi]         [name:VeranaSansDemi-Regular]   [features=default]
-    \definefontsynonym [VeranaSans-DemiItalic]   [name:VeranaSansDemi-Oblique]   [features=default]
-    \definefontsynonym [VeranaSans-Medium]       [name:VeranaSansMedium-Regular] [features=default]
-    \definefontsynonym [VeranaSans-MediumItalic] [name:VeranaSansMedium-Oblique] [features=default]
+\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
index 16839346455..6857e2b9f41 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-arkandis,
-%D        version=2009.03.24,
+%D        version=2010.08.03,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Arkandis Collection,
 %D         author=Wolfgang Schuster,
@@ -10,225 +10,483 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
+\starttypescriptcollection [arkandis]
+
 % Accanthis
 
-\starttypescript [serif] [accanthis]
-    \definefontsynonym [Accanthis-Regular]    [name:AccanthisADFStd-Regular]    [features=default]
-    \definefontsynonym [Accanthis-Italic]     [name:AccanthisADFStd-Italic]     [features=default]
-    \definefontsynonym [Accanthis-Bold]       [name:AccanthisADFStd-Bold]       [features=default]
-    \definefontsynonym [Accanthis-BoldItalic] [name:AccanthisADFStd-BoldItalic] [features=default]
+\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 [serif] [accanthis-two]
-    \definefontsynonym [AccanthisTwo-Regular]    [name:AccanthisADFStdNo2-Regular]    [features=default]
-    \definefontsynonym [AccanthisTwo-Italic]     [name:AccanthisADFStdNo2-Italic]     [features=default]
-    \definefontsynonym [AccanthisTwo-Bold]       [name:AccanthisADFStdNo2-Bold]       [features=default]
-    \definefontsynonym [AccanthisTwo-BoldItalic] [name:AccanthisADFStdNo2-BoldItalic] [features=default]
+\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 [serif] [baskervald]
-    \definefontsynonym [Baskervald-Regular]     [name:BaskervaldADFStd-Regular]      [features=default]
-    \definefontsynonym [Baskervald-Italic]      [name:BaskervaldADFStd-Italic]       [features=default]
-    \definefontsynonym [Baskervald-Bold]        [name:BaskervaldADFStd-Bold]         [features=default]
-    \definefontsynonym [Baskervald-BoldItalic]  [name:BaskervaldADFStd-BoldItalic]   [features=default]
-    \definefontsynonym [Baskervald-Heavy]       [name:BaskervaldADFStdHeavy]         [features=default]
-    \definefontsynonym [Baskervald-HeavyItalic] [name:BaskervaldADFStdHeavy-Oblique] [features=default]
+\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 [serif] [berenis]
-    \definefontsynonym [Berenis-Condensed]        [name:Berenis ADF Cd Book]         [features=default]
-    \definefontsynonym [Berenis-ItalicCond]       [name:Berenis ADF Cd Italic]       [features=default]
-    \definefontsynonym [Berenis-BoldCond]         [name:Berenis ADF Cd Bold]         [features=default]
-    \definefontsynonym [Berenis-BoldItalicCond]   [name:Berenis ADF Cd Bold Italic]  [features=default]
-    \definefontsynonym [Berenis-Regular]          [name:Berenis ADF Book]            [features=default]
-    \definefontsynonym [Berenis-Italic]           [name:Berenis ADF Italic]          [features=default]
-    \definefontsynonym [Berenis-Medium]           [name:Berenis ADF Med Regular]     [features=default]
-    \definefontsynonym [Berenis-MediumItalic]     [name:Berenis ADF Med Italic]      [features=default]
-    \definefontsynonym [Berenis-MediumBold]       [name:Berenis ADF Med Bold]        [features=default]
-    \definefontsynonym [Berenis-MediumBoldItalic] [name:Berenis ADF Med Bold Italic] [features=default]
-    \definefontsynonym [Berenis-Bold]             [name:Berenis ADF Bold]            [features=default]
-    \definefontsynonym [Berenis-BoldItalic]       [name:Berenis ADF Bold Italic]     [features=default]
+\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 [serif] [berenis-two]
-    \definefontsynonym [BerenisTwo-Condensed]      [name:Berenis ADF No2 Cd Book]         [features=default]
-    \definefontsynonym [BerenisTwo-ItalicCond]     [name:Berenis ADF No2 Cd Italic]       [features=default]
-    \definefontsynonym [BerenisTwo-BoldCond]       [name:Berenis ADF No2 Cd Bold]         [features=default]
-    \definefontsynonym [BerenisTwo-BoldItalicCond] [name:Berenis ADF No2 Cd Bold Italic]  [features=default]
-    \definefontsynonym [BerenisTwo-Regular]        [name:Berenis ADF No2 Book]            [features=default]
-    \definefontsynonym [BerenisTwo-Italic]         [name:Berenis ADF No2 Italic]          [features=default]
-    \definefontsynonym [BerenisTwo-Bold]           [name:Berenis ADF No2 Bold]            [features=default]
-    \definefontsynonym [BerenisTwo-BoldItalic]     [name:Berenis ADF No2 Bold Italic]     [features=default]
+\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 [sans] [gillius]
-    \definefontsynonym [Gillius-Condensed]      [name:Gillius ADF Cd Regular]     [features=default]
-    \definefontsynonym [Gillius-ItalicCond]     [name:Gillius ADF Cd Italic]      [features=default]
-    \definefontsynonym [Gillius-BoldCond]       [name:Gillius ADF Cd Bold]        [features=default]
-    \definefontsynonym [Gillius-BoldItalicCond] [name:Gillius ADF Cd Bold Italic] [features=default]
-    \definefontsynonym [Gillius-Regular]        [name:Gillius ADF Regular]        [features=default]
-    \definefontsynonym [Gillius-Italic]         [name:Gillius ADF Italic]         [features=default]
-    \definefontsynonym [Gillius-Bold]           [name:Gillius ADF Bold]           [features=default]
-    \definefontsynonym [Gillius-BoldItalic]     [name:Gillius ADF Bold Italic]    [features=default]
+\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 [sans] [gillius-two]
-    \definefontsynonym [GilliusTwo-Condensed]      [name:Gillius ADF No2 Cd Regular]     [features=default]
-    \definefontsynonym [GilliusTwo-ItalicCond]     [name:Gillius ADF No2 Cd Italic]      [features=default]
-    \definefontsynonym [GilliusTwo-BoldCond]       [name:Gillius ADF No2 Cd Bold]        [features=default]
-    \definefontsynonym [GilliusTwo-BoldItalicCond] [name:Gillius ADF No2 Cd Bold Italic] [features=default]
-    \definefontsynonym [GilliusTwo-Regular]        [name:Gillius ADF No2 Regular]        [features=default]
-    \definefontsynonym [GilliusTwo-Italic]         [name:Gillius ADF No2 Italic]         [features=default]
-    \definefontsynonym [GilliusTwo-Bold]           [name:Gillius ADF No2 Bold]           [features=default]
-    \definefontsynonym [GilliusTwo-BoldItalic]     [name:Gillius ADF No2 Bold Italic]    [features=default]
+\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 [sans] [ikarius]
-    \definefontsynonym [Ikarius-Regular]    [name:IkariusADFStd-Regular]    [features=default]
-    \definefontsynonym [Ikarius-Italic]     [name:IkariusADFStd-Italic]     [features=default]
-    \definefontsynonym [Ikarius-Bold]       [name:IkariusADFStd-Bold]       [features=default]
-    \definefontsynonym [Ikarius-BoldItalic] [name:IkariusADFStd-BoldItalic] [features=default]
+\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 [sans] [ikarius-two]
-    \definefontsynonym [IkariusTwo-Regular]    [name:IkariusADFNo2Std-Regular]    [features=default]
-    \definefontsynonym [IkariusTwo-Italic]     [name:IkariusADFNo2Std-Italic]     [features=default]
-    \definefontsynonym [IkariusTwo-Bold]       [name:IkariusADFNo2Std-Bold]       [features=default]
-    \definefontsynonym [IkariusTwo-BoldItalic] [name:IkariusADFNo2Std-BoldItalic] [features=default]
+\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 [serif] [irianis]
-    \definefontsynonym [Irianis-Regular]         [name:IrianisADFStd-Regular]         [features=default]
-    \definefontsynonym [Irianis-Italic]          [name:IrianisADFStd-Italic]          [features=default]
-    \definefontsynonym [Irianis-Bold]            [name:IrianisADFStd-Bold]            [features=default]
-    \definefontsynonym [Irianis-BoldItalic]      [name:IrianisADFStd-BoldItalic]      [features=default]
-    \definefontsynonym [IrianisStyle-Regular]    [name:IrianisADFStyleStd-Regular]    [features=default]
-    \definefontsynonym [IrianisStyle-Italic]     [name:IrianisADFStyleStd-Italic]     [features=default]
-    \definefontsynonym [IrianisStyle-Bold]       [name:IrianisADFStyleStd-Bold]       [features=default]
-    \definefontsynonym [IrianisStyle-BoldItalic] [name:IrianisADFStyleStd-BoldItalic] [features=default]
+\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 [sans] [libris]
-    \definefontsynonym [Libris-Regular]    [name:LibrisADFStd-Regular]    [features=default]
-    \definefontsynonym [Libris-Italic]     [name:LibrisADFStd-Italic]     [features=default]
-    \definefontsynonym [Libris-Bold]       [name:LibrisADFStd-Bold]       [features=default]
-    \definefontsynonym [Libris-BoldItalic] [name:LibrisADFStd-BoldItalic] [features=default]
+\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 [serif] [mekanus]
-    \definefontsynonym [Mekanus-Regular]    [name:MekanusADFStd-Regular]    [features=default]
-    \definefontsynonym [Mekanus-Italic]     [name:MekanusADFStd-Italic]     [features=default]
-    \definefontsynonym [Mekanus-Bold]       [name:MekanusADFStd-Bold]       [features=default]
-    \definefontsynonym [Mekanus-BoldItalic] [name:MekanusADFStd-BoldItalic] [features=default]
+\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 [serif] [romande]
-    \definefontsynonym [Romande-Script]        [name:Romande ADF Script Std Italic]    [features=default]
-    \definefontsynonym [Romande-Regular]       [name:Romande ADF Std Regular]          [features=default]
-    \definefontsynonym [Romande-Italic]        [name:Romande ADF Std Italic]           [features=default]
-    \definefontsynonym [Romande-Bold]          [name:Romande ADF Std Demi Bold]        [features=default]
-    \definefontsynonym [Romande-BoldItalic]    [name:Romande ADF Std Demi Bold Italic] [features=default]
-    \definefontsynonym [Romande-Smallcaps]     [name:Romande ADF Style Std Regular]    [features=default]
-    \definefontsynonym [Romande-BoldSmallcaps] [name:Romande ADF Style Std Demi Bold]  [features=default]
+\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 [sans] [switzera]
-    \definefontsynonym [Switzera-LightCond]           [name:SwitzeraADFLightCd-Regular]    [features=default]
-    \definefontsynonym [Switzera-LightItalicCond]     [name:SwitzeraADFLightCd-Italic]     [features=default]
-    \definefontsynonym [Switzera-LightBoldCond]       [name:SwitzeraADFLightCd-Bold]       [features=default]
-    \definefontsynonym [Switzera-LightBoldItalicCond] [name:SwitzeraADFLightCd-BoldItalic] [features=default]
-    \definefontsynonym [Switzera-Light]               [name:SwitzeraADFLight-Regular]      [features=default]
-    \definefontsynonym [Switzera-LightItalic]         [name:SwitzeraADFLight-Italic]       [features=default]
-    \definefontsynonym [Switzera-LightBold]           [name:SwitzeraADFLight-Bold]         [features=default]
-    \definefontsynonym [Switzera-LightBoldItalic]     [name:SwitzeraADFLight-BoldItalic]   [features=default]
-    \definefontsynonym [Switzera-Condensed]           [name:SwitzeraADFCd-Regular]         [features=default]
-    \definefontsynonym [Switzera-ItalicCond]          [name:SwitzeraADFCd-Italic]          [features=default]
-    \definefontsynonym [Switzera-BoldCond]            [name:SwitzeraADFCd-Bold]            [features=default]
-    \definefontsynonym [Switzera-BoldItalicCond]      [name:SwitzeraADFCd-BoldItalic]      [features=default]
-    \definefontsynonym [Switzera-Regular]             [name:SwitzeraADF-Regular]           [features=default]
-    \definefontsynonym [Switzera-Italic]              [name:SwitzeraADF-Italic]            [features=default]
-    \definefontsynonym [Switzera-Demi]                [name:SwitzeraADF-DemiBold]          [features=default]
-    \definefontsynonym [Switzera-DemiItalic]          [name:SwitzeraADF-DemiBoldItalic]    [features=default]
-    \definefontsynonym [Switzera-Bold]                [name:SwitzeraADFBold]               [features=default]
-    \definefontsynonym [Switzera-BoldItalic]          [name:SwitzeraADFBold-Italic]        [features=default]
-    \definefontsynonym [Switzera-ExItalic]            [name:SwitzeraADFEx-Italic]          [features=default]
-    \definefontsynonym [Switzera-ExRegular]           [name:SwitzeraADFEx-Regular]         [features=default]
-    \definefontsynonym [Switzera-ExBold]              [name:SwitzeraADFEx-Bold]            [features=default]
-    \definefontsynonym [Switzera-ExBoldItalic]        [name:SwitzeraADFEx-BoldItalic]      [features=default]
-    \definefontsynonym [Switzera-ExtraBold]           [name:SwitzeraADFExtraBold]          [features=default]
-    \definefontsynonym [Switzera-ExtraBoldItalic]     [name:SwitzeraADFExtraBold-Italic]   [features=default]
+\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 [serif] [tribun]
-    \definefontsynonym [Tribun-Condensed]      [name:Tribun ADF Med Cd Std Regular]     [features=default]
-    \definefontsynonym [Tribun-ItalicCond]     [name:Tribun ADF Med Cd Std Italic]      [features=default]
-    \definefontsynonym [Tribun-BoldCond]       [name:Tribun ADF Med Cd Std Bold]        [features=default]
-    \definefontsynonym [Tribun-BoldItalicCond] [name:Tribun ADF Med Cd Std Bold Italic] [features=default]
-    \definefontsynonym [Tribun-Regular]        [name:Tribun ADF Med Std Regular]        [features=default]
-    \definefontsynonym [Tribun-Italic]         [name:Tribun ADF Med Std Italic]         [features=default]
-    \definefontsynonym [Tribun-Bold]           [name:Tribun ADF Med Std Bold]           [features=default]
-    \definefontsynonym [Tribun-BoldItalic]     [name:Tribun ADF Med Std Bold Italic]    [features=default]
+\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 [sans] [universalis]
-    \definefontsynonym [Universalis-Condensed]      [name:UniversalisADFCdStd-Regular]   [features=default]
-    \definefontsynonym [Universalis-ItalicCond]     [name:UniversalisADFCdStd-Oblique]   [features=default]
-    \definefontsynonym [Universalis-BoldCond]       [name:UniversalisADFCdStd-Bold]      [features=default]
-    \definefontsynonym [Universalis-BoldItalicCond] [name:UniversalisADFCdStd-BdOblique] [features=default]
-    \definefontsynonym [Universalis-Regular]        [name:UniversalisADFStd-Regular]     [features=default]
-    \definefontsynonym [Universalis-Italic]         [name:UniversalisADFStd-Oblique]     [features=default]
-    \definefontsynonym [Universalis-Bold]           [name:UniversalisADFStd-Bold]        [features=default]
-    \definefontsynonym [Universalis-BoldItalic]     [name:UniversalisADFStd-BoldOblique] [features=default]
+\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 [serif] [verana]
-    \definefontsynonym [Verana-Regular]    [name:Verana-Regular]    [features=default]
-    \definefontsynonym [Verana-Italic]     [name:Verana-Italic]     [features=default]
-    \definefontsynonym [Verana-Bold]       [name:Verana-Bold]       [features=default]
-    \definefontsynonym [Verana-BoldItalic] [name:Verana-BoldItalic] [features=default]
+\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 [sans] [verana]
-    \definefontsynonym [VeranaSans-Regular]      [name:VeranaSans-Regular]       [features=default]
-    \definefontsynonym [VeranaSans-Italic]       [name:VeranaSans-Oblique]       [features=default]
-    \definefontsynonym [VeranaSans-Bold]         [name:VeranaSans-Bold]          [features=default]
-    \definefontsynonym [VeranaSans-BoldItalic]   [name:VeranaSans-BoldOblique]   [features=default]
-    \definefontsynonym [VeranaSans-Demi]         [name:VeranaSansDemi-Regular]   [features=default]
-    \definefontsynonym [VeranaSans-DemiItalic]   [name:VeranaSansDemi-Oblique]   [features=default]
-    \definefontsynonym [VeranaSans-Medium]       [name:VeranaSansMedium-Regular] [features=default]
-    \definefontsynonym [VeranaSans-MediumItalic] [name:VeranaSansMedium-Oblique] [features=default]
+\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.tex b/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.tex
deleted file mode 100644
index 7b5b297e7a8..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-arkandis.tex
+++ /dev/null
@@ -1,266 +0,0 @@
-%D \module
-%D   [       file=type-arkandis,
-%D        version=2009.03.24,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Arkandis Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [arkandis]
-
-% Accanthis
-
-\starttypescript [serif] [accanthis]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Accanthis-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Accanthis-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Accanthis-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Accanthis-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [accanthis]
-    \definetypeface [accanthis] [rm] [serif] [accanthis] [default]
-\stoptypescript
-
-% Accanthis No2
-
-\starttypescript [serif] [accanthis-two]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [AccanthisTwo-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [AccanthisTwo-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [AccanthisTwo-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [AccanthisTwo-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [accanthis-two]
-    \definetypeface [accanthis-two] [rm] [serif] [accanthis-two] [default]
-\stoptypescript
-
-% Baskervald
-
-\starttypescript [serif] [baskervald]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Baskervald-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Baskervald-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Baskervald-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Baskervald-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [baskervald]
-    \definetypeface [baskervald] [rm] [serif] [baskervald] [default]
-\stoptypescript
-
-% Berenis
-
-\starttypescript [serif] [berenis]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Berenis-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Berenis-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Berenis-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Berenis-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [berenis]
-    \definetypeface [berenis] [rm] [serif] [berenis] [default]
-\stoptypescript
-
-% Berenis No2
-
-\starttypescript [serif] [berenis-two]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [BerenisTwo-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [BerenisTwo-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [BerenisTwo-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [BerenisTwo-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [berenis-two]
-    \definetypeface [berenis-two] [rm] [serif] [berenis-two] [default]
-\stoptypescript
-
-% Gillius ADF
-
-\starttypescript [sans] [gillius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Gillius-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Gillius-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Gillius-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Gillius-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [gillius]
-    \definetypeface [gillius] [ss] [sans] [gillius] [default]
-\stoptypescript
-
-% Gillius No2
-
-\starttypescript [sans] [gillius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GilliusTwo-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [GilliusTwo-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [GilliusTwo-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [GilliusTwo-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [gillius-two]
-    \definetypeface [gillius-two] [ss] [sans] [gillius-two] [default]
-\stoptypescript
-
-% Ikarius
-
-\starttypescript [sans] [ikarius]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Ikarius-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Ikarius-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Ikarius-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Ikarius-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [ikarius]
-    \definetypeface [ikarius] [ss] [sans] [ikarius] [default]
-\stoptypescript
-
-% Ikarius No2
-
-\starttypescript [sans] [ikarius-two]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [IkariusTwo-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [IkariusTwo-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [IkariusTwo-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [IkariusTwo-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [ikarius-two]
-    \definetypeface [ikarius-two] [ss] [sans] [ikarius-two] [default]
-\stoptypescript
-
-% Irianis
-
-\starttypescript [serif] [irianis]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Irianis-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Irianis-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Irianis-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Irianis-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [irianis]
-    \definetypeface [irianis] [rm] [serif] [irianis] [default]
-\stoptypescript
-
-% Libris
-
-\starttypescript [sans] [libris]
-    \definefontsynonym [Sans]           [Libris-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Libris-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Libris-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Libris-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [libris]
-    \definetypeface [libris] [ss] [sans] [libris] [default]
-\stoptypescript
-
-% Mekanus
-
-\starttypescript [serif] [mekanus]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Mekanus-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Mekanus-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Mekanus-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Mekanus-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mekanus]
-    \definetypeface [mekanus] [rm] [serif] [mekanus] [default]
-\stoptypescript
-
-% Romande
-
-\starttypescript [serif] [romande]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Romande-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Romande-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Romande-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Romande-BoldItalic] [features=default]
-    \definefontsynonym [SerifCaps]       [Romande-Smallcaps]  [features=default]
-\stoptypescript
-
-\starttypescript [romande]
-    \definetypeface [romande] [rm] [serif] [romande] [default]
-\stoptypescript
-
-% Switzera
-
-\starttypescript [sans] [switzera]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Switzera-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Switzera-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Switzera-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Switzera-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [switzera]
-    \definetypeface [switzera] [ss] [sans] [switzera] [default]
-\stoptypescript
-
-% Tribun
-
-\starttypescript [serif] [tribun]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Tribun-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Tribun-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Tribun-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Tribun-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [tribun]
-    \definetypeface [tribun] [rm] [serif] [tribun] [default]
-\stoptypescript
-
-% Universalis
-
-\starttypescript [sans] [universalis]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Universalis-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Universalis-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Universalis-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Universalis-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [universalis]
-    \definetypeface [universalis] [ss] [sans] [universalis] [default]
-\stoptypescript
-
-% Verana
-
-\starttypescript [serif] [verana]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Verana-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Verana-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Verana-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Verana-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [verana]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [VeranaSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [VeranaSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [VeranaSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [VeranaSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [verana]
-    \definetypeface [verana] [rm] [serif] [verana] [default]
-    \definetypeface [verana] [ss] [sans]  [verana] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-arkandis}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex b/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex
deleted file mode 100644
index 4c1fa92b2bf..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-asana.tex
+++ /dev/null
@@ -1,38 +0,0 @@
-%D \module
-%D   [       file=type-asana,
-%D        version=2009.03.25,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Asana Font Definitions,
-%D         author=Aditya Mahajan,
-%D           date=\currentdate,
-%D      copyright=Aditya Mahajan]
-%C
-%C Copyright 2009 Aditya Mahajan.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-%D Asana math is a \OPENTYPE\ math font that is available freely under the Open
-%D Font License. The font may be downloaded from:
-%D \startitemize
-%D \item Open font library: 
-%D       \hyphenatedurl{http://openfontlibrary.org/media/files/asyropoulos/219}
-%D \item CTAN: 
-%D       \hyphenatedurl{http://www.ctan.org/tex-archive/fonts/Asana-Math/}
-%D \stopitemize
-
-\starttypescriptcollection[asana]
-
-\starttypescript [math] [asana] [name]
-    \definefontsynonym [MathRoman] [name:Asana-Math] [features=math\mathsizesuffix]
-\stoptypescript
-
-\starttypescript [asana]
-    \definetypeface [asana] [rm] [serif] [palatino] [default]
-    \definetypeface [asana] [ss] [sans]  [modern]   [default] [rscale=1.075]
-    \definetypeface [asana] [tt] [mono]  [modern]   [default] [rscale=1.075]
-    \definetypeface [asana] [mm] [math]  [asana]    [default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
index 9a602efe9b7..b7a2020ad46 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-baar,
-%D        version=2009.03.29,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Baar Collection,
 %D         author=Wolfgang Schuster,
@@ -10,15 +10,66 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\definetypescriptprefix [f:metanoia] [Baar Metanoia]
-\definetypescriptprefix [f:philos]   [Baar Philos]
-\definetypescriptprefix [f:sophia]   [Baar Sophia]
+%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}
 
-\starttypescript [sans] [metanoia,philos,sophia]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]            [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]     [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]       [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} BoldItalic] [features=default]
+\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
index 9a602efe9b7..b7a2020ad46 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-baar.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-baar,
-%D        version=2009.03.29,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Baar Collection,
 %D         author=Wolfgang Schuster,
@@ -10,15 +10,66 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\definetypescriptprefix [f:metanoia] [Baar Metanoia]
-\definetypescriptprefix [f:philos]   [Baar Philos]
-\definetypescriptprefix [f:sophia]   [Baar Sophia]
+%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}
 
-\starttypescript [sans] [metanoia,philos,sophia]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]            [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]     [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]       [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} BoldItalic] [features=default]
+\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.tex b/Master/texmf-dist/tex/context/third/typescripts/type-baar.tex
deleted file mode 100644
index 8403674dfa4..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-baar.tex
+++ /dev/null
@@ -1,39 +0,0 @@
-%D \module
-%D   [       file=type-baar,
-%D        version=2009.03.29,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Baar Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-%D These are typescript for fonts designed by Lutz Baar. The fonts are donation
-%D ware and can be downloaded from
-%D \hyphenatedurl{http://www.menschengeist.de/aidfonts.htm}
-
-\definetypescriptprefix [n:metanoia] [Metanoia]
-\definetypescriptprefix [n:philos]   [Philos]
-\definetypescriptprefix [n:sophia]   [Sophia]
-
-\starttypescriptcollection [baar]
-
-\starttypescript [sans] [metanoia,philos,sophia]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [metanoia,philos,sophia]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-baar}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
index 9b801fb9de2..62dd9835f6f 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-bera,
-%D        version=2008.11.26,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Bera Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,23 +10,57 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [bera]
-    \definefontsynonym [BeraSerif-Regular] [name:BeraSerif-Roman] [features=default]
-    \definefontsynonym [BeraSerif-Bold]    [name:BeraSerif-Bold]  [features=default]
+\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 [sans] [bera]
-    \definefontsynonym [BeraSans-Regular]    [name:BeraSans-Roman]       [features=default]
-    \definefontsynonym [BeraSans-Italic]     [name:BeraSans-Oblique]     [features=default]
-    \definefontsynonym [BeraSans-Bold]       [name:BeraSans-Bold]        [features=default]
-    \definefontsynonym [BeraSans-BoldItalic] [name:BeraSans-BoldOblique] [features=default]
+\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 [mono] [bera]
-    \definefontsynonym [BeraSansMono-Regular]    [name:BeraSansMono-Roman]   [features=default]
-    \definefontsynonym [BeraSansMono-Italic]     [name:BeraSansMono-Oblique] [features=default]
-    \definefontsynonym [BeraSansMono-Bold]       [name:BeraSansMono-Bold]    [features=default]
-    \definefontsynonym [BeraSansMono-BoldItalic] [name:BeraSansMono-BoldOb]  [features=default]
+\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
index 9b801fb9de2..de03d1dfe48 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-bera.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-bera,
-%D        version=2008.11.26,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Bera Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,23 +10,57 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [bera]
-    \definefontsynonym [BeraSerif-Regular] [name:BeraSerif-Roman] [features=default]
-    \definefontsynonym [BeraSerif-Bold]    [name:BeraSerif-Bold]  [features=default]
+\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 [sans] [bera]
-    \definefontsynonym [BeraSans-Regular]    [name:BeraSans-Roman]       [features=default]
-    \definefontsynonym [BeraSans-Italic]     [name:BeraSans-Oblique]     [features=default]
-    \definefontsynonym [BeraSans-Bold]       [name:BeraSans-Bold]        [features=default]
-    \definefontsynonym [BeraSans-BoldItalic] [name:BeraSans-BoldOblique] [features=default]
+\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 [mono] [bera]
-    \definefontsynonym [BeraSansMono-Regular]    [name:BeraSansMono-Roman]   [features=default]
-    \definefontsynonym [BeraSansMono-Italic]     [name:BeraSansMono-Oblique] [features=default]
-    \definefontsynonym [BeraSansMono-Bold]       [name:BeraSansMono-Bold]    [features=default]
-    \definefontsynonym [BeraSansMono-BoldItalic] [name:BeraSansMono-BoldOb]  [features=default]
+\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-bera.tex b/Master/texmf-dist/tex/context/third/typescripts/type-bera.tex
deleted file mode 100644
index 267a7de04a5..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-bera.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-%D \module
-%D   [       file=type-bera,
-%D        version=2008.11.26,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Bera Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [bera]
-
-\starttypescript [serif] [bera]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [BeraSerif-Regular] [features=default]
-    \definefontsynonym [SerifBold] [BeraSerif-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [sans] [bera]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [BeraSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [BeraSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [BeraSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [BeraSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [bera]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [BeraSansMono-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [BeraSansMono-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [BeraSansMono-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [BeraSansMono-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [bera]
-    \definetypeface [bera] [rm] [serif] [bera]   [default]
-    \definetypeface [bera] [ss] [sans]  [bera]   [default]
-    \definetypeface [bera] [tt] [mono]  [bera]   [default]
-    \definetypeface [bera] [mm] [math]  [modern] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-bera}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
new file mode 100644
index 00000000000..8934f1a5edb
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkii
@@ -0,0 +1,41 @@
+%D \module
+%D   [       file=type-calluna,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Calluna Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2010 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [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]
+    \definefontsynonym [\s!SerifCaps]        [Calluna-Caps]       [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [calluna]
+    \definetypeface [calluna] [rm] [\s!serif] [calluna]  [\s!default]
+    \definetypeface [calluna] [ss] [\s!sans]  [modern]   [\s!default]
+    \definetypeface [calluna] [tt] [\s!mono]  [modern]   [\s!default]
+    \definetypeface [calluna] [mm] [\s!math]  [palatino] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
new file mode 100644
index 00000000000..ee193bb0dd5
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-calluna.mkiv
@@ -0,0 +1,41 @@
+%D \module
+%D   [       file=type-calluna,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Calluna Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2010 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [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]
+    \definefontsynonym [\s!SerifCaps]        [Calluna-Caps]       [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [calluna]
+    \definetypeface [calluna] [rm] [\s!serif] [calluna]  [\s!default]
+    \definetypeface [calluna] [ss] [\s!sans]  [modern]   [\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
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
index 36a4c9217fb..9f4bd26c3c3 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-charissil,
-%D        version=2008.04.21,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Charis SIL Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,11 +10,31 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [charissil]
-    \definefontsynonym [CharisSIL-Regular]    [name:Charis SIL]             [features=default]
-    \definefontsynonym [CharisSIL-Italic]     [name:Charis SIL Italic]      [features=default]
-    \definefontsynonym [CharisSIL-Bold]       [name:Charis SIL Bold]        [features=default]
-    \definefontsynonym [CharisSIL-BoldItalic] [name:Charis SIL Bold Italic] [features=default]
+\starttypescriptcollection [charissil]
+
+\starttypescript [\s!serif] [charissil]
+    \definefontsynonym [CharisSIL-Regular]    [\s!file:CharisSILR]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-Italic]     [\s!file:CharisSILI]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-Bold]       [\s!file:CharisSILB]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-BoldItalic] [\s!file:CharisSILBI] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [charissil]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharisSIL-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharisSIL-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharisSIL-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharisSIL-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [charissil]
+    \definetypeface [charissil] [rm] [\s!serif] [charissil] [\s!default]
+    \definetypeface [charissil] [ss] [\s!sans]  [modern]    [\s!default]
+    \definetypeface [charissil] [tt] [\s!mono]  [modern]    [\s!default]
+    \definetypeface [charissil] [mm] [\s!math]  [modern]    [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
index 36a4c9217fb..ca6e24845f1 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-charissil,
-%D        version=2008.04.21,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Charis SIL Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,11 +10,31 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [charissil]
-    \definefontsynonym [CharisSIL-Regular]    [name:Charis SIL]             [features=default]
-    \definefontsynonym [CharisSIL-Italic]     [name:Charis SIL Italic]      [features=default]
-    \definefontsynonym [CharisSIL-Bold]       [name:Charis SIL Bold]        [features=default]
-    \definefontsynonym [CharisSIL-BoldItalic] [name:Charis SIL Bold Italic] [features=default]
+\starttypescriptcollection [charissil]
+
+\starttypescript [\s!serif] [charissil]
+    \definefontsynonym [CharisSIL-Regular]    [\s!file:charissilr]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-Italic]     [\s!file:charissili]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-Bold]       [\s!file:charissilb]  [\s!features=\s!default]
+    \definefontsynonym [CharisSIL-BoldItalic] [\s!file:charissilbi] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [charissil]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharisSIL-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharisSIL-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharisSIL-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharisSIL-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [charissil]
+    \definetypeface [charissil] [rm] [\s!serif] [charissil] [\s!default]
+    \definetypeface [charissil] [ss] [\s!sans]  [modern]    [\s!default] [\s!rscale=\v!auto]
+    \definetypeface [charissil] [tt] [\s!mono]  [modern]    [\s!default] [\s!rscale=\v!auto]
+    \definetypeface [charissil] [mm] [\s!math]  [modern]    [\s!default] [\s!rscale=\v!auto]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex b/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex
deleted file mode 100644
index 409534135ba..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charissil.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-%D \module
-%D   [       file=type-charissil,
-%D        version=2008.04.21,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Charis SIL Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [serif] [charissil]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [CharisSIL-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [CharisSIL-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [CharisSIL-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [CharisSIL-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [charissil]
-    \definetypeface [charissil] [rm] [serif] [charissil] [default]
-\stoptypescript
-
-\loadmarkfile{charissil}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
index 5daeba04058..ee2d0412cbd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-charter,
-%D        version=2008.06.08,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Charter Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,13 +10,43 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [charter,charter-bold]
-    \definefontsynonym [CharterITC-Regular]     [name:Charter ITC Pro Regular]      [features=default]
-    \definefontsynonym [CharterITC-Bold]        [name:Charter ITC Pro Bold]         [features=default]
-    \definefontsynonym [CharterITC-Italic]      [name:Charter ITC Pro Italic]       [features=default]
-    \definefontsynonym [CharterITC-BoldItalic]  [name:Charter ITC Pro Bold Italic]  [features=default]
-    \definefontsynonym [CharterITC-Black]       [name:Charter ITC Pro Black]        [features=default]
-    \definefontsynonym [CharterITC-BlackItalic] [name:Charter ITC Pro Black Italic] [features=default]
+\starttypescriptcollection[charter]
+
+\starttypescript [\s!serif] [charter,charter-bold]
+    \definefontsynonym [CharterITC-Regular]     [\s!file:CharterITCPro-Regular]     [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Italic]      [\s!file:CharterITCPro-Italic]      [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Bold]        [\s!file:CharterITCPro-Bold]        [\s!features=\s!default]
+    \definefontsynonym [CharterITC-BoldItalic]  [\s!file:CharterITCPro-BoldItalic]  [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Black]       [\s!file:CharterITCPro-Black]       [\s!features=\s!default]
+    \definefontsynonym [CharterITC-BlackItalic] [\s!file:CharterITCPro-BlackItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [charter]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharterITC-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharterITC-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharterITC-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharterITC-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [CharterITC-Regular]    [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [\s!serif] [charter-bold]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharterITC-Bold]        [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharterITC-BoldItalic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharterITC-Black]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharterITC-BlackItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [CharterITC-Bold]        [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [charter,charter-bold]
+    \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
+    \definetypeface [\typescriptone] [ss] [\s!sans]  [modern]         [\s!default]
+    \definetypeface [\typescriptone] [tt] [\s!mono]  [modern]         [\s!default]
+    \definetypeface [\typescriptone] [mm] [\s!math]  [modern]         [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
index 5daeba04058..ad758ba41bb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-charter.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-charter,
-%D        version=2008.06.08,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Charter Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,13 +10,43 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [charter,charter-bold]
-    \definefontsynonym [CharterITC-Regular]     [name:Charter ITC Pro Regular]      [features=default]
-    \definefontsynonym [CharterITC-Bold]        [name:Charter ITC Pro Bold]         [features=default]
-    \definefontsynonym [CharterITC-Italic]      [name:Charter ITC Pro Italic]       [features=default]
-    \definefontsynonym [CharterITC-BoldItalic]  [name:Charter ITC Pro Bold Italic]  [features=default]
-    \definefontsynonym [CharterITC-Black]       [name:Charter ITC Pro Black]        [features=default]
-    \definefontsynonym [CharterITC-BlackItalic] [name:Charter ITC Pro Black Italic] [features=default]
+\starttypescriptcollection[charter]
+
+\starttypescript [\s!serif] [charter,charter-bold]
+    \definefontsynonym [CharterITC-Regular]     [\s!file:charteritcproregular]     [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Italic]      [\s!file:charteritcproitalic]      [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Bold]        [\s!file:charteritcprobold]        [\s!features=\s!default]
+    \definefontsynonym [CharterITC-BoldItalic]  [\s!file:charteritcprobolditalic]  [\s!features=\s!default]
+    \definefontsynonym [CharterITC-Black]       [\s!file:charteritcproblack]       [\s!features=\s!default]
+    \definefontsynonym [CharterITC-BlackItalic] [\s!file:charteritcproblackitalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [charter]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharterITC-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharterITC-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharterITC-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharterITC-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [CharterITC-Regular]    [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [\s!serif] [charter-bold]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [CharterITC-Bold]        [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [CharterITC-BoldItalic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [CharterITC-Black]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [CharterITC-BlackItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [CharterITC-Bold]        [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [charter,charter-bold]
+    \definetypeface [\typescriptone] [rm] [\s!serif] [\typescriptone] [\s!default]
+    \definetypeface [\typescriptone] [ss] [\s!sans]  [modern]         [\s!default]
+    \definetypeface [\typescriptone] [tt] [\s!mono]  [modern]         [\s!default]
+    \definetypeface [\typescriptone] [mm] [\s!math]  [charter]        [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex b/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex
deleted file mode 100644
index b23f9368ad2..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-charter.tex
+++ /dev/null
@@ -1,35 +0,0 @@
-%D \module
-%D   [       file=type-charter,
-%D        version=2008.06.08,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Charter Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [serif] [charter]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [CharterITC-Regular]    [features=default]
-    \definefontsynonym [SerifBold]       [CharterITC-Bold]       [features=default]
-    \definefontsynonym [SerifItalic]     [CharterITC-Italic]     [features=default]
-    \definefontsynonym [SerifBoldItalic] [CharterITC-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [charter-bold]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [CharterITC-Bold]        [features=default]
-    \definefontsynonym [SerifBold]       [CharterITC-Black]       [features=default]
-    \definefontsynonym [SerifItalic]     [CharterITC-BoldItalic]  [features=default]
-    \definefontsynonym [SerifBoldItalic] [CharterITC-BlackItalic] [features=default]
-\stoptypescript
-
-\starttypescript [charter,charter-bold]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-\loadmarkfile{type-charter}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
index 43bcd45c3bf..b48f4611fdd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-cmu,
-%D        version=2008.12.04,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Computer Modern Unicode Collection,
 %D         author=Wolfgang Schuster,
@@ -10,50 +10,111 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif,sans,mono] [computer-modern-unicode]
-    \definefontsynonym [CMUSerif-Regular]             [name:CMU Serif Roman]                           [features=default]
-    \definefontsynonym [CMUSerif-Italic]              [name:CMU Serif Italic]                          [features=default]
-    \definefontsynonym [CMUSerif-Slanted]             [name:CMU Serif Roman Slanted]                   [features=default]
-    \definefontsynonym [CMUSerif-Bold]                [name:CMU Serif Bold Extended Roman]             [features=default]
-    \definefontsynonym [CMUSerif-BoldItalic]          [name:CMU Serif Bold Extended Italic]            [features=default]
-    \definefontsynonym [CMSUerif-BoldNonextended]     [name:CMU Serif Roman Bold Nonextended]          [features=default]
-    \definefontsynonym [CMSUerif-BoldSlanted]         [name:CMU Serif Bold Extended Slanted Roman]     [features=default]
-    \definefontsynonym [SMCSerif-ExtraBold]           [name:CMU Serif Roman Bold Nonextended]          [features=default]
-    \definefontsynonym [CMSUerif-UprightItalic]       [name:CMU Serif Upright Italic]                  [features=default]
-    \definefontsynonym [CMUSans-Regular]              [name:CMU Sans Serif]                            [features=default]
-    \definefontsynonym [CMUSans-Italic]               [name:CMU Sans Serif Oblique]                    [features=default]
-    \definefontsynonym [CMUSans-Bold]                 [name:CMU Sans Serif Bold Extended]              [features=default]
-    \definefontsynonym [CMUSans-BoldItalic]           [name:CMU Sans Serif Bold Extended Oblique]      [features=default]
-    \definefontsynonym [CMUSans-Condensed]            [name:CMU Sans Serif Demi Condensed]             [features=default]
-    \definefontsynonym [CMUTypewriter-Light]          [name:CMU Typewriter Text Light]                 [features=default]
-    \definefontsynonym [CMUTypewriter-LightSlanted]   [name:CMU Typewriter Text Light Oblique]         [features=default]
-    \definefontsynonym [CMUTypewriter-Regular]        [name:CMU Typewriter Text Regular]               [features=default]
-    \definefontsynonym [CMUTypewriter-Italic]         [name:CMU Typewriter Text Italic]                [features=default]
-    \definefontsynonym [CMUTypewriter-Slanted]        [name:CMU Typewriter Text Oblique]               [features=default]
-    \definefontsynonym [CMUTypewriter-Bold]           [name:CMU Typewriter Text Bold]                  [features=default]
-    \definefontsynonym [CMUTypewriter-BoldItalic]     [name:CMU Typewriter Text Bold Italic]           [features=default]
-    \definefontsynonym [CMUTypewriter-Variable]       [name:CMU Typewriter Text Variable Width]        [features=default]
-    \definefontsynonym [CMUTypewriter-VariableItalic] [name:CMU Typewriter Text Variable Width Italic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [cmu-bright]
-    \definefontsynonym [CMUBright-Roman]          [name:CMU Bright Roman]                 [features=default]
-    \definefontsynonym [CMUBright-Italic]         [name:CMU Bright Oblique]               [features=default]
-    \definefontsynonym [CMUBright-Bold]           [name:CMU Bright Bold Extended]         [features=default]
-    \definefontsynonym [CMUBright-BoldItalic]     [name:CMU Bright Bold Extended Oblique] [features=default]
-    \definefontsynonym [CMUBright-SemiBold]       [name:CMU Bright SemiBold]              [features=default]
-    \definefontsynonym [CMUBright-SemiBoldItalic] [name:CMU Bright SemiBold Oblique]      [features=default]
-\stoptypescript
-
-\starttypescript [serif] [cmu-classical]
-    \definefontsynonym [CMUClassicalSerif-Italic] [name:CMU Classical Serif Italic] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [cmu-concrete]
-    \definefontsynonym [CMUConcrete-Roman]      [name:CMU Concrete Roman]                [features=default]
-    \definefontsynonym [CMUConcretei-Ialic]     [name:CMU Concrete Italic]               [features=default]
-    \definefontsynonym [CMUConcrete-Bold]       [name:CMU Concrete Bold Extended Roman]  [features=default]
-    \definefontsynonym [CMUConcrete-BoldItalic] [name:CMU Concrete Bold Extended Italic] [features=default]
+\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
index 43bcd45c3bf..b48f4611fdd 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-cmu,
-%D        version=2008.12.04,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Computer Modern Unicode Collection,
 %D         author=Wolfgang Schuster,
@@ -10,50 +10,111 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif,sans,mono] [computer-modern-unicode]
-    \definefontsynonym [CMUSerif-Regular]             [name:CMU Serif Roman]                           [features=default]
-    \definefontsynonym [CMUSerif-Italic]              [name:CMU Serif Italic]                          [features=default]
-    \definefontsynonym [CMUSerif-Slanted]             [name:CMU Serif Roman Slanted]                   [features=default]
-    \definefontsynonym [CMUSerif-Bold]                [name:CMU Serif Bold Extended Roman]             [features=default]
-    \definefontsynonym [CMUSerif-BoldItalic]          [name:CMU Serif Bold Extended Italic]            [features=default]
-    \definefontsynonym [CMSUerif-BoldNonextended]     [name:CMU Serif Roman Bold Nonextended]          [features=default]
-    \definefontsynonym [CMSUerif-BoldSlanted]         [name:CMU Serif Bold Extended Slanted Roman]     [features=default]
-    \definefontsynonym [SMCSerif-ExtraBold]           [name:CMU Serif Roman Bold Nonextended]          [features=default]
-    \definefontsynonym [CMSUerif-UprightItalic]       [name:CMU Serif Upright Italic]                  [features=default]
-    \definefontsynonym [CMUSans-Regular]              [name:CMU Sans Serif]                            [features=default]
-    \definefontsynonym [CMUSans-Italic]               [name:CMU Sans Serif Oblique]                    [features=default]
-    \definefontsynonym [CMUSans-Bold]                 [name:CMU Sans Serif Bold Extended]              [features=default]
-    \definefontsynonym [CMUSans-BoldItalic]           [name:CMU Sans Serif Bold Extended Oblique]      [features=default]
-    \definefontsynonym [CMUSans-Condensed]            [name:CMU Sans Serif Demi Condensed]             [features=default]
-    \definefontsynonym [CMUTypewriter-Light]          [name:CMU Typewriter Text Light]                 [features=default]
-    \definefontsynonym [CMUTypewriter-LightSlanted]   [name:CMU Typewriter Text Light Oblique]         [features=default]
-    \definefontsynonym [CMUTypewriter-Regular]        [name:CMU Typewriter Text Regular]               [features=default]
-    \definefontsynonym [CMUTypewriter-Italic]         [name:CMU Typewriter Text Italic]                [features=default]
-    \definefontsynonym [CMUTypewriter-Slanted]        [name:CMU Typewriter Text Oblique]               [features=default]
-    \definefontsynonym [CMUTypewriter-Bold]           [name:CMU Typewriter Text Bold]                  [features=default]
-    \definefontsynonym [CMUTypewriter-BoldItalic]     [name:CMU Typewriter Text Bold Italic]           [features=default]
-    \definefontsynonym [CMUTypewriter-Variable]       [name:CMU Typewriter Text Variable Width]        [features=default]
-    \definefontsynonym [CMUTypewriter-VariableItalic] [name:CMU Typewriter Text Variable Width Italic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [cmu-bright]
-    \definefontsynonym [CMUBright-Roman]          [name:CMU Bright Roman]                 [features=default]
-    \definefontsynonym [CMUBright-Italic]         [name:CMU Bright Oblique]               [features=default]
-    \definefontsynonym [CMUBright-Bold]           [name:CMU Bright Bold Extended]         [features=default]
-    \definefontsynonym [CMUBright-BoldItalic]     [name:CMU Bright Bold Extended Oblique] [features=default]
-    \definefontsynonym [CMUBright-SemiBold]       [name:CMU Bright SemiBold]              [features=default]
-    \definefontsynonym [CMUBright-SemiBoldItalic] [name:CMU Bright SemiBold Oblique]      [features=default]
-\stoptypescript
-
-\starttypescript [serif] [cmu-classical]
-    \definefontsynonym [CMUClassicalSerif-Italic] [name:CMU Classical Serif Italic] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [cmu-concrete]
-    \definefontsynonym [CMUConcrete-Roman]      [name:CMU Concrete Roman]                [features=default]
-    \definefontsynonym [CMUConcretei-Ialic]     [name:CMU Concrete Italic]               [features=default]
-    \definefontsynonym [CMUConcrete-Bold]       [name:CMU Concrete Bold Extended Roman]  [features=default]
-    \definefontsynonym [CMUConcrete-BoldItalic] [name:CMU Concrete Bold Extended Italic] [features=default]
+\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.tex b/Master/texmf-dist/tex/context/third/typescripts/type-cmu.tex
deleted file mode 100644
index c4ebf59e012..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-cmu.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [       file=type-cmu,
-%D        version=2008.12.04,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Computer Modern Unicode Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [computer-modern-unicode]
-
-\starttypescript [serif] [computer-modern-unicode]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [CMUSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [CMUSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [CMUSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [CMUSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [computer-modern-unicode]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [CMUSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [CMUSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [CMUSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [CMUSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [computer-modern-unicode]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [CMUTypewriter-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [CMUTypewriter-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [CMUTypewriter-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [CMUTypewriter-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [computer-modern-unicode]
-    \definetypeface [computer-modern-unicode] [rm] [serif] [computer-modern-unicode] [default]
-    \definetypeface [computer-modern-unicode] [ss] [sans]  [computer-modern-unicode] [default]
-    \definetypeface [computer-modern-unicode] [tt] [mono]  [computer-modern-unicode] [default]
-    \definetypeface [computer-modern-unicode] [mm] [math]  [modern]                  [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-cmu}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
index 8e3761bd7dd..cf494572f5a 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-dejavu,
-%D        version=2009.04.02,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=DejaVu Collection,
 %D         author=Wolfgang Schuster,
@@ -10,33 +10,87 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSerif-Regular]        [name:DejaVu Serif]                       [features=default]
-    \definefontsynonym [DejaVuSerif-Italic]         [name:DejaVu Serif Italic]                [features=default]
-    \definefontsynonym [DejaVuSerif-Bold]           [name:DejaVu Serif Bold]                  [features=default]
-    \definefontsynonym [DejaVuSerif-BoldItalic]     [name:DejaVu Serif Bold Italic]           [features=default]
-    \definefontsynonym [DejaVuSerifCond-Regular]    [name:DejaVu Serif Condensed]             [features=default]
-    \definefontsynonym [DejaVuSerifCond-Bold]       [name:DejaVu Serif Condensed Bold]        [features=default]
-    \definefontsynonym [DejaVuSerifCond-Italic]     [name:DejaVu Serif Condensed Italic]      [features=default]
-    \definefontsynonym [DejaVuSerifCond-BoldItalic] [name:DejaVu Serif Condensed Bold Italic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSans-Regular]        [name:DejaVu Sans]                        [features=default]
-    \definefontsynonym [DejaVuSans-Italic]         [name:DejaVu Sans Oblique]                [features=default]
-    \definefontsynonym [DejaVuSans-Bold]           [name:DejaVu Sans Bold]                   [features=default]
-    \definefontsynonym [DejaVuSans-BoldItalic]     [name:DejaVu Sans Bold Oblique]           [features=default]
-    \definefontsynonym [DejaVuSansCond-Regular]    [name:DejaVu Sans Condensed]              [features=default]
-    \definefontsynonym [DejaVuSansCond-Bold]       [name:DejaVu Sans Condensed Bold]         [features=default]
-    \definefontsynonym [DejaVuSansCond-Italic]     [name:DejaVu Sans Condensed Oblique]      [features=default]
-    \definefontsynonym [DejaVuSansCond-BoldItalic] [name:DejaVu Sans Condensed Bold Oblique] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [dejavu]
-    \definefontsynonym [DejaVuMono-Regular]    [name:DejaVu Sans Mono]              [features=default]
-    \definefontsynonym [DejaVuMono-Italic]     [name:DejaVu Sans Mono Oblique]      [features=default]
-    \definefontsynonym [DejaVuMono-Bold]       [name:DejaVu Sans Mono Bold]         [features=default]
-    \definefontsynonym [DejaVuMono-BoldItalic] [name:DejaVu Sans Mono Bold Oblique] [features=default]
+%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
index 8e3761bd7dd..a4cdfadf940 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-dejavu,
-%D        version=2009.04.02,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=DejaVu Collection,
 %D         author=Wolfgang Schuster,
@@ -10,33 +10,87 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSerif-Regular]        [name:DejaVu Serif]                       [features=default]
-    \definefontsynonym [DejaVuSerif-Italic]         [name:DejaVu Serif Italic]                [features=default]
-    \definefontsynonym [DejaVuSerif-Bold]           [name:DejaVu Serif Bold]                  [features=default]
-    \definefontsynonym [DejaVuSerif-BoldItalic]     [name:DejaVu Serif Bold Italic]           [features=default]
-    \definefontsynonym [DejaVuSerifCond-Regular]    [name:DejaVu Serif Condensed]             [features=default]
-    \definefontsynonym [DejaVuSerifCond-Bold]       [name:DejaVu Serif Condensed Bold]        [features=default]
-    \definefontsynonym [DejaVuSerifCond-Italic]     [name:DejaVu Serif Condensed Italic]      [features=default]
-    \definefontsynonym [DejaVuSerifCond-BoldItalic] [name:DejaVu Serif Condensed Bold Italic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [dejavu,dejavu-cond]
-    \definefontsynonym [DejaVuSans-Regular]        [name:DejaVu Sans]                        [features=default]
-    \definefontsynonym [DejaVuSans-Italic]         [name:DejaVu Sans Oblique]                [features=default]
-    \definefontsynonym [DejaVuSans-Bold]           [name:DejaVu Sans Bold]                   [features=default]
-    \definefontsynonym [DejaVuSans-BoldItalic]     [name:DejaVu Sans Bold Oblique]           [features=default]
-    \definefontsynonym [DejaVuSansCond-Regular]    [name:DejaVu Sans Condensed]              [features=default]
-    \definefontsynonym [DejaVuSansCond-Bold]       [name:DejaVu Sans Condensed Bold]         [features=default]
-    \definefontsynonym [DejaVuSansCond-Italic]     [name:DejaVu Sans Condensed Oblique]      [features=default]
-    \definefontsynonym [DejaVuSansCond-BoldItalic] [name:DejaVu Sans Condensed Bold Oblique] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [dejavu]
-    \definefontsynonym [DejaVuMono-Regular]    [name:DejaVu Sans Mono]              [features=default]
-    \definefontsynonym [DejaVuMono-Italic]     [name:DejaVu Sans Mono Oblique]      [features=default]
-    \definefontsynonym [DejaVuMono-Bold]       [name:DejaVu Sans Mono Bold]         [features=default]
-    \definefontsynonym [DejaVuMono-BoldItalic] [name:DejaVu Sans Mono Bold Oblique] [features=default]
+%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-dejavu.tex b/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.tex
deleted file mode 100644
index 357cd6c1465..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-dejavu.tex
+++ /dev/null
@@ -1,70 +0,0 @@
-%D \module
-%D   [       file=type-dejavu,
-%D        version=2009.04.02,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=DejaVu Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-%D The DejaVu fonts are a font family based on the Vera Fonts but provide a
-%D wider character range. They are available under a free font license and can
-%D be downloaded from \hyphenatedurl{http://dejavu-fonts.org/}
-
-\starttypescriptcollection [dejavu]
-
-\starttypescript [serif] [dejavu]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Serif]           [DejaVuSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [DejaVuSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [DejaVuSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [DejaVuSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [dejavu-cond]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Serif]           [DejaVuSerifCond-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [DejaVuSerifCond-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [DejaVuSerifCond-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [DejaVuSerifCond-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [dejavu]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [DejaVuSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [DejaVuSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [DejaVuSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [DejaVuSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [dejavu-cond]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [DejaVuSansCond-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [DejaVuSansCond-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [DejaVuSansCond-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [DejaVuSansCond-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [dejavu]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [DejaVuMono-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [DejaVuMono-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [DejaVuMono-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [DejaVuMono-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [dejavu,dejavu-cond]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-    \definetypeface [\typescriptone] [ss] [sans]  [\typescriptone] [default]
-    \definetypeface [\typescriptone] [tt] [mono]  [dejavu]         [default]
-    \definetypeface [\typescriptone] [mm] [math]  [palatino]       [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-dejavu}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
index e7ceddb1ac1..b1609ea99d0 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-droid,
-%D        version=2008.07.28,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Droid Collection,
 %D         author=Wolfgang Schuster,
@@ -10,14 +10,56 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif,sans,mono] [droid]
-    \definefontsynonym [DroidSerif-Regular]    [name:Droid Serif]             [features=default]
-    \definefontsynonym [DroidSerif-Italic]     [name:Droid Serif Italic]      [features=default]
-    \definefontsynonym [DroidSerif-Bold]       [name:Droid Serif Bold]        [features=default]
-    \definefontsynonym [DroidSerif-BoldItalic] [name:Droid Serif Bold Italic] [features=default]
-    \definefontsynonym [DroidSans-Regular]     [name:Droid Sans]              [features=default]
-    \definefontsynonym [DroidSans-Bold]        [name:Droid Sans Bold]         [features=default]
-    \definefontsynonym [DroidMono-Regular]     [name:Droid Sans Mono]         [features=default]
+%D Droid is a font family created by Ascender Corporation for the 
+%D Android platform, and licensed under the Apache license. They can be
+%D downloaded from the git snapshot of android:
+%D \hyphenatedurl{http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=39b04dd27e6d20809f8ff26920d1e761a0005252;sf=tgz}
+
+\starttypescriptcollection[droid]
+
+\starttypescript [\s!serif] [droid]
+    \definefontsynonym [DroidSerif-Regular]    [\s!file:DroidSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-Italic]     [\s!file:DroidSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-Bold]       [\s!file:DroidSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-BoldItalic] [\s!file:DroidSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [droid]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [DroidSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [DroidSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [DroidSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [DroidSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [droid]
+    \definefontsynonym [DroidSans-Regular] [\s!file:DroidSans]      [\s!features=\s!default]
+    \definefontsynonym [DroidSans-Bold]    [\s!file:DroidSans-Bold] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [droid]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [DroidSans-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [DroidSans-Bold]    [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [droid]
+    \definefontsynonym [DroidMono-Regular] [\s!file:DroidSansMono] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [droid]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono] [DroidMono-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [droid]
+    \definetypeface [droid] [rm] [\s!serif] [droid]  [\s!default]
+    \definetypeface [droid] [ss] [\s!sans]  [droid]  [\s!default]
+    \definetypeface [droid] [tt] [\s!mono]  [droid]  [\s!default]
+    \definetypeface [droid] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
index 2288bd3053a..9e7c212b7dc 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-droid.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-droid,
-%D        version=2008.07.28,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Droid Collection,
 %D         author=Wolfgang Schuster,
@@ -10,14 +10,56 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif,sans,mono] [droid]
-    \definefontsynonym [DroidSerif-Regular]    [name:droidserif]           [features=default]
-    \definefontsynonym [DroidSerif-Italic]     [name:droidserifitalic]     [features=default]
-    \definefontsynonym [DroidSerif-Bold]       [name:droidserifbold]       [features=default]
-    \definefontsynonym [DroidSerif-BoldItalic] [name:droidserifbolditalic] [features=default]
-    \definefontsynonym [DroidSans-Regular]     [name:droidsans]            [features=default]
-    \definefontsynonym [DroidSans-Bold]        [name:droidsansbold]        [features=default]
-    \definefontsynonym [DroidMono-Regular]     [name:droidsansmono]        [features=default]
+%D Droid is a font family created by Ascender Corporation for the 
+%D Android platform, and licensed under the Apache license. They can be
+%D downloaded from the git snapshot of android:
+%D \hyphenatedurl{http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=39b04dd27e6d20809f8ff26920d1e761a0005252;sf=tgz}
+
+\starttypescriptcollection[droid]
+
+\starttypescript [\s!serif] [droid]
+    \definefontsynonym [DroidSerif-Regular]    [\s!file:droidserifregular]    [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-Italic]     [\s!file:droidserifitalic]     [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-Bold]       [\s!file:droidserifbold]       [\s!features=\s!default]
+    \definefontsynonym [DroidSerif-BoldItalic] [\s!file:droidserifbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [droid]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [DroidSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [DroidSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [DroidSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [DroidSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [droid]
+    \definefontsynonym [DroidSans-Regular] [\s!file:droidsans]     [\s!features=\s!default]
+    \definefontsynonym [DroidSans-Bold]    [\s!file:droidsansbold] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [droid]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [DroidSans-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [DroidSans-Bold]    [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [droid]
+    \definefontsynonym [DroidMono-Regular] [\s!file:droidsansmono] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!mono] [droid]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono] [DroidMono-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [droid]
+    \definetypeface [droid] [rm] [\s!serif] [droid]  [\s!default]
+    \definetypeface [droid] [ss] [\s!sans]  [droid]  [\s!default]
+    \definetypeface [droid] [tt] [\s!mono]  [droid]  [\s!default]
+    \definetypeface [droid] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex b/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex
deleted file mode 100644
index 5b775567547..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-droid.tex
+++ /dev/null
@@ -1,45 +0,0 @@
-%D \module
-%D   [       file=type-droid,
-%D        version=2008.07.28,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Droid Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [droid]
-
-\starttypescript [serif] [droid]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [DroidSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [DroidSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [DroidSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [DroidSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [droid]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [DroidSans-Regular] [features=default]
-    \definefontsynonym [SansBold] [DroidSans-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [mono] [droid]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono] [DroidMono-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [droid]
-    \definetypeface [droid] [rm] [serif] [droid]  [default]
-    \definetypeface [droid] [ss] [sans]  [droid]  [default]
-    \definetypeface [droid] [tt] [mono]  [droid]  [default]
-    \definetypeface [droid] [mm] [math]  [modern] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-droid}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
index 52e0e3e3642..e8fcfd0c34d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-exljbris,
-%D        version=2009.04.04,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Exljbris Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -30,11 +30,11 @@
 % Diavlo
 
 \starttypescript [sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definefontsynonym [DiavloLight-Regular]  [name:Diavlo Light Regular]  [features=default]
-    \definefontsynonym [DiavloBook-Regular]   [name:Diavlo Book Regular]   [features=default]
-    \definefontsynonym [DiavloMedium-Regular] [name:Diavlo Medium Regular] [features=default]
-    \definefontsynonym [DiavloBold-Regular]   [name:Diavlo Bold Regular]   [features=default]
-    \definefontsynonym [DiavloBlack-Regular]  [name:Diavlo Black Regular]  [features=default]
+    \definefontsynonym [DiavloLight-Regular]  [name:diavlolightregular]  [features=default]
+    \definefontsynonym [DiavloBook-Regular]   [name:diavlobookregular]   [features=default]
+    \definefontsynonym [DiavloMedium-Regular] [name:diavlomediumregular] [features=default]
+    \definefontsynonym [DiavloBold-Regular]   [name:diavloboldregular]   [features=default]
+    \definefontsynonym [DiavloBlack-Regular]  [name:diavloblackregular]  [features=default]
 \stoptypescript
 
 % Fertigo Pro
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
index 12447382f7e..02cbe3c19ed 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-exljbris.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-exljbris,
-%D        version=2009.04.04,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Exljbris Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -55,6 +55,7 @@
 
 \starttypescript [anivers]
     \definetypeface [anivers] [ss] [sans] [anivers] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Delicious
@@ -70,6 +71,7 @@
 
 \starttypescript [delicious]
     \definetypeface [delicious] [ss] [sans] [delicious] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Diavlo
@@ -100,6 +102,7 @@
 
 \starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
     \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Fertigo Pro
@@ -111,6 +114,7 @@
 
 \starttypescript [fertigo]
     \definetypeface [fertigo] [ss] [sans] [fertigo] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Fontin, Fontin Sans
@@ -138,6 +142,7 @@
     \definetypeface [fontin] [ss] [sans]  [fontin]   [default]
     \definetypeface [fontin] [tt] [mono]  [modern]   [default] [rscale=1.1]
     \definetypeface [fontin] [mm] [math]  [palatino] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Museo, Museo Sans
@@ -157,6 +162,7 @@
 \starttypescript [museo]
     \definetypeface [museo] [rm] [serif] [museo] [default]
     \definetypeface [museo] [ss] [sans]  [museo] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Tallys
@@ -168,6 +174,7 @@
 
 \starttypescript [tallys]
     \definetypeface [tallys] [rm] [serif] [tallys] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
index 64abbe3fef2..e1bf476c5ed 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-fontsite,
-%D        version=2009.04.15,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Fontsite Collection,
 %D         author=Wolfgang Schuster,
@@ -13,19 +13,19 @@
 % 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]
+    \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: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]
+    \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
index c3f1984557e..ebe35cd4e0c 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-fontsite.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-fontsite,
-%D        version=2009.04.15,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Fontsite Collection,
 %D         author=Wolfgang Schuster,
@@ -26,6 +26,7 @@
 
 \starttypescript [bergamo]
     \definetypeface [bergamo] [rm] [serif] [bergamo] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Carto Gothic
@@ -40,6 +41,7 @@
 
 \starttypescript [cartogothic]
     \definetypeface [cartogothic] [ss] [sans] [cartogothic] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
index fbe92a2dda0..97c9482d9d5 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-gfs,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=GFS Collection,
 %D         author=Wolfgang Schuster,
@@ -13,79 +13,79 @@
 % Ambrosia
 
 \starttypescript [serif] [ambrosia]
-    \definefontsynonym [Ambrosia-Regular] [name:GFSAmbrosia-Regular] [features=default]
+    \definefontsynonym [Ambrosia-Regular] [name:gfsambrosiaregular] [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]
+    \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: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]
+    \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: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]
+    \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:GFSElpis-Regular] [features=default]
+    \definefontsynonym [Elpis-Regular] [name:gfselpisregular] [features=default]
 \stoptypescript
 
 % Eustace
 
 \starttypescript [serif] [eustace]
-    \definefontsynonym [Eustace-Regular] [name:GFSEustace-Regular] [features=default]
+    \definefontsynonym [Eustace-Regular] [name:gfseustaceregular] [features=default]
 \stoptypescript
 
 % Fleischman
 
 \starttypescript [serif] [fleischman]
-    \definefontsynonym [Fleischman-Regular] [name:GFSFleischman-Regular] [features=default]
+    \definefontsynonym [Fleischman-Regular] [name:gfsfleischmanregular] [features=default]
 \stoptypescript
 
 % Jackson
 
 \starttypescript [serif] [jackson]
-    \definefontsynonym [Jackson-Regular] [name:GFSJackson-Regular] [features=default]
+    \definefontsynonym [Jackson-Regular] [name:gfsjacksonregular] [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]
+    \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]
+    \definefontsynonym [Nicefore-Regular] [name:gfsnicefore] [features=default]
 \stoptypescript
 
 % Theokritos
 
 \starttypescript [serif] [theokritos]
-    \definefontsynonym [Theokritos-Regular] [name:GFS Theokritos Regular] [features=default]
+    \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
index 7951ddc97a6..ffd6d79f176 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-gfs.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-gfs,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=GFS Collection,
 %D         author=Wolfgang Schuster,
@@ -21,6 +21,7 @@
 
 \starttypescript [ambrosia]
     \definetypeface [ambrosia] [rm] [serif] [ambrosia] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Artemisia
@@ -35,6 +36,7 @@
 
 \starttypescript [artemisia]
     \definetypeface [artemisia] [rm] [serif] [artemisia] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Bodoni
@@ -49,6 +51,7 @@
 
 \starttypescript [bodoni]
     \definetypeface [bodoni] [rm] [serif] [bodoni] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Didot
@@ -63,6 +66,7 @@
 
 \starttypescript [didot]
     \definetypeface [didot] [rm] [serif] [didot] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Elpis
@@ -74,6 +78,7 @@
 
 \starttypescript [elpis]
     \definetypeface [elpis] [rm] [serif] [elpis] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Eustace
@@ -85,6 +90,7 @@
 
 \starttypescript [eustace]
     \definetypeface [eustace] [rm] [serif] [eustace] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Fleischman
@@ -107,6 +113,7 @@
 
 \starttypescript [jackson]
     \definetypeface [jackson] [rm] [serif] [jackson] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Neohellenic
@@ -121,6 +128,7 @@
 
 \starttypescript [neohellenic]
     \definetypeface [neohellenic] [ss] [sans] [neohellenic] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Nicefore
@@ -132,6 +140,7 @@
 
 \starttypescript [nicefore]
     \definetypeface [nicefore] [ss] [sans] [nicefore] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Theokritos
@@ -143,6 +152,7 @@
 
 \starttypescript [theokritos]
     \definetypeface [theokritos] [rm] [serif] [theokritos] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex b/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex
deleted file mode 100644
index c1c1d32d1e0..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-goudysans.tex
+++ /dev/null
@@ -1,32 +0,0 @@
-%D \module
-%D   [       file=type-goudysans,
-%D        version=2008.07.27,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Goudy Sans Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [sans] [goudysans]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [GoudySans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [GoudySans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [GoudySans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [GoudySans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [goudysans]
-    \definefontsynonym [GoudySans-Regular]    [name:GoudySans-Regular]    [features=default]
-    \definefontsynonym [GoudySans-Italic]     [name:GoudySans-Italic]     [features=default]
-    \definefontsynonym [GoudySans-Bold]       [name:GoudySans-Bold]       [features=default]
-    \definefontsynonym [GoudySans-BoldItalic] [name:GoudySans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [goudysans]
-    \definetypeface [goudysans] [ss] [sans] [goudysans] [default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
index 195cd264d5b..516c0ef2882 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-junicode.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-junicode,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Junicode Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -27,6 +27,7 @@
 
 \starttypescript [junicode]
     \definetypeface [junicode] [rm] [serif] [junicode] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
index faa6a04317b..2718cc955fb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-justus.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-justus,
-%D        version=2008.09.18,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Sabon Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -40,6 +40,7 @@
     \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-kaffeesatz.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
new file mode 100644
index 00000000000..b7f5facb7ae
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkii
@@ -0,0 +1,47 @@
+%D \module
+%D   [       file=type-kaffeesatz,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Kaffeesatz Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [kaffeesatz]
+
+\starttypescript [\s!sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definefontsynonym [Kaffeesatz-Thin]    [\s!file:YanoneKaffeesatz-Thin]    [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Light]   [\s!file:YanoneKaffeesatz-Light]   [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Regular] [\s!file:YanoneKaffeesatz-Regular] [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Bold]    [\s!file:YanoneKaffeesatz-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz-thin]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Thin]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Light] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
new file mode 100644
index 00000000000..5be3e77b4c0
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kaffeesatz.mkiv
@@ -0,0 +1,47 @@
+%D \module
+%D   [       file=type-kaffeesatz,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Kaffeesatz Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [kaffeesatz]
+
+\starttypescript [\s!sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definefontsynonym [Kaffeesatz-Thin]    [\s!file:yanonekaffeesatzthin]    [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Light]   [\s!file:yanonekaffeesatzlight]   [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Regular] [\s!file:yanonekaffeesatzregular] [\s!features=\s!default]
+    \definefontsynonym [Kaffeesatz-Bold]    [\s!file:yanonekaffeesatzbold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz-thin]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Thin]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Light] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [kaffeesatz-light]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Kaffeesatz-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Kaffeesatz-Regular] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\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
index 88eb6143764..125fcb734a0 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-kontrapunkt.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-kontrapunkt,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Kontrapunkt Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -25,6 +25,7 @@
 
 \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
index eb7e5cb2e43..8f4d5f94533 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-leftist.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-leftist,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Leftist Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -21,6 +21,7 @@
 
 \starttypescript [leftist]
     \definetypeface [leftist] [rm] [serif] [leftist] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
index c6a285cbdfa..1c88464f100 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-liberation,
-%D        version=2008.07.27,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Liberation Collection,
 %D         author=Wolfgang Schuster,
@@ -10,25 +10,61 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [liberation]
-    \definefontsynonym [LiberationSerif-Regular]    [name:Liberation Serif]             [features=default]
-    \definefontsynonym [LiberationSerif-Italic]     [name:Liberation Serif Italic]      [features=default]
-    \definefontsynonym [LiberationSerif-Bold]       [name:Liberation Serif Bold]        [features=default]
-    \definefontsynonym [LiberationSerif-BoldItalic] [name:Liberation Serif Bold Italic] [features=default]
+\starttypescriptcollection [liberation]
+
+\starttypescript [\s!serif] [liberation]
+    \definefontsynonym [LiberationSerif-Regular]    [\s!file:LiberationSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-Italic]     [\s!file:LiberationSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-Bold]       [\s!file:LiberationSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-BoldItalic] [\s!file:LiberationSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [liberation]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [LiberationSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [LiberationSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [LiberationSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [LiberationSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [liberation]
+    \definefontsynonym [LiberationSans-Regular]    [\s!file:LiberationSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-Italic]     [\s!file:LiberationSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-Bold]       [\s!file:LiberationSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-BoldItalic] [\s!file:LiberationSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [liberation]
-    \definefontsynonym [LiberationSans-Regular]    [name:Liberation Sans]             [features=default]
-    \definefontsynonym [LiberationSans-Italic]     [name:Liberation Sans Italic]      [features=default]
-    \definefontsynonym [LiberationSans-Bold]       [name:Liberation Sans Bold]        [features=default]
-    \definefontsynonym [LiberationSans-BoldItalic] [name:Liberation Sans Bold Italic] [features=default]
+\starttypescript [\s!sans] [liberation]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [LiberationSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [LiberationSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [LiberationSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [LiberationSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [mono] [liberation]
-    \definefontsynonym [LiberationMono-Regular]    [name:Liberation Mono]             [features=default]
-    \definefontsynonym [LiberationMono-Italic]     [name:Liberation Mono Italic]      [features=default]
-    \definefontsynonym [LiberationMono-Bold]       [name:Liberation Mono Bold]        [features=default]
-    \definefontsynonym [LiberationMono-BoldItalic] [name:Liberation Mono Bold Italic] [features=default]
+\starttypescript [\s!mono] [liberation]
+    \definefontsynonym [LiberationMono-Regular]    [\s!file:LiberationMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-Italic]     [\s!file:LiberationMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-Bold]       [\s!file:LiberationMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-BoldItalic] [\s!file:LiberationMono-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [liberation]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [LiberationMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [LiberationMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [LiberationMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [LiberationMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [liberation]
+    \definetypeface [liberation] [rm] [\s!serif] [liberation] [\s!default]
+    \definetypeface [liberation] [ss] [\s!sans]  [liberation] [\s!default]
+    \definetypeface [liberation] [tt] [\s!mono]  [liberation] [\s!default]
+    \definetypeface [liberation] [mm] [\s!math]  [modern]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
index c6a285cbdfa..0acc29f22e6 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-liberation,
-%D        version=2008.07.27,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Liberation Collection,
 %D         author=Wolfgang Schuster,
@@ -10,25 +10,61 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [liberation]
-    \definefontsynonym [LiberationSerif-Regular]    [name:Liberation Serif]             [features=default]
-    \definefontsynonym [LiberationSerif-Italic]     [name:Liberation Serif Italic]      [features=default]
-    \definefontsynonym [LiberationSerif-Bold]       [name:Liberation Serif Bold]        [features=default]
-    \definefontsynonym [LiberationSerif-BoldItalic] [name:Liberation Serif Bold Italic] [features=default]
+\starttypescriptcollection [liberation]
+
+\starttypescript [\s!serif] [liberation]
+    \definefontsynonym [LiberationSerif-Regular]    [\s!file:liberationserifregular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-Italic]     [\s!file:liberationserifitalic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-Bold]       [\s!file:liberationserifbold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationSerif-BoldItalic] [\s!file:liberationserifbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [liberation]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [LiberationSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [LiberationSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [LiberationSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [LiberationSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [liberation]
+    \definefontsynonym [LiberationSans-Regular]    [\s!file:liberationsansregular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-Italic]     [\s!file:liberationsansitalic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-Bold]       [\s!file:liberationsansbold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationSans-BoldItalic] [\s!file:liberationsansbolditalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [liberation]
-    \definefontsynonym [LiberationSans-Regular]    [name:Liberation Sans]             [features=default]
-    \definefontsynonym [LiberationSans-Italic]     [name:Liberation Sans Italic]      [features=default]
-    \definefontsynonym [LiberationSans-Bold]       [name:Liberation Sans Bold]        [features=default]
-    \definefontsynonym [LiberationSans-BoldItalic] [name:Liberation Sans Bold Italic] [features=default]
+\starttypescript [\s!sans] [liberation]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [LiberationSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [LiberationSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [LiberationSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [LiberationSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [mono] [liberation]
-    \definefontsynonym [LiberationMono-Regular]    [name:Liberation Mono]             [features=default]
-    \definefontsynonym [LiberationMono-Italic]     [name:Liberation Mono Italic]      [features=default]
-    \definefontsynonym [LiberationMono-Bold]       [name:Liberation Mono Bold]        [features=default]
-    \definefontsynonym [LiberationMono-BoldItalic] [name:Liberation Mono Bold Italic] [features=default]
+\starttypescript [\s!mono] [liberation]
+    \definefontsynonym [LiberationMono-Regular]    [\s!file:liberationmonoregular]    [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-Italic]     [\s!file:liberationmonoitalic]     [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-Bold]       [\s!file:liberationmonobold]       [\s!features=\s!default]
+    \definefontsynonym [LiberationMono-BoldItalic] [\s!file:liberationmonobolditalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [liberation]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [LiberationMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [LiberationMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [LiberationMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [LiberationMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [liberation]
+    \definetypeface [liberation] [rm] [\s!serif] [liberation] [\s!default]
+    \definetypeface [liberation] [ss] [\s!sans]  [liberation] [\s!default]
+    \definetypeface [liberation] [tt] [\s!mono]  [liberation] [\s!default]
+    \definetypeface [liberation] [mm] [\s!math]  [modern]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex b/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex
deleted file mode 100644
index 8452b450adf..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-liberation.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [       file=type-liberation,
-%D        version=2008.07.27,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Liberation Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [liberation]
-
-\starttypescript [serif] [liberation]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [LiberationSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [LiberationSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [LiberationSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [LiberationSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [liberation]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [LiberationSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [LiberationSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [LiberationSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [LiberationSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [liberation]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [LiberationMono-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [LiberationMono-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [LiberationMono-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [LiberationMono-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [liberation]
-    \definetypeface [liberation] [rm] [serif] [liberation] [default]
-    \definetypeface [liberation] [ss] [sans]  [liberation] [default]
-    \definetypeface [liberation] [tt] [mono]  [liberation] [default]
-    \definetypeface [liberation] [mm] [math]  [modern]     [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-liberation}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
index 33d6c3adfc5..19c898a18a3 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-linuxlibertine,
-%D        version=2009.03.24,
+%D        version=2009.07.23,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Linux Libertine Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -11,16 +11,16 @@
 %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]
+    \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:Linux Biolinum O]      [features=default]
-    \definefontsynonym [LinuxBiolinum-Bold]    [name:Linux Biolinum O Bold] [features=default]
+    \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
index 47efd024c03..abac3fdd53f 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-linuxlibertine.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-linuxlibertine,
-%D        version=2009.03.24,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Linux Libertine Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -32,6 +32,7 @@
     \definetypeface [\typescriptone] [ss] [sans]  [linuxbiolinum]  [default]
     \definetypeface [\typescriptone] [tt] [mono]  [modern]         [default]
     \definetypeface [\typescriptone] [mm] [math]  [modern]         [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
index daeb5ec5098..a9f929e93a5 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-luxi,
-%D        version=2008.05.12,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Luxi Collection,
 %D         author=Wolfgang Schuster,
@@ -10,25 +10,61 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [luxi]
-    \definefontsynonym [LuxiSerif-Regular]    [name:Luxi Serif Regular]      [features=default]
-    \definefontsynonym [LuxiSerif-Italic]     [name:Luxi Serif Oblique]      [features=default]
-    \definefontsynonym [LuxiSerif-Bold]       [name:Luxi Serif Bold]         [features=default]
-    \definefontsynonym [LuxiSerif-BoldItalic] [name:Luxi Serif Bold Oblique] [features=default]
+\starttypescriptcollection[luxi]
+
+\starttypescript [\s!serif] [luxi]
+    \definefontsynonym [LuxiSerif-Regular]    [\s!file:luxirr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-Italic]     [\s!file:luxirri] [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-Bold]       [\s!file:luxirb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-BoldItalic] [\s!file:luxirbi] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [luxi]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [LuxiSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [LuxiSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [LuxiSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [LuxiSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [luxi]
+    \definefontsynonym [LuxiSans-Regular]    [\s!file:luxisr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-Italic]     [\s!file:luxisri] [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-Bold]       [\s!file:luxisb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-BoldItalic] [\s!file:luxisbi] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [luxi]
-    \definefontsynonym [LuxiSans-Regular]    [name:Luxi Sans Regular]      [features=default]
-    \definefontsynonym [LuxiSans-Italic]     [name:Luxi Sans Oblique]      [features=default]
-    \definefontsynonym [LuxiSans-Bold]       [name:Luxi Sans Bold]         [features=default]
-    \definefontsynonym [LuxiSans-BoldItalic] [name:Luxi Sans Bold Oblique] [features=default]
+\starttypescript [\s!sans] [luxi]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [LuxiSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [LuxiSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [LuxiSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [LuxiSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [mono] [luxi]
-    \definefontsynonym [LuxiMono-Regular]    [name:Luxi Mono Regular]      [features=default]
-    \definefontsynonym [LuxiMono-Italic]     [name:Luxi Mono Oblique]      [features=default]
-    \definefontsynonym [LuxiMono-Bold]       [name:Luxi Mono Bold]         [features=default]
-    \definefontsynonym [LuxiMono-BoldItalic] [name:Luxi Mono Bold Oblique] [features=default]
+\starttypescript [\s!mono] [luxi]
+    \definefontsynonym [LuxiMono-Regular]    [\s!file:luximr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-Italic]     [\s!file:luximri] [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-Bold]       [\s!file:luximb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-BoldItalic] [\s!file:luximbi] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [luxi]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [LuxiMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [LuxiMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [LuxiMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [LuxiMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [luxi]
+    \definetypeface [luxi] [rm] [\s!serif] [luxi]   [\s!default]
+    \definetypeface [luxi] [ss] [\s!sans]  [luxi]   [\s!default]
+    \definetypeface [luxi] [tt] [\s!mono]  [luxi]   [\s!default]
+    \definetypeface [luxi] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
index daeb5ec5098..a9f929e93a5 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-luxi,
-%D        version=2008.05.12,
+%D        version=2010.09.13,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Luxi Collection,
 %D         author=Wolfgang Schuster,
@@ -10,25 +10,61 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [luxi]
-    \definefontsynonym [LuxiSerif-Regular]    [name:Luxi Serif Regular]      [features=default]
-    \definefontsynonym [LuxiSerif-Italic]     [name:Luxi Serif Oblique]      [features=default]
-    \definefontsynonym [LuxiSerif-Bold]       [name:Luxi Serif Bold]         [features=default]
-    \definefontsynonym [LuxiSerif-BoldItalic] [name:Luxi Serif Bold Oblique] [features=default]
+\starttypescriptcollection[luxi]
+
+\starttypescript [\s!serif] [luxi]
+    \definefontsynonym [LuxiSerif-Regular]    [\s!file:luxirr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-Italic]     [\s!file:luxirri] [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-Bold]       [\s!file:luxirb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSerif-BoldItalic] [\s!file:luxirbi] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [luxi]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [LuxiSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [LuxiSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [LuxiSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [LuxiSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [luxi]
+    \definefontsynonym [LuxiSans-Regular]    [\s!file:luxisr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-Italic]     [\s!file:luxisri] [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-Bold]       [\s!file:luxisb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiSans-BoldItalic] [\s!file:luxisbi] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [luxi]
-    \definefontsynonym [LuxiSans-Regular]    [name:Luxi Sans Regular]      [features=default]
-    \definefontsynonym [LuxiSans-Italic]     [name:Luxi Sans Oblique]      [features=default]
-    \definefontsynonym [LuxiSans-Bold]       [name:Luxi Sans Bold]         [features=default]
-    \definefontsynonym [LuxiSans-BoldItalic] [name:Luxi Sans Bold Oblique] [features=default]
+\starttypescript [\s!sans] [luxi]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [LuxiSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [LuxiSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [LuxiSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [LuxiSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [mono] [luxi]
-    \definefontsynonym [LuxiMono-Regular]    [name:Luxi Mono Regular]      [features=default]
-    \definefontsynonym [LuxiMono-Italic]     [name:Luxi Mono Oblique]      [features=default]
-    \definefontsynonym [LuxiMono-Bold]       [name:Luxi Mono Bold]         [features=default]
-    \definefontsynonym [LuxiMono-BoldItalic] [name:Luxi Mono Bold Oblique] [features=default]
+\starttypescript [\s!mono] [luxi]
+    \definefontsynonym [LuxiMono-Regular]    [\s!file:luximr]  [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-Italic]     [\s!file:luximri] [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-Bold]       [\s!file:luximb]  [\s!features=\s!default]
+    \definefontsynonym [LuxiMono-BoldItalic] [\s!file:luximbi] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [luxi]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [\s!Mono]           [LuxiMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!MonoItalic]     [LuxiMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBold]       [LuxiMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!MonoBoldItalic] [LuxiMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [luxi]
+    \definetypeface [luxi] [rm] [\s!serif] [luxi]   [\s!default]
+    \definetypeface [luxi] [ss] [\s!sans]  [luxi]   [\s!default]
+    \definetypeface [luxi] [tt] [\s!mono]  [luxi]   [\s!default]
+    \definetypeface [luxi] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex b/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex
deleted file mode 100644
index c636112c060..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-luxi.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [       file=type-luxi,
-%D        version=2008.05.12,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Luxi Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection[luxi]
-
-\starttypescript [serif] [luxi]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [LuxiSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [LuxiSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [LuxiSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [LuxiSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [luxi]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [LuxiSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [LuxiSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [LuxiSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [LuxiSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [luxi]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [LuxiMono-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [LuxiMono-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [LuxiMono-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [LuxiMono-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [luxi]
-    \definetypeface [luxi] [rm] [serif] [luxi]   [default]
-    \definetypeface [luxi] [ss] [sans]  [luxi]   [default]
-    \definetypeface [luxi] [tt] [mono]  [luxi]   [default]
-    \definetypeface [luxi] [mm] [math]  [modern] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-luxi}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
index 31d44745ac9..c46c1175e13 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-mgopen,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=MgOpen Collection,
 %D         author=Wolfgang Schuster,
@@ -13,37 +13,37 @@
 % 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]
+    \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: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]
+    \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: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]
+    \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: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]
+    \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
index c94bddeb58b..a8fd0186109 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-mgopen.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-mgopen,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=MgOpen Collection,
 %D         author=Wolfgang Schuster,
@@ -24,6 +24,7 @@
 
 \starttypescript [mgopen-canonica]
     \definetypeface [mgopen-canonica] [rm] [serif] [mgopen-canonica] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Cosmetica
@@ -38,6 +39,7 @@
 
 \starttypescript [mgopen-cosmetica]
     \definetypeface [mgopen-cosmetica] [ss] [sans] [mgopen-cosmetica] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Moderna
@@ -52,6 +54,7 @@
 
 \starttypescript [mgopen-moderna]
     \definetypeface [mgopen-moderna] [ss] [sans] [mgopen-moderna] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Modata
@@ -66,6 +69,7 @@
 
 \starttypescript [mgopen-modata]
     \definetypeface [mgopen-modata] [ss] [sans] [mgopen-modata] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
index 44816912e8a..4f89f090eb0 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-miso.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-miso,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Miso Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -35,6 +35,7 @@
 
 \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
index 614c21c4b4e..5c5f1a20622 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-nichtlustig.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-nichtlustig,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Nichtlustig Collection,
 %D         author=Wolfgang Schuster,
@@ -25,6 +25,7 @@
 
 \starttypescript [nichtlusdick]
     \definetypeface [nichtlusdick] [ss] [sans] [nichtlusdick] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % NICHTLUSDUENN
@@ -40,6 +41,7 @@
 
 \starttypescript [nichtlusduenn]
     \definetypeface [nichtlusduenn] [ss] [sans] [nichtlusduenn] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
index 90eee50d553..e851f52b086 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-pigiarniq,
-%D        version=2008.07.27,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Pigiarniq Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,12 +10,41 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
-    \definefontsynonym [Pigiarniq-Light]   [name:Pigiarniq Light]  [features=default]
-    \definefontsynonym [Pigiarniq-Regular] [name:Pigiarniq]        [features=default]
-    \definefontsynonym [Pigiarniq-Italic]  [name:Pigiarniq Italic] [features=default]
-    \definefontsynonym [Pigiarniq-Bold]    [name:Pigiarniq Bold]   [features=default]
-    \definefontsynonym [Pigiarniq-Heavy]   [name:Pigiarniq Heavy]  [features=default]
+\starttypescriptcollection [pigiarniq]
+
+\starttypescript [\s!sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definefontsynonym [Pigiarniq-Light]   [\s!file:Pigiarniq Light]   [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Regular] [\s!file:Pigiarniq Regular] [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Italic]  [\s!file:Pigiarniq Italic]  [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Bold]    [\s!file:Pigiarniq Bold]    [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Heavy]   [\s!file:Pigiarniq Heavy]   [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [pigiarniq]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]       [Pigiarniq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic] [Pigiarniq-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]   [Pigiarniq-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [pigiarniq-thin]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Pigiarniq-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Pigiarniq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Pigiarniq-Italic]  [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!sans] [pigiarniq-bold]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Pigiarniq-Bold]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Pigiarniq-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
index 90eee50d553..6885b4d95b6 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-pigiarniq,
-%D        version=2008.07.27,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Pigiarniq Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,12 +10,41 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
-    \definefontsynonym [Pigiarniq-Light]   [name:Pigiarniq Light]  [features=default]
-    \definefontsynonym [Pigiarniq-Regular] [name:Pigiarniq]        [features=default]
-    \definefontsynonym [Pigiarniq-Italic]  [name:Pigiarniq Italic] [features=default]
-    \definefontsynonym [Pigiarniq-Bold]    [name:Pigiarniq Bold]   [features=default]
-    \definefontsynonym [Pigiarniq-Heavy]   [name:Pigiarniq Heavy]  [features=default]
+\starttypescriptcollection [pigiarniq]
+
+\starttypescript [\s!sans] [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definefontsynonym [Pigiarniq-Light]   [\s!file:pigiarniqlight]   [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Regular] [\s!file:pigiarniqregular] [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Italic]  [\s!file:pigiarniqitalic]  [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Bold]    [\s!file:pigiarniqbold]    [\s!features=\s!default]
+    \definefontsynonym [Pigiarniq-Heavy]   [\s!file:pigiarniqheavy]   [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [pigiarniq]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]       [Pigiarniq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic] [Pigiarniq-Italic]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]   [Pigiarniq-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [pigiarniq-thin]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Pigiarniq-Light]   [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Pigiarniq-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Pigiarniq-Italic]  [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!sans] [pigiarniq-bold]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]     [Pigiarniq-Bold]  [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold] [Pigiarniq-Heavy] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [pigiarniq,pigiarniq-thin,pigiarniq-bold]
+    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex b/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex
deleted file mode 100644
index 5682a5651d6..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-pigiarniq.tex
+++ /dev/null
@@ -1,43 +0,0 @@
-%D \module
-%D   [       file=type-pigiarniq,
-%D        version=2008.07.27,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Pigiarniq Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [pigiarniq]
-
-\starttypescript [sans] [pigiarniq]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]       [Pigiarniq-Regular] [features=default]
-    \definefontsynonym [SansItalic] [Pigiarniq-Italic]  [features=default]
-    \definefontsynonym [SansBold]   [Pigiarniq-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [sans] [pigiarniq-thin]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Pigiarniq-Light]   [features=default]
-    \definefontsynonym [SansBold]       [Pigiarniq-Regular] [features=default]
-    \definefontsynonym [SansBoldItalic] [Pigiarniq-Italic]  [features=default]
-\stoptypescript
-
-\starttypescript [sans] [pigiarniq-bold]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Pigiarniq-Bold]  [features=default]
-    \definefontsynonym [SansBold] [Pigiarniq-Heavy] [features=default]
-\stoptypescript
-
-\starttypescript [pigiarniq,pigiarniq-thin,pigiarniq-bold]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-pigiarniq}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
index 9166ff72f96..c0978d6b2fc 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkii
@@ -27,7 +27,7 @@
 \stoptypescript
 
 \starttypescript [sans] [klara]
-    \definefontsynonym [KlaraSans-Regular] [name:RT Klara Sans]      [features=default]
+    \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
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
index 9166ff72f96..e14c629cefb 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-richtype,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Richtype Collection,
 %D         author=Wolfgang Schuster,
@@ -13,23 +13,23 @@
 % 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]
+    \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:RTKlara-Bold]   [features=default]
-    \definefontsynonym [KlaraSerif-Italic]  [name:RTKlara-Italic] [features=default]
+    \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:RT Klara Sans]      [features=default]
-    \definefontsynonym [KlaraSans-Bold]    [name:RTKlaraSans-Bold]   [features=default]
-    \definefontsynonym [KlaraSans-Italic]  [name:RTKlaraSans-Italic] [features=default]
+    \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
index bdd77c80ba8..1744016fa53 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-richtype.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-richtype,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Richtype Collection,
 %D         author=Wolfgang Schuster,
@@ -24,6 +24,7 @@
 
 \starttypescript [francesca]
     \definetypeface [francesca] [rm] [serif] [francesca] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % Klara
@@ -45,6 +46,7 @@
 \starttypescript [klara]
     \definetypeface [klara] [rm] [serif] [klara] [default]
     \definetypeface [klara] [ss] [sans]  [klara] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
new file mode 100644
index 00000000000..ccfb8fc71ab
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkii
@@ -0,0 +1,41 @@
+%D \module
+%D   [       file=type-sabon,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Sabon Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [sabon]
+
+\starttypescript [\s!serif] [sabon]
+    \definefontsynonym [Sabon-Regular]    [\s!file:SabonLTStd-Roman]      [\s!features=\s!default]
+    \definefontsynonym [Sabon-Italic]     [\s!file:SabonLTStd-Italic]     [\s!features=\s!default]
+    \definefontsynonym [Sabon-Bold]       [\s!file:SabonLTStd-Bold]       [\s!features=\s!default]
+    \definefontsynonym [Sabon-BoldItalic] [\s!file:SabonLTStd-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [sabon]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [Sabon-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [Sabon-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [Sabon-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [Sabon-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [Sabon-Regular]    [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [sabon]
+    \definetypeface [sabon] [rm] [\s!serif] [sabon]    [\s!default]
+    \definetypeface [sabon] [ss] [\s!sans]  [modern]   [\s!default]
+    \definetypeface [sabon] [tt] [\s!mono]  [modern]   [\s!default] [\s!rscale=1.075]
+    \definetypeface [sabon] [mm] [\s!math]  [palatino] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
new file mode 100644
index 00000000000..d7f5038edbb
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.mkiv
@@ -0,0 +1,41 @@
+%D \module
+%D   [       file=type-sabon,
+%D        version=2010.09.14,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Sabon Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [sabon]
+
+\starttypescript [\s!serif] [sabon]
+    \definefontsynonym [Sabon-Regular]    [\s!file:sabonltstdroman]      [\s!features=\s!default]
+    \definefontsynonym [Sabon-Italic]     [\s!file:sabonltstditalic]     [\s!features=\s!default]
+    \definefontsynonym [Sabon-Bold]       [\s!file:sabonltstdbold]       [\s!features=\s!default]
+    \definefontsynonym [Sabon-BoldItalic] [\s!file:sabonltstdbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [sabon]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [Sabon-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [Sabon-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [Sabon-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [Sabon-BoldItalic] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifCaps]       [Sabon-Regular]    [\s!features=\s!smallcaps]
+\stoptypescript
+
+\starttypescript [sabon]
+    \definetypeface [sabon] [rm] [\s!serif] [sabon]    [\s!default]
+    \definetypeface [sabon] [ss] [\s!sans]  [modern]   [\s!default] [\s!rscale=\v!auto]
+    \definetypeface [sabon] [tt] [\s!mono]  [modern]   [\s!default] [\s!rscale=\v!auto]
+    \definetypeface [sabon] [mm] [\s!math]  [palatino] [\s!default] [\s!rscale=\v!auto]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex b/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex
deleted file mode 100644
index 40d25d639da..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-sabon.tex
+++ /dev/null
@@ -1,35 +0,0 @@
-%D \module
-%D   [       file=type-sabon,
-%D        version=2008.07.27,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Sabon Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [serif] [sabon]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [Sabon-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [Sabon-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [Sabon-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [Sabon-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [sabon]
-    \definefontsynonym [Sabon-Regular]    [name:SabonLTStd-Roman]      [features=default]
-    \definefontsynonym [Sabon-Italic]     [name:SabonLTStd-Italic]     [features=default]
-    \definefontsynonym [Sabon-Bold]       [name:SabonLTStd-Bold]       [features=default]
-    \definefontsynonym [Sabon-BoldItalic] [name:SabonLTStd-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sabon]
-    \definetypeface [sabon] [rm] [serif] [sabon]    [default]
-    \definetypeface [sabon] [ss] [sans]  [modern]   [default]
-    \definetypeface [sabon] [tt] [mono]  [modern]   [default] [rscale=1.075]
-    \definetypeface [sabon] [mm] [math]  [palatino] [default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
index b1d7607dfe5..237a4b9478f 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-samba.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-samba,
-%D        version=2009.03.29,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Samba Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -21,6 +21,7 @@
 
 \starttypescript [samba]
     \definetypeface [samba] [ss] [sans] [samba] [default]
+    \quittypescriptscanning
 \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
index 69d500c0fa2..051f343ea01 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-smeltery,
-%D        version=2009.04.06,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=SMeltery Collection,
 %D         author=Wolfgang Schuster,
@@ -13,40 +13,40 @@
 % 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]
+    \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: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]
+    \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]
+    \definefontsynonym [Geronto-Regular] [name:gerontobis] [features=default]
 \stoptypescript
 
 % MEgalopolis Extra
 
 \starttypescript [sans] [megalopolis]
-    \definefontsynonym [Megalopolis-Regular] [name:MEgalopolisExtra] [features=default]
+    \definefontsynonym [Megalopolis-Regular] [name:megalopolisextra] [features=default]
 \stoptypescript
 
 % TRottoir
 
 \starttypescript [sans] [trottoir]
-    \definefontsynonym [Trottoir-Regular] [name:Trottoir] [features=default]
+    \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
index bdf31151c97..906eea2f8ec 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-smeltery.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-smeltery,
-%D        version=2009.04.06,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=SMeltery Collection,
 %D         author=Wolfgang Schuster,
@@ -33,6 +33,7 @@
 \starttypescript [audimat]
     \definetypeface [audimat] [ss] [sans] [audimat] [default]
     \definetypeface [audimat] [tt] [mono] [audimat] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % GEronto Bis
@@ -43,7 +44,8 @@
 \stoptypescript
 
 \starttypescript [geronto]
-    \definetypeface [geronto] [rm] [serif] [geronto] [default] 
+    \definetypeface [geronto] [rm] [serif] [geronto] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % MEgalopolis Extra
@@ -55,6 +57,7 @@
 
 \starttypescript [megalopolis]
     \definetypeface [megalopolis] [ss] [sans] [megalopolis] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 % TRottoir
@@ -66,6 +69,7 @@
 
 \starttypescript [trottoir]
     \definetypeface [trottoir] [ss] [sans] [trottoir] [default]
+    \quittypescriptscanning
 \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
new file mode 100644
index 00000000000..695bc348a96
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkii
@@ -0,0 +1,37 @@
+%D \module
+%D   [       file=type-tuffy,
+%D        version=2010.09.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Tuffy Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [tuffy]
+
+\starttypescript [\s!sans] [tuffy]
+    \definefontsynonym [Tuffy-Regular]    [\s!file:Tuffy]             [\s!features=\s!default]
+    \definefontsynonym [Tuffy-Italic]     [\s!file:Tuffy_Italic]      [\s!features=\s!default]
+    \definefontsynonym [Tuffy-Bold]       [\s!file:Tuffy_Bold]        [\s!features=\s!default]
+    \definefontsynonym [Tuffy-BoldItalic] [\s!file:Tuffy_Bold_Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [tuffy]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Tuffy-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Tuffy-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Tuffy-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Tuffy-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tuffy]
+    \definetypeface [tuffy] [ss] [\s!sans] [tuffy] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
new file mode 100644
index 00000000000..9c4a100738d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.mkiv
@@ -0,0 +1,37 @@
+%D \module
+%D   [       file=type-tuffy,
+%D        version=2010.09.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Tuffy Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [tuffy]
+
+\starttypescript [\s!sans] [tuffy]
+    \definefontsynonym [Tuffy-Regular]    [\s!file:tuffy]           [\s!features=\s!default]
+    \definefontsynonym [Tuffy-Italic]     [\s!file:tuffyitalic]     [\s!features=\s!default]
+    \definefontsynonym [Tuffy-Bold]       [\s!file:tuffybold]       [\s!features=\s!default]
+    \definefontsynonym [Tuffy-BoldItalic] [\s!file:tuffybolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [tuffy]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [Tuffy-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [Tuffy-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [Tuffy-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [Tuffy-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [tuffy]
+    \definetypeface [tuffy] [ss] [\s!sans] [tuffy] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex b/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex
deleted file mode 100644
index 3d047c5132a..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-tuffy.tex
+++ /dev/null
@@ -1,32 +0,0 @@
-%D \module
-%D   [       file=type-tuffy,
-%D        version=2008.07.28,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Tuffy Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [sans] [tuffy]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [Tuffy-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [Tuffy-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [Tuffy-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [Tuffy-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [tuffy]
-    \definefontsynonym [Tuffy-Regular]    [name:Tuffy Regular]     [features=default]
-    \definefontsynonym [Tuffy-Italic]     [name:Tuffy Italic]      [features=default]
-    \definefontsynonym [Tuffy-Bold]       [name:Tuffy Bold]        [features=default]
-    \definefontsynonym [Tuffy-BoldItalic] [name:Tuffy Bold Italic] [features=default]
-\stoptypescript
-
-\starttypescript [tuffy]
-    \definetypeface [tuffy] [ss] [sans] [tuffy] [default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
index 7d0a27476fd..485942cc7f5 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-uqammaq.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-uqammaq,
-%D        version=2008.07.27,
+%D        version=2009.08.18,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Uqammaq Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -37,6 +37,7 @@
 
 \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.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
index 1df29992dcf..358a7088bec 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-vera,
-%D        version=2008.06.08,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Bitstream Vera Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,23 +10,57 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [vera]
-    \definefontsynonym [VeraSerif-Regular] [name:Bitstream Vera Serif]      [features=default]
-    \definefontsynonym [VeraSerif-Bold]    [name:Bitstream Vera Serif Bold] [features=default]
+\starttypescriptcollection [vera]
+
+\starttypescript [\s!serif] [vera]
+    \definefontsynonym [VeraSerif-Regular] [\s!file:VeraSerif]      [\s!features=\s!default]
+    \definefontsynonym [VeraSerif-Bold]    [\s!file:VeraSerif-Bold] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [vera]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]     [VeraSerif-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold] [VeraSerif-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [vera]
+    \definefontsynonym [VeraSans-Regular]    [\s!file:Vera]             [\s!features=\s!default]
+    \definefontsynonym [VeraSans-Italic]     [\s!file:Vera-Italic]      [\s!features=\s!default]
+    \definefontsynonym [VeraSans-Bold]       [\s!file:Vera-Bold]        [\s!features=\s!default]
+    \definefontsynonym [VeraSans-BoldItalic] [\s!file:Vera-Bold-Italic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [vera]
-    \definefontsynonym [VeraSans-Regular]    [name:Bitstream Vera Sans]              [features=default]
-    \definefontsynonym [VeraSans-Italic]     [name:Bitstream Vera Sans Oblique]      [features=default]
-    \definefontsynonym [VeraSans-Bold]       [name:Bitstream Vera Sans Bold]         [features=default]
-    \definefontsynonym [VeraSans-BoldItalic] [name:Bitstream Vera Sans Bold Oblique] [features=default]
+\starttypescript [\s!sans] [vera]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [VeraSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [VeraSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [VeraSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [VeraSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [mono] [vera]
-    \definefontsynonym [VeraMono-Regular]    [name:Bitstream Vera Sans Mono]              [features=default]
-    \definefontsynonym [VeraMono-Italic]     [name:Bitstream Vera Sans Mono Oblique]      [features=default]
-    \definefontsynonym [VeraMono-Bold]       [name:Bitstream Vera Sans Mono Bold]         [features=default]
-    \definefontsynonym [VeraMono-BoldItalic] [name:Bitstream Vera Sans Mono Bold Oblique] [features=default]
+    \definefontsynonym [VeraMono-Regular]    [\s!file:VeraMono]             [\s!features=\s!default]
+    \definefontsynonym [VeraMono-Italic]     [\s!file:VeraMono-Italic]      [\s!features=\s!default]
+    \definefontsynonym [VeraMono-Bold]       [\s!file:VeraMono-Bold]        [\s!features=\s!default]
+    \definefontsynonym [VeraMono-BoldItalic] [\s!file:VeraMono-Bold-Italic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [vera]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [Mono]           [VeraMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [MonoItalic]     [VeraMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [MonoBold]       [VeraMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [MonoBoldItalic] [VeraMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [vera]
+    \definetypeface [vera] [rm] [\s!serif] [vera]   [\s!default]
+    \definetypeface [vera] [ss] [\s!sans]  [vera]   [\s!default]
+    \definetypeface [vera] [tt] [\s!mono]  [vera]   [\s!default]
+    \definetypeface [vera] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
index bfa63220839..89a7eac856b 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-vera,
-%D        version=2008.06.08,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Bitstream Vera Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,23 +10,57 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [vera]
-    \definefontsynonym [VeraSerif-Regular] [name:bitstreamveraserifroman] [features=default]
-    \definefontsynonym [VeraSerif-Bold]    [name:bitstreamveraserifbold]  [features=default]
+\starttypescriptcollection [vera]
+
+\starttypescript [\s!serif] [vera]
+    \definefontsynonym [VeraSerif-Regular] [\s!file:veraserif]     [\s!features=\s!default]
+    \definefontsynonym [VeraSerif-Bold]    [\s!file:veraserifbold] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [vera]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]     [VeraSerif-Regular] [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold] [VeraSerif-Bold]    [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [vera]
+    \definefontsynonym [VeraSans-Regular]    [\s!file:vera]           [\s!features=\s!default]
+    \definefontsynonym [VeraSans-Italic]     [\s!file:veraitalic]     [\s!features=\s!default]
+    \definefontsynonym [VeraSans-Bold]       [\s!file:verabold]       [\s!features=\s!default]
+    \definefontsynonym [VeraSans-BoldItalic] [\s!file:verabolditalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [vera]
-    \definefontsynonym [VeraSans-Regular]    [name:bitstreamverasansroman]       [features=default]
-    \definefontsynonym [VeraSans-Italic]     [name:bitstreamverasansoblique]     [features=default]
-    \definefontsynonym [VeraSans-Bold]       [name:bitstreamverasansbold]        [features=default]
-    \definefontsynonym [VeraSans-BoldItalic] [name:bitstreamverasansboldoblique] [features=default]
+\starttypescript [\s!sans] [vera]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [VeraSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [VeraSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [VeraSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [VeraSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [mono] [vera]
-    \definefontsynonym [VeraMono-Regular]    [name:bitstreamverasansmonoroman]       [features=default]
-    \definefontsynonym [VeraMono-Italic]     [name:bitstreamverasansmonooblique]     [features=default]
-    \definefontsynonym [VeraMono-Bold]       [name:bitstreamverasansmonobold]        [features=default]
-    \definefontsynonym [VeraMono-BoldItalic] [name:bitstreamverasansmonoboldoblique] [features=default]
+    \definefontsynonym [VeraMono-Regular]    [\s!file:veramono]           [\s!features=\s!default]
+    \definefontsynonym [VeraMono-Italic]     [\s!file:veramonoitalic]     [\s!features=\s!default]
+    \definefontsynonym [VeraMono-Bold]       [\s!file:veramonobold]       [\s!features=\s!default]
+    \definefontsynonym [VeraMono-BoldItalic] [\s!file:veramonobolditalic] [\s!features=\s!default]
 \stoptypescript
 
+\starttypescript [\s!mono] [vera]
+    \setups[\s!font:\s!fallback:\s!mono]
+    \definefontsynonym [Mono]           [VeraMono-Regular]    [\s!features=\s!default]
+    \definefontsynonym [MonoItalic]     [VeraMono-Italic]     [\s!features=\s!default]
+    \definefontsynonym [MonoBold]       [VeraMono-Bold]       [\s!features=\s!default]
+    \definefontsynonym [MonoBoldItalic] [VeraMono-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [vera]
+    \definetypeface [vera] [rm] [\s!serif] [vera]   [\s!default]
+    \definetypeface [vera] [ss] [\s!sans]  [vera]   [\s!default]
+    \definetypeface [vera] [tt] [\s!mono]  [vera]   [\s!default]
+    \definetypeface [vera] [mm] [\s!math]  [modern] [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
 \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
index bd3a24909ac..e69de29bb2d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vera.tex
@@ -1,48 +0,0 @@
-%D \module
-%D   [       file=type-vera,
-%D        version=2008.06.08,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Bitstream Vera Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [vera]
-
-\starttypescript [serif] [vera]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]     [VeraSerif-Regular] [features=default]
-    \definefontsynonym [SerifBold] [VeraSerif-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [sans] [vera]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [VeraSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [VeraSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [VeraSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [VeraSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [vera]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [VeraMono-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [VeraMono-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [VeraMono-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [VeraMono-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [vera]
-    \definetypeface [vera] [rm] [serif] [vera]   [default]
-    \definetypeface [vera] [ss] [sans]  [vera]   [default]
-    \definetypeface [vera] [tt] [mono]  [vera]   [default]
-    \definetypeface [vera] [mm] [math]  [modern] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-vera}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
index 88254746a71..1a0cc63e740 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-verajja,
-%D        version=2009.03.24,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Verajja Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,18 +10,46 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [verajja]
-    \definefontsynonym [VerajjaSerif-Regular]    [name:Verajja Serif]             [features=default]
-    \definefontsynonym [VerajjaSerif-Italic]     [name:Verajja Serif Italic]      [features=default]
-    \definefontsynonym [VerajjaSerif-Bold]       [name:Verajja Serif Bold]        [features=default]
-    \definefontsynonym [VerajjaSerif-BoldItalic] [name:Verajja Serif Bold Italic] [features=default]
+\starttypescriptcollection [verajja]
+
+\starttypescript [\s!serif] [verajja]
+    \definefontsynonym [VerajjaSerif-Regular]    [\s!file:Verajja Serif Regular]     [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-Italic]     [\s!file:Verajja Serif Italic]      [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-Bold]       [\s!file:Verajja Serif Bold]        [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-BoldItalic] [\s!file:Verajja Serif Bold Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [verajja]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [VerajjaSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [VerajjaSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [VerajjaSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [VerajjaSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [verajja]
+    \definefontsynonym [VerajjaSans-Regular]    [\s!file:Verajja Regular]     [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-Italic]     [\s!file:Verajja Italic]      [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-Bold]       [\s!file:Verajja Bold]        [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-BoldItalic] [\s!file:Verajja Bold Italic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [verajja]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [VerajjaSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [VerajjaSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [VerajjaSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [VerajjaSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [verajja]
-    \definefontsynonym [VerajjaSans-Regular]    [name:Verajja]             [features=default]
-    \definefontsynonym [VerajjaSans-Italic]     [name:Verajja Italic]      [features=default]
-    \definefontsynonym [VerajjaSans-Bold]       [name:Verajja Bold]        [features=default]
-    \definefontsynonym [VerajjaSans-BoldItalic] [name:Verajja Bold Italic] [features=default]
+\starttypescript [verajja]
+    \definetypeface [verajja] [rm] [\s!serif] [verajja] [\s!default]
+    \definetypeface [verajja] [ss] [\s!sans]  [verajja] [\s!default]
+    \definetypeface [verajja] [tt] [\s!mono]  [modern]  [\s!default]
+    \definetypeface [verajja] [mm] [\s!math]  [modern]  [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
index 32fa95be460..fabe2033775 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-verajja,
-%D        version=2009.03.24,
+%D        version=2010.09.14,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Verajja Font Definitions,
 %D         author=Wolfgang Schuster,
@@ -10,18 +10,46 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\starttypescript [serif] [verajja]
-    \definefontsynonym [VerajjaSerif-Regular]    [name:verajjaserif]           [features=default]
-    \definefontsynonym [VerajjaSerif-Italic]     [name:verajjaserifitalic]     [features=default]
-    \definefontsynonym [VerajjaSerif-Bold]       [name:verajjaserifbold]       [features=default]
-    \definefontsynonym [VerajjaSerif-BoldItalic] [name:verajjaserifbolditalic] [features=default]
+\starttypescriptcollection [verajja]
+
+\starttypescript [\s!serif] [verajja]
+    \definefontsynonym [VerajjaSerif-Regular]    [\s!file:verajjaserifregular]    [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-Italic]     [\s!file:verajjaserifitalic]     [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-Bold]       [\s!file:verajjaserifbold]       [\s!features=\s!default]
+    \definefontsynonym [VerajjaSerif-BoldItalic] [\s!file:verajjaserifbolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!serif] [verajja]
+    \setups[\s!font:\s!fallback:\s!serif]
+    \definefontsynonym [\s!Serif]           [VerajjaSerif-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SerifItalic]     [VerajjaSerif-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBold]       [VerajjaSerif-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SerifBoldItalic] [VerajjaSerif-BoldItalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [verajja]
+    \definefontsynonym [VerajjaSans-Regular]    [\s!file:verajjaregular]    [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-Italic]     [\s!file:verajjaitalic]     [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-Bold]       [\s!file:verajjabold]       [\s!features=\s!default]
+    \definefontsynonym [VerajjaSans-BoldItalic] [\s!file:verajjabolditalic] [\s!features=\s!default]
+\stoptypescript
+
+\starttypescript [\s!sans] [verajja]
+    \setups[\s!font:\s!fallback:\s!sans]
+    \definefontsynonym [\s!Sans]           [VerajjaSans-Regular]    [\s!features=\s!default]
+    \definefontsynonym [\s!SansItalic]     [VerajjaSans-Italic]     [\s!features=\s!default]
+    \definefontsynonym [\s!SansBold]       [VerajjaSans-Bold]       [\s!features=\s!default]
+    \definefontsynonym [\s!SansBoldItalic] [VerajjaSans-BoldItalic] [\s!features=\s!default]
 \stoptypescript
 
-\starttypescript [sans] [verajja]
-    \definefontsynonym [VerajjaSans-Regular]    [name:verajja]           [features=default]
-    \definefontsynonym [VerajjaSans-Italic]     [name:verajjaitalic]     [features=default]
-    \definefontsynonym [VerajjaSans-Bold]       [name:verajjabold]       [features=default]
-    \definefontsynonym [VerajjaSans-BoldItalic] [name:verajjabolditalic] [features=default]
+\starttypescript [verajja]
+    \definetypeface [verajja] [rm] [\s!serif] [verajja] [\s!default]
+    \definetypeface [verajja] [ss] [\s!sans]  [verajja] [\s!default]
+    \definetypeface [verajja] [tt] [\s!mono]  [modern]  [\s!default]
+    \definetypeface [verajja] [mm] [\s!math]  [modern]  [\s!default]
+    \quittypescriptscanning
 \stoptypescript
 
+\stoptypescriptcollection
+
 \endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex b/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex
deleted file mode 100644
index 5dda476c402..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-verajja.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%D \module
-%D   [       file=type-verajja,
-%D        version=2009.03.24,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Verajja Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [verajja]
-
-\starttypescript [serif] [verajja]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [VerajjaSerif-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [VerajjaSerif-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [VerajjaSerif-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [VerajjaSerif-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [verajja]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [VerajjaSans-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [VerajjaSans-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [VerajjaSans-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [VerajjaSans-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [verajja]
-    \definetypeface [verajja] [rm] [serif] [verajja] [default]
-    \definetypeface [verajja] [ss] [sans]  [verajja] [default]
-    \definetypeface [verajja] [tt] [mono]  [modern]  [default]
-    \definetypeface [verajja] [mm] [math]  [modern]  [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-verajja}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
index 40a06360e90..268809c4f1a 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-vista,
-%D        version=2008.06.08,
+%D        version=2010.09.15,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Vista Collection,
 %D         author=Wolfgang Schuster,
@@ -10,18 +10,116 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\definetypescriptprefix [f:cambria]    [Cambria]
-\definetypescriptprefix [f:constantia] [Constantia]
-\definetypescriptprefix [f:calibri]    [Calibri]
-\definetypescriptprefix [f:candara]    [Candara]
-\definetypescriptprefix [f:corbel]     [Corbel]
-\definetypescriptprefix [f:consolas]   [Consolas]
+\starttypescriptcollection [vista]
 
-\starttypescript [serif,sans,mono] [cambria,constantia,calibri,candara,corbel,consolas]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]             [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo} Italic]      [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo} Bold]        [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo} Bold Italic] [features=default]
+\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 [\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 [\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
+
+\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
+
+\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
+
+\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-vista.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
index b5ddbacde9d..2f3d8bfe53d 100644
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vista.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=type-vista,
-%D        version=2008.06.08,
+%D        version=2010.09.15,
 %D          title=\CONTEXT\ Typescript Macros,
 %D       subtitle=Vista Collection,
 %D         author=Wolfgang Schuster,
@@ -10,18 +10,116 @@
 %C Copyright 2009 Wolfgang Schuster.
 %C This file may be distributed under the GNU General Public License v. 2.0.
 
-\definetypescriptprefix [f:cambria]    [cambria]
-\definetypescriptprefix [f:constantia] [constantia]
-\definetypescriptprefix [f:calibri]    [calibri]
-\definetypescriptprefix [f:candara]    [candara]
-\definetypescriptprefix [f:corbel]     [corbel]
-\definetypescriptprefix [f:consolas]   [consolas]
+\starttypescriptcollection [vista]
 
-\starttypescript [serif,sans,mono] [cambria,constantia,calibri,candara,corbel,consolas]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]    [name:\typescriptprefix{f:\typescripttwo}]           [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]     [name:\typescriptprefix{f:\typescripttwo}italic]     [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]       [name:\typescriptprefix{f:\typescripttwo}bold]       [features=default]
-    \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [name:\typescriptprefix{f:\typescripttwo}bolditalic] [features=default]
+\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 [\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 [\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
+
+\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
+
+\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
+
+\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-vista.tex b/Master/texmf-dist/tex/context/third/typescripts/type-vista.tex
deleted file mode 100644
index 587d6bf6c0b..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vista.tex
+++ /dev/null
@@ -1,62 +0,0 @@
-%D \module
-%D   [       file=type-vista,
-%D        version=2008.06.08,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Vista Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescriptcollection [vista]
-
-\definetypescriptprefix [n:cambria]    [Cambria]
-\definetypescriptprefix [n:constantia] [Constantia]
-\definetypescriptprefix [n:calibri]    [Calibri]
-\definetypescriptprefix [n:candara]    [Candara]
-\definetypescriptprefix [n:corbel]     [Corbel]
-\definetypescriptprefix [n:consolas]   [Consolas]
-
-\starttypescript [serif] [cambria,constantia]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SerifItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SerifBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [calibri,candara,corbel]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [SansItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [SansBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [SansBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [mono] [consolas]
-    \setups[font:fallback:mono]
-    \definefontsynonym [Mono]           [\typescriptprefix{n:\typescripttwo}-Regular]    [features=default]
-    \definefontsynonym [MonoItalic]     [\typescriptprefix{n:\typescripttwo}-Italic]     [features=default]
-    \definefontsynonym [MonoBold]       [\typescriptprefix{n:\typescripttwo}-Bold]       [features=default]
-    \definefontsynonym [MonoBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] [features=default]
-\stoptypescript
-
-\starttypescript [cambria,constantia]
-    \definetypeface [\typescriptone] [rm] [serif] [\typescriptone] [default]
-\stoptypescript
-
-\starttypescript [calibri,candara,corbel]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-\starttypescript [consolas]
-    \definetypeface [\typescriptone] [tt] [mono] [\typescriptone] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-vista}
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
new file mode 100644
index 00000000000..01e8a491c07
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkii
@@ -0,0 +1,40 @@
+%D \module
+%D   [       file=type-vollkorn,
+%D        version=2010.09.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vollkorn Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [vollkorn]
+
+\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]
+    \definefontsynonym [SerifBold]       [Vollkorn-Bold]       [\s!features=\s!default]
+    \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]
+    \definetypeface [vollkorn] [tt] [\s!mono]  [modern]   [\s!default]
+    \definetypeface [vollkorn] [mm] [\s!math]  [math]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
new file mode 100644
index 00000000000..c12b5c6bc7d
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.mkiv
@@ -0,0 +1,40 @@
+%D \module
+%D   [       file=type-vollkorn,
+%D        version=2010.09.15,
+%D          title=\CONTEXT\ Typescript Macros,
+%D       subtitle=Vollkorn Font Definitions,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster]
+%C
+%C Copyright 2009 Wolfgang Schuster.
+%C This file may be distributed under the GNU General Public License v. 2.0.
+
+\starttypescriptcollection [vollkorn]
+
+\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]
+    \definefontsynonym [SerifBold]       [Vollkorn-Bold]       [\s!features=\s!default]
+    \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]
+    \definetypeface [vollkorn] [tt] [\s!mono]  [modern]   [\s!default]
+    \definetypeface [vollkorn] [mm] [\s!math]  [math]     [\s!default]
+    \quittypescriptscanning
+\stoptypescript
+
+\stoptypescriptcollection
+
+\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex b/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex
deleted file mode 100644
index 7f68a5f769f..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-vollkorn.tex
+++ /dev/null
@@ -1,26 +0,0 @@
-%D \module
-%D   [       file=type-vollkorn,
-%D        version=2009.03.29,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Vollkorn Font Definitions,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-\starttypescript [serif] [vollkorn]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Vollkorn-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [serif] [vollkorn]
-    \definefontsynonym [Vollkorn-Regular] [name:Vollkorn] [features=default]
-\stoptypescript
-
-\starttypescript [vollkorn]
-    \definetypeface [vollkorn] [rm] [serif] [vollkorn] [default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii
deleted file mode 100644
index 6d6a246a2d7..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkii
+++ /dev/null
@@ -1,34 +0,0 @@
-%D \module
-%D   [       file=type-yanone,
-%D        version=2009.03.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Yanone Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-% Al Abdali 8
-
-\starttypescript [sans] [alabdali]
-    \definefontsynonym [Kaffeesatz-Regular] [name:Al Abdali 8] [features=arabic]
-\stoptypescript
-
-% Kaffeesatz
-
-\starttypescript [sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
-    \definefontsynonym [Kaffeesatz-Thin]    [name:YanoneKaffeesatz-Thin]    [features=default]
-    \definefontsynonym [Kaffeesatz-Light]   [name:YanoneKaffeesatz-Light]   [features=default]
-    \definefontsynonym [Kaffeesatz-Regular] [name:YanoneKaffeesatz-Regular] [features=default]
-    \definefontsynonym [Kaffeesatz-Bold]    [name:YanoneKaffeesatz-Bold]    [features=default]
-\stoptypescript
-
-% Tagesschrift
-
-\starttypescript [serif] [tagesschrift]
-    \definefontsynonym [Tagesschrift-Regular] [name:Yanone Tagesschrift] [features=default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv
deleted file mode 100644
index 45d2c04f9da..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.mkiv
+++ /dev/null
@@ -1,34 +0,0 @@
-%D \module
-%D   [       file=type-yanone,
-%D        version=2009.03.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Yanone Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-% Al Abdali 8
-
-\starttypescript [sans] [alabdali]
-    \definefontsynonym [Kaffeesatz-Regular] [name:alabdali8] [features=arabic]
-\stoptypescript
-
-% Kaffeesatz
-
-\starttypescript [sans] [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
-    \definefontsynonym [Kaffeesatz-Thin]    [name:yanonekaffeesatzthin]    [features=default]
-    \definefontsynonym [Kaffeesatz-Light]   [name:yanonekaffeesatzlight]   [features=default]
-    \definefontsynonym [Kaffeesatz-Regular] [name:yanonekaffeesatzregular] [features=default]
-    \definefontsynonym [Kaffeesatz-Bold]    [name:yanonekaffeesatzbold]    [features=default]
-\stoptypescript
-
-% Tagesschrift
-
-\starttypescript [serif] [tagesschrift]
-    \definefontsynonym [Tagesschrift-Regular] [name:Yanone Tagesschrift] [features=default]
-\stoptypescript
-
-\endinput
diff --git a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex b/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex
deleted file mode 100644
index 61ca62497f3..00000000000
--- a/Master/texmf-dist/tex/context/third/typescripts/type-yanone.tex
+++ /dev/null
@@ -1,68 +0,0 @@
-%D \module
-%D   [       file=type-yanone,
-%D        version=2009.03.30,
-%D          title=\CONTEXT\ Typescript Macros,
-%D       subtitle=Yanone Collection,
-%D         author=Wolfgang Schuster,
-%D           date=\currentdate,
-%D      copyright=Wolfgang Schuster]
-%C
-%C Copyright 2009 Wolfgang Schuster.
-%C This file may be distributed under the GNU General Public License v. 2.0.
-
-%D These are typescripts for fonts created by Jan Gerner. They can be
-%D downloaded at\hyphenatedurl{http://www.yanone.de/}
-
-\starttypescriptcollection [yanone]
-
-% Al Abdali 8
-
-\starttypescript [sans] [alabdali]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans] [Kaffeesatz-Bold] [features=arabic]
-\stoptypescript
-
-\starttypescript [alabdali]
-    \definetypeface [alabdali] [ss] [sans] [alabdali] [default]
-\stoptypescript
-
-% Kaffeesatz
-
-\starttypescript [sans] [kaffeesatz]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Kaffeesatz-Regular] [features=default]
-    \definefontsynonym [SansBold] [Kaffeesatz-Bold]    [features=default]
-\stoptypescript
-
-\starttypescript [sans] [kaffeesatz-thin]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Kaffeesatz-Thin]  [features=default]
-    \definefontsynonym [SansBold] [Kaffeesatz-Light] [features=default]
-\stoptypescript
-
-\starttypescript [sans] [kaffeesatz-light]
-    \setups[font:fallback:sans]
-    \definefontsynonym [Sans]     [Kaffeesatz-Light]   [features=default]
-    \definefontsynonym [SansBold] [Kaffeesatz-Regular] [features=default]
-\stoptypescript
-
-\starttypescript [kaffeesatz,kaffeesatz-thin,kaffeesatz-light]
-    \definetypeface [\typescriptone] [ss] [sans] [\typescriptone] [default]
-\stoptypescript
-
-% Tagesschrift
-
-\starttypescript [serif] [tagesschrift]
-    \setups[font:fallback:serif]
-    \definefontsynonym [Serif] [Tagesschrift-Regular]   [features=default]
-\stoptypescript
-
-\starttypescript [tagesschrift]
-    \definetypeface [tagesschrift] [rm] [serif] [tagesschrift] [default]
-\stoptypescript
-
-\stoptypescriptcollection
-
-\loadmarkfile{type-yanone}
-
-\endinput