CTAN sync 202108310300

67 files changed, 108 insertions, 2064 deletions

diff --git a/macros/context/contrib/context-typescripts/VERSION b/macros/context/contrib/context-typescripts/VERSION
index 9ea5e88e29..dda7930ac9 100644
--- a/macros/context/contrib/context-typescripts/VERSION
+++ b/macros/context/contrib/context-typescripts/VERSION
@@ -1 +1 @@
-2012.02.15
+2021.08.29
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-adobe.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-adobe.mkii
deleted file mode 100644
index 1a9913e210..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-adobe.mkii
+++ /dev/null
@@ -1,99 +0,0 @@
-%D \module
-%D   [     file=type-adobe,
-%D      version=2010.09.13,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Adobe Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\definetypescriptprefix [f:minion]     [minionpro]
-\definetypescriptprefix [f:myriad]     [myriadpro]
-\definetypescriptprefix [f:warnockpro] [warnockpro]
-
-\definetypescriptprefix [n:minion]     [Minion]
-\definetypescriptprefix [n:myriad]     [Myriad]
-\definetypescriptprefix [n:warnockpro] [WarnockPro]
-
-\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 [\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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-aller.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-aller.mkii
deleted file mode 100644
index 5a34f78c26..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-aller.mkii
+++ /dev/null
@@ -1,68 +0,0 @@
-%D \module
-%D   [     file=type-aller,
-%D      version=2011.08.28,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Aller Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [aller]
-
-\starttypescript [\s!sans] [aller,aller-light,aller-display]
-    \definefontsynonym [Aller-Regular]      [\s!file:Aller_Rg]     [\s!features=\s!default]
-    \definefontsynonym [Aller-Italic]       [\s!file:Aller_It]     [\s!features=\s!default]
-    \definefontsynonym [Aller-Bold]         [\s!file:Aller_Bd]     [\s!features=\s!default]
-    \definefontsynonym [Aller-BoldItalic]   [\s!file:Aller_BdIt]   [\s!features=\s!default]
-    \definefontsynonym [Aller-Display]      [\s!file:AllerDisplay] [\s!features=\s!default]
-    \definefontsynonym [Aller-LightRegular] [\s!file:Aller_Lt]     [\s!features=\s!default]
-    \definefontsynonym [Aller-LightItalic]  [\s!file:Aller_LtIt]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [aller]
-    \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]
-    \definefontsynonym [\s!SansCaps]       [Aller-Regular]    [\s!features=\s!smallcaps]
-\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]
-    \definefontsynonym [\s!SansBold]       [Aller-Regular]      [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Aller-Italic]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Aller-LightRegular] [\s!features=\s!smallcaps]
-\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] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-anivers.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-anivers.mkii
deleted file mode 100644
index 84f8a67beb..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-anivers.mkii
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-anivers,
-%D      version=2011.08.28,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Anivers Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [anivers]
-
-\starttypescript [\s!sans] [anivers]
-    \definefontsynonym [Anivers-Regular] [\s!file:Anivers_Regular]   [\s!features=\s!default]
-    \definefontsynonym [Anivers-Italic]  [\s!file:Anivers_Italic]    [\s!features=\s!default]
-    \definefontsynonym [Anivers-Bold]    [\s!file:Anivers_Bold]      [\s!features=\s!default]
-    \definefontsynonym [Anivers-Caps]    [\s!file:Anivers_SmallCaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [anivers]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [Anivers-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [Anivers-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]   [Anivers-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]   [Anivers-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [anivers]
-    \definetypeface [anivers] [ss] [\s!sans] [anivers] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-audimat.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-audimat.mkii
deleted file mode 100644
index f5eccdb9b9..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-audimat.mkii
+++ /dev/null
@@ -1,71 +0,0 @@
-%D \module
-%D   [     file=type-audimat,
-%D      version=2011.09.21,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Audimat Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [audimat]
-
-\starttypescript [\s!sans] [audimat]
-    \definefontsynonym [Audimat-Regular]    [\s!file:AUdimat-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Audimat-Italic]     [\s!file:AUdimat-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Audimat-Bold]       [\s!file:AUdimat-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Audimat-BoldItalic] [\s!file:AUdimat-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [audimat]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Audimat-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Audimat-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Audimat-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Audimat-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [audimat]
-    \definefontsynonym [AudimatMono-Light]       [\s!file:AUDIML__] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-LightItalic] [\s!file:AUDIMLO_] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-LightCaps]   [\s!file:AUDIMSCL] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-Regular]     [\s!file:AUDIMRG_] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-Italic]      [\s!file:AUDIMO__] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-Smallcaps]   [\s!file:AUDIMSC_] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-Bold]        [\s!file:AUDIMB__] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-BoldItalic]  [\s!file:AUDIMBO_] [\s!features=\s!default]
-    \definefontsynonym [AudimatMono-BoldCaps]    [\s!file:AUDIMSCB] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!mono] [audimat]
-    \setups[\s!font:\s!fallback:\s!mono]
-    \definefontsynonym [\s!Mono]           [AudimatMono-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!MonoItalic]     [AudimatMono-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBold]       [AudimatMono-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!MonoBoldItalic] [AudimatMono-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [audimat]
-    \definetypeface [audimat] [ss] [\s!sans] [audimat] [\s!default]
-    \definetypeface [audimat] [tt] [\s!mono] [audimat] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-axel.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-axel.mkii
deleted file mode 100644
index cde84402f2..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-axel.mkii
+++ /dev/null
@@ -1,49 +0,0 @@
-%D \module
-%D   [     file=type-axel,
-%D      version=2011.08.28,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Axel Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [axel]
-
-\starttypescript [\s!sans] [axel]
-    \definefontsynonym [Axel-Regular]  [\s!file:Axel-Regular]   [\s!features=\s!default]
-    \definefontsynonym [Axel-Bold]     [\s!file:Axel-Bold]      [\s!features=\s!default]
-    \definefontsynonym [Axel-Caps]     [\s!file:AxelSC-Regular] [\s!features=\s!default]
-    \definefontsynonym [Axel-BoldCaps] [\s!file:AxelSC-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [axel]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Axel-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Axel-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps] [Axel-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [axel]
-    \definetypeface [axel] [ss] [\s!sans] [axel] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-azuro.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-azuro.mkii
deleted file mode 100644
index 87dca6e8b3..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-azuro.mkii
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-azuro,
-%D      version=2011.08.28,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Azuro Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [azuro]
-
-\starttypescript [\s!sans] [azuro]
-    \definefontsynonym [Azuro-Regular]    [\s!file:Azuro-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Azuro-Italic]     [\s!file:Azuro-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Azuro-Bold]       [\s!file:Azuro-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Azuro-BoldItalic] [\s!file:Azuro-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [azuro]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Azuro-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Azuro-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Azuro-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Azuro-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [azuro]
-    \definetypeface [azuro] [ss] [\s!sans] [azuro] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-calluna.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-calluna.mkii
deleted file mode 100644
index bdc257a8f8..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-calluna.mkii
+++ /dev/null
@@ -1,68 +0,0 @@
-%D \module
-%D   [     file=type-calluna,
-%D      version=2011.01.01,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Calluna Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [calluna]
-
-\starttypescript [\s!serif] [calluna]
-    \definefontsynonym [Calluna-Regular]    [\s!file:Calluna-Regular] [\s!features=\s!default]
-    \definefontsynonym [Calluna-Italic]     [\s!file:Calluna-It]      [\s!features=\s!default]
-    \definefontsynonym [Calluna-Bold]       [\s!file:Calluna-Bold]    [\s!features=\s!default]
-    \definefontsynonym [Calluna-BoldItalic] [\s!file:Calluna-BoldIt]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [calluna]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]            [Calluna-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]      [Calluna-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]        [Calluna-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic]  [Calluna-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \definefontsynonym [CallunaSans-Regular]    [\s!file:CallunaSansRegular]    [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Italic]     [\s!file:CallunaSansItalic]     [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-Bold]       [\s!file:CallunaSansBold]       [\s!features=\s!default]
-    \definefontsynonym [CallunaSans-BoldItalic] [\s!file:CallunaSansBoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [calluna]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]            [CallunaSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]      [CallunaSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]        [CallunaSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic]  [CallunaSans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [calluna]
-    \definetypeface [calluna] [rm] [\s!serif] [calluna]  [\s!default]
-    \definetypeface [calluna] [ss] [\s!sans]  [calluna]  [\s!default]
-    \definetypeface [calluna] [tt] [\s!mono]  [modern]   [\s!default]
-    \definetypeface [calluna] [mm] [\s!math]  [palatino] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charissil.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charissil.mkii
deleted file mode 100644
index f96f5985b8..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charissil.mkii
+++ /dev/null
@@ -1,53 +0,0 @@
-%D \module
-%D   [     file=type-charissil,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Charis SIL Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charter.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charter.mkii
deleted file mode 100644
index 74ddef029a..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charter.mkii
+++ /dev/null
@@ -1,65 +0,0 @@
-%D \module
-%D   [     file=type-charter,
-%D      version=2010.09.13,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Charter Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection[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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-delicious.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-delicious.mkii
deleted file mode 100644
index 8b0e8c5a8f..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-delicious.mkii
+++ /dev/null
@@ -1,53 +0,0 @@
-%D \module
-%D   [     file=type-delicious,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Delicious Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [delicious]
-
-\starttypescript [\s!sans] [delicious]
-    \definefontsynonym [Delicious-Regular]    [\s!file:Delicious-Roman]      [\s!features=\s!default]
-    \definefontsynonym [Delicious-Italic]     [\s!file:Delicious-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Delicious-Bold]       [\s!file:Delicious-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Delicious-BoldItalic] [\s!file:Delicious-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [Delicious-Caps]       [\s!file:Delicious-SmallCaps]  [\s!features=\s!default]
-    \definefontsynonym [Delicious-Heavy]      [\s!file:Delicious-Heavy]      [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [delicious]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Delicious-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Delicious-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Delicious-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Delicious-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [Delicious-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [delicious]
-    \definetypeface [delicious] [ss] [\s!sans] [delicious] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-diavlo.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-diavlo.mkii
deleted file mode 100644
index a13239d011..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-diavlo.mkii
+++ /dev/null
@@ -1,67 +0,0 @@
-%D \module
-%D   [     file=type-diavlo,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Diavlo Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [diavlo]
-
-\starttypescript [\s!sans] [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definefontsynonym [DiavloLight-Regular]  [\s!file:Diavlo_LIGHT_II_37]  [\s!features=\s!default]
-    \definefontsynonym [DiavloBook-Regular]   [\s!file:Diavlo_BOOK_II_37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloMedium-Regular] [\s!file:Diavlo_MEDIUM_II_37] [\s!features=\s!default]
-    \definefontsynonym [DiavloBold-Regular]   [\s!file:Diavlo_BOLD_II_37]   [\s!features=\s!default]
-    \definefontsynonym [DiavloBlack-Regular]  [\s!file:Diavlo_BLACK_II_37]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBook-Regular]   [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloMedium-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-light]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloLight-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBook-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-medium]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloMedium-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular]  [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [\s!sans] [diavlo-bold]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [DiavloBold-Regular]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [DiavloBlack-Regular] [\s!features=\s!default]  
-\stoptypescript
-
-\starttypescript [diavlo,diavlo-light,diavlo-medium,diavlo-bold]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-droid.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-droid.mkii
deleted file mode 100644
index ad34cd0292..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-droid.mkii
+++ /dev/null
@@ -1,78 +0,0 @@
-%D \module
-%D   [     file=type-droid,
-%D      version=2010.09.13,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Droid Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%D 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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fertigo.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fertigo.mkii
deleted file mode 100644
index 0afe073571..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fertigo.mkii
+++ /dev/null
@@ -1,46 +0,0 @@
-%D \module
-%D   [     file=type-fertigo,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Fertigo Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [fertigo]
-
-\starttypescript [\s!sans] [fertigo]
-    \definefontsynonym [FertigoPro-Regular] [\s!file:Fertigo_PRO]       [\s!features=\s!default]
-    \definefontsynonym [FertigoPro-Italic]  [\s!file:FertigoPro_Italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fertigo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [FertigoPro-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [FertigoPro-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fertigo]
-    \definetypeface [fertigo] [ss] [\s!sans] [fertigo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fontin.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fontin.mkii
deleted file mode 100644
index a671115836..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fontin.mkii
+++ /dev/null
@@ -1,70 +0,0 @@
-%D \module
-%D   [     file=type-fontin,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Fontin Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [fontin]
-
-\starttypescript [\s!serif] [fontin]
-    \definefontsynonym [Fontin-Regular] [\s!file:Fontin-Regular]   [\s!features=\s!default]
-    \definefontsynonym [Fontin-Italic]  [\s!file:Fontin-Italic]    [\s!features=\s!default]
-    \definefontsynonym [Fontin-Bold]    [\s!file:Fontin-Bold]      [\s!features=\s!default]
-    \definefontsynonym [Fontin-Caps]    [\s!file:Fontin-SmallCaps] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [fontin]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [Fontin-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [Fontin-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]   [Fontin-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]   [Fontin-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \definefontsynonym [FontinSans-Regular]    [\s!file:Fontin_Sans_R_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Italic]     [\s!file:Fontin_Sans_I_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Bold]       [\s!file:Fontin_Sans_B_45b]  [\s!features=\s!default]
-    \definefontsynonym [FontinSans-BoldItalic] [\s!file:Fontin_Sans_BI_45b] [\s!features=\s!default]
-    \definefontsynonym [FontinSans-Caps]       [\s!file:Fontin_Sans_SC_45b] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [fontin]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [FontinSans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [FontinSans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [FontinSans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [FontinSans-BoldItalic] [\s!features=\s!default]
-    \definefontsynonym [\s!SansCaps]       [FontinSans-Caps]       [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [fontin]
-    \definetypeface [fontin] [rm] [\s!serif] [fontin]   [\s!default]
-    \definetypeface [fontin] [ss] [\s!sans]  [fontin]   [\s!default]
-    \definetypeface [fontin] [tt] [\s!mono]  [modern]   [\s!default] [rscale=1.1]
-    \definetypeface [fontin] [mm] [\s!math]  [palatino] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-goudysans.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-goudysans.mkiv
deleted file mode 100644
index 64c055e08e..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-goudysans.mkiv
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-goudysans,
-%D      version=2011.09.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Goudy Sans Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [goudysans]
-
-\starttypescript [\s!sans] [goudysans]
-    \definefontsynonym [GoudySans-Regular]    [\s!file:goudsrg_] [\s!features=\s!default]
-    \definefontsynonym [GoudySans-Italic]     [\s!file:goudsi__] [\s!features=\s!default]
-    \definefontsynonym [GoudySans-Bold]       [\s!file:goudsb__] [\s!features=\s!default]
-    \definefontsynonym [GoudySans-BoldItalic] [\s!file:goudsbi_] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [goudysans]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [GoudySans-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [GoudySans-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [GoudySans-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [GoudySans-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [goudysans]
-    \definetypeface [goudysans] [ss] [\s!sans] [goudysans] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-adobe.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-adobe.mkiv
index abbb09d325..14a6b33f73 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-adobe.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-adobe.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \definetypescriptprefix [f:minion]     [minionpro]
 \definetypescriptprefix [f:myriad]     [myriadpro]
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-aller.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-aller.mkiv
index e7c6615aa4..1f7dc98535 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-aller.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-aller.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [aller]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-anivers.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-anivers.mkiv
index 0ab5642a7d..e4805dbcb2 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-anivers.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-anivers.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [anivers]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-audimat.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-audimat.mkiv
index 71dedfc11e..e594911649 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-audimat.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-audimat.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [audimat]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-axel.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-axel.mkiv
index f069f7cbbe..71a352d3c4 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-axel.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-axel.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [axel]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-azuro.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-azuro.mkiv
index 8cc012d918..d9ee5efd88 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-azuro.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-azuro.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [azuro]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-calluna.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-calluna.mkiv
index c1a0f65cc5..d4e7ff4fb3 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-calluna.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-calluna.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [calluna]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charissil.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-charissil.mkiv
index 0b1b452cdf..85d9d98f5c 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charissil.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-charissil.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [charissil]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charter.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-charter.mkiv
index 75719b7e41..a21fb1bd66 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-charter.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-charter.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection[charter]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-delicious.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-delicious.mkiv
index dbc45e2fef..57fa4106d0 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-delicious.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-delicious.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [delicious]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-diavlo.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-diavlo.mkiv
index 35681b204e..aecf11cb63 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-diavlo.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-diavlo.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [diavlo]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-droid.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-droid.mkiv
index 34ec58d4b1..1464772b92 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-droid.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-droid.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 %D Droid is a font family created by Ascender Corporation for the 
 %D Android platform, and licensed under the Apache license. They can be
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ernestine.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-ernestine.mkiv
index dc668c8d46..da88292512 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ernestine.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-ernestine.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [ernestine]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fertigo.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-fertigo.mkiv
index a84e7e91dd..a37f89304c 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fertigo.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-fertigo.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [fertigo]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fontin.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-fontin.mkiv
index 027d2f37f9..027d2f37f9 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-fontin.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-fontin.mkiv
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-goudysans.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-goudysans.mkiv
index 64c055e08e..126ff18be0 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-goudysans.mkii
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-goudysans.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2012 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [goudysans]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-junicode.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-junicode.mkiv
index 08557cb44b..219eeedda4 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-junicode.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-junicode.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +21,9 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-\starttypescriptcollection [goudysans]
+\starttypescriptcollection [junicode]
 
 \starttypescript [\s!serif] [junicode]
     \definefontsynonym [Junicode-Regular]    [\s!file:junicoderegular]    [\s!features=\s!default]
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-justus.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-justus.mkiv
index a6ab743f45..0ad101691a 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-justus.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-justus.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [justus]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kaffeesatz.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-kaffeesatz.mkiv
index 3ede739fed..363e55cd32 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kaffeesatz.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-kaffeesatz.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [kaffeesatz]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kontrapunkt.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-kontrapunkt.mkiv
index 0a235e272b..a41831c874 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kontrapunkt.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-kontrapunkt.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [kontrapunkt]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-liberation.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-liberation.mkiv
index a5a36ffa7d..44db188aa0 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-liberation.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-liberation.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [liberation]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-luxi.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-luxi.mkiv
index 13117c9bb8..af656e0e77 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-luxi.mkii
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-luxi.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection[luxi]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-miso.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-miso.mkiv
index 4a9581b138..3a8fca2e9b 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-miso.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-miso.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 %D MISO is an architectural lettering font by Mårten Nettelbladt. It is
 %D available in three weights (light, regular, bold) and can be downloaded from
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-museo.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-museo.mkiv
index 119477b814..25dbaa6d85 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-museo.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-museo.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [museo]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-office.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-office.mkiv
index 53c3ff865e..eedcb7e528 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-office.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-office.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [office]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-pigiarniq.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-pigiarniq.mkiv
index 4caeb14dda..a736ac3859 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-pigiarniq.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-pigiarniq.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [pigiarniq]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-sabon.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-sabon.mkiv
index 7c5f4ade97..cce0bce36f 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-sabon.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-sabon.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [sabon]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tallys.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-tallys.mkiv
index 03d2c77801..33fe782dff 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tallys.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-tallys.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [tallys]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tuffy.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-tuffy.mkiv
index d13fd4767d..3cae8cb8ee 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tuffy.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-tuffy.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [tuffy]
 
@@ -33,7 +33,7 @@
 \stoptypescript
 
 \starttypescript [\s!sans] [tuffy]
-    \setups[\s!font:\s!fallback:\s!sans]
+    \setup[\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]
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ubuntu.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-ubuntu.mkiv
index 0658e8f7ef..a296e8ddce 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ubuntu.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-ubuntu.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\unprotect
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [ubuntu]
 
@@ -35,7 +33,7 @@
 \stoptypescript
 
 \starttypescript [\s!sans] [ubuntu]
-    \setups[\s!font:\s!fallback:\s!sans]
+    \setup[\s!font:\s!fallback:\s!sans]
     \definefontsynonym [\s!Sans]           [Ununtu-Regular]    [\s!features=\s!default]
     \definefontsynonym [\s!SansItalic]     [Ubuntu-Italic]     [\s!features=\s!default]
     \definefontsynonym [\s!SansBold]       [Ubuntu-Bold]       [\s!features=\s!default]
@@ -49,4 +47,4 @@
 
 \stoptypescriptcollection
 
-\protect \endinput
\ No newline at end of file
+\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-uqammaq.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-uqammaq.mkiv
index 667ec785b0..f76dcfd124 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-uqammaq.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-uqammaq.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2011  Wolfgang Schuster
+%C Copyright (C) 2011 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [uqammaq]
 
@@ -33,19 +33,19 @@
 \stoptypescript
 
 \starttypescript [\s!sans] [uqammaq]
-    \setups[\s!font:\s!fallback:\s!sans]
+    \setup[\s!font:\s!fallback:\s!sans]
     \definefontsynonym [\s!Sans]     [Uqammaq-Regular] [\s!features=\s!default]
     \definefontsynonym [\s!SansBold] [Uqammaq-Bold]    [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [\s!sans] [uqammaq-light]
-    \setups[\s!font:\s!fallback:\s!sans]
+    \setup[\s!font:\s!fallback:\s!sans]
     \definefontsynonym [\s!Sans]     [Uqammaq-Light]   [\s!features=\s!default]
     \definefontsynonym [\s!SansBold] [Uqammaq-Regular] [\s!features=\s!default]
 \stoptypescript
 
 \starttypescript [\s!sans] [uqammaq-bold]
-    \setups[\s!font:\s!fallback:\s!sans]
+    \setup[\s!font:\s!fallback:\s!sans]
     \definefontsynonym [\s!Sans]     [Uqammaq-Bold]  [\s!features=\s!default]
     \definefontsynonym [\s!SansBold] [Uqammaq-Heavy] [\s!features=\s!default]
 \stoptypescript
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vera.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-vera.mkiv
index b34cd37e77..e214860c0f 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vera.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-vera.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [vera]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-verajja.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-verajja.mkiv
index b4ceb2e9fe..f0beac9a6f 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-verajja.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-verajja.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [verajja]
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vollkorn.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-vollkorn.mkiv
index 63fe8d477c..ec7e61049b 100644..100755
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vollkorn.mkiv
+++ b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-imp-vollkorn.mkiv
@@ -8,12 +8,12 @@
 %D    copyright=Wolfgang Schuster,
 %D      license=GNU General Public License]
 
-%C Copyright (C) 2010  Wolfgang Schuster
+%C Copyright (C) 2010 Wolfgang Schuster
 %C
 %C This program is free software: you can redistribute it and/or modify
 %C it under the terms of the GNU General Public License as published by
 %C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
+%C (at your option) any later version.
 %C
 %C This program is distributed in the hope that it will be useful,
 %C but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
 %C GNU General Public License for more details.
 %C
 %C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
+%C along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 \starttypescriptcollection [vollkorn]
 
@@ -44,7 +44,7 @@
     \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]
+    \definetypeface [vollkorn] [mm] [\s!math]  [modern]   [\s!default]
     \quittypescriptscanning
 \stoptypescript
 
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-junicode.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-junicode.mkii
deleted file mode 100644
index de3d5966b6..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-junicode.mkii
+++ /dev/null
@@ -1,50 +0,0 @@
-%D \module
-%D   [     file=type-junicode,
-%D      version=2011.09.18,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Junicode Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [goudysans]
-
-\starttypescript [\s!serif] [junicode]
-    \definefontsynonym [Junicode-Regular]    [\s!file:Junicode-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Junicode-Italic]     [\s!file:Junicode-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Junicode-Bold]       [\s!file:Junicode-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Junicode-BoldItalic] [\s!file:Junicode-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [junicode]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]           [Junicode-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic]     [Junicode-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]       [Junicode-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBoldItalic] [Junicode-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [junicode]
-    \definetypeface [junicode] [rm] [\s!serif] [junicode] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-justus.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-justus.mkii
deleted file mode 100644
index 3acaf5a620..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-justus.mkii
+++ /dev/null
@@ -1,53 +0,0 @@
-%D \module
-%D   [     file=type-justus,
-%D      version=2011.09.20,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Justus Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [justus]
-
-\starttypescript [\s!serif] [justus]
-    \definefontsynonym [Justus-Regular] [\s!file:Justus-Roman]      [\s!features=\s!default]
-    \definefontsynonym [Justus-Italic]  [\s!file:Justus-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Justus-Bold]    [\s!file:Justus-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Justus-Caps]    [\s!file:Justus-Versalitas] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [justus]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [Justus-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [Justus-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]   [Justus-Bold]    [\s!features=\s!default]
-    \definefontsynonym [\s!SerifCaps]   [Justus-Caps]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [justus]
-    \definetypeface [justus] [rm] [\s!serif] [justus] [\s!default]
-    \definetypeface [justus] [ss] [\s!sans]  [modern] [\s!default]
-    \definetypeface [justus] [tt] [\s!mono]  [modern] [\s!default]
-    \definetypeface [justus] [mm] [\s!math]  [modern] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kaffeesatz.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kaffeesatz.mkii
deleted file mode 100644
index 05ed62c5eb..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kaffeesatz.mkii
+++ /dev/null
@@ -1,60 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kontrapunkt.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kontrapunkt.mkii
deleted file mode 100644
index 6aee33b5f0..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-kontrapunkt.mkii
+++ /dev/null
@@ -1,48 +0,0 @@
-%D \module
-%D   [     file=type-kontrapunkt,
-%D      version=2011.09.20,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Kontrapunkt Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [kontrapunkt]
-
-\starttypescript [\s!serif] [kontrapunkt]
-    \definefontsynonym [Kontrapunkt-Regular] [\s!file:Kontrapunkt-Light]       [\s!features=\s!default]
-    \definefontsynonym [Kontrapunkt-Italic]  [\s!file:Kontrapunkt-LightItalic] [\s!features=\s!default]
-    \definefontsynonym [Kontrapunkt-Bold]    [\s!file:Kontrapunkt-Bold]        [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [kontrapunkt]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]       [Kontrapunkt-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifItalic] [Kontrapunkt-Italic]  [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold]   [Kontrapunkt-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [kontrapunkt]
-    \definetypeface [kontrapunkt] [rm] [\s!serif] [kontrapunkt] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-liberation.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-liberation.mkii
deleted file mode 100644
index 56713079a9..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-liberation.mkii
+++ /dev/null
@@ -1,83 +0,0 @@
-%D \module
-%D   [     file=type-liberation,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Liberation Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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 [\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 [\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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-luxi.mkiv b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-luxi.mkiv
deleted file mode 100644
index 13117c9bb8..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-luxi.mkiv
+++ /dev/null
@@ -1,83 +0,0 @@
-%D \module
-%D   [     file=type-luxi,
-%D      version=2010.09.13,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Luxi Collection,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection[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 [\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 [\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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-miso.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-miso.mkii
deleted file mode 100644
index ea6c627a8c..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-miso.mkii
+++ /dev/null
@@ -1,58 +0,0 @@
-%D \module
-%D   [     file=type-miso,
-%D      version=2011.09.21,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Miso Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-%D MISO is an architectural lettering font by Mårten Nettelbladt. It is
-%D available in three weights (light, regular, bold) and can be downloaded from
-%D \hyphenatedurl{http://www.fontsquirrel.com/fonts/Miso}
-
-\starttypescriptcollection [miso]
-
-\starttypescript [\s!sans] [miso-light,miso]
-    \definefontsynonym [Miso-Light]   [\s!file:miso-light] [\s!features=\s!default]
-    \definefontsynonym [Miso-Regular] [\s!file:miso]       [\s!features=\s!default]
-    \definefontsynonym [Miso-Bold]    [\s!file:miso-bold]  [\s!features=\s!default]
-\stoptypescript
-
-
-\starttypescript [\s!sans] [miso-light]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Miso-Light]   [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Miso-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [miso]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Miso-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Miso-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [miso-light,miso]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-museo.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-museo.mkii
deleted file mode 100644
index 1cebbce094..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-museo.mkii
+++ /dev/null
@@ -1,59 +0,0 @@
-%D \module
-%D   [     file=type-museo,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Museo Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [museo]
-
-\starttypescript [\s!serif] [museo]
-    \definefontsynonym [Museo-300] [\s!file:Museo300-Regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-500] [\s!file:Museo500-Regular] [\s!features=\s!default]
-    \definefontsynonym [Museo-700] [\s!file:Museo700-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [museo]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif]     [Museo-500] [\s!features=\s!default]
-    \definefontsynonym [\s!SerifBold] [Museo-700] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \definefontsynonym [MuseoSans-Regular] [\s!file:MuseoSans_500]        [\s!features=\s!default]
-    \definefontsynonym [MuseoSans-Italic]  [\s!file:MuseoSans_500_Italic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [museo]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]       [MuseoSans-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic] [MuseoSans-Italic]  [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [museo]
-    \definetypeface [museo] [rm] [\s!serif] [museo] [\s!default]
-    \definetypeface [museo] [ss] [\s!sans]  [museo] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-pigiarniq.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-pigiarniq.mkii
deleted file mode 100644
index 927a5319e4..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-pigiarniq.mkii
+++ /dev/null
@@ -1,63 +0,0 @@
-%D \module
-%D   [     file=type-pigiarniq,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Pigiarniq Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-sabon.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-sabon.mkii
deleted file mode 100644
index b2713d5297..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-sabon.mkii
+++ /dev/null
@@ -1,54 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tallys.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tallys.mkii
deleted file mode 100644
index f53a8242eb..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tallys.mkii
+++ /dev/null
@@ -1,44 +0,0 @@
-%D \module
-%D   [     file=type-tallys,
-%D      version=2010.10.27,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Tallys Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [tallys]
-
-\starttypescript [\s!serif] [tallys]
-    \definefontsynonym [Tallys-Regular] [\s!file:Tallys_15] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [tallys]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [\s!Serif] [Tallys-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [tallys]
-    \definetypeface [tallys] [rm] [\s!serif] [tallys] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tuffy.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tuffy.mkii
deleted file mode 100644
index e936a9ede0..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-tuffy.mkii
+++ /dev/null
@@ -1,50 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ubuntu.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ubuntu.mkii
deleted file mode 100644
index 4488e27779..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-ubuntu.mkii
+++ /dev/null
@@ -1,52 +0,0 @@
-%D \module
-%D   [     file=type-ubuntu,
-%D      version=2011.09.23,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Ubuntu Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\unprotect
-
-\starttypescriptcollection [ubuntu]
-
-\starttypescript [\s!sans] [ubuntu]
-    \definefontsynonym [Ununtu-Regular]    [\s!file:Ubuntu-R]  [\s!features=\s!default]
-    \definefontsynonym [Ubuntu-Italic]     [\s!file:Ubuntu-I]  [\s!features=\s!default]
-    \definefontsynonym [Ubuntu-Bold]       [\s!file:Ubuntu-B]  [\s!features=\s!default]
-    \definefontsynonym [Ubuntu-BoldItalic] [\s!file:Ubuntu-BI] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [ubuntu]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]           [Ununtu-Regular]    [\s!features=\s!default]
-    \definefontsynonym [\s!SansItalic]     [Ubuntu-Italic]     [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold]       [Ubuntu-Bold]       [\s!features=\s!default]
-    \definefontsynonym [\s!SansBoldItalic] [Ubuntu-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [ubuntu]
-    \definetypeface [ubuntu] [ss] [\s!sans] [ubuntu] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\protect \endinput
\ No newline at end of file
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-uqammaq.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-uqammaq.mkii
deleted file mode 100644
index 2f1abcdf24..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-uqammaq.mkii
+++ /dev/null
@@ -1,60 +0,0 @@
-%D \module
-%D   [     file=type-uqammaq,
-%D      version=2011.09.21,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Uqammaq Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2011  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [uqammaq]
-
-\starttypescript [\s!sans] [uqammaq,uqammaq-light,uqammaq-bold]
-    \definefontsynonym [Uqammaq-Light]   [\s!file:Uqammaq Light]   [\s!features=\s!default]
-    \definefontsynonym [Uqammaq-Regular] [\s!file:Uqammaq Regular] [\s!features=\s!default]
-    \definefontsynonym [Uqammaq-Bold]    [\s!file:Uqammaq Bold]    [\s!features=\s!default]
-    \definefontsynonym [Uqammaq-Heavy]   [\s!file:Uqammaq Heavy]   [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [uqammaq]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Uqammaq-Regular] [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Uqammaq-Bold]    [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [uqammaq-light]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Uqammaq-Light]   [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Uqammaq-Regular] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!sans] [uqammaq-bold]
-    \setups[\s!font:\s!fallback:\s!sans]
-    \definefontsynonym [\s!Sans]     [Uqammaq-Bold]  [\s!features=\s!default]
-    \definefontsynonym [\s!SansBold] [Uqammaq-Heavy] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [uqammaq,uqammaq-light,uqammaq-bold]
-    \definetypeface [\typescriptone] [ss] [\s!sans] [\typescriptone] [\s!default]
-    \quittypescriptscanning
-\stoptypescript
-
-\stoptypescriptcollection
-
-\endinput
diff --git a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vera.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vera.mkii
deleted file mode 100644
index 8d0ee9f4ce..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vera.mkii
+++ /dev/null
@@ -1,79 +0,0 @@
-%D \module
-%D   [     file=type-vera,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Bitstream Vera Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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 [\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]    [\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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-verajja.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-verajja.mkii
deleted file mode 100644
index fc56865f23..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-verajja.mkii
+++ /dev/null
@@ -1,68 +0,0 @@
-%D \module
-%D   [     file=type-verajja,
-%D      version=2010.09.14,
-%D        title=\CONTEXT\ Typescript Macros,
-%D     subtitle=Verajja Font Definitions,
-%D       author=Wolfgang Schuster,
-%D         date=\currentdate,
-%D    copyright=Wolfgang Schuster,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [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 [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/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vollkorn.mkii b/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vollkorn.mkii
deleted file mode 100644
index a4258f60cd..0000000000
--- a/macros/context/contrib/context-typescripts/tex/context/third/typescripts/type-vollkorn.mkii
+++ /dev/null
@@ -1,53 +0,0 @@
-%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,
-%D      license=GNU General Public License]
-
-%C Copyright (C) 2010  Wolfgang Schuster
-%C
-%C This program is free software: you can redistribute it and/or modify
-%C it under the terms of the GNU General Public License as published by
-%C the Free Software Foundation, either version 3 of the License, or
-%C any later version.
-%C
-%C This program is distributed in the hope that it will be useful,
-%C but WITHOUT ANY WARRANTY; without even the implied warranty of
-%C MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%C GNU General Public License for more details.
-%C
-%C You should have received a copy of the GNU General Public License
-%C along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-\starttypescriptcollection [vollkorn]
-
-\starttypescript [\s!serif] [vollkorn]
-    \definefontsynonym [Vollkorn-Regular]    [\s!file:Vollkorn-Regular]    [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Italic]     [\s!file:Vollkorn-Italic]     [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-Bold]       [\s!file:Vollkorn-Bold]       [\s!features=\s!default]
-    \definefontsynonym [Vollkorn-BoldItalic] [\s!file:Vollkorn-BoldItalic] [\s!features=\s!default]
-\stoptypescript
-
-\starttypescript [\s!serif] [vollkorn]
-    \setups[\s!font:\s!fallback:\s!serif]
-    \definefontsynonym [Serif]           [Vollkorn-Regular]    [\s!features=\s!default]
-    \definefontsynonym [SerifItalic]     [Vollkorn-Italic]     [\s!features=\s!default]
-    \definefontsynonym [SerifBold]       [Vollkorn-Bold]       [\s!features=\s!default]
-    \definefontsynonym [SerifBoldItalic] [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