CTAN sync 201911090301

57 files changed, 8670 insertions, 9350 deletions

diff --git a/fonts/montserrat/tex/LY1Montserrat-Dnom.fd b/fonts/montserrat/tex/LY1Montserrat-Dnom.fd
index 0df427784c..ead8c054ed 100644
--- a/fonts/montserrat/tex/LY1Montserrat-Dnom.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -27,273 +35,258 @@
 }{}
 
 
-%   ----  semibold  ----
-
-\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ly1
-}{}
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-dnom-ly1
 }{}
 
-
-%   ----  black  ----
-
 \DeclareFontShape{LY1}{Montserrat-Dnom}{black}{it}{
       <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Dnom}{black}{sl}{
       <-> ssub * Montserrat-Dnom/black/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{sl}{
+      <-> ssub * Montserrat-Dnom/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{sl}{
+      <-> ssub * Montserrat-Dnom/thin/it
 }{}
 
 
 %   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Dnom}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ly1
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Dnom}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-dnom-ly1
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Dnom}{light}{sl}{
       <-> ssub * Montserrat-Dnom/light/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{medium}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{extralight}{sl}{
+      <-> ssub * Montserrat-Dnom/extralight/it
 }{}
 
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{it}{
       <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ly1
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ly1
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Dnom}{extrabold}{sl}{
       <-> ssub * Montserrat-Dnom/extrabold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ly1
+\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{thin}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{regular}{sl}{
+      <-> ssub * Montserrat-Dnom/regular/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{it}{
-      <-> ssub * Montserrat-Dnom/thin/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{n}{
-      <-> ssub * Montserrat-Dnom/thin/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{semibold}{sl}{
+      <-> ssub * Montserrat-Dnom/semibold/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{n}{
-      <-> ssub * Montserrat-Dnom/extralight/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{sl}{
+      <-> alias * Montserrat-Dnom/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{it}{
+      <-> alias * Montserrat-Dnom/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{it}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ul}{n}{
+      <-> alias * Montserrat-Dnom/thin/n
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{it}{
-      <-> ssub * Montserrat-Dnom/light/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{n}{
+      <-> alias * Montserrat-Dnom/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{n}{
-      <-> ssub * Montserrat-Dnom/light/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{it}{
+      <-> alias * Montserrat-Dnom/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{sl}{
-      <-> ssub * Montserrat-Dnom/light/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{el}{sl}{
+      <-> alias * Montserrat-Dnom/extralight/sl
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{it}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{sl}{
+      <-> alias * Montserrat-Dnom/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{it}{
+      <-> alias * Montserrat-Dnom/light/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{sl}{n}{
-      <-> ssub * Montserrat-Dnom/regular/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{l}{n}{
+      <-> alias * Montserrat-Dnom/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{m}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/sl
+      <-> alias * Montserrat-Dnom/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{n}{
-      <-> ssub * Montserrat-Dnom/medium/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{it}{
+      <-> alias * Montserrat-Dnom/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{it}{
-      <-> ssub * Montserrat-Dnom/medium/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{m}{n}{
+      <-> alias * Montserrat-Dnom/regular/n
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{it}{
+      <-> alias * Montserrat-Dnom/semibold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{n}{
-      <-> ssub * Montserrat-Dnom/semibold/n
+      <-> alias * Montserrat-Dnom/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{it}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{sb}{sl}{
+      <-> alias * Montserrat-Dnom/semibold/sl
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{b}{it}{
-      <-> ssub * Montserrat-Dnom/bold/it
+      <-> alias * Montserrat-Dnom/bold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{b}{n}{
-      <-> ssub * Montserrat-Dnom/bold/n
+      <-> alias * Montserrat-Dnom/bold/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{b}{sl}{
-      <-> ssub * Montserrat-Dnom/bold/sl
+      <-> alias * Montserrat-Dnom/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{it}{
-      <-> ssub * Montserrat-Dnom/extrabold/it
+      <-> alias * Montserrat-Dnom/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{sl}{
-      <-> ssub * Montserrat-Dnom/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{n}{
+      <-> alias * Montserrat-Dnom/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{n}{
-      <-> ssub * Montserrat-Dnom/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{eb}{sl}{
+      <-> alias * Montserrat-Dnom/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{it}{
-      <-> ssub * Montserrat-Dnom/black/it
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{n}{
+      <-> alias * Montserrat-Dnom/black/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{sl}{
-      <-> ssub * Montserrat-Dnom/black/sl
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{it}{
+      <-> alias * Montserrat-Dnom/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{n}{
-      <-> ssub * Montserrat-Dnom/black/n
+\DeclareFontShape{LY1}{Montserrat-Dnom}{ub}{sl}{
+      <-> alias * Montserrat-Dnom/black/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Dnom}{bx}{n}{
       <-> ssub * Montserrat-Dnom/b/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Dnom}{bx}{sl}{
-      <-> ssub * Montserrat-Dnom/b/sl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Dnom}{bx}{it}{
       <-> ssub * Montserrat-Dnom/b/it
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Dnom}{bx}{sl}{
+      <-> ssub * Montserrat-Dnom/b/sl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/LY1Montserrat-Inf.fd b/fonts/montserrat/tex/LY1Montserrat-Inf.fd
index 72f2e0f741..fa873abaf3 100644
--- a/fonts/montserrat/tex/LY1Montserrat-Inf.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,18 +20,48 @@
 \DeclareFontFamily{LY1}{Montserrat-Inf}{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{sl}{
+      <-> ssub * Montserrat-Inf/thin/it
+}{}
+
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{light}{sl}{
+      <-> ssub * Montserrat-Inf/light/it
+}{}
+
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{sl}{
+      <-> ssub * Montserrat-Inf/extralight/it
 }{}
 
 
@@ -42,78 +80,63 @@
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{sl}{
-      <-> ssub * Montserrat-Inf/regular/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{sl}{
+      <-> ssub * Montserrat-Inf/medium/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Inf}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{black}{sl}{
-      <-> ssub * Montserrat-Inf/black/it
-}{}
-
-
-%   ----  extralight  ----
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{extralight}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{black}{sl}{
+      <-> ssub * Montserrat-Inf/black/it
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{light}{sl}{
-      <-> ssub * Montserrat-Inf/light/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{semibold}{sl}{
+      <-> ssub * Montserrat-Inf/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-inf-ly1
+\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{medium}{sl}{
-      <-> ssub * Montserrat-Inf/medium/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{regular}{sl}{
+      <-> ssub * Montserrat-Inf/regular/it
 }{}
 
 
@@ -131,167 +154,137 @@
       <-> ssub * Montserrat-Inf/extrabold/it
 }{}
 
-
-%   ----  thin  ----
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{thin}{sl}{
-      <-> ssub * Montserrat-Inf/thin/it
-}{}
-
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{n}{
-      <-> ssub * Montserrat-Inf/thin/n
+\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{sl}{
+      <-> alias * Montserrat-Inf/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{sl}{
-      <-> ssub * Montserrat-Inf/thin/sl
+\DeclareFontShape{LY1}{Montserrat-Inf}{ul}{n}{
+      <-> alias * Montserrat-Inf/thin/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{ul}{it}{
-      <-> ssub * Montserrat-Inf/thin/it
+      <-> alias * Montserrat-Inf/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{el}{n}{
-      <-> ssub * Montserrat-Inf/extralight/n
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Inf}{el}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/sl
+      <-> alias * Montserrat-Inf/extralight/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{el}{it}{
-      <-> ssub * Montserrat-Inf/extralight/it
+      <-> alias * Montserrat-Inf/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Inf}{el}{n}{
+      <-> alias * Montserrat-Inf/extralight/n
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{l}{sl}{
-      <-> ssub * Montserrat-Inf/light/sl
+\DeclareFontShape{LY1}{Montserrat-Inf}{l}{it}{
+      <-> alias * Montserrat-Inf/light/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{l}{n}{
-      <-> ssub * Montserrat-Inf/light/n
+      <-> alias * Montserrat-Inf/light/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{l}{it}{
-      <-> ssub * Montserrat-Inf/light/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{l}{sl}{
+      <-> alias * Montserrat-Inf/light/sl
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{it}{
-      <-> ssub * Montserrat-Inf/regular/it
-}{}
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{n}{
-      <-> ssub * Montserrat-Inf/regular/n
+\DeclareFontShape{LY1}{Montserrat-Inf}{m}{sl}{
+      <-> alias * Montserrat-Inf/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{sl}{sl}{
-      <-> ssub * Montserrat-Inf/regular/sl
+\DeclareFontShape{LY1}{Montserrat-Inf}{m}{n}{
+      <-> alias * Montserrat-Inf/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{LY1}{Montserrat-Inf}{m}{it}{
-      <-> ssub * Montserrat-Inf/medium/it
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{m}{sl}{
-      <-> ssub * Montserrat-Inf/medium/sl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Inf}{m}{n}{
-      <-> ssub * Montserrat-Inf/medium/n
+      <-> alias * Montserrat-Inf/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{sb}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/sl
+      <-> alias * Montserrat-Inf/semibold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{sb}{n}{
-      <-> ssub * Montserrat-Inf/semibold/n
+      <-> alias * Montserrat-Inf/semibold/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{sb}{it}{
-      <-> ssub * Montserrat-Inf/semibold/it
+      <-> alias * Montserrat-Inf/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{b}{n}{
-      <-> ssub * Montserrat-Inf/bold/n
+      <-> alias * Montserrat-Inf/bold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{b}{sl}{
-      <-> ssub * Montserrat-Inf/bold/sl
+\DeclareFontShape{LY1}{Montserrat-Inf}{b}{it}{
+      <-> alias * Montserrat-Inf/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{b}{it}{
-      <-> ssub * Montserrat-Inf/bold/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{b}{sl}{
+      <-> alias * Montserrat-Inf/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{eb}{it}{
-      <-> ssub * Montserrat-Inf/extrabold/it
+      <-> alias * Montserrat-Inf/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{sl}{
-      <-> ssub * Montserrat-Inf/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{n}{
+      <-> alias * Montserrat-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{n}{
-      <-> ssub * Montserrat-Inf/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-Inf}{eb}{sl}{
+      <-> alias * Montserrat-Inf/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{ub}{sl}{
-      <-> ssub * Montserrat-Inf/black/sl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Inf}{ub}{n}{
-      <-> ssub * Montserrat-Inf/black/n
+      <-> alias * Montserrat-Inf/black/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{ub}{it}{
-      <-> ssub * Montserrat-Inf/black/it
+      <-> alias * Montserrat-Inf/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Inf}{bx}{it}{
-      <-> ssub * Montserrat-Inf/b/it
+\DeclareFontShape{LY1}{Montserrat-Inf}{ub}{sl}{
+      <-> alias * Montserrat-Inf/black/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Inf}{bx}{n}{
       <-> ssub * Montserrat-Inf/b/n
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Inf}{bx}{it}{
+      <-> ssub * Montserrat-Inf/b/it
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Inf}{bx}{sl}{
       <-> ssub * Montserrat-Inf/b/sl
 }{}
diff --git a/fonts/montserrat/tex/LY1Montserrat-LF.fd b/fonts/montserrat/tex/LY1Montserrat-LF.fd
index 09c5b4a5f3..5277045feb 100644
--- a/fonts/montserrat/tex/LY1Montserrat-LF.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-LF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,111 +20,111 @@
 \DeclareFontFamily{LY1}{Montserrat-LF}{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sl}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scsl}{
+      <-> ssub * Montserrat-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sl}{
+      <-> ssub * Montserrat-LF/thin/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sl}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scsl}{
+      <-> ssub * Montserrat-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scsl}{
-      <-> ssub * Montserrat-LF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sl}{
+      <-> ssub * Montserrat-LF/extralight/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{sl}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{scsl}{
+      <-> ssub * Montserrat-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extralight}{scsl}{
-      <-> ssub * Montserrat-LF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{light}{sl}{
+      <-> ssub * Montserrat-LF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sl}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{scsl}{
+      <-> ssub * Montserrat-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scsl}{
-      <-> ssub * Montserrat-LF/regular/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{bold}{sl}{
+      <-> ssub * Montserrat-LF/bold/it
 }{}
 
 
@@ -126,118 +134,110 @@
       <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-lf-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{black}{sc}{
       <-> \Montserrat@@scale Montserrat-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-lf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{black}{sl}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{LY1}{Montserrat-LF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{black}{scsl}{
       <-> ssub * Montserrat-LF/black/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-LF}{black}{sl}{
+      <-> ssub * Montserrat-LF/black/it
+}{}
 
-%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-lf-sc-ly1
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{sl}{
-      <-> ssub * Montserrat-LF/light/it
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scsl}{
+      <-> ssub * Montserrat-LF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{light}{scsl}{
-      <-> ssub * Montserrat-LF/light/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sl}{
+      <-> ssub * Montserrat-LF/medium/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{sl}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{scsl}{
+      <-> ssub * Montserrat-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{medium}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{semibold}{sl}{
+      <-> ssub * Montserrat-LF/semibold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ly1
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{sl}{
-      <-> ssub * Montserrat-LF/thin/it
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{scsl}{
+      <-> ssub * Montserrat-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{thin}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{regular}{sl}{
+      <-> ssub * Montserrat-LF/regular/it
 }{}
 
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{scit}{
       <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ly1
 }{}
@@ -246,282 +246,263 @@
       <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{scsl}{
       <-> ssub * Montserrat-LF/extrabold/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-LF}{extrabold}{sl}{
+      <-> ssub * Montserrat-LF/extrabold/it
+}{}
+
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ul}{n}{
-      <-> ssub * Montserrat-LF/thin/n
+\DeclareFontShape{LY1}{Montserrat-LF}{ul}{scit}{
+      <-> alias * Montserrat-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sc}{
-      <-> ssub * Montserrat-LF/thin/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sl}{
+      <-> alias * Montserrat-LF/thin/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{ul}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scsl
+      <-> alias * Montserrat-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sl}{
-      <-> ssub * Montserrat-LF/thin/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{ul}{sc}{
+      <-> alias * Montserrat-LF/thin/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{ul}{it}{
-      <-> ssub * Montserrat-LF/thin/it
+      <-> alias * Montserrat-LF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ul}{scit}{
-      <-> ssub * Montserrat-LF/thin/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{ul}{n}{
+      <-> alias * Montserrat-LF/thin/n
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{n}{
-      <-> ssub * Montserrat-LF/extralight/n
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{sl}{
+      <-> alias * Montserrat-LF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{sc}{
-      <-> ssub * Montserrat-LF/extralight/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{scit}{
+      <-> alias * Montserrat-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{scsl}{
-      <-> ssub * Montserrat-LF/extralight/scsl
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{it}{
+      <-> alias * Montserrat-LF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{sl}{
-      <-> ssub * Montserrat-LF/extralight/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{n}{
+      <-> alias * Montserrat-LF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{it}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{sc}{
+      <-> alias * Montserrat-LF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{el}{scit}{
-      <-> ssub * Montserrat-LF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{el}{scsl}{
+      <-> alias * Montserrat-LF/extralight/scsl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-LF}{l}{scit}{
-      <-> ssub * Montserrat-LF/light/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{l}{sc}{
+      <-> alias * Montserrat-LF/light/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{l}{it}{
-      <-> ssub * Montserrat-LF/light/it
+      <-> alias * Montserrat-LF/light/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{l}{sl}{
-      <-> ssub * Montserrat-LF/light/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{l}{n}{
+      <-> alias * Montserrat-LF/light/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{l}{scsl}{
-      <-> ssub * Montserrat-LF/light/scsl
+      <-> alias * Montserrat-LF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{l}{sc}{
-      <-> ssub * Montserrat-LF/light/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{l}{sl}{
+      <-> alias * Montserrat-LF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{l}{n}{
-      <-> ssub * Montserrat-LF/light/n
+\DeclareFontShape{LY1}{Montserrat-LF}{l}{scit}{
+      <-> alias * Montserrat-LF/light/scit
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{scit}{
-      <-> ssub * Montserrat-LF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{it}{
-      <-> ssub * Montserrat-LF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{sl}{
-      <-> ssub * Montserrat-LF/regular/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{m}{sc}{
+      <-> alias * Montserrat-LF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{n}{
-      <-> ssub * Montserrat-LF/regular/n
+\DeclareFontShape{LY1}{Montserrat-LF}{m}{n}{
+      <-> alias * Montserrat-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{sc}{
-      <-> ssub * Montserrat-LF/regular/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{m}{it}{
+      <-> alias * Montserrat-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sl}{scsl}{
-      <-> ssub * Montserrat-LF/regular/scsl
+\DeclareFontShape{LY1}{Montserrat-LF}{m}{scsl}{
+      <-> alias * Montserrat-LF/regular/scsl
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{LY1}{Montserrat-LF}{m}{sl}{
-      <-> ssub * Montserrat-LF/medium/sl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{m}{sc}{
-      <-> ssub * Montserrat-LF/medium/sc
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{m}{n}{
-      <-> ssub * Montserrat-LF/medium/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{m}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scsl
+      <-> alias * Montserrat-LF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{m}{scit}{
-      <-> ssub * Montserrat-LF/medium/scit
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-LF}{m}{it}{
-      <-> ssub * Montserrat-LF/medium/it
+      <-> alias * Montserrat-LF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sl}{
-      <-> ssub * Montserrat-LF/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scsl}{
+      <-> alias * Montserrat-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sc}{
-      <-> ssub * Montserrat-LF/semibold/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{sb}{it}{
+      <-> alias * Montserrat-LF/semibold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{sb}{n}{
-      <-> ssub * Montserrat-LF/semibold/n
+      <-> alias * Montserrat-LF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sb}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scsl
+\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sc}{
+      <-> alias * Montserrat-LF/semibold/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{sb}{scit}{
-      <-> ssub * Montserrat-LF/semibold/scit
+      <-> alias * Montserrat-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{sb}{it}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{sb}{sl}{
+      <-> alias * Montserrat-LF/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{sc}{
-      <-> ssub * Montserrat-LF/bold/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{scsl}{
+      <-> alias * Montserrat-LF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{n}{
-      <-> ssub * Montserrat-LF/bold/n
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{sc}{
+      <-> alias * Montserrat-LF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{scsl}{
-      <-> ssub * Montserrat-LF/bold/scsl
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{it}{
+      <-> alias * Montserrat-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{sl}{
-      <-> ssub * Montserrat-LF/bold/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{n}{
+      <-> alias * Montserrat-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{it}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{scit}{
+      <-> alias * Montserrat-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{b}{scit}{
-      <-> ssub * Montserrat-LF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{b}{sl}{
+      <-> alias * Montserrat-LF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scit}{
-      <-> ssub * Montserrat-LF/extrabold/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sl}{
+      <-> alias * Montserrat-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{eb}{it}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-LF}{eb}{scit}{
+      <-> alias * Montserrat-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sc}{
+      <-> alias * Montserrat-LF/extrabold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{eb}{sc}{
-      <-> ssub * Montserrat-LF/extrabold/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{eb}{it}{
+      <-> alias * Montserrat-LF/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{eb}{n}{
-      <-> ssub * Montserrat-LF/extrabold/n
+      <-> alias * Montserrat-LF/extrabold/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{eb}{scsl}{
-      <-> ssub * Montserrat-LF/extrabold/scsl
+      <-> alias * Montserrat-LF/extrabold/scsl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ub}{scit}{
-      <-> ssub * Montserrat-LF/black/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sl}{
+      <-> alias * Montserrat-LF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ub}{it}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{LY1}{Montserrat-LF}{ub}{scit}{
+      <-> alias * Montserrat-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sl}{
-      <-> ssub * Montserrat-LF/black/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sc}{
+      <-> alias * Montserrat-LF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{ub}{sc}{
-      <-> ssub * Montserrat-LF/black/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{ub}{it}{
+      <-> alias * Montserrat-LF/black/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{ub}{n}{
-      <-> ssub * Montserrat-LF/black/n
+      <-> alias * Montserrat-LF/black/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{ub}{scsl}{
-      <-> ssub * Montserrat-LF/black/scsl
+      <-> alias * Montserrat-LF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sl}{
-      <-> ssub * Montserrat-LF/b/sl
+\DeclareFontShape{LY1}{Montserrat-LF}{bx}{n}{
+      <-> ssub * Montserrat-LF/b/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sc}{
-      <-> ssub * Montserrat-LF/b/sc
+\DeclareFontShape{LY1}{Montserrat-LF}{bx}{it}{
+      <-> ssub * Montserrat-LF/b/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bx}{n}{
-      <-> ssub * Montserrat-LF/b/n
+\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sc}{
+      <-> ssub * Montserrat-LF/b/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-LF}{bx}{scsl}{
       <-> ssub * Montserrat-LF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scit}{
-      <-> ssub * Montserrat-LF/b/scit
+\DeclareFontShape{LY1}{Montserrat-LF}{bx}{sl}{
+      <-> ssub * Montserrat-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-LF}{bx}{it}{
-      <-> ssub * Montserrat-LF/b/it
+\DeclareFontShape{LY1}{Montserrat-LF}{bx}{scit}{
+      <-> ssub * Montserrat-LF/b/scit
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/LY1Montserrat-Numr.fd b/fonts/montserrat/tex/LY1Montserrat-Numr.fd
index 236e894bf0..731c0ec50f 100644
--- a/fonts/montserrat/tex/LY1Montserrat-Numr.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,276 +20,265 @@
 \DeclareFontFamily{LY1}{Montserrat-Numr}{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{sl}{
-      <-> ssub * Montserrat-Numr/bold/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{sl}{
+      <-> ssub * Montserrat-Numr/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{light}{sl}{
+      <-> ssub * Montserrat-Numr/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{black}{sl}{
-      <-> ssub * Montserrat-Numr/black/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{sl}{
+      <-> ssub * Montserrat-Numr/thin/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{sl}{
-      <-> ssub * Montserrat-Numr/regular/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{sl}{
+      <-> ssub * Montserrat-Numr/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extralight}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{black}{sl}{
+      <-> ssub * Montserrat-Numr/black/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{light}{sl}{
-      <-> ssub * Montserrat-Numr/light/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{bold}{sl}{
+      <-> ssub * Montserrat-Numr/bold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{medium}{sl}{
-      <-> ssub * Montserrat-Numr/medium/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{regular}{sl}{
+      <-> ssub * Montserrat-Numr/regular/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{sl}{
-      <-> ssub * Montserrat-Numr/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{semibold}{sl}{
+      <-> ssub * Montserrat-Numr/semibold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-numr-ly1
+\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{thin}{sl}{
-      <-> ssub * Montserrat-Numr/thin/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{extrabold}{sl}{
+      <-> ssub * Montserrat-Numr/extrabold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{ul}{n}{
-      <-> ssub * Montserrat-Numr/thin/n
+      <-> alias * Montserrat-Numr/thin/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{sl}{
-      <-> ssub * Montserrat-Numr/thin/sl
+\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{it}{
+      <-> alias * Montserrat-Numr/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{it}{
-      <-> ssub * Montserrat-Numr/thin/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{ul}{sl}{
+      <-> alias * Montserrat-Numr/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{el}{n}{
-      <-> ssub * Montserrat-Numr/extralight/n
+\DeclareFontShape{LY1}{Montserrat-Numr}{el}{it}{
+      <-> alias * Montserrat-Numr/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{el}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/sl
+\DeclareFontShape{LY1}{Montserrat-Numr}{el}{n}{
+      <-> alias * Montserrat-Numr/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{el}{it}{
-      <-> ssub * Montserrat-Numr/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{el}{sl}{
+      <-> alias * Montserrat-Numr/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{l}{it}{
-      <-> ssub * Montserrat-Numr/light/it
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Numr}{l}{n}{
-      <-> ssub * Montserrat-Numr/light/n
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Numr}{l}{sl}{
-      <-> ssub * Montserrat-Numr/light/sl
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{it}{
-      <-> ssub * Montserrat-Numr/regular/it
+      <-> alias * Montserrat-Numr/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{sl}{
-      <-> ssub * Montserrat-Numr/regular/sl
+\DeclareFontShape{LY1}{Montserrat-Numr}{l}{it}{
+      <-> alias * Montserrat-Numr/light/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{sl}{n}{
-      <-> ssub * Montserrat-Numr/regular/n
+\DeclareFontShape{LY1}{Montserrat-Numr}{l}{n}{
+      <-> alias * Montserrat-Numr/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{m}{sl}{
-      <-> ssub * Montserrat-Numr/medium/sl
+\DeclareFontShape{LY1}{Montserrat-Numr}{m}{it}{
+      <-> alias * Montserrat-Numr/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{m}{n}{
-      <-> ssub * Montserrat-Numr/medium/n
+      <-> alias * Montserrat-Numr/regular/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{m}{it}{
-      <-> ssub * Montserrat-Numr/medium/it
+\DeclareFontShape{LY1}{Montserrat-Numr}{m}{sl}{
+      <-> alias * Montserrat-Numr/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{n}{
-      <-> ssub * Montserrat-Numr/semibold/n
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Numr}{sb}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/sl
+      <-> alias * Montserrat-Numr/semibold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{sb}{it}{
-      <-> ssub * Montserrat-Numr/semibold/it
+      <-> alias * Montserrat-Numr/semibold/it
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Numr}{sb}{n}{
+      <-> alias * Montserrat-Numr/semibold/n
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{b}{it}{
-      <-> ssub * Montserrat-Numr/bold/it
-}{}
+%   b --> bold
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{b}{sl}{
-      <-> ssub * Montserrat-Numr/bold/sl
+      <-> alias * Montserrat-Numr/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{b}{n}{
-      <-> ssub * Montserrat-Numr/bold/n
+      <-> alias * Montserrat-Numr/bold/n
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Numr}{b}{it}{
+      <-> alias * Montserrat-Numr/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{eb}{it}{
-      <-> ssub * Montserrat-Numr/extrabold/it
+      <-> alias * Montserrat-Numr/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{sl}{
-      <-> ssub * Montserrat-Numr/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{n}{
+      <-> alias * Montserrat-Numr/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{n}{
-      <-> ssub * Montserrat-Numr/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-Numr}{eb}{sl}{
+      <-> alias * Montserrat-Numr/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{ub}{sl}{
-      <-> ssub * Montserrat-Numr/black/sl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Numr}{ub}{n}{
-      <-> ssub * Montserrat-Numr/black/n
+      <-> alias * Montserrat-Numr/black/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{ub}{it}{
-      <-> ssub * Montserrat-Numr/black/it
+      <-> alias * Montserrat-Numr/black/it
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Numr}{ub}{sl}{
+      <-> alias * Montserrat-Numr/black/sl
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{it}{
+      <-> ssub * Montserrat-Numr/b/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Numr}{bx}{n}{
@@ -292,8 +289,4 @@
       <-> ssub * Montserrat-Numr/b/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Numr}{bx}{it}{
-      <-> ssub * Montserrat-Numr/b/it
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/LY1Montserrat-OsF.fd b/fonts/montserrat/tex/LY1Montserrat-OsF.fd
index 314dcc9aaa..fce47c8e57 100644
--- a/fonts/montserrat/tex/LY1Montserrat-OsF.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,516 +20,489 @@
 \DeclareFontFamily{LY1}{Montserrat-OsF}{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sl}{
-      <-> ssub * Montserrat-OsF/black/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-OsF/extrabold/it
 }{}
 
 
 %   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{regular}{n}{
       <-> \Montserrat@@scale Montserrat-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sl}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{regular}{scsl}{
       <-> ssub * Montserrat-OsF/regular/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-OsF}{regular}{sl}{
+      <-> ssub * Montserrat-OsF/regular/it
+}{}
+
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sl}{
+      <-> ssub * Montserrat-OsF/semibold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sl}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scsl}{
+      <-> ssub * Montserrat-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sl}{
+      <-> ssub * Montserrat-OsF/medium/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{scsl}{
+      <-> ssub * Montserrat-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{black}{sl}{
+      <-> ssub * Montserrat-OsF/black/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{scsl}{
+      <-> ssub * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{bold}{sl}{
+      <-> ssub * Montserrat-OsF/bold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sl}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{extralight}{sl}{
+      <-> ssub * Montserrat-OsF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{sl}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scsl}{
+      <-> ssub * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{medium}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sl}{
+      <-> ssub * Montserrat-OsF/light/it
 }{}
 
 
-%   ----  light  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{sl}{
-      <-> ssub * Montserrat-OsF/light/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{scsl}{
+      <-> ssub * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{light}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{thin}{sl}{
+      <-> ssub * Montserrat-OsF/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{it}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sl}{
+      <-> alias * Montserrat-OsF/thin/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{ul}{scit}{
-      <-> ssub * Montserrat-OsF/thin/scit
+      <-> alias * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scsl
+\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{n}{
+      <-> alias * Montserrat-OsF/thin/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sc}{
-      <-> ssub * Montserrat-OsF/thin/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{it}{
+      <-> alias * Montserrat-OsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{n}{
-      <-> ssub * Montserrat-OsF/thin/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sc}{
+      <-> alias * Montserrat-OsF/thin/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{sl}{
-      <-> ssub * Montserrat-OsF/thin/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{ul}{scsl}{
+      <-> alias * Montserrat-OsF/thin/scsl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scit}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scsl}{
+      <-> alias * Montserrat-OsF/extralight/scsl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{el}{it}{
-      <-> ssub * Montserrat-OsF/extralight/it
+      <-> alias * Montserrat-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{el}{n}{
+      <-> alias * Montserrat-OsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scsl
+\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sc}{
+      <-> alias * Montserrat-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{el}{n}{
-      <-> ssub * Montserrat-OsF/extralight/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{el}{scit}{
+      <-> alias * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sc}{
-      <-> ssub * Montserrat-OsF/extralight/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{el}{sl}{
+      <-> alias * Montserrat-OsF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scsl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{l}{n}{
-      <-> ssub * Montserrat-OsF/light/n
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-OsF}{l}{sc}{
-      <-> ssub * Montserrat-OsF/light/sc
+      <-> alias * Montserrat-OsF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{l}{sl}{
-      <-> ssub * Montserrat-OsF/light/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{l}{n}{
+      <-> alias * Montserrat-OsF/light/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{l}{it}{
-      <-> ssub * Montserrat-OsF/light/it
+      <-> alias * Montserrat-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scit}{
-      <-> ssub * Montserrat-OsF/light/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{sl}{
-      <-> ssub * Montserrat-OsF/regular/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scsl}{
+      <-> alias * Montserrat-OsF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{n}{
-      <-> ssub * Montserrat-OsF/regular/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{l}{sl}{
+      <-> alias * Montserrat-OsF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{sc}{
-      <-> ssub * Montserrat-OsF/regular/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{l}{scit}{
+      <-> alias * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scsl
-}{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{scit}{
-      <-> ssub * Montserrat-OsF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sl}{it}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{m}{n}{
+      <-> alias * Montserrat-OsF/regular/n
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sl}{
-      <-> ssub * Montserrat-OsF/medium/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{m}{it}{
+      <-> alias * Montserrat-OsF/regular/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{m}{sc}{
-      <-> ssub * Montserrat-OsF/medium/sc
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{m}{n}{
-      <-> ssub * Montserrat-OsF/medium/n
+      <-> alias * Montserrat-OsF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{m}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scsl
+      <-> alias * Montserrat-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scit}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{m}{sl}{
+      <-> alias * Montserrat-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{m}{it}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{m}{scit}{
+      <-> alias * Montserrat-OsF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scsl
+\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{it}{
+      <-> alias * Montserrat-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sc}{
-      <-> ssub * Montserrat-OsF/semibold/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{n}{
+      <-> alias * Montserrat-OsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{n}{
-      <-> ssub * Montserrat-OsF/semibold/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sc}{
+      <-> alias * Montserrat-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scsl}{
+      <-> alias * Montserrat-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{it}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{sb}{sl}{
+      <-> alias * Montserrat-OsF/semibold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{sb}{scit}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+      <-> alias * Montserrat-OsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{b}{sl}{
-      <-> ssub * Montserrat-OsF/bold/sl
+      <-> alias * Montserrat-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{b}{n}{
-      <-> ssub * Montserrat-OsF/bold/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scit}{
+      <-> alias * Montserrat-OsF/bold/scit
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{b}{sc}{
-      <-> ssub * Montserrat-OsF/bold/sc
+      <-> alias * Montserrat-OsF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scsl
+\DeclareFontShape{LY1}{Montserrat-OsF}{b}{n}{
+      <-> alias * Montserrat-OsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scit}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{b}{it}{
+      <-> alias * Montserrat-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{b}{it}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{b}{scsl}{
+      <-> alias * Montserrat-OsF/bold/scsl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{it}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scit}{
+      <-> alias * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scit}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sl}{
+      <-> alias * Montserrat-OsF/extrabold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{eb}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scsl
+      <-> alias * Montserrat-OsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sc}{
-      <-> ssub * Montserrat-OsF/extrabold/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{it}{
+      <-> alias * Montserrat-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{eb}{n}{
-      <-> ssub * Montserrat-OsF/extrabold/n
+      <-> alias * Montserrat-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{eb}{sc}{
+      <-> alias * Montserrat-OsF/extrabold/sc
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{scit}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sc}{
+      <-> alias * Montserrat-OsF/black/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{ub}{it}{
-      <-> ssub * Montserrat-OsF/black/it
+      <-> alias * Montserrat-OsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sl}{
-      <-> ssub * Montserrat-OsF/black/sl
+\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{n}{
+      <-> alias * Montserrat-OsF/black/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{ub}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scsl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{n}{
-      <-> ssub * Montserrat-OsF/black/n
+      <-> alias * Montserrat-OsF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sc}{
-      <-> ssub * Montserrat-OsF/black/sc
+\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{sl}{
+      <-> alias * Montserrat-OsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{it}{
-      <-> ssub * Montserrat-OsF/b/it
+\DeclareFontShape{LY1}{Montserrat-OsF}{ub}{scit}{
+      <-> alias * Montserrat-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scit}{
-      <-> ssub * Montserrat-OsF/b/scit
+\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{n}{
+      <-> ssub * Montserrat-OsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scsl}{
-      <-> ssub * Montserrat-OsF/b/scsl
+\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{it}{
+      <-> ssub * Montserrat-OsF/b/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{bx}{sc}{
       <-> ssub * Montserrat-OsF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{n}{
-      <-> ssub * Montserrat-OsF/b/n
+\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scsl}{
+      <-> ssub * Montserrat-OsF/b/scsl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-OsF}{bx}{sl}{
       <-> ssub * Montserrat-OsF/b/sl
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-OsF}{bx}{scit}{
+      <-> ssub * Montserrat-OsF/b/scit
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/LY1Montserrat-Sup.fd b/fonts/montserrat/tex/LY1Montserrat-Sup.fd
index 62d097bbee..dcd4fd0f35 100644
--- a/fonts/montserrat/tex/LY1Montserrat-Sup.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,286 +20,271 @@
 \DeclareFontFamily{LY1}{Montserrat-Sup}{}
 
 
-%   ----  regular  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{sl}{
-      <-> ssub * Montserrat-Sup/regular/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{sl}{
+      <-> ssub * Montserrat-Sup/extrabold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{black}{sl}{
-      <-> ssub * Montserrat-Sup/black/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{sl}{
+      <-> ssub * Montserrat-Sup/semibold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{regular}{sl}{
+      <-> ssub * Montserrat-Sup/regular/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{semibold}{sl}{
-      <-> ssub * Montserrat-Sup/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{sl}{
+      <-> ssub * Montserrat-Sup/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{bold}{sl}{
-      <-> ssub * Montserrat-Sup/bold/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{sl}{
+      <-> ssub * Montserrat-Sup/medium/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{extrabold}{sl}{
-      <-> ssub * Montserrat-Sup/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{black}{sl}{
+      <-> ssub * Montserrat-Sup/black/it
 }{}
 
 
 %   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Sup}{thin}{it}{
       <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Sup}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Sup}{thin}{sl}{
       <-> ssub * Montserrat-Sup/thin/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-sup-ly1
+\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{medium}{sl}{
-      <-> ssub * Montserrat-Sup/medium/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{extralight}{sl}{
+      <-> ssub * Montserrat-Sup/extralight/it
 }{}
 
 
 %   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-Sup}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Sup}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Sup}{light}{sl}{
       <-> ssub * Montserrat-Sup/light/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{ul}{it}{
-      <-> ssub * Montserrat-Sup/thin/it
+      <-> alias * Montserrat-Sup/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{sl}{
-      <-> ssub * Montserrat-Sup/thin/sl
+\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{n}{
+      <-> alias * Montserrat-Sup/thin/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{n}{
-      <-> ssub * Montserrat-Sup/thin/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{ul}{sl}{
+      <-> alias * Montserrat-Sup/thin/sl
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{el}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/sl
+      <-> alias * Montserrat-Sup/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{el}{n}{
-      <-> ssub * Montserrat-Sup/extralight/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{el}{it}{
+      <-> alias * Montserrat-Sup/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{el}{it}{
-      <-> ssub * Montserrat-Sup/extralight/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{el}{n}{
+      <-> alias * Montserrat-Sup/extralight/n
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{l}{it}{
-      <-> ssub * Montserrat-Sup/light/it
+      <-> alias * Montserrat-Sup/light/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{l}{n}{
-      <-> ssub * Montserrat-Sup/light/n
+      <-> alias * Montserrat-Sup/light/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{l}{sl}{
-      <-> ssub * Montserrat-Sup/light/sl
+      <-> alias * Montserrat-Sup/light/sl
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{sl}{
-      <-> ssub * Montserrat-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{n}{
-      <-> ssub * Montserrat-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Sup}{sl}{it}{
-      <-> ssub * Montserrat-Sup/regular/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{m}{sl}{
+      <-> alias * Montserrat-Sup/regular/sl
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{LY1}{Montserrat-Sup}{m}{n}{
-      <-> ssub * Montserrat-Sup/medium/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Sup}{m}{sl}{
-      <-> ssub * Montserrat-Sup/medium/sl
+      <-> alias * Montserrat-Sup/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{m}{it}{
-      <-> ssub * Montserrat-Sup/medium/it
+      <-> alias * Montserrat-Sup/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{it}{
-      <-> ssub * Montserrat-Sup/semibold/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{n}{
+      <-> alias * Montserrat-Sup/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{sl}{
-      <-> ssub * Montserrat-Sup/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{it}{
+      <-> alias * Montserrat-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{n}{
-      <-> ssub * Montserrat-Sup/semibold/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{sb}{sl}{
+      <-> alias * Montserrat-Sup/semibold/sl
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{b}{it}{
-      <-> ssub * Montserrat-Sup/bold/it
+      <-> alias * Montserrat-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{b}{sl}{
-      <-> ssub * Montserrat-Sup/bold/sl
+\DeclareFontShape{LY1}{Montserrat-Sup}{b}{n}{
+      <-> alias * Montserrat-Sup/bold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{b}{n}{
-      <-> ssub * Montserrat-Sup/bold/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{b}{sl}{
+      <-> alias * Montserrat-Sup/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{it}{
-      <-> ssub * Montserrat-Sup/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{n}{
+      <-> alias * Montserrat-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{sl}{
-      <-> ssub * Montserrat-Sup/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{it}{
+      <-> alias * Montserrat-Sup/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{n}{
-      <-> ssub * Montserrat-Sup/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{eb}{sl}{
+      <-> alias * Montserrat-Sup/extrabold/sl
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{ub}{n}{
-      <-> ssub * Montserrat-Sup/black/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-Sup}{ub}{sl}{
-      <-> ssub * Montserrat-Sup/black/sl
+      <-> alias * Montserrat-Sup/black/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{ub}{it}{
-      <-> ssub * Montserrat-Sup/black/it
+      <-> alias * Montserrat-Sup/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-Sup}{bx}{n}{
-      <-> ssub * Montserrat-Sup/b/n
+\DeclareFontShape{LY1}{Montserrat-Sup}{ub}{sl}{
+      <-> alias * Montserrat-Sup/black/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-Sup}{bx}{sl}{
       <-> ssub * Montserrat-Sup/b/sl
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-Sup}{bx}{n}{
+      <-> ssub * Montserrat-Sup/b/n
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-Sup}{bx}{it}{
       <-> ssub * Montserrat-Sup/b/it
 }{}
diff --git a/fonts/montserrat/tex/LY1Montserrat-TLF.fd b/fonts/montserrat/tex/LY1Montserrat-TLF.fd
index abade38640..49e5b7b902 100644
--- a/fonts/montserrat/tex/LY1Montserrat-TLF.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,37 +20,37 @@
 \DeclareFontFamily{LY1}{Montserrat-TLF}{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scsl}{
+      <-> ssub * Montserrat-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sl}{
+      <-> ssub * Montserrat-TLF/medium/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{black}{sc}{
@@ -53,110 +61,102 @@
       <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{black}{sl}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{black}{scsl}{
       <-> ssub * Montserrat-TLF/black/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-TLF}{black}{sl}{
+      <-> ssub * Montserrat-TLF/black/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ly1
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sl}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scsl}{
+      <-> ssub * Montserrat-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sl}{
+      <-> ssub * Montserrat-TLF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{sl}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bold}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{extralight}{sl}{
+      <-> ssub * Montserrat-TLF/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scsl}{
+      <-> ssub * Montserrat-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sl}{
+      <-> ssub * Montserrat-TLF/light/it
 }{}
 
 
 %   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-tlf-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TLF}{thin}{scit}{
       <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ly1
 }{}
@@ -165,24 +165,24 @@
       <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sl}{
-      <-> ssub * Montserrat-TLF/thin/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{thin}{scsl}{
       <-> ssub * Montserrat-TLF/thin/scit
 }{}
 
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{thin}{sl}{
+      <-> ssub * Montserrat-TLF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ly1
-}{}
+
+%   ----  extrabold  ----
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{sc}{
       <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ly1
@@ -192,322 +192,307 @@
       <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{scsl}{
       <-> ssub * Montserrat-TLF/extrabold/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-TLF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TLF/extrabold/it
+}{}
 
-%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-ly1
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{sl}{
-      <-> ssub * Montserrat-TLF/light/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{scsl}{
+      <-> ssub * Montserrat-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{light}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{regular}{sl}{
+      <-> ssub * Montserrat-TLF/regular/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{sl}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{medium}{scsl}{
-      <-> ssub * Montserrat-TLF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{semibold}{sl}{
+      <-> ssub * Montserrat-TLF/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{sl}{
-      <-> ssub * Montserrat-TLF/thin/sl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TLF}{ul}{scsl}{
-      <-> ssub * Montserrat-TLF/thin/scsl
+      <-> alias * Montserrat-TLF/thin/scsl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{ul}{sc}{
-      <-> ssub * Montserrat-TLF/thin/sc
+      <-> alias * Montserrat-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{it}{
+      <-> alias * Montserrat-TLF/thin/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{ul}{n}{
-      <-> ssub * Montserrat-TLF/thin/n
+      <-> alias * Montserrat-TLF/thin/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{ul}{scit}{
-      <-> ssub * Montserrat-TLF/thin/scit
+      <-> alias * Montserrat-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{it}{
-      <-> ssub * Montserrat-TLF/thin/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{ul}{sl}{
+      <-> alias * Montserrat-TLF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{el}{it}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{el}{scsl}{
+      <-> alias * Montserrat-TLF/extralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{el}{scit}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{el}{it}{
+      <-> alias * Montserrat-TLF/extralight/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{el}{n}{
-      <-> ssub * Montserrat-TLF/extralight/n
+      <-> alias * Montserrat-TLF/extralight/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{el}{sc}{
-      <-> ssub * Montserrat-TLF/extralight/sc
+      <-> alias * Montserrat-TLF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{el}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scsl
+\DeclareFontShape{LY1}{Montserrat-TLF}{el}{scit}{
+      <-> alias * Montserrat-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{el}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/sl
+      <-> alias * Montserrat-TLF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sl}{
-      <-> ssub * Montserrat-TLF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{l}{n}{
-      <-> ssub * Montserrat-TLF/light/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sc}{
-      <-> ssub * Montserrat-TLF/light/sc
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scsl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TLF}{l}{scit}{
-      <-> ssub * Montserrat-TLF/light/scit
+      <-> alias * Montserrat-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{l}{it}{
-      <-> ssub * Montserrat-TLF/light/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{scit}{
-      <-> ssub * Montserrat-TLF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{it}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sl}{
+      <-> alias * Montserrat-TLF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{sl}{
-      <-> ssub * Montserrat-TLF/regular/sl
+\DeclareFontShape{LY1}{Montserrat-TLF}{l}{scsl}{
+      <-> alias * Montserrat-TLF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scsl
+\DeclareFontShape{LY1}{Montserrat-TLF}{l}{sc}{
+      <-> alias * Montserrat-TLF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{n}{
-      <-> ssub * Montserrat-TLF/regular/n
+\DeclareFontShape{LY1}{Montserrat-TLF}{l}{n}{
+      <-> alias * Montserrat-TLF/light/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sl}{sc}{
-      <-> ssub * Montserrat-TLF/regular/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{l}{it}{
+      <-> alias * Montserrat-TLF/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sc}{
-      <-> ssub * Montserrat-TLF/medium/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scit}{
+      <-> alias * Montserrat-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{m}{n}{
-      <-> ssub * Montserrat-TLF/medium/n
+\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sl}{
+      <-> alias * Montserrat-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{m}{scsl}{
-      <-> ssub * Montserrat-TLF/medium/scsl
+      <-> alias * Montserrat-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sl}{
-      <-> ssub * Montserrat-TLF/medium/sl
+\DeclareFontShape{LY1}{Montserrat-TLF}{m}{it}{
+      <-> alias * Montserrat-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{m}{it}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{m}{n}{
+      <-> alias * Montserrat-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{m}{scit}{
-      <-> ssub * Montserrat-TLF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{m}{sc}{
+      <-> alias * Montserrat-TLF/regular/sc
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scit}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sc}{
+      <-> alias * Montserrat-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{it}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{n}{
+      <-> alias * Montserrat-TLF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{it}{
+      <-> alias * Montserrat-TLF/semibold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scsl
+      <-> alias * Montserrat-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{n}{
-      <-> ssub * Montserrat-TLF/semibold/n
+\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sl}{
+      <-> alias * Montserrat-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{sc}{
-      <-> ssub * Montserrat-TLF/semibold/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{sb}{scit}{
+      <-> alias * Montserrat-TLF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{b}{it}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{b}{sc}{
+      <-> alias * Montserrat-TLF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{b}{scit}{
-      <-> ssub * Montserrat-TLF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-TLF}{b}{it}{
+      <-> alias * Montserrat-TLF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{b}{n}{
-      <-> ssub * Montserrat-TLF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TLF}{b}{sc}{
-      <-> ssub * Montserrat-TLF/bold/sc
+      <-> alias * Montserrat-TLF/bold/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{b}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scsl
+      <-> alias * Montserrat-TLF/bold/scsl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{b}{sl}{
-      <-> ssub * Montserrat-TLF/bold/sl
+      <-> alias * Montserrat-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TLF}{b}{scit}{
+      <-> alias * Montserrat-TLF/bold/scit
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{it}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sl}{
+      <-> alias * Montserrat-TLF/extrabold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scit}{
-      <-> ssub * Montserrat-TLF/extrabold/scit
+      <-> alias * Montserrat-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scsl}{
-      <-> ssub * Montserrat-TLF/extrabold/scsl
+\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{n}{
+      <-> alias * Montserrat-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sc}{
-      <-> ssub * Montserrat-TLF/extrabold/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{it}{
+      <-> alias * Montserrat-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{n}{
-      <-> ssub * Montserrat-TLF/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sc}{
+      <-> alias * Montserrat-TLF/extrabold/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-TLF}{eb}{scsl}{
+      <-> alias * Montserrat-TLF/extrabold/scsl
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{ub}{scit}{
-      <-> ssub * Montserrat-TLF/black/scit
+      <-> alias * Montserrat-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{it}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sl}{
+      <-> alias * Montserrat-TLF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sl}{
-      <-> ssub * Montserrat-TLF/black/sl
+\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{scsl}{
+      <-> alias * Montserrat-TLF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{n}{
-      <-> ssub * Montserrat-TLF/black/n
+\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{it}{
+      <-> alias * Montserrat-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sc}{
-      <-> ssub * Montserrat-TLF/black/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{n}{
+      <-> alias * Montserrat-TLF/black/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{scsl}{
-      <-> ssub * Montserrat-TLF/black/scsl
+\DeclareFontShape{LY1}{Montserrat-TLF}{ub}{sc}{
+      <-> alias * Montserrat-TLF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{sc}{
-      <-> ssub * Montserrat-TLF/b/sc
+\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{it}{
+      <-> ssub * Montserrat-TLF/b/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TLF}{bx}{n}{
       <-> ssub * Montserrat-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{sc}{
+      <-> ssub * Montserrat-TLF/b/sc
+}{}
+
 \DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scsl}{
       <-> ssub * Montserrat-TLF/b/scsl
 }{}
@@ -516,10 +501,6 @@
       <-> ssub * Montserrat-TLF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TLF}{bx}{it}{
-      <-> ssub * Montserrat-TLF/b/it
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TLF}{bx}{scit}{
       <-> ssub * Montserrat-TLF/b/scit
 }{}
diff --git a/fonts/montserrat/tex/LY1Montserrat-TOsF.fd b/fonts/montserrat/tex/LY1Montserrat-TOsF.fd
index fae137715d..69acecebd7 100644
--- a/fonts/montserrat/tex/LY1Montserrat-TOsF.fd
+++ b/fonts/montserrat/tex/LY1Montserrat-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1Montserrat-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/Montserrat-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/Montserrat-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,172 +20,172 @@
 \DeclareFontFamily{LY1}{Montserrat-TOsF}{}
 
 
-%   ----  extralight  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scsl}{
+      <-> ssub * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sl}{
+      <-> ssub * Montserrat-TOsF/black/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scsl}{
+      <-> ssub * Montserrat-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scsl}{
-      <-> ssub * Montserrat-TOsF/regular/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sl}{
+      <-> ssub * Montserrat-TOsF/medium/it
 }{}
 
 
-%   ----  black  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{sl}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scsl}{
+      <-> ssub * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{black}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scsl}{
+      <-> ssub * Montserrat-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sl}{
+      <-> ssub * Montserrat-TOsF/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bold}{scsl}{
-      <-> ssub * Montserrat-TOsF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extralight}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/it
 }{}
 
 
 %   ----  thin  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{it}{
       <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ly1
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{n}{
       <-> \Montserrat@@scale Montserrat-Thin-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{scsl}{
       <-> ssub * Montserrat-TOsF/thin/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-TOsF}{thin}{sl}{
+      <-> ssub * Montserrat-TOsF/thin/it
+}{}
+
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{sc}{
@@ -188,338 +196,311 @@
       <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ly1
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{scsl}{
       <-> ssub * Montserrat-TOsF/extrabold/scit
 }{}
 
+\DeclareFontShape{LY1}{Montserrat-TOsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
+}{}
 
-%   ----  medium  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ly1
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{medium}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{semibold}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ly1
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{sl}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{scsl}{
+      <-> ssub * Montserrat-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{light}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{regular}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{it}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scit}{
+      <-> alias * Montserrat-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scit}{
-      <-> ssub * Montserrat-TOsF/thin/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sl}{
+      <-> alias * Montserrat-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sc}{
-      <-> ssub * Montserrat-TOsF/thin/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scsl}{
+      <-> alias * Montserrat-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{n}{
-      <-> ssub * Montserrat-TOsF/thin/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{it}{
+      <-> alias * Montserrat-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{scsl}{
-      <-> ssub * Montserrat-TOsF/thin/scsl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{n}{
+      <-> alias * Montserrat-TOsF/thin/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ul}{sc}{
+      <-> alias * Montserrat-TOsF/thin/sc
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scit}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scsl}{
+      <-> alias * Montserrat-TOsF/extralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{it}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{n}{
+      <-> alias * Montserrat-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{it}{
+      <-> alias * Montserrat-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{n}{
-      <-> ssub * Montserrat-TOsF/extralight/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sc}{
+      <-> alias * Montserrat-TOsF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sc}{
-      <-> ssub * Montserrat-TOsF/extralight/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scit}{
+      <-> alias * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scsl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{el}{sl}{
+      <-> alias * Montserrat-TOsF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sl}{
-      <-> ssub * Montserrat-TOsF/light/sl
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sc}{
-      <-> ssub * Montserrat-TOsF/light/sc
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{n}{
-      <-> ssub * Montserrat-TOsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scsl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scit}{
-      <-> ssub * Montserrat-TOsF/light/scit
+      <-> alias * Montserrat-TOsF/light/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{l}{it}{
-      <-> ssub * Montserrat-TOsF/light/it
+      <-> alias * Montserrat-TOsF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{scit}{
-      <-> ssub * Montserrat-TOsF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{it}{
-      <-> ssub * Montserrat-TOsF/regular/it
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{n}{
+      <-> alias * Montserrat-TOsF/light/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{n}{
-      <-> ssub * Montserrat-TOsF/regular/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scsl}{
+      <-> alias * Montserrat-TOsF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{sc}{
-      <-> ssub * Montserrat-TOsF/regular/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{sl}{
+      <-> alias * Montserrat-TOsF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sl}{scsl}{
-      <-> ssub * Montserrat-TOsF/regular/scsl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{l}{scit}{
+      <-> alias * Montserrat-TOsF/light/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{m}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/sl
-}{}
-
-\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scsl
+      <-> alias * Montserrat-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{n}{
-      <-> ssub * Montserrat-TOsF/medium/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scit}{
+      <-> alias * Montserrat-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{m}{sc}{
-      <-> ssub * Montserrat-TOsF/medium/sc
+      <-> alias * Montserrat-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scit}{
-      <-> ssub * Montserrat-TOsF/medium/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{n}{
+      <-> alias * Montserrat-TOsF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{m}{it}{
-      <-> ssub * Montserrat-TOsF/medium/it
+      <-> alias * Montserrat-TOsF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TOsF}{m}{scsl}{
+      <-> alias * Montserrat-TOsF/regular/scsl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scit}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sc}{
+      <-> alias * Montserrat-TOsF/semibold/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{it}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+      <-> alias * Montserrat-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{n}{
+      <-> alias * Montserrat-TOsF/semibold/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scsl
+      <-> alias * Montserrat-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{n}{
-      <-> ssub * Montserrat-TOsF/semibold/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sl}{
+      <-> alias * Montserrat-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{sc}{
-      <-> ssub * Montserrat-TOsF/semibold/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{sb}{scit}{
+      <-> alias * Montserrat-TOsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{it}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scit}{
+      <-> alias * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scit}{
-      <-> ssub * Montserrat-TOsF/bold/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sl}{
+      <-> alias * Montserrat-TOsF/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{b}{scsl}{
-      <-> ssub * Montserrat-TOsF/bold/scsl
+      <-> alias * Montserrat-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sc}{
-      <-> ssub * Montserrat-TOsF/bold/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{it}{
+      <-> alias * Montserrat-TOsF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{b}{n}{
-      <-> ssub * Montserrat-TOsF/bold/n
+      <-> alias * Montserrat-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{b}{sc}{
+      <-> alias * Montserrat-TOsF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scit}{
-      <-> ssub * Montserrat-TOsF/extrabold/scit
+\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{it}{
+      <-> alias * Montserrat-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{it}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{n}{
+      <-> alias * Montserrat-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sc}{
+      <-> alias * Montserrat-TOsF/extrabold/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scsl}{
-      <-> ssub * Montserrat-TOsF/extrabold/scsl
+      <-> alias * Montserrat-TOsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{n}{
-      <-> ssub * Montserrat-TOsF/extrabold/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sl}{
+      <-> alias * Montserrat-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{sc}{
-      <-> ssub * Montserrat-TOsF/extrabold/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{eb}{scit}{
+      <-> alias * Montserrat-TOsF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{scit}{
-      <-> ssub * Montserrat-TOsF/black/scit
+      <-> alias * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{it}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sl}{
+      <-> alias * Montserrat-TOsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sl}{
-      <-> ssub * Montserrat-TOsF/black/sl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{scsl}{
+      <-> alias * Montserrat-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sc}{
+      <-> alias * Montserrat-TOsF/black/sc
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{n}{
-      <-> ssub * Montserrat-TOsF/black/n
+      <-> alias * Montserrat-TOsF/black/n
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{sc}{
-      <-> ssub * Montserrat-TOsF/black/sc
+\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{it}{
+      <-> alias * Montserrat-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{ub}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scsl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{it}{
+      <-> ssub * Montserrat-TOsF/b/it
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scsl}{
-      <-> ssub * Montserrat-TOsF/b/scsl
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{n}{
+      <-> ssub * Montserrat-TOsF/b/n
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{sc}{
       <-> ssub * Montserrat-TOsF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{n}{
-      <-> ssub * Montserrat-TOsF/b/n
+\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scsl}{
+      <-> ssub * Montserrat-TOsF/b/scsl
 }{}
 
 \DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{sl}{
       <-> ssub * Montserrat-TOsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{it}{
-      <-> ssub * Montserrat-TOsF/b/it
-}{}
-
 \DeclareFontShape{LY1}{Montserrat-TOsF}{bx}{scit}{
       <-> ssub * Montserrat-TOsF/b/scit
 }{}
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-Dnom.fd b/fonts/montserrat/tex/LY1MontserratAlternates-Dnom.fd
index 47915e6c6b..87249866a9 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-Dnom.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,31 +20,31 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-Dnom}{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/light/it
 }{}
 
 
 %   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extralight}{sl}{
       <-> ssub * MontserratAlternates-Dnom/extralight/it
 }{}
@@ -57,18 +65,33 @@
 }{}
 
 
-%   ----  bold  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/black/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/regular/it
 }{}
 
 
@@ -87,213 +110,183 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{light}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/it
 }{}
 
 
 %   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
-}{}
-
-
-%   ----  black  ----
-
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{black}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/bold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{n}{
-      <-> ssub * MontserratAlternates-Dnom/thin/n
+      <-> alias * MontserratAlternates-Dnom/thin/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{it}{
-      <-> ssub * MontserratAlternates-Dnom/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{sl}{
+      <-> alias * MontserratAlternates-Dnom/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/thin/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ul}{it}{
+      <-> alias * MontserratAlternates-Dnom/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/n
+      <-> alias * MontserratAlternates-Dnom/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{sl}{
+      <-> alias * MontserratAlternates-Dnom/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{el}{it}{
+      <-> alias * MontserratAlternates-Dnom/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{it}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{n}{
-      <-> ssub * MontserratAlternates-Dnom/light/n
+      <-> alias * MontserratAlternates-Dnom/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{n}{
-      <-> ssub * MontserratAlternates-Dnom/regular/n
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{sl}{
+      <-> alias * MontserratAlternates-Dnom/light/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/regular/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{l}{it}{
+      <-> alias * MontserratAlternates-Dnom/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sl}{it}{
-      <-> ssub * MontserratAlternates-Dnom/regular/it
-}{}
 
+%   m --> regular
 
-%   m --> medium
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{sl}{
+      <-> alias * MontserratAlternates-Dnom/regular/sl
+}{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{n}{
-      <-> ssub * MontserratAlternates-Dnom/medium/n
+      <-> alias * MontserratAlternates-Dnom/regular/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{it}{
-      <-> ssub * MontserratAlternates-Dnom/medium/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{m}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/medium/sl
+      <-> alias * MontserratAlternates-Dnom/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/sl
+      <-> alias * MontserratAlternates-Dnom/semibold/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/n
+      <-> alias * MontserratAlternates-Dnom/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{sb}{it}{
+      <-> alias * MontserratAlternates-Dnom/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{n}{
-      <-> ssub * MontserratAlternates-Dnom/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{it}{
+      <-> alias * MontserratAlternates-Dnom/bold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{it}{
-      <-> ssub * MontserratAlternates-Dnom/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{n}{
+      <-> alias * MontserratAlternates-Dnom/bold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{b}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/bold/sl
+      <-> alias * MontserratAlternates-Dnom/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+      <-> alias * MontserratAlternates-Dnom/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{n}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{eb}{sl}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{n}{
+      <-> alias * MontserratAlternates-Dnom/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{it}{
-      <-> ssub * MontserratAlternates-Dnom/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{sl}{
+      <-> alias * MontserratAlternates-Dnom/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{n}{
-      <-> ssub * MontserratAlternates-Dnom/black/n
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{ub}{it}{
+      <-> alias * MontserratAlternates-Dnom/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{sl}{
       <-> ssub * MontserratAlternates-Dnom/b/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{it}{
-      <-> ssub * MontserratAlternates-Dnom/b/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{n}{
       <-> ssub * MontserratAlternates-Dnom/b/n
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Dnom}{bx}{it}{
+      <-> ssub * MontserratAlternates-Dnom/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-Inf.fd b/fonts/montserrat/tex/LY1MontserratAlternates-Inf.fd
index cfcaeb1209..981baa8c6b 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-Inf.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,48 +20,33 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-Inf}{}
 
 
-%   ----  extralight  ----
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
-}{}
-
-
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{sl}{
+      <-> ssub * MontserratAlternates-Inf/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Inf/extralight/it
 }{}
 
 
@@ -72,216 +65,216 @@
 }{}
 
 
-%   ----  regular  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{sl}{
+      <-> ssub * MontserratAlternates-Inf/black/it
 }{}
 
+
+%   ----  regular  ----
+
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{regular}{sl}{
       <-> ssub * MontserratAlternates-Inf/regular/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{black}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/extrabold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Inf/medium/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{light}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/bold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Inf/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{n}{
-      <-> ssub * MontserratAlternates-Inf/thin/n
+      <-> alias * MontserratAlternates-Inf/thin/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{it}{
-      <-> ssub * MontserratAlternates-Inf/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{sl}{
+      <-> alias * MontserratAlternates-Inf/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Inf/thin/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ul}{it}{
+      <-> alias * MontserratAlternates-Inf/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{it}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
+      <-> alias * MontserratAlternates-Inf/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{n}{
+      <-> alias * MontserratAlternates-Inf/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{n}{
-      <-> ssub * MontserratAlternates-Inf/extralight/n
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{el}{sl}{
+      <-> alias * MontserratAlternates-Inf/extralight/sl
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{n}{
-      <-> ssub * MontserratAlternates-Inf/light/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{it}{
-      <-> ssub * MontserratAlternates-Inf/light/it
+      <-> alias * MontserratAlternates-Inf/light/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/sl
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{n}{
-      <-> ssub * MontserratAlternates-Inf/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{it}{
-      <-> ssub * MontserratAlternates-Inf/regular/it
+      <-> alias * MontserratAlternates-Inf/light/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Inf/regular/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{l}{it}{
+      <-> alias * MontserratAlternates-Inf/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{sl}{
-      <-> ssub * MontserratAlternates-Inf/medium/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{it}{
+      <-> alias * MontserratAlternates-Inf/regular/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{it}{
-      <-> ssub * MontserratAlternates-Inf/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{sl}{
+      <-> alias * MontserratAlternates-Inf/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{m}{n}{
-      <-> ssub * MontserratAlternates-Inf/medium/n
+      <-> alias * MontserratAlternates-Inf/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{n}{
-      <-> ssub * MontserratAlternates-Inf/semibold/n
+      <-> alias * MontserratAlternates-Inf/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{it}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{sl}{
+      <-> alias * MontserratAlternates-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{sb}{it}{
+      <-> alias * MontserratAlternates-Inf/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{n}{
-      <-> ssub * MontserratAlternates-Inf/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{sl}{
+      <-> alias * MontserratAlternates-Inf/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{it}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{n}{
+      <-> alias * MontserratAlternates-Inf/bold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{b}{it}{
+      <-> alias * MontserratAlternates-Inf/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{n}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{sl}{
+      <-> alias * MontserratAlternates-Inf/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{it}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{n}{
+      <-> alias * MontserratAlternates-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{eb}{it}{
+      <-> alias * MontserratAlternates-Inf/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{n}{
-      <-> ssub * MontserratAlternates-Inf/black/n
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{sl}{
+      <-> alias * MontserratAlternates-Inf/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{it}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{n}{
+      <-> alias * MontserratAlternates-Inf/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Inf}{ub}{it}{
+      <-> alias * MontserratAlternates-Inf/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Inf}{bx}{it}{
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-LF.fd b/fonts/montserrat/tex/LY1MontserratAlternates-LF.fd
index fa35809813..7f1c60aa87 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-LF.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-LF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,508 +20,477 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-LF}{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-LF/medium/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-LF/semibold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-LF/bold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-LF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-LF/medium/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-LF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{black}{sl}{
+      <-> ssub * MontserratAlternates-LF/black/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-LF/regular/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-LF/extralight/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{light}{sl}{
+      <-> ssub * MontserratAlternates-LF/light/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-LF/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{n}{
-      <-> ssub * MontserratAlternates-LF/thin/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{it}{
+      <-> alias * MontserratAlternates-LF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{scit}{
+      <-> alias * MontserratAlternates-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sc}{
+      <-> alias * MontserratAlternates-LF/thin/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-LF/thin/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{n}{
+      <-> alias * MontserratAlternates-LF/thin/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{it}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ul}{sl}{
+      <-> alias * MontserratAlternates-LF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extralight/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sl}{
+      <-> alias * MontserratAlternates-LF/extralight/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{n}{
-      <-> ssub * MontserratAlternates-LF/extralight/n
+      <-> alias * MontserratAlternates-LF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scit}{
-      <-> ssub * MontserratAlternates-LF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sc}{
+      <-> alias * MontserratAlternates-LF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{it}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scit}{
+      <-> alias * MontserratAlternates-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sc}{
-      <-> ssub * MontserratAlternates-LF/extralight/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{scsl}{
+      <-> alias * MontserratAlternates-LF/extralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{el}{it}{
+      <-> alias * MontserratAlternates-LF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{it}{
-      <-> ssub * MontserratAlternates-LF/light/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sc}{
-      <-> ssub * MontserratAlternates-LF/light/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scit}{
+      <-> alias * MontserratAlternates-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{it}{
+      <-> alias * MontserratAlternates-LF/light/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scsl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{scit}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+      <-> alias * MontserratAlternates-LF/light/scsl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{n}{
-      <-> ssub * MontserratAlternates-LF/light/n
+      <-> alias * MontserratAlternates-LF/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sl}{
+      <-> alias * MontserratAlternates-LF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-LF/regular/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{l}{sc}{
+      <-> alias * MontserratAlternates-LF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{it}{
-      <-> ssub * MontserratAlternates-LF/regular/it
-}{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-LF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{n}{
-      <-> ssub * MontserratAlternates-LF/regular/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scsl}{
+      <-> alias * MontserratAlternates-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-LF/regular/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{it}{
+      <-> alias * MontserratAlternates-LF/regular/it
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{it}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scit}{
+      <-> alias * MontserratAlternates-LF/regular/scit
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{sc}{
-      <-> ssub * MontserratAlternates-LF/medium/sc
+      <-> alias * MontserratAlternates-LF/regular/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-LF/medium/scsl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{scit}{
-      <-> ssub * MontserratAlternates-LF/medium/scit
+      <-> alias * MontserratAlternates-LF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{m}{n}{
-      <-> ssub * MontserratAlternates-LF/medium/n
+      <-> alias * MontserratAlternates-LF/regular/n
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-LF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{n}{
-      <-> ssub * MontserratAlternates-LF/semibold/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{it}{
+      <-> alias * MontserratAlternates-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/semibold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{scit}{
+      <-> alias * MontserratAlternates-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sc}{
+      <-> alias * MontserratAlternates-LF/semibold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-LF/semibold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{sl}{
+      <-> alias * MontserratAlternates-LF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{it}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{sb}{n}{
+      <-> alias * MontserratAlternates-LF/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/sl
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sc}{
-      <-> ssub * MontserratAlternates-LF/bold/sc
+      <-> alias * MontserratAlternates-LF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{it}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{sl}{
+      <-> alias * MontserratAlternates-LF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scit}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{n}{
+      <-> alias * MontserratAlternates-LF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{n}{
-      <-> ssub * MontserratAlternates-LF/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{it}{
+      <-> alias * MontserratAlternates-LF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scsl
+      <-> alias * MontserratAlternates-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{b}{scit}{
+      <-> alias * MontserratAlternates-LF/bold/scit
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+      <-> alias * MontserratAlternates-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{n}{
-      <-> ssub * MontserratAlternates-LF/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{it}{
+      <-> alias * MontserratAlternates-LF/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scsl
+      <-> alias * MontserratAlternates-LF/extrabold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{n}{
+      <-> alias * MontserratAlternates-LF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sl}{
+      <-> alias * MontserratAlternates-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{it}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{eb}{sc}{
+      <-> alias * MontserratAlternates-LF/extrabold/sc
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+      <-> alias * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{n}{
-      <-> ssub * MontserratAlternates-LF/black/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{it}{
+      <-> alias * MontserratAlternates-LF/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scsl
+      <-> alias * MontserratAlternates-LF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{n}{
+      <-> alias * MontserratAlternates-LF/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-LF/black/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sl}{
+      <-> alias * MontserratAlternates-LF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{it}{
-      <-> ssub * MontserratAlternates-LF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{ub}{sc}{
+      <-> alias * MontserratAlternates-LF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-LF/b/sc
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{n}{
+      <-> ssub * MontserratAlternates-LF/b/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sl}{
       <-> ssub * MontserratAlternates-LF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{it}{
-      <-> ssub * MontserratAlternates-LF/b/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{n}{
-      <-> ssub * MontserratAlternates-LF/b/n
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-LF/b/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{scit}{
@@ -524,4 +501,8 @@
       <-> ssub * MontserratAlternates-LF/b/scsl
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-LF}{bx}{it}{
+      <-> ssub * MontserratAlternates-LF/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-Numr.fd b/fonts/montserrat/tex/LY1MontserratAlternates-Numr.fd
index d4abbdf79f..85fd705f5c 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-Numr.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,93 +20,93 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-Numr}{}
 
 
-%   ----  thin  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Numr/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{sl}{
+      <-> ssub * MontserratAlternates-Numr/black/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Numr/regular/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{sl}{
+      <-> ssub * MontserratAlternates-Numr/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{black}{sl}{
-      <-> ssub * MontserratAlternates-Numr/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Numr/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Numr/thin/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{light}{sl}{
-      <-> ssub * MontserratAlternates-Numr/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/bold/it
 }{}
 
 
@@ -117,181 +125,166 @@
 }{}
 
 
-%   ----  extralight  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Numr/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Numr/thin/sl
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{it}{
-      <-> ssub * MontserratAlternates-Numr/thin/it
+      <-> alias * MontserratAlternates-Numr/thin/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{n}{
-      <-> ssub * MontserratAlternates-Numr/thin/n
+      <-> alias * MontserratAlternates-Numr/thin/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ul}{sl}{
+      <-> alias * MontserratAlternates-Numr/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{n}{
-      <-> ssub * MontserratAlternates-Numr/extralight/n
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{it}{
+      <-> alias * MontserratAlternates-Numr/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{it}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{n}{
+      <-> alias * MontserratAlternates-Numr/extralight/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{el}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/sl
+      <-> alias * MontserratAlternates-Numr/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{it}{
-      <-> ssub * MontserratAlternates-Numr/light/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{sl}{
-      <-> ssub * MontserratAlternates-Numr/light/sl
+      <-> alias * MontserratAlternates-Numr/light/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{n}{
-      <-> ssub * MontserratAlternates-Numr/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{it}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
+      <-> alias * MontserratAlternates-Numr/light/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{l}{it}{
+      <-> alias * MontserratAlternates-Numr/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sl}{n}{
-      <-> ssub * MontserratAlternates-Numr/regular/n
-}{}
 
+%   m --> regular
 
-%   m --> medium
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{n}{
+      <-> alias * MontserratAlternates-Numr/regular/n
+}{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{sl}{
-      <-> ssub * MontserratAlternates-Numr/medium/sl
+      <-> alias * MontserratAlternates-Numr/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{it}{
-      <-> ssub * MontserratAlternates-Numr/medium/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{m}{n}{
-      <-> ssub * MontserratAlternates-Numr/medium/n
+      <-> alias * MontserratAlternates-Numr/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{n}{
-      <-> ssub * MontserratAlternates-Numr/semibold/n
+      <-> alias * MontserratAlternates-Numr/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{it}{
-      <-> ssub * MontserratAlternates-Numr/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{sl}{
+      <-> alias * MontserratAlternates-Numr/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/semibold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{sb}{it}{
+      <-> alias * MontserratAlternates-Numr/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{n}{
-      <-> ssub * MontserratAlternates-Numr/bold/n
+      <-> alias * MontserratAlternates-Numr/bold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/sl
+      <-> alias * MontserratAlternates-Numr/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{b}{it}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+      <-> alias * MontserratAlternates-Numr/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/sl
+      <-> alias * MontserratAlternates-Numr/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{it}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{n}{
+      <-> alias * MontserratAlternates-Numr/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{n}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{eb}{it}{
+      <-> alias * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{n}{
-      <-> ssub * MontserratAlternates-Numr/black/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{it}{
-      <-> ssub * MontserratAlternates-Numr/black/it
+      <-> alias * MontserratAlternates-Numr/black/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Numr/black/sl
+      <-> alias * MontserratAlternates-Numr/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bx}{sl}{
-      <-> ssub * MontserratAlternates-Numr/b/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{ub}{it}{
+      <-> alias * MontserratAlternates-Numr/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{bx}{it}{
       <-> ssub * MontserratAlternates-Numr/b/it
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Numr}{bx}{sl}{
+      <-> ssub * MontserratAlternates-Numr/b/sl
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Numr}{bx}{n}{
       <-> ssub * MontserratAlternates-Numr/b/n
 }{}
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-OsF.fd b/fonts/montserrat/tex/LY1MontserratAlternates-OsF.fd
index d21345234d..d01891e00f 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-OsF.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,512 +20,485 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-OsF}{}
 
 
-%   ----  thin  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/medium/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-OsF/thin/it
 }{}
 
 
-%   ----  light  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-OsF/regular/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-OsF/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scsl
+      <-> alias * MontserratAlternates-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-OsF/thin/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{it}{
+      <-> alias * MontserratAlternates-OsF/thin/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+      <-> alias * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sc}{
+      <-> alias * MontserratAlternates-OsF/thin/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-OsF/thin/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{n}{
+      <-> alias * MontserratAlternates-OsF/thin/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/sl
+      <-> alias * MontserratAlternates-OsF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{n}{
+      <-> alias * MontserratAlternates-OsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{n}{
-      <-> ssub * MontserratAlternates-OsF/extralight/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{
+      <-> alias * MontserratAlternates-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sc}{
+      <-> alias * MontserratAlternates-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scit}{
+      <-> alias * MontserratAlternates-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{scsl}{
+      <-> alias * MontserratAlternates-OsF/extralight/scsl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{el}{it}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+      <-> alias * MontserratAlternates-OsF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{
+      <-> alias * MontserratAlternates-OsF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-OsF/light/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{
+      <-> alias * MontserratAlternates-OsF/light/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/sl
+      <-> alias * MontserratAlternates-OsF/light/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{it}{
+      <-> alias * MontserratAlternates-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{n}{
-      <-> ssub * MontserratAlternates-OsF/light/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scsl}{
+      <-> alias * MontserratAlternates-OsF/light/scsl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
+      <-> alias * MontserratAlternates-OsF/light/scit
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-OsF/regular/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{
+      <-> alias * MontserratAlternates-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{
+      <-> alias * MontserratAlternates-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-OsF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{
+      <-> alias * MontserratAlternates-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-OsF/regular/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{
+      <-> alias * MontserratAlternates-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/regular/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{
+      <-> alias * MontserratAlternates-OsF/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/sl
+      <-> alias * MontserratAlternates-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-OsF/medium/sc
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{it}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
-}{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{n}{
-      <-> ssub * MontserratAlternates-OsF/medium/n
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-OsF/medium/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/medium/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{
+      <-> alias * MontserratAlternates-OsF/semibold/it
 }{}
 
-
-%   sb --> semibold
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-OsF/semibold/scit
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sc
+      <-> alias * MontserratAlternates-OsF/semibold/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scsl
+      <-> alias * MontserratAlternates-OsF/semibold/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-OsF/semibold/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+      <-> alias * MontserratAlternates-OsF/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{it}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{
+      <-> alias * MontserratAlternates-OsF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-OsF/bold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{
+      <-> alias * MontserratAlternates-OsF/bold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/sl
+      <-> alias * MontserratAlternates-OsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{it}{
+      <-> alias * MontserratAlternates-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scsl}{
+      <-> alias * MontserratAlternates-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{n}{
-      <-> ssub * MontserratAlternates-OsF/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{b}{scit}{
+      <-> alias * MontserratAlternates-OsF/bold/scit
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sl
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sc
+      <-> alias * MontserratAlternates-OsF/extrabold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{
+      <-> alias * MontserratAlternates-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{it}{
+      <-> alias * MontserratAlternates-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scsl
+      <-> alias * MontserratAlternates-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-OsF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{n}{
+      <-> alias * MontserratAlternates-OsF/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-OsF/black/n
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-OsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-OsF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scit}{
+      <-> alias * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-OsF/black/sc
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-OsF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{ub}{it}{
+      <-> alias * MontserratAlternates-OsF/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{n}{
       <-> ssub * MontserratAlternates-OsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{
-      <-> ssub * MontserratAlternates-OsF/b/scit
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/b/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-OsF/b/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sc}{
       <-> ssub * MontserratAlternates-OsF/b/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-OsF/b/sl
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scit}{
+      <-> ssub * MontserratAlternates-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/b/scsl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-OsF}{bx}{it}{
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-Sup.fd b/fonts/montserrat/tex/LY1MontserratAlternates-Sup.fd
index 1efc8710ee..ff5bad8218 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-Sup.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -14,61 +22,61 @@
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{extrabold}{sl}{
       <-> ssub * MontserratAlternates-Sup/extrabold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Sup/medium/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/semibold/it
 }{}
 
 
@@ -87,46 +95,46 @@
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Sup/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Sup/thin/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{black}{sl}{
       <-> ssub * MontserratAlternates-Sup/black/it
 }{}
@@ -147,151 +155,136 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{n}{
-      <-> ssub * MontserratAlternates-Sup/thin/n
+      <-> alias * MontserratAlternates-Sup/thin/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/sl
+      <-> alias * MontserratAlternates-Sup/thin/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{ul}{it}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+      <-> alias * MontserratAlternates-Sup/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/sl
+      <-> alias * MontserratAlternates-Sup/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{it}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{n}{
+      <-> alias * MontserratAlternates-Sup/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{n}{
-      <-> ssub * MontserratAlternates-Sup/extralight/n
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{el}{it}{
+      <-> alias * MontserratAlternates-Sup/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{it}{
-      <-> ssub * MontserratAlternates-Sup/light/it
+      <-> alias * MontserratAlternates-Sup/light/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{sl}{
-      <-> ssub * MontserratAlternates-Sup/light/sl
+      <-> alias * MontserratAlternates-Sup/light/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{l}{n}{
-      <-> ssub * MontserratAlternates-Sup/light/n
+      <-> alias * MontserratAlternates-Sup/light/n
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{it}{
-      <-> ssub * MontserratAlternates-Sup/regular/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sl}{n}{
-      <-> ssub * MontserratAlternates-Sup/regular/n
-}{}
-
-
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{n}{
-      <-> ssub * MontserratAlternates-Sup/medium/n
+      <-> alias * MontserratAlternates-Sup/regular/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{it}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{sl}{
+      <-> alias * MontserratAlternates-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{m}{it}{
+      <-> alias * MontserratAlternates-Sup/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/sl
+      <-> alias * MontserratAlternates-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{it}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{n}{
+      <-> alias * MontserratAlternates-Sup/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{n}{
-      <-> ssub * MontserratAlternates-Sup/semibold/n
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{sb}{it}{
+      <-> alias * MontserratAlternates-Sup/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{n}{
-      <-> ssub * MontserratAlternates-Sup/bold/n
+      <-> alias * MontserratAlternates-Sup/bold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/sl
+      <-> alias * MontserratAlternates-Sup/bold/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{b}{it}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+      <-> alias * MontserratAlternates-Sup/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{n}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/n
+      <-> alias * MontserratAlternates-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{it}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{sl}{
+      <-> alias * MontserratAlternates-Sup/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{eb}{it}{
+      <-> alias * MontserratAlternates-Sup/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{it}{
-      <-> ssub * MontserratAlternates-Sup/black/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Sup/black/sl
+      <-> alias * MontserratAlternates-Sup/black/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{n}{
-      <-> ssub * MontserratAlternates-Sup/black/n
+      <-> alias * MontserratAlternates-Sup/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{sl}{
-      <-> ssub * MontserratAlternates-Sup/b/sl
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{ub}{sl}{
+      <-> alias * MontserratAlternates-Sup/black/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{it}{
       <-> ssub * MontserratAlternates-Sup/b/it
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{sl}{
+      <-> ssub * MontserratAlternates-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-Sup}{bx}{n}{
       <-> ssub * MontserratAlternates-Sup/b/n
 }{}
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-TLF.fd b/fonts/montserrat/tex/LY1MontserratAlternates-TLF.fd
index a653313f53..a33c97a975 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-TLF.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,49 +20,76 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-TLF}{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
+}{}
+
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/it
 }{}
 
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{extrabold}{scsl}{
@@ -66,76 +101,76 @@
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-TLF/medium/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{black}{scsl}{
@@ -147,30 +182,30 @@
 }{}
 
 
-%   ----  regular  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
 
@@ -180,14 +215,14 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{light}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-ly1
 }{}
@@ -201,309 +236,263 @@
 }{}
 
 
-%   ----  medium  ----
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/medium/scit
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
-}{}
-
-
-%   ----  semibold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/sl
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TLF/thin/sc
+      <-> alias * MontserratAlternates-TLF/thin/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TLF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{n}{
+      <-> alias * MontserratAlternates-TLF/thin/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TLF/thin/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{it}{
+      <-> alias * MontserratAlternates-TLF/thin/it
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scsl
+      <-> alias * MontserratAlternates-TLF/thin/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ul}{scit}{
+      <-> alias * MontserratAlternates-TLF/thin/scit
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{it}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> alias * MontserratAlternates-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{n}{
+      <-> alias * MontserratAlternates-TLF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{sc}{
+      <-> alias * MontserratAlternates-TLF/extralight/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scit}{
+      <-> alias * MontserratAlternates-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{n}{
-      <-> ssub * MontserratAlternates-TLF/extralight/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scsl}{
+      <-> alias * MontserratAlternates-TLF/extralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{el}{it}{
+      <-> alias * MontserratAlternates-TLF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{it}{
-      <-> ssub * MontserratAlternates-TLF/light/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TLF/light/sc
+      <-> alias * MontserratAlternates-TLF/light/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/light/scsl
+      <-> alias * MontserratAlternates-TLF/light/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{n}{
-      <-> ssub * MontserratAlternates-TLF/light/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TLF/light/scit
+      <-> alias * MontserratAlternates-TLF/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TLF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{it}{
+      <-> alias * MontserratAlternates-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TLF/regular/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scsl}{
+      <-> alias * MontserratAlternates-TLF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/regular/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{l}{scit}{
+      <-> alias * MontserratAlternates-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/sl
-}{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TLF/regular/sc
-}{}
+%   m --> regular
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sc}{
+      <-> alias * MontserratAlternates-TLF/regular/sc
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/medium/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sl}{
+      <-> alias * MontserratAlternates-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{n}{
-      <-> ssub * MontserratAlternates-TLF/medium/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TLF/medium/scit
+      <-> alias * MontserratAlternates-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{it}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
+      <-> alias * MontserratAlternates-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TLF/medium/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scsl}{
+      <-> alias * MontserratAlternates-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{m}{scit}{
+      <-> alias * MontserratAlternates-TLF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{n}{
+      <-> alias * MontserratAlternates-TLF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TLF/semibold/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+      <-> alias * MontserratAlternates-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TLF/semibold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{sb}{it}{
+      <-> alias * MontserratAlternates-TLF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/bold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sl}{
+      <-> alias * MontserratAlternates-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TLF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{n}{
+      <-> alias * MontserratAlternates-TLF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{n}{
-      <-> ssub * MontserratAlternates-TLF/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sc}{
+      <-> alias * MontserratAlternates-TLF/bold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{it}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scit}{
+      <-> alias * MontserratAlternates-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TLF/bold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{scsl}{
+      <-> alias * MontserratAlternates-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{b}{it}{
+      <-> alias * MontserratAlternates-TLF/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{n}{
+      <-> alias * MontserratAlternates-TLF/extrabold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sl
+      <-> alias * MontserratAlternates-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{sc}{
+      <-> alias * MontserratAlternates-TLF/extrabold/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scit
+      <-> alias * MontserratAlternates-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{scsl}{
+      <-> alias * MontserratAlternates-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{eb}{it}{
+      <-> alias * MontserratAlternates-TLF/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/black/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scit}{
+      <-> alias * MontserratAlternates-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TLF/black/n
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> alias * MontserratAlternates-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TLF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-TLF/black/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TLF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{n}{
+      <-> alias * MontserratAlternates-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{sl}{
+      <-> alias * MontserratAlternates-TLF/black/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TLF/black/sc
+      <-> alias * MontserratAlternates-TLF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TLF/b/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{n}{
       <-> ssub * MontserratAlternates-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-TLF/b/sc
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{scit}{
       <-> ssub * MontserratAlternates-TLF/b/scit
 }{}
@@ -512,14 +501,6 @@
       <-> ssub * MontserratAlternates-TLF/b/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-TLF/b/sc
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TLF/b/sl
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TLF}{bx}{it}{
       <-> ssub * MontserratAlternates-TLF/b/it
 }{}
diff --git a/fonts/montserrat/tex/LY1MontserratAlternates-TOsF.fd b/fonts/montserrat/tex/LY1MontserratAlternates-TOsF.fd
index fa8343f4ef..6a27bde81a 100644
--- a/fonts/montserrat/tex/LY1MontserratAlternates-TOsF.fd
+++ b/fonts/montserrat/tex/LY1MontserratAlternates-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{LY1MontserratAlternates-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for LY1/MontserratAlternates-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for LY1/MontserratAlternates-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,84 +20,84 @@
 \DeclareFontFamily{LY1}{MontserratAlternates-TOsF}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/semibold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/light/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extrabold/it
 }{}
 
 
@@ -99,14 +107,14 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ly1
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ly1
 }{}
 
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ly1
+}{}
+
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{medium}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-ly1
 }{}
@@ -120,118 +128,118 @@
 }{}
 
 
-%   ----  semibold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  black  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/black/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/thin/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/light/it
 }{}
 
 
 %   ----  extralight  ----
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{n}{
@@ -242,8 +250,8 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ly1
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ly1
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{extralight}{scsl}{
@@ -255,273 +263,246 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{n}{
+      <-> alias * MontserratAlternates-TOsF/thin/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{sc}{
+      <-> alias * MontserratAlternates-TOsF/thin/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scit}{
+      <-> alias * MontserratAlternates-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TOsF/thin/n
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ul}{it}{
+      <-> alias * MontserratAlternates-TOsF/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sc}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/n
+      <-> alias * MontserratAlternates-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+      <-> alias * MontserratAlternates-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{el}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extralight/scit
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/light/scsl
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/light/scit
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{n}{
-      <-> ssub * MontserratAlternates-TOsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{it}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/light/sc
+      <-> alias * MontserratAlternates-TOsF/light/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/sl
+      <-> alias * MontserratAlternates-TOsF/light/sl
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TOsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{sc}{
+      <-> alias * MontserratAlternates-TOsF/light/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scit}{
+      <-> alias * MontserratAlternates-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/light/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{l}{it}{
+      <-> alias * MontserratAlternates-TOsF/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sl}{
+      <-> alias * MontserratAlternates-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{n}{
-      <-> ssub * MontserratAlternates-TOsF/medium/n
+      <-> alias * MontserratAlternates-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sc}{
+      <-> alias * MontserratAlternates-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{it}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scit}{
+      <-> alias * MontserratAlternates-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{m}{it}{
+      <-> alias * MontserratAlternates-TOsF/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{it}{
+      <-> alias * MontserratAlternates-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{n}{
+      <-> alias * MontserratAlternates-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sc
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scit}{
+      <-> alias * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{n}{
-      <-> ssub * MontserratAlternates-TOsF/bold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{it}{
+      <-> alias * MontserratAlternates-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{it}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sl}{
+      <-> alias * MontserratAlternates-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{n}{
+      <-> alias * MontserratAlternates-TOsF/bold/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{b}{sc}{
+      <-> alias * MontserratAlternates-TOsF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sc}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/n
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{n}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/n
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+      <-> alias * MontserratAlternates-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TOsF/black/n
+      <-> alias * MontserratAlternates-TOsF/black/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-TOsF/black/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scsl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-TOsF/black/sc
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/sl
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scit}{
+      <-> alias * MontserratAlternates-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/black/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/black/scsl
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
-}{}
-
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/b/scsl
+      <-> alias * MontserratAlternates-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/b/scit
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-TOsF/b/sc
 }{}
 
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{n}{
       <-> ssub * MontserratAlternates-TOsF/b/n
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{it}{
-      <-> ssub * MontserratAlternates-TOsF/b/it
-}{}
-
 \DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{sl}{
       <-> ssub * MontserratAlternates-TOsF/b/sl
 }{}
 
-\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/b/sc
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{it}{
+      <-> ssub * MontserratAlternates-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MontserratAlternates-TOsF}{bx}{scit}{
+      <-> ssub * MontserratAlternates-TOsF/b/scit
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/OT1Montserrat-Dnom.fd b/fonts/montserrat/tex/OT1Montserrat-Dnom.fd
index daecd99d25..a3209027e8 100644
--- a/fonts/montserrat/tex/OT1Montserrat-Dnom.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,18 +20,18 @@
 \DeclareFontFamily{OT1}{Montserrat-Dnom}{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{sl}{
+      <-> ssub * Montserrat-Dnom/bold/it
 }{}
 
 
@@ -42,246 +50,235 @@
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{sl}{
+      <-> ssub * Montserrat-Dnom/medium/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{sl}{
+      <-> ssub * Montserrat-Dnom/thin/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{bold}{sl}{
-      <-> ssub * Montserrat-Dnom/bold/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{sl}{
+      <-> ssub * Montserrat-Dnom/light/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{sl}{
-      <-> ssub * Montserrat-Dnom/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extralight}{sl}{
+      <-> ssub * Montserrat-Dnom/extralight/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{thin}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{extrabold}{sl}{
+      <-> ssub * Montserrat-Dnom/extrabold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{medium}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{regular}{sl}{
+      <-> ssub * Montserrat-Dnom/regular/it
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-dnom-ot1
+\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{light}{sl}{
-      <-> ssub * Montserrat-Dnom/light/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{semibold}{sl}{
+      <-> ssub * Montserrat-Dnom/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{it}{
-      <-> ssub * Montserrat-Dnom/thin/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{n}{
+      <-> alias * Montserrat-Dnom/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/sl
+\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{it}{
+      <-> alias * Montserrat-Dnom/thin/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{n}{
-      <-> ssub * Montserrat-Dnom/thin/n
+\DeclareFontShape{OT1}{Montserrat-Dnom}{ul}{sl}{
+      <-> alias * Montserrat-Dnom/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{n}{
-      <-> ssub * Montserrat-Dnom/extralight/n
+\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{it}{
+      <-> alias * Montserrat-Dnom/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{n}{
+      <-> alias * Montserrat-Dnom/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{it}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{el}{sl}{
+      <-> alias * Montserrat-Dnom/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{sl}{
-      <-> ssub * Montserrat-Dnom/light/sl
+\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{it}{
+      <-> alias * Montserrat-Dnom/light/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{l}{n}{
-      <-> ssub * Montserrat-Dnom/light/n
+      <-> alias * Montserrat-Dnom/light/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{it}{
-      <-> ssub * Montserrat-Dnom/light/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{l}{sl}{
+      <-> alias * Montserrat-Dnom/light/sl
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{n}{
-      <-> ssub * Montserrat-Dnom/regular/n
-}{}
+%   m --> regular
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/sl
+\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{sl}{
+      <-> alias * Montserrat-Dnom/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{sl}{it}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{it}{
+      <-> alias * Montserrat-Dnom/regular/it
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{OT1}{Montserrat-Dnom}{m}{n}{
-      <-> ssub * Montserrat-Dnom/medium/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Dnom}{m}{it}{
-      <-> ssub * Montserrat-Dnom/medium/it
+      <-> alias * Montserrat-Dnom/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{it}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+      <-> alias * Montserrat-Dnom/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{n}{
-      <-> ssub * Montserrat-Dnom/semibold/n
+      <-> alias * Montserrat-Dnom/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{sb}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/sl
+      <-> alias * Montserrat-Dnom/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{it}{
-      <-> ssub * Montserrat-Dnom/bold/it
+\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{n}{
+      <-> alias * Montserrat-Dnom/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{n}{
-      <-> ssub * Montserrat-Dnom/bold/n
+\DeclareFontShape{OT1}{Montserrat-Dnom}{b}{it}{
+      <-> alias * Montserrat-Dnom/bold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{b}{sl}{
-      <-> ssub * Montserrat-Dnom/bold/sl
+      <-> alias * Montserrat-Dnom/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{sl}{
-      <-> ssub * Montserrat-Dnom/extrabold/sl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{n}{
-      <-> ssub * Montserrat-Dnom/extrabold/n
+      <-> alias * Montserrat-Dnom/extrabold/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{it}{
-      <-> ssub * Montserrat-Dnom/extrabold/it
+      <-> alias * Montserrat-Dnom/extrabold/it
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Dnom}{eb}{sl}{
+      <-> alias * Montserrat-Dnom/extrabold/sl
+}{}
 
-%   ub --> black
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{sl}{
-      <-> ssub * Montserrat-Dnom/black/sl
-}{}
+%   ub --> black
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{n}{
-      <-> ssub * Montserrat-Dnom/black/n
+      <-> alias * Montserrat-Dnom/black/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{it}{
-      <-> ssub * Montserrat-Dnom/black/it
+      <-> alias * Montserrat-Dnom/black/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Dnom}{ub}{sl}{
+      <-> alias * Montserrat-Dnom/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{n}{
+      <-> ssub * Montserrat-Dnom/b/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{it}{
@@ -292,8 +289,4 @@
       <-> ssub * Montserrat-Dnom/b/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Dnom}{bx}{n}{
-      <-> ssub * Montserrat-Dnom/b/n
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/OT1Montserrat-Inf.fd b/fonts/montserrat/tex/OT1Montserrat-Inf.fd
index 208f9621a9..c95c999d19 100644
--- a/fonts/montserrat/tex/OT1Montserrat-Inf.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -14,89 +22,89 @@
 
 %   ----  thin  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-inf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Inf}{thin}{it}{
       <-> \Montserrat@@scale Montserrat-ThinItalic-inf-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Inf}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-inf-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Inf}{thin}{sl}{
       <-> ssub * Montserrat-Inf/thin/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{sl}{
-      <-> ssub * Montserrat-Inf/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{light}{sl}{
+      <-> ssub * Montserrat-Inf/light/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{sl}{
-      <-> ssub * Montserrat-Inf/medium/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{sl}{
+      <-> ssub * Montserrat-Inf/extralight/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{light}{sl}{
-      <-> ssub * Montserrat-Inf/light/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{sl}{
+      <-> ssub * Montserrat-Inf/bold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{extralight}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{medium}{sl}{
+      <-> ssub * Montserrat-Inf/medium/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Inf}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-inf-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Inf}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Inf}{black}{sl}{
       <-> ssub * Montserrat-Inf/black/it
 }{}
@@ -104,194 +112,179 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-inf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Inf}{regular}{n}{
       <-> \Montserrat@@scale Montserrat-Regular-inf-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Inf}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-inf-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Inf}{regular}{sl}{
       <-> ssub * Montserrat-Inf/regular/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{bold}{sl}{
-      <-> ssub * Montserrat-Inf/bold/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{sl}{
+      <-> ssub * Montserrat-Inf/semibold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-inf-ot1
+\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{semibold}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{extrabold}{sl}{
+      <-> ssub * Montserrat-Inf/extrabold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{ul}{it}{
-      <-> ssub * Montserrat-Inf/thin/it
+      <-> alias * Montserrat-Inf/thin/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{ul}{n}{
-      <-> ssub * Montserrat-Inf/thin/n
+      <-> alias * Montserrat-Inf/thin/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{ul}{sl}{
-      <-> ssub * Montserrat-Inf/thin/sl
+      <-> alias * Montserrat-Inf/thin/sl
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{el}{it}{
-      <-> ssub * Montserrat-Inf/extralight/it
+      <-> alias * Montserrat-Inf/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{el}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-Inf}{el}{n}{
+      <-> alias * Montserrat-Inf/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{el}{n}{
-      <-> ssub * Montserrat-Inf/extralight/n
+\DeclareFontShape{OT1}{Montserrat-Inf}{el}{sl}{
+      <-> alias * Montserrat-Inf/extralight/sl
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{l}{it}{
-      <-> ssub * Montserrat-Inf/light/it
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Inf}{l}{sl}{
-      <-> ssub * Montserrat-Inf/light/sl
+      <-> alias * Montserrat-Inf/light/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{l}{n}{
-      <-> ssub * Montserrat-Inf/light/n
+      <-> alias * Montserrat-Inf/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{sl}{
-      <-> ssub * Montserrat-Inf/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{n}{
-      <-> ssub * Montserrat-Inf/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Inf}{sl}{it}{
-      <-> ssub * Montserrat-Inf/regular/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{l}{sl}{
+      <-> alias * Montserrat-Inf/light/sl
 }{}
 
 
-%   m --> medium
-
-\DeclareFontShape{OT1}{Montserrat-Inf}{m}{sl}{
-      <-> ssub * Montserrat-Inf/medium/sl
-}{}
+%   m --> regular
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{m}{n}{
-      <-> ssub * Montserrat-Inf/medium/n
+      <-> alias * Montserrat-Inf/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{m}{it}{
-      <-> ssub * Montserrat-Inf/medium/it
+      <-> alias * Montserrat-Inf/regular/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Inf}{m}{sl}{
+      <-> alias * Montserrat-Inf/regular/sl
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{sb}{it}{
-      <-> ssub * Montserrat-Inf/semibold/it
+      <-> alias * Montserrat-Inf/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/sl
+\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{n}{
+      <-> alias * Montserrat-Inf/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{n}{
-      <-> ssub * Montserrat-Inf/semibold/n
+\DeclareFontShape{OT1}{Montserrat-Inf}{sb}{sl}{
+      <-> alias * Montserrat-Inf/semibold/sl
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{b}{it}{
-      <-> ssub * Montserrat-Inf/bold/it
+      <-> alias * Montserrat-Inf/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{b}{sl}{
-      <-> ssub * Montserrat-Inf/bold/sl
+\DeclareFontShape{OT1}{Montserrat-Inf}{b}{n}{
+      <-> alias * Montserrat-Inf/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{b}{n}{
-      <-> ssub * Montserrat-Inf/bold/n
+\DeclareFontShape{OT1}{Montserrat-Inf}{b}{sl}{
+      <-> alias * Montserrat-Inf/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{it}{
-      <-> ssub * Montserrat-Inf/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{sl}{
+      <-> alias * Montserrat-Inf/extrabold/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{eb}{n}{
-      <-> ssub * Montserrat-Inf/extrabold/n
+      <-> alias * Montserrat-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{sl}{
-      <-> ssub * Montserrat-Inf/extrabold/sl
+\DeclareFontShape{OT1}{Montserrat-Inf}{eb}{it}{
+      <-> alias * Montserrat-Inf/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{n}{
-      <-> ssub * Montserrat-Inf/black/n
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Inf}{ub}{sl}{
-      <-> ssub * Montserrat-Inf/black/sl
+      <-> alias * Montserrat-Inf/black/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{it}{
-      <-> ssub * Montserrat-Inf/black/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{n}{
+      <-> alias * Montserrat-Inf/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Inf}{bx}{it}{
-      <-> ssub * Montserrat-Inf/b/it
+\DeclareFontShape{OT1}{Montserrat-Inf}{ub}{it}{
+      <-> alias * Montserrat-Inf/black/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Inf}{bx}{sl}{
       <-> ssub * Montserrat-Inf/b/sl
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Inf}{bx}{it}{
+      <-> ssub * Montserrat-Inf/b/it
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Inf}{bx}{n}{
       <-> ssub * Montserrat-Inf/b/n
 }{}
diff --git a/fonts/montserrat/tex/OT1Montserrat-LF.fd b/fonts/montserrat/tex/OT1Montserrat-LF.fd
index 4faf2707ff..cd3da4402e 100644
--- a/fonts/montserrat/tex/OT1Montserrat-LF.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-LF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -14,14 +22,14 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-LF}{bold}{scit}{
       <-> \Montserrat@@scale Montserrat-BoldItalic-lf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-LF}{bold}{n}{
       <-> \Montserrat@@scale Montserrat-Bold-lf-ot1
 }{}
@@ -30,106 +38,98 @@
       <-> \Montserrat@@scale Montserrat-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{bold}{sl}{
-      <-> ssub * Montserrat-LF/bold/it
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-LF}{bold}{scsl}{
       <-> ssub * Montserrat-LF/bold/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{bold}{sl}{
+      <-> ssub * Montserrat-LF/bold/it
+}{}
 
-%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ot1
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sl}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scsl}{
+      <-> ssub * Montserrat-LF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sl}{
+      <-> ssub * Montserrat-LF/medium/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{black}{it}{
       <-> \Montserrat@@scale Montserrat-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-lf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-LF}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{black}{sl}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{OT1}{Montserrat-LF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{black}{scsl}{
       <-> ssub * Montserrat-LF/black/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{black}{sl}{
+      <-> ssub * Montserrat-LF/black/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-lf-ot1
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sl}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scsl}{
+      <-> ssub * Montserrat-LF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scsl}{
-      <-> ssub * Montserrat-LF/regular/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sl}{
+      <-> ssub * Montserrat-LF/thin/it
 }{}
 
 
 %   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-LF}{extralight}{scit}{
       <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-ot1
 }{}
@@ -138,19 +138,27 @@
       <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sl}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{extralight}{scsl}{
       <-> ssub * Montserrat-LF/extralight/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{extralight}{sl}{
+      <-> ssub * Montserrat-LF/extralight/it
+}{}
+
 
 %   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{light}{it}{
@@ -161,367 +169,340 @@
       <-> \Montserrat@@scale Montserrat-Light-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{light}{sl}{
-      <-> ssub * Montserrat-LF/light/it
+\DeclareFontShape{OT1}{Montserrat-LF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{light}{scsl}{
       <-> ssub * Montserrat-LF/light/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{light}{sl}{
+      <-> ssub * Montserrat-LF/light/it
+}{}
+
 
-%   ----  medium  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{sl}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{medium}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sl}{
+      <-> ssub * Montserrat-LF/extrabold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{scsl}{
+      <-> ssub * Montserrat-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-LF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{semibold}{sl}{
+      <-> ssub * Montserrat-LF/semibold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-lf-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-lf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{sl}{
-      <-> ssub * Montserrat-LF/thin/it
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{scsl}{
+      <-> ssub * Montserrat-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{thin}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{regular}{sl}{
+      <-> ssub * Montserrat-LF/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
+\DeclareFontShape{OT1}{Montserrat-LF}{ul}{sc}{
+      <-> alias * Montserrat-LF/thin/sc
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-LF}{ul}{n}{
-      <-> ssub * Montserrat-LF/thin/n
+      <-> alias * Montserrat-LF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ul}{sc}{
-      <-> ssub * Montserrat-LF/thin/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{ul}{it}{
+      <-> alias * Montserrat-LF/thin/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{ul}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scsl
+      <-> alias * Montserrat-LF/thin/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{ul}{sl}{
-      <-> ssub * Montserrat-LF/thin/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{ul}{it}{
-      <-> ssub * Montserrat-LF/thin/it
+      <-> alias * Montserrat-LF/thin/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{ul}{scit}{
-      <-> ssub * Montserrat-LF/thin/scit
+      <-> alias * Montserrat-LF/thin/scit
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-LF}{el}{sl}{
-      <-> ssub * Montserrat-LF/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-LF}{el}{scsl}{
+      <-> alias * Montserrat-LF/extralight/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{el}{sc}{
-      <-> ssub * Montserrat-LF/extralight/sc
+      <-> alias * Montserrat-LF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{el}{n}{
-      <-> ssub * Montserrat-LF/extralight/n
+\DeclareFontShape{OT1}{Montserrat-LF}{el}{it}{
+      <-> alias * Montserrat-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{el}{scsl}{
-      <-> ssub * Montserrat-LF/extralight/scsl
+\DeclareFontShape{OT1}{Montserrat-LF}{el}{n}{
+      <-> alias * Montserrat-LF/extralight/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{el}{scit}{
-      <-> ssub * Montserrat-LF/extralight/scit
+      <-> alias * Montserrat-LF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{el}{it}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-LF}{el}{sl}{
+      <-> alias * Montserrat-LF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-LF}{l}{n}{
-      <-> ssub * Montserrat-LF/light/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{l}{sc}{
-      <-> ssub * Montserrat-LF/light/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{l}{scsl}{
-      <-> ssub * Montserrat-LF/light/scsl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-LF}{l}{sl}{
-      <-> ssub * Montserrat-LF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{l}{it}{
-      <-> ssub * Montserrat-LF/light/it
+      <-> alias * Montserrat-LF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{l}{scit}{
-      <-> ssub * Montserrat-LF/light/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{scsl}{
-      <-> ssub * Montserrat-LF/regular/scsl
+      <-> alias * Montserrat-LF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{sc}{
-      <-> ssub * Montserrat-LF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{n}{
-      <-> ssub * Montserrat-LF/regular/n
+\DeclareFontShape{OT1}{Montserrat-LF}{l}{sc}{
+      <-> alias * Montserrat-LF/light/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{sl}{
-      <-> ssub * Montserrat-LF/regular/sl
+\DeclareFontShape{OT1}{Montserrat-LF}{l}{it}{
+      <-> alias * Montserrat-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{it}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{OT1}{Montserrat-LF}{l}{n}{
+      <-> alias * Montserrat-LF/light/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sl}{scit}{
-      <-> ssub * Montserrat-LF/regular/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{l}{scsl}{
+      <-> alias * Montserrat-LF/light/scsl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{Montserrat-LF}{m}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scsl
+      <-> alias * Montserrat-LF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{m}{sc}{
-      <-> ssub * Montserrat-LF/medium/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{m}{it}{
+      <-> alias * Montserrat-LF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{m}{n}{
-      <-> ssub * Montserrat-LF/medium/n
+      <-> alias * Montserrat-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{m}{sl}{
-      <-> ssub * Montserrat-LF/medium/sl
+\DeclareFontShape{OT1}{Montserrat-LF}{m}{sc}{
+      <-> alias * Montserrat-LF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{m}{it}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{OT1}{Montserrat-LF}{m}{scit}{
+      <-> alias * Montserrat-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{m}{scit}{
-      <-> ssub * Montserrat-LF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{m}{sl}{
+      <-> alias * Montserrat-LF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scit}{
-      <-> ssub * Montserrat-LF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scsl}{
+      <-> alias * Montserrat-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{it}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sc}{
+      <-> alias * Montserrat-LF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sl}{
-      <-> ssub * Montserrat-LF/semibold/sl
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{it}{
+      <-> alias * Montserrat-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scsl
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{n}{
+      <-> alias * Montserrat-LF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{n}{
-      <-> ssub * Montserrat-LF/semibold/n
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{scit}{
+      <-> alias * Montserrat-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sc}{
-      <-> ssub * Montserrat-LF/semibold/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{sb}{sl}{
+      <-> alias * Montserrat-LF/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{Montserrat-LF}{b}{n}{
-      <-> ssub * Montserrat-LF/bold/n
+\DeclareFontShape{OT1}{Montserrat-LF}{b}{scit}{
+      <-> alias * Montserrat-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{b}{sc}{
-      <-> ssub * Montserrat-LF/bold/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{b}{sl}{
+      <-> alias * Montserrat-LF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{b}{scsl}{
-      <-> ssub * Montserrat-LF/bold/scsl
+      <-> alias * Montserrat-LF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{b}{sl}{
-      <-> ssub * Montserrat-LF/bold/sl
+\DeclareFontShape{OT1}{Montserrat-LF}{b}{it}{
+      <-> alias * Montserrat-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{b}{it}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{OT1}{Montserrat-LF}{b}{n}{
+      <-> alias * Montserrat-LF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{b}{scit}{
-      <-> ssub * Montserrat-LF/bold/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{b}{sc}{
+      <-> alias * Montserrat-LF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-LF}{eb}{it}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scsl}{
+      <-> alias * Montserrat-LF/extrabold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scit}{
-      <-> ssub * Montserrat-LF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sc}{
+      <-> alias * Montserrat-LF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{eb}{sc}{
-      <-> ssub * Montserrat-LF/extrabold/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{eb}{it}{
+      <-> alias * Montserrat-LF/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{eb}{n}{
-      <-> ssub * Montserrat-LF/extrabold/n
+      <-> alias * Montserrat-LF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scsl}{
-      <-> ssub * Montserrat-LF/extrabold/scsl
+\DeclareFontShape{OT1}{Montserrat-LF}{eb}{scit}{
+      <-> alias * Montserrat-LF/extrabold/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{eb}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/sl
+      <-> alias * Montserrat-LF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{OT1}{Montserrat-LF}{ub}{sl}{
-      <-> ssub * Montserrat-LF/black/sl
+      <-> alias * Montserrat-LF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ub}{sc}{
-      <-> ssub * Montserrat-LF/black/sc
+\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scit}{
+      <-> alias * Montserrat-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ub}{n}{
-      <-> ssub * Montserrat-LF/black/n
+\DeclareFontShape{OT1}{Montserrat-LF}{ub}{it}{
+      <-> alias * Montserrat-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scsl}{
-      <-> ssub * Montserrat-LF/black/scsl
+\DeclareFontShape{OT1}{Montserrat-LF}{ub}{n}{
+      <-> alias * Montserrat-LF/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scit}{
-      <-> ssub * Montserrat-LF/black/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{ub}{sc}{
+      <-> alias * Montserrat-LF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{ub}{it}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{OT1}{Montserrat-LF}{ub}{scsl}{
+      <-> alias * Montserrat-LF/black/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{bx}{sl}{
       <-> ssub * Montserrat-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scsl}{
-      <-> ssub * Montserrat-LF/b/scsl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-LF}{bx}{n}{
-      <-> ssub * Montserrat-LF/b/n
+\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scit}{
+      <-> ssub * Montserrat-LF/b/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{bx}{sc}{
       <-> ssub * Montserrat-LF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scit}{
-      <-> ssub * Montserrat-LF/b/scit
+\DeclareFontShape{OT1}{Montserrat-LF}{bx}{n}{
+      <-> ssub * Montserrat-LF/b/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-LF}{bx}{it}{
       <-> ssub * Montserrat-LF/b/it
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-LF}{bx}{scsl}{
+      <-> ssub * Montserrat-LF/b/scsl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/OT1Montserrat-Numr.fd b/fonts/montserrat/tex/OT1Montserrat-Numr.fd
index dbde1dc62f..5333b4107a 100644
--- a/fonts/montserrat/tex/OT1Montserrat-Numr.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,78 +20,78 @@
 \DeclareFontFamily{OT1}{Montserrat-Numr}{}
 
 
-%   ----  extralight  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{black}{sl}{
+      <-> ssub * Montserrat-Numr/black/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{sl}{
-      <-> ssub * Montserrat-Numr/regular/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{sl}{
+      <-> ssub * Montserrat-Numr/medium/it
 }{}
 
 
-%   ----  black  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{black}{sl}{
-      <-> ssub * Montserrat-Numr/black/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{sl}{
+      <-> ssub * Montserrat-Numr/bold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{light}{sl}{
+      <-> ssub * Montserrat-Numr/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{bold}{sl}{
-      <-> ssub * Montserrat-Numr/bold/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{extralight}{sl}{
+      <-> ssub * Montserrat-Numr/extralight/it
 }{}
 
 
@@ -117,183 +125,168 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{light}{sl}{
-      <-> ssub * Montserrat-Numr/light/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{semibold}{sl}{
+      <-> ssub * Montserrat-Numr/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-ot1
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{medium}{sl}{
-      <-> ssub * Montserrat-Numr/medium/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{regular}{sl}{
+      <-> ssub * Montserrat-Numr/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{sl}{
-      <-> ssub * Montserrat-Numr/thin/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{it}{
+      <-> alias * Montserrat-Numr/thin/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{ul}{n}{
-      <-> ssub * Montserrat-Numr/thin/n
+      <-> alias * Montserrat-Numr/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{it}{
-      <-> ssub * Montserrat-Numr/thin/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{ul}{sl}{
+      <-> alias * Montserrat-Numr/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{
-      <-> ssub * Montserrat-Numr/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{
+      <-> alias * Montserrat-Numr/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{it}{
+      <-> alias * Montserrat-Numr/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{el}{n}{
-      <-> ssub * Montserrat-Numr/extralight/n
+\DeclareFontShape{OT1}{Montserrat-Numr}{el}{sl}{
+      <-> alias * Montserrat-Numr/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{
-      <-> ssub * Montserrat-Numr/light/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{
+      <-> alias * Montserrat-Numr/light/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{l}{sl}{
-      <-> ssub * Montserrat-Numr/light/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{l}{it}{
+      <-> alias * Montserrat-Numr/light/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{l}{n}{
-      <-> ssub * Montserrat-Numr/light/n
+      <-> alias * Montserrat-Numr/light/n
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{it}{
-      <-> ssub * Montserrat-Numr/regular/it
-}{}
+%   m --> regular
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{sl}{
-      <-> ssub * Montserrat-Numr/regular/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{m}{sl}{
+      <-> alias * Montserrat-Numr/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sl}{n}{
-      <-> ssub * Montserrat-Numr/regular/n
+\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{
+      <-> alias * Montserrat-Numr/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{OT1}{Montserrat-Numr}{m}{it}{
-      <-> ssub * Montserrat-Numr/medium/it
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Numr}{m}{sl}{
-      <-> ssub * Montserrat-Numr/medium/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Numr}{m}{n}{
-      <-> ssub * Montserrat-Numr/medium/n
+      <-> alias * Montserrat-Numr/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{
-      <-> ssub * Montserrat-Numr/semibold/n
+\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{
+      <-> alias * Montserrat-Numr/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{sb}{n}{
+      <-> alias * Montserrat-Numr/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{sb}{it}{
-      <-> ssub * Montserrat-Numr/semibold/it
+      <-> alias * Montserrat-Numr/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{b}{it}{
-      <-> ssub * Montserrat-Numr/bold/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{
+      <-> alias * Montserrat-Numr/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{
-      <-> ssub * Montserrat-Numr/bold/n
+\DeclareFontShape{OT1}{Montserrat-Numr}{b}{it}{
+      <-> alias * Montserrat-Numr/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{b}{sl}{
-      <-> ssub * Montserrat-Numr/bold/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{b}{n}{
+      <-> alias * Montserrat-Numr/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{
-      <-> ssub * Montserrat-Numr/extrabold/it
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Numr}{eb}{sl}{
-      <-> ssub * Montserrat-Numr/extrabold/sl
+      <-> alias * Montserrat-Numr/extrabold/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{eb}{n}{
-      <-> ssub * Montserrat-Numr/extrabold/n
+      <-> alias * Montserrat-Numr/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-Numr}{eb}{it}{
+      <-> alias * Montserrat-Numr/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{it}{
-      <-> ssub * Montserrat-Numr/black/it
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{n}{
+      <-> alias * Montserrat-Numr/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{sl}{
-      <-> ssub * Montserrat-Numr/black/sl
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{it}{
+      <-> alias * Montserrat-Numr/black/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{n}{
-      <-> ssub * Montserrat-Numr/black/n
+\DeclareFontShape{OT1}{Montserrat-Numr}{ub}{sl}{
+      <-> alias * Montserrat-Numr/black/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Numr}{bx}{n}{
       <-> ssub * Montserrat-Numr/b/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{sl}{
-      <-> ssub * Montserrat-Numr/b/sl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Numr}{bx}{it}{
       <-> ssub * Montserrat-Numr/b/it
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Numr}{bx}{sl}{
+      <-> ssub * Montserrat-Numr/b/sl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/OT1Montserrat-OsF.fd b/fonts/montserrat/tex/OT1Montserrat-OsF.fd
index 95e017aa95..a5a5f413c1 100644
--- a/fonts/montserrat/tex/OT1Montserrat-OsF.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,502 +20,475 @@
 \DeclareFontFamily{OT1}{Montserrat-OsF}{}
 
 
-%   ----  medium  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sl}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-OsF/extrabold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sl}{
-      <-> ssub * Montserrat-OsF/light/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sl}{
+      <-> ssub * Montserrat-OsF/semibold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sl}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scsl}{
+      <-> ssub * Montserrat-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sl}{
+      <-> ssub * Montserrat-OsF/regular/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scsl}{
+      <-> ssub * Montserrat-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sl}{
+      <-> ssub * Montserrat-OsF/black/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{scsl}{
+      <-> ssub * Montserrat-OsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{medium}{sl}{
+      <-> ssub * Montserrat-OsF/medium/it
 }{}
 
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-OsF}{bold}{sc}{
       <-> \Montserrat@@scale Montserrat-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-OsF}{bold}{it}{
       <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{sl}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{bold}{scsl}{
       <-> ssub * Montserrat-OsF/bold/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-OsF}{bold}{sl}{
+      <-> ssub * Montserrat-OsF/bold/it
+}{}
+
 
 %   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{n}{
       <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{scsl}{
       <-> ssub * Montserrat-OsF/extralight/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-OsF}{extralight}{sl}{
+      <-> ssub * Montserrat-OsF/extralight/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-ot1
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{sl}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{scsl}{
+      <-> ssub * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{regular}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{light}{sl}{
+      <-> ssub * Montserrat-OsF/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{sl}{
-      <-> ssub * Montserrat-OsF/black/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{scsl}{
+      <-> ssub * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{black}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{thin}{sl}{
+      <-> ssub * Montserrat-OsF/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{n}{
-      <-> ssub * Montserrat-OsF/thin/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scsl}{
+      <-> alias * Montserrat-OsF/thin/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{ul}{sc}{
-      <-> ssub * Montserrat-OsF/thin/sc
+      <-> alias * Montserrat-OsF/thin/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{it}{
+      <-> alias * Montserrat-OsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{sl}{
-      <-> ssub * Montserrat-OsF/thin/sl
+\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{n}{
+      <-> alias * Montserrat-OsF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{it}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scit}{
+      <-> alias * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{scit}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{ul}{sl}{
+      <-> alias * Montserrat-OsF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sc}{
+      <-> alias * Montserrat-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{el}{n}{
-      <-> ssub * Montserrat-OsF/extralight/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{el}{it}{
+      <-> alias * Montserrat-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sc}{
-      <-> ssub * Montserrat-OsF/extralight/sc
+\DeclareFontShape{OT1}{Montserrat-OsF}{el}{n}{
+      <-> alias * Montserrat-OsF/extralight/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{el}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scsl
+      <-> alias * Montserrat-OsF/extralight/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scit}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{el}{sl}{
+      <-> alias * Montserrat-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{el}{it}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{el}{scit}{
+      <-> alias * Montserrat-OsF/extralight/scit
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{l}{n}{
-      <-> ssub * Montserrat-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{l}{sc}{
-      <-> ssub * Montserrat-OsF/light/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{l}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scsl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-OsF}{l}{sl}{
-      <-> ssub * Montserrat-OsF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{l}{it}{
-      <-> ssub * Montserrat-OsF/light/it
+      <-> alias * Montserrat-OsF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{l}{scit}{
-      <-> ssub * Montserrat-OsF/light/scit
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{scit}{
-      <-> ssub * Montserrat-OsF/regular/scit
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{it}{
-      <-> ssub * Montserrat-OsF/regular/it
+      <-> alias * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{sl}{
-      <-> ssub * Montserrat-OsF/regular/sl
+\DeclareFontShape{OT1}{Montserrat-OsF}{l}{sc}{
+      <-> alias * Montserrat-OsF/light/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{l}{it}{
+      <-> alias * Montserrat-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{n}{
-      <-> ssub * Montserrat-OsF/regular/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{l}{n}{
+      <-> alias * Montserrat-OsF/light/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sl}{sc}{
-      <-> ssub * Montserrat-OsF/regular/sc
+\DeclareFontShape{OT1}{Montserrat-OsF}{l}{scsl}{
+      <-> alias * Montserrat-OsF/light/scsl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{m}{sl}{
-      <-> ssub * Montserrat-OsF/medium/sl
+      <-> alias * Montserrat-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{m}{n}{
-      <-> ssub * Montserrat-OsF/medium/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scit}{
+      <-> alias * Montserrat-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sc}{
-      <-> ssub * Montserrat-OsF/medium/sc
+\DeclareFontShape{OT1}{Montserrat-OsF}{m}{n}{
+      <-> alias * Montserrat-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{m}{it}{
+      <-> alias * Montserrat-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scit}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{m}{sc}{
+      <-> alias * Montserrat-OsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{m}{it}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{m}{scsl}{
+      <-> alias * Montserrat-OsF/regular/scsl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scit}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scsl}{
+      <-> alias * Montserrat-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{it}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sc}{
+      <-> alias * Montserrat-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/sl
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{n}{
+      <-> alias * Montserrat-OsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sc}{
-      <-> ssub * Montserrat-OsF/semibold/sc
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{it}{
+      <-> alias * Montserrat-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{n}{
-      <-> ssub * Montserrat-OsF/semibold/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scit}{
+      <-> alias * Montserrat-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{sb}{sl}{
+      <-> alias * Montserrat-OsF/semibold/sl
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{b}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scsl
+      <-> alias * Montserrat-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{b}{n}{
-      <-> ssub * Montserrat-OsF/bold/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{b}{it}{
+      <-> alias * Montserrat-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sc}{
-      <-> ssub * Montserrat-OsF/bold/sc
+\DeclareFontShape{OT1}{Montserrat-OsF}{b}{n}{
+      <-> alias * Montserrat-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sl}{
-      <-> ssub * Montserrat-OsF/bold/sl
+\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sc}{
+      <-> alias * Montserrat-OsF/bold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{b}{it}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scit}{
+      <-> alias * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{b}{scit}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{b}{sl}{
+      <-> alias * Montserrat-OsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scit}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{it}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+      <-> alias * Montserrat-OsF/extrabold/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/sl
+      <-> alias * Montserrat-OsF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{n}{
-      <-> ssub * Montserrat-OsF/extrabold/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scsl}{
+      <-> alias * Montserrat-OsF/extrabold/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{eb}{sc}{
-      <-> ssub * Montserrat-OsF/extrabold/sc
+      <-> alias * Montserrat-OsF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{n}{
+      <-> alias * Montserrat-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-OsF}{eb}{it}{
+      <-> alias * Montserrat-OsF/extrabold/it
 }{}
 
 
 %   ub --> black
 
+\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{scit}{
+      <-> alias * Montserrat-OsF/black/scit
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-OsF}{ub}{sl}{
-      <-> ssub * Montserrat-OsF/black/sl
+      <-> alias * Montserrat-OsF/black/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{ub}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scsl
+      <-> alias * Montserrat-OsF/black/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{ub}{sc}{
-      <-> ssub * Montserrat-OsF/black/sc
+      <-> alias * Montserrat-OsF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{n}{
-      <-> ssub * Montserrat-OsF/black/n
+\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{it}{
+      <-> alias * Montserrat-OsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{scit}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{n}{
+      <-> alias * Montserrat-OsF/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{ub}{it}{
-      <-> ssub * Montserrat-OsF/black/it
+\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scsl}{
+      <-> ssub * Montserrat-OsF/b/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{bx}{it}{
       <-> ssub * Montserrat-OsF/b/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scit}{
-      <-> ssub * Montserrat-OsF/b/scit
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-OsF}{bx}{n}{
       <-> ssub * Montserrat-OsF/b/n
 }{}
@@ -516,8 +497,8 @@
       <-> ssub * Montserrat-OsF/b/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scsl}{
-      <-> ssub * Montserrat-OsF/b/scsl
+\DeclareFontShape{OT1}{Montserrat-OsF}{bx}{scit}{
+      <-> ssub * Montserrat-OsF/b/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-OsF}{bx}{sl}{
diff --git a/fonts/montserrat/tex/OT1Montserrat-Sup.fd b/fonts/montserrat/tex/OT1Montserrat-Sup.fd
index b0c88156ee..fb8cec17aa 100644
--- a/fonts/montserrat/tex/OT1Montserrat-Sup.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,33 +20,33 @@
 \DeclareFontFamily{OT1}{Montserrat-Sup}{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{sl}{
+      <-> ssub * Montserrat-Sup/bold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{sl}{
-      <-> ssub * Montserrat-Sup/regular/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{sl}{
+      <-> ssub * Montserrat-Sup/medium/it
 }{}
 
 
@@ -57,241 +65,226 @@
 }{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{sl}{
-      <-> ssub * Montserrat-Sup/semibold/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{sl}{
+      <-> ssub * Montserrat-Sup/thin/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{bold}{sl}{
-      <-> ssub * Montserrat-Sup/bold/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{extralight}{sl}{
+      <-> ssub * Montserrat-Sup/extralight/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{thin}{sl}{
-      <-> ssub * Montserrat-Sup/thin/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{light}{sl}{
+      <-> ssub * Montserrat-Sup/light/it
 }{}
 
 
 %   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{n}{
       <-> \Montserrat@@scale Montserrat-ExtraBold-sup-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Sup}{extrabold}{sl}{
       <-> ssub * Montserrat-Sup/extrabold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{medium}{sl}{
-      <-> ssub * Montserrat-Sup/medium/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{semibold}{sl}{
+      <-> ssub * Montserrat-Sup/semibold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{light}{sl}{
-      <-> ssub * Montserrat-Sup/light/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{regular}{sl}{
+      <-> ssub * Montserrat-Sup/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{it}{
-      <-> ssub * Montserrat-Sup/thin/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{n}{
+      <-> alias * Montserrat-Sup/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{n}{
-      <-> ssub * Montserrat-Sup/thin/n
+\DeclareFontShape{OT1}{Montserrat-Sup}{ul}{it}{
+      <-> alias * Montserrat-Sup/thin/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{ul}{sl}{
-      <-> ssub * Montserrat-Sup/thin/sl
+      <-> alias * Montserrat-Sup/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{el}{n}{
-      <-> ssub * Montserrat-Sup/extralight/n
+\DeclareFontShape{OT1}{Montserrat-Sup}{el}{it}{
+      <-> alias * Montserrat-Sup/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{el}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-Sup}{el}{n}{
+      <-> alias * Montserrat-Sup/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{el}{it}{
-      <-> ssub * Montserrat-Sup/extralight/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{el}{sl}{
+      <-> alias * Montserrat-Sup/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{l}{it}{
-      <-> ssub * Montserrat-Sup/light/it
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Sup}{l}{sl}{
-      <-> ssub * Montserrat-Sup/light/sl
+      <-> alias * Montserrat-Sup/light/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{l}{n}{
-      <-> ssub * Montserrat-Sup/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{sl}{
-      <-> ssub * Montserrat-Sup/regular/sl
+      <-> alias * Montserrat-Sup/light/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{n}{
-      <-> ssub * Montserrat-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-Sup}{sl}{it}{
-      <-> ssub * Montserrat-Sup/regular/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{l}{it}{
+      <-> alias * Montserrat-Sup/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{m}{sl}{
-      <-> ssub * Montserrat-Sup/medium/sl
+\DeclareFontShape{OT1}{Montserrat-Sup}{m}{it}{
+      <-> alias * Montserrat-Sup/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{m}{n}{
-      <-> ssub * Montserrat-Sup/medium/n
+      <-> alias * Montserrat-Sup/regular/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{m}{it}{
-      <-> ssub * Montserrat-Sup/medium/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{m}{sl}{
+      <-> alias * Montserrat-Sup/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{n}{
-      <-> ssub * Montserrat-Sup/semibold/n
+\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{sl}{
+      <-> alias * Montserrat-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{sl}{
-      <-> ssub * Montserrat-Sup/semibold/sl
+\DeclareFontShape{OT1}{Montserrat-Sup}{sb}{n}{
+      <-> alias * Montserrat-Sup/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{sb}{it}{
-      <-> ssub * Montserrat-Sup/semibold/it
+      <-> alias * Montserrat-Sup/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{b}{it}{
-      <-> ssub * Montserrat-Sup/bold/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{b}{n}{
+      <-> alias * Montserrat-Sup/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{b}{n}{
-      <-> ssub * Montserrat-Sup/bold/n
+\DeclareFontShape{OT1}{Montserrat-Sup}{b}{it}{
+      <-> alias * Montserrat-Sup/bold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{b}{sl}{
-      <-> ssub * Montserrat-Sup/bold/sl
+      <-> alias * Montserrat-Sup/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{it}{
-      <-> ssub * Montserrat-Sup/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{sl}{
+      <-> alias * Montserrat-Sup/extrabold/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{eb}{n}{
-      <-> ssub * Montserrat-Sup/extrabold/n
+      <-> alias * Montserrat-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{sl}{
-      <-> ssub * Montserrat-Sup/extrabold/sl
+\DeclareFontShape{OT1}{Montserrat-Sup}{eb}{it}{
+      <-> alias * Montserrat-Sup/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{ub}{it}{
-      <-> ssub * Montserrat-Sup/black/it
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-Sup}{ub}{sl}{
-      <-> ssub * Montserrat-Sup/black/sl
+      <-> alias * Montserrat-Sup/black/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{ub}{n}{
-      <-> ssub * Montserrat-Sup/black/n
+      <-> alias * Montserrat-Sup/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-Sup}{bx}{n}{
-      <-> ssub * Montserrat-Sup/b/n
+\DeclareFontShape{OT1}{Montserrat-Sup}{ub}{it}{
+      <-> alias * Montserrat-Sup/black/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-Sup}{bx}{sl}{
       <-> ssub * Montserrat-Sup/b/sl
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-Sup}{bx}{n}{
+      <-> ssub * Montserrat-Sup/b/n
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-Sup}{bx}{it}{
       <-> ssub * Montserrat-Sup/b/it
 }{}
diff --git a/fonts/montserrat/tex/OT1Montserrat-TLF.fd b/fonts/montserrat/tex/OT1Montserrat-TLF.fd
index 09794a7d26..6132c75273 100644
--- a/fonts/montserrat/tex/OT1Montserrat-TLF.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,516 +20,489 @@
 \DeclareFontFamily{OT1}{Montserrat-TLF}{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scsl}{
+      <-> ssub * Montserrat-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sl}{
+      <-> ssub * Montserrat-TLF/regular/it
 }{}
 
 
-%   ----  black  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sl}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scsl}{
-      <-> ssub * Montserrat-TLF/black/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sl}{
+      <-> ssub * Montserrat-TLF/semibold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{sl}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{regular}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TLF/extrabold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sl}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scsl}{
+      <-> ssub * Montserrat-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sl}{
+      <-> ssub * Montserrat-TLF/thin/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scsl}{
+      <-> ssub * Montserrat-TLF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sl}{
+      <-> ssub * Montserrat-TLF/light/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{sl}{
-      <-> ssub * Montserrat-TLF/thin/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{thin}{scsl}{
-      <-> ssub * Montserrat-TLF/thin/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{extralight}{sl}{
+      <-> ssub * Montserrat-TLF/extralight/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{scsl}{
+      <-> ssub * Montserrat-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-TLF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{bold}{sl}{
+      <-> ssub * Montserrat-TLF/bold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{sl}{
-      <-> ssub * Montserrat-TLF/light/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{scsl}{
+      <-> ssub * Montserrat-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{light}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{black}{sl}{
+      <-> ssub * Montserrat-TLF/black/it
 }{}
 
 
 %   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{medium}{it}{
       <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-TLF}{medium}{n}{
       <-> \Montserrat@@scale Montserrat-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sl}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{medium}{scsl}{
       <-> ssub * Montserrat-TLF/medium/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-TLF}{medium}{sl}{
+      <-> ssub * Montserrat-TLF/medium/it
+}{}
+
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{n}{
-      <-> ssub * Montserrat-TLF/thin/n
+\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{scit}{
+      <-> alias * Montserrat-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sc}{
-      <-> ssub * Montserrat-TLF/thin/sc
+\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sl}{
+      <-> alias * Montserrat-TLF/thin/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ul}{scsl}{
-      <-> ssub * Montserrat-TLF/thin/scsl
+      <-> alias * Montserrat-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sl}{
-      <-> ssub * Montserrat-TLF/thin/sl
+\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{n}{
+      <-> alias * Montserrat-TLF/thin/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ul}{it}{
-      <-> ssub * Montserrat-TLF/thin/it
+      <-> alias * Montserrat-TLF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{scit}{
-      <-> ssub * Montserrat-TLF/thin/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{ul}{sc}{
+      <-> alias * Montserrat-TLF/thin/sc
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scsl
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sl}{
+      <-> alias * Montserrat-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sc}{
-      <-> ssub * Montserrat-TLF/extralight/sc
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scit}{
+      <-> alias * Montserrat-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{n}{
-      <-> ssub * Montserrat-TLF/extralight/n
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{it}{
+      <-> alias * Montserrat-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{n}{
+      <-> alias * Montserrat-TLF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{it}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{sc}{
+      <-> alias * Montserrat-TLF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scit}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{el}{scsl}{
+      <-> alias * Montserrat-TLF/extralight/scsl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sl}{
-      <-> ssub * Montserrat-TLF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scsl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-TLF}{l}{sc}{
-      <-> ssub * Montserrat-TLF/light/sc
+      <-> alias * Montserrat-TLF/light/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{l}{n}{
-      <-> ssub * Montserrat-TLF/light/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scit}{
-      <-> ssub * Montserrat-TLF/light/scit
+      <-> alias * Montserrat-TLF/light/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{l}{it}{
-      <-> ssub * Montserrat-TLF/light/it
+      <-> alias * Montserrat-TLF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{sc}{
-      <-> ssub * Montserrat-TLF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{n}{
-      <-> ssub * Montserrat-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scsl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{sl}{
-      <-> ssub * Montserrat-TLF/regular/sl
+\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scsl}{
+      <-> alias * Montserrat-TLF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{it}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{l}{sl}{
+      <-> alias * Montserrat-TLF/light/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{sl}{scit}{
-      <-> ssub * Montserrat-TLF/regular/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{l}{scit}{
+      <-> alias * Montserrat-TLF/light/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{m}{it}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scsl}{
+      <-> alias * Montserrat-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scit}{
-      <-> ssub * Montserrat-TLF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{m}{n}{
+      <-> alias * Montserrat-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scsl}{
-      <-> ssub * Montserrat-TLF/medium/scsl
+\DeclareFontShape{OT1}{Montserrat-TLF}{m}{it}{
+      <-> alias * Montserrat-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{m}{sc}{
-      <-> ssub * Montserrat-TLF/medium/sc
+      <-> alias * Montserrat-TLF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{m}{n}{
-      <-> ssub * Montserrat-TLF/medium/n
+\DeclareFontShape{OT1}{Montserrat-TLF}{m}{scit}{
+      <-> alias * Montserrat-TLF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{m}{sl}{
-      <-> ssub * Montserrat-TLF/medium/sl
+      <-> alias * Montserrat-TLF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/sl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sc}{
-      <-> ssub * Montserrat-TLF/semibold/sc
+      <-> alias * Montserrat-TLF/semibold/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{sb}{n}{
-      <-> ssub * Montserrat-TLF/semibold/n
+      <-> alias * Montserrat-TLF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{it}{
+      <-> alias * Montserrat-TLF/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scsl
+      <-> alias * Montserrat-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scit}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{sl}{
+      <-> alias * Montserrat-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{it}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{sb}{scit}{
+      <-> alias * Montserrat-TLF/semibold/scit
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{b}{scit}{
-      <-> ssub * Montserrat-TLF/bold/scit
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{b}{it}{
-      <-> ssub * Montserrat-TLF/bold/it
+      <-> alias * Montserrat-TLF/bold/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{b}{sl}{
-      <-> ssub * Montserrat-TLF/bold/sl
+      <-> alias * Montserrat-TLF/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{b}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scsl
+      <-> alias * Montserrat-TLF/bold/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{b}{sc}{
-      <-> ssub * Montserrat-TLF/bold/sc
+      <-> alias * Montserrat-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-TLF}{b}{it}{
+      <-> alias * Montserrat-TLF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{b}{n}{
-      <-> ssub * Montserrat-TLF/bold/n
+      <-> alias * Montserrat-TLF/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scit}{
-      <-> ssub * Montserrat-TLF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scsl}{
+      <-> alias * Montserrat-TLF/extrabold/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{it}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{n}{
+      <-> alias * Montserrat-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/sl
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{it}{
+      <-> alias * Montserrat-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scsl}{
-      <-> ssub * Montserrat-TLF/extrabold/scsl
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sc}{
+      <-> alias * Montserrat-TLF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sc}{
-      <-> ssub * Montserrat-TLF/extrabold/sc
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{scit}{
+      <-> alias * Montserrat-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{n}{
-      <-> ssub * Montserrat-TLF/extrabold/n
+\DeclareFontShape{OT1}{Montserrat-TLF}{eb}{sl}{
+      <-> alias * Montserrat-TLF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ub}{sl}{
-      <-> ssub * Montserrat-TLF/black/sl
+      <-> alias * Montserrat-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{scit}{
+      <-> alias * Montserrat-TLF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{it}{
+      <-> alias * Montserrat-TLF/black/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ub}{n}{
-      <-> ssub * Montserrat-TLF/black/n
+      <-> alias * Montserrat-TLF/black/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ub}{sc}{
-      <-> ssub * Montserrat-TLF/black/sc
+      <-> alias * Montserrat-TLF/black/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{ub}{scsl}{
-      <-> ssub * Montserrat-TLF/black/scsl
+      <-> alias * Montserrat-TLF/black/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{scit}{
-      <-> ssub * Montserrat-TLF/black/scit
+\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{n}{
+      <-> ssub * Montserrat-TLF/b/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{ub}{it}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{it}{
+      <-> ssub * Montserrat-TLF/b/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sl}{
-      <-> ssub * Montserrat-TLF/b/sl
+\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sc}{
+      <-> ssub * Montserrat-TLF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{bx}{scsl}{
       <-> ssub * Montserrat-TLF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sc}{
-      <-> ssub * Montserrat-TLF/b/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{n}{
-      <-> ssub * Montserrat-TLF/b/n
+\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{sl}{
+      <-> ssub * Montserrat-TLF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TLF}{bx}{scit}{
       <-> ssub * Montserrat-TLF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TLF}{bx}{it}{
-      <-> ssub * Montserrat-TLF/b/it
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/OT1Montserrat-TOsF.fd b/fonts/montserrat/tex/OT1Montserrat-TOsF.fd
index ec88d2668b..8f1b8b8e80 100644
--- a/fonts/montserrat/tex/OT1Montserrat-TOsF.fd
+++ b/fonts/montserrat/tex/OT1Montserrat-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1Montserrat-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/Montserrat-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/Montserrat-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,84 +20,84 @@
 \DeclareFontFamily{OT1}{Montserrat-TOsF}{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sl}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scsl}{
+      <-> ssub * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scsl}{
+      <-> ssub * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sl}{
+      <-> ssub * Montserrat-TOsF/black/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{scsl}{
+      <-> ssub * Montserrat-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-TOsF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{medium}{sl}{
+      <-> ssub * Montserrat-TOsF/medium/it
 }{}
 
 
@@ -99,6 +107,10 @@
       <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ot1
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{n}{
       <-> \Montserrat@@scale Montserrat-Thin-tosf-ot1
 }{}
@@ -107,417 +119,386 @@
       <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{scsl}{
+      <-> ssub * Montserrat-TOsF/thin/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{sl}{
       <-> ssub * Montserrat-TOsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{thin}{scsl}{
-      <-> ssub * Montserrat-TOsF/thin/scit
-}{}
-
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bold}{scsl}{
-      <-> ssub * Montserrat-TOsF/bold/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{scsl}{
+      <-> ssub * Montserrat-TOsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{light}{sl}{
+      <-> ssub * Montserrat-TOsF/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{sl}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{black}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
 }{}
 
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-ot1
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{scit}{
       <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{n}{
       <-> \Montserrat@@scale Montserrat-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{scsl}{
       <-> ssub * Montserrat-TOsF/regular/scit
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-TOsF}{regular}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/it
+}{}
 
-%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ot1
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ot1
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{semibold}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sc}{
-      <-> ssub * Montserrat-TOsF/thin/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{it}{
+      <-> alias * Montserrat-TOsF/thin/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{n}{
-      <-> ssub * Montserrat-TOsF/thin/n
+      <-> alias * Montserrat-TOsF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{scsl}{
-      <-> ssub * Montserrat-TOsF/thin/scsl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sc}{
+      <-> alias * Montserrat-TOsF/thin/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{scsl}{
+      <-> alias * Montserrat-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{it}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{sl}{
+      <-> alias * Montserrat-TOsF/thin/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{ul}{scit}{
-      <-> ssub * Montserrat-TOsF/thin/scit
+      <-> alias * Montserrat-TOsF/thin/scit
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sc}{
-      <-> ssub * Montserrat-TOsF/extralight/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scit}{
+      <-> alias * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{n}{
-      <-> ssub * Montserrat-TOsF/extralight/n
+\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sl}{
+      <-> alias * Montserrat-TOsF/extralight/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scsl
+      <-> alias * Montserrat-TOsF/extralight/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{it}{
+      <-> alias * Montserrat-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{it}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{n}{
+      <-> alias * Montserrat-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{scit}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{el}{sc}{
+      <-> alias * Montserrat-TOsF/extralight/sc
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scsl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sc}{
+      <-> alias * Montserrat-TOsF/light/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sc}{
-      <-> ssub * Montserrat-TOsF/light/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{it}{
+      <-> alias * Montserrat-TOsF/light/it
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{l}{n}{
-      <-> ssub * Montserrat-TOsF/light/n
+      <-> alias * Montserrat-TOsF/light/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sl}{
-      <-> ssub * Montserrat-TOsF/light/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scsl}{
+      <-> alias * Montserrat-TOsF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{it}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{l}{sl}{
+      <-> alias * Montserrat-TOsF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{l}{scit}{
-      <-> ssub * Montserrat-TOsF/light/scit
+      <-> alias * Montserrat-TOsF/light/scit
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{it}{
-      <-> ssub * Montserrat-TOsF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{scit}{
-      <-> ssub * Montserrat-TOsF/regular/scit
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{sc}{
-      <-> ssub * Montserrat-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{n}{
-      <-> ssub * Montserrat-TOsF/regular/n
+\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sl}{
+      <-> alias * Montserrat-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{scsl}{
-      <-> ssub * Montserrat-TOsF/regular/scsl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scit}{
+      <-> alias * Montserrat-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sl}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{it}{
+      <-> alias * Montserrat-TOsF/regular/it
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{n}{
+      <-> alias * Montserrat-TOsF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{m}{sc}{
-      <-> ssub * Montserrat-TOsF/medium/sc
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{n}{
-      <-> ssub * Montserrat-TOsF/medium/n
+      <-> alias * Montserrat-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scsl
+      <-> alias * Montserrat-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{scit}{
-      <-> ssub * Montserrat-TOsF/medium/scit
-}{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{m}{it}{
-      <-> ssub * Montserrat-TOsF/medium/it
-}{}
+%   sb --> semibold
 
+\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scit}{
+      <-> alias * Montserrat-TOsF/semibold/scit
+}{}
 
-%   sb --> semibold
+\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sl}{
+      <-> alias * Montserrat-TOsF/semibold/sl
+}{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scsl
+      <-> alias * Montserrat-TOsF/semibold/scsl
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sc}{
-      <-> ssub * Montserrat-TOsF/semibold/sc
+      <-> alias * Montserrat-TOsF/semibold/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{n}{
-      <-> ssub * Montserrat-TOsF/semibold/n
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/sl
+      <-> alias * Montserrat-TOsF/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{it}{
-      <-> ssub * Montserrat-TOsF/semibold/it
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{sb}{scit}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
+      <-> alias * Montserrat-TOsF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scit}{
-      <-> ssub * Montserrat-TOsF/bold/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sl}{
+      <-> alias * Montserrat-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{it}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scit}{
+      <-> alias * Montserrat-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{n}{
+      <-> alias * Montserrat-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sc}{
-      <-> ssub * Montserrat-TOsF/bold/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{it}{
+      <-> alias * Montserrat-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{n}{
-      <-> ssub * Montserrat-TOsF/bold/n
+\DeclareFontShape{OT1}{Montserrat-TOsF}{b}{sc}{
+      <-> alias * Montserrat-TOsF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{b}{scsl}{
-      <-> ssub * Montserrat-TOsF/bold/scsl
+      <-> alias * Montserrat-TOsF/bold/scsl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sc}{
-      <-> ssub * Montserrat-TOsF/extrabold/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sl}{
+      <-> alias * Montserrat-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{n}{
-      <-> ssub * Montserrat-TOsF/extrabold/n
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scit}{
+      <-> alias * Montserrat-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scsl}{
-      <-> ssub * Montserrat-TOsF/extrabold/scsl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sc}{
+      <-> alias * Montserrat-TOsF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/sl
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{it}{
+      <-> alias * Montserrat-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{it}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{n}{
+      <-> alias * Montserrat-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scit}{
-      <-> ssub * Montserrat-TOsF/extrabold/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{eb}{scsl}{
+      <-> alias * Montserrat-TOsF/extrabold/scsl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{sl}{
-      <-> ssub * Montserrat-TOsF/black/sl
-}{}
-
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scsl
-}{}
-
 \DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{sc}{
-      <-> ssub * Montserrat-TOsF/black/sc
+      <-> alias * Montserrat-TOsF/black/sc
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{n}{
-      <-> ssub * Montserrat-TOsF/black/n
+      <-> alias * Montserrat-TOsF/black/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scit}{
-      <-> ssub * Montserrat-TOsF/black/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{it}{
+      <-> alias * Montserrat-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{it}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scsl}{
+      <-> alias * Montserrat-TOsF/black/scsl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{it}{
-      <-> ssub * Montserrat-TOsF/b/it
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{sl}{
+      <-> alias * Montserrat-TOsF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scit}{
-      <-> ssub * Montserrat-TOsF/b/scit
+\DeclareFontShape{OT1}{Montserrat-TOsF}{ub}{scit}{
+      <-> alias * Montserrat-TOsF/black/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scsl}{
       <-> ssub * Montserrat-TOsF/b/scsl
 }{}
 
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sc}{
+      <-> ssub * Montserrat-TOsF/b/sc
+}{}
+
 \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{n}{
       <-> ssub * Montserrat-TOsF/b/n
 }{}
 
-\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sc}{
-      <-> ssub * Montserrat-TOsF/b/sc
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{it}{
+      <-> ssub * Montserrat-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{scit}{
+      <-> ssub * Montserrat-TOsF/b/scit
 }{}
 
 \DeclareFontShape{OT1}{Montserrat-TOsF}{bx}{sl}{
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-Dnom.fd b/fonts/montserrat/tex/OT1MontserratAlternates-Dnom.fd
index 66a83e66da..80cb46cd7a 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-Dnom.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,276 +20,261 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-Dnom}{}
 
 
-%   ----  extrabold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/it
 }{}
 
 
 %   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bold}{sl}{
       <-> ssub * MontserratAlternates-Dnom/bold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/thin/it
 }{}
 
 
-%   ----  light  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{light}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{black}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/black/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{n}{
-      <-> ssub * MontserratAlternates-Dnom/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{it}{
+      <-> alias * MontserratAlternates-Dnom/thin/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/thin/sl
+      <-> alias * MontserratAlternates-Dnom/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{it}{
-      <-> ssub * MontserratAlternates-Dnom/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ul}{n}{
+      <-> alias * MontserratAlternates-Dnom/thin/n
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/n
+      <-> alias * MontserratAlternates-Dnom/extralight/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/sl
+      <-> alias * MontserratAlternates-Dnom/extralight/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{el}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/it
+      <-> alias * MontserratAlternates-Dnom/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{it}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
+      <-> alias * MontserratAlternates-Dnom/light/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{n}{
-      <-> ssub * MontserratAlternates-Dnom/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{it}{
-      <-> ssub * MontserratAlternates-Dnom/regular/it
+      <-> alias * MontserratAlternates-Dnom/light/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sl}{n}{
-      <-> ssub * MontserratAlternates-Dnom/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{l}{it}{
+      <-> alias * MontserratAlternates-Dnom/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{n}{
-      <-> ssub * MontserratAlternates-Dnom/medium/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{it}{
+      <-> alias * MontserratAlternates-Dnom/regular/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{it}{
-      <-> ssub * MontserratAlternates-Dnom/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{n}{
+      <-> alias * MontserratAlternates-Dnom/regular/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{m}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/medium/sl
+      <-> alias * MontserratAlternates-Dnom/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{it}{
+      <-> alias * MontserratAlternates-Dnom/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/sl
+      <-> alias * MontserratAlternates-Dnom/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{sb}{n}{
+      <-> alias * MontserratAlternates-Dnom/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{n}{
-      <-> ssub * MontserratAlternates-Dnom/bold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{sl}{
+      <-> alias * MontserratAlternates-Dnom/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/bold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{n}{
+      <-> alias * MontserratAlternates-Dnom/bold/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{b}{it}{
-      <-> ssub * MontserratAlternates-Dnom/bold/it
+      <-> alias * MontserratAlternates-Dnom/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{sl}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{n}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{eb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+      <-> alias * MontserratAlternates-Dnom/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{n}{
-      <-> ssub * MontserratAlternates-Dnom/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{it}{
+      <-> alias * MontserratAlternates-Dnom/black/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/black/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{n}{
+      <-> alias * MontserratAlternates-Dnom/black/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{it}{
-      <-> ssub * MontserratAlternates-Dnom/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Dnom}{ub}{sl}{
+      <-> alias * MontserratAlternates-Dnom/black/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Dnom}{bx}{it}{
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-Inf.fd b/fonts/montserrat/tex/OT1MontserratAlternates-Inf.fd
index 204095c899..ac8daf38c6 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-Inf.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,108 +20,108 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-Inf}{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Inf/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Inf/regular/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{sl}{
+      <-> ssub * MontserratAlternates-Inf/black/it
 }{}
 
 
-%   ----  light  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Inf/thin/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Inf/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{light}{sl}{
+      <-> ssub * MontserratAlternates-Inf/light/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Inf/extralight/it
 }{}
 
 
-%   ----  black  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{black}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/bold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Inf/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/semibold/it
 }{}
 
 
@@ -132,166 +140,151 @@
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-inf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Inf/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Inf/thin/sl
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{it}{
-      <-> ssub * MontserratAlternates-Inf/thin/it
+      <-> alias * MontserratAlternates-Inf/thin/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{n}{
-      <-> ssub * MontserratAlternates-Inf/thin/n
+      <-> alias * MontserratAlternates-Inf/thin/n
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ul}{sl}{
+      <-> alias * MontserratAlternates-Inf/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{n}{
-      <-> ssub * MontserratAlternates-Inf/extralight/n
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{it}{
+      <-> alias * MontserratAlternates-Inf/extralight/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/sl
+      <-> alias * MontserratAlternates-Inf/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{it}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{el}{n}{
+      <-> alias * MontserratAlternates-Inf/extralight/n
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{n}{
-      <-> ssub * MontserratAlternates-Inf/light/n
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{it}{
-      <-> ssub * MontserratAlternates-Inf/light/it
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/sl
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{it}{
-      <-> ssub * MontserratAlternates-Inf/regular/it
+      <-> alias * MontserratAlternates-Inf/light/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Inf/regular/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{n}{
+      <-> alias * MontserratAlternates-Inf/light/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sl}{n}{
-      <-> ssub * MontserratAlternates-Inf/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{l}{it}{
+      <-> alias * MontserratAlternates-Inf/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{sl}{
-      <-> ssub * MontserratAlternates-Inf/medium/sl
+      <-> alias * MontserratAlternates-Inf/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{it}{
-      <-> ssub * MontserratAlternates-Inf/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{n}{
+      <-> alias * MontserratAlternates-Inf/regular/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{n}{
-      <-> ssub * MontserratAlternates-Inf/medium/n
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{m}{it}{
+      <-> alias * MontserratAlternates-Inf/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{it}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/sl
+      <-> alias * MontserratAlternates-Inf/semibold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{n}{
-      <-> ssub * MontserratAlternates-Inf/semibold/n
+      <-> alias * MontserratAlternates-Inf/semibold/n
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{sb}{it}{
+      <-> alias * MontserratAlternates-Inf/semibold/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{it}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
-}{}
+%   b --> bold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/sl
+      <-> alias * MontserratAlternates-Inf/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{n}{
-      <-> ssub * MontserratAlternates-Inf/bold/n
+      <-> alias * MontserratAlternates-Inf/bold/n
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{b}{it}{
+      <-> alias * MontserratAlternates-Inf/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/sl
+      <-> alias * MontserratAlternates-Inf/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{it}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{n}{
+      <-> alias * MontserratAlternates-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{n}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{eb}{it}{
+      <-> alias * MontserratAlternates-Inf/extrabold/it
 }{}
 
 
 %   ub --> black
 
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{n}{
+      <-> alias * MontserratAlternates-Inf/black/n
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/sl
+      <-> alias * MontserratAlternates-Inf/black/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{it}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+      <-> alias * MontserratAlternates-Inf/black/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{ub}{n}{
-      <-> ssub * MontserratAlternates-Inf/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{it}{
+      <-> ssub * MontserratAlternates-Inf/b/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{n}{
       <-> ssub * MontserratAlternates-Inf/b/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{it}{
-      <-> ssub * MontserratAlternates-Inf/b/it
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Inf}{bx}{sl}{
       <-> ssub * MontserratAlternates-Inf/b/sl
 }{}
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-LF.fd b/fonts/montserrat/tex/OT1MontserratAlternates-LF.fd
index 5bf05de7ee..8716e741f1 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-LF.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-LF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,78 +20,24 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-LF}{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/it
-}{}
-
-
-%   ----  thin  ----
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/it
-}{}
-
-
 %   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{semibold}{scsl}{
       <-> ssub * MontserratAlternates-LF/semibold/scit
 }{}
@@ -93,37 +47,37 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-LF/bold/it
 }{}
 
 
 %   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{sc}{
@@ -134,8 +88,8 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{medium}{scsl}{
@@ -147,49 +101,49 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/it
 }{}
 
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{regular}{scsl}{
@@ -201,51 +155,78 @@
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{black}{sl}{
+      <-> ssub * MontserratAlternates-LF/black/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-LF/thin/scit
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-LF/thin/it
+}{}
+
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{extralight}{scsl}{
       <-> ssub * MontserratAlternates-LF/extralight/scit
 }{}
@@ -254,274 +235,274 @@
       <-> ssub * MontserratAlternates-LF/extralight/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-LF/thin/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{it}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{n}{
-      <-> ssub * MontserratAlternates-LF/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-LF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{light}{sl}{
+      <-> ssub * MontserratAlternates-LF/light/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{it}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-LF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sc}{
-      <-> ssub * MontserratAlternates-LF/extralight/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{it}{
+      <-> alias * MontserratAlternates-LF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{scit}{
+      <-> alias * MontserratAlternates-LF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extralight/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sc}{
+      <-> alias * MontserratAlternates-LF/thin/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scit}{
-      <-> ssub * MontserratAlternates-LF/extralight/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{n}{
+      <-> alias * MontserratAlternates-LF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{n}{
-      <-> ssub * MontserratAlternates-LF/extralight/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ul}{sl}{
+      <-> alias * MontserratAlternates-LF/thin/sl
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{n}{
-      <-> ssub * MontserratAlternates-LF/light/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scsl}{
+      <-> alias * MontserratAlternates-LF/extralight/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scit}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{it}{
+      <-> alias * MontserratAlternates-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{scit}{
+      <-> alias * MontserratAlternates-LF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sc}{
+      <-> alias * MontserratAlternates-LF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sc}{
-      <-> ssub * MontserratAlternates-LF/light/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{n}{
+      <-> alias * MontserratAlternates-LF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{it}{
-      <-> ssub * MontserratAlternates-LF/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{el}{sl}{
+      <-> alias * MontserratAlternates-LF/extralight/sl
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sc}{
+      <-> alias * MontserratAlternates-LF/light/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-LF/regular/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{n}{
+      <-> alias * MontserratAlternates-LF/light/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{it}{
-      <-> ssub * MontserratAlternates-LF/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{sl}{
+      <-> alias * MontserratAlternates-LF/light/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-LF/regular/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{it}{
+      <-> alias * MontserratAlternates-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{n}{
-      <-> ssub * MontserratAlternates-LF/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scsl}{
+      <-> alias * MontserratAlternates-LF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-LF/regular/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{l}{scit}{
+      <-> alias * MontserratAlternates-LF/light/scit
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{n}{
-      <-> ssub * MontserratAlternates-LF/medium/n
+      <-> alias * MontserratAlternates-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scit}{
-      <-> ssub * MontserratAlternates-LF/medium/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sl}{
+      <-> alias * MontserratAlternates-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-LF/medium/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sc}{
+      <-> alias * MontserratAlternates-LF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scit}{
+      <-> alias * MontserratAlternates-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{sc}{
-      <-> ssub * MontserratAlternates-LF/medium/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{scsl}{
+      <-> alias * MontserratAlternates-LF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{m}{it}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+      <-> alias * MontserratAlternates-LF/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{it}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-LF/semibold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{it}{
+      <-> alias * MontserratAlternates-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scit}{
+      <-> alias * MontserratAlternates-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/semibold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sc}{
+      <-> alias * MontserratAlternates-LF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-LF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{sl}{
+      <-> alias * MontserratAlternates-LF/semibold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{sb}{n}{
-      <-> ssub * MontserratAlternates-LF/semibold/n
+      <-> alias * MontserratAlternates-LF/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scit}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sc}{
+      <-> alias * MontserratAlternates-LF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{n}{
-      <-> ssub * MontserratAlternates-LF/bold/n
+      <-> alias * MontserratAlternates-LF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sl}{
+      <-> alias * MontserratAlternates-LF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{it}{
+      <-> alias * MontserratAlternates-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{sc}{
-      <-> ssub * MontserratAlternates-LF/bold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scsl}{
+      <-> alias * MontserratAlternates-LF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{it}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{b}{scit}{
+      <-> alias * MontserratAlternates-LF/bold/scit
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scsl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+      <-> alias * MontserratAlternates-LF/extrabold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{n}{
-      <-> ssub * MontserratAlternates-LF/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{it}{
+      <-> alias * MontserratAlternates-LF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{it}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{scit}{
+      <-> alias * MontserratAlternates-LF/extrabold/scit
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sc
+      <-> alias * MontserratAlternates-LF/extrabold/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sl
+      <-> alias * MontserratAlternates-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{eb}{n}{
+      <-> alias * MontserratAlternates-LF/extrabold/n
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sc}{
+      <-> alias * MontserratAlternates-LF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{n}{
-      <-> ssub * MontserratAlternates-LF/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sl}{
+      <-> alias * MontserratAlternates-LF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{n}{
+      <-> alias * MontserratAlternates-LF/black/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/sl
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{it}{
+      <-> alias * MontserratAlternates-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-LF/black/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-LF/black/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{it}{
-      <-> ssub * MontserratAlternates-LF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{ub}{scit}{
+      <-> alias * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{it}{
-      <-> ssub * MontserratAlternates-LF/b/it
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-LF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{sl}{
       <-> ssub * MontserratAlternates-LF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-LF/b/sc
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{n}{
+      <-> ssub * MontserratAlternates-LF/b/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scsl}{
       <-> ssub * MontserratAlternates-LF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scit}{
-      <-> ssub * MontserratAlternates-LF/b/scit
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{it}{
+      <-> ssub * MontserratAlternates-LF/b/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{n}{
-      <-> ssub * MontserratAlternates-LF/b/n
+\DeclareFontShape{OT1}{MontserratAlternates-LF}{bx}{scit}{
+      <-> ssub * MontserratAlternates-LF/b/scit
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-Numr.fd b/fonts/montserrat/tex/OT1MontserratAlternates-Numr.fd
index 7d7aeeed6d..7ce722b3d1 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-Numr.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,18 +20,18 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-Numr}{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
@@ -42,63 +50,63 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{sl}{
-      <-> ssub * MontserratAlternates-Numr/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/bold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/semibold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{sl}{
-      <-> ssub * MontserratAlternates-Numr/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{light}{sl}{
+      <-> ssub * MontserratAlternates-Numr/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extralight/it
 }{}
 
 
@@ -117,171 +125,160 @@
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{black}{sl}{
+      <-> ssub * MontserratAlternates-Numr/black/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Numr/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{it}{
-      <-> ssub * MontserratAlternates-Numr/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{n}{
+      <-> alias * MontserratAlternates-Numr/thin/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Numr/thin/sl
+      <-> alias * MontserratAlternates-Numr/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{n}{
-      <-> ssub * MontserratAlternates-Numr/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{ul}{it}{
+      <-> alias * MontserratAlternates-Numr/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{n}{
-      <-> ssub * MontserratAlternates-Numr/extralight/n
+      <-> alias * MontserratAlternates-Numr/extralight/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/sl
+      <-> alias * MontserratAlternates-Numr/extralight/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{el}{it}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+      <-> alias * MontserratAlternates-Numr/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{n}{
-      <-> ssub * MontserratAlternates-Numr/light/n
+      <-> alias * MontserratAlternates-Numr/light/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{sl}{
-      <-> ssub * MontserratAlternates-Numr/light/sl
+      <-> alias * MontserratAlternates-Numr/light/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{l}{it}{
-      <-> ssub * MontserratAlternates-Numr/light/it
+      <-> alias * MontserratAlternates-Numr/light/it
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{n}{
-      <-> ssub * MontserratAlternates-Numr/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sl}{it}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{n}{
+      <-> alias * MontserratAlternates-Numr/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{sl}{
-      <-> ssub * MontserratAlternates-Numr/medium/sl
+      <-> alias * MontserratAlternates-Numr/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{it}{
-      <-> ssub * MontserratAlternates-Numr/medium/it
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{m}{n}{
-      <-> ssub * MontserratAlternates-Numr/medium/n
+      <-> alias * MontserratAlternates-Numr/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{it}{
-      <-> ssub * MontserratAlternates-Numr/semibold/it
+      <-> alias * MontserratAlternates-Numr/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/semibold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{n}{
+      <-> alias * MontserratAlternates-Numr/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{n}{
-      <-> ssub * MontserratAlternates-Numr/semibold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{sb}{sl}{
+      <-> alias * MontserratAlternates-Numr/semibold/sl
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{n}{
-      <-> ssub * MontserratAlternates-Numr/bold/n
+      <-> alias * MontserratAlternates-Numr/bold/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/sl
+      <-> alias * MontserratAlternates-Numr/bold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{b}{it}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+      <-> alias * MontserratAlternates-Numr/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/sl
+      <-> alias * MontserratAlternates-Numr/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{it}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{n}{
+      <-> alias * MontserratAlternates-Numr/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{n}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{eb}{it}{
+      <-> alias * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{n}{
-      <-> ssub * MontserratAlternates-Numr/black/n
+      <-> alias * MontserratAlternates-Numr/black/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Numr/black/sl
+      <-> alias * MontserratAlternates-Numr/black/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{ub}{it}{
-      <-> ssub * MontserratAlternates-Numr/black/it
+      <-> alias * MontserratAlternates-Numr/black/it
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bx}{n}{
+      <-> ssub * MontserratAlternates-Numr/b/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Numr}{bx}{sl}{
@@ -292,8 +289,4 @@
       <-> ssub * MontserratAlternates-Numr/b/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Numr}{bx}{n}{
-      <-> ssub * MontserratAlternates-Numr/b/n
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-OsF.fd b/fonts/montserrat/tex/OT1MontserratAlternates-OsF.fd
index 4e67de75e0..51755c0dee 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-OsF.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,51 +20,78 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-OsF}{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scit
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
+}{}
+
+
+%   ----  extrabold  ----
+
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{extrabold}{scsl}{
       <-> ssub * MontserratAlternates-OsF/extrabold/scit
 }{}
@@ -68,22 +103,22 @@
 
 %   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{medium}{scsl}{
       <-> ssub * MontserratAlternates-OsF/medium/scit
 }{}
@@ -93,66 +128,35 @@
 }{}
 
 
-%   ----  light  ----
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/it
-}{}
-
-
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/it
 }{}
 
 
 %   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-ot1
 }{}
@@ -161,6 +165,10 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{regular}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-ot1
 }{}
@@ -174,354 +182,327 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-OsF/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{n}{
+      <-> alias * MontserratAlternates-OsF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-OsF/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sl}{
+      <-> alias * MontserratAlternates-OsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sc}{
+      <-> alias * MontserratAlternates-OsF/thin/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/sl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scit}{
+      <-> alias * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-OsF/thin/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-OsF/thin/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+      <-> alias * MontserratAlternates-OsF/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sc}{
+      <-> alias * MontserratAlternates-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{n}{
-      <-> ssub * MontserratAlternates-OsF/extralight/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sl}{
+      <-> alias * MontserratAlternates-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{n}{
+      <-> alias * MontserratAlternates-OsF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{it}{
+      <-> alias * MontserratAlternates-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scsl}{
+      <-> alias * MontserratAlternates-OsF/extralight/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{it}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{el}{scit}{
+      <-> alias * MontserratAlternates-OsF/extralight/scit
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{n}{
-      <-> ssub * MontserratAlternates-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scsl
+      <-> alias * MontserratAlternates-OsF/light/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/sl
+      <-> alias * MontserratAlternates-OsF/light/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-OsF/light/sc
+      <-> alias * MontserratAlternates-OsF/light/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{it}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scit}{
+      <-> alias * MontserratAlternates-OsF/light/scit
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{scsl}{
+      <-> alias * MontserratAlternates-OsF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-OsF/regular/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{l}{it}{
+      <-> alias * MontserratAlternates-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/sl
-}{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/regular/scsl
-}{}
+%   m --> regular
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-OsF/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sc}{
+      <-> alias * MontserratAlternates-OsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-OsF/regular/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{n}{
+      <-> alias * MontserratAlternates-OsF/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-OsF/medium/sc
+      <-> alias * MontserratAlternates-OsF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{it}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
+      <-> alias * MontserratAlternates-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{n}{
-      <-> ssub * MontserratAlternates-OsF/medium/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scsl}{
+      <-> alias * MontserratAlternates-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-OsF/medium/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/medium/scsl
+      <-> alias * MontserratAlternates-OsF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sc}{
+      <-> alias * MontserratAlternates-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{n}{
+      <-> alias * MontserratAlternates-OsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-OsF/semibold/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-OsF/semibold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+      <-> alias * MontserratAlternates-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-OsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-OsF/bold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{n}{
+      <-> alias * MontserratAlternates-OsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{it}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sl}{
+      <-> alias * MontserratAlternates-OsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{n}{
-      <-> ssub * MontserratAlternates-OsF/bold/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{sc}{
+      <-> alias * MontserratAlternates-OsF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+      <-> alias * MontserratAlternates-OsF/bold/scit
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scsl
+      <-> alias * MontserratAlternates-OsF/bold/scsl
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{b}{it}{
+      <-> alias * MontserratAlternates-OsF/bold/it
+}{}
 
-%   eb --> extrabold
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sl
-}{}
+%   eb --> extrabold
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sc
+      <-> alias * MontserratAlternates-OsF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-OsF/extrabold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/n
+      <-> alias * MontserratAlternates-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{it}{
+      <-> alias * MontserratAlternates-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scsl
+      <-> alias * MontserratAlternates-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-OsF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-OsF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-OsF/black/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{n}{
+      <-> alias * MontserratAlternates-OsF/black/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/sl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-OsF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scit}{
+      <-> alias * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-OsF/black/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-OsF/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{ub}{it}{
+      <-> alias * MontserratAlternates-OsF/black/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{scit}{
       <-> ssub * MontserratAlternates-OsF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{n}{
-      <-> ssub * MontserratAlternates-OsF/b/n
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{scsl}{
       <-> ssub * MontserratAlternates-OsF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-OsF/b/sc
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{it}{
+      <-> ssub * MontserratAlternates-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{n}{
+      <-> ssub * MontserratAlternates-OsF/b/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sl}{
       <-> ssub * MontserratAlternates-OsF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{it}{
-      <-> ssub * MontserratAlternates-OsF/b/it
+\DeclareFontShape{OT1}{MontserratAlternates-OsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-OsF/b/sc
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-Sup.fd b/fonts/montserrat/tex/OT1MontserratAlternates-Sup.fd
index be24153e23..0399b390e7 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-Sup.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,276 +20,261 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-Sup}{}
 
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/semibold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Sup/medium/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/extrabold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{sl}{
+      <-> ssub * MontserratAlternates-Sup/black/it
 }{}
 
 
-%   ----  light  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{sl}{
-      <-> ssub * MontserratAlternates-Sup/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Sup/regular/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{light}{sl}{
+      <-> ssub * MontserratAlternates-Sup/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{black}{sl}{
-      <-> ssub * MontserratAlternates-Sup/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Sup/extralight/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Sup/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Sup/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{n}{
-      <-> ssub * MontserratAlternates-Sup/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{sl}{
+      <-> alias * MontserratAlternates-Sup/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{n}{
+      <-> alias * MontserratAlternates-Sup/thin/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{ul}{it}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+      <-> alias * MontserratAlternates-Sup/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{it}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+      <-> alias * MontserratAlternates-Sup/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{n}{
+      <-> alias * MontserratAlternates-Sup/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{n}{
-      <-> ssub * MontserratAlternates-Sup/extralight/n
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{el}{sl}{
+      <-> alias * MontserratAlternates-Sup/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{n}{
-      <-> ssub * MontserratAlternates-Sup/light/n
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{it}{
+      <-> alias * MontserratAlternates-Sup/light/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{it}{
-      <-> ssub * MontserratAlternates-Sup/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{n}{
+      <-> alias * MontserratAlternates-Sup/light/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{l}{sl}{
-      <-> ssub * MontserratAlternates-Sup/light/sl
+      <-> alias * MontserratAlternates-Sup/light/sl
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{it}{
-      <-> ssub * MontserratAlternates-Sup/regular/it
-}{}
+%   m --> regular
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Sup/regular/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{it}{
+      <-> alias * MontserratAlternates-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{sl}{n}{
-      <-> ssub * MontserratAlternates-Sup/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{sl}{
+      <-> alias * MontserratAlternates-Sup/regular/sl
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{n}{
-      <-> ssub * MontserratAlternates-Sup/medium/n
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{it}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{m}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/sl
+      <-> alias * MontserratAlternates-Sup/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{it}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+      <-> alias * MontserratAlternates-Sup/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/sl
+      <-> alias * MontserratAlternates-Sup/semibold/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{sb}{n}{
-      <-> ssub * MontserratAlternates-Sup/semibold/n
+      <-> alias * MontserratAlternates-Sup/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/sl
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{it}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+      <-> alias * MontserratAlternates-Sup/bold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{n}{
-      <-> ssub * MontserratAlternates-Sup/bold/n
+      <-> alias * MontserratAlternates-Sup/bold/n
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{b}{sl}{
+      <-> alias * MontserratAlternates-Sup/bold/sl
+}{}
 
-%   eb --> extrabold
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{n}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/n
-}{}
+%   eb --> extrabold
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{it}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/it
+      <-> alias * MontserratAlternates-Sup/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/sl
+      <-> alias * MontserratAlternates-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{eb}{n}{
+      <-> alias * MontserratAlternates-Sup/extrabold/n
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Sup/black/sl
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{n}{
+      <-> alias * MontserratAlternates-Sup/black/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{it}{
-      <-> ssub * MontserratAlternates-Sup/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{sl}{
+      <-> alias * MontserratAlternates-Sup/black/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{n}{
-      <-> ssub * MontserratAlternates-Sup/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-Sup}{ub}{it}{
+      <-> alias * MontserratAlternates-Sup/black/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-Sup}{bx}{it}{
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-TLF.fd b/fonts/montserrat/tex/OT1MontserratAlternates-TLF.fd
index 0b1e301217..134e8d05df 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-TLF.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,132 +20,132 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-TLF}{}
 
 
-%   ----  extrabold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/bold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{black}{scsl}{
       <-> ssub * MontserratAlternates-TLF/black/scit
 }{}
@@ -147,381 +155,354 @@
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/regular/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-TLF/medium/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/light/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/medium/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TLF/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{it}{
+      <-> alias * MontserratAlternates-TLF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{scit}{
+      <-> alias * MontserratAlternates-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sc}{
+      <-> alias * MontserratAlternates-TLF/thin/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TLF/thin/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{n}{
+      <-> alias * MontserratAlternates-TLF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TLF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{n}{
-      <-> ssub * MontserratAlternates-TLF/extralight/n
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scsl
+      <-> alias * MontserratAlternates-TLF/extralight/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{it}{
+      <-> alias * MontserratAlternates-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{scit}{
+      <-> alias * MontserratAlternates-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{it}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sc}{
+      <-> alias * MontserratAlternates-TLF/extralight/sc
 }{}
 
-
-%   l --> light
-
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/light/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> alias * MontserratAlternates-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{n}{
-      <-> ssub * MontserratAlternates-TLF/light/n
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{el}{n}{
+      <-> alias * MontserratAlternates-TLF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TLF/light/scit
-}{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{it}{
-      <-> ssub * MontserratAlternates-TLF/light/it
-}{}
+%   l --> light
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TLF/light/sc
+      <-> alias * MontserratAlternates-TLF/light/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/sl
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TLF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TLF/regular/scit
+      <-> alias * MontserratAlternates-TLF/light/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/regular/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{n}{
+      <-> alias * MontserratAlternates-TLF/light/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{it}{
+      <-> alias * MontserratAlternates-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TLF/regular/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scsl}{
+      <-> alias * MontserratAlternates-TLF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{l}{scit}{
+      <-> alias * MontserratAlternates-TLF/light/scit
 }{}
 
 
-%   m --> medium
-
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{it}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
-}{}
+%   m --> regular
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TLF/medium/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scit}{
+      <-> alias * MontserratAlternates-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{it}{
+      <-> alias * MontserratAlternates-TLF/regular/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/medium/scsl
+      <-> alias * MontserratAlternates-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{n}{
-      <-> ssub * MontserratAlternates-TLF/medium/n
+      <-> alias * MontserratAlternates-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TLF/medium/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sl}{
+      <-> alias * MontserratAlternates-TLF/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{m}{sc}{
+      <-> alias * MontserratAlternates-TLF/regular/sc
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TLF/semibold/n
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{n}{
+      <-> alias * MontserratAlternates-TLF/semibold/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+      <-> alias * MontserratAlternates-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{sb}{scit}{
+      <-> alias * MontserratAlternates-TLF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scit}{
+      <-> alias * MontserratAlternates-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TLF/bold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{it}{
+      <-> alias * MontserratAlternates-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{it}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scsl}{
+      <-> alias * MontserratAlternates-TLF/bold/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{n}{
-      <-> ssub * MontserratAlternates-TLF/bold/n
+      <-> alias * MontserratAlternates-TLF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TLF/bold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sl}{
+      <-> alias * MontserratAlternates-TLF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/bold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{b}{sc}{
+      <-> alias * MontserratAlternates-TLF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sl
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sc
+      <-> alias * MontserratAlternates-TLF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{n}{
+      <-> alias * MontserratAlternates-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{it}{
+      <-> alias * MontserratAlternates-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scsl
+      <-> alias * MontserratAlternates-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{eb}{scit}{
+      <-> alias * MontserratAlternates-TLF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TLF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{sc}{
+      <-> alias * MontserratAlternates-TLF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TLF/black/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{n}{
+      <-> alias * MontserratAlternates-TLF/black/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/sl
+      <-> alias * MontserratAlternates-TLF/black/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/black/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> alias * MontserratAlternates-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TLF/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-TLF/black/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TLF/black/scit
+      <-> alias * MontserratAlternates-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-TLF/b/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{n}{
+      <-> ssub * MontserratAlternates-TLF/b/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sl}{
       <-> ssub * MontserratAlternates-TLF/b/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{it}{
-      <-> ssub * MontserratAlternates-TLF/b/it
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-TLF/b/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{scit}{
       <-> ssub * MontserratAlternates-TLF/b/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{n}{
-      <-> ssub * MontserratAlternates-TLF/b/n
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{scsl}{
       <-> ssub * MontserratAlternates-TLF/b/scsl
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TLF}{bx}{it}{
+      <-> ssub * MontserratAlternates-TLF/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/OT1MontserratAlternates-TOsF.fd b/fonts/montserrat/tex/OT1MontserratAlternates-TOsF.fd
index e62b583044..f9158cf7ee 100644
--- a/fonts/montserrat/tex/OT1MontserratAlternates-TOsF.fd
+++ b/fonts/montserrat/tex/OT1MontserratAlternates-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{OT1MontserratAlternates-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for OT1/MontserratAlternates-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for OT1/MontserratAlternates-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,30 +20,57 @@
 \DeclareFontFamily{OT1}{MontserratAlternates-TOsF}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/black/it
 }{}
 
 
@@ -45,6 +80,10 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-ot1
 }{}
@@ -53,10 +92,6 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{thin}{scsl}{
       <-> ssub * MontserratAlternates-TOsF/thin/scit
 }{}
@@ -66,66 +101,62 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extralight/it
 }{}
 
 
 %   ----  semibold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ot1
 }{}
@@ -134,6 +165,10 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{semibold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ot1
 }{}
@@ -147,30 +182,30 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/light/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/it
 }{}
 
 
@@ -180,6 +215,10 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ot1
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-ot1
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-ot1
 }{}
@@ -188,10 +227,6 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{medium}{scsl}{
       <-> ssub * MontserratAlternates-TOsF/medium/scit
 }{}
@@ -201,49 +236,22 @@
 }{}
 
 
-%   ----  extralight  ----
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scit
-}{}
+%   ----  extrabold  ----
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ot1
 }{}
 
-
-%   ----  extrabold  ----
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ot1
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-ot1
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{extrabold}{scsl}{
@@ -255,255 +263,236 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sl
+      <-> alias * MontserratAlternates-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sc
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{n}{
+      <-> alias * MontserratAlternates-TOsF/thin/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TOsF/thin/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{sc}{
+      <-> alias * MontserratAlternates-TOsF/thin/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scit
+      <-> alias * MontserratAlternates-TOsF/thin/scit
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scsl
+      <-> alias * MontserratAlternates-TOsF/thin/scsl
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ul}{it}{
+      <-> alias * MontserratAlternates-TOsF/thin/it
+}{}
 
-%   el --> extralight
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sl
-}{}
+%   el --> extralight
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sc
+      <-> alias * MontserratAlternates-TOsF/extralight/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{n}{
+      <-> alias * MontserratAlternates-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{it}{
+      <-> alias * MontserratAlternates-TOsF/extralight/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scsl
+      <-> alias * MontserratAlternates-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{el}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extralight/scit
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/light/scsl
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/light/scit
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{n}{
-      <-> ssub * MontserratAlternates-TOsF/light/n
+      <-> alias * MontserratAlternates-TOsF/light/scit
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{it}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/light/sc
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/sl
+      <-> alias * MontserratAlternates-TOsF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/light/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{n}{
+      <-> alias * MontserratAlternates-TOsF/light/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TOsF/regular/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sl}{
+      <-> alias * MontserratAlternates-TOsF/light/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{l}{sc}{
+      <-> alias * MontserratAlternates-TOsF/light/sc
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scsl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scit
+      <-> alias * MontserratAlternates-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{n}{
-      <-> ssub * MontserratAlternates-TOsF/medium/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{it}{
+      <-> alias * MontserratAlternates-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{it}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{scit}{
+      <-> alias * MontserratAlternates-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sc
+      <-> alias * MontserratAlternates-TOsF/regular/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sl
+      <-> alias * MontserratAlternates-TOsF/regular/sl
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{m}{n}{
+      <-> alias * MontserratAlternates-TOsF/regular/n
+}{}
 
-%   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
-}{}
+%   sb --> semibold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{it}{
+      <-> alias * MontserratAlternates-TOsF/semibold/it
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scsl
+      <-> alias * MontserratAlternates-TOsF/semibold/scsl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/n
+      <-> alias * MontserratAlternates-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sc
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{n}{
+      <-> alias * MontserratAlternates-TOsF/bold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sl}{
+      <-> alias * MontserratAlternates-TOsF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{it}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{sc}{
+      <-> alias * MontserratAlternates-TOsF/bold/sc
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+      <-> alias * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{n}{
-      <-> ssub * MontserratAlternates-TOsF/bold/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{b}{it}{
+      <-> alias * MontserratAlternates-TOsF/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sc}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{n}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scsl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sl
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{it}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scsl
+      <-> alias * MontserratAlternates-TOsF/black/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{it}{
+      <-> alias * MontserratAlternates-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TOsF/black/n
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{scit}{
+      <-> alias * MontserratAlternates-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-TOsF/black/sc
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/black/sc
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{n}{
+      <-> alias * MontserratAlternates-TOsF/black/n
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/sl
+      <-> alias * MontserratAlternates-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/b/sl
 }{}
 
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{n}{
       <-> ssub * MontserratAlternates-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-TOsF/b/sc
+}{}
+
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{scit}{
       <-> ssub * MontserratAlternates-TOsF/b/scit
 }{}
@@ -512,14 +501,6 @@
       <-> ssub * MontserratAlternates-TOsF/b/scsl
 }{}
 
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/b/sc
-}{}
-
 \DeclareFontShape{OT1}{MontserratAlternates-TOsF}{bx}{it}{
       <-> ssub * MontserratAlternates-TOsF/b/it
 }{}
diff --git a/fonts/montserrat/tex/T1Montserrat-Dnom.fd b/fonts/montserrat/tex/T1Montserrat-Dnom.fd
index a96f33b030..2eee48e66f 100644
--- a/fonts/montserrat/tex/T1Montserrat-Dnom.fd
+++ b/fonts/montserrat/tex/T1Montserrat-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,276 +20,261 @@
 \DeclareFontFamily{T1}{Montserrat-Dnom}{}
 
 
-%   ----  light  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{light}{sl}{
-      <-> ssub * Montserrat-Dnom/light/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{sl}{
+      <-> ssub * Montserrat-Dnom/extrabold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{sl}{
+      <-> ssub * Montserrat-Dnom/semibold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extrabold}{sl}{
-      <-> ssub * Montserrat-Dnom/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{sl}{
+      <-> ssub * Montserrat-Dnom/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{medium}{sl}{
+      <-> ssub * Montserrat-Dnom/medium/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{sl}{
-      <-> ssub * Montserrat-Dnom/bold/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{black}{sl}{
+      <-> ssub * Montserrat-Dnom/black/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{semibold}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{bold}{sl}{
+      <-> ssub * Montserrat-Dnom/bold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{black}{sl}{
-      <-> ssub * Montserrat-Dnom/black/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{light}{sl}{
+      <-> ssub * Montserrat-Dnom/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{regular}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{sl}{
+      <-> ssub * Montserrat-Dnom/extralight/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-dnom-t1
+\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{extralight}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{thin}{sl}{
+      <-> ssub * Montserrat-Dnom/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ul}{sl}{
-      <-> ssub * Montserrat-Dnom/thin/sl
+      <-> alias * Montserrat-Dnom/thin/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ul}{n}{
-      <-> ssub * Montserrat-Dnom/thin/n
+      <-> alias * Montserrat-Dnom/thin/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ul}{it}{
-      <-> ssub * Montserrat-Dnom/thin/it
+      <-> alias * Montserrat-Dnom/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{el}{n}{
-      <-> ssub * Montserrat-Dnom/extralight/n
+      <-> alias * Montserrat-Dnom/extralight/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{el}{sl}{
-      <-> ssub * Montserrat-Dnom/extralight/sl
+\DeclareFontShape{T1}{Montserrat-Dnom}{el}{it}{
+      <-> alias * Montserrat-Dnom/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{el}{it}{
-      <-> ssub * Montserrat-Dnom/extralight/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{el}{sl}{
+      <-> alias * Montserrat-Dnom/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{l}{n}{
-      <-> ssub * Montserrat-Dnom/light/n
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Dnom}{l}{sl}{
-      <-> ssub * Montserrat-Dnom/light/sl
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Dnom}{l}{it}{
-      <-> ssub * Montserrat-Dnom/light/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{sl}{
-      <-> ssub * Montserrat-Dnom/regular/sl
+      <-> alias * Montserrat-Dnom/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{n}{
-      <-> ssub * Montserrat-Dnom/regular/n
+\DeclareFontShape{T1}{Montserrat-Dnom}{l}{n}{
+      <-> alias * Montserrat-Dnom/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{sl}{it}{
-      <-> ssub * Montserrat-Dnom/regular/it
+\DeclareFontShape{T1}{Montserrat-Dnom}{l}{sl}{
+      <-> alias * Montserrat-Dnom/light/sl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{m}{sl}{
-      <-> ssub * Montserrat-Dnom/medium/sl
+      <-> alias * Montserrat-Dnom/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{m}{n}{
-      <-> ssub * Montserrat-Dnom/medium/n
+      <-> alias * Montserrat-Dnom/regular/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{m}{it}{
-      <-> ssub * Montserrat-Dnom/medium/it
+      <-> alias * Montserrat-Dnom/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{n}{
-      <-> ssub * Montserrat-Dnom/semibold/n
+\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{sl}{
+      <-> alias * Montserrat-Dnom/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{sl}{
-      <-> ssub * Montserrat-Dnom/semibold/sl
+\DeclareFontShape{T1}{Montserrat-Dnom}{sb}{n}{
+      <-> alias * Montserrat-Dnom/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{sb}{it}{
-      <-> ssub * Montserrat-Dnom/semibold/it
+      <-> alias * Montserrat-Dnom/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{b}{it}{
-      <-> ssub * Montserrat-Dnom/bold/it
+      <-> alias * Montserrat-Dnom/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{b}{sl}{
-      <-> ssub * Montserrat-Dnom/bold/sl
+\DeclareFontShape{T1}{Montserrat-Dnom}{b}{n}{
+      <-> alias * Montserrat-Dnom/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{b}{n}{
-      <-> ssub * Montserrat-Dnom/bold/n
+\DeclareFontShape{T1}{Montserrat-Dnom}{b}{sl}{
+      <-> alias * Montserrat-Dnom/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{n}{
-      <-> ssub * Montserrat-Dnom/extrabold/n
+\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{sl}{
+      <-> alias * Montserrat-Dnom/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{sl}{
-      <-> ssub * Montserrat-Dnom/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-Dnom}{eb}{n}{
+      <-> alias * Montserrat-Dnom/extrabold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{eb}{it}{
-      <-> ssub * Montserrat-Dnom/extrabold/it
+      <-> alias * Montserrat-Dnom/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ub}{it}{
-      <-> ssub * Montserrat-Dnom/black/it
+      <-> alias * Montserrat-Dnom/black/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ub}{n}{
-      <-> ssub * Montserrat-Dnom/black/n
+      <-> alias * Montserrat-Dnom/black/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{ub}{sl}{
-      <-> ssub * Montserrat-Dnom/black/sl
+      <-> alias * Montserrat-Dnom/black/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Dnom}{bx}{it}{
diff --git a/fonts/montserrat/tex/T1Montserrat-Inf.fd b/fonts/montserrat/tex/T1Montserrat-Inf.fd
index 27ef201f8b..d8eb93d0f3 100644
--- a/fonts/montserrat/tex/T1Montserrat-Inf.fd
+++ b/fonts/montserrat/tex/T1Montserrat-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,288 +20,273 @@
 \DeclareFontFamily{T1}{Montserrat-Inf}{}
 
 
-%   ----  light  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{light}{sl}{
-      <-> ssub * Montserrat-Inf/light/it
+\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{sl}{
+      <-> ssub * Montserrat-Inf/extrabold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{medium}{sl}{
-      <-> ssub * Montserrat-Inf/medium/it
+\DeclareFontShape{T1}{Montserrat-Inf}{regular}{sl}{
+      <-> ssub * Montserrat-Inf/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{thin}{sl}{
-      <-> ssub * Montserrat-Inf/thin/it
+\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{sl}{
+      <-> ssub * Montserrat-Inf/semibold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extrabold}{sl}{
-      <-> ssub * Montserrat-Inf/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{bold}{sl}{
+      <-> ssub * Montserrat-Inf/bold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{semibold}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{black}{sl}{
+      <-> ssub * Montserrat-Inf/black/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{bold}{sl}{
-      <-> ssub * Montserrat-Inf/bold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{medium}{sl}{
+      <-> ssub * Montserrat-Inf/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/it
+\DeclareFontShape{T1}{Montserrat-Inf}{thin}{sl}{
+      <-> ssub * Montserrat-Inf/thin/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{regular}{sl}{
-      <-> ssub * Montserrat-Inf/regular/it
+\DeclareFontShape{T1}{Montserrat-Inf}{light}{sl}{
+      <-> ssub * Montserrat-Inf/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-Inf}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-inf-t1
+\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{black}{sl}{
-      <-> ssub * Montserrat-Inf/black/it
+\DeclareFontShape{T1}{Montserrat-Inf}{extralight}{sl}{
+      <-> ssub * Montserrat-Inf/extralight/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{Montserrat-Inf}{ul}{it}{
-      <-> ssub * Montserrat-Inf/thin/it
+      <-> alias * Montserrat-Inf/thin/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Inf}{ul}{n}{
-      <-> ssub * Montserrat-Inf/thin/n
+      <-> alias * Montserrat-Inf/thin/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Inf}{ul}{sl}{
-      <-> ssub * Montserrat-Inf/thin/sl
+      <-> alias * Montserrat-Inf/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-Inf}{el}{sl}{
-      <-> ssub * Montserrat-Inf/extralight/sl
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Inf}{el}{n}{
-      <-> ssub * Montserrat-Inf/extralight/n
+      <-> alias * Montserrat-Inf/extralight/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Inf}{el}{it}{
-      <-> ssub * Montserrat-Inf/extralight/it
+      <-> alias * Montserrat-Inf/extralight/it
 }{}
 
-
-%   l --> light
-
-\DeclareFontShape{T1}{Montserrat-Inf}{l}{sl}{
-      <-> ssub * Montserrat-Inf/light/sl
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Inf}{l}{n}{
-      <-> ssub * Montserrat-Inf/light/n
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Inf}{l}{it}{
-      <-> ssub * Montserrat-Inf/light/it
+\DeclareFontShape{T1}{Montserrat-Inf}{el}{sl}{
+      <-> alias * Montserrat-Inf/extralight/sl
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sl}{it}{
-      <-> ssub * Montserrat-Inf/regular/it
+\DeclareFontShape{T1}{Montserrat-Inf}{l}{it}{
+      <-> alias * Montserrat-Inf/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sl}{sl}{
-      <-> ssub * Montserrat-Inf/regular/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{l}{n}{
+      <-> alias * Montserrat-Inf/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sl}{n}{
-      <-> ssub * Montserrat-Inf/regular/n
+\DeclareFontShape{T1}{Montserrat-Inf}{l}{sl}{
+      <-> alias * Montserrat-Inf/light/sl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{Montserrat-Inf}{m}{n}{
-      <-> ssub * Montserrat-Inf/medium/n
+      <-> alias * Montserrat-Inf/regular/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{m}{sl}{
-      <-> ssub * Montserrat-Inf/medium/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{m}{it}{
+      <-> alias * Montserrat-Inf/regular/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{m}{it}{
-      <-> ssub * Montserrat-Inf/medium/it
+\DeclareFontShape{T1}{Montserrat-Inf}{m}{sl}{
+      <-> alias * Montserrat-Inf/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sb}{it}{
-      <-> ssub * Montserrat-Inf/semibold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{sb}{sl}{
+      <-> alias * Montserrat-Inf/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sb}{n}{
-      <-> ssub * Montserrat-Inf/semibold/n
+\DeclareFontShape{T1}{Montserrat-Inf}{sb}{it}{
+      <-> alias * Montserrat-Inf/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{sb}{sl}{
-      <-> ssub * Montserrat-Inf/semibold/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{sb}{n}{
+      <-> alias * Montserrat-Inf/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-Inf}{b}{it}{
-      <-> ssub * Montserrat-Inf/bold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{b}{sl}{
+      <-> alias * Montserrat-Inf/bold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{b}{n}{
-      <-> ssub * Montserrat-Inf/bold/n
+\DeclareFontShape{T1}{Montserrat-Inf}{b}{it}{
+      <-> alias * Montserrat-Inf/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{b}{sl}{
-      <-> ssub * Montserrat-Inf/bold/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{b}{n}{
+      <-> alias * Montserrat-Inf/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-Inf}{eb}{it}{
-      <-> ssub * Montserrat-Inf/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Inf}{eb}{n}{
+      <-> alias * Montserrat-Inf/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{eb}{n}{
-      <-> ssub * Montserrat-Inf/extrabold/n
+\DeclareFontShape{T1}{Montserrat-Inf}{eb}{it}{
+      <-> alias * Montserrat-Inf/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Inf}{eb}{sl}{
-      <-> ssub * Montserrat-Inf/extrabold/sl
+      <-> alias * Montserrat-Inf/extrabold/sl
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{T1}{Montserrat-Inf}{ub}{n}{
-      <-> ssub * Montserrat-Inf/black/n
+      <-> alias * Montserrat-Inf/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{ub}{sl}{
-      <-> ssub * Montserrat-Inf/black/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{ub}{it}{
+      <-> alias * Montserrat-Inf/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{ub}{it}{
-      <-> ssub * Montserrat-Inf/black/it
+\DeclareFontShape{T1}{Montserrat-Inf}{ub}{sl}{
+      <-> alias * Montserrat-Inf/black/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{bx}{it}{
-      <-> ssub * Montserrat-Inf/b/it
+\DeclareFontShape{T1}{Montserrat-Inf}{bx}{sl}{
+      <-> ssub * Montserrat-Inf/b/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Inf}{bx}{n}{
       <-> ssub * Montserrat-Inf/b/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Inf}{bx}{sl}{
-      <-> ssub * Montserrat-Inf/b/sl
+\DeclareFontShape{T1}{Montserrat-Inf}{bx}{it}{
+      <-> ssub * Montserrat-Inf/b/it
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-LF.fd b/fonts/montserrat/tex/T1Montserrat-LF.fd
index c010c42cdd..340c09930c 100644
--- a/fonts/montserrat/tex/T1Montserrat-LF.fd
+++ b/fonts/montserrat/tex/T1Montserrat-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-LF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,30 +20,30 @@
 \DeclareFontFamily{T1}{Montserrat-LF}{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{sl}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scsl}{
+      <-> ssub * Montserrat-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{medium}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scit
+\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sl}{
+      <-> ssub * Montserrat-LF/extralight/it
 }{}
 
 
@@ -45,29 +53,33 @@
       <-> \Montserrat@@scale Montserrat-Light-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-lf-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-LF}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{light}{sl}{
-      <-> ssub * Montserrat-LF/light/it
+\DeclareFontShape{T1}{Montserrat-LF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-lf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{light}{scsl}{
       <-> ssub * Montserrat-LF/light/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-LF}{light}{sl}{
+      <-> ssub * Montserrat-LF/light/it
+}{}
+
 
 %   ----  thin  ----
 
+\DeclareFontShape{T1}{Montserrat-LF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-t1
+}{}
+
 \DeclareFontShape{T1}{Montserrat-LF}{thin}{sc}{
       <-> \Montserrat@@scale Montserrat-Thin-lf-sc-t1
 }{}
@@ -80,70 +92,66 @@
       <-> \Montserrat@@scale Montserrat-ThinItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{thin}{scsl}{
+      <-> ssub * Montserrat-LF/thin/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{thin}{sl}{
       <-> ssub * Montserrat-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{thin}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scit
-}{}
-
 
-%   ----  extrabold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{scsl}{
+      <-> ssub * Montserrat-LF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-LF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-LF}{medium}{sl}{
+      <-> ssub * Montserrat-LF/medium/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sl}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{T1}{Montserrat-LF}{black}{scsl}{
+      <-> ssub * Montserrat-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-LF}{black}{sl}{
+      <-> ssub * Montserrat-LF/black/it
 }{}
 
 
@@ -157,47 +165,20 @@
       <-> \Montserrat@@scale Montserrat-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-lf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-LF}{bold}{n}{
       <-> \Montserrat@@scale Montserrat-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{bold}{sl}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{T1}{Montserrat-LF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-lf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{bold}{scsl}{
       <-> ssub * Montserrat-LF/bold/scit
 }{}
 
-
-%   ----  extralight  ----
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{sl}{
-      <-> ssub * Montserrat-LF/extralight/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-LF}{extralight}{scsl}{
-      <-> ssub * Montserrat-LF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-LF}{bold}{sl}{
+      <-> ssub * Montserrat-LF/bold/it
 }{}
 
 
@@ -219,285 +200,289 @@
       <-> \Montserrat@@scale Montserrat-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{regular}{sl}{
-      <-> ssub * Montserrat-LF/regular/it
-}{}
-
 \DeclareFontShape{T1}{Montserrat-LF}{regular}{scsl}{
       <-> ssub * Montserrat-LF/regular/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-LF}{regular}{sl}{
+      <-> ssub * Montserrat-LF/regular/it
+}{}
 
-%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-lf-t1
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-t1
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-lf-sc-t1
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{sl}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{scsl}{
+      <-> ssub * Montserrat-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{black}{scsl}{
-      <-> ssub * Montserrat-LF/black/scit
+\DeclareFontShape{T1}{Montserrat-LF}{semibold}{sl}{
+      <-> ssub * Montserrat-LF/semibold/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{sl}{
-      <-> ssub * Montserrat-LF/thin/sl
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{scsl}{
-      <-> ssub * Montserrat-LF/thin/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{sc}{
-      <-> ssub * Montserrat-LF/thin/sc
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{n}{
-      <-> ssub * Montserrat-LF/thin/n
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{scit}{
-      <-> ssub * Montserrat-LF/thin/scit
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ul}{it}{
-      <-> ssub * Montserrat-LF/thin/it
+\DeclareFontShape{T1}{Montserrat-LF}{extrabold}{sl}{
+      <-> ssub * Montserrat-LF/extrabold/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{sc}{
-      <-> ssub * Montserrat-LF/extralight/sc
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{n}{
+      <-> alias * Montserrat-LF/thin/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{n}{
-      <-> ssub * Montserrat-LF/extralight/n
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{it}{
+      <-> alias * Montserrat-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{scsl}{
-      <-> ssub * Montserrat-LF/extralight/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{sc}{
+      <-> alias * Montserrat-LF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{sl}{
-      <-> ssub * Montserrat-LF/extralight/sl
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{scsl}{
+      <-> alias * Montserrat-LF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{it}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{sl}{
+      <-> alias * Montserrat-LF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{el}{scit}{
-      <-> ssub * Montserrat-LF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-LF}{ul}{scit}{
+      <-> alias * Montserrat-LF/thin/scit
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{sl}{
-      <-> ssub * Montserrat-LF/light/sl
+\DeclareFontShape{T1}{Montserrat-LF}{el}{scsl}{
+      <-> alias * Montserrat-LF/extralight/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{scsl}{
-      <-> ssub * Montserrat-LF/light/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{el}{sc}{
+      <-> alias * Montserrat-LF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{sc}{
-      <-> ssub * Montserrat-LF/light/sc
+\DeclareFontShape{T1}{Montserrat-LF}{el}{n}{
+      <-> alias * Montserrat-LF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{n}{
-      <-> ssub * Montserrat-LF/light/n
+\DeclareFontShape{T1}{Montserrat-LF}{el}{it}{
+      <-> alias * Montserrat-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{scit}{
-      <-> ssub * Montserrat-LF/light/scit
+\DeclareFontShape{T1}{Montserrat-LF}{el}{scit}{
+      <-> alias * Montserrat-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{l}{it}{
-      <-> ssub * Montserrat-LF/light/it
+\DeclareFontShape{T1}{Montserrat-LF}{el}{sl}{
+      <-> alias * Montserrat-LF/extralight/sl
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{scit}{
-      <-> ssub * Montserrat-LF/regular/scit
+\DeclareFontShape{T1}{Montserrat-LF}{l}{sl}{
+      <-> alias * Montserrat-LF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{it}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{T1}{Montserrat-LF}{l}{scit}{
+      <-> alias * Montserrat-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{sl}{
-      <-> ssub * Montserrat-LF/regular/sl
+\DeclareFontShape{T1}{Montserrat-LF}{l}{it}{
+      <-> alias * Montserrat-LF/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{scsl}{
-      <-> ssub * Montserrat-LF/regular/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{l}{n}{
+      <-> alias * Montserrat-LF/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{sc}{
-      <-> ssub * Montserrat-LF/regular/sc
+\DeclareFontShape{T1}{Montserrat-LF}{l}{sc}{
+      <-> alias * Montserrat-LF/light/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sl}{n}{
-      <-> ssub * Montserrat-LF/regular/n
+\DeclareFontShape{T1}{Montserrat-LF}{l}{scsl}{
+      <-> alias * Montserrat-LF/light/scsl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-LF}{m}{it}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{T1}{Montserrat-LF}{m}{scit}{
+      <-> alias * Montserrat-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{m}{scit}{
-      <-> ssub * Montserrat-LF/medium/scit
+\DeclareFontShape{T1}{Montserrat-LF}{m}{sl}{
+      <-> alias * Montserrat-LF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{m}{scsl}{
-      <-> ssub * Montserrat-LF/medium/scsl
+      <-> alias * Montserrat-LF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{m}{n}{
-      <-> ssub * Montserrat-LF/medium/n
+      <-> alias * Montserrat-LF/regular/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{m}{sc}{
-      <-> ssub * Montserrat-LF/medium/sc
+\DeclareFontShape{T1}{Montserrat-LF}{m}{it}{
+      <-> alias * Montserrat-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{m}{sl}{
-      <-> ssub * Montserrat-LF/medium/sl
+\DeclareFontShape{T1}{Montserrat-LF}{m}{sc}{
+      <-> alias * Montserrat-LF/regular/sc
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{it}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{sc}{
+      <-> alias * Montserrat-LF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{scit}{
-      <-> ssub * Montserrat-LF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{n}{
+      <-> alias * Montserrat-LF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{scsl}{
-      <-> ssub * Montserrat-LF/semibold/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{it}{
+      <-> alias * Montserrat-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{n}{
-      <-> ssub * Montserrat-LF/semibold/n
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{scsl}{
+      <-> alias * Montserrat-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{sc}{
-      <-> ssub * Montserrat-LF/semibold/sc
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{sl}{
+      <-> alias * Montserrat-LF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{sb}{sl}{
-      <-> ssub * Montserrat-LF/semibold/sl
+\DeclareFontShape{T1}{Montserrat-LF}{sb}{scit}{
+      <-> alias * Montserrat-LF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-LF}{b}{it}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{T1}{Montserrat-LF}{b}{sl}{
+      <-> alias * Montserrat-LF/bold/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{b}{scit}{
-      <-> ssub * Montserrat-LF/bold/scit
+      <-> alias * Montserrat-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{b}{sc}{
-      <-> ssub * Montserrat-LF/bold/sc
+\DeclareFontShape{T1}{Montserrat-LF}{b}{it}{
+      <-> alias * Montserrat-LF/bold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{b}{n}{
-      <-> ssub * Montserrat-LF/bold/n
+      <-> alias * Montserrat-LF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{b}{scsl}{
-      <-> ssub * Montserrat-LF/bold/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{b}{sc}{
+      <-> alias * Montserrat-LF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{b}{sl}{
-      <-> ssub * Montserrat-LF/bold/sl
+\DeclareFontShape{T1}{Montserrat-LF}{b}{scsl}{
+      <-> alias * Montserrat-LF/bold/scsl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{T1}{Montserrat-LF}{eb}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/sl
+      <-> alias * Montserrat-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{eb}{scsl}{
-      <-> ssub * Montserrat-LF/extrabold/scsl
+\DeclareFontShape{T1}{Montserrat-LF}{eb}{scit}{
+      <-> alias * Montserrat-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{eb}{n}{
-      <-> ssub * Montserrat-LF/extrabold/n
+\DeclareFontShape{T1}{Montserrat-LF}{eb}{it}{
+      <-> alias * Montserrat-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{eb}{sc}{
-      <-> ssub * Montserrat-LF/extrabold/sc
+\DeclareFontShape{T1}{Montserrat-LF}{eb}{n}{
+      <-> alias * Montserrat-LF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{eb}{scit}{
-      <-> ssub * Montserrat-LF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-LF}{eb}{sc}{
+      <-> alias * Montserrat-LF/extrabold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{eb}{it}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-LF}{eb}{scsl}{
+      <-> alias * Montserrat-LF/extrabold/scsl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-LF}{ub}{sl}{
-      <-> ssub * Montserrat-LF/black/sl
+\DeclareFontShape{T1}{Montserrat-LF}{ub}{sc}{
+      <-> alias * Montserrat-LF/black/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{ub}{n}{
-      <-> ssub * Montserrat-LF/black/n
+      <-> alias * Montserrat-LF/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ub}{sc}{
-      <-> ssub * Montserrat-LF/black/sc
+\DeclareFontShape{T1}{Montserrat-LF}{ub}{it}{
+      <-> alias * Montserrat-LF/black/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{ub}{scsl}{
-      <-> ssub * Montserrat-LF/black/scsl
+      <-> alias * Montserrat-LF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-LF}{ub}{sl}{
+      <-> alias * Montserrat-LF/black/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{ub}{scit}{
-      <-> ssub * Montserrat-LF/black/scit
+      <-> alias * Montserrat-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{ub}{it}{
-      <-> ssub * Montserrat-LF/black/it
+\DeclareFontShape{T1}{Montserrat-LF}{bx}{scit}{
+      <-> ssub * Montserrat-LF/b/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-LF}{bx}{sl}{
@@ -508,20 +493,16 @@
       <-> ssub * Montserrat-LF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{bx}{n}{
-      <-> ssub * Montserrat-LF/b/n
-}{}
-
 \DeclareFontShape{T1}{Montserrat-LF}{bx}{sc}{
       <-> ssub * Montserrat-LF/b/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-LF}{bx}{scit}{
-      <-> ssub * Montserrat-LF/b/scit
-}{}
-
 \DeclareFontShape{T1}{Montserrat-LF}{bx}{it}{
       <-> ssub * Montserrat-LF/b/it
 }{}
 
+\DeclareFontShape{T1}{Montserrat-LF}{bx}{n}{
+      <-> ssub * Montserrat-LF/b/n
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-Numr.fd b/fonts/montserrat/tex/T1Montserrat-Numr.fd
index 286b9e87f8..1b1224b008 100644
--- a/fonts/montserrat/tex/T1Montserrat-Numr.fd
+++ b/fonts/montserrat/tex/T1Montserrat-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,280 +20,261 @@
 \DeclareFontFamily{T1}{Montserrat-Numr}{}
 
 
-%   ----  semibold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{regular}{sl}{
+      <-> ssub * Montserrat-Numr/regular/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{bold}{sl}{
-      <-> ssub * Montserrat-Numr/bold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{semibold}{sl}{
+      <-> ssub * Montserrat-Numr/semibold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/it
+\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{sl}{
+      <-> ssub * Montserrat-Numr/extrabold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{regular}{sl}{
-      <-> ssub * Montserrat-Numr/regular/it
+\DeclareFontShape{T1}{Montserrat-Numr}{thin}{sl}{
+      <-> ssub * Montserrat-Numr/thin/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{black}{sl}{
-      <-> ssub * Montserrat-Numr/black/it
+\DeclareFontShape{T1}{Montserrat-Numr}{extralight}{sl}{
+      <-> ssub * Montserrat-Numr/extralight/it
 }{}
 
 
 %   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-numr-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Numr}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-numr-t1
 }{}
 
+\DeclareFontShape{T1}{Montserrat-Numr}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-numr-t1
+}{}
+
 \DeclareFontShape{T1}{Montserrat-Numr}{light}{sl}{
       <-> ssub * Montserrat-Numr/light/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{medium}{sl}{
-      <-> ssub * Montserrat-Numr/medium/it
+\DeclareFontShape{T1}{Montserrat-Numr}{bold}{sl}{
+      <-> ssub * Montserrat-Numr/bold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{thin}{sl}{
-      <-> ssub * Montserrat-Numr/thin/it
+\DeclareFontShape{T1}{Montserrat-Numr}{medium}{sl}{
+      <-> ssub * Montserrat-Numr/medium/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-numr-t1
+\DeclareFontShape{T1}{Montserrat-Numr}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{extrabold}{sl}{
-      <-> ssub * Montserrat-Numr/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{black}{sl}{
+      <-> ssub * Montserrat-Numr/black/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-Numr}{ul}{it}{
-      <-> ssub * Montserrat-Numr/thin/it
+\DeclareFontShape{T1}{Montserrat-Numr}{ul}{sl}{
+      <-> alias * Montserrat-Numr/thin/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{ul}{n}{
-      <-> ssub * Montserrat-Numr/thin/n
+\DeclareFontShape{T1}{Montserrat-Numr}{ul}{it}{
+      <-> alias * Montserrat-Numr/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{ul}{sl}{
-      <-> ssub * Montserrat-Numr/thin/sl
+\DeclareFontShape{T1}{Montserrat-Numr}{ul}{n}{
+      <-> alias * Montserrat-Numr/thin/n
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-Numr}{el}{sl}{
-      <-> ssub * Montserrat-Numr/extralight/sl
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Numr}{el}{n}{
-      <-> ssub * Montserrat-Numr/extralight/n
+      <-> alias * Montserrat-Numr/extralight/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{el}{it}{
-      <-> ssub * Montserrat-Numr/extralight/it
+      <-> alias * Montserrat-Numr/extralight/it
 }{}
 
+\DeclareFontShape{T1}{Montserrat-Numr}{el}{sl}{
+      <-> alias * Montserrat-Numr/extralight/sl
+}{}
 
-%   l --> light
 
-\DeclareFontShape{T1}{Montserrat-Numr}{l}{n}{
-      <-> ssub * Montserrat-Numr/light/n
-}{}
+%   l --> light
 
 \DeclareFontShape{T1}{Montserrat-Numr}{l}{sl}{
-      <-> ssub * Montserrat-Numr/light/sl
+      <-> alias * Montserrat-Numr/light/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{l}{it}{
-      <-> ssub * Montserrat-Numr/light/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-Numr}{sl}{it}{
-      <-> ssub * Montserrat-Numr/regular/it
+      <-> alias * Montserrat-Numr/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{sl}{sl}{
-      <-> ssub * Montserrat-Numr/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Numr}{sl}{n}{
-      <-> ssub * Montserrat-Numr/regular/n
+\DeclareFontShape{T1}{Montserrat-Numr}{l}{n}{
+      <-> alias * Montserrat-Numr/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-Numr}{m}{it}{
-      <-> ssub * Montserrat-Numr/medium/it
+\DeclareFontShape{T1}{Montserrat-Numr}{m}{n}{
+      <-> alias * Montserrat-Numr/regular/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{m}{n}{
-      <-> ssub * Montserrat-Numr/medium/n
+\DeclareFontShape{T1}{Montserrat-Numr}{m}{it}{
+      <-> alias * Montserrat-Numr/regular/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{m}{sl}{
-      <-> ssub * Montserrat-Numr/medium/sl
+      <-> alias * Montserrat-Numr/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-Numr}{sb}{sl}{
-      <-> ssub * Montserrat-Numr/semibold/sl
+\DeclareFontShape{T1}{Montserrat-Numr}{sb}{it}{
+      <-> alias * Montserrat-Numr/semibold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{sb}{n}{
-      <-> ssub * Montserrat-Numr/semibold/n
+      <-> alias * Montserrat-Numr/semibold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{sb}{it}{
-      <-> ssub * Montserrat-Numr/semibold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{sb}{sl}{
+      <-> alias * Montserrat-Numr/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-Numr}{b}{n}{
-      <-> ssub * Montserrat-Numr/bold/n
+\DeclareFontShape{T1}{Montserrat-Numr}{b}{it}{
+      <-> alias * Montserrat-Numr/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{b}{sl}{
-      <-> ssub * Montserrat-Numr/bold/sl
+\DeclareFontShape{T1}{Montserrat-Numr}{b}{n}{
+      <-> alias * Montserrat-Numr/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{b}{it}{
-      <-> ssub * Montserrat-Numr/bold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{b}{sl}{
+      <-> alias * Montserrat-Numr/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-Numr}{eb}{sl}{
-      <-> ssub * Montserrat-Numr/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-Numr}{eb}{it}{
+      <-> alias * Montserrat-Numr/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{eb}{n}{
-      <-> ssub * Montserrat-Numr/extrabold/n
+      <-> alias * Montserrat-Numr/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{eb}{it}{
-      <-> ssub * Montserrat-Numr/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Numr}{eb}{sl}{
+      <-> alias * Montserrat-Numr/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-Numr}{ub}{it}{
-      <-> ssub * Montserrat-Numr/black/it
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Numr}{ub}{sl}{
-      <-> ssub * Montserrat-Numr/black/sl
+      <-> alias * Montserrat-Numr/black/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{ub}{n}{
-      <-> ssub * Montserrat-Numr/black/n
+      <-> alias * Montserrat-Numr/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Numr}{bx}{n}{
-      <-> ssub * Montserrat-Numr/b/n
+\DeclareFontShape{T1}{Montserrat-Numr}{ub}{it}{
+      <-> alias * Montserrat-Numr/black/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Numr}{bx}{sl}{
@@ -296,4 +285,8 @@
       <-> ssub * Montserrat-Numr/b/it
 }{}
 
+\DeclareFontShape{T1}{Montserrat-Numr}{bx}{n}{
+      <-> ssub * Montserrat-Numr/b/n
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-OsF.fd b/fonts/montserrat/tex/T1Montserrat-OsF.fd
index 3c91f2a20a..9d9106c240 100644
--- a/fonts/montserrat/tex/T1Montserrat-OsF.fd
+++ b/fonts/montserrat/tex/T1Montserrat-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,492 +20,469 @@
 \DeclareFontFamily{T1}{Montserrat-OsF}{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{sl}{
-      <-> ssub * Montserrat-OsF/light/it
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{light}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sl}{
+      <-> ssub * Montserrat-OsF/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sl}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scsl}{
+      <-> ssub * Montserrat-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sl}{
+      <-> ssub * Montserrat-OsF/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sl}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-OsF/extrabold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{scsl}{
+      <-> ssub * Montserrat-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{thin}{sl}{
+      <-> ssub * Montserrat-OsF/thin/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sl}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sl}{
+      <-> ssub * Montserrat-OsF/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{scsl}{
+      <-> ssub * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{light}{sl}{
+      <-> ssub * Montserrat-OsF/light/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{scsl}{
+      <-> ssub * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{bold}{sl}{
+      <-> ssub * Montserrat-OsF/bold/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{sc}{
       <-> \Montserrat@@scale Montserrat-Black-osf-sc-t1
 }{}
 
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-t1
+}{}
+
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{black}{sl}{
-      <-> ssub * Montserrat-OsF/black/it
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{black}{scsl}{
       <-> ssub * Montserrat-OsF/black/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-OsF}{black}{sl}{
+      <-> ssub * Montserrat-OsF/black/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-sc-t1
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-sc-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-t1
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{sl}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{scsl}{
+      <-> ssub * Montserrat-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{regular}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{medium}{sl}{
+      <-> ssub * Montserrat-OsF/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{it}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scsl}{
+      <-> alias * Montserrat-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scit}{
-      <-> ssub * Montserrat-OsF/thin/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sc}{
+      <-> alias * Montserrat-OsF/thin/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ul}{n}{
-      <-> ssub * Montserrat-OsF/thin/n
+      <-> alias * Montserrat-OsF/thin/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{sc}{
-      <-> ssub * Montserrat-OsF/thin/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{it}{
+      <-> alias * Montserrat-OsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scsl}{
-      <-> ssub * Montserrat-OsF/thin/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{ul}{scit}{
+      <-> alias * Montserrat-OsF/thin/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ul}{sl}{
-      <-> ssub * Montserrat-OsF/thin/sl
+      <-> alias * Montserrat-OsF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{
-      <-> ssub * Montserrat-OsF/extralight/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{
+      <-> alias * Montserrat-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{
-      <-> ssub * Montserrat-OsF/extralight/n
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{
+      <-> alias * Montserrat-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{
-      <-> ssub * Montserrat-OsF/extralight/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{sc}{
+      <-> alias * Montserrat-OsF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{n}{
+      <-> alias * Montserrat-OsF/extralight/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{el}{it}{
-      <-> ssub * Montserrat-OsF/extralight/it
+      <-> alias * Montserrat-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{el}{scit}{
-      <-> ssub * Montserrat-OsF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{el}{scsl}{
+      <-> alias * Montserrat-OsF/extralight/scsl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{n}{
-      <-> ssub * Montserrat-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{sc}{
-      <-> ssub * Montserrat-OsF/light/sc
-}{}
-
 \DeclareFontShape{T1}{Montserrat-OsF}{l}{scsl}{
-      <-> ssub * Montserrat-OsF/light/scsl
+      <-> alias * Montserrat-OsF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{sl}{
-      <-> ssub * Montserrat-OsF/light/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{sc}{
+      <-> alias * Montserrat-OsF/light/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{l}{it}{
-      <-> ssub * Montserrat-OsF/light/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{
-      <-> ssub * Montserrat-OsF/light/scit
+      <-> alias * Montserrat-OsF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sl}{
-      <-> ssub * Montserrat-OsF/regular/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{n}{
+      <-> alias * Montserrat-OsF/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scsl}{
-      <-> ssub * Montserrat-OsF/regular/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{scit}{
+      <-> alias * Montserrat-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{sc}{
-      <-> ssub * Montserrat-OsF/regular/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{l}{sl}{
+      <-> alias * Montserrat-OsF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{n}{
-      <-> ssub * Montserrat-OsF/regular/n
-}{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{scit}{
-      <-> ssub * Montserrat-OsF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sl}{it}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{sc}{
+      <-> alias * Montserrat-OsF/regular/sc
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{scit}{
-      <-> ssub * Montserrat-OsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{n}{
+      <-> alias * Montserrat-OsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{m}{it}{
-      <-> ssub * Montserrat-OsF/medium/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{
-      <-> ssub * Montserrat-OsF/medium/sl
+      <-> alias * Montserrat-OsF/regular/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{m}{scsl}{
-      <-> ssub * Montserrat-OsF/medium/scsl
+      <-> alias * Montserrat-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{sc}{
-      <-> ssub * Montserrat-OsF/medium/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{sl}{
+      <-> alias * Montserrat-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{m}{n}{
-      <-> ssub * Montserrat-OsF/medium/n
+\DeclareFontShape{T1}{Montserrat-OsF}{m}{scit}{
+      <-> alias * Montserrat-OsF/regular/scit
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{it}{
-      <-> ssub * Montserrat-OsF/semibold/it
+      <-> alias * Montserrat-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{
-      <-> ssub * Montserrat-OsF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{
+      <-> alias * Montserrat-OsF/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{sc}{
-      <-> ssub * Montserrat-OsF/semibold/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{sb}{n}{
-      <-> ssub * Montserrat-OsF/semibold/n
+      <-> alias * Montserrat-OsF/semibold/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{scsl}{
-      <-> ssub * Montserrat-OsF/semibold/scsl
+      <-> alias * Montserrat-OsF/semibold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{sb}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/sl
+      <-> alias * Montserrat-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-OsF}{sb}{scit}{
+      <-> alias * Montserrat-OsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{T1}{Montserrat-OsF}{b}{scsl}{
-      <-> ssub * Montserrat-OsF/bold/scsl
+      <-> alias * Montserrat-OsF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{b}{n}{
-      <-> ssub * Montserrat-OsF/bold/n
+      <-> alias * Montserrat-OsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{
-      <-> ssub * Montserrat-OsF/bold/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{
+      <-> alias * Montserrat-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{
-      <-> ssub * Montserrat-OsF/bold/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{sc}{
+      <-> alias * Montserrat-OsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{it}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{
+      <-> alias * Montserrat-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{b}{scit}{
-      <-> ssub * Montserrat-OsF/bold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{b}{sl}{
+      <-> alias * Montserrat-OsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{
-      <-> ssub * Montserrat-OsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{
+      <-> alias * Montserrat-OsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{
-      <-> ssub * Montserrat-OsF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{
+      <-> alias * Montserrat-OsF/extrabold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{
+      <-> alias * Montserrat-OsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sc}{
-      <-> ssub * Montserrat-OsF/extrabold/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{it}{
+      <-> alias * Montserrat-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{n}{
-      <-> ssub * Montserrat-OsF/extrabold/n
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scit}{
+      <-> alias * Montserrat-OsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{eb}{scsl}{
-      <-> ssub * Montserrat-OsF/extrabold/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{eb}{sl}{
+      <-> alias * Montserrat-OsF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scsl}{
-      <-> ssub * Montserrat-OsF/black/scsl
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scit}{
+      <-> alias * Montserrat-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sc}{
-      <-> ssub * Montserrat-OsF/black/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sl}{
+      <-> alias * Montserrat-OsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{n}{
-      <-> ssub * Montserrat-OsF/black/n
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scsl}{
+      <-> alias * Montserrat-OsF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sl}{
-      <-> ssub * Montserrat-OsF/black/sl
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{sc}{
+      <-> alias * Montserrat-OsF/black/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{ub}{it}{
-      <-> ssub * Montserrat-OsF/black/it
+      <-> alias * Montserrat-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{ub}{scit}{
-      <-> ssub * Montserrat-OsF/black/scit
+\DeclareFontShape{T1}{Montserrat-OsF}{ub}{n}{
+      <-> alias * Montserrat-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{
+      <-> ssub * Montserrat-OsF/b/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{bx}{sl}{
@@ -508,20 +493,16 @@
       <-> ssub * Montserrat-OsF/b/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{
-      <-> ssub * Montserrat-OsF/b/sc
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{
+      <-> ssub * Montserrat-OsF/b/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-OsF}{bx}{n}{
       <-> ssub * Montserrat-OsF/b/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{scit}{
-      <-> ssub * Montserrat-OsF/b/scit
-}{}
-
-\DeclareFontShape{T1}{Montserrat-OsF}{bx}{it}{
-      <-> ssub * Montserrat-OsF/b/it
+\DeclareFontShape{T1}{Montserrat-OsF}{bx}{sc}{
+      <-> ssub * Montserrat-OsF/b/sc
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-Sup.fd b/fonts/montserrat/tex/T1Montserrat-Sup.fd
index 30eab1bc6a..7d4fecbce3 100644
--- a/fonts/montserrat/tex/T1Montserrat-Sup.fd
+++ b/fonts/montserrat/tex/T1Montserrat-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,288 +20,273 @@
 \DeclareFontFamily{T1}{Montserrat-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{bold}{sl}{
-      <-> ssub * Montserrat-Sup/bold/it
+\DeclareFontShape{T1}{Montserrat-Sup}{regular}{sl}{
+      <-> ssub * Montserrat-Sup/regular/it
 }{}
 
 
 %   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-sup-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Sup}{semibold}{it}{
       <-> \Montserrat@@scale Montserrat-SemiBoldItalic-sup-t1
 }{}
 
+\DeclareFontShape{T1}{Montserrat-Sup}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-sup-t1
+}{}
+
 \DeclareFontShape{T1}{Montserrat-Sup}{semibold}{sl}{
       <-> ssub * Montserrat-Sup/semibold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/it
+\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{sl}{
+      <-> ssub * Montserrat-Sup/extrabold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{black}{sl}{
-      <-> ssub * Montserrat-Sup/black/it
+\DeclareFontShape{T1}{Montserrat-Sup}{thin}{sl}{
+      <-> ssub * Montserrat-Sup/thin/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{regular}{sl}{
-      <-> ssub * Montserrat-Sup/regular/it
+\DeclareFontShape{T1}{Montserrat-Sup}{light}{sl}{
+      <-> ssub * Montserrat-Sup/light/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{light}{sl}{
-      <-> ssub * Montserrat-Sup/light/it
+\DeclareFontShape{T1}{Montserrat-Sup}{extralight}{sl}{
+      <-> ssub * Montserrat-Sup/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{medium}{sl}{
-      <-> ssub * Montserrat-Sup/medium/it
+\DeclareFontShape{T1}{Montserrat-Sup}{bold}{sl}{
+      <-> ssub * Montserrat-Sup/bold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{thin}{sl}{
-      <-> ssub * Montserrat-Sup/thin/it
+\DeclareFontShape{T1}{Montserrat-Sup}{black}{sl}{
+      <-> ssub * Montserrat-Sup/black/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-sup-t1
+\DeclareFontShape{T1}{Montserrat-Sup}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{extrabold}{sl}{
-      <-> ssub * Montserrat-Sup/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Sup}{medium}{sl}{
+      <-> ssub * Montserrat-Sup/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{Montserrat-Sup}{ul}{sl}{
-      <-> ssub * Montserrat-Sup/thin/sl
+      <-> alias * Montserrat-Sup/thin/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{ul}{n}{
-      <-> ssub * Montserrat-Sup/thin/n
+\DeclareFontShape{T1}{Montserrat-Sup}{ul}{it}{
+      <-> alias * Montserrat-Sup/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{ul}{it}{
-      <-> ssub * Montserrat-Sup/thin/it
+\DeclareFontShape{T1}{Montserrat-Sup}{ul}{n}{
+      <-> alias * Montserrat-Sup/thin/n
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{T1}{Montserrat-Sup}{el}{sl}{
-      <-> ssub * Montserrat-Sup/extralight/sl
+      <-> alias * Montserrat-Sup/extralight/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{el}{n}{
-      <-> ssub * Montserrat-Sup/extralight/n
+      <-> alias * Montserrat-Sup/extralight/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{el}{it}{
-      <-> ssub * Montserrat-Sup/extralight/it
+      <-> alias * Montserrat-Sup/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{T1}{Montserrat-Sup}{l}{it}{
-      <-> ssub * Montserrat-Sup/light/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Sup}{l}{sl}{
-      <-> ssub * Montserrat-Sup/light/sl
+      <-> alias * Montserrat-Sup/light/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{l}{n}{
-      <-> ssub * Montserrat-Sup/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-Sup}{sl}{it}{
-      <-> ssub * Montserrat-Sup/regular/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-Sup}{sl}{sl}{
-      <-> ssub * Montserrat-Sup/regular/sl
+      <-> alias * Montserrat-Sup/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{sl}{n}{
-      <-> ssub * Montserrat-Sup/regular/n
+\DeclareFontShape{T1}{Montserrat-Sup}{l}{sl}{
+      <-> alias * Montserrat-Sup/light/sl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-Sup}{m}{n}{
-      <-> ssub * Montserrat-Sup/medium/n
+\DeclareFontShape{T1}{Montserrat-Sup}{m}{sl}{
+      <-> alias * Montserrat-Sup/regular/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{m}{sl}{
-      <-> ssub * Montserrat-Sup/medium/sl
+\DeclareFontShape{T1}{Montserrat-Sup}{m}{n}{
+      <-> alias * Montserrat-Sup/regular/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{m}{it}{
-      <-> ssub * Montserrat-Sup/medium/it
+      <-> alias * Montserrat-Sup/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-Sup}{sb}{it}{
-      <-> ssub * Montserrat-Sup/semibold/it
+\DeclareFontShape{T1}{Montserrat-Sup}{sb}{sl}{
+      <-> alias * Montserrat-Sup/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{sb}{n}{
-      <-> ssub * Montserrat-Sup/semibold/n
+\DeclareFontShape{T1}{Montserrat-Sup}{sb}{it}{
+      <-> alias * Montserrat-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{sb}{sl}{
-      <-> ssub * Montserrat-Sup/semibold/sl
+\DeclareFontShape{T1}{Montserrat-Sup}{sb}{n}{
+      <-> alias * Montserrat-Sup/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-Sup}{b}{it}{
-      <-> ssub * Montserrat-Sup/bold/it
+\DeclareFontShape{T1}{Montserrat-Sup}{b}{n}{
+      <-> alias * Montserrat-Sup/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{b}{n}{
-      <-> ssub * Montserrat-Sup/bold/n
+\DeclareFontShape{T1}{Montserrat-Sup}{b}{it}{
+      <-> alias * Montserrat-Sup/bold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{b}{sl}{
-      <-> ssub * Montserrat-Sup/bold/sl
+      <-> alias * Montserrat-Sup/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{T1}{Montserrat-Sup}{eb}{n}{
-      <-> ssub * Montserrat-Sup/extrabold/n
+      <-> alias * Montserrat-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{eb}{sl}{
-      <-> ssub * Montserrat-Sup/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-Sup}{eb}{it}{
+      <-> alias * Montserrat-Sup/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{eb}{it}{
-      <-> ssub * Montserrat-Sup/extrabold/it
+\DeclareFontShape{T1}{Montserrat-Sup}{eb}{sl}{
+      <-> alias * Montserrat-Sup/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-Sup}{ub}{it}{
-      <-> ssub * Montserrat-Sup/black/it
-}{}
-
 \DeclareFontShape{T1}{Montserrat-Sup}{ub}{sl}{
-      <-> ssub * Montserrat-Sup/black/sl
+      <-> alias * Montserrat-Sup/black/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{ub}{n}{
-      <-> ssub * Montserrat-Sup/black/n
+      <-> alias * Montserrat-Sup/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{bx}{n}{
-      <-> ssub * Montserrat-Sup/b/n
+\DeclareFontShape{T1}{Montserrat-Sup}{ub}{it}{
+      <-> alias * Montserrat-Sup/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-Sup}{bx}{sl}{
-      <-> ssub * Montserrat-Sup/b/sl
+\DeclareFontShape{T1}{Montserrat-Sup}{bx}{n}{
+      <-> ssub * Montserrat-Sup/b/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-Sup}{bx}{it}{
       <-> ssub * Montserrat-Sup/b/it
 }{}
 
+\DeclareFontShape{T1}{Montserrat-Sup}{bx}{sl}{
+      <-> ssub * Montserrat-Sup/b/sl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-TLF.fd b/fonts/montserrat/tex/T1Montserrat-TLF.fd
index 25fcaa7a73..303da9c477 100644
--- a/fonts/montserrat/tex/T1Montserrat-TLF.fd
+++ b/fonts/montserrat/tex/T1Montserrat-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -22,506 +30,479 @@
       <-> \Montserrat@@scale Montserrat-Thin-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{Montserrat-TLF}{thin}{it}{
       <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{thin}{sl}{
-      <-> ssub * Montserrat-TLF/thin/it
+\DeclareFontShape{T1}{Montserrat-TLF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{thin}{scsl}{
       <-> ssub * Montserrat-TLF/thin/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-TLF}{thin}{sl}{
+      <-> ssub * Montserrat-TLF/thin/it
+}{}
+
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{scsl}{
+      <-> ssub * Montserrat-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-TLF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{light}{sl}{
+      <-> ssub * Montserrat-TLF/light/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{sl}{
-      <-> ssub * Montserrat-TLF/light/it
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{light}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sl}{
+      <-> ssub * Montserrat-TLF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scit}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sl}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scsl}{
+      <-> ssub * Montserrat-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scsl}{
-      <-> ssub * Montserrat-TLF/medium/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sl}{
+      <-> ssub * Montserrat-TLF/bold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{scsl}{
+      <-> ssub * Montserrat-TLF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{medium}{sl}{
+      <-> ssub * Montserrat-TLF/medium/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TLF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{black}{it}{
       <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{black}{sl}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{T1}{Montserrat-TLF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{black}{scsl}{
       <-> ssub * Montserrat-TLF/black/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-TLF}{black}{sl}{
+      <-> ssub * Montserrat-TLF/black/it
+}{}
 
-%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-t1
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sl}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sl}{
+      <-> ssub * Montserrat-TLF/semibold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scit}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{sl}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{scsl}{
+      <-> ssub * Montserrat-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bold}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{regular}{sl}{
+      <-> ssub * Montserrat-TLF/regular/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TLF/extrabold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sc}{
-      <-> ssub * Montserrat-TLF/thin/sc
+\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sl}{
+      <-> alias * Montserrat-TLF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ul}{n}{
-      <-> ssub * Montserrat-TLF/thin/n
+\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scit}{
+      <-> alias * Montserrat-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scsl}{
-      <-> ssub * Montserrat-TLF/thin/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sc}{
+      <-> alias * Montserrat-TLF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ul}{sl}{
-      <-> ssub * Montserrat-TLF/thin/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{ul}{n}{
+      <-> alias * Montserrat-TLF/thin/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{ul}{it}{
-      <-> ssub * Montserrat-TLF/thin/it
+      <-> alias * Montserrat-TLF/thin/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scit}{
-      <-> ssub * Montserrat-TLF/thin/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{ul}{scsl}{
+      <-> alias * Montserrat-TLF/thin/scsl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{scit}{
+      <-> alias * Montserrat-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{sc}{
-      <-> ssub * Montserrat-TLF/extralight/sc
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{sl}{
+      <-> alias * Montserrat-TLF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{n}{
-      <-> ssub * Montserrat-TLF/extralight/n
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{scsl}{
+      <-> alias * Montserrat-TLF/extralight/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{scsl}{
-      <-> ssub * Montserrat-TLF/extralight/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{it}{
+      <-> alias * Montserrat-TLF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{scit}{
-      <-> ssub * Montserrat-TLF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{n}{
+      <-> alias * Montserrat-TLF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{el}{it}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{T1}{Montserrat-TLF}{el}{sc}{
+      <-> alias * Montserrat-TLF/extralight/sc
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{T1}{Montserrat-TLF}{l}{sl}{
-      <-> ssub * Montserrat-TLF/light/sl
+      <-> alias * Montserrat-TLF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{l}{scsl}{
-      <-> ssub * Montserrat-TLF/light/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{l}{scit}{
+      <-> alias * Montserrat-TLF/light/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{l}{n}{
-      <-> ssub * Montserrat-TLF/light/n
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TLF}{l}{sc}{
-      <-> ssub * Montserrat-TLF/light/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TLF}{l}{scit}{
-      <-> ssub * Montserrat-TLF/light/scit
+      <-> alias * Montserrat-TLF/light/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{l}{it}{
-      <-> ssub * Montserrat-TLF/light/it
+      <-> alias * Montserrat-TLF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{scit}{
-      <-> ssub * Montserrat-TLF/regular/scit
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{it}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{T1}{Montserrat-TLF}{l}{sc}{
+      <-> alias * Montserrat-TLF/light/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{sl}{
-      <-> ssub * Montserrat-TLF/regular/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{l}{scsl}{
+      <-> alias * Montserrat-TLF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{scsl}{
-      <-> ssub * Montserrat-TLF/regular/scsl
-}{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{sc}{
-      <-> ssub * Montserrat-TLF/regular/sc
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sl}{n}{
-      <-> ssub * Montserrat-TLF/regular/n
+\DeclareFontShape{T1}{Montserrat-TLF}{m}{scsl}{
+      <-> alias * Montserrat-TLF/regular/scsl
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{T1}{Montserrat-TLF}{m}{sl}{
-      <-> ssub * Montserrat-TLF/medium/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{m}{it}{
+      <-> alias * Montserrat-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{m}{scsl}{
-      <-> ssub * Montserrat-TLF/medium/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{m}{n}{
+      <-> alias * Montserrat-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{m}{sc}{
-      <-> ssub * Montserrat-TLF/medium/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TLF}{m}{n}{
-      <-> ssub * Montserrat-TLF/medium/n
+      <-> alias * Montserrat-TLF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{m}{scit}{
-      <-> ssub * Montserrat-TLF/medium/scit
+      <-> alias * Montserrat-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{m}{it}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{T1}{Montserrat-TLF}{m}{sl}{
+      <-> alias * Montserrat-TLF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scsl}{
+      <-> alias * Montserrat-TLF/semibold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{sb}{sc}{
-      <-> ssub * Montserrat-TLF/semibold/sc
+      <-> alias * Montserrat-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sb}{n}{
-      <-> ssub * Montserrat-TLF/semibold/n
+\DeclareFontShape{T1}{Montserrat-TLF}{sb}{it}{
+      <-> alias * Montserrat-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sb}{scsl}{
-      <-> ssub * Montserrat-TLF/semibold/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{sb}{n}{
+      <-> alias * Montserrat-TLF/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{sb}{scit}{
-      <-> ssub * Montserrat-TLF/semibold/scit
+      <-> alias * Montserrat-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{sb}{it}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{sb}{sl}{
+      <-> alias * Montserrat-TLF/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-TLF}{b}{it}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{b}{scit}{
+      <-> alias * Montserrat-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{b}{scit}{
-      <-> ssub * Montserrat-TLF/bold/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{b}{sl}{
+      <-> alias * Montserrat-TLF/bold/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{b}{scsl}{
-      <-> ssub * Montserrat-TLF/bold/scsl
+      <-> alias * Montserrat-TLF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{b}{n}{
-      <-> ssub * Montserrat-TLF/bold/n
+      <-> alias * Montserrat-TLF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{b}{sc}{
-      <-> ssub * Montserrat-TLF/bold/sc
+\DeclareFontShape{T1}{Montserrat-TLF}{b}{it}{
+      <-> alias * Montserrat-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{b}{sl}{
-      <-> ssub * Montserrat-TLF/bold/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{b}{sc}{
+      <-> alias * Montserrat-TLF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scsl}{
-      <-> ssub * Montserrat-TLF/extrabold/scsl
-}{}
-
 \DeclareFontShape{T1}{Montserrat-TLF}{eb}{sc}{
-      <-> ssub * Montserrat-TLF/extrabold/sc
+      <-> alias * Montserrat-TLF/extrabold/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{eb}{n}{
-      <-> ssub * Montserrat-TLF/extrabold/n
+      <-> alias * Montserrat-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{eb}{it}{
+      <-> alias * Montserrat-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{eb}{it}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-TLF}{eb}{scsl}{
+      <-> alias * Montserrat-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TLF}{eb}{sl}{
+      <-> alias * Montserrat-TLF/extrabold/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{eb}{scit}{
-      <-> ssub * Montserrat-TLF/extrabold/scit
+      <-> alias * Montserrat-TLF/extrabold/scit
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scit}{
-      <-> ssub * Montserrat-TLF/black/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scsl}{
+      <-> alias * Montserrat-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sc}{
+      <-> alias * Montserrat-TLF/black/sc
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{ub}{it}{
-      <-> ssub * Montserrat-TLF/black/it
+      <-> alias * Montserrat-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sl}{
-      <-> ssub * Montserrat-TLF/black/sl
+\DeclareFontShape{T1}{Montserrat-TLF}{ub}{n}{
+      <-> alias * Montserrat-TLF/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sc}{
-      <-> ssub * Montserrat-TLF/black/sc
+\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scit}{
+      <-> alias * Montserrat-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ub}{n}{
-      <-> ssub * Montserrat-TLF/black/n
+\DeclareFontShape{T1}{Montserrat-TLF}{ub}{sl}{
+      <-> alias * Montserrat-TLF/black/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{ub}{scsl}{
-      <-> ssub * Montserrat-TLF/black/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scit}{
+      <-> ssub * Montserrat-TLF/b/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scsl}{
-      <-> ssub * Montserrat-TLF/b/scsl
+\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sl}{
+      <-> ssub * Montserrat-TLF/b/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sc}{
-      <-> ssub * Montserrat-TLF/b/sc
+\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scsl}{
+      <-> ssub * Montserrat-TLF/b/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TLF}{bx}{n}{
       <-> ssub * Montserrat-TLF/b/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sl}{
-      <-> ssub * Montserrat-TLF/b/sl
-}{}
-
 \DeclareFontShape{T1}{Montserrat-TLF}{bx}{it}{
       <-> ssub * Montserrat-TLF/b/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TLF}{bx}{scit}{
-      <-> ssub * Montserrat-TLF/b/scit
+\DeclareFontShape{T1}{Montserrat-TLF}{bx}{sc}{
+      <-> ssub * Montserrat-TLF/b/sc
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1Montserrat-TOsF.fd b/fonts/montserrat/tex/T1Montserrat-TOsF.fd
index da2f4087e2..18bea93dfd 100644
--- a/fonts/montserrat/tex/T1Montserrat-TOsF.fd
+++ b/fonts/montserrat/tex/T1Montserrat-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1Montserrat-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/Montserrat-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/Montserrat-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,492 +20,473 @@
 \DeclareFontFamily{T1}{Montserrat-TOsF}{}
 
 
-%   ----  extralight  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scsl}{
+      <-> ssub * Montserrat-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sc}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scit}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sc}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scit}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sl}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scsl}{
+      <-> ssub * Montserrat-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/it
 }{}
 
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sc}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scit}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{regular}{n}{
       <-> \Montserrat@@scale Montserrat-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sc}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scit}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{regular}{scsl}{
       <-> ssub * Montserrat-TOsF/regular/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-TOsF}{regular}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/it
+}{}
 
-%   ----  bold  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1
-}{}
+%   ----  bold  ----
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scit}{
       <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sc}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bold}{n}{
       <-> \Montserrat@@scale Montserrat-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sc}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bold}{scsl}{
       <-> ssub * Montserrat-TOsF/bold/scit
 }{}
 
+\DeclareFontShape{T1}{Montserrat-TOsF}{bold}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/it
+}{}
 
-%   ----  semibold  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sc}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-sc-t1
+%   ----  black  ----
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scit}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sc}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scit}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{scsl}{
+      <-> ssub * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{semibold}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{black}{sl}{
+      <-> ssub * Montserrat-TOsF/black/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scit}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scit}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sc}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sc}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scsl}{
+      <-> ssub * Montserrat-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scsl}{
-      <-> ssub * Montserrat-TOsF/thin/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sl}{
+      <-> ssub * Montserrat-TOsF/medium/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scit}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sc}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sc}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scit}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{scsl}{
+      <-> ssub * Montserrat-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{extrabold}{scsl}{
-      <-> ssub * Montserrat-TOsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{thin}{sl}{
+      <-> ssub * Montserrat-TOsF/thin/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scit}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sc}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sc}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scit}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sl}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{scsl}{
+      <-> ssub * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{extralight}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scit}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sc}{
-      <-> \Montserrat@@scale Montserrat-Medium-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sc}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scit}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{scsl}{
+      <-> ssub * Montserrat-TOsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{medium}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{light}{sl}{
+      <-> ssub * Montserrat-TOsF/light/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sc}{
-      <-> ssub * Montserrat-TOsF/thin/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{n}{
-      <-> ssub * Montserrat-TOsF/thin/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scsl}{
+      <-> alias * Montserrat-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scsl}{
-      <-> ssub * Montserrat-TOsF/thin/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sc}{
+      <-> alias * Montserrat-TOsF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{n}{
+      <-> alias * Montserrat-TOsF/thin/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{ul}{it}{
-      <-> ssub * Montserrat-TOsF/thin/it
+      <-> alias * Montserrat-TOsF/thin/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{ul}{scit}{
-      <-> ssub * Montserrat-TOsF/thin/scit
+      <-> alias * Montserrat-TOsF/thin/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ul}{sl}{
+      <-> alias * Montserrat-TOsF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{
+      <-> alias * Montserrat-TOsF/extralight/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{el}{scit}{
-      <-> ssub * Montserrat-TOsF/extralight/scit
+      <-> alias * Montserrat-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{
-      <-> ssub * Montserrat-TOsF/extralight/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{
+      <-> alias * Montserrat-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{n}{
-      <-> ssub * Montserrat-TOsF/extralight/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{it}{
+      <-> alias * Montserrat-TOsF/extralight/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{el}{sc}{
-      <-> ssub * Montserrat-TOsF/extralight/sc
+      <-> alias * Montserrat-TOsF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{el}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{el}{scsl}{
+      <-> alias * Montserrat-TOsF/extralight/scsl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scsl}{
-      <-> ssub * Montserrat-TOsF/light/scsl
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{
-      <-> ssub * Montserrat-TOsF/light/sc
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{
-      <-> ssub * Montserrat-TOsF/light/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{
+      <-> alias * Montserrat-TOsF/light/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{l}{sl}{
-      <-> ssub * Montserrat-TOsF/light/sl
+      <-> alias * Montserrat-TOsF/light/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{
-      <-> ssub * Montserrat-TOsF/light/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scit}{
-      <-> ssub * Montserrat-TOsF/light/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{scsl}{
+      <-> alias * Montserrat-TOsF/light/scsl
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{sc}{
+      <-> alias * Montserrat-TOsF/light/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scsl}{
-      <-> ssub * Montserrat-TOsF/regular/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{n}{
+      <-> alias * Montserrat-TOsF/light/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{n}{
-      <-> ssub * Montserrat-TOsF/regular/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{l}{it}{
+      <-> alias * Montserrat-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{sc}{
-      <-> ssub * Montserrat-TOsF/regular/sc
-}{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{scit}{
-      <-> ssub * Montserrat-TOsF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sl}{it}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{
+      <-> alias * Montserrat-TOsF/regular/scit
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{T1}{Montserrat-TOsF}{m}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/sl
+      <-> alias * Montserrat-TOsF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{m}{scsl}{
-      <-> ssub * Montserrat-TOsF/medium/scsl
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{
-      <-> ssub * Montserrat-TOsF/medium/n
+      <-> alias * Montserrat-TOsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{m}{sc}{
-      <-> ssub * Montserrat-TOsF/medium/sc
+      <-> alias * Montserrat-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{scit}{
-      <-> ssub * Montserrat-TOsF/medium/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{
+      <-> alias * Montserrat-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{m}{it}{
-      <-> ssub * Montserrat-TOsF/medium/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{m}{n}{
+      <-> alias * Montserrat-TOsF/regular/n
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scit}{
-      <-> ssub * Montserrat-TOsF/semibold/scit
-}{}
-
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{it}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+      <-> alias * Montserrat-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{n}{
+      <-> alias * Montserrat-TOsF/semibold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sc}{
-      <-> ssub * Montserrat-TOsF/semibold/sc
+      <-> alias * Montserrat-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{n}{
-      <-> ssub * Montserrat-TOsF/semibold/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scsl}{
+      <-> alias * Montserrat-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scsl}{
-      <-> ssub * Montserrat-TOsF/semibold/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{sl}{
+      <-> alias * Montserrat-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{sb}{scit}{
+      <-> alias * Montserrat-TOsF/semibold/scit
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{
+      <-> alias * Montserrat-TOsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{
-      <-> ssub * Montserrat-TOsF/bold/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{it}{
+      <-> alias * Montserrat-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{
-      <-> ssub * Montserrat-TOsF/bold/sc
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{
+      <-> alias * Montserrat-TOsF/bold/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{n}{
-      <-> ssub * Montserrat-TOsF/bold/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{sc}{
+      <-> alias * Montserrat-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scsl}{
-      <-> ssub * Montserrat-TOsF/bold/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{b}{scit}{
+      <-> alias * Montserrat-TOsF/bold/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{b}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/sl
+      <-> alias * Montserrat-TOsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{
-      <-> ssub * Montserrat-TOsF/extrabold/scit
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{
+      <-> alias * Montserrat-TOsF/extrabold/scsl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{eb}{it}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/sl
+      <-> alias * Montserrat-TOsF/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{eb}{n}{
-      <-> ssub * Montserrat-TOsF/extrabold/n
+      <-> alias * Montserrat-TOsF/extrabold/n
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sc}{
-      <-> ssub * Montserrat-TOsF/extrabold/sc
+      <-> alias * Montserrat-TOsF/extrabold/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scsl}{
-      <-> ssub * Montserrat-TOsF/extrabold/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{scit}{
+      <-> alias * Montserrat-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{eb}{sl}{
+      <-> alias * Montserrat-TOsF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sl}{
-      <-> ssub * Montserrat-TOsF/black/sl
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sc}{
+      <-> alias * Montserrat-TOsF/black/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scsl}{
-      <-> ssub * Montserrat-TOsF/black/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{n}{
+      <-> alias * Montserrat-TOsF/black/n
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{n}{
-      <-> ssub * Montserrat-TOsF/black/n
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{it}{
+      <-> alias * Montserrat-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sc}{
-      <-> ssub * Montserrat-TOsF/black/sc
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scsl}{
+      <-> alias * Montserrat-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{sl}{
+      <-> alias * Montserrat-TOsF/black/sl
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{ub}{scit}{
-      <-> ssub * Montserrat-TOsF/black/scit
+      <-> alias * Montserrat-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{ub}{it}{
-      <-> ssub * Montserrat-TOsF/black/it
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{
+      <-> ssub * Montserrat-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{
+      <-> ssub * Montserrat-TOsF/b/it
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bx}{n}{
@@ -508,20 +497,12 @@
       <-> ssub * Montserrat-TOsF/b/sc
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scsl}{
-      <-> ssub * Montserrat-TOsF/b/scsl
+\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{
+      <-> ssub * Montserrat-TOsF/b/scit
 }{}
 
 \DeclareFontShape{T1}{Montserrat-TOsF}{bx}{sl}{
       <-> ssub * Montserrat-TOsF/b/sl
 }{}
 
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{it}{
-      <-> ssub * Montserrat-TOsF/b/it
-}{}
-
-\DeclareFontShape{T1}{Montserrat-TOsF}{bx}{scit}{
-      <-> ssub * Montserrat-TOsF/b/scit
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd b/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
index 85c54bd689..06845e24b9 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-Dnom.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-Dnom.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-Dnom.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,18 +20,33 @@
 \DeclareFontFamily{T1}{MontserratAlternates-Dnom}{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/semibold/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/bold/it
 }{}
 
 
@@ -42,18 +65,18 @@
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/extrabold/it
 }{}
 
 
@@ -74,226 +97,196 @@
 
 %   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Regular-dnom-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-dnom-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{regular}{sl}{
       <-> ssub * MontserratAlternates-Dnom/regular/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{light}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/light/it
 }{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-dnom-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-dnom-t1
-}{}
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-t1
 }{}
 
-
-%   ----  extralight  ----
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-dnom-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{extralight}{sl}{
       <-> ssub * MontserratAlternates-Dnom/extralight/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-dnom-t1
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-dnom-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Dnom/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/thin/sl
+      <-> alias * MontserratAlternates-Dnom/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{it}{
-      <-> ssub * MontserratAlternates-Dnom/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{n}{
+      <-> alias * MontserratAlternates-Dnom/thin/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{n}{
-      <-> ssub * MontserratAlternates-Dnom/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ul}{it}{
+      <-> alias * MontserratAlternates-Dnom/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{
+      <-> alias * MontserratAlternates-Dnom/extralight/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{n}{
+      <-> alias * MontserratAlternates-Dnom/extralight/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{el}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extralight/sl
+      <-> alias * MontserratAlternates-Dnom/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{it}{
-      <-> ssub * MontserratAlternates-Dnom/light/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/light/sl
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{n}{
-      <-> ssub * MontserratAlternates-Dnom/light/n
+      <-> alias * MontserratAlternates-Dnom/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{n}{
-      <-> ssub * MontserratAlternates-Dnom/regular/n
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{it}{
-      <-> ssub * MontserratAlternates-Dnom/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{sl}{
+      <-> alias * MontserratAlternates-Dnom/light/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{l}{it}{
+      <-> alias * MontserratAlternates-Dnom/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/medium/sl
+      <-> alias * MontserratAlternates-Dnom/regular/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{it}{
-      <-> ssub * MontserratAlternates-Dnom/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{n}{
+      <-> alias * MontserratAlternates-Dnom/regular/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{n}{
-      <-> ssub * MontserratAlternates-Dnom/medium/n
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{m}{it}{
+      <-> alias * MontserratAlternates-Dnom/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/it
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/sl
+      <-> alias * MontserratAlternates-Dnom/semibold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/semibold/n
+      <-> alias * MontserratAlternates-Dnom/semibold/n
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{sb}{it}{
+      <-> alias * MontserratAlternates-Dnom/semibold/it
+}{}
 
-%   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{it}{
-      <-> ssub * MontserratAlternates-Dnom/bold/it
-}{}
+%   b --> bold
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/bold/sl
+      <-> alias * MontserratAlternates-Dnom/bold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{n}{
-      <-> ssub * MontserratAlternates-Dnom/bold/n
+      <-> alias * MontserratAlternates-Dnom/bold/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{b}{it}{
+      <-> alias * MontserratAlternates-Dnom/bold/it
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/sl
+      <-> alias * MontserratAlternates-Dnom/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{n}{
-      <-> ssub * MontserratAlternates-Dnom/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{eb}{it}{
+      <-> alias * MontserratAlternates-Dnom/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{n}{
-      <-> ssub * MontserratAlternates-Dnom/black/n
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{sl}{
+      <-> alias * MontserratAlternates-Dnom/black/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{it}{
-      <-> ssub * MontserratAlternates-Dnom/black/it
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{n}{
+      <-> alias * MontserratAlternates-Dnom/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Dnom/black/sl
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{ub}{it}{
+      <-> alias * MontserratAlternates-Dnom/black/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{n}{
       <-> ssub * MontserratAlternates-Dnom/b/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{it}{
-      <-> ssub * MontserratAlternates-Dnom/b/it
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{sl}{
       <-> ssub * MontserratAlternates-Dnom/b/sl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Dnom}{bx}{it}{
+      <-> ssub * MontserratAlternates-Dnom/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-Inf.fd b/fonts/montserrat/tex/T1MontserratAlternates-Inf.fd
index 51f9ea54ab..3044398fcb 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-Inf.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-Inf.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-Inf.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-Inf.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,93 +20,78 @@
 \DeclareFontFamily{T1}{MontserratAlternates-Inf}{}
 
 
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-t1
-}{}
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-t1
 }{}
 
-
-%   ----  thin  ----
-
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Thin-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-inf-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{thin}{sl}{
       <-> ssub * MontserratAlternates-Inf/thin/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Inf/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{sl}{
+      <-> ssub * MontserratAlternates-Inf/light/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Inf/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Inf/regular/it
 }{}
 
 
-%   ----  light  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{light}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{black}{sl}{
+      <-> ssub * MontserratAlternates-Inf/black/it
 }{}
 
 
@@ -132,168 +125,168 @@
 }{}
 
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-inf-t1
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/semibold/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{n}{
-      <-> ssub * MontserratAlternates-Inf/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{it}{
-      <-> ssub * MontserratAlternates-Inf/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-inf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Inf/thin/sl
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Inf/bold/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{n}{
-      <-> ssub * MontserratAlternates-Inf/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{it}{
+      <-> alias * MontserratAlternates-Inf/thin/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extralight/sl
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{sl}{
+      <-> alias * MontserratAlternates-Inf/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{it}{
-      <-> ssub * MontserratAlternates-Inf/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{ul}{n}{
+      <-> alias * MontserratAlternates-Inf/thin/n
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{n}{
-      <-> ssub * MontserratAlternates-Inf/light/n
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{sl}{
+      <-> alias * MontserratAlternates-Inf/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{sl}{
-      <-> ssub * MontserratAlternates-Inf/light/sl
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{n}{
+      <-> alias * MontserratAlternates-Inf/extralight/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{it}{
-      <-> ssub * MontserratAlternates-Inf/light/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{el}{it}{
+      <-> alias * MontserratAlternates-Inf/extralight/it
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Inf/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{it}{
+      <-> alias * MontserratAlternates-Inf/light/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{it}{
-      <-> ssub * MontserratAlternates-Inf/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{sl}{
+      <-> alias * MontserratAlternates-Inf/light/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{sl}{n}{
-      <-> ssub * MontserratAlternates-Inf/regular/n
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{l}{n}{
+      <-> alias * MontserratAlternates-Inf/light/n
 }{}
 
 
-%   m --> medium
-
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{it}{
-      <-> ssub * MontserratAlternates-Inf/medium/it
-}{}
+%   m --> regular
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{sl}{
-      <-> ssub * MontserratAlternates-Inf/medium/sl
+      <-> alias * MontserratAlternates-Inf/regular/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{n}{
-      <-> ssub * MontserratAlternates-Inf/medium/n
+      <-> alias * MontserratAlternates-Inf/regular/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{m}{it}{
+      <-> alias * MontserratAlternates-Inf/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{n}{
-      <-> ssub * MontserratAlternates-Inf/semibold/n
+      <-> alias * MontserratAlternates-Inf/semibold/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/semibold/sl
+      <-> alias * MontserratAlternates-Inf/semibold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{sb}{it}{
-      <-> ssub * MontserratAlternates-Inf/semibold/it
+      <-> alias * MontserratAlternates-Inf/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{n}{
-      <-> ssub * MontserratAlternates-Inf/bold/n
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{it}{
-      <-> ssub * MontserratAlternates-Inf/bold/it
+      <-> alias * MontserratAlternates-Inf/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{sl}{
-      <-> ssub * MontserratAlternates-Inf/bold/sl
+      <-> alias * MontserratAlternates-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{b}{n}{
+      <-> alias * MontserratAlternates-Inf/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/sl
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{it}{
+      <-> alias * MontserratAlternates-Inf/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{it}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{sl}{
+      <-> alias * MontserratAlternates-Inf/extrabold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{eb}{n}{
-      <-> ssub * MontserratAlternates-Inf/extrabold/n
+      <-> alias * MontserratAlternates-Inf/extrabold/n
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{n}{
-      <-> ssub * MontserratAlternates-Inf/black/n
+      <-> alias * MontserratAlternates-Inf/black/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Inf/black/sl
+      <-> alias * MontserratAlternates-Inf/black/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{ub}{it}{
-      <-> ssub * MontserratAlternates-Inf/black/it
+      <-> alias * MontserratAlternates-Inf/black/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{bx}{sl}{
       <-> ssub * MontserratAlternates-Inf/b/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Inf}{bx}{it}{
-      <-> ssub * MontserratAlternates-Inf/b/it
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Inf}{bx}{n}{
       <-> ssub * MontserratAlternates-Inf/b/n
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Inf}{bx}{it}{
+      <-> ssub * MontserratAlternates-Inf/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-LF.fd b/fonts/montserrat/tex/T1MontserratAlternates-LF.fd
index be7a5cf1aa..39e2280664 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-LF.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-LF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,516 +20,489 @@
 \DeclareFontFamily{T1}{MontserratAlternates-LF}{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-LF/regular/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sl}{
+      <-> ssub * MontserratAlternates-LF/black/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-LF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-LF/thin/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sl}{
+      <-> ssub * MontserratAlternates-LF/light/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-LF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-LF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-LF/medium/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-LF/bold/it
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{light}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-LF/semibold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{black}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-t1
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-LF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-LF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-LF/medium/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-LF/thin/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sc}{
+      <-> alias * MontserratAlternates-LF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{n}{
-      <-> ssub * MontserratAlternates-LF/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sl}{
+      <-> alias * MontserratAlternates-LF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-LF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{n}{
+      <-> alias * MontserratAlternates-LF/thin/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{it}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+      <-> alias * MontserratAlternates-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-LF/thin/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-LF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ul}{scit}{
+      <-> alias * MontserratAlternates-LF/thin/scit
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extralight/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scit}{
+      <-> alias * MontserratAlternates-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{n}{
-      <-> ssub * MontserratAlternates-LF/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{it}{
+      <-> alias * MontserratAlternates-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scit}{
-      <-> ssub * MontserratAlternates-LF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{scsl}{
+      <-> alias * MontserratAlternates-LF/extralight/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{it}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{n}{
+      <-> alias * MontserratAlternates-LF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sc}{
-      <-> ssub * MontserratAlternates-LF/extralight/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sl}{
+      <-> alias * MontserratAlternates-LF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{el}{sc}{
+      <-> alias * MontserratAlternates-LF/extralight/sc
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scit}{
-      <-> ssub * MontserratAlternates-LF/light/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sc}{
+      <-> alias * MontserratAlternates-LF/light/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{l}{n}{
-      <-> ssub * MontserratAlternates-LF/light/n
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-LF/light/scsl
+      <-> alias * MontserratAlternates-LF/light/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{sc}{
-      <-> ssub * MontserratAlternates-LF/light/sc
+      <-> alias * MontserratAlternates-LF/light/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{l}{it}{
-      <-> ssub * MontserratAlternates-LF/light/it
+      <-> alias * MontserratAlternates-LF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{it}{
-      <-> ssub * MontserratAlternates-LF/regular/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-LF/regular/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scsl}{
+      <-> alias * MontserratAlternates-LF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{l}{scit}{
+      <-> alias * MontserratAlternates-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-LF/regular/scsl
-}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{n}{
-      <-> ssub * MontserratAlternates-LF/regular/n
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-LF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{n}{
+      <-> alias * MontserratAlternates-LF/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/sl
+      <-> alias * MontserratAlternates-LF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{m}{sc}{
-      <-> ssub * MontserratAlternates-LF/medium/sc
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{it}{
-      <-> ssub * MontserratAlternates-LF/medium/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{n}{
-      <-> ssub * MontserratAlternates-LF/medium/n
+      <-> alias * MontserratAlternates-LF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scit}{
-      <-> ssub * MontserratAlternates-LF/medium/scit
+      <-> alias * MontserratAlternates-LF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-LF/medium/scsl
+      <-> alias * MontserratAlternates-LF/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-LF}{m}{it}{
+      <-> alias * MontserratAlternates-LF/regular/it
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/semibold/scsl
+      <-> alias * MontserratAlternates-LF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{n}{
-      <-> ssub * MontserratAlternates-LF/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{it}{
+      <-> alias * MontserratAlternates-LF/semibold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-LF/semibold/scit
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{it}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+      <-> alias * MontserratAlternates-LF/semibold/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-LF/semibold/sc
+      <-> alias * MontserratAlternates-LF/semibold/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/sl
+      <-> alias * MontserratAlternates-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-LF}{sb}{n}{
+      <-> alias * MontserratAlternates-LF/semibold/n
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-LF/bold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sl}{
+      <-> alias * MontserratAlternates-LF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scit}{
-      <-> ssub * MontserratAlternates-LF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{n}{
+      <-> alias * MontserratAlternates-LF/bold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{n}{
-      <-> ssub * MontserratAlternates-LF/bold/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sc}{
+      <-> alias * MontserratAlternates-LF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{it}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scit}{
+      <-> alias * MontserratAlternates-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sc}{
-      <-> ssub * MontserratAlternates-LF/bold/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{scsl}{
+      <-> alias * MontserratAlternates-LF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{b}{it}{
+      <-> alias * MontserratAlternates-LF/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scit}{
+      <-> alias * MontserratAlternates-LF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{it}{
+      <-> alias * MontserratAlternates-LF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{it}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scsl}{
+      <-> alias * MontserratAlternates-LF/extrabold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{n}{
-      <-> ssub * MontserratAlternates-LF/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sl}{
+      <-> alias * MontserratAlternates-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{n}{
+      <-> alias * MontserratAlternates-LF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{eb}{sc}{
+      <-> alias * MontserratAlternates-LF/extrabold/sc
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-LF/black/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sc}{
+      <-> alias * MontserratAlternates-LF/black/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{n}{
-      <-> ssub * MontserratAlternates-LF/black/n
+      <-> alias * MontserratAlternates-LF/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-LF/black/scit
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sl}{
+      <-> alias * MontserratAlternates-LF/black/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{it}{
-      <-> ssub * MontserratAlternates-LF/black/it
+      <-> alias * MontserratAlternates-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-LF/black/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-LF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{ub}{scit}{
+      <-> alias * MontserratAlternates-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-LF/b/scsl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{it}{
+      <-> ssub * MontserratAlternates-LF/b/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{n}{
-      <-> ssub * MontserratAlternates-LF/b/n
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-LF/b/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{scit}{
       <-> ssub * MontserratAlternates-LF/b/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{it}{
-      <-> ssub * MontserratAlternates-LF/b/it
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-LF/b/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-LF/b/sl
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{n}{
+      <-> ssub * MontserratAlternates-LF/b/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-LF/b/sc
+\DeclareFontShape{T1}{MontserratAlternates-LF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-LF/b/sl
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-Numr.fd b/fonts/montserrat/tex/T1MontserratAlternates-Numr.fd
index f391ddec86..6c468663ae 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-Numr.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-Numr.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-Numr.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-Numr.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,33 +20,48 @@
 \DeclareFontFamily{T1}{MontserratAlternates-Numr}{}
 
 
-%   ----  bold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Numr/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Numr/medium/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-numr-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-numr-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Numr/bold/it
 }{}
 
 
@@ -72,33 +95,33 @@
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Numr/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Numr/extralight/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Numr/thin/it
 }{}
 
 
@@ -117,175 +140,141 @@
 }{}
 
 
-%   ----  extrabold  ----
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-numr-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-numr-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
-}{}
-
-
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-numr-t1
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-numr-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Numr/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Numr/thin/sl
+      <-> alias * MontserratAlternates-Numr/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{it}{
-      <-> ssub * MontserratAlternates-Numr/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{n}{
+      <-> alias * MontserratAlternates-Numr/thin/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{n}{
-      <-> ssub * MontserratAlternates-Numr/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{ul}{it}{
+      <-> alias * MontserratAlternates-Numr/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{n}{
-      <-> ssub * MontserratAlternates-Numr/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{sl}{
+      <-> alias * MontserratAlternates-Numr/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{it}{
-      <-> ssub * MontserratAlternates-Numr/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{n}{
+      <-> alias * MontserratAlternates-Numr/extralight/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extralight/sl
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{el}{it}{
+      <-> alias * MontserratAlternates-Numr/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{it}{
-      <-> ssub * MontserratAlternates-Numr/light/it
+      <-> alias * MontserratAlternates-Numr/light/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{sl}{
-      <-> ssub * MontserratAlternates-Numr/light/sl
+      <-> alias * MontserratAlternates-Numr/light/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{l}{n}{
-      <-> ssub * MontserratAlternates-Numr/light/n
+      <-> alias * MontserratAlternates-Numr/light/n
 }{}
 
 
-%   sl --> regular
+%   m --> regular
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{it}{
-      <-> ssub * MontserratAlternates-Numr/regular/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Numr/regular/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{sl}{n}{
-      <-> ssub * MontserratAlternates-Numr/regular/n
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{n}{
+      <-> alias * MontserratAlternates-Numr/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{sl}{
-      <-> ssub * MontserratAlternates-Numr/medium/sl
+      <-> alias * MontserratAlternates-Numr/regular/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{it}{
-      <-> ssub * MontserratAlternates-Numr/medium/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{m}{n}{
-      <-> ssub * MontserratAlternates-Numr/medium/n
+      <-> alias * MontserratAlternates-Numr/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{n}{
-      <-> ssub * MontserratAlternates-Numr/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{sl}{
+      <-> alias * MontserratAlternates-Numr/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/semibold/sl
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{n}{
+      <-> alias * MontserratAlternates-Numr/semibold/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{sb}{it}{
-      <-> ssub * MontserratAlternates-Numr/semibold/it
+      <-> alias * MontserratAlternates-Numr/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{it}{
-      <-> ssub * MontserratAlternates-Numr/bold/it
+      <-> alias * MontserratAlternates-Numr/bold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{sl}{
-      <-> ssub * MontserratAlternates-Numr/bold/sl
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{n}{
+      <-> alias * MontserratAlternates-Numr/bold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{n}{
-      <-> ssub * MontserratAlternates-Numr/bold/n
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{b}{sl}{
+      <-> alias * MontserratAlternates-Numr/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{it}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/it
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/sl
+      <-> alias * MontserratAlternates-Numr/extrabold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{n}{
-      <-> ssub * MontserratAlternates-Numr/extrabold/n
+      <-> alias * MontserratAlternates-Numr/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{eb}{it}{
+      <-> alias * MontserratAlternates-Numr/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Numr/black/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{it}{
-      <-> ssub * MontserratAlternates-Numr/black/it
+      <-> alias * MontserratAlternates-Numr/black/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{n}{
-      <-> ssub * MontserratAlternates-Numr/black/n
+      <-> alias * MontserratAlternates-Numr/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Numr}{bx}{it}{
-      <-> ssub * MontserratAlternates-Numr/b/it
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{ub}{it}{
+      <-> alias * MontserratAlternates-Numr/black/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Numr}{bx}{sl}{
@@ -296,4 +285,8 @@
       <-> ssub * MontserratAlternates-Numr/b/n
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-Numr}{bx}{it}{
+      <-> ssub * MontserratAlternates-Numr/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-OsF.fd b/fonts/montserrat/tex/T1MontserratAlternates-OsF.fd
index 7635e8cee0..3e53b9be2d 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-OsF.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,219 +20,219 @@
 \DeclareFontFamily{T1}{MontserratAlternates-OsF}{}
 
 
-%   ----  bold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-OsF/regular/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/medium/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-OsF/thin/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-t1
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-OsF/medium/it
 }{}
 
 
@@ -234,14 +242,14 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-sc-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-sc-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{extrabold}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-t1
 }{}
@@ -255,273 +263,246 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sl}{
+      <-> alias * MontserratAlternates-OsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-OsF/thin/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{n}{
+      <-> alias * MontserratAlternates-OsF/thin/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/sl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{sc}{
+      <-> alias * MontserratAlternates-OsF/thin/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/thin/scsl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scit}{
+      <-> alias * MontserratAlternates-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-OsF/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-OsF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ul}{it}{
+      <-> alias * MontserratAlternates-OsF/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{it}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{n}{
+      <-> alias * MontserratAlternates-OsF/extralight/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sl
+      <-> alias * MontserratAlternates-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scsl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{sc}{
+      <-> alias * MontserratAlternates-OsF/extralight/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extralight/scit
+      <-> alias * MontserratAlternates-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{n}{
-      <-> ssub * MontserratAlternates-OsF/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{scsl}{
+      <-> alias * MontserratAlternates-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{el}{it}{
+      <-> alias * MontserratAlternates-OsF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-OsF/light/scit
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{n}{
-      <-> ssub * MontserratAlternates-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/light/scsl
+      <-> alias * MontserratAlternates-OsF/light/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/sl
+      <-> alias * MontserratAlternates-OsF/light/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-OsF/light/sc
+      <-> alias * MontserratAlternates-OsF/light/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{it}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scit}{
+      <-> alias * MontserratAlternates-OsF/light/scit
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-OsF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{scsl}{
+      <-> alias * MontserratAlternates-OsF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-OsF/regular/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{l}{it}{
+      <-> alias * MontserratAlternates-OsF/light/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/regular/scsl
-}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/sl
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-OsF/regular/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sl}{
+      <-> alias * MontserratAlternates-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{n}{
+      <-> alias * MontserratAlternates-OsF/regular/n
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{n}{
-      <-> ssub * MontserratAlternates-OsF/medium/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sc}{
+      <-> alias * MontserratAlternates-OsF/regular/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-OsF/medium/scit
+      <-> alias * MontserratAlternates-OsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/medium/scsl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-OsF/medium/sc
+      <-> alias * MontserratAlternates-OsF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{m}{it}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
+      <-> alias * MontserratAlternates-OsF/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{n}{
+      <-> alias * MontserratAlternates-OsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{sc}{
+      <-> alias * MontserratAlternates-OsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-OsF/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-OsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{sb}{it}{
+      <-> alias * MontserratAlternates-OsF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{it}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-OsF/bold/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scit}{
+      <-> alias * MontserratAlternates-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/sl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{it}{
+      <-> alias * MontserratAlternates-OsF/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/bold/scsl
+      <-> alias * MontserratAlternates-OsF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-OsF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sl}{
+      <-> alias * MontserratAlternates-OsF/bold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{n}{
-      <-> ssub * MontserratAlternates-OsF/bold/n
+      <-> alias * MontserratAlternates-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{b}{sc}{
+      <-> alias * MontserratAlternates-OsF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scsl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/scit
+      <-> alias * MontserratAlternates-OsF/extrabold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{it}{
+      <-> alias * MontserratAlternates-OsF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-OsF/extrabold/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sc
+      <-> alias * MontserratAlternates-OsF/extrabold/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sl
+      <-> alias * MontserratAlternates-OsF/extrabold/sl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{eb}{n}{
+      <-> alias * MontserratAlternates-OsF/extrabold/n
+}{}
 
-%   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/sl
-}{}
+%   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-OsF/black/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scit}{
+      <-> alias * MontserratAlternates-OsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-OsF/black/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-OsF/black/n
+      <-> alias * MontserratAlternates-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-OsF/black/scit
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-OsF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/black/scsl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{n}{
+      <-> alias * MontserratAlternates-OsF/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-OsF/b/sl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-OsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-OsF/b/sc
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-OsF/black/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{it}{
       <-> ssub * MontserratAlternates-OsF/b/it
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-OsF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scit}{
       <-> ssub * MontserratAlternates-OsF/b/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{n}{
-      <-> ssub * MontserratAlternates-OsF/b/n
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-OsF/b/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-OsF/b/scsl
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-OsF}{bx}{n}{
+      <-> ssub * MontserratAlternates-OsF/b/n
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-Sup.fd b/fonts/montserrat/tex/T1MontserratAlternates-Sup.fd
index d267bbd283..e359956499 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-Sup.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-Sup.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-Sup.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,288 +20,273 @@
 \DeclareFontFamily{T1}{MontserratAlternates-Sup}{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{sl}{
+      <-> ssub * MontserratAlternates-Sup/medium/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/extrabold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{sl}{
-      <-> ssub * MontserratAlternates-Sup/black/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/semibold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{sl}{
-      <-> ssub * MontserratAlternates-Sup/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{bold}{sl}{
+      <-> ssub * MontserratAlternates-Sup/bold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{thin}{sl}{
+      <-> ssub * MontserratAlternates-Sup/thin/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{medium}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{sl}{
+      <-> ssub * MontserratAlternates-Sup/light/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{light}{sl}{
-      <-> ssub * MontserratAlternates-Sup/light/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-Sup/extralight/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{regular}{sl}{
+      <-> ssub * MontserratAlternates-Sup/regular/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-sup-t1
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{black}{sl}{
+      <-> ssub * MontserratAlternates-Sup/black/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{it}{
-      <-> ssub * MontserratAlternates-Sup/thin/it
+      <-> alias * MontserratAlternates-Sup/thin/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{sl}{
-      <-> ssub * MontserratAlternates-Sup/thin/sl
+      <-> alias * MontserratAlternates-Sup/thin/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{ul}{n}{
-      <-> ssub * MontserratAlternates-Sup/thin/n
+      <-> alias * MontserratAlternates-Sup/thin/n
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{n}{
-      <-> ssub * MontserratAlternates-Sup/extralight/n
+      <-> alias * MontserratAlternates-Sup/extralight/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{it}{
-      <-> ssub * MontserratAlternates-Sup/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{sl}{
+      <-> alias * MontserratAlternates-Sup/extralight/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extralight/sl
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{el}{it}{
+      <-> alias * MontserratAlternates-Sup/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{n}{
-      <-> ssub * MontserratAlternates-Sup/light/n
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{it}{
-      <-> ssub * MontserratAlternates-Sup/light/it
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{sl}{
-      <-> ssub * MontserratAlternates-Sup/light/sl
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{n}{
-      <-> ssub * MontserratAlternates-Sup/regular/n
+      <-> alias * MontserratAlternates-Sup/light/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{sl}{
-      <-> ssub * MontserratAlternates-Sup/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{n}{
+      <-> alias * MontserratAlternates-Sup/light/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sl}{it}{
-      <-> ssub * MontserratAlternates-Sup/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{l}{it}{
+      <-> alias * MontserratAlternates-Sup/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{it}{
-      <-> ssub * MontserratAlternates-Sup/medium/it
+      <-> alias * MontserratAlternates-Sup/regular/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{sl}{
-      <-> ssub * MontserratAlternates-Sup/medium/sl
+      <-> alias * MontserratAlternates-Sup/regular/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{m}{n}{
-      <-> ssub * MontserratAlternates-Sup/medium/n
+      <-> alias * MontserratAlternates-Sup/regular/n
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{n}{
-      <-> ssub * MontserratAlternates-Sup/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{it}{
+      <-> alias * MontserratAlternates-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/semibold/sl
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{n}{
+      <-> alias * MontserratAlternates-Sup/semibold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{it}{
-      <-> ssub * MontserratAlternates-Sup/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{sb}{sl}{
+      <-> alias * MontserratAlternates-Sup/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{n}{
-      <-> ssub * MontserratAlternates-Sup/bold/n
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{it}{
+      <-> alias * MontserratAlternates-Sup/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{sl}{
-      <-> ssub * MontserratAlternates-Sup/bold/sl
+      <-> alias * MontserratAlternates-Sup/bold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{it}{
-      <-> ssub * MontserratAlternates-Sup/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{b}{n}{
+      <-> alias * MontserratAlternates-Sup/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{n}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{sl}{
+      <-> alias * MontserratAlternates-Sup/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{it}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{n}{
+      <-> alias * MontserratAlternates-Sup/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{sl}{
-      <-> ssub * MontserratAlternates-Sup/extrabold/sl
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{eb}{it}{
+      <-> alias * MontserratAlternates-Sup/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{sl}{
-      <-> ssub * MontserratAlternates-Sup/black/sl
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{it}{
+      <-> alias * MontserratAlternates-Sup/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{it}{
-      <-> ssub * MontserratAlternates-Sup/black/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{sl}{
+      <-> alias * MontserratAlternates-Sup/black/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{ub}{n}{
-      <-> ssub * MontserratAlternates-Sup/black/n
+      <-> alias * MontserratAlternates-Sup/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{n}{
-      <-> ssub * MontserratAlternates-Sup/b/n
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{it}{
+      <-> ssub * MontserratAlternates-Sup/b/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{sl}{
       <-> ssub * MontserratAlternates-Sup/b/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{it}{
-      <-> ssub * MontserratAlternates-Sup/b/it
+\DeclareFontShape{T1}{MontserratAlternates-Sup}{bx}{n}{
+      <-> ssub * MontserratAlternates-Sup/b/n
 }{}
 
 \endinput
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-TLF.fd b/fonts/montserrat/tex/T1MontserratAlternates-TLF.fd
index 1862e1f231..a70d20099b 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-TLF.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,78 +20,105 @@
 \DeclareFontFamily{T1}{MontserratAlternates-TLF}{}
 
 
-%   ----  extralight  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/scit
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
+}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-sc-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{regular}{scsl}{
       <-> ssub * MontserratAlternates-TLF/regular/scit
 }{}
@@ -99,14 +134,14 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{black}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-sc-t1
 }{}
@@ -120,76 +155,49 @@
 }{}
 
 
-%   ----  semibold  ----
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-t1
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-t1
-}{}
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-sc-t1
 }{}
 
-
-%   ----  light  ----
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-sc-t1
-}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/light/scit
-}{}
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-t1
 }{}
 
-
-%   ----  medium  ----
-
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-sc-t1
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{medium}{scsl}{
@@ -203,22 +211,22 @@
 
 %   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-t1
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-sc-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bold}{scsl}{
       <-> ssub * MontserratAlternates-TLF/bold/scit
 }{}
@@ -228,294 +236,267 @@
 }{}
 
 
-%   ----  thin  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/semibold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/thin/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scit}{
+      <-> alias * MontserratAlternates-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TLF/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{it}{
+      <-> alias * MontserratAlternates-TLF/thin/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TLF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{scsl}{
+      <-> alias * MontserratAlternates-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{n}{
+      <-> alias * MontserratAlternates-TLF/thin/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TLF/thin/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TLF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ul}{sc}{
+      <-> alias * MontserratAlternates-TLF/thin/sc
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scsl}{
+      <-> alias * MontserratAlternates-TLF/extralight/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{it}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+      <-> alias * MontserratAlternates-TLF/extralight/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scit
+      <-> alias * MontserratAlternates-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{n}{
-      <-> ssub * MontserratAlternates-TLF/extralight/n
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sc}{
+      <-> alias * MontserratAlternates-TLF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> alias * MontserratAlternates-TLF/extralight/sl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{el}{n}{
+      <-> alias * MontserratAlternates-TLF/extralight/n
+}{}
 
-%   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{it}{
-      <-> ssub * MontserratAlternates-TLF/light/it
-}{}
+%   l --> light
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TLF/light/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scit}{
+      <-> alias * MontserratAlternates-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{it}{
+      <-> alias * MontserratAlternates-TLF/light/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/light/scsl
+      <-> alias * MontserratAlternates-TLF/light/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TLF/light/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sl}{
+      <-> alias * MontserratAlternates-TLF/light/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{n}{
-      <-> ssub * MontserratAlternates-TLF/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+      <-> alias * MontserratAlternates-TLF/light/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TLF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{l}{sc}{
+      <-> alias * MontserratAlternates-TLF/light/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/regular/scsl
-}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TLF/regular/n
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TLF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scit}{
+      <-> alias * MontserratAlternates-TLF/regular/scit
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{it}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
+      <-> alias * MontserratAlternates-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TLF/medium/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scsl}{
+      <-> alias * MontserratAlternates-TLF/regular/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/medium/scsl
+      <-> alias * MontserratAlternates-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{n}{
-      <-> ssub * MontserratAlternates-TLF/medium/n
+      <-> alias * MontserratAlternates-TLF/regular/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TLF/medium/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{m}{sc}{
+      <-> alias * MontserratAlternates-TLF/regular/sc
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TLF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{n}{
+      <-> alias * MontserratAlternates-TLF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TLF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scit}{
+      <-> alias * MontserratAlternates-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-TLF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TLF/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{sb}{it}{
+      <-> alias * MontserratAlternates-TLF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{it}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TLF/bold/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scit}{
+      <-> alias * MontserratAlternates-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{it}{
+      <-> alias * MontserratAlternates-TLF/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/bold/scsl
+      <-> alias * MontserratAlternates-TLF/bold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TLF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sl}{
+      <-> alias * MontserratAlternates-TLF/bold/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{n}{
-      <-> ssub * MontserratAlternates-TLF/bold/n
+      <-> alias * MontserratAlternates-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{b}{sc}{
+      <-> alias * MontserratAlternates-TLF/bold/sc
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scit
+      <-> alias * MontserratAlternates-TLF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{it}{
+      <-> alias * MontserratAlternates-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/scsl
+      <-> alias * MontserratAlternates-TLF/extrabold/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sl
+      <-> alias * MontserratAlternates-TLF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{n}{
+      <-> alias * MontserratAlternates-TLF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{eb}{sc}{
+      <-> alias * MontserratAlternates-TLF/extrabold/sc
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TLF/black/it
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scsl}{
+      <-> alias * MontserratAlternates-TLF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TLF/black/sc
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> alias * MontserratAlternates-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/sl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scit}{
+      <-> alias * MontserratAlternates-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/black/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sc}{
+      <-> alias * MontserratAlternates-TLF/black/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TLF/black/n
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TLF/black/scit
+      <-> alias * MontserratAlternates-TLF/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scsl}{
-      <-> ssub * MontserratAlternates-TLF/b/scsl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{n}{
-      <-> ssub * MontserratAlternates-TLF/b/n
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{ub}{sl}{
+      <-> alias * MontserratAlternates-TLF/black/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scit}{
       <-> ssub * MontserratAlternates-TLF/b/scit
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{scsl}{
+      <-> ssub * MontserratAlternates-TLF/b/scsl
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{it}{
       <-> ssub * MontserratAlternates-TLF/b/it
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{n}{
+      <-> ssub * MontserratAlternates-TLF/b/n
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TLF}{bx}{sl}{
       <-> ssub * MontserratAlternates-TLF/b/sl
 }{}
diff --git a/fonts/montserrat/tex/T1MontserratAlternates-TOsF.fd b/fonts/montserrat/tex/T1MontserratAlternates-TOsF.fd
index 985c35d4ef..65d44234c9 100644
--- a/fonts/montserrat/tex/T1MontserratAlternates-TOsF.fd
+++ b/fonts/montserrat/tex/T1MontserratAlternates-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{T1MontserratAlternates-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for T1/MontserratAlternates-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for T1/MontserratAlternates-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,174 +20,170 @@
 \DeclareFontFamily{T1}{MontserratAlternates-TOsF}{}
 
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/semibold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/medium/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extrabold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  black  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/black/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/it
 }{}
 
 
 %   ----  light  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-t1
-}{}
-
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{sc}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-sc-t1
 }{}
@@ -188,6 +192,10 @@
       <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-t1
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-t1
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{light}{scit}{
       <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-sc-t1
 }{}
@@ -201,315 +209,280 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extralight/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  thin  ----
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scit}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scit}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sc}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sc}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-sc-t1
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{scsl}{
+      <-> ssub * MontserratAlternates-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/thin/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scsl
+      <-> alias * MontserratAlternates-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TOsF/thin/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{it}{
+      <-> alias * MontserratAlternates-TOsF/thin/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/thin/scit
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+      <-> alias * MontserratAlternates-TOsF/thin/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sc
+      <-> alias * MontserratAlternates-TOsF/thin/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sl
+      <-> alias * MontserratAlternates-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ul}{n}{
+      <-> alias * MontserratAlternates-TOsF/thin/n
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/n
+      <-> alias * MontserratAlternates-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sc}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{el}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+      <-> alias * MontserratAlternates-TOsF/extralight/it
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/sl
+      <-> alias * MontserratAlternates-TOsF/light/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/light/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{n}{
+      <-> alias * MontserratAlternates-TOsF/light/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{it}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{sc}{
+      <-> alias * MontserratAlternates-TOsF/light/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/light/scit
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{n}{
-      <-> ssub * MontserratAlternates-TOsF/light/n
+      <-> alias * MontserratAlternates-TOsF/light/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/light/scsl
+      <-> alias * MontserratAlternates-TOsF/light/scsl
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sc
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{l}{it}{
+      <-> alias * MontserratAlternates-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scsl
-}{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/regular/scit
-}{}
+%   m --> regular
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TOsF/regular/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sl}{
+      <-> alias * MontserratAlternates-TOsF/regular/sl
 }{}
 
-
-%   m --> medium
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{it}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{n}{
+      <-> alias * MontserratAlternates-TOsF/regular/n
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sc
+      <-> alias * MontserratAlternates-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scit}{
+      <-> alias * MontserratAlternates-TOsF/regular/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scsl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/medium/scit
+      <-> alias * MontserratAlternates-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{n}{
-      <-> ssub * MontserratAlternates-TOsF/medium/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{m}{it}{
+      <-> alias * MontserratAlternates-TOsF/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{n}{
+      <-> alias * MontserratAlternates-TOsF/semibold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sc}{
+      <-> alias * MontserratAlternates-TOsF/semibold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/semibold/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{sb}{it}{
+      <-> alias * MontserratAlternates-TOsF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scsl}{
+      <-> alias * MontserratAlternates-TOsF/bold/scsl
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{it}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+      <-> alias * MontserratAlternates-TOsF/bold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scit
+      <-> alias * MontserratAlternates-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{n}{
-      <-> ssub * MontserratAlternates-TOsF/bold/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sc}{
+      <-> alias * MontserratAlternates-TOsF/bold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/scsl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{sl}{
+      <-> alias * MontserratAlternates-TOsF/bold/sl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{b}{n}{
+      <-> alias * MontserratAlternates-TOsF/bold/n
+}{}
 
-%   eb --> extrabold
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sl
-}{}
+%   eb --> extrabold
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sc
+      <-> alias * MontserratAlternates-TOsF/extrabold/sc
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{n}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scit
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{it}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/scsl
+      <-> alias * MontserratAlternates-TOsF/extrabold/scsl
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{eb}{scit}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/scit
+}{}
 
-%   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/sl
-}{}
+%   ub --> black
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/black/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{n}{
+      <-> alias * MontserratAlternates-TOsF/black/n
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-TOsF/black/sl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TOsF/black/n
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{sc}{
+      <-> alias * MontserratAlternates-TOsF/black/sc
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{scit}{
-      <-> ssub * MontserratAlternates-TOsF/black/scit
+      <-> alias * MontserratAlternates-TOsF/black/scit
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{scsl}{
-      <-> ssub * MontserratAlternates-TOsF/black/scsl
-}{}
-
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{it}{
-      <-> ssub * MontserratAlternates-TOsF/b/it
+      <-> alias * MontserratAlternates-TOsF/black/scsl
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/b/sl
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{ub}{it}{
+      <-> alias * MontserratAlternates-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sc}{
-      <-> ssub * MontserratAlternates-TOsF/b/sc
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{it}{
+      <-> ssub * MontserratAlternates-TOsF/b/it
 }{}
 
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{scsl}{
@@ -520,6 +493,14 @@
       <-> ssub * MontserratAlternates-TOsF/b/scit
 }{}
 
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sc}{
+      <-> ssub * MontserratAlternates-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{MontserratAlternates-TOsF}{bx}{n}{
       <-> ssub * MontserratAlternates-TOsF/b/n
 }{}
diff --git a/fonts/montserrat/tex/TS1Montserrat-LF.fd b/fonts/montserrat/tex/TS1Montserrat-LF.fd
index afc88fed57..9f8fb904a0 100644
--- a/fonts/montserrat/tex/TS1Montserrat-LF.fd
+++ b/fonts/montserrat/tex/TS1Montserrat-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1Montserrat-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/Montserrat-LF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/Montserrat-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,18 +20,18 @@
 \DeclareFontFamily{TS1}{Montserrat-LF}{}
 
 
-%   ----  extralight  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{sl}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-LF}{bold}{sl}{
+      <-> ssub * Montserrat-LF/bold/it
 }{}
 
 
@@ -42,63 +50,63 @@
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{regular}{sl}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{TS1}{Montserrat-LF}{medium}{sl}{
+      <-> ssub * Montserrat-LF/medium/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  thin  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{bold}{sl}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{TS1}{Montserrat-LF}{thin}{sl}{
+      <-> ssub * Montserrat-LF/thin/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{sl}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-LF}{extralight}{sl}{
+      <-> ssub * Montserrat-LF/extralight/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{thin}{sl}{
-      <-> ssub * Montserrat-LF/thin/it
+\DeclareFontShape{TS1}{Montserrat-LF}{light}{sl}{
+      <-> ssub * Montserrat-LF/light/it
 }{}
 
 
@@ -117,181 +125,166 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{light}{sl}{
-      <-> ssub * Montserrat-LF/light/it
+\DeclareFontShape{TS1}{Montserrat-LF}{semibold}{sl}{
+      <-> ssub * Montserrat-LF/semibold/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{Montserrat-LF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-lf-ts1
+\DeclareFontShape{TS1}{Montserrat-LF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{medium}{sl}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{TS1}{Montserrat-LF}{regular}{sl}{
+      <-> ssub * Montserrat-LF/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{TS1}{Montserrat-LF}{ul}{n}{
-      <-> ssub * Montserrat-LF/thin/n
+      <-> alias * Montserrat-LF/thin/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{ul}{sl}{
-      <-> ssub * Montserrat-LF/thin/sl
+\DeclareFontShape{TS1}{Montserrat-LF}{ul}{it}{
+      <-> alias * Montserrat-LF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{ul}{it}{
-      <-> ssub * Montserrat-LF/thin/it
+\DeclareFontShape{TS1}{Montserrat-LF}{ul}{sl}{
+      <-> alias * Montserrat-LF/thin/sl
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{TS1}{Montserrat-LF}{el}{sl}{
-      <-> ssub * Montserrat-LF/extralight/sl
+      <-> alias * Montserrat-LF/extralight/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{el}{n}{
-      <-> ssub * Montserrat-LF/extralight/n
+\DeclareFontShape{TS1}{Montserrat-LF}{el}{it}{
+      <-> alias * Montserrat-LF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{el}{it}{
-      <-> ssub * Montserrat-LF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-LF}{el}{n}{
+      <-> alias * Montserrat-LF/extralight/n
 }{}
 
 
 %   l --> light
 
 \DeclareFontShape{TS1}{Montserrat-LF}{l}{n}{
-      <-> ssub * Montserrat-LF/light/n
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-LF}{l}{sl}{
-      <-> ssub * Montserrat-LF/light/sl
+      <-> alias * Montserrat-LF/light/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-LF}{l}{it}{
-      <-> ssub * Montserrat-LF/light/it
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{TS1}{Montserrat-LF}{sl}{sl}{
-      <-> ssub * Montserrat-LF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-LF}{sl}{n}{
-      <-> ssub * Montserrat-LF/regular/n
+      <-> alias * Montserrat-LF/light/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{sl}{it}{
-      <-> ssub * Montserrat-LF/regular/it
+\DeclareFontShape{TS1}{Montserrat-LF}{l}{sl}{
+      <-> alias * Montserrat-LF/light/sl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{TS1}{Montserrat-LF}{m}{it}{
-      <-> ssub * Montserrat-LF/medium/it
+\DeclareFontShape{TS1}{Montserrat-LF}{m}{n}{
+      <-> alias * Montserrat-LF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{m}{n}{
-      <-> ssub * Montserrat-LF/medium/n
+\DeclareFontShape{TS1}{Montserrat-LF}{m}{it}{
+      <-> alias * Montserrat-LF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-LF}{m}{sl}{
-      <-> ssub * Montserrat-LF/medium/sl
+      <-> alias * Montserrat-LF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{TS1}{Montserrat-LF}{sb}{sl}{
-      <-> ssub * Montserrat-LF/semibold/sl
+      <-> alias * Montserrat-LF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{sb}{n}{
-      <-> ssub * Montserrat-LF/semibold/n
+\DeclareFontShape{TS1}{Montserrat-LF}{sb}{it}{
+      <-> alias * Montserrat-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{sb}{it}{
-      <-> ssub * Montserrat-LF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-LF}{sb}{n}{
+      <-> alias * Montserrat-LF/semibold/n
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{Montserrat-LF}{b}{n}{
-      <-> ssub * Montserrat-LF/bold/n
+      <-> alias * Montserrat-LF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{b}{sl}{
-      <-> ssub * Montserrat-LF/bold/sl
+\DeclareFontShape{TS1}{Montserrat-LF}{b}{it}{
+      <-> alias * Montserrat-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{b}{it}{
-      <-> ssub * Montserrat-LF/bold/it
+\DeclareFontShape{TS1}{Montserrat-LF}{b}{sl}{
+      <-> alias * Montserrat-LF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{TS1}{Montserrat-LF}{eb}{sl}{
-      <-> ssub * Montserrat-LF/extrabold/sl
+      <-> alias * Montserrat-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{eb}{n}{
-      <-> ssub * Montserrat-LF/extrabold/n
+\DeclareFontShape{TS1}{Montserrat-LF}{eb}{it}{
+      <-> alias * Montserrat-LF/extrabold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{eb}{it}{
-      <-> ssub * Montserrat-LF/extrabold/it
+\DeclareFontShape{TS1}{Montserrat-LF}{eb}{n}{
+      <-> alias * Montserrat-LF/extrabold/n
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{TS1}{Montserrat-LF}{ub}{n}{
-      <-> ssub * Montserrat-LF/black/n
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-LF}{ub}{sl}{
-      <-> ssub * Montserrat-LF/black/sl
+      <-> alias * Montserrat-LF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-LF}{ub}{it}{
-      <-> ssub * Montserrat-LF/black/it
+      <-> alias * Montserrat-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-LF}{bx}{n}{
-      <-> ssub * Montserrat-LF/b/n
+\DeclareFontShape{TS1}{Montserrat-LF}{ub}{n}{
+      <-> alias * Montserrat-LF/black/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-LF}{bx}{sl}{
       <-> ssub * Montserrat-LF/b/sl
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-LF}{bx}{n}{
+      <-> ssub * Montserrat-LF/b/n
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-LF}{bx}{it}{
       <-> ssub * Montserrat-LF/b/it
 }{}
diff --git a/fonts/montserrat/tex/TS1Montserrat-OsF.fd b/fonts/montserrat/tex/TS1Montserrat-OsF.fd
index 7a6b1963bc..03b6b759bc 100644
--- a/fonts/montserrat/tex/TS1Montserrat-OsF.fd
+++ b/fonts/montserrat/tex/TS1Montserrat-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1Montserrat-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/Montserrat-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/Montserrat-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,76 +20,61 @@
 \DeclareFontFamily{TS1}{Montserrat-OsF}{}
 
 
-%   ----  bold  ----
+%   ----  medium  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{sl}{
-      <-> ssub * Montserrat-OsF/bold/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{sl}{
+      <-> ssub * Montserrat-OsF/medium/it
 }{}
 
 
-%   ----  semibold  ----
-
-\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ts1
-}{}
+%   ----  black  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ts1
 }{}
 
-
-%   ----  black  ----
-
 \DeclareFontShape{TS1}{Montserrat-OsF}{black}{n}{
       <-> \Montserrat@@scale Montserrat-Black-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-OsF}{black}{sl}{
       <-> ssub * Montserrat-OsF/black/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{sl}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{bold}{sl}{
+      <-> ssub * Montserrat-OsF/bold/it
 }{}
 
 
 %   ----  extralight  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{n}{
       <-> \Montserrat@@scale Montserrat-ExtraLight-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-OsF}{extralight}{sl}{
       <-> ssub * Montserrat-OsF/extralight/it
 }{}
@@ -89,31 +82,31 @@
 
 %   ----  light  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ts1
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-OsF}{light}{n}{
       <-> \Montserrat@@scale Montserrat-Light-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-OsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-OsF}{light}{sl}{
       <-> ssub * Montserrat-OsF/light/it
 }{}
 
 
-%   ----  medium  ----
+%   ----  thin  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{medium}{sl}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{sl}{
+      <-> ssub * Montserrat-OsF/thin/it
 }{}
 
 
@@ -132,156 +125,160 @@
 }{}
 
 
-%   ----  thin  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-osf-ts1
+\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{thin}{sl}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{regular}{sl}{
+      <-> ssub * Montserrat-OsF/regular/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  semibold  ----
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{n}{
-      <-> ssub * Montserrat-OsF/thin/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{sl}{
-      <-> ssub * Montserrat-OsF/thin/sl
+\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{it}{
-      <-> ssub * Montserrat-OsF/thin/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{semibold}{sl}{
+      <-> ssub * Montserrat-OsF/semibold/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{el}{it}{
-      <-> ssub * Montserrat-OsF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{it}{
+      <-> alias * Montserrat-OsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{el}{sl}{
-      <-> ssub * Montserrat-OsF/extralight/sl
+\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{n}{
+      <-> alias * Montserrat-OsF/thin/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{el}{n}{
-      <-> ssub * Montserrat-OsF/extralight/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{ul}{sl}{
+      <-> alias * Montserrat-OsF/thin/sl
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{l}{n}{
-      <-> ssub * Montserrat-OsF/light/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{el}{sl}{
+      <-> alias * Montserrat-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{l}{sl}{
-      <-> ssub * Montserrat-OsF/light/sl
+\DeclareFontShape{TS1}{Montserrat-OsF}{el}{n}{
+      <-> alias * Montserrat-OsF/extralight/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{l}{it}{
-      <-> ssub * Montserrat-OsF/light/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{el}{it}{
+      <-> alias * Montserrat-OsF/extralight/it
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{it}{
-      <-> ssub * Montserrat-OsF/regular/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{l}{n}{
+      <-> alias * Montserrat-OsF/light/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{sl}{
-      <-> ssub * Montserrat-OsF/regular/sl
+\DeclareFontShape{TS1}{Montserrat-OsF}{l}{it}{
+      <-> alias * Montserrat-OsF/light/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{sl}{n}{
-      <-> ssub * Montserrat-OsF/regular/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{l}{sl}{
+      <-> alias * Montserrat-OsF/light/sl
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{m}{sl}{
-      <-> ssub * Montserrat-OsF/medium/sl
+      <-> alias * Montserrat-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{m}{n}{
-      <-> ssub * Montserrat-OsF/medium/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{m}{it}{
+      <-> alias * Montserrat-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{m}{it}{
-      <-> ssub * Montserrat-OsF/medium/it
+\DeclareFontShape{TS1}{Montserrat-OsF}{m}{n}{
+      <-> alias * Montserrat-OsF/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{sb}{it}{
-      <-> ssub * Montserrat-OsF/semibold/it
+      <-> alias * Montserrat-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{sl}{
-      <-> ssub * Montserrat-OsF/semibold/sl
+\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{n}{
+      <-> alias * Montserrat-OsF/semibold/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{n}{
-      <-> ssub * Montserrat-OsF/semibold/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{sb}{sl}{
+      <-> alias * Montserrat-OsF/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{b}{it}{
-      <-> ssub * Montserrat-OsF/bold/it
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-OsF}{b}{sl}{
-      <-> ssub * Montserrat-OsF/bold/sl
+      <-> alias * Montserrat-OsF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{b}{n}{
-      <-> ssub * Montserrat-OsF/bold/n
+      <-> alias * Montserrat-OsF/bold/n
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-OsF}{b}{it}{
+      <-> alias * Montserrat-OsF/bold/it
+}{}
 
-%   eb --> extrabold
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{it}{
-      <-> ssub * Montserrat-OsF/extrabold/it
-}{}
+%   eb --> extrabold
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{eb}{sl}{
-      <-> ssub * Montserrat-OsF/extrabold/sl
+      <-> alias * Montserrat-OsF/extrabold/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{eb}{n}{
-      <-> ssub * Montserrat-OsF/extrabold/n
+      <-> alias * Montserrat-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Montserrat-OsF}{eb}{it}{
+      <-> alias * Montserrat-OsF/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{ub}{it}{
-      <-> ssub * Montserrat-OsF/black/it
+      <-> alias * Montserrat-OsF/black/it
+}{}
+
+\DeclareFontShape{TS1}{Montserrat-OsF}{ub}{n}{
+      <-> alias * Montserrat-OsF/black/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{ub}{sl}{
-      <-> ssub * Montserrat-OsF/black/sl
+      <-> alias * Montserrat-OsF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{ub}{n}{
-      <-> ssub * Montserrat-OsF/black/n
+\DeclareFontShape{TS1}{Montserrat-OsF}{bx}{it}{
+      <-> ssub * Montserrat-OsF/b/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-OsF}{bx}{n}{
@@ -292,8 +289,4 @@
       <-> ssub * Montserrat-OsF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-OsF}{bx}{it}{
-      <-> ssub * Montserrat-OsF/b/it
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/TS1Montserrat-TLF.fd b/fonts/montserrat/tex/TS1Montserrat-TLF.fd
index f76b192b43..cf9ba8e182 100644
--- a/fonts/montserrat/tex/TS1Montserrat-TLF.fd
+++ b/fonts/montserrat/tex/TS1Montserrat-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1Montserrat-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/Montserrat-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/Montserrat-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,21 +20,6 @@
 \DeclareFontFamily{TS1}{Montserrat-TLF}{}
 
 
-%   ----  extrabold  ----
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/it
-}{}
-
-
 %   ----  thin  ----
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{thin}{n}{
@@ -42,78 +35,78 @@
 }{}
 
 
-%   ----  medium  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{it}{
-      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{n}{
-      <-> \Montserrat@@scale Montserrat-Medium-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{sl}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{sl}{
+      <-> ssub * Montserrat-TLF/extralight/it
 }{}
 
 
 %   ----  light  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tlf-ts1
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-TLF}{light}{it}{
       <-> \Montserrat@@scale Montserrat-LightItalic-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-TLF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tlf-ts1
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-TLF}{light}{sl}{
       <-> ssub * Montserrat-TLF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{sl}{
-      <-> ssub * Montserrat-TLF/regular/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{sl}{
+      <-> ssub * Montserrat-TLF/bold/it
 }{}
 
 
-%   ----  black  ----
+%   ----  medium  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{black}{it}{
-      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{it}{
+      <-> \Montserrat@@scale Montserrat-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{n}{
+      <-> \Montserrat@@scale Montserrat-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{black}{sl}{
-      <-> ssub * Montserrat-TLF/black/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{medium}{sl}{
+      <-> ssub * Montserrat-TLF/medium/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  black  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{black}{it}{
+      <-> \Montserrat@@scale Montserrat-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{extralight}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{black}{sl}{
+      <-> ssub * Montserrat-TLF/black/it
 }{}
 
 
@@ -132,156 +125,156 @@
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{bold}{sl}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{regular}{sl}{
+      <-> ssub * Montserrat-TLF/regular/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Montserrat-TLF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TLF/extrabold/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{ul}{n}{
-      <-> ssub * Montserrat-TLF/thin/n
+      <-> alias * Montserrat-TLF/thin/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{sl}{
-      <-> ssub * Montserrat-TLF/thin/sl
+\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{it}{
+      <-> alias * Montserrat-TLF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{it}{
-      <-> ssub * Montserrat-TLF/thin/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{ul}{sl}{
+      <-> alias * Montserrat-TLF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{el}{it}{
-      <-> ssub * Montserrat-TLF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{el}{sl}{
+      <-> alias * Montserrat-TLF/extralight/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{el}{n}{
-      <-> ssub * Montserrat-TLF/extralight/n
+      <-> alias * Montserrat-TLF/extralight/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{el}{sl}{
-      <-> ssub * Montserrat-TLF/extralight/sl
+\DeclareFontShape{TS1}{Montserrat-TLF}{el}{it}{
+      <-> alias * Montserrat-TLF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{l}{n}{
-      <-> ssub * Montserrat-TLF/light/n
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-TLF}{l}{sl}{
-      <-> ssub * Montserrat-TLF/light/sl
+      <-> alias * Montserrat-TLF/light/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{l}{it}{
-      <-> ssub * Montserrat-TLF/light/it
+      <-> alias * Montserrat-TLF/light/it
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{it}{
-      <-> ssub * Montserrat-TLF/regular/it
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{n}{
-      <-> ssub * Montserrat-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TLF}{sl}{sl}{
-      <-> ssub * Montserrat-TLF/regular/sl
+\DeclareFontShape{TS1}{Montserrat-TLF}{l}{n}{
+      <-> alias * Montserrat-TLF/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{m}{sl}{
-      <-> ssub * Montserrat-TLF/medium/sl
+\DeclareFontShape{TS1}{Montserrat-TLF}{m}{it}{
+      <-> alias * Montserrat-TLF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{m}{n}{
-      <-> ssub * Montserrat-TLF/medium/n
+      <-> alias * Montserrat-TLF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{m}{it}{
-      <-> ssub * Montserrat-TLF/medium/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{m}{sl}{
+      <-> alias * Montserrat-TLF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{it}{
-      <-> ssub * Montserrat-TLF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{n}{
+      <-> alias * Montserrat-TLF/semibold/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{n}{
-      <-> ssub * Montserrat-TLF/semibold/n
+\DeclareFontShape{TS1}{Montserrat-TLF}{sb}{it}{
+      <-> alias * Montserrat-TLF/semibold/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{sb}{sl}{
-      <-> ssub * Montserrat-TLF/semibold/sl
+      <-> alias * Montserrat-TLF/semibold/sl
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{b}{it}{
-      <-> ssub * Montserrat-TLF/bold/it
+\DeclareFontShape{TS1}{Montserrat-TLF}{b}{sl}{
+      <-> alias * Montserrat-TLF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{b}{n}{
-      <-> ssub * Montserrat-TLF/bold/n
+\DeclareFontShape{TS1}{Montserrat-TLF}{b}{it}{
+      <-> alias * Montserrat-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TLF}{b}{sl}{
-      <-> ssub * Montserrat-TLF/bold/sl
+\DeclareFontShape{TS1}{Montserrat-TLF}{b}{n}{
+      <-> alias * Montserrat-TLF/bold/n
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{eb}{sl}{
-      <-> ssub * Montserrat-TLF/extrabold/sl
+      <-> alias * Montserrat-TLF/extrabold/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{eb}{n}{
-      <-> ssub * Montserrat-TLF/extrabold/n
+      <-> alias * Montserrat-TLF/extrabold/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{eb}{it}{
-      <-> ssub * Montserrat-TLF/extrabold/it
+      <-> alias * Montserrat-TLF/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{ub}{it}{
-      <-> ssub * Montserrat-TLF/black/it
+      <-> alias * Montserrat-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{ub}{n}{
-      <-> ssub * Montserrat-TLF/black/n
+      <-> alias * Montserrat-TLF/black/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{ub}{sl}{
-      <-> ssub * Montserrat-TLF/black/sl
+      <-> alias * Montserrat-TLF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TLF}{bx}{sl}{
diff --git a/fonts/montserrat/tex/TS1Montserrat-TOsF.fd b/fonts/montserrat/tex/TS1Montserrat-TOsF.fd
index 5ca7b9d2c8..37c4851978 100644
--- a/fonts/montserrat/tex/TS1Montserrat-TOsF.fd
+++ b/fonts/montserrat/tex/TS1Montserrat-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1Montserrat-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/Montserrat-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/Montserrat-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname Montserrat@scale\endcsname\relax
     \let\Montserrat@@scale\@empty
@@ -12,76 +20,76 @@
 \DeclareFontFamily{TS1}{Montserrat-TOsF}{}
 
 
-%   ----  semibold  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{n}{
-      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{it}{
-      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{sl}{
+      <-> ssub * Montserrat-TOsF/extrabold/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{n}{
-      <-> \Montserrat@@scale Montserrat-Bold-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{n}{
+      <-> \Montserrat@@scale Montserrat-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{it}{
-      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{it}{
+      <-> \Montserrat@@scale Montserrat-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{sl}{
+      <-> ssub * Montserrat-TOsF/regular/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{it}{
+      <-> \Montserrat@@scale Montserrat-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{n}{
+      <-> \Montserrat@@scale Montserrat-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{semibold}{sl}{
+      <-> ssub * Montserrat-TOsF/semibold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{it}{
-      <-> \Montserrat@@scale Montserrat-Italic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{it}{
+      <-> \Montserrat@@scale Montserrat-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{n}{
-      <-> \Montserrat@@scale Montserrat-Regular-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{n}{
+      <-> \Montserrat@@scale Montserrat-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{regular}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{bold}{sl}{
+      <-> ssub * Montserrat-TOsF/bold/it
 }{}
 
 
 %   ----  black  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{black}{n}{
-      <-> \Montserrat@@scale Montserrat-Black-tosf-ts1
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-TOsF}{black}{it}{
       <-> \Montserrat@@scale Montserrat-BlackItalic-tosf-ts1
 }{}
 
+\DeclareFontShape{TS1}{Montserrat-TOsF}{black}{n}{
+      <-> \Montserrat@@scale Montserrat-Black-tosf-ts1
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-TOsF}{black}{sl}{
       <-> ssub * Montserrat-TOsF/black/it
 }{}
@@ -102,186 +110,175 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  thin  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{it}{
-      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{n}{
+      <-> \Montserrat@@scale Montserrat-Thin-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{n}{
-      <-> \Montserrat@@scale Montserrat-Light-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{it}{
+      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{sl}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{sl}{
+      <-> ssub * Montserrat-TOsF/thin/it
 }{}
 
 
-%   ----  thin  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{it}{
-      <-> \Montserrat@@scale Montserrat-ThinItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{n}{
+      <-> \Montserrat@@scale Montserrat-ExtraLight-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{n}{
-      <-> \Montserrat@@scale Montserrat-Thin-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{it}{
+      <-> \Montserrat@@scale Montserrat-ExtraLightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{thin}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{extralight}{sl}{
+      <-> ssub * Montserrat-TOsF/extralight/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{n}{
-      <-> \Montserrat@@scale Montserrat-ExtraBold-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{n}{
+      <-> \Montserrat@@scale Montserrat-Light-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{it}{
-      <-> \Montserrat@@scale Montserrat-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{it}{
+      <-> \Montserrat@@scale Montserrat-LightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{extrabold}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{light}{sl}{
+      <-> ssub * Montserrat-TOsF/light/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{it}{
-      <-> ssub * Montserrat-TOsF/thin/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{sl}{
+      <-> alias * Montserrat-TOsF/thin/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{n}{
-      <-> ssub * Montserrat-TOsF/thin/n
+      <-> alias * Montserrat-TOsF/thin/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{sl}{
-      <-> ssub * Montserrat-TOsF/thin/sl
+\DeclareFontShape{TS1}{Montserrat-TOsF}{ul}{it}{
+      <-> alias * Montserrat-TOsF/thin/it
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{it}{
-      <-> ssub * Montserrat-TOsF/extralight/it
-}{}
-
 \DeclareFontShape{TS1}{Montserrat-TOsF}{el}{sl}{
-      <-> ssub * Montserrat-TOsF/extralight/sl
+      <-> alias * Montserrat-TOsF/extralight/sl
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{el}{n}{
-      <-> ssub * Montserrat-TOsF/extralight/n
+      <-> alias * Montserrat-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{Montserrat-TOsF}{el}{it}{
+      <-> alias * Montserrat-TOsF/extralight/it
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{it}{
-      <-> ssub * Montserrat-TOsF/light/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{n}{
+      <-> alias * Montserrat-TOsF/light/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{n}{
-      <-> ssub * Montserrat-TOsF/light/n
+\DeclareFontShape{TS1}{Montserrat-TOsF}{l}{it}{
+      <-> alias * Montserrat-TOsF/light/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{l}{sl}{
-      <-> ssub * Montserrat-TOsF/light/sl
+      <-> alias * Montserrat-TOsF/light/sl
 }{}
 
 
-%   sl --> regular
-
-\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{n}{
-      <-> ssub * Montserrat-TOsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{sl}{
-      <-> ssub * Montserrat-TOsF/regular/sl
-}{}
+%   m --> regular
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{sl}{it}{
-      <-> ssub * Montserrat-TOsF/regular/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{m}{n}{
+      <-> alias * Montserrat-TOsF/regular/n
 }{}
 
-
-%   m --> medium
-
 \DeclareFontShape{TS1}{Montserrat-TOsF}{m}{it}{
-      <-> ssub * Montserrat-TOsF/medium/it
-}{}
-
-\DeclareFontShape{TS1}{Montserrat-TOsF}{m}{n}{
-      <-> ssub * Montserrat-TOsF/medium/n
+      <-> alias * Montserrat-TOsF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{m}{sl}{
-      <-> ssub * Montserrat-TOsF/medium/sl
+      <-> alias * Montserrat-TOsF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{sl}{
-      <-> ssub * Montserrat-TOsF/semibold/sl
+      <-> alias * Montserrat-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{n}{
-      <-> ssub * Montserrat-TOsF/semibold/n
+\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{it}{
+      <-> alias * Montserrat-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{it}{
-      <-> ssub * Montserrat-TOsF/semibold/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{sb}{n}{
+      <-> alias * Montserrat-TOsF/semibold/n
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{b}{it}{
-      <-> ssub * Montserrat-TOsF/bold/it
+      <-> alias * Montserrat-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{sl}{
-      <-> ssub * Montserrat-TOsF/bold/sl
+\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{n}{
+      <-> alias * Montserrat-TOsF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{n}{
-      <-> ssub * Montserrat-TOsF/bold/n
+\DeclareFontShape{TS1}{Montserrat-TOsF}{b}{sl}{
+      <-> alias * Montserrat-TOsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{sl}{
-      <-> ssub * Montserrat-TOsF/extrabold/sl
+\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{it}{
+      <-> alias * Montserrat-TOsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{n}{
-      <-> ssub * Montserrat-TOsF/extrabold/n
+      <-> alias * Montserrat-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{it}{
-      <-> ssub * Montserrat-TOsF/extrabold/it
+\DeclareFontShape{TS1}{Montserrat-TOsF}{eb}{sl}{
+      <-> alias * Montserrat-TOsF/extrabold/sl
 }{}
 
 
 %   ub --> black
 
+\DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{sl}{
+      <-> alias * Montserrat-TOsF/black/sl
+}{}
+
 \DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{it}{
-      <-> ssub * Montserrat-TOsF/black/it
+      <-> alias * Montserrat-TOsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{n}{
-      <-> ssub * Montserrat-TOsF/black/n
+      <-> alias * Montserrat-TOsF/black/n
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{ub}{sl}{
-      <-> ssub * Montserrat-TOsF/black/sl
+\DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{n}{
+      <-> ssub * Montserrat-TOsF/b/n
 }{}
 
 \DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{it}{
@@ -292,8 +289,4 @@
       <-> ssub * Montserrat-TOsF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{Montserrat-TOsF}{bx}{n}{
-      <-> ssub * Montserrat-TOsF/b/n
-}{}
-
 \endinput
diff --git a/fonts/montserrat/tex/TS1MontserratAlternates-LF.fd b/fonts/montserrat/tex/TS1MontserratAlternates-LF.fd
index 7915499380..70fc93f5e8 100644
--- a/fonts/montserrat/tex/TS1MontserratAlternates-LF.fd
+++ b/fonts/montserrat/tex/TS1MontserratAlternates-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1MontserratAlternates-LF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-LF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/MontserratAlternates-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,6 +20,21 @@
 \DeclareFontFamily{TS1}{MontserratAlternates-LF}{}
 
 
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-LF/semibold/it
+}{}
+
+
 %   ----  bold  ----
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{bold}{n}{
@@ -27,33 +50,33 @@
 }{}
 
 
-%   ----  thin  ----
+%   ----  medium  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-LF/medium/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-LF/extrabold/it
 }{}
 
 
@@ -72,33 +95,18 @@
 }{}
 
 
-%   ----  semibold  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
-}{}
-
-
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-lf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-LF/regular/it
 }{}
 
 
@@ -117,21 +125,6 @@
 }{}
 
 
-%   ----  extrabold  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-lf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
-}{}
-
-
 %   ----  extralight  ----
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{extralight}{it}{
@@ -146,154 +139,154 @@
       <-> ssub * MontserratAlternates-LF/extralight/it
 }{}
 
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
 
-%   ul --> thin
+%   ----  thin  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{it}{
-      <-> ssub * MontserratAlternates-LF/thin/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-LF/thin/sl
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{n}{
-      <-> ssub * MontserratAlternates-LF/thin/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-LF/thin/it
 }{}
 
+%
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
 
-%   el --> extralight
+%   ul --> thin
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{n}{
-      <-> ssub * MontserratAlternates-LF/extralight/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{it}{
+      <-> alias * MontserratAlternates-LF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{it}{
-      <-> ssub * MontserratAlternates-LF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{n}{
+      <-> alias * MontserratAlternates-LF/thin/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{sl}{
-      <-> ssub * MontserratAlternates-LF/extralight/sl
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{ul}{sl}{
+      <-> alias * MontserratAlternates-LF/thin/sl
 }{}
 
 
-%   l --> light
+%   el --> extralight
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{sl}{
-      <-> ssub * MontserratAlternates-LF/light/sl
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{it}{
+      <-> alias * MontserratAlternates-LF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{it}{
-      <-> ssub * MontserratAlternates-LF/light/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{sl}{
+      <-> alias * MontserratAlternates-LF/extralight/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{n}{
-      <-> ssub * MontserratAlternates-LF/light/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{el}{n}{
+      <-> alias * MontserratAlternates-LF/extralight/n
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-LF/regular/sl
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{n}{
+      <-> alias * MontserratAlternates-LF/light/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{it}{
-      <-> ssub * MontserratAlternates-LF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{sl}{
+      <-> alias * MontserratAlternates-LF/light/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{sl}{n}{
-      <-> ssub * MontserratAlternates-LF/regular/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{l}{it}{
+      <-> alias * MontserratAlternates-LF/light/it
 }{}
 
 
-%   m --> medium
-
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{n}{
-      <-> ssub * MontserratAlternates-LF/medium/n
-}{}
+%   m --> regular
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{it}{
-      <-> ssub * MontserratAlternates-LF/medium/it
+      <-> alias * MontserratAlternates-LF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{sl}{
-      <-> ssub * MontserratAlternates-LF/medium/sl
+      <-> alias * MontserratAlternates-LF/regular/sl
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{m}{n}{
+      <-> alias * MontserratAlternates-LF/regular/n
+}{}
 
-%   sb --> semibold
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{n}{
-      <-> ssub * MontserratAlternates-LF/semibold/n
-}{}
+%   sb --> semibold
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{it}{
-      <-> ssub * MontserratAlternates-LF/semibold/it
+      <-> alias * MontserratAlternates-LF/semibold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-LF/semibold/sl
+      <-> alias * MontserratAlternates-LF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{sb}{n}{
+      <-> alias * MontserratAlternates-LF/semibold/n
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{sl}{
-      <-> ssub * MontserratAlternates-LF/bold/sl
+      <-> alias * MontserratAlternates-LF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{it}{
-      <-> ssub * MontserratAlternates-LF/bold/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{n}{
+      <-> alias * MontserratAlternates-LF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{n}{
-      <-> ssub * MontserratAlternates-LF/bold/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{b}{it}{
+      <-> alias * MontserratAlternates-LF/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{it}{
-      <-> ssub * MontserratAlternates-LF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{n}{
+      <-> alias * MontserratAlternates-LF/extrabold/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-LF/extrabold/sl
+      <-> alias * MontserratAlternates-LF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{n}{
-      <-> ssub * MontserratAlternates-LF/extrabold/n
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{eb}{it}{
+      <-> alias * MontserratAlternates-LF/extrabold/it
 }{}
 
 
 %   ub --> black
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{it}{
-      <-> ssub * MontserratAlternates-LF/black/it
+      <-> alias * MontserratAlternates-LF/black/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-LF/black/sl
+      <-> alias * MontserratAlternates-LF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{ub}{n}{
-      <-> ssub * MontserratAlternates-LF/black/n
+      <-> alias * MontserratAlternates-LF/black/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{sl}{
       <-> ssub * MontserratAlternates-LF/b/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{it}{
-      <-> ssub * MontserratAlternates-LF/b/it
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{n}{
       <-> ssub * MontserratAlternates-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-LF}{bx}{it}{
+      <-> ssub * MontserratAlternates-LF/b/it
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/TS1MontserratAlternates-OsF.fd b/fonts/montserrat/tex/TS1MontserratAlternates-OsF.fd
index 6a4d9a3867..0f95d01ed8 100644
--- a/fonts/montserrat/tex/TS1MontserratAlternates-OsF.fd
+++ b/fonts/montserrat/tex/TS1MontserratAlternates-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1MontserratAlternates-OsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-OsF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/MontserratAlternates-OsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,48 +20,33 @@
 \DeclareFontFamily{TS1}{MontserratAlternates-OsF}{}
 
 
-%   ----  extralight  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
-}{}
-
-
-%   ----  extrabold  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/semibold/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/bold/it
 }{}
 
 
@@ -72,63 +65,78 @@
 }{}
 
 
-%   ----  light  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extrabold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  black  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{sl}{
+      <-> ssub * MontserratAlternates-OsF/black/it
 }{}
 
+
+%   ----  regular  ----
+
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Italic-osf-ts1
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-osf-ts1
+}{}
+
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{regular}{sl}{
       <-> ssub * MontserratAlternates-OsF/regular/it
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{black}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-OsF/light/it
 }{}
 
 
-%   ----  bold  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-OsF/extralight/it
 }{}
 
 
@@ -147,141 +155,126 @@
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-OsF/thin/sl
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{it}{
+      <-> alias * MontserratAlternates-OsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-OsF/thin/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{sl}{
+      <-> alias * MontserratAlternates-OsF/thin/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-OsF/thin/n
+      <-> alias * MontserratAlternates-OsF/thin/n
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{n}{
-      <-> ssub * MontserratAlternates-OsF/extralight/n
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{it}{
-      <-> ssub * MontserratAlternates-OsF/extralight/it
+      <-> alias * MontserratAlternates-OsF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extralight/sl
-}{}
-
-
-%   l --> light
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-OsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{it}{
-      <-> ssub * MontserratAlternates-OsF/light/it
+      <-> alias * MontserratAlternates-OsF/extralight/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{n}{
-      <-> ssub * MontserratAlternates-OsF/light/n
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{el}{n}{
+      <-> alias * MontserratAlternates-OsF/extralight/n
 }{}
 
 
-%   sl --> regular
+%   l --> light
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-OsF/regular/n
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{n}{
+      <-> alias * MontserratAlternates-OsF/light/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-OsF/regular/sl
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{sl}{
+      <-> alias * MontserratAlternates-OsF/light/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-OsF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{l}{it}{
+      <-> alias * MontserratAlternates-OsF/light/it
 }{}
 
 
-%   m --> medium
-
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{it}{
-      <-> ssub * MontserratAlternates-OsF/medium/it
-}{}
+%   m --> regular
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-OsF/medium/sl
+      <-> alias * MontserratAlternates-OsF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{n}{
-      <-> ssub * MontserratAlternates-OsF/medium/n
+      <-> alias * MontserratAlternates-OsF/regular/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{m}{it}{
+      <-> alias * MontserratAlternates-OsF/regular/it
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/semibold/sl
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{n}{
+      <-> alias * MontserratAlternates-OsF/semibold/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-OsF/semibold/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{sl}{
+      <-> alias * MontserratAlternates-OsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-OsF/semibold/n
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{sb}{it}{
+      <-> alias * MontserratAlternates-OsF/semibold/it
 }{}
 
 
 %   b --> bold
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{it}{
-      <-> ssub * MontserratAlternates-OsF/bold/it
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{n}{
+      <-> alias * MontserratAlternates-OsF/bold/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-OsF/bold/sl
+      <-> alias * MontserratAlternates-OsF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{n}{
-      <-> ssub * MontserratAlternates-OsF/bold/n
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{b}{it}{
+      <-> alias * MontserratAlternates-OsF/bold/it
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/n
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/it
+      <-> alias * MontserratAlternates-OsF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-OsF/extrabold/sl
+      <-> alias * MontserratAlternates-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{eb}{n}{
+      <-> alias * MontserratAlternates-OsF/extrabold/n
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-OsF/black/n
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-OsF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-OsF/black/sl
+\DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{n}{
+      <-> alias * MontserratAlternates-OsF/black/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-OsF/black/it
+      <-> alias * MontserratAlternates-OsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-OsF}{bx}{n}{
diff --git a/fonts/montserrat/tex/TS1MontserratAlternates-TLF.fd b/fonts/montserrat/tex/TS1MontserratAlternates-TLF.fd
index 2c5f789b64..ec0ea574c9 100644
--- a/fonts/montserrat/tex/TS1MontserratAlternates-TLF.fd
+++ b/fonts/montserrat/tex/TS1MontserratAlternates-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1MontserratAlternates-TLF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/MontserratAlternates-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,33 +20,48 @@
 \DeclareFontFamily{TS1}{MontserratAlternates-TLF}{}
 
 
-%   ----  medium  ----
+%   ----  extrabold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extrabold/it
+}{}
+
+
+%   ----  medium  ----
+
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{n}{
       <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tlf-ts1
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tlf-ts1
+}{}
+
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{medium}{sl}{
       <-> ssub * MontserratAlternates-TLF/medium/it
 }{}
 
 
-%   ----  light  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TLF/bold/it
 }{}
 
 
@@ -57,235 +80,201 @@
 }{}
 
 
-%   ----  black  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TLF/light/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TLF/extralight/it
 }{}
 
 
 %   ----  thin  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{it}{
       <-> \MontserratAlternates@@scale MontserratAlternates-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tlf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{thin}{sl}{
+      <-> ssub * MontserratAlternates-TLF/thin/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  black  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{black}{sl}{
+      <-> ssub * MontserratAlternates-TLF/black/it
 }{}
 
 
-%   ----  extralight  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tlf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TLF/regular/it
 }{}
 
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TLF/thin/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TLF/thin/it
+      <-> alias * MontserratAlternates-TLF/thin/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TLF/thin/n
+      <-> alias * MontserratAlternates-TLF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ul}{sl}{
+      <-> alias * MontserratAlternates-TLF/thin/sl
 }{}
 
 
 %   el --> extralight
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{
-      <-> ssub * MontserratAlternates-TLF/extralight/n
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{
+      <-> alias * MontserratAlternates-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extralight/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{n}{
+      <-> alias * MontserratAlternates-TLF/extralight/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{it}{
-      <-> ssub * MontserratAlternates-TLF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{el}{sl}{
+      <-> alias * MontserratAlternates-TLF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TLF/light/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{it}{
-      <-> ssub * MontserratAlternates-TLF/light/it
+      <-> alias * MontserratAlternates-TLF/light/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{
-      <-> ssub * MontserratAlternates-TLF/light/n
-}{}
-
-
-%   sl --> regular
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TLF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TLF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{sl}{
+      <-> alias * MontserratAlternates-TLF/light/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TLF/regular/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{l}{n}{
+      <-> alias * MontserratAlternates-TLF/light/n
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{it}{
-      <-> ssub * MontserratAlternates-TLF/medium/it
+      <-> alias * MontserratAlternates-TLF/regular/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TLF/medium/sl
+      <-> alias * MontserratAlternates-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{m}{n}{
-      <-> ssub * MontserratAlternates-TLF/medium/n
+      <-> alias * MontserratAlternates-TLF/regular/n
 }{}
 
 
 %   sb --> semibold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TLF/semibold/n
+      <-> alias * MontserratAlternates-TLF/semibold/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/semibold/sl
+      <-> alias * MontserratAlternates-TLF/semibold/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TLF/semibold/it
+      <-> alias * MontserratAlternates-TLF/semibold/it
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{it}{
-      <-> ssub * MontserratAlternates-TLF/bold/it
+      <-> alias * MontserratAlternates-TLF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TLF/bold/sl
+      <-> alias * MontserratAlternates-TLF/bold/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{b}{n}{
-      <-> ssub * MontserratAlternates-TLF/bold/n
+      <-> alias * MontserratAlternates-TLF/bold/n
 }{}
 
 
 %   eb --> extrabold
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/it
+      <-> alias * MontserratAlternates-TLF/extrabold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TLF/extrabold/n
+      <-> alias * MontserratAlternates-TLF/extrabold/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TLF/extrabold/sl
+}{}
 
-%   ub --> black
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TLF/black/it
-}{}
+%   ub --> black
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TLF/black/sl
+      <-> alias * MontserratAlternates-TLF/black/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TLF/black/n
+      <-> alias * MontserratAlternates-TLF/black/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TLF/b/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{ub}{it}{
+      <-> alias * MontserratAlternates-TLF/black/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{it}{
@@ -296,4 +285,8 @@
       <-> ssub * MontserratAlternates-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TLF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TLF/b/sl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/TS1MontserratAlternates-TOsF.fd b/fonts/montserrat/tex/TS1MontserratAlternates-TOsF.fd
index 6ac7aa6488..584a99335d 100644
--- a/fonts/montserrat/tex/TS1MontserratAlternates-TOsF.fd
+++ b/fonts/montserrat/tex/TS1MontserratAlternates-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2019/10/18
+%% Generated by autoinst on 2019/11/07
 %%
 \ProvidesFile{TS1MontserratAlternates-TOsF.fd}
-    [2019/10/18 (autoinst)  Font definitions for TS1/MontserratAlternates-TOsF.]
+    [2019/11/07 (autoinst)  Font definitions for TS1/MontserratAlternates-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+    \@font@info{Font\space shape\space `\curr@fontshape'\space will
+        \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
 
 \expandafter\ifx\csname MontserratAlternates@scale\endcsname\relax
     \let\MontserratAlternates@@scale\@empty
@@ -12,48 +20,63 @@
 \DeclareFontFamily{TS1}{MontserratAlternates-TOsF}{}
 
 
-%   ----  extralight  ----
+%   ----  semibold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/semibold/it
 }{}
 
 
-%   ----  extrabold  ----
+%   ----  bold  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/bold/it
 }{}
 
 
-%   ----  regular  ----
+%   ----  medium  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/medium/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extrabold}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extrabold/it
 }{}
 
 
@@ -72,48 +95,48 @@
 }{}
 
 
-%   ----  medium  ----
+%   ----  regular  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Medium-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-MediumItalic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{medium}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{regular}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/regular/it
 }{}
 
 
-%   ----  light  ----
+%   ----  extralight  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-ExtraLight-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{extralight}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/extralight/it
 }{}
 
 
-%   ----  semibold  ----
+%   ----  light  ----
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBold-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{it}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-LightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-SemiBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{n}{
+      <-> \MontserratAlternates@@scale MontserratAlternates-Light-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{semibold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{light}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/light/it
 }{}
 
 
@@ -131,169 +154,139 @@
       <-> ssub * MontserratAlternates-TOsF/thin/it
 }{}
 
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{it}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-BoldItalic-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{n}{
-      <-> \MontserratAlternates@@scale MontserratAlternates-Bold-tosf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bold}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
-}{}
-
 %
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%  Extra 'alias' rules to map the standard NFSS codes to our fancy names
 %
 
 %   ul --> thin
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{n}{
-      <-> ssub * MontserratAlternates-TOsF/thin/n
+      <-> alias * MontserratAlternates-TOsF/thin/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/thin/sl
+      <-> alias * MontserratAlternates-TOsF/thin/sl
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ul}{it}{
-      <-> ssub * MontserratAlternates-TOsF/thin/it
+      <-> alias * MontserratAlternates-TOsF/thin/it
 }{}
 
 
 %   el --> extralight
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/it
+      <-> alias * MontserratAlternates-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{n}{
+      <-> alias * MontserratAlternates-TOsF/extralight/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extralight/n
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{el}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extralight/sl
 }{}
 
 
 %   l --> light
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{it}{
-      <-> ssub * MontserratAlternates-TOsF/light/it
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{n}{
-      <-> ssub * MontserratAlternates-TOsF/light/n
+      <-> alias * MontserratAlternates-TOsF/light/n
 }{}
 
-
-%   sl --> regular
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{n}{
-      <-> ssub * MontserratAlternates-TOsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{it}{
-      <-> ssub * MontserratAlternates-TOsF/regular/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{sl}{
+      <-> alias * MontserratAlternates-TOsF/light/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sl}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/regular/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{l}{it}{
+      <-> alias * MontserratAlternates-TOsF/light/it
 }{}
 
 
-%   m --> medium
+%   m --> regular
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{n}{
-      <-> ssub * MontserratAlternates-TOsF/medium/n
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{it}{
+      <-> alias * MontserratAlternates-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{it}{
-      <-> ssub * MontserratAlternates-TOsF/medium/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{n}{
+      <-> alias * MontserratAlternates-TOsF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{m}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/medium/sl
+      <-> alias * MontserratAlternates-TOsF/regular/sl
 }{}
 
 
 %   sb --> semibold
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/n
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{it}{
+      <-> alias * MontserratAlternates-TOsF/semibold/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/sl
+      <-> alias * MontserratAlternates-TOsF/semibold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/semibold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{sb}{n}{
+      <-> alias * MontserratAlternates-TOsF/semibold/n
 }{}
 
 
 %   b --> bold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{it}{
-      <-> ssub * MontserratAlternates-TOsF/bold/it
+      <-> alias * MontserratAlternates-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/bold/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{n}{
+      <-> alias * MontserratAlternates-TOsF/bold/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{n}{
-      <-> ssub * MontserratAlternates-TOsF/bold/n
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{b}{sl}{
+      <-> alias * MontserratAlternates-TOsF/bold/sl
 }{}
 
 
 %   eb --> extrabold
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{n}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/n
+      <-> alias * MontserratAlternates-TOsF/extrabold/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{it}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{sl}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/extrabold/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{eb}{it}{
+      <-> alias * MontserratAlternates-TOsF/extrabold/it
 }{}
 
 
 %   ub --> black
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{n}{
-      <-> ssub * MontserratAlternates-TOsF/black/n
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{sl}{
+      <-> alias * MontserratAlternates-TOsF/black/sl
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{it}{
-      <-> ssub * MontserratAlternates-TOsF/black/it
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{n}{
+      <-> alias * MontserratAlternates-TOsF/black/n
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/black/sl
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{ub}{it}{
+      <-> alias * MontserratAlternates-TOsF/black/it
 }{}
 
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{it}{
       <-> ssub * MontserratAlternates-TOsF/b/it
 }{}
 
-\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{sl}{
-      <-> ssub * MontserratAlternates-TOsF/b/sl
-}{}
-
 \DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{n}{
       <-> ssub * MontserratAlternates-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{MontserratAlternates-TOsF}{bx}{sl}{
+      <-> ssub * MontserratAlternates-TOsF/b/sl
+}{}
+
 \endinput
diff --git a/fonts/montserrat/tex/montserrat.sty b/fonts/montserrat/tex/montserrat.sty
index 8e043cb046..205ba07548 100644
--- a/fonts/montserrat/tex/montserrat.sty
+++ b/fonts/montserrat/tex/montserrat.sty
@@ -1,7 +1,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.02}
-\def\filedate{2019/10/17}
+\def\fileversion{1.03}
+\def\filedate{2019/11/07}
 \ProvidesPackage{montserrat}[\filedate\space v\fileversion]
 
 \message{`montserrat' v\fileversion, \filedate\space Style file for Montserrat and Alternates (msharpe)}