noto (23apr19)

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

57 files changed, 14776 insertions, 4252 deletions

diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoMono-TLF.fd
new file mode 100644
index 00000000000..129784b6bea
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoMono-TLF.fd
@@ -0,0 +1,89 @@
+%% Generated by autoinst on 2019/04/22
+%%
+\ProvidesFile{LGRNotoMono-TLF.fd}
+    [2019/04/22 (autoinst)  Font definitions for LGR/NotoMono-TLF.]
+
+\expandafter\ifx\csname NotoMono@scale\endcsname\relax
+    \let\NotoMono@@scale\@empty
+\else
+    \edef\NotoMono@@scale{s*[\csname NotoMono@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LGR}{NotoMono-TLF}{}
+
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{regular}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{regular}{it}{
+      <-> \NotoMono@@scale NotoMono-Italic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{regular}{sl}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bold}{n}{
+      <-> \NotoMono@@scale NotoMono-Bold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bold}{it}{
+      <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bold}{sl}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{m}{sl}{
+      <-> ssub * NotoMono-TLF/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{m}{n}{
+      <-> ssub * NotoMono-TLF/regular/n
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{m}{it}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{b}{sl}{
+      <-> ssub * NotoMono-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{b}{n}{
+      <-> ssub * NotoMono-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{b}{it}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bx}{n}{
+      <-> ssub * NotoMono-TLF/b/n
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bx}{sl}{
+      <-> ssub * NotoMono-TLF/b/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoMono-TLF}{bx}{it}{
+      <-> ssub * NotoMono-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-LF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-LF.fd
index 43c6b5e2a53..faf36f0bd48 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSans-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSans-LF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSans-LF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSans-LF}{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{scsl}{
-      <-> ssub * NotoSans-LF/eb/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{eb}{sl}{
-      <-> ssub * NotoSans-LF/eb/it
+\DeclareFontShape{LGR}{NotoSans-LF}{regular}{sl}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{scsl}{
-      <-> ssub * NotoSans-LF/sb/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{sb}{sl}{
-      <-> ssub * NotoSans-LF/sb/it
+\DeclareFontShape{LGR}{NotoSans-LF}{thin}{sl}{
+      <-> ssub * NotoSans-LF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{scsl}{
-      <-> ssub * NotoSans-LF/mb/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{mb}{sl}{
-      <-> ssub * NotoSans-LF/mb/it
+\DeclareFontShape{LGR}{NotoSans-LF}{semibold}{sl}{
+      <-> ssub * NotoSans-LF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{scsl}{
-      <-> ssub * NotoSans-LF/m/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{m}{sl}{
-      <-> ssub * NotoSans-LF/m/it
+\DeclareFontShape{LGR}{NotoSans-LF}{bold}{sl}{
+      <-> ssub * NotoSans-LF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{scsl}{
-      <-> ssub * NotoSans-LF/l/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{scsl}{
+      <-> ssub * NotoSans-LF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{l}{sl}{
-      <-> ssub * NotoSans-LF/l/it
+\DeclareFontShape{LGR}{NotoSans-LF}{light}{sl}{
+      <-> ssub * NotoSans-LF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extrabold}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{scsl}{
-      <-> ssub * NotoSans-LF/k/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{scsl}{
+      <-> ssub * NotoSans-LF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{k}{sl}{
-      <-> ssub * NotoSans-LF/k/it
+\DeclareFontShape{LGR}{NotoSans-LF}{black}{sl}{
+      <-> ssub * NotoSans-LF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{scsl}{
-      <-> ssub * NotoSans-LF/b/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{scsl}{
+      <-> ssub * NotoSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{b}{sl}{
-      <-> ssub * NotoSans-LF/b/it
+\DeclareFontShape{LGR}{NotoSans-LF}{medium}{sl}{
+      <-> ssub * NotoSans-LF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{scsl}{
-      <-> ssub * NotoSans-LF/el/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{el}{sl}{
-      <-> ssub * NotoSans-LF/el/it
+\DeclareFontShape{LGR}{NotoSans-LF}{extralight}{sl}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{sl}{
+      <-> ssub * NotoSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{sc}{
+      <-> ssub * NotoSans-LF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{n}{
+      <-> ssub * NotoSans-LF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{scsl}{
-      <-> ssub * NotoSans-LF/i/scit
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{it}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{i}{sl}{
-      <-> ssub * NotoSans-LF/i/it
+\DeclareFontShape{LGR}{NotoSans-LF}{m}{scit}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{bx}{sl}{
-      <-> ssub * NotoSans-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{sl}{
+      <-> ssub * NotoSans-LF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{bx}{scsl}{
-      <-> ssub * NotoSans-LF/b/scsl
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-LF}{bx}{sc}{
-      <-> ssub * NotoSans-LF/b/sc
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{sc}{
+      <-> ssub * NotoSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{n}{
+      <-> ssub * NotoSans-LF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{it}{
+      <-> ssub * NotoSans-LF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ul}{scit}{
+      <-> ssub * NotoSans-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{sc}{
+      <-> ssub * NotoSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{n}{
+      <-> ssub * NotoSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{it}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{eb}{scit}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{sl}{
+      <-> ssub * NotoSans-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{sc}{
+      <-> ssub * NotoSans-LF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{n}{
+      <-> ssub * NotoSans-LF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{it}{
+      <-> ssub * NotoSans-LF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{sb}{scit}{
+      <-> ssub * NotoSans-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{sl}{
+      <-> ssub * NotoSans-LF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{scsl}{
+      <-> ssub * NotoSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{sc}{
+      <-> ssub * NotoSans-LF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{n}{
+      <-> ssub * NotoSans-LF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{it}{
+      <-> ssub * NotoSans-LF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{ub}{scit}{
+      <-> ssub * NotoSans-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{sl}{
+      <-> ssub * NotoSans-LF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{scsl}{
+      <-> ssub * NotoSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{sc}{
+      <-> ssub * NotoSans-LF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{n}{
+      <-> ssub * NotoSans-LF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{it}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{l}{scit}{
+      <-> ssub * NotoSans-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{sl}{
+      <-> ssub * NotoSans-LF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{sc}{
+      <-> ssub * NotoSans-LF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{n}{
+      <-> ssub * NotoSans-LF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{it}{
+      <-> ssub * NotoSans-LF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{b}{scit}{
+      <-> ssub * NotoSans-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{sl}{
+      <-> ssub * NotoSans-LF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{sc}{
+      <-> ssub * NotoSans-LF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{n}{
+      <-> ssub * NotoSans-LF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{it}{
+      <-> ssub * NotoSans-LF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{el}{scit}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSans-LF}{bx}{n}{
       <-> ssub * NotoSans-LF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSans-LF}{bx}{sc}{
+      <-> ssub * NotoSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{bx}{scsl}{
+      <-> ssub * NotoSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-LF}{bx}{sl}{
+      <-> ssub * NotoSans-LF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSans-LF}{bx}{it}{
       <-> ssub * NotoSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-OsF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-OsF.fd
index 4386d4f487e..1045587c76c 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSans-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSans-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSans-OsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSans-OsF}{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{scsl}{
-      <-> ssub * NotoSans-OsF/eb/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{sl}{
-      <-> ssub * NotoSans-OsF/eb/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{regular}{sl}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{scsl}{
-      <-> ssub * NotoSans-OsF/sb/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{sl}{
-      <-> ssub * NotoSans-OsF/sb/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{thin}{sl}{
+      <-> ssub * NotoSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{scsl}{
-      <-> ssub * NotoSans-OsF/mb/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{mb}{sl}{
-      <-> ssub * NotoSans-OsF/mb/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{semibold}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{scsl}{
-      <-> ssub * NotoSans-OsF/m/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{m}{sl}{
-      <-> ssub * NotoSans-OsF/m/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{bold}{sl}{
+      <-> ssub * NotoSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{scsl}{
-      <-> ssub * NotoSans-OsF/l/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{l}{sl}{
-      <-> ssub * NotoSans-OsF/l/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{light}{sl}{
+      <-> ssub * NotoSans-OsF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{scsl}{
-      <-> ssub * NotoSans-OsF/k/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{k}{sl}{
-      <-> ssub * NotoSans-OsF/k/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{black}{sl}{
+      <-> ssub * NotoSans-OsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{scsl}{
+      <-> ssub * NotoSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{b}{sl}{
-      <-> ssub * NotoSans-OsF/b/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{medium}{sl}{
+      <-> ssub * NotoSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{scsl}{
-      <-> ssub * NotoSans-OsF/el/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{el}{sl}{
-      <-> ssub * NotoSans-OsF/el/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{extralight}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{sl}{
+      <-> ssub * NotoSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{sc}{
+      <-> ssub * NotoSans-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{n}{
+      <-> ssub * NotoSans-OsF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{scsl}{
-      <-> ssub * NotoSans-OsF/i/scit
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{it}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{i}{sl}{
-      <-> ssub * NotoSans-OsF/i/it
+\DeclareFontShape{LGR}{NotoSans-OsF}{m}{scit}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{sl}{
-      <-> ssub * NotoSans-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{sl}{
+      <-> ssub * NotoSans-OsF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scsl
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{sc}{
-      <-> ssub * NotoSans-OsF/b/sc
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{sc}{
+      <-> ssub * NotoSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{n}{
+      <-> ssub * NotoSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{it}{
+      <-> ssub * NotoSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ul}{scit}{
+      <-> ssub * NotoSans-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{sc}{
+      <-> ssub * NotoSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{n}{
+      <-> ssub * NotoSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{it}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{eb}{scit}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{sc}{
+      <-> ssub * NotoSans-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{n}{
+      <-> ssub * NotoSans-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{it}{
+      <-> ssub * NotoSans-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{sb}{scit}{
+      <-> ssub * NotoSans-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{sl}{
+      <-> ssub * NotoSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{sc}{
+      <-> ssub * NotoSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{n}{
+      <-> ssub * NotoSans-OsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{it}{
+      <-> ssub * NotoSans-OsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{ub}{scit}{
+      <-> ssub * NotoSans-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{sl}{
+      <-> ssub * NotoSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{sc}{
+      <-> ssub * NotoSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{n}{
+      <-> ssub * NotoSans-OsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{it}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{l}{scit}{
+      <-> ssub * NotoSans-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{sl}{
+      <-> ssub * NotoSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{sc}{
+      <-> ssub * NotoSans-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{n}{
+      <-> ssub * NotoSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{it}{
+      <-> ssub * NotoSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{b}{scit}{
+      <-> ssub * NotoSans-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{sc}{
+      <-> ssub * NotoSans-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{n}{
+      <-> ssub * NotoSans-OsF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{it}{
+      <-> ssub * NotoSans-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{el}{scit}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSans-OsF}{bx}{n}{
       <-> ssub * NotoSans-OsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{sc}{
+      <-> ssub * NotoSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{scsl}{
+      <-> ssub * NotoSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-OsF}{bx}{sl}{
+      <-> ssub * NotoSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSans-OsF}{bx}{it}{
       <-> ssub * NotoSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-Sup.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-Sup.fd
index 825c7c938ae..7a46bbd5c97 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSans-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSans-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSans-Sup.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{LGR}{NotoSans-Sup}{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{sl}{
-      <-> ssub * NotoSans-Sup/eb/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{regular}{sl}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-sup-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{sl}{
-      <-> ssub * NotoSans-Sup/sb/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{thin}{sl}{
+      <-> ssub * NotoSans-Sup/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-sup-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{mb}{sl}{
-      <-> ssub * NotoSans-Sup/mb/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{semibold}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-sup-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{m}{sl}{
-      <-> ssub * NotoSans-Sup/m/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{bold}{sl}{
+      <-> ssub * NotoSans-Sup/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{l}{it}{
+\DeclareFontShape{LGR}{NotoSans-Sup}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{l}{sl}{
-      <-> ssub * NotoSans-Sup/l/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{light}{sl}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{k}{n}{
+\DeclareFontShape{LGR}{NotoSans-Sup}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{k}{it}{
+\DeclareFontShape{LGR}{NotoSans-Sup}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{k}{sl}{
-      <-> ssub * NotoSans-Sup/k/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{black}{sl}{
+      <-> ssub * NotoSans-Sup/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-sup-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{b}{sl}{
-      <-> ssub * NotoSans-Sup/b/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{medium}{sl}{
+      <-> ssub * NotoSans-Sup/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{el}{it}{
+\DeclareFontShape{LGR}{NotoSans-Sup}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{el}{sl}{
-      <-> ssub * NotoSans-Sup/el/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{extralight}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-sup-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{m}{sl}{
+      <-> ssub * NotoSans-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSans-Sup}{m}{n}{
+      <-> ssub * NotoSans-Sup/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{i}{sl}{
-      <-> ssub * NotoSans-Sup/i/it
+\DeclareFontShape{LGR}{NotoSans-Sup}{m}{it}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-Sup}{bx}{sl}{
-      <-> ssub * NotoSans-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ul}{sl}{
+      <-> ssub * NotoSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ul}{n}{
+      <-> ssub * NotoSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ul}{it}{
+      <-> ssub * NotoSans-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{n}{
+      <-> ssub * NotoSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{eb}{it}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{n}{
+      <-> ssub * NotoSans-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{sb}{it}{
+      <-> ssub * NotoSans-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ub}{sl}{
+      <-> ssub * NotoSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ub}{n}{
+      <-> ssub * NotoSans-Sup/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{ub}{it}{
+      <-> ssub * NotoSans-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{l}{sl}{
+      <-> ssub * NotoSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{l}{n}{
+      <-> ssub * NotoSans-Sup/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{l}{it}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{b}{sl}{
+      <-> ssub * NotoSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{b}{n}{
+      <-> ssub * NotoSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{b}{it}{
+      <-> ssub * NotoSans-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{el}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{el}{n}{
+      <-> ssub * NotoSans-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-Sup}{el}{it}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
 \DeclareFontShape{LGR}{NotoSans-Sup}{bx}{n}{
       <-> ssub * NotoSans-Sup/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSans-Sup}{bx}{sl}{
+      <-> ssub * NotoSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSans-Sup}{bx}{it}{
       <-> ssub * NotoSans-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TLF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TLF.fd
index 02cf2b5aa41..3400e36f884 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSans-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSans-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSans-TLF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSans-TLF}{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{scsl}{
-      <-> ssub * NotoSans-TLF/eb/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{sl}{
-      <-> ssub * NotoSans-TLF/eb/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{regular}{sl}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{scsl}{
-      <-> ssub * NotoSans-TLF/sb/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{sl}{
-      <-> ssub * NotoSans-TLF/sb/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{thin}{sl}{
+      <-> ssub * NotoSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{scsl}{
-      <-> ssub * NotoSans-TLF/mb/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{mb}{sl}{
-      <-> ssub * NotoSans-TLF/mb/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{semibold}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{scsl}{
-      <-> ssub * NotoSans-TLF/m/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{m}{sl}{
-      <-> ssub * NotoSans-TLF/m/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{bold}{sl}{
+      <-> ssub * NotoSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{scsl}{
-      <-> ssub * NotoSans-TLF/l/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{l}{sl}{
-      <-> ssub * NotoSans-TLF/l/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{light}{sl}{
+      <-> ssub * NotoSans-TLF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{scsl}{
-      <-> ssub * NotoSans-TLF/k/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{k}{sl}{
-      <-> ssub * NotoSans-TLF/k/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{black}{sl}{
+      <-> ssub * NotoSans-TLF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{scsl}{
+      <-> ssub * NotoSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{b}{sl}{
-      <-> ssub * NotoSans-TLF/b/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{medium}{sl}{
+      <-> ssub * NotoSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{scsl}{
-      <-> ssub * NotoSans-TLF/el/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{el}{sl}{
-      <-> ssub * NotoSans-TLF/el/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{extralight}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{sl}{
+      <-> ssub * NotoSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{sc}{
+      <-> ssub * NotoSans-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{n}{
+      <-> ssub * NotoSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{scsl}{
-      <-> ssub * NotoSans-TLF/i/scit
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{it}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{i}{sl}{
-      <-> ssub * NotoSans-TLF/i/it
+\DeclareFontShape{LGR}{NotoSans-TLF}{m}{scit}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{sl}{
-      <-> ssub * NotoSans-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{sl}{
+      <-> ssub * NotoSans-TLF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scsl
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{sc}{
-      <-> ssub * NotoSans-TLF/b/sc
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{sc}{
+      <-> ssub * NotoSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{n}{
+      <-> ssub * NotoSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{it}{
+      <-> ssub * NotoSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ul}{scit}{
+      <-> ssub * NotoSans-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{sc}{
+      <-> ssub * NotoSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{n}{
+      <-> ssub * NotoSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{it}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{eb}{scit}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{sc}{
+      <-> ssub * NotoSans-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{n}{
+      <-> ssub * NotoSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{it}{
+      <-> ssub * NotoSans-TLF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{sb}{scit}{
+      <-> ssub * NotoSans-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{sl}{
+      <-> ssub * NotoSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{sc}{
+      <-> ssub * NotoSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{n}{
+      <-> ssub * NotoSans-TLF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{it}{
+      <-> ssub * NotoSans-TLF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{ub}{scit}{
+      <-> ssub * NotoSans-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{sl}{
+      <-> ssub * NotoSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{sc}{
+      <-> ssub * NotoSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{n}{
+      <-> ssub * NotoSans-TLF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{it}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{l}{scit}{
+      <-> ssub * NotoSans-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{sl}{
+      <-> ssub * NotoSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{sc}{
+      <-> ssub * NotoSans-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{n}{
+      <-> ssub * NotoSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{it}{
+      <-> ssub * NotoSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{b}{scit}{
+      <-> ssub * NotoSans-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{sc}{
+      <-> ssub * NotoSans-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{n}{
+      <-> ssub * NotoSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{it}{
+      <-> ssub * NotoSans-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{el}{scit}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSans-TLF}{bx}{n}{
       <-> ssub * NotoSans-TLF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{sc}{
+      <-> ssub * NotoSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{scsl}{
+      <-> ssub * NotoSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TLF}{bx}{sl}{
+      <-> ssub * NotoSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSans-TLF}{bx}{it}{
       <-> ssub * NotoSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TOsF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TOsF.fd
index 5ab670e771b..e438547e1af 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSans-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSans-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSans-TOsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSans-TOsF}{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSans-TOsF/eb/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{sl}{
-      <-> ssub * NotoSans-TOsF/eb/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{regular}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSans-TOsF/sb/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{sl}{
-      <-> ssub * NotoSans-TOsF/sb/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{thin}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSans-TOsF/mb/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{mb}{sl}{
-      <-> ssub * NotoSans-TOsF/mb/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{scsl}{
-      <-> ssub * NotoSans-TOsF/m/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{sl}{
-      <-> ssub * NotoSans-TOsF/m/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bold}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{scsl}{
-      <-> ssub * NotoSans-TOsF/l/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{sl}{
-      <-> ssub * NotoSans-TOsF/l/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{light}{sl}{
+      <-> ssub * NotoSans-TOsF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{scsl}{
-      <-> ssub * NotoSans-TOsF/k/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{k}{sl}{
-      <-> ssub * NotoSans-TOsF/k/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{black}{sl}{
+      <-> ssub * NotoSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{sl}{
-      <-> ssub * NotoSans-TOsF/b/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{medium}{sl}{
+      <-> ssub * NotoSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{scsl}{
-      <-> ssub * NotoSans-TOsF/el/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{sl}{
-      <-> ssub * NotoSans-TOsF/el/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{sc}{
+      <-> ssub * NotoSans-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{n}{
+      <-> ssub * NotoSans-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{scsl}{
-      <-> ssub * NotoSans-TOsF/i/scit
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{it}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{i}{sl}{
-      <-> ssub * NotoSans-TOsF/i/it
+\DeclareFontShape{LGR}{NotoSans-TOsF}{m}{scit}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{sl}{
-      <-> ssub * NotoSans-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scsl
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{sc}{
-      <-> ssub * NotoSans-TOsF/b/sc
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{sc}{
+      <-> ssub * NotoSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{n}{
+      <-> ssub * NotoSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{it}{
+      <-> ssub * NotoSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ul}{scit}{
+      <-> ssub * NotoSans-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{sc}{
+      <-> ssub * NotoSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{n}{
+      <-> ssub * NotoSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{it}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{eb}{scit}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{sc}{
+      <-> ssub * NotoSans-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{n}{
+      <-> ssub * NotoSans-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{it}{
+      <-> ssub * NotoSans-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{sb}{scit}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{sl}{
+      <-> ssub * NotoSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{sc}{
+      <-> ssub * NotoSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{n}{
+      <-> ssub * NotoSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{it}{
+      <-> ssub * NotoSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{ub}{scit}{
+      <-> ssub * NotoSans-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{sl}{
+      <-> ssub * NotoSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{sc}{
+      <-> ssub * NotoSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{n}{
+      <-> ssub * NotoSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{it}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{l}{scit}{
+      <-> ssub * NotoSans-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{sc}{
+      <-> ssub * NotoSans-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{n}{
+      <-> ssub * NotoSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{it}{
+      <-> ssub * NotoSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{b}{scit}{
+      <-> ssub * NotoSans-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{sc}{
+      <-> ssub * NotoSans-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{n}{
+      <-> ssub * NotoSans-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{it}{
+      <-> ssub * NotoSans-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{el}{scit}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{n}{
       <-> ssub * NotoSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{sc}{
+      <-> ssub * NotoSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{sl}{
+      <-> ssub * NotoSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSans-TOsF}{bx}{it}{
       <-> ssub * NotoSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-LF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-LF.fd
index 69455e719a7..70f7916a642 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSerif-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSerif-LF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSerif-LF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSerif-LF}{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{scsl}{
-      <-> ssub * NotoSerif-LF/eb/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{sl}{
-      <-> ssub * NotoSerif-LF/eb/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{regular}{sl}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{scsl}{
-      <-> ssub * NotoSerif-LF/sb/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{sl}{
-      <-> ssub * NotoSerif-LF/sb/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{thin}{sl}{
+      <-> ssub * NotoSerif-LF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{scsl}{
-      <-> ssub * NotoSerif-LF/mb/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{mb}{sl}{
-      <-> ssub * NotoSerif-LF/mb/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{semibold}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{scsl}{
-      <-> ssub * NotoSerif-LF/m/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{m}{sl}{
-      <-> ssub * NotoSerif-LF/m/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{bold}{sl}{
+      <-> ssub * NotoSerif-LF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{scsl}{
-      <-> ssub * NotoSerif-LF/l/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{l}{sl}{
-      <-> ssub * NotoSerif-LF/l/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{light}{sl}{
+      <-> ssub * NotoSerif-LF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{scsl}{
-      <-> ssub * NotoSerif-LF/k/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{k}{sl}{
-      <-> ssub * NotoSerif-LF/k/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{black}{sl}{
+      <-> ssub * NotoSerif-LF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{scsl}{
+      <-> ssub * NotoSerif-LF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{b}{sl}{
-      <-> ssub * NotoSerif-LF/b/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{medium}{sl}{
+      <-> ssub * NotoSerif-LF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{scsl}{
-      <-> ssub * NotoSerif-LF/el/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{el}{sl}{
-      <-> ssub * NotoSerif-LF/el/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{extralight}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{sl}{
+      <-> ssub * NotoSerif-LF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{sc}{
+      <-> ssub * NotoSerif-LF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{n}{
+      <-> ssub * NotoSerif-LF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{scsl}{
-      <-> ssub * NotoSerif-LF/i/scit
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{it}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{i}{sl}{
-      <-> ssub * NotoSerif-LF/i/it
+\DeclareFontShape{LGR}{NotoSerif-LF}{m}{scit}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{sl}{
-      <-> ssub * NotoSerif-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{sl}{
+      <-> ssub * NotoSerif-LF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scsl
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{sc}{
-      <-> ssub * NotoSerif-LF/b/sc
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{sc}{
+      <-> ssub * NotoSerif-LF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{n}{
+      <-> ssub * NotoSerif-LF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{it}{
+      <-> ssub * NotoSerif-LF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ul}{scit}{
+      <-> ssub * NotoSerif-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{sc}{
+      <-> ssub * NotoSerif-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{n}{
+      <-> ssub * NotoSerif-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{it}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{eb}{scit}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{sc}{
+      <-> ssub * NotoSerif-LF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{n}{
+      <-> ssub * NotoSerif-LF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{it}{
+      <-> ssub * NotoSerif-LF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{sb}{scit}{
+      <-> ssub * NotoSerif-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{sl}{
+      <-> ssub * NotoSerif-LF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{sc}{
+      <-> ssub * NotoSerif-LF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{n}{
+      <-> ssub * NotoSerif-LF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{it}{
+      <-> ssub * NotoSerif-LF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{ub}{scit}{
+      <-> ssub * NotoSerif-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{sl}{
+      <-> ssub * NotoSerif-LF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{sc}{
+      <-> ssub * NotoSerif-LF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{n}{
+      <-> ssub * NotoSerif-LF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{it}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{l}{scit}{
+      <-> ssub * NotoSerif-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{sl}{
+      <-> ssub * NotoSerif-LF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{sc}{
+      <-> ssub * NotoSerif-LF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{n}{
+      <-> ssub * NotoSerif-LF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{it}{
+      <-> ssub * NotoSerif-LF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{b}{scit}{
+      <-> ssub * NotoSerif-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{sc}{
+      <-> ssub * NotoSerif-LF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{n}{
+      <-> ssub * NotoSerif-LF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{it}{
+      <-> ssub * NotoSerif-LF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{el}{scit}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSerif-LF}{bx}{n}{
       <-> ssub * NotoSerif-LF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{sc}{
+      <-> ssub * NotoSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{scsl}{
+      <-> ssub * NotoSerif-LF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-LF}{bx}{sl}{
+      <-> ssub * NotoSerif-LF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSerif-LF}{bx}{it}{
       <-> ssub * NotoSerif-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-OsF.fd
index fc23c86a6d4..d3f1be6e542 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSerif-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSerif-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSerif-OsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSerif-OsF}{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-OsF/eb/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{sl}{
-      <-> ssub * NotoSerif-OsF/eb/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{regular}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-OsF/sb/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{sl}{
-      <-> ssub * NotoSerif-OsF/sb/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{thin}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-OsF/mb/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{mb}{sl}{
-      <-> ssub * NotoSerif-OsF/mb/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{scsl}{
-      <-> ssub * NotoSerif-OsF/m/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{sl}{
-      <-> ssub * NotoSerif-OsF/m/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bold}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{scsl}{
-      <-> ssub * NotoSerif-OsF/l/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{sl}{
-      <-> ssub * NotoSerif-OsF/l/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{light}{sl}{
+      <-> ssub * NotoSerif-OsF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{scsl}{
-      <-> ssub * NotoSerif-OsF/k/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{k}{sl}{
-      <-> ssub * NotoSerif-OsF/k/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{black}{sl}{
+      <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{sl}{
-      <-> ssub * NotoSerif-OsF/b/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{medium}{sl}{
+      <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{scsl}{
-      <-> ssub * NotoSerif-OsF/el/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{sl}{
-      <-> ssub * NotoSerif-OsF/el/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{sc}{
+      <-> ssub * NotoSerif-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{n}{
+      <-> ssub * NotoSerif-OsF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{scsl}{
-      <-> ssub * NotoSerif-OsF/i/scit
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{it}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{i}{sl}{
-      <-> ssub * NotoSerif-OsF/i/it
+\DeclareFontShape{LGR}{NotoSerif-OsF}{m}{scit}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{sl}{
-      <-> ssub * NotoSerif-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scsl
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{sc}{
-      <-> ssub * NotoSerif-OsF/b/sc
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{sc}{
+      <-> ssub * NotoSerif-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{n}{
+      <-> ssub * NotoSerif-OsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{it}{
+      <-> ssub * NotoSerif-OsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ul}{scit}{
+      <-> ssub * NotoSerif-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{sc}{
+      <-> ssub * NotoSerif-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{n}{
+      <-> ssub * NotoSerif-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{it}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{eb}{scit}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{sc}{
+      <-> ssub * NotoSerif-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{n}{
+      <-> ssub * NotoSerif-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{it}{
+      <-> ssub * NotoSerif-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{sb}{scit}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{sl}{
+      <-> ssub * NotoSerif-OsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{sc}{
+      <-> ssub * NotoSerif-OsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{n}{
+      <-> ssub * NotoSerif-OsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{it}{
+      <-> ssub * NotoSerif-OsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{ub}{scit}{
+      <-> ssub * NotoSerif-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{sl}{
+      <-> ssub * NotoSerif-OsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{sc}{
+      <-> ssub * NotoSerif-OsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{n}{
+      <-> ssub * NotoSerif-OsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{it}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{l}{scit}{
+      <-> ssub * NotoSerif-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{sc}{
+      <-> ssub * NotoSerif-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{n}{
+      <-> ssub * NotoSerif-OsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{it}{
+      <-> ssub * NotoSerif-OsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{b}{scit}{
+      <-> ssub * NotoSerif-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{sc}{
+      <-> ssub * NotoSerif-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{n}{
+      <-> ssub * NotoSerif-OsF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{it}{
+      <-> ssub * NotoSerif-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{el}{scit}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{n}{
       <-> ssub * NotoSerif-OsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{sc}{
+      <-> ssub * NotoSerif-OsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{sl}{
+      <-> ssub * NotoSerif-OsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSerif-OsF}{bx}{it}{
       <-> ssub * NotoSerif-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-Sup.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-Sup.fd
index f9c659fe7e4..e6fd928cbb4 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSerif-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSerif-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSerif-Sup.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{LGR}{NotoSerif-Sup}{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{sl}{
-      <-> ssub * NotoSerif-Sup/eb/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{regular}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{sl}{
-      <-> ssub * NotoSerif-Sup/sb/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{thin}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-sup-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{mb}{sl}{
-      <-> ssub * NotoSerif-Sup/mb/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{semibold}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-sup-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{sl}{
-      <-> ssub * NotoSerif-Sup/m/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{bold}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{it}{
+\DeclareFontShape{LGR}{NotoSerif-Sup}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{sl}{
-      <-> ssub * NotoSerif-Sup/l/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{light}{sl}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{k}{n}{
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{k}{it}{
+\DeclareFontShape{LGR}{NotoSerif-Sup}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{k}{sl}{
-      <-> ssub * NotoSerif-Sup/k/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{black}{sl}{
+      <-> ssub * NotoSerif-Sup/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-sup-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{sl}{
-      <-> ssub * NotoSerif-Sup/b/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{medium}{sl}{
+      <-> ssub * NotoSerif-Sup/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{it}{
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-sup-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{sl}{
-      <-> ssub * NotoSerif-Sup/el/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{extralight}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-sup-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-lgr
+\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{n}{
+      <-> ssub * NotoSerif-Sup/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{i}{sl}{
-      <-> ssub * NotoSerif-Sup/i/it
+\DeclareFontShape{LGR}{NotoSerif-Sup}{m}{it}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-Sup}{bx}{sl}{
-      <-> ssub * NotoSerif-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ul}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ul}{n}{
+      <-> ssub * NotoSerif-Sup/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ul}{it}{
+      <-> ssub * NotoSerif-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{n}{
+      <-> ssub * NotoSerif-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{eb}{it}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{n}{
+      <-> ssub * NotoSerif-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{sb}{it}{
+      <-> ssub * NotoSerif-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ub}{sl}{
+      <-> ssub * NotoSerif-Sup/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ub}{n}{
+      <-> ssub * NotoSerif-Sup/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{ub}{it}{
+      <-> ssub * NotoSerif-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{sl}{
+      <-> ssub * NotoSerif-Sup/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{n}{
+      <-> ssub * NotoSerif-Sup/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{l}{it}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{n}{
+      <-> ssub * NotoSerif-Sup/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{b}{it}{
+      <-> ssub * NotoSerif-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{n}{
+      <-> ssub * NotoSerif-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-Sup}{el}{it}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
 \DeclareFontShape{LGR}{NotoSerif-Sup}{bx}{n}{
       <-> ssub * NotoSerif-Sup/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSerif-Sup}{bx}{sl}{
+      <-> ssub * NotoSerif-Sup/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSerif-Sup}{bx}{it}{
       <-> ssub * NotoSerif-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TLF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TLF.fd
index a48b7065236..6e52313b572 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSerif-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSerif-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSerif-TLF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSerif-TLF}{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TLF/eb/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{sl}{
-      <-> ssub * NotoSerif-TLF/eb/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{regular}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TLF/sb/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{sl}{
-      <-> ssub * NotoSerif-TLF/sb/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{thin}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TLF/mb/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{mb}{sl}{
-      <-> ssub * NotoSerif-TLF/mb/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{scsl}{
-      <-> ssub * NotoSerif-TLF/m/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{sl}{
-      <-> ssub * NotoSerif-TLF/m/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bold}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{scsl}{
-      <-> ssub * NotoSerif-TLF/l/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{sl}{
-      <-> ssub * NotoSerif-TLF/l/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{light}{sl}{
+      <-> ssub * NotoSerif-TLF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{scsl}{
-      <-> ssub * NotoSerif-TLF/k/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{k}{sl}{
-      <-> ssub * NotoSerif-TLF/k/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{black}{sl}{
+      <-> ssub * NotoSerif-TLF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{sl}{
-      <-> ssub * NotoSerif-TLF/b/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{medium}{sl}{
+      <-> ssub * NotoSerif-TLF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{scsl}{
-      <-> ssub * NotoSerif-TLF/el/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{sl}{
-      <-> ssub * NotoSerif-TLF/el/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{sc}{
+      <-> ssub * NotoSerif-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{n}{
+      <-> ssub * NotoSerif-TLF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{scsl}{
-      <-> ssub * NotoSerif-TLF/i/scit
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{it}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{i}{sl}{
-      <-> ssub * NotoSerif-TLF/i/it
+\DeclareFontShape{LGR}{NotoSerif-TLF}{m}{scit}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{sl}{
-      <-> ssub * NotoSerif-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scsl
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{sc}{
-      <-> ssub * NotoSerif-TLF/b/sc
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{sc}{
+      <-> ssub * NotoSerif-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{n}{
+      <-> ssub * NotoSerif-TLF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{it}{
+      <-> ssub * NotoSerif-TLF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ul}{scit}{
+      <-> ssub * NotoSerif-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{sc}{
+      <-> ssub * NotoSerif-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{n}{
+      <-> ssub * NotoSerif-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{it}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{eb}{scit}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{sc}{
+      <-> ssub * NotoSerif-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{n}{
+      <-> ssub * NotoSerif-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{it}{
+      <-> ssub * NotoSerif-TLF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{sb}{scit}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{sl}{
+      <-> ssub * NotoSerif-TLF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{sc}{
+      <-> ssub * NotoSerif-TLF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{n}{
+      <-> ssub * NotoSerif-TLF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{it}{
+      <-> ssub * NotoSerif-TLF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{ub}{scit}{
+      <-> ssub * NotoSerif-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{sl}{
+      <-> ssub * NotoSerif-TLF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{sc}{
+      <-> ssub * NotoSerif-TLF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{n}{
+      <-> ssub * NotoSerif-TLF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{it}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{l}{scit}{
+      <-> ssub * NotoSerif-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{sc}{
+      <-> ssub * NotoSerif-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{n}{
+      <-> ssub * NotoSerif-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{it}{
+      <-> ssub * NotoSerif-TLF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{b}{scit}{
+      <-> ssub * NotoSerif-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{sc}{
+      <-> ssub * NotoSerif-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{n}{
+      <-> ssub * NotoSerif-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{it}{
+      <-> ssub * NotoSerif-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{el}{scit}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{n}{
       <-> ssub * NotoSerif-TLF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{sc}{
+      <-> ssub * NotoSerif-TLF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{sl}{
+      <-> ssub * NotoSerif-TLF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSerif-TLF}{bx}{it}{
       <-> ssub * NotoSerif-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TOsF.fd b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TOsF.fd
index 1beb5d57df2..a869e2d12a0 100644
--- a/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LGRNotoSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LGRNotoSerif-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LGR/NotoSerif-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for LGR/NotoSerif-TOsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LGR}{NotoSerif-TOsF}{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-lgr
+
+%   ----  regular  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/eb/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{sl}{
-      <-> ssub * NotoSerif-TOsF/eb/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{regular}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-lgr
+
+%   ----  thin  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/sb/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{sl}{
-      <-> ssub * NotoSerif-TOsF/sb/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{thin}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-lgr
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/mb/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{mb}{sl}{
-      <-> ssub * NotoSerif-TOsF/mb/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-lgr
+
+%   ----  bold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{scsl}{
-      <-> ssub * NotoSerif-TOsF/m/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{sl}{
-      <-> ssub * NotoSerif-TOsF/m/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bold}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{scsl}{
-      <-> ssub * NotoSerif-TOsF/l/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{sl}{
-      <-> ssub * NotoSerif-TOsF/l/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{light}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{scsl}{
-      <-> ssub * NotoSerif-TOsF/k/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{k}{sl}{
-      <-> ssub * NotoSerif-TOsF/k/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{black}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-lgr
+
+%   ----  medium  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{medium}{sl}{
+      <-> ssub * NotoSerif-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{n}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{it}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{scit}{
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-sc-lgr
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{scsl}{
-      <-> ssub * NotoSerif-TOsF/el/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{sl}{
-      <-> ssub * NotoSerif-TOsF/el/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-lgr
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{sc}{
+      <-> ssub * NotoSerif-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-lgr
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{n}{
+      <-> ssub * NotoSerif-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{scsl}{
-      <-> ssub * NotoSerif-TOsF/i/scit
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{it}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{i}{sl}{
-      <-> ssub * NotoSerif-TOsF/i/it
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{m}{scit}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scsl
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{sc}{
-      <-> ssub * NotoSerif-TOsF/b/sc
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{sc}{
+      <-> ssub * NotoSerif-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{n}{
+      <-> ssub * NotoSerif-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{it}{
+      <-> ssub * NotoSerif-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ul}{scit}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{sc}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{n}{
+      <-> ssub * NotoSerif-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{it}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{eb}{scit}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{sc}{
+      <-> ssub * NotoSerif-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{n}{
+      <-> ssub * NotoSerif-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{it}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{sb}{scit}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{sc}{
+      <-> ssub * NotoSerif-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{n}{
+      <-> ssub * NotoSerif-TOsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{it}{
+      <-> ssub * NotoSerif-TOsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{ub}{scit}{
+      <-> ssub * NotoSerif-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{sc}{
+      <-> ssub * NotoSerif-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{n}{
+      <-> ssub * NotoSerif-TOsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{it}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{l}{scit}{
+      <-> ssub * NotoSerif-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{sc}{
+      <-> ssub * NotoSerif-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{n}{
+      <-> ssub * NotoSerif-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{it}{
+      <-> ssub * NotoSerif-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{b}{scit}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{sc}{
+      <-> ssub * NotoSerif-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{n}{
+      <-> ssub * NotoSerif-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{it}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{el}{scit}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{n}{
       <-> ssub * NotoSerif-TOsF/b/n
 }{}
 
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{sc}{
+      <-> ssub * NotoSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{sl}{
+      <-> ssub * NotoSerif-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LGR}{NotoSerif-TOsF}{bx}{it}{
       <-> ssub * NotoSerif-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd
index 81aeba18b6b..e25338772b5 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/22
 %%
 \ProvidesFile{LY1NotoMono-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoMono-TLF.]
+    [2019/04/22 (autoinst)  Font definitions for LY1/NotoMono-TLF.]
 
 \expandafter\ifx\csname NotoMono@scale\endcsname\relax
     \let\NotoMono@@scale\@empty
@@ -11,38 +11,77 @@
 
 \DeclareFontFamily{LY1}{NotoMono-TLF}{}
 
-\DeclareFontShape{LY1}{NotoMono-TLF}{b}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{regular}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{regular}{it}{
+      <-> \NotoMono@@scale NotoMono-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{regular}{sl}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{bold}{n}{
       <-> \NotoMono@@scale NotoMono-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoMono-TLF}{b}{it}{
+\DeclareFontShape{LY1}{NotoMono-TLF}{bold}{it}{
       <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoMono-TLF}{b}{sl}{
-      <-> ssub * NotoMono-TLF/b/it
+\DeclareFontShape{LY1}{NotoMono-TLF}{bold}{sl}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{m}{sl}{
+      <-> ssub * NotoMono-TLF/regular/sl
 }{}
 
 \DeclareFontShape{LY1}{NotoMono-TLF}{m}{n}{
-      <-> \NotoMono@@scale NotoMono-tlf-ly1
+      <-> ssub * NotoMono-TLF/regular/n
 }{}
 
 \DeclareFontShape{LY1}{NotoMono-TLF}{m}{it}{
-      <-> \NotoMono@@scale NotoMono-Italic-tlf-ly1
+      <-> ssub * NotoMono-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoMono-TLF}{m}{sl}{
-      <-> ssub * NotoMono-TLF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{b}{sl}{
+      <-> ssub * NotoMono-TLF/bold/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoMono-TLF}{bx}{sl}{
-      <-> ssub * NotoMono-TLF/b/sl
+\DeclareFontShape{LY1}{NotoMono-TLF}{b}{n}{
+      <-> ssub * NotoMono-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoMono-TLF}{b}{it}{
+      <-> ssub * NotoMono-TLF/bold/it
 }{}
 
 \DeclareFontShape{LY1}{NotoMono-TLF}{bx}{n}{
       <-> ssub * NotoMono-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoMono-TLF}{bx}{sl}{
+      <-> ssub * NotoMono-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoMono-TLF}{bx}{it}{
       <-> ssub * NotoMono-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-LF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-LF.fd
index adca2c7f810..93dd140d16d 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSans-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSans-LF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSans-LF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSans-LF}{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{scsl}{
-      <-> ssub * NotoSans-LF/eb/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{eb}{sl}{
-      <-> ssub * NotoSans-LF/eb/it
+\DeclareFontShape{LY1}{NotoSans-LF}{regular}{sl}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{scsl}{
-      <-> ssub * NotoSans-LF/sb/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{sb}{sl}{
-      <-> ssub * NotoSans-LF/sb/it
+\DeclareFontShape{LY1}{NotoSans-LF}{thin}{sl}{
+      <-> ssub * NotoSans-LF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{scsl}{
-      <-> ssub * NotoSans-LF/mb/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{mb}{sl}{
-      <-> ssub * NotoSans-LF/mb/it
+\DeclareFontShape{LY1}{NotoSans-LF}{semibold}{sl}{
+      <-> ssub * NotoSans-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{scsl}{
-      <-> ssub * NotoSans-LF/m/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{m}{sl}{
-      <-> ssub * NotoSans-LF/m/it
+\DeclareFontShape{LY1}{NotoSans-LF}{bold}{sl}{
+      <-> ssub * NotoSans-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{scsl}{
-      <-> ssub * NotoSans-LF/l/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{scsl}{
+      <-> ssub * NotoSans-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{l}{sl}{
-      <-> ssub * NotoSans-LF/l/it
+\DeclareFontShape{LY1}{NotoSans-LF}{light}{sl}{
+      <-> ssub * NotoSans-LF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extrabold}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{scsl}{
-      <-> ssub * NotoSans-LF/k/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{scsl}{
+      <-> ssub * NotoSans-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{k}{sl}{
-      <-> ssub * NotoSans-LF/k/it
+\DeclareFontShape{LY1}{NotoSans-LF}{black}{sl}{
+      <-> ssub * NotoSans-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{scsl}{
-      <-> ssub * NotoSans-LF/b/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{scsl}{
+      <-> ssub * NotoSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{b}{sl}{
-      <-> ssub * NotoSans-LF/b/it
+\DeclareFontShape{LY1}{NotoSans-LF}{medium}{sl}{
+      <-> ssub * NotoSans-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{scsl}{
-      <-> ssub * NotoSans-LF/el/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{el}{sl}{
-      <-> ssub * NotoSans-LF/el/it
+\DeclareFontShape{LY1}{NotoSans-LF}{extralight}{sl}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{sl}{
+      <-> ssub * NotoSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{sc}{
+      <-> ssub * NotoSans-LF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{n}{
+      <-> ssub * NotoSans-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{scsl}{
-      <-> ssub * NotoSans-LF/i/scit
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{it}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{i}{sl}{
-      <-> ssub * NotoSans-LF/i/it
+\DeclareFontShape{LY1}{NotoSans-LF}{m}{scit}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{bx}{sl}{
-      <-> ssub * NotoSans-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{sl}{
+      <-> ssub * NotoSans-LF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{bx}{scsl}{
-      <-> ssub * NotoSans-LF/b/scsl
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-LF}{bx}{sc}{
-      <-> ssub * NotoSans-LF/b/sc
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{sc}{
+      <-> ssub * NotoSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{n}{
+      <-> ssub * NotoSans-LF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{it}{
+      <-> ssub * NotoSans-LF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ul}{scit}{
+      <-> ssub * NotoSans-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{sc}{
+      <-> ssub * NotoSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{n}{
+      <-> ssub * NotoSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{it}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{eb}{scit}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{sl}{
+      <-> ssub * NotoSans-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{sc}{
+      <-> ssub * NotoSans-LF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{n}{
+      <-> ssub * NotoSans-LF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{it}{
+      <-> ssub * NotoSans-LF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{sb}{scit}{
+      <-> ssub * NotoSans-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{sl}{
+      <-> ssub * NotoSans-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{scsl}{
+      <-> ssub * NotoSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{sc}{
+      <-> ssub * NotoSans-LF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{n}{
+      <-> ssub * NotoSans-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{it}{
+      <-> ssub * NotoSans-LF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{ub}{scit}{
+      <-> ssub * NotoSans-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{sl}{
+      <-> ssub * NotoSans-LF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{scsl}{
+      <-> ssub * NotoSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{sc}{
+      <-> ssub * NotoSans-LF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{n}{
+      <-> ssub * NotoSans-LF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{it}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{l}{scit}{
+      <-> ssub * NotoSans-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{sl}{
+      <-> ssub * NotoSans-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{sc}{
+      <-> ssub * NotoSans-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{n}{
+      <-> ssub * NotoSans-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{it}{
+      <-> ssub * NotoSans-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{b}{scit}{
+      <-> ssub * NotoSans-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{sl}{
+      <-> ssub * NotoSans-LF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{sc}{
+      <-> ssub * NotoSans-LF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{n}{
+      <-> ssub * NotoSans-LF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{it}{
+      <-> ssub * NotoSans-LF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{el}{scit}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSans-LF}{bx}{n}{
       <-> ssub * NotoSans-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSans-LF}{bx}{sc}{
+      <-> ssub * NotoSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{bx}{scsl}{
+      <-> ssub * NotoSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-LF}{bx}{sl}{
+      <-> ssub * NotoSans-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSans-LF}{bx}{it}{
       <-> ssub * NotoSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-OsF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-OsF.fd
index 3764fd078cb..4eaa009b24f 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSans-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSans-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSans-OsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSans-OsF}{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{scsl}{
-      <-> ssub * NotoSans-OsF/eb/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{sl}{
-      <-> ssub * NotoSans-OsF/eb/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{regular}{sl}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{scsl}{
-      <-> ssub * NotoSans-OsF/sb/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{sl}{
-      <-> ssub * NotoSans-OsF/sb/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{thin}{sl}{
+      <-> ssub * NotoSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{scsl}{
-      <-> ssub * NotoSans-OsF/mb/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{mb}{sl}{
-      <-> ssub * NotoSans-OsF/mb/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{semibold}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{scsl}{
-      <-> ssub * NotoSans-OsF/m/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{m}{sl}{
-      <-> ssub * NotoSans-OsF/m/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{bold}{sl}{
+      <-> ssub * NotoSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{scsl}{
-      <-> ssub * NotoSans-OsF/l/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{l}{sl}{
-      <-> ssub * NotoSans-OsF/l/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{light}{sl}{
+      <-> ssub * NotoSans-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{scsl}{
-      <-> ssub * NotoSans-OsF/k/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{k}{sl}{
-      <-> ssub * NotoSans-OsF/k/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{black}{sl}{
+      <-> ssub * NotoSans-OsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{scsl}{
+      <-> ssub * NotoSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{b}{sl}{
-      <-> ssub * NotoSans-OsF/b/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{medium}{sl}{
+      <-> ssub * NotoSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{scsl}{
-      <-> ssub * NotoSans-OsF/el/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{el}{sl}{
-      <-> ssub * NotoSans-OsF/el/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{extralight}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{sl}{
+      <-> ssub * NotoSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{sc}{
+      <-> ssub * NotoSans-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{n}{
+      <-> ssub * NotoSans-OsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{scsl}{
-      <-> ssub * NotoSans-OsF/i/scit
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{it}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{i}{sl}{
-      <-> ssub * NotoSans-OsF/i/it
+\DeclareFontShape{LY1}{NotoSans-OsF}{m}{scit}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{sl}{
-      <-> ssub * NotoSans-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{sl}{
+      <-> ssub * NotoSans-OsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scsl
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{sc}{
-      <-> ssub * NotoSans-OsF/b/sc
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{sc}{
+      <-> ssub * NotoSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{n}{
+      <-> ssub * NotoSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{it}{
+      <-> ssub * NotoSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ul}{scit}{
+      <-> ssub * NotoSans-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{sc}{
+      <-> ssub * NotoSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{n}{
+      <-> ssub * NotoSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{it}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{eb}{scit}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{sc}{
+      <-> ssub * NotoSans-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{n}{
+      <-> ssub * NotoSans-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{it}{
+      <-> ssub * NotoSans-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{sb}{scit}{
+      <-> ssub * NotoSans-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{sl}{
+      <-> ssub * NotoSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{sc}{
+      <-> ssub * NotoSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{n}{
+      <-> ssub * NotoSans-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{it}{
+      <-> ssub * NotoSans-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{ub}{scit}{
+      <-> ssub * NotoSans-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{sl}{
+      <-> ssub * NotoSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{sc}{
+      <-> ssub * NotoSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{n}{
+      <-> ssub * NotoSans-OsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{it}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{l}{scit}{
+      <-> ssub * NotoSans-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{sl}{
+      <-> ssub * NotoSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{sc}{
+      <-> ssub * NotoSans-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{n}{
+      <-> ssub * NotoSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{it}{
+      <-> ssub * NotoSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{b}{scit}{
+      <-> ssub * NotoSans-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{sc}{
+      <-> ssub * NotoSans-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{n}{
+      <-> ssub * NotoSans-OsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{it}{
+      <-> ssub * NotoSans-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{el}{scit}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSans-OsF}{bx}{n}{
       <-> ssub * NotoSans-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{sc}{
+      <-> ssub * NotoSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{scsl}{
+      <-> ssub * NotoSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-OsF}{bx}{sl}{
+      <-> ssub * NotoSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSans-OsF}{bx}{it}{
       <-> ssub * NotoSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-Sup.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-Sup.fd
index a1ab99b575a..a1bd427ab61 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSans-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSans-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSans-Sup.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{LY1}{NotoSans-Sup}{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{sl}{
-      <-> ssub * NotoSans-Sup/eb/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{regular}{sl}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-sup-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{sl}{
-      <-> ssub * NotoSans-Sup/sb/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{thin}{sl}{
+      <-> ssub * NotoSans-Sup/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-sup-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{mb}{sl}{
-      <-> ssub * NotoSans-Sup/mb/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{semibold}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-sup-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{m}{sl}{
-      <-> ssub * NotoSans-Sup/m/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{bold}{sl}{
+      <-> ssub * NotoSans-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{l}{it}{
+\DeclareFontShape{LY1}{NotoSans-Sup}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{l}{sl}{
-      <-> ssub * NotoSans-Sup/l/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{light}{sl}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{k}{n}{
+\DeclareFontShape{LY1}{NotoSans-Sup}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{k}{it}{
+\DeclareFontShape{LY1}{NotoSans-Sup}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{k}{sl}{
-      <-> ssub * NotoSans-Sup/k/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{black}{sl}{
+      <-> ssub * NotoSans-Sup/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-sup-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{b}{sl}{
-      <-> ssub * NotoSans-Sup/b/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{medium}{sl}{
+      <-> ssub * NotoSans-Sup/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{el}{it}{
+\DeclareFontShape{LY1}{NotoSans-Sup}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{el}{sl}{
-      <-> ssub * NotoSans-Sup/el/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{extralight}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-sup-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{m}{sl}{
+      <-> ssub * NotoSans-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSans-Sup}{m}{n}{
+      <-> ssub * NotoSans-Sup/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{i}{sl}{
-      <-> ssub * NotoSans-Sup/i/it
+\DeclareFontShape{LY1}{NotoSans-Sup}{m}{it}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-Sup}{bx}{sl}{
-      <-> ssub * NotoSans-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ul}{sl}{
+      <-> ssub * NotoSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ul}{n}{
+      <-> ssub * NotoSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ul}{it}{
+      <-> ssub * NotoSans-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{n}{
+      <-> ssub * NotoSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{eb}{it}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{n}{
+      <-> ssub * NotoSans-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{sb}{it}{
+      <-> ssub * NotoSans-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ub}{sl}{
+      <-> ssub * NotoSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ub}{n}{
+      <-> ssub * NotoSans-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{ub}{it}{
+      <-> ssub * NotoSans-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{l}{sl}{
+      <-> ssub * NotoSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{l}{n}{
+      <-> ssub * NotoSans-Sup/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{l}{it}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{b}{sl}{
+      <-> ssub * NotoSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{b}{n}{
+      <-> ssub * NotoSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{b}{it}{
+      <-> ssub * NotoSans-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{el}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{el}{n}{
+      <-> ssub * NotoSans-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-Sup}{el}{it}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
 \DeclareFontShape{LY1}{NotoSans-Sup}{bx}{n}{
       <-> ssub * NotoSans-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSans-Sup}{bx}{sl}{
+      <-> ssub * NotoSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSans-Sup}{bx}{it}{
       <-> ssub * NotoSans-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TLF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TLF.fd
index 35c83916310..f11090c4abe 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSans-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSans-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSans-TLF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSans-TLF}{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{scsl}{
-      <-> ssub * NotoSans-TLF/eb/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{sl}{
-      <-> ssub * NotoSans-TLF/eb/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{regular}{sl}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{scsl}{
-      <-> ssub * NotoSans-TLF/sb/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{sl}{
-      <-> ssub * NotoSans-TLF/sb/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{thin}{sl}{
+      <-> ssub * NotoSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{scsl}{
-      <-> ssub * NotoSans-TLF/mb/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{mb}{sl}{
-      <-> ssub * NotoSans-TLF/mb/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{semibold}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{scsl}{
-      <-> ssub * NotoSans-TLF/m/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{m}{sl}{
-      <-> ssub * NotoSans-TLF/m/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{bold}{sl}{
+      <-> ssub * NotoSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{scsl}{
-      <-> ssub * NotoSans-TLF/l/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{l}{sl}{
-      <-> ssub * NotoSans-TLF/l/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{light}{sl}{
+      <-> ssub * NotoSans-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{scsl}{
-      <-> ssub * NotoSans-TLF/k/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{k}{sl}{
-      <-> ssub * NotoSans-TLF/k/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{black}{sl}{
+      <-> ssub * NotoSans-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{scsl}{
+      <-> ssub * NotoSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{b}{sl}{
-      <-> ssub * NotoSans-TLF/b/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{medium}{sl}{
+      <-> ssub * NotoSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{scsl}{
-      <-> ssub * NotoSans-TLF/el/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{el}{sl}{
-      <-> ssub * NotoSans-TLF/el/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{extralight}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{sl}{
+      <-> ssub * NotoSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{sc}{
+      <-> ssub * NotoSans-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{n}{
+      <-> ssub * NotoSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{scsl}{
-      <-> ssub * NotoSans-TLF/i/scit
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{it}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{i}{sl}{
-      <-> ssub * NotoSans-TLF/i/it
+\DeclareFontShape{LY1}{NotoSans-TLF}{m}{scit}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{sl}{
-      <-> ssub * NotoSans-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{sl}{
+      <-> ssub * NotoSans-TLF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scsl
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{sc}{
-      <-> ssub * NotoSans-TLF/b/sc
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{sc}{
+      <-> ssub * NotoSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{n}{
+      <-> ssub * NotoSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{it}{
+      <-> ssub * NotoSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ul}{scit}{
+      <-> ssub * NotoSans-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{sc}{
+      <-> ssub * NotoSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{n}{
+      <-> ssub * NotoSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{it}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{eb}{scit}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{sc}{
+      <-> ssub * NotoSans-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{n}{
+      <-> ssub * NotoSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{it}{
+      <-> ssub * NotoSans-TLF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{sb}{scit}{
+      <-> ssub * NotoSans-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{sl}{
+      <-> ssub * NotoSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{sc}{
+      <-> ssub * NotoSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{n}{
+      <-> ssub * NotoSans-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{it}{
+      <-> ssub * NotoSans-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{ub}{scit}{
+      <-> ssub * NotoSans-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{sl}{
+      <-> ssub * NotoSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{sc}{
+      <-> ssub * NotoSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{n}{
+      <-> ssub * NotoSans-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{it}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{l}{scit}{
+      <-> ssub * NotoSans-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{sl}{
+      <-> ssub * NotoSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{sc}{
+      <-> ssub * NotoSans-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{n}{
+      <-> ssub * NotoSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{it}{
+      <-> ssub * NotoSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{b}{scit}{
+      <-> ssub * NotoSans-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{sc}{
+      <-> ssub * NotoSans-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{n}{
+      <-> ssub * NotoSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{it}{
+      <-> ssub * NotoSans-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{el}{scit}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSans-TLF}{bx}{n}{
       <-> ssub * NotoSans-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{sc}{
+      <-> ssub * NotoSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{scsl}{
+      <-> ssub * NotoSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TLF}{bx}{sl}{
+      <-> ssub * NotoSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSans-TLF}{bx}{it}{
       <-> ssub * NotoSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TOsF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TOsF.fd
index fbb0aad6fad..95e86d57b2c 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSans-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSans-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSans-TOsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSans-TOsF}{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSans-TOsF/eb/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{sl}{
-      <-> ssub * NotoSans-TOsF/eb/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{regular}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSans-TOsF/sb/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{sl}{
-      <-> ssub * NotoSans-TOsF/sb/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{thin}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSans-TOsF/mb/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{mb}{sl}{
-      <-> ssub * NotoSans-TOsF/mb/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{scsl}{
-      <-> ssub * NotoSans-TOsF/m/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{sl}{
-      <-> ssub * NotoSans-TOsF/m/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bold}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{scsl}{
-      <-> ssub * NotoSans-TOsF/l/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{sl}{
-      <-> ssub * NotoSans-TOsF/l/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{light}{sl}{
+      <-> ssub * NotoSans-TOsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{scsl}{
-      <-> ssub * NotoSans-TOsF/k/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{k}{sl}{
-      <-> ssub * NotoSans-TOsF/k/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{black}{sl}{
+      <-> ssub * NotoSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{sl}{
-      <-> ssub * NotoSans-TOsF/b/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{medium}{sl}{
+      <-> ssub * NotoSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{scsl}{
-      <-> ssub * NotoSans-TOsF/el/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{sl}{
-      <-> ssub * NotoSans-TOsF/el/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{sc}{
+      <-> ssub * NotoSans-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{n}{
+      <-> ssub * NotoSans-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{scsl}{
-      <-> ssub * NotoSans-TOsF/i/scit
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{it}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{i}{sl}{
-      <-> ssub * NotoSans-TOsF/i/it
+\DeclareFontShape{LY1}{NotoSans-TOsF}{m}{scit}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{sl}{
-      <-> ssub * NotoSans-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scsl
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{sc}{
-      <-> ssub * NotoSans-TOsF/b/sc
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{sc}{
+      <-> ssub * NotoSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{n}{
+      <-> ssub * NotoSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{it}{
+      <-> ssub * NotoSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ul}{scit}{
+      <-> ssub * NotoSans-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{sc}{
+      <-> ssub * NotoSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{n}{
+      <-> ssub * NotoSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{it}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{eb}{scit}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{sc}{
+      <-> ssub * NotoSans-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{n}{
+      <-> ssub * NotoSans-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{it}{
+      <-> ssub * NotoSans-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{sb}{scit}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{sl}{
+      <-> ssub * NotoSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{sc}{
+      <-> ssub * NotoSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{n}{
+      <-> ssub * NotoSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{it}{
+      <-> ssub * NotoSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{ub}{scit}{
+      <-> ssub * NotoSans-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{sl}{
+      <-> ssub * NotoSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{sc}{
+      <-> ssub * NotoSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{n}{
+      <-> ssub * NotoSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{it}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{l}{scit}{
+      <-> ssub * NotoSans-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{sc}{
+      <-> ssub * NotoSans-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{n}{
+      <-> ssub * NotoSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{it}{
+      <-> ssub * NotoSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{b}{scit}{
+      <-> ssub * NotoSans-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{sc}{
+      <-> ssub * NotoSans-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{n}{
+      <-> ssub * NotoSans-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{it}{
+      <-> ssub * NotoSans-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{el}{scit}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{n}{
       <-> ssub * NotoSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{sc}{
+      <-> ssub * NotoSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{sl}{
+      <-> ssub * NotoSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSans-TOsF}{bx}{it}{
       <-> ssub * NotoSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-LF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-LF.fd
index 25c12e0e036..628a5b33554 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSerif-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSerif-LF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSerif-LF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSerif-LF}{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{scsl}{
-      <-> ssub * NotoSerif-LF/eb/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{sl}{
-      <-> ssub * NotoSerif-LF/eb/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{regular}{sl}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{scsl}{
-      <-> ssub * NotoSerif-LF/sb/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{sl}{
-      <-> ssub * NotoSerif-LF/sb/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{thin}{sl}{
+      <-> ssub * NotoSerif-LF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{scsl}{
-      <-> ssub * NotoSerif-LF/mb/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{mb}{sl}{
-      <-> ssub * NotoSerif-LF/mb/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{semibold}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{scsl}{
-      <-> ssub * NotoSerif-LF/m/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{m}{sl}{
-      <-> ssub * NotoSerif-LF/m/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{bold}{sl}{
+      <-> ssub * NotoSerif-LF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{scsl}{
-      <-> ssub * NotoSerif-LF/l/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{l}{sl}{
-      <-> ssub * NotoSerif-LF/l/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{light}{sl}{
+      <-> ssub * NotoSerif-LF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{scsl}{
-      <-> ssub * NotoSerif-LF/k/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{k}{sl}{
-      <-> ssub * NotoSerif-LF/k/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{black}{sl}{
+      <-> ssub * NotoSerif-LF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{scsl}{
+      <-> ssub * NotoSerif-LF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{b}{sl}{
-      <-> ssub * NotoSerif-LF/b/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{medium}{sl}{
+      <-> ssub * NotoSerif-LF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{scsl}{
-      <-> ssub * NotoSerif-LF/el/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{el}{sl}{
-      <-> ssub * NotoSerif-LF/el/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{extralight}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{sl}{
+      <-> ssub * NotoSerif-LF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{sc}{
+      <-> ssub * NotoSerif-LF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{n}{
+      <-> ssub * NotoSerif-LF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{scsl}{
-      <-> ssub * NotoSerif-LF/i/scit
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{it}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{i}{sl}{
-      <-> ssub * NotoSerif-LF/i/it
+\DeclareFontShape{LY1}{NotoSerif-LF}{m}{scit}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{sl}{
-      <-> ssub * NotoSerif-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{sl}{
+      <-> ssub * NotoSerif-LF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scsl
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{sc}{
-      <-> ssub * NotoSerif-LF/b/sc
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{sc}{
+      <-> ssub * NotoSerif-LF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{n}{
+      <-> ssub * NotoSerif-LF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{it}{
+      <-> ssub * NotoSerif-LF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ul}{scit}{
+      <-> ssub * NotoSerif-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{sc}{
+      <-> ssub * NotoSerif-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{n}{
+      <-> ssub * NotoSerif-LF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{it}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{eb}{scit}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{sc}{
+      <-> ssub * NotoSerif-LF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{n}{
+      <-> ssub * NotoSerif-LF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{it}{
+      <-> ssub * NotoSerif-LF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{sb}{scit}{
+      <-> ssub * NotoSerif-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{sl}{
+      <-> ssub * NotoSerif-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{sc}{
+      <-> ssub * NotoSerif-LF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{n}{
+      <-> ssub * NotoSerif-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{it}{
+      <-> ssub * NotoSerif-LF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{ub}{scit}{
+      <-> ssub * NotoSerif-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{sl}{
+      <-> ssub * NotoSerif-LF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{sc}{
+      <-> ssub * NotoSerif-LF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{n}{
+      <-> ssub * NotoSerif-LF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{it}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{l}{scit}{
+      <-> ssub * NotoSerif-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{sl}{
+      <-> ssub * NotoSerif-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{sc}{
+      <-> ssub * NotoSerif-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{n}{
+      <-> ssub * NotoSerif-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{it}{
+      <-> ssub * NotoSerif-LF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{b}{scit}{
+      <-> ssub * NotoSerif-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{sc}{
+      <-> ssub * NotoSerif-LF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{n}{
+      <-> ssub * NotoSerif-LF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{it}{
+      <-> ssub * NotoSerif-LF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{el}{scit}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSerif-LF}{bx}{n}{
       <-> ssub * NotoSerif-LF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{sc}{
+      <-> ssub * NotoSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{scsl}{
+      <-> ssub * NotoSerif-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-LF}{bx}{sl}{
+      <-> ssub * NotoSerif-LF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSerif-LF}{bx}{it}{
       <-> ssub * NotoSerif-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-OsF.fd
index 40c44f6049e..e065f4082b2 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSerif-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSerif-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSerif-OsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSerif-OsF}{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-OsF/eb/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{sl}{
-      <-> ssub * NotoSerif-OsF/eb/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{regular}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-OsF/sb/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{sl}{
-      <-> ssub * NotoSerif-OsF/sb/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{thin}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-OsF/mb/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{mb}{sl}{
-      <-> ssub * NotoSerif-OsF/mb/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{scsl}{
-      <-> ssub * NotoSerif-OsF/m/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{sl}{
-      <-> ssub * NotoSerif-OsF/m/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bold}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{scsl}{
-      <-> ssub * NotoSerif-OsF/l/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{sl}{
-      <-> ssub * NotoSerif-OsF/l/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{light}{sl}{
+      <-> ssub * NotoSerif-OsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{scsl}{
-      <-> ssub * NotoSerif-OsF/k/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{k}{sl}{
-      <-> ssub * NotoSerif-OsF/k/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{black}{sl}{
+      <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-OsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{sl}{
-      <-> ssub * NotoSerif-OsF/b/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{medium}{sl}{
+      <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{scsl}{
-      <-> ssub * NotoSerif-OsF/el/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{sl}{
-      <-> ssub * NotoSerif-OsF/el/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{sc}{
+      <-> ssub * NotoSerif-OsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{n}{
+      <-> ssub * NotoSerif-OsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{scsl}{
-      <-> ssub * NotoSerif-OsF/i/scit
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{it}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{i}{sl}{
-      <-> ssub * NotoSerif-OsF/i/it
+\DeclareFontShape{LY1}{NotoSerif-OsF}{m}{scit}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{sl}{
-      <-> ssub * NotoSerif-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scsl
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{sc}{
-      <-> ssub * NotoSerif-OsF/b/sc
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{sc}{
+      <-> ssub * NotoSerif-OsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{n}{
+      <-> ssub * NotoSerif-OsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{it}{
+      <-> ssub * NotoSerif-OsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ul}{scit}{
+      <-> ssub * NotoSerif-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{sc}{
+      <-> ssub * NotoSerif-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{n}{
+      <-> ssub * NotoSerif-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{it}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{eb}{scit}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{sc}{
+      <-> ssub * NotoSerif-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{n}{
+      <-> ssub * NotoSerif-OsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{it}{
+      <-> ssub * NotoSerif-OsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{sb}{scit}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{sl}{
+      <-> ssub * NotoSerif-OsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{sc}{
+      <-> ssub * NotoSerif-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{n}{
+      <-> ssub * NotoSerif-OsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{it}{
+      <-> ssub * NotoSerif-OsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{ub}{scit}{
+      <-> ssub * NotoSerif-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{sl}{
+      <-> ssub * NotoSerif-OsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{sc}{
+      <-> ssub * NotoSerif-OsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{n}{
+      <-> ssub * NotoSerif-OsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{it}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{l}{scit}{
+      <-> ssub * NotoSerif-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{sc}{
+      <-> ssub * NotoSerif-OsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{n}{
+      <-> ssub * NotoSerif-OsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{it}{
+      <-> ssub * NotoSerif-OsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{b}{scit}{
+      <-> ssub * NotoSerif-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{sc}{
+      <-> ssub * NotoSerif-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{n}{
+      <-> ssub * NotoSerif-OsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{it}{
+      <-> ssub * NotoSerif-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{el}{scit}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{n}{
       <-> ssub * NotoSerif-OsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{sc}{
+      <-> ssub * NotoSerif-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-OsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{sl}{
+      <-> ssub * NotoSerif-OsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSerif-OsF}{bx}{it}{
       <-> ssub * NotoSerif-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-Sup.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-Sup.fd
index a54fd09fafb..559f5bfd975 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSerif-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSerif-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSerif-Sup.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{LY1}{NotoSerif-Sup}{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{sl}{
-      <-> ssub * NotoSerif-Sup/eb/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{regular}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{sl}{
-      <-> ssub * NotoSerif-Sup/sb/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{thin}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-sup-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{mb}{sl}{
-      <-> ssub * NotoSerif-Sup/mb/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{semibold}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-sup-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{sl}{
-      <-> ssub * NotoSerif-Sup/m/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{bold}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{it}{
+\DeclareFontShape{LY1}{NotoSerif-Sup}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{sl}{
-      <-> ssub * NotoSerif-Sup/l/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{light}{sl}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{k}{n}{
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{k}{it}{
+\DeclareFontShape{LY1}{NotoSerif-Sup}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{k}{sl}{
-      <-> ssub * NotoSerif-Sup/k/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{black}{sl}{
+      <-> ssub * NotoSerif-Sup/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-sup-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{sl}{
-      <-> ssub * NotoSerif-Sup/b/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{medium}{sl}{
+      <-> ssub * NotoSerif-Sup/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{it}{
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-sup-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{sl}{
-      <-> ssub * NotoSerif-Sup/el/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{extralight}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-sup-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-ly1
+\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{n}{
+      <-> ssub * NotoSerif-Sup/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{i}{sl}{
-      <-> ssub * NotoSerif-Sup/i/it
+\DeclareFontShape{LY1}{NotoSerif-Sup}{m}{it}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-Sup}{bx}{sl}{
-      <-> ssub * NotoSerif-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ul}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ul}{n}{
+      <-> ssub * NotoSerif-Sup/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ul}{it}{
+      <-> ssub * NotoSerif-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{n}{
+      <-> ssub * NotoSerif-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{eb}{it}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{n}{
+      <-> ssub * NotoSerif-Sup/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{sb}{it}{
+      <-> ssub * NotoSerif-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ub}{sl}{
+      <-> ssub * NotoSerif-Sup/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ub}{n}{
+      <-> ssub * NotoSerif-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{ub}{it}{
+      <-> ssub * NotoSerif-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{sl}{
+      <-> ssub * NotoSerif-Sup/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{n}{
+      <-> ssub * NotoSerif-Sup/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{l}{it}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{n}{
+      <-> ssub * NotoSerif-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{b}{it}{
+      <-> ssub * NotoSerif-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{n}{
+      <-> ssub * NotoSerif-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-Sup}{el}{it}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
 \DeclareFontShape{LY1}{NotoSerif-Sup}{bx}{n}{
       <-> ssub * NotoSerif-Sup/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSerif-Sup}{bx}{sl}{
+      <-> ssub * NotoSerif-Sup/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSerif-Sup}{bx}{it}{
       <-> ssub * NotoSerif-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TLF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TLF.fd
index 1a0ba3e9ad5..db2b5be0d2c 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSerif-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSerif-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSerif-TLF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSerif-TLF}{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TLF/eb/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{sl}{
-      <-> ssub * NotoSerif-TLF/eb/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{regular}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TLF/sb/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{sl}{
-      <-> ssub * NotoSerif-TLF/sb/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{thin}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TLF/mb/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{mb}{sl}{
-      <-> ssub * NotoSerif-TLF/mb/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{scsl}{
-      <-> ssub * NotoSerif-TLF/m/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{sl}{
-      <-> ssub * NotoSerif-TLF/m/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bold}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{scsl}{
-      <-> ssub * NotoSerif-TLF/l/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{sl}{
-      <-> ssub * NotoSerif-TLF/l/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{light}{sl}{
+      <-> ssub * NotoSerif-TLF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{scsl}{
-      <-> ssub * NotoSerif-TLF/k/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{k}{sl}{
-      <-> ssub * NotoSerif-TLF/k/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{black}{sl}{
+      <-> ssub * NotoSerif-TLF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TLF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{sl}{
-      <-> ssub * NotoSerif-TLF/b/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{medium}{sl}{
+      <-> ssub * NotoSerif-TLF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{scsl}{
-      <-> ssub * NotoSerif-TLF/el/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{sl}{
-      <-> ssub * NotoSerif-TLF/el/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{sc}{
+      <-> ssub * NotoSerif-TLF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{n}{
+      <-> ssub * NotoSerif-TLF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{scsl}{
-      <-> ssub * NotoSerif-TLF/i/scit
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{it}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{i}{sl}{
-      <-> ssub * NotoSerif-TLF/i/it
+\DeclareFontShape{LY1}{NotoSerif-TLF}{m}{scit}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{sl}{
-      <-> ssub * NotoSerif-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scsl
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{sc}{
-      <-> ssub * NotoSerif-TLF/b/sc
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{sc}{
+      <-> ssub * NotoSerif-TLF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{n}{
+      <-> ssub * NotoSerif-TLF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{it}{
+      <-> ssub * NotoSerif-TLF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ul}{scit}{
+      <-> ssub * NotoSerif-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{sc}{
+      <-> ssub * NotoSerif-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{n}{
+      <-> ssub * NotoSerif-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{it}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{eb}{scit}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{sc}{
+      <-> ssub * NotoSerif-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{n}{
+      <-> ssub * NotoSerif-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{it}{
+      <-> ssub * NotoSerif-TLF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{sb}{scit}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{sl}{
+      <-> ssub * NotoSerif-TLF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{sc}{
+      <-> ssub * NotoSerif-TLF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{n}{
+      <-> ssub * NotoSerif-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{it}{
+      <-> ssub * NotoSerif-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{ub}{scit}{
+      <-> ssub * NotoSerif-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{sl}{
+      <-> ssub * NotoSerif-TLF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{sc}{
+      <-> ssub * NotoSerif-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{n}{
+      <-> ssub * NotoSerif-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{it}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{l}{scit}{
+      <-> ssub * NotoSerif-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{sc}{
+      <-> ssub * NotoSerif-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{n}{
+      <-> ssub * NotoSerif-TLF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{it}{
+      <-> ssub * NotoSerif-TLF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{b}{scit}{
+      <-> ssub * NotoSerif-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{sc}{
+      <-> ssub * NotoSerif-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{n}{
+      <-> ssub * NotoSerif-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{it}{
+      <-> ssub * NotoSerif-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{el}{scit}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{n}{
       <-> ssub * NotoSerif-TLF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{sc}{
+      <-> ssub * NotoSerif-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{sl}{
+      <-> ssub * NotoSerif-TLF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSerif-TLF}{bx}{it}{
       <-> ssub * NotoSerif-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TOsF.fd b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TOsF.fd
index d053bc5e105..7d1621b6bd6 100644
--- a/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/LY1NotoSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{LY1NotoSerif-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for LY1/NotoSerif-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for LY1/NotoSerif-TOsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{LY1}{NotoSerif-TOsF}{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-ly1
+
+%   ----  regular  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/eb/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{sl}{
-      <-> ssub * NotoSerif-TOsF/eb/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{regular}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-ly1
+
+%   ----  thin  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/sb/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{sl}{
-      <-> ssub * NotoSerif-TOsF/sb/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{thin}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-ly1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/mb/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{mb}{sl}{
-      <-> ssub * NotoSerif-TOsF/mb/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-ly1
+
+%   ----  bold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{scsl}{
-      <-> ssub * NotoSerif-TOsF/m/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{sl}{
-      <-> ssub * NotoSerif-TOsF/m/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bold}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{scsl}{
-      <-> ssub * NotoSerif-TOsF/l/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{sl}{
-      <-> ssub * NotoSerif-TOsF/l/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{light}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{scsl}{
-      <-> ssub * NotoSerif-TOsF/k/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{k}{sl}{
-      <-> ssub * NotoSerif-TOsF/k/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{black}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-ly1
+
+%   ----  medium  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{medium}{sl}{
+      <-> ssub * NotoSerif-TOsF/medium/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{n}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{it}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{scit}{
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-sc-ly1
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{scsl}{
-      <-> ssub * NotoSerif-TOsF/el/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{sl}{
-      <-> ssub * NotoSerif-TOsF/el/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-ly1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{sc}{
+      <-> ssub * NotoSerif-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-ly1
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{n}{
+      <-> ssub * NotoSerif-TOsF/regular/n
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{scsl}{
-      <-> ssub * NotoSerif-TOsF/i/scit
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{it}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{i}{sl}{
-      <-> ssub * NotoSerif-TOsF/i/it
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{m}{scit}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scsl
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{sc}{
-      <-> ssub * NotoSerif-TOsF/b/sc
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{sc}{
+      <-> ssub * NotoSerif-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{n}{
+      <-> ssub * NotoSerif-TOsF/thin/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{it}{
+      <-> ssub * NotoSerif-TOsF/thin/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ul}{scit}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{sc}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{n}{
+      <-> ssub * NotoSerif-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{it}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{eb}{scit}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{sc}{
+      <-> ssub * NotoSerif-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{n}{
+      <-> ssub * NotoSerif-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{it}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{sb}{scit}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{sc}{
+      <-> ssub * NotoSerif-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{n}{
+      <-> ssub * NotoSerif-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{it}{
+      <-> ssub * NotoSerif-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{ub}{scit}{
+      <-> ssub * NotoSerif-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{sc}{
+      <-> ssub * NotoSerif-TOsF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{n}{
+      <-> ssub * NotoSerif-TOsF/light/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{it}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{l}{scit}{
+      <-> ssub * NotoSerif-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{sc}{
+      <-> ssub * NotoSerif-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{n}{
+      <-> ssub * NotoSerif-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{it}{
+      <-> ssub * NotoSerif-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{b}{scit}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{sc}{
+      <-> ssub * NotoSerif-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{n}{
+      <-> ssub * NotoSerif-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{it}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{el}{scit}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{n}{
       <-> ssub * NotoSerif-TOsF/b/n
 }{}
 
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{sc}{
+      <-> ssub * NotoSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{sl}{
+      <-> ssub * NotoSerif-TOsF/b/sl
+}{}
+
 \DeclareFontShape{LY1}{NotoSerif-TOsF}{bx}{it}{
       <-> ssub * NotoSerif-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd
index 43fb640550e..c30b7ba3c60 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/22
 %%
 \ProvidesFile{OT1NotoMono-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoMono-TLF.]
+    [2019/04/22 (autoinst)  Font definitions for OT1/NotoMono-TLF.]
 
 \expandafter\ifx\csname NotoMono@scale\endcsname\relax
     \let\NotoMono@@scale\@empty
@@ -11,38 +11,77 @@
 
 \DeclareFontFamily{OT1}{NotoMono-TLF}{}
 
-\DeclareFontShape{OT1}{NotoMono-TLF}{b}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{regular}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{regular}{it}{
+      <-> \NotoMono@@scale NotoMono-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{regular}{sl}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{bold}{n}{
       <-> \NotoMono@@scale NotoMono-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoMono-TLF}{b}{it}{
+\DeclareFontShape{OT1}{NotoMono-TLF}{bold}{it}{
       <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoMono-TLF}{b}{sl}{
-      <-> ssub * NotoMono-TLF/b/it
+\DeclareFontShape{OT1}{NotoMono-TLF}{bold}{sl}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{m}{sl}{
+      <-> ssub * NotoMono-TLF/regular/sl
 }{}
 
 \DeclareFontShape{OT1}{NotoMono-TLF}{m}{n}{
-      <-> \NotoMono@@scale NotoMono-tlf-ot1
+      <-> ssub * NotoMono-TLF/regular/n
 }{}
 
 \DeclareFontShape{OT1}{NotoMono-TLF}{m}{it}{
-      <-> \NotoMono@@scale NotoMono-Italic-tlf-ot1
+      <-> ssub * NotoMono-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoMono-TLF}{m}{sl}{
-      <-> ssub * NotoMono-TLF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{b}{sl}{
+      <-> ssub * NotoMono-TLF/bold/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoMono-TLF}{bx}{sl}{
-      <-> ssub * NotoMono-TLF/b/sl
+\DeclareFontShape{OT1}{NotoMono-TLF}{b}{n}{
+      <-> ssub * NotoMono-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoMono-TLF}{b}{it}{
+      <-> ssub * NotoMono-TLF/bold/it
 }{}
 
 \DeclareFontShape{OT1}{NotoMono-TLF}{bx}{n}{
       <-> ssub * NotoMono-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoMono-TLF}{bx}{sl}{
+      <-> ssub * NotoMono-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoMono-TLF}{bx}{it}{
       <-> ssub * NotoMono-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-LF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-LF.fd
index 14cf5469820..2d537f7f9b3 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSans-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSans-LF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSans-LF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSans-LF}{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{scsl}{
-      <-> ssub * NotoSans-LF/eb/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{eb}{sl}{
-      <-> ssub * NotoSans-LF/eb/it
+\DeclareFontShape{OT1}{NotoSans-LF}{regular}{sl}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{scsl}{
-      <-> ssub * NotoSans-LF/sb/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{sb}{sl}{
-      <-> ssub * NotoSans-LF/sb/it
+\DeclareFontShape{OT1}{NotoSans-LF}{thin}{sl}{
+      <-> ssub * NotoSans-LF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{scsl}{
-      <-> ssub * NotoSans-LF/mb/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{mb}{sl}{
-      <-> ssub * NotoSans-LF/mb/it
+\DeclareFontShape{OT1}{NotoSans-LF}{semibold}{sl}{
+      <-> ssub * NotoSans-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{scsl}{
-      <-> ssub * NotoSans-LF/m/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{m}{sl}{
-      <-> ssub * NotoSans-LF/m/it
+\DeclareFontShape{OT1}{NotoSans-LF}{bold}{sl}{
+      <-> ssub * NotoSans-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{scsl}{
-      <-> ssub * NotoSans-LF/l/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{scsl}{
+      <-> ssub * NotoSans-LF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{l}{sl}{
-      <-> ssub * NotoSans-LF/l/it
+\DeclareFontShape{OT1}{NotoSans-LF}{light}{sl}{
+      <-> ssub * NotoSans-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extrabold}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{scsl}{
-      <-> ssub * NotoSans-LF/k/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{scsl}{
+      <-> ssub * NotoSans-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{k}{sl}{
-      <-> ssub * NotoSans-LF/k/it
+\DeclareFontShape{OT1}{NotoSans-LF}{black}{sl}{
+      <-> ssub * NotoSans-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{scsl}{
-      <-> ssub * NotoSans-LF/b/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{scsl}{
+      <-> ssub * NotoSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{b}{sl}{
-      <-> ssub * NotoSans-LF/b/it
+\DeclareFontShape{OT1}{NotoSans-LF}{medium}{sl}{
+      <-> ssub * NotoSans-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{scsl}{
-      <-> ssub * NotoSans-LF/el/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{el}{sl}{
-      <-> ssub * NotoSans-LF/el/it
+\DeclareFontShape{OT1}{NotoSans-LF}{extralight}{sl}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{sl}{
+      <-> ssub * NotoSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{sc}{
+      <-> ssub * NotoSans-LF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{n}{
+      <-> ssub * NotoSans-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{scsl}{
-      <-> ssub * NotoSans-LF/i/scit
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{it}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{i}{sl}{
-      <-> ssub * NotoSans-LF/i/it
+\DeclareFontShape{OT1}{NotoSans-LF}{m}{scit}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{bx}{sl}{
-      <-> ssub * NotoSans-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{sl}{
+      <-> ssub * NotoSans-LF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{bx}{scsl}{
-      <-> ssub * NotoSans-LF/b/scsl
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-LF}{bx}{sc}{
-      <-> ssub * NotoSans-LF/b/sc
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{sc}{
+      <-> ssub * NotoSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{n}{
+      <-> ssub * NotoSans-LF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{it}{
+      <-> ssub * NotoSans-LF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ul}{scit}{
+      <-> ssub * NotoSans-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{sc}{
+      <-> ssub * NotoSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{n}{
+      <-> ssub * NotoSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{it}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{eb}{scit}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{sl}{
+      <-> ssub * NotoSans-LF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{sc}{
+      <-> ssub * NotoSans-LF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{n}{
+      <-> ssub * NotoSans-LF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{it}{
+      <-> ssub * NotoSans-LF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{sb}{scit}{
+      <-> ssub * NotoSans-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{sl}{
+      <-> ssub * NotoSans-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{scsl}{
+      <-> ssub * NotoSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{sc}{
+      <-> ssub * NotoSans-LF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{n}{
+      <-> ssub * NotoSans-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{it}{
+      <-> ssub * NotoSans-LF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{ub}{scit}{
+      <-> ssub * NotoSans-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{sl}{
+      <-> ssub * NotoSans-LF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{scsl}{
+      <-> ssub * NotoSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{sc}{
+      <-> ssub * NotoSans-LF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{n}{
+      <-> ssub * NotoSans-LF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{it}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{l}{scit}{
+      <-> ssub * NotoSans-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{sl}{
+      <-> ssub * NotoSans-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{sc}{
+      <-> ssub * NotoSans-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{n}{
+      <-> ssub * NotoSans-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{it}{
+      <-> ssub * NotoSans-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{b}{scit}{
+      <-> ssub * NotoSans-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{sl}{
+      <-> ssub * NotoSans-LF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{sc}{
+      <-> ssub * NotoSans-LF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{n}{
+      <-> ssub * NotoSans-LF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{it}{
+      <-> ssub * NotoSans-LF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{el}{scit}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSans-LF}{bx}{n}{
       <-> ssub * NotoSans-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSans-LF}{bx}{sc}{
+      <-> ssub * NotoSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{bx}{scsl}{
+      <-> ssub * NotoSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-LF}{bx}{sl}{
+      <-> ssub * NotoSans-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSans-LF}{bx}{it}{
       <-> ssub * NotoSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-OsF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-OsF.fd
index ff7ff52a648..768fc5df7b7 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSans-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSans-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSans-OsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSans-OsF}{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{scsl}{
-      <-> ssub * NotoSans-OsF/eb/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{sl}{
-      <-> ssub * NotoSans-OsF/eb/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{regular}{sl}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{scsl}{
-      <-> ssub * NotoSans-OsF/sb/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{sl}{
-      <-> ssub * NotoSans-OsF/sb/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{thin}{sl}{
+      <-> ssub * NotoSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{scsl}{
-      <-> ssub * NotoSans-OsF/mb/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{mb}{sl}{
-      <-> ssub * NotoSans-OsF/mb/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{semibold}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{scsl}{
-      <-> ssub * NotoSans-OsF/m/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{m}{sl}{
-      <-> ssub * NotoSans-OsF/m/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{bold}{sl}{
+      <-> ssub * NotoSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{scsl}{
-      <-> ssub * NotoSans-OsF/l/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{l}{sl}{
-      <-> ssub * NotoSans-OsF/l/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{light}{sl}{
+      <-> ssub * NotoSans-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{scsl}{
-      <-> ssub * NotoSans-OsF/k/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{k}{sl}{
-      <-> ssub * NotoSans-OsF/k/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{black}{sl}{
+      <-> ssub * NotoSans-OsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{scsl}{
+      <-> ssub * NotoSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{b}{sl}{
-      <-> ssub * NotoSans-OsF/b/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{medium}{sl}{
+      <-> ssub * NotoSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{scsl}{
-      <-> ssub * NotoSans-OsF/el/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{el}{sl}{
-      <-> ssub * NotoSans-OsF/el/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{extralight}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{sl}{
+      <-> ssub * NotoSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{sc}{
+      <-> ssub * NotoSans-OsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{n}{
+      <-> ssub * NotoSans-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{scsl}{
-      <-> ssub * NotoSans-OsF/i/scit
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{it}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{i}{sl}{
-      <-> ssub * NotoSans-OsF/i/it
+\DeclareFontShape{OT1}{NotoSans-OsF}{m}{scit}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{sl}{
-      <-> ssub * NotoSans-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{sl}{
+      <-> ssub * NotoSans-OsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scsl
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{sc}{
-      <-> ssub * NotoSans-OsF/b/sc
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{sc}{
+      <-> ssub * NotoSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{n}{
+      <-> ssub * NotoSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{it}{
+      <-> ssub * NotoSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ul}{scit}{
+      <-> ssub * NotoSans-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{sc}{
+      <-> ssub * NotoSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{n}{
+      <-> ssub * NotoSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{it}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{eb}{scit}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{sc}{
+      <-> ssub * NotoSans-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{n}{
+      <-> ssub * NotoSans-OsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{it}{
+      <-> ssub * NotoSans-OsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{sb}{scit}{
+      <-> ssub * NotoSans-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{sl}{
+      <-> ssub * NotoSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{sc}{
+      <-> ssub * NotoSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{n}{
+      <-> ssub * NotoSans-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{it}{
+      <-> ssub * NotoSans-OsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{ub}{scit}{
+      <-> ssub * NotoSans-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{sl}{
+      <-> ssub * NotoSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{sc}{
+      <-> ssub * NotoSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{n}{
+      <-> ssub * NotoSans-OsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{it}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{l}{scit}{
+      <-> ssub * NotoSans-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{sl}{
+      <-> ssub * NotoSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{sc}{
+      <-> ssub * NotoSans-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{n}{
+      <-> ssub * NotoSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{it}{
+      <-> ssub * NotoSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{b}{scit}{
+      <-> ssub * NotoSans-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{sc}{
+      <-> ssub * NotoSans-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{n}{
+      <-> ssub * NotoSans-OsF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{it}{
+      <-> ssub * NotoSans-OsF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{el}{scit}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSans-OsF}{bx}{n}{
       <-> ssub * NotoSans-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{sc}{
+      <-> ssub * NotoSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{scsl}{
+      <-> ssub * NotoSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-OsF}{bx}{sl}{
+      <-> ssub * NotoSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSans-OsF}{bx}{it}{
       <-> ssub * NotoSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-Sup.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-Sup.fd
index 332b8cd32a9..beed9b3db71 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSans-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSans-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSans-Sup.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{OT1}{NotoSans-Sup}{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{sl}{
-      <-> ssub * NotoSans-Sup/eb/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{regular}{sl}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-sup-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{sl}{
-      <-> ssub * NotoSans-Sup/sb/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{thin}{sl}{
+      <-> ssub * NotoSans-Sup/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-sup-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{mb}{sl}{
-      <-> ssub * NotoSans-Sup/mb/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{semibold}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-sup-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{m}{sl}{
-      <-> ssub * NotoSans-Sup/m/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{bold}{sl}{
+      <-> ssub * NotoSans-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{l}{it}{
+\DeclareFontShape{OT1}{NotoSans-Sup}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{l}{sl}{
-      <-> ssub * NotoSans-Sup/l/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{light}{sl}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{k}{n}{
+\DeclareFontShape{OT1}{NotoSans-Sup}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{k}{it}{
+\DeclareFontShape{OT1}{NotoSans-Sup}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{k}{sl}{
-      <-> ssub * NotoSans-Sup/k/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{black}{sl}{
+      <-> ssub * NotoSans-Sup/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-sup-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{b}{sl}{
-      <-> ssub * NotoSans-Sup/b/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{medium}{sl}{
+      <-> ssub * NotoSans-Sup/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{el}{it}{
+\DeclareFontShape{OT1}{NotoSans-Sup}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{el}{sl}{
-      <-> ssub * NotoSans-Sup/el/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{extralight}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-sup-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{m}{sl}{
+      <-> ssub * NotoSans-Sup/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSans-Sup}{m}{n}{
+      <-> ssub * NotoSans-Sup/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{i}{sl}{
-      <-> ssub * NotoSans-Sup/i/it
+\DeclareFontShape{OT1}{NotoSans-Sup}{m}{it}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-Sup}{bx}{sl}{
-      <-> ssub * NotoSans-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ul}{sl}{
+      <-> ssub * NotoSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ul}{n}{
+      <-> ssub * NotoSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ul}{it}{
+      <-> ssub * NotoSans-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{n}{
+      <-> ssub * NotoSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{eb}{it}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{n}{
+      <-> ssub * NotoSans-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{sb}{it}{
+      <-> ssub * NotoSans-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ub}{sl}{
+      <-> ssub * NotoSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ub}{n}{
+      <-> ssub * NotoSans-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{ub}{it}{
+      <-> ssub * NotoSans-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{l}{sl}{
+      <-> ssub * NotoSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{l}{n}{
+      <-> ssub * NotoSans-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{l}{it}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{b}{sl}{
+      <-> ssub * NotoSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{b}{n}{
+      <-> ssub * NotoSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{b}{it}{
+      <-> ssub * NotoSans-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{el}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{el}{n}{
+      <-> ssub * NotoSans-Sup/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-Sup}{el}{it}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
 \DeclareFontShape{OT1}{NotoSans-Sup}{bx}{n}{
       <-> ssub * NotoSans-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSans-Sup}{bx}{sl}{
+      <-> ssub * NotoSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSans-Sup}{bx}{it}{
       <-> ssub * NotoSans-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TLF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TLF.fd
index 98cf46f4f29..2d3565bb9aa 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSans-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSans-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSans-TLF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSans-TLF}{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{scsl}{
-      <-> ssub * NotoSans-TLF/eb/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{sl}{
-      <-> ssub * NotoSans-TLF/eb/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{regular}{sl}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{scsl}{
-      <-> ssub * NotoSans-TLF/sb/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{sl}{
-      <-> ssub * NotoSans-TLF/sb/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{thin}{sl}{
+      <-> ssub * NotoSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{scsl}{
-      <-> ssub * NotoSans-TLF/mb/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{mb}{sl}{
-      <-> ssub * NotoSans-TLF/mb/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{semibold}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{scsl}{
-      <-> ssub * NotoSans-TLF/m/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{m}{sl}{
-      <-> ssub * NotoSans-TLF/m/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{bold}{sl}{
+      <-> ssub * NotoSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{scsl}{
-      <-> ssub * NotoSans-TLF/l/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{l}{sl}{
-      <-> ssub * NotoSans-TLF/l/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{light}{sl}{
+      <-> ssub * NotoSans-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{scsl}{
-      <-> ssub * NotoSans-TLF/k/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{k}{sl}{
-      <-> ssub * NotoSans-TLF/k/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{black}{sl}{
+      <-> ssub * NotoSans-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{scsl}{
+      <-> ssub * NotoSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{b}{sl}{
-      <-> ssub * NotoSans-TLF/b/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{medium}{sl}{
+      <-> ssub * NotoSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{scsl}{
-      <-> ssub * NotoSans-TLF/el/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{el}{sl}{
-      <-> ssub * NotoSans-TLF/el/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{extralight}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{sl}{
+      <-> ssub * NotoSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{sc}{
+      <-> ssub * NotoSans-TLF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{n}{
+      <-> ssub * NotoSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{scsl}{
-      <-> ssub * NotoSans-TLF/i/scit
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{it}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{i}{sl}{
-      <-> ssub * NotoSans-TLF/i/it
+\DeclareFontShape{OT1}{NotoSans-TLF}{m}{scit}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{sl}{
-      <-> ssub * NotoSans-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{sl}{
+      <-> ssub * NotoSans-TLF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scsl
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{sc}{
-      <-> ssub * NotoSans-TLF/b/sc
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{sc}{
+      <-> ssub * NotoSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{n}{
+      <-> ssub * NotoSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{it}{
+      <-> ssub * NotoSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ul}{scit}{
+      <-> ssub * NotoSans-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{sc}{
+      <-> ssub * NotoSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{n}{
+      <-> ssub * NotoSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{it}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{eb}{scit}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{sc}{
+      <-> ssub * NotoSans-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{n}{
+      <-> ssub * NotoSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{it}{
+      <-> ssub * NotoSans-TLF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{sb}{scit}{
+      <-> ssub * NotoSans-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{sl}{
+      <-> ssub * NotoSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{sc}{
+      <-> ssub * NotoSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{n}{
+      <-> ssub * NotoSans-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{it}{
+      <-> ssub * NotoSans-TLF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{ub}{scit}{
+      <-> ssub * NotoSans-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{sl}{
+      <-> ssub * NotoSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{sc}{
+      <-> ssub * NotoSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{n}{
+      <-> ssub * NotoSans-TLF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{it}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{l}{scit}{
+      <-> ssub * NotoSans-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{sl}{
+      <-> ssub * NotoSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{sc}{
+      <-> ssub * NotoSans-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{n}{
+      <-> ssub * NotoSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{it}{
+      <-> ssub * NotoSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{b}{scit}{
+      <-> ssub * NotoSans-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{sc}{
+      <-> ssub * NotoSans-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{n}{
+      <-> ssub * NotoSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{it}{
+      <-> ssub * NotoSans-TLF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{el}{scit}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSans-TLF}{bx}{n}{
       <-> ssub * NotoSans-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{sc}{
+      <-> ssub * NotoSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{scsl}{
+      <-> ssub * NotoSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TLF}{bx}{sl}{
+      <-> ssub * NotoSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSans-TLF}{bx}{it}{
       <-> ssub * NotoSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TOsF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TOsF.fd
index 6fcc3f4b7a5..87a197e2b20 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSans-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSans-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSans-TOsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSans-TOsF}{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSans-TOsF/eb/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{sl}{
-      <-> ssub * NotoSans-TOsF/eb/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{regular}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSans-TOsF/sb/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{sl}{
-      <-> ssub * NotoSans-TOsF/sb/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{thin}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSans-TOsF/mb/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{mb}{sl}{
-      <-> ssub * NotoSans-TOsF/mb/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{scsl}{
-      <-> ssub * NotoSans-TOsF/m/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{sl}{
-      <-> ssub * NotoSans-TOsF/m/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bold}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{scsl}{
-      <-> ssub * NotoSans-TOsF/l/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{sl}{
-      <-> ssub * NotoSans-TOsF/l/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{light}{sl}{
+      <-> ssub * NotoSans-TOsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{scsl}{
-      <-> ssub * NotoSans-TOsF/k/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{k}{sl}{
-      <-> ssub * NotoSans-TOsF/k/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{black}{sl}{
+      <-> ssub * NotoSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{sl}{
-      <-> ssub * NotoSans-TOsF/b/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{medium}{sl}{
+      <-> ssub * NotoSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{scsl}{
-      <-> ssub * NotoSans-TOsF/el/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{sl}{
-      <-> ssub * NotoSans-TOsF/el/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{sc}{
+      <-> ssub * NotoSans-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{n}{
+      <-> ssub * NotoSans-TOsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{scsl}{
-      <-> ssub * NotoSans-TOsF/i/scit
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{it}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{i}{sl}{
-      <-> ssub * NotoSans-TOsF/i/it
+\DeclareFontShape{OT1}{NotoSans-TOsF}{m}{scit}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{sl}{
-      <-> ssub * NotoSans-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scsl
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{sc}{
-      <-> ssub * NotoSans-TOsF/b/sc
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{sc}{
+      <-> ssub * NotoSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{n}{
+      <-> ssub * NotoSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{it}{
+      <-> ssub * NotoSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ul}{scit}{
+      <-> ssub * NotoSans-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{sc}{
+      <-> ssub * NotoSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{n}{
+      <-> ssub * NotoSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{it}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{eb}{scit}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{sc}{
+      <-> ssub * NotoSans-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{n}{
+      <-> ssub * NotoSans-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{it}{
+      <-> ssub * NotoSans-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{sb}{scit}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{sl}{
+      <-> ssub * NotoSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{sc}{
+      <-> ssub * NotoSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{n}{
+      <-> ssub * NotoSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{it}{
+      <-> ssub * NotoSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{ub}{scit}{
+      <-> ssub * NotoSans-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{sl}{
+      <-> ssub * NotoSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{sc}{
+      <-> ssub * NotoSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{n}{
+      <-> ssub * NotoSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{it}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{l}{scit}{
+      <-> ssub * NotoSans-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{sc}{
+      <-> ssub * NotoSans-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{n}{
+      <-> ssub * NotoSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{it}{
+      <-> ssub * NotoSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{b}{scit}{
+      <-> ssub * NotoSans-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{sc}{
+      <-> ssub * NotoSans-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{n}{
+      <-> ssub * NotoSans-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{it}{
+      <-> ssub * NotoSans-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{el}{scit}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{n}{
       <-> ssub * NotoSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{sc}{
+      <-> ssub * NotoSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{sl}{
+      <-> ssub * NotoSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSans-TOsF}{bx}{it}{
       <-> ssub * NotoSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-LF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-LF.fd
index d6914a0c7a1..2fbd72d2ada 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSerif-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSerif-LF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSerif-LF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSerif-LF}{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{scsl}{
-      <-> ssub * NotoSerif-LF/eb/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{sl}{
-      <-> ssub * NotoSerif-LF/eb/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{regular}{sl}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{scsl}{
-      <-> ssub * NotoSerif-LF/sb/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{sl}{
-      <-> ssub * NotoSerif-LF/sb/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{thin}{sl}{
+      <-> ssub * NotoSerif-LF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{scsl}{
-      <-> ssub * NotoSerif-LF/mb/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{mb}{sl}{
-      <-> ssub * NotoSerif-LF/mb/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{semibold}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{scsl}{
-      <-> ssub * NotoSerif-LF/m/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{m}{sl}{
-      <-> ssub * NotoSerif-LF/m/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{bold}{sl}{
+      <-> ssub * NotoSerif-LF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{scsl}{
-      <-> ssub * NotoSerif-LF/l/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{l}{sl}{
-      <-> ssub * NotoSerif-LF/l/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{light}{sl}{
+      <-> ssub * NotoSerif-LF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{scsl}{
-      <-> ssub * NotoSerif-LF/k/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{k}{sl}{
-      <-> ssub * NotoSerif-LF/k/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{black}{sl}{
+      <-> ssub * NotoSerif-LF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{scsl}{
+      <-> ssub * NotoSerif-LF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{b}{sl}{
-      <-> ssub * NotoSerif-LF/b/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{medium}{sl}{
+      <-> ssub * NotoSerif-LF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{scsl}{
-      <-> ssub * NotoSerif-LF/el/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{el}{sl}{
-      <-> ssub * NotoSerif-LF/el/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{extralight}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{sl}{
+      <-> ssub * NotoSerif-LF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{sc}{
+      <-> ssub * NotoSerif-LF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{n}{
+      <-> ssub * NotoSerif-LF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{scsl}{
-      <-> ssub * NotoSerif-LF/i/scit
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{it}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{i}{sl}{
-      <-> ssub * NotoSerif-LF/i/it
+\DeclareFontShape{OT1}{NotoSerif-LF}{m}{scit}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{sl}{
-      <-> ssub * NotoSerif-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{sl}{
+      <-> ssub * NotoSerif-LF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scsl
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{sc}{
-      <-> ssub * NotoSerif-LF/b/sc
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{sc}{
+      <-> ssub * NotoSerif-LF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{n}{
+      <-> ssub * NotoSerif-LF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{it}{
+      <-> ssub * NotoSerif-LF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ul}{scit}{
+      <-> ssub * NotoSerif-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{sc}{
+      <-> ssub * NotoSerif-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{n}{
+      <-> ssub * NotoSerif-LF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{it}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{eb}{scit}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{sc}{
+      <-> ssub * NotoSerif-LF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{n}{
+      <-> ssub * NotoSerif-LF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{it}{
+      <-> ssub * NotoSerif-LF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{sb}{scit}{
+      <-> ssub * NotoSerif-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{sl}{
+      <-> ssub * NotoSerif-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{sc}{
+      <-> ssub * NotoSerif-LF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{n}{
+      <-> ssub * NotoSerif-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{it}{
+      <-> ssub * NotoSerif-LF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{ub}{scit}{
+      <-> ssub * NotoSerif-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{sl}{
+      <-> ssub * NotoSerif-LF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{sc}{
+      <-> ssub * NotoSerif-LF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{n}{
+      <-> ssub * NotoSerif-LF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{it}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{l}{scit}{
+      <-> ssub * NotoSerif-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{sl}{
+      <-> ssub * NotoSerif-LF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{sc}{
+      <-> ssub * NotoSerif-LF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{n}{
+      <-> ssub * NotoSerif-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{it}{
+      <-> ssub * NotoSerif-LF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{b}{scit}{
+      <-> ssub * NotoSerif-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{sc}{
+      <-> ssub * NotoSerif-LF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{n}{
+      <-> ssub * NotoSerif-LF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{it}{
+      <-> ssub * NotoSerif-LF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{el}{scit}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSerif-LF}{bx}{n}{
       <-> ssub * NotoSerif-LF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{sc}{
+      <-> ssub * NotoSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{scsl}{
+      <-> ssub * NotoSerif-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-LF}{bx}{sl}{
+      <-> ssub * NotoSerif-LF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSerif-LF}{bx}{it}{
       <-> ssub * NotoSerif-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-OsF.fd
index d4b4d8dea6c..3d1b743e5f1 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSerif-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSerif-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSerif-OsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSerif-OsF}{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-OsF/eb/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{sl}{
-      <-> ssub * NotoSerif-OsF/eb/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{regular}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-OsF/sb/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{sl}{
-      <-> ssub * NotoSerif-OsF/sb/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{thin}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-OsF/mb/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{mb}{sl}{
-      <-> ssub * NotoSerif-OsF/mb/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{scsl}{
-      <-> ssub * NotoSerif-OsF/m/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{sl}{
-      <-> ssub * NotoSerif-OsF/m/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bold}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{scsl}{
-      <-> ssub * NotoSerif-OsF/l/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{sl}{
-      <-> ssub * NotoSerif-OsF/l/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{light}{sl}{
+      <-> ssub * NotoSerif-OsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{scsl}{
-      <-> ssub * NotoSerif-OsF/k/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{k}{sl}{
-      <-> ssub * NotoSerif-OsF/k/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{black}{sl}{
+      <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-OsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{sl}{
-      <-> ssub * NotoSerif-OsF/b/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{medium}{sl}{
+      <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{scsl}{
-      <-> ssub * NotoSerif-OsF/el/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{sl}{
-      <-> ssub * NotoSerif-OsF/el/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{sc}{
+      <-> ssub * NotoSerif-OsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{n}{
+      <-> ssub * NotoSerif-OsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{scsl}{
-      <-> ssub * NotoSerif-OsF/i/scit
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{it}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{i}{sl}{
-      <-> ssub * NotoSerif-OsF/i/it
+\DeclareFontShape{OT1}{NotoSerif-OsF}{m}{scit}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{sl}{
-      <-> ssub * NotoSerif-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scsl
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{sc}{
-      <-> ssub * NotoSerif-OsF/b/sc
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{sc}{
+      <-> ssub * NotoSerif-OsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{n}{
+      <-> ssub * NotoSerif-OsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{it}{
+      <-> ssub * NotoSerif-OsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ul}{scit}{
+      <-> ssub * NotoSerif-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{sc}{
+      <-> ssub * NotoSerif-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{n}{
+      <-> ssub * NotoSerif-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{it}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{eb}{scit}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{sc}{
+      <-> ssub * NotoSerif-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{n}{
+      <-> ssub * NotoSerif-OsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{it}{
+      <-> ssub * NotoSerif-OsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{sb}{scit}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{sl}{
+      <-> ssub * NotoSerif-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{sc}{
+      <-> ssub * NotoSerif-OsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{n}{
+      <-> ssub * NotoSerif-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{it}{
+      <-> ssub * NotoSerif-OsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{ub}{scit}{
+      <-> ssub * NotoSerif-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{sl}{
+      <-> ssub * NotoSerif-OsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{sc}{
+      <-> ssub * NotoSerif-OsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{n}{
+      <-> ssub * NotoSerif-OsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{it}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{l}{scit}{
+      <-> ssub * NotoSerif-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{sc}{
+      <-> ssub * NotoSerif-OsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{n}{
+      <-> ssub * NotoSerif-OsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{it}{
+      <-> ssub * NotoSerif-OsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{b}{scit}{
+      <-> ssub * NotoSerif-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{sc}{
+      <-> ssub * NotoSerif-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{n}{
+      <-> ssub * NotoSerif-OsF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{it}{
+      <-> ssub * NotoSerif-OsF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{el}{scit}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{n}{
       <-> ssub * NotoSerif-OsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{sc}{
+      <-> ssub * NotoSerif-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-OsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{sl}{
+      <-> ssub * NotoSerif-OsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSerif-OsF}{bx}{it}{
       <-> ssub * NotoSerif-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-Sup.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-Sup.fd
index b89a5cb8f23..c519c3fa276 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSerif-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSerif-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSerif-Sup.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{OT1}{NotoSerif-Sup}{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{sl}{
-      <-> ssub * NotoSerif-Sup/eb/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{regular}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{sl}{
-      <-> ssub * NotoSerif-Sup/sb/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{thin}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-sup-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{mb}{sl}{
-      <-> ssub * NotoSerif-Sup/mb/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{semibold}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-sup-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{sl}{
-      <-> ssub * NotoSerif-Sup/m/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{bold}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{it}{
+\DeclareFontShape{OT1}{NotoSerif-Sup}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{sl}{
-      <-> ssub * NotoSerif-Sup/l/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{light}{sl}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{k}{n}{
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{k}{it}{
+\DeclareFontShape{OT1}{NotoSerif-Sup}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{k}{sl}{
-      <-> ssub * NotoSerif-Sup/k/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{black}{sl}{
+      <-> ssub * NotoSerif-Sup/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-sup-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{sl}{
-      <-> ssub * NotoSerif-Sup/b/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{medium}{sl}{
+      <-> ssub * NotoSerif-Sup/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{it}{
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-sup-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{sl}{
-      <-> ssub * NotoSerif-Sup/el/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{extralight}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-sup-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-ot1
+\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{n}{
+      <-> ssub * NotoSerif-Sup/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{i}{sl}{
-      <-> ssub * NotoSerif-Sup/i/it
+\DeclareFontShape{OT1}{NotoSerif-Sup}{m}{it}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-Sup}{bx}{sl}{
-      <-> ssub * NotoSerif-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ul}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ul}{n}{
+      <-> ssub * NotoSerif-Sup/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ul}{it}{
+      <-> ssub * NotoSerif-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{n}{
+      <-> ssub * NotoSerif-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{eb}{it}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{n}{
+      <-> ssub * NotoSerif-Sup/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{sb}{it}{
+      <-> ssub * NotoSerif-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ub}{sl}{
+      <-> ssub * NotoSerif-Sup/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ub}{n}{
+      <-> ssub * NotoSerif-Sup/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{ub}{it}{
+      <-> ssub * NotoSerif-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{sl}{
+      <-> ssub * NotoSerif-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{n}{
+      <-> ssub * NotoSerif-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{l}{it}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{n}{
+      <-> ssub * NotoSerif-Sup/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{b}{it}{
+      <-> ssub * NotoSerif-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{n}{
+      <-> ssub * NotoSerif-Sup/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-Sup}{el}{it}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
 \DeclareFontShape{OT1}{NotoSerif-Sup}{bx}{n}{
       <-> ssub * NotoSerif-Sup/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSerif-Sup}{bx}{sl}{
+      <-> ssub * NotoSerif-Sup/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSerif-Sup}{bx}{it}{
       <-> ssub * NotoSerif-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TLF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TLF.fd
index dba4347b85f..5f1f0aeadaf 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSerif-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSerif-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSerif-TLF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSerif-TLF}{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TLF/eb/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{sl}{
-      <-> ssub * NotoSerif-TLF/eb/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{regular}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TLF/sb/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{sl}{
-      <-> ssub * NotoSerif-TLF/sb/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{thin}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TLF/mb/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{mb}{sl}{
-      <-> ssub * NotoSerif-TLF/mb/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{scsl}{
-      <-> ssub * NotoSerif-TLF/m/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{sl}{
-      <-> ssub * NotoSerif-TLF/m/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bold}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{scsl}{
-      <-> ssub * NotoSerif-TLF/l/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{sl}{
-      <-> ssub * NotoSerif-TLF/l/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{light}{sl}{
+      <-> ssub * NotoSerif-TLF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{scsl}{
-      <-> ssub * NotoSerif-TLF/k/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{k}{sl}{
-      <-> ssub * NotoSerif-TLF/k/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{black}{sl}{
+      <-> ssub * NotoSerif-TLF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TLF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{sl}{
-      <-> ssub * NotoSerif-TLF/b/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{medium}{sl}{
+      <-> ssub * NotoSerif-TLF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{scsl}{
-      <-> ssub * NotoSerif-TLF/el/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{sl}{
-      <-> ssub * NotoSerif-TLF/el/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{sc}{
+      <-> ssub * NotoSerif-TLF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{n}{
+      <-> ssub * NotoSerif-TLF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{scsl}{
-      <-> ssub * NotoSerif-TLF/i/scit
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{it}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{i}{sl}{
-      <-> ssub * NotoSerif-TLF/i/it
+\DeclareFontShape{OT1}{NotoSerif-TLF}{m}{scit}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{sl}{
-      <-> ssub * NotoSerif-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scsl
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{sc}{
-      <-> ssub * NotoSerif-TLF/b/sc
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{sc}{
+      <-> ssub * NotoSerif-TLF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{n}{
+      <-> ssub * NotoSerif-TLF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{it}{
+      <-> ssub * NotoSerif-TLF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ul}{scit}{
+      <-> ssub * NotoSerif-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{sc}{
+      <-> ssub * NotoSerif-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{n}{
+      <-> ssub * NotoSerif-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{it}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{eb}{scit}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{sc}{
+      <-> ssub * NotoSerif-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{n}{
+      <-> ssub * NotoSerif-TLF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{it}{
+      <-> ssub * NotoSerif-TLF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{sb}{scit}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{sl}{
+      <-> ssub * NotoSerif-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{sc}{
+      <-> ssub * NotoSerif-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{n}{
+      <-> ssub * NotoSerif-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{it}{
+      <-> ssub * NotoSerif-TLF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{ub}{scit}{
+      <-> ssub * NotoSerif-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{sl}{
+      <-> ssub * NotoSerif-TLF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{sc}{
+      <-> ssub * NotoSerif-TLF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{n}{
+      <-> ssub * NotoSerif-TLF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{it}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{l}{scit}{
+      <-> ssub * NotoSerif-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{sc}{
+      <-> ssub * NotoSerif-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{n}{
+      <-> ssub * NotoSerif-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{it}{
+      <-> ssub * NotoSerif-TLF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{b}{scit}{
+      <-> ssub * NotoSerif-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{sc}{
+      <-> ssub * NotoSerif-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{n}{
+      <-> ssub * NotoSerif-TLF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{it}{
+      <-> ssub * NotoSerif-TLF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{el}{scit}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{n}{
       <-> ssub * NotoSerif-TLF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{sc}{
+      <-> ssub * NotoSerif-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{sl}{
+      <-> ssub * NotoSerif-TLF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSerif-TLF}{bx}{it}{
       <-> ssub * NotoSerif-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TOsF.fd b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TOsF.fd
index 414f653e2de..38ae6fa3c0e 100644
--- a/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/OT1NotoSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{OT1NotoSerif-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for OT1/NotoSerif-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for OT1/NotoSerif-TOsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{OT1}{NotoSerif-TOsF}{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-ot1
+
+%   ----  regular  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/eb/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{sl}{
-      <-> ssub * NotoSerif-TOsF/eb/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{regular}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-ot1
+
+%   ----  thin  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/sb/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{sl}{
-      <-> ssub * NotoSerif-TOsF/sb/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{thin}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-ot1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/mb/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{mb}{sl}{
-      <-> ssub * NotoSerif-TOsF/mb/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-ot1
+
+%   ----  bold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{scsl}{
-      <-> ssub * NotoSerif-TOsF/m/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{sl}{
-      <-> ssub * NotoSerif-TOsF/m/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bold}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{scsl}{
-      <-> ssub * NotoSerif-TOsF/l/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{sl}{
-      <-> ssub * NotoSerif-TOsF/l/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{light}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{scsl}{
-      <-> ssub * NotoSerif-TOsF/k/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{k}{sl}{
-      <-> ssub * NotoSerif-TOsF/k/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{black}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-ot1
+
+%   ----  medium  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{medium}{sl}{
+      <-> ssub * NotoSerif-TOsF/medium/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{n}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{it}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{scit}{
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-sc-ot1
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{scsl}{
-      <-> ssub * NotoSerif-TOsF/el/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{sl}{
-      <-> ssub * NotoSerif-TOsF/el/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-ot1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{sc}{
+      <-> ssub * NotoSerif-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-ot1
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{n}{
+      <-> ssub * NotoSerif-TOsF/regular/n
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{scsl}{
-      <-> ssub * NotoSerif-TOsF/i/scit
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{it}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{i}{sl}{
-      <-> ssub * NotoSerif-TOsF/i/it
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{m}{scit}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scsl
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{sc}{
-      <-> ssub * NotoSerif-TOsF/b/sc
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{sc}{
+      <-> ssub * NotoSerif-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{n}{
+      <-> ssub * NotoSerif-TOsF/thin/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{it}{
+      <-> ssub * NotoSerif-TOsF/thin/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ul}{scit}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{sc}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{n}{
+      <-> ssub * NotoSerif-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{it}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{eb}{scit}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{sc}{
+      <-> ssub * NotoSerif-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{n}{
+      <-> ssub * NotoSerif-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{it}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{sb}{scit}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{sc}{
+      <-> ssub * NotoSerif-TOsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{n}{
+      <-> ssub * NotoSerif-TOsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{it}{
+      <-> ssub * NotoSerif-TOsF/black/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{ub}{scit}{
+      <-> ssub * NotoSerif-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{sc}{
+      <-> ssub * NotoSerif-TOsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{n}{
+      <-> ssub * NotoSerif-TOsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{it}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{l}{scit}{
+      <-> ssub * NotoSerif-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{sc}{
+      <-> ssub * NotoSerif-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{n}{
+      <-> ssub * NotoSerif-TOsF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{it}{
+      <-> ssub * NotoSerif-TOsF/bold/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{b}{scit}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{sc}{
+      <-> ssub * NotoSerif-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{n}{
+      <-> ssub * NotoSerif-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{it}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{el}{scit}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{n}{
       <-> ssub * NotoSerif-TOsF/b/n
 }{}
 
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{sc}{
+      <-> ssub * NotoSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{sl}{
+      <-> ssub * NotoSerif-TOsF/b/sl
+}{}
+
 \DeclareFontShape{OT1}{NotoSerif-TOsF}{bx}{it}{
       <-> ssub * NotoSerif-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd
index 86381397303..66afed9ae64 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/22
 %%
 \ProvidesFile{T1NotoMono-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoMono-TLF.]
+    [2019/04/22 (autoinst)  Font definitions for T1/NotoMono-TLF.]
 
 \expandafter\ifx\csname NotoMono@scale\endcsname\relax
     \let\NotoMono@@scale\@empty
@@ -11,38 +11,77 @@
 
 \DeclareFontFamily{T1}{NotoMono-TLF}{}
 
-\DeclareFontShape{T1}{NotoMono-TLF}{b}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoMono-TLF}{regular}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoMono-TLF}{regular}{it}{
+      <-> \NotoMono@@scale NotoMono-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoMono-TLF}{regular}{sl}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoMono-TLF}{bold}{n}{
       <-> \NotoMono@@scale NotoMono-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoMono-TLF}{b}{it}{
+\DeclareFontShape{T1}{NotoMono-TLF}{bold}{it}{
       <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoMono-TLF}{b}{sl}{
-      <-> ssub * NotoMono-TLF/b/it
+\DeclareFontShape{T1}{NotoMono-TLF}{bold}{sl}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoMono-TLF}{m}{sl}{
+      <-> ssub * NotoMono-TLF/regular/sl
 }{}
 
 \DeclareFontShape{T1}{NotoMono-TLF}{m}{n}{
-      <-> \NotoMono@@scale NotoMono-tlf-t1
+      <-> ssub * NotoMono-TLF/regular/n
 }{}
 
 \DeclareFontShape{T1}{NotoMono-TLF}{m}{it}{
-      <-> \NotoMono@@scale NotoMono-Italic-tlf-t1
+      <-> ssub * NotoMono-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoMono-TLF}{m}{sl}{
-      <-> ssub * NotoMono-TLF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoMono-TLF}{b}{sl}{
+      <-> ssub * NotoMono-TLF/bold/sl
 }{}
 
-\DeclareFontShape{T1}{NotoMono-TLF}{bx}{sl}{
-      <-> ssub * NotoMono-TLF/b/sl
+\DeclareFontShape{T1}{NotoMono-TLF}{b}{n}{
+      <-> ssub * NotoMono-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoMono-TLF}{b}{it}{
+      <-> ssub * NotoMono-TLF/bold/it
 }{}
 
 \DeclareFontShape{T1}{NotoMono-TLF}{bx}{n}{
       <-> ssub * NotoMono-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoMono-TLF}{bx}{sl}{
+      <-> ssub * NotoMono-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoMono-TLF}{bx}{it}{
       <-> ssub * NotoMono-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSans-LF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSans-LF.fd
index 65a892c4493..479ebbebcd6 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSans-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSans-LF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSans-LF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSans-LF}{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{scsl}{
-      <-> ssub * NotoSans-LF/eb/scit
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{eb}{sl}{
-      <-> ssub * NotoSans-LF/eb/it
+\DeclareFontShape{T1}{NotoSans-LF}{regular}{sl}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{scsl}{
-      <-> ssub * NotoSans-LF/sb/scit
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{sb}{sl}{
-      <-> ssub * NotoSans-LF/sb/it
+\DeclareFontShape{T1}{NotoSans-LF}{thin}{sl}{
+      <-> ssub * NotoSans-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{scsl}{
-      <-> ssub * NotoSans-LF/mb/scit
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{mb}{sl}{
-      <-> ssub * NotoSans-LF/mb/it
+\DeclareFontShape{T1}{NotoSans-LF}{semibold}{sl}{
+      <-> ssub * NotoSans-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{scsl}{
-      <-> ssub * NotoSans-LF/m/scit
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{m}{sl}{
-      <-> ssub * NotoSans-LF/m/it
+\DeclareFontShape{T1}{NotoSans-LF}{bold}{sl}{
+      <-> ssub * NotoSans-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{n}{
+\DeclareFontShape{T1}{NotoSans-LF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{it}{
+\DeclareFontShape{T1}{NotoSans-LF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSans-LF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{scsl}{
-      <-> ssub * NotoSans-LF/l/scit
+\DeclareFontShape{T1}{NotoSans-LF}{light}{scsl}{
+      <-> ssub * NotoSans-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{l}{sl}{
-      <-> ssub * NotoSans-LF/l/it
+\DeclareFontShape{T1}{NotoSans-LF}{light}{sl}{
+      <-> ssub * NotoSans-LF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{extrabold}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{n}{
+\DeclareFontShape{T1}{NotoSans-LF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{it}{
+\DeclareFontShape{T1}{NotoSans-LF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSans-LF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{scsl}{
-      <-> ssub * NotoSans-LF/k/scit
+\DeclareFontShape{T1}{NotoSans-LF}{black}{scsl}{
+      <-> ssub * NotoSans-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{k}{sl}{
-      <-> ssub * NotoSans-LF/k/it
+\DeclareFontShape{T1}{NotoSans-LF}{black}{sl}{
+      <-> ssub * NotoSans-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{scsl}{
-      <-> ssub * NotoSans-LF/b/scit
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{scsl}{
+      <-> ssub * NotoSans-LF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{b}{sl}{
-      <-> ssub * NotoSans-LF/b/it
+\DeclareFontShape{T1}{NotoSans-LF}{medium}{sl}{
+      <-> ssub * NotoSans-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{n}{
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{it}{
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{scsl}{
-      <-> ssub * NotoSans-LF/el/scit
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{el}{sl}{
-      <-> ssub * NotoSans-LF/el/it
+\DeclareFontShape{T1}{NotoSans-LF}{extralight}{sl}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSans-LF}{m}{sl}{
+      <-> ssub * NotoSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{m}{scsl}{
+      <-> ssub * NotoSans-LF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-t1
+\DeclareFontShape{T1}{NotoSans-LF}{m}{sc}{
+      <-> ssub * NotoSans-LF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSans-LF}{m}{n}{
+      <-> ssub * NotoSans-LF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{scsl}{
-      <-> ssub * NotoSans-LF/i/scit
+\DeclareFontShape{T1}{NotoSans-LF}{m}{it}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{i}{sl}{
-      <-> ssub * NotoSans-LF/i/it
+\DeclareFontShape{T1}{NotoSans-LF}{m}{scit}{
+      <-> ssub * NotoSans-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{bx}{sl}{
-      <-> ssub * NotoSans-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{sl}{
+      <-> ssub * NotoSans-LF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{bx}{scsl}{
-      <-> ssub * NotoSans-LF/b/scsl
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{scsl}{
+      <-> ssub * NotoSans-LF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-LF}{bx}{sc}{
-      <-> ssub * NotoSans-LF/b/sc
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{sc}{
+      <-> ssub * NotoSans-LF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{n}{
+      <-> ssub * NotoSans-LF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{it}{
+      <-> ssub * NotoSans-LF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ul}{scit}{
+      <-> ssub * NotoSans-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{scsl}{
+      <-> ssub * NotoSans-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{sc}{
+      <-> ssub * NotoSans-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{n}{
+      <-> ssub * NotoSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{it}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{eb}{scit}{
+      <-> ssub * NotoSans-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{sl}{
+      <-> ssub * NotoSans-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{scsl}{
+      <-> ssub * NotoSans-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{sc}{
+      <-> ssub * NotoSans-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{n}{
+      <-> ssub * NotoSans-LF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{it}{
+      <-> ssub * NotoSans-LF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{sb}{scit}{
+      <-> ssub * NotoSans-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{sl}{
+      <-> ssub * NotoSans-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{scsl}{
+      <-> ssub * NotoSans-LF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{sc}{
+      <-> ssub * NotoSans-LF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{n}{
+      <-> ssub * NotoSans-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{it}{
+      <-> ssub * NotoSans-LF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{ub}{scit}{
+      <-> ssub * NotoSans-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{sl}{
+      <-> ssub * NotoSans-LF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{scsl}{
+      <-> ssub * NotoSans-LF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{sc}{
+      <-> ssub * NotoSans-LF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{n}{
+      <-> ssub * NotoSans-LF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{it}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{l}{scit}{
+      <-> ssub * NotoSans-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{sl}{
+      <-> ssub * NotoSans-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{scsl}{
+      <-> ssub * NotoSans-LF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{sc}{
+      <-> ssub * NotoSans-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{n}{
+      <-> ssub * NotoSans-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{it}{
+      <-> ssub * NotoSans-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{b}{scit}{
+      <-> ssub * NotoSans-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{sl}{
+      <-> ssub * NotoSans-LF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{scsl}{
+      <-> ssub * NotoSans-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{sc}{
+      <-> ssub * NotoSans-LF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{n}{
+      <-> ssub * NotoSans-LF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{it}{
+      <-> ssub * NotoSans-LF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{el}{scit}{
+      <-> ssub * NotoSans-LF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSans-LF}{bx}{n}{
       <-> ssub * NotoSans-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSans-LF}{bx}{sc}{
+      <-> ssub * NotoSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{bx}{scsl}{
+      <-> ssub * NotoSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-LF}{bx}{sl}{
+      <-> ssub * NotoSans-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSans-LF}{bx}{it}{
       <-> ssub * NotoSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSans-OsF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSans-OsF.fd
index 1b8384124c6..61b5a871d21 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSans-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSans-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSans-OsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSans-OsF}{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{scsl}{
-      <-> ssub * NotoSans-OsF/eb/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{eb}{sl}{
-      <-> ssub * NotoSans-OsF/eb/it
+\DeclareFontShape{T1}{NotoSans-OsF}{regular}{sl}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{scsl}{
-      <-> ssub * NotoSans-OsF/sb/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{sb}{sl}{
-      <-> ssub * NotoSans-OsF/sb/it
+\DeclareFontShape{T1}{NotoSans-OsF}{thin}{sl}{
+      <-> ssub * NotoSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{scsl}{
-      <-> ssub * NotoSans-OsF/mb/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{mb}{sl}{
-      <-> ssub * NotoSans-OsF/mb/it
+\DeclareFontShape{T1}{NotoSans-OsF}{semibold}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{scsl}{
-      <-> ssub * NotoSans-OsF/m/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{m}{sl}{
-      <-> ssub * NotoSans-OsF/m/it
+\DeclareFontShape{T1}{NotoSans-OsF}{bold}{sl}{
+      <-> ssub * NotoSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{n}{
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{it}{
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{scsl}{
-      <-> ssub * NotoSans-OsF/l/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{l}{sl}{
-      <-> ssub * NotoSans-OsF/l/it
+\DeclareFontShape{T1}{NotoSans-OsF}{light}{sl}{
+      <-> ssub * NotoSans-OsF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{n}{
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{it}{
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{scsl}{
-      <-> ssub * NotoSans-OsF/k/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{k}{sl}{
-      <-> ssub * NotoSans-OsF/k/it
+\DeclareFontShape{T1}{NotoSans-OsF}{black}{sl}{
+      <-> ssub * NotoSans-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{scsl}{
+      <-> ssub * NotoSans-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{b}{sl}{
-      <-> ssub * NotoSans-OsF/b/it
+\DeclareFontShape{T1}{NotoSans-OsF}{medium}{sl}{
+      <-> ssub * NotoSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{n}{
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{it}{
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{scsl}{
-      <-> ssub * NotoSans-OsF/el/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{el}{sl}{
-      <-> ssub * NotoSans-OsF/el/it
+\DeclareFontShape{T1}{NotoSans-OsF}{extralight}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{sl}{
+      <-> ssub * NotoSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{scsl}{
+      <-> ssub * NotoSans-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{sc}{
+      <-> ssub * NotoSans-OsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{n}{
+      <-> ssub * NotoSans-OsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{scsl}{
-      <-> ssub * NotoSans-OsF/i/scit
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{it}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{i}{sl}{
-      <-> ssub * NotoSans-OsF/i/it
+\DeclareFontShape{T1}{NotoSans-OsF}{m}{scit}{
+      <-> ssub * NotoSans-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{bx}{sl}{
-      <-> ssub * NotoSans-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{sl}{
+      <-> ssub * NotoSans-OsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{bx}{scsl}{
-      <-> ssub * NotoSans-OsF/b/scsl
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{scsl}{
+      <-> ssub * NotoSans-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-OsF}{bx}{sc}{
-      <-> ssub * NotoSans-OsF/b/sc
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{sc}{
+      <-> ssub * NotoSans-OsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{n}{
+      <-> ssub * NotoSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{it}{
+      <-> ssub * NotoSans-OsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ul}{scit}{
+      <-> ssub * NotoSans-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{scsl}{
+      <-> ssub * NotoSans-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{sc}{
+      <-> ssub * NotoSans-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{n}{
+      <-> ssub * NotoSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{it}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{eb}{scit}{
+      <-> ssub * NotoSans-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{scsl}{
+      <-> ssub * NotoSans-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{sc}{
+      <-> ssub * NotoSans-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{n}{
+      <-> ssub * NotoSans-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{it}{
+      <-> ssub * NotoSans-OsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{sb}{scit}{
+      <-> ssub * NotoSans-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{sl}{
+      <-> ssub * NotoSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{scsl}{
+      <-> ssub * NotoSans-OsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{sc}{
+      <-> ssub * NotoSans-OsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{n}{
+      <-> ssub * NotoSans-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{it}{
+      <-> ssub * NotoSans-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{ub}{scit}{
+      <-> ssub * NotoSans-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{sl}{
+      <-> ssub * NotoSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{scsl}{
+      <-> ssub * NotoSans-OsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{sc}{
+      <-> ssub * NotoSans-OsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{n}{
+      <-> ssub * NotoSans-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{it}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{l}{scit}{
+      <-> ssub * NotoSans-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{sl}{
+      <-> ssub * NotoSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{scsl}{
+      <-> ssub * NotoSans-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{sc}{
+      <-> ssub * NotoSans-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{n}{
+      <-> ssub * NotoSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{it}{
+      <-> ssub * NotoSans-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{b}{scit}{
+      <-> ssub * NotoSans-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{scsl}{
+      <-> ssub * NotoSans-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{sc}{
+      <-> ssub * NotoSans-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{n}{
+      <-> ssub * NotoSans-OsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{it}{
+      <-> ssub * NotoSans-OsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{el}{scit}{
+      <-> ssub * NotoSans-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSans-OsF}{bx}{n}{
       <-> ssub * NotoSans-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSans-OsF}{bx}{sc}{
+      <-> ssub * NotoSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{bx}{scsl}{
+      <-> ssub * NotoSans-OsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-OsF}{bx}{sl}{
+      <-> ssub * NotoSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSans-OsF}{bx}{it}{
       <-> ssub * NotoSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSans-Sup.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSans-Sup.fd
index 34d838d0fed..6bef7b061ba 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSans-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSans-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSans-Sup.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{T1}{NotoSans-Sup}{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{eb}{sl}{
-      <-> ssub * NotoSans-Sup/eb/it
+\DeclareFontShape{T1}{NotoSans-Sup}{regular}{sl}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-sup-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{sb}{sl}{
-      <-> ssub * NotoSans-Sup/sb/it
+\DeclareFontShape{T1}{NotoSans-Sup}{thin}{sl}{
+      <-> ssub * NotoSans-Sup/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-sup-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{mb}{sl}{
-      <-> ssub * NotoSans-Sup/mb/it
+\DeclareFontShape{T1}{NotoSans-Sup}{semibold}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-sup-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{m}{sl}{
-      <-> ssub * NotoSans-Sup/m/it
+\DeclareFontShape{T1}{NotoSans-Sup}{bold}{sl}{
+      <-> ssub * NotoSans-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{l}{it}{
+\DeclareFontShape{T1}{NotoSans-Sup}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{l}{sl}{
-      <-> ssub * NotoSans-Sup/l/it
+\DeclareFontShape{T1}{NotoSans-Sup}{light}{sl}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{k}{n}{
+\DeclareFontShape{T1}{NotoSans-Sup}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{k}{it}{
+\DeclareFontShape{T1}{NotoSans-Sup}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{k}{sl}{
-      <-> ssub * NotoSans-Sup/k/it
+\DeclareFontShape{T1}{NotoSans-Sup}{black}{sl}{
+      <-> ssub * NotoSans-Sup/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-sup-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{b}{sl}{
-      <-> ssub * NotoSans-Sup/b/it
+\DeclareFontShape{T1}{NotoSans-Sup}{medium}{sl}{
+      <-> ssub * NotoSans-Sup/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSans-Sup}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{el}{it}{
+\DeclareFontShape{T1}{NotoSans-Sup}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{el}{sl}{
-      <-> ssub * NotoSans-Sup/el/it
+\DeclareFontShape{T1}{NotoSans-Sup}{extralight}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-sup-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSans-Sup}{m}{sl}{
+      <-> ssub * NotoSans-Sup/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-sup-t1
+\DeclareFontShape{T1}{NotoSans-Sup}{m}{n}{
+      <-> ssub * NotoSans-Sup/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{i}{sl}{
-      <-> ssub * NotoSans-Sup/i/it
+\DeclareFontShape{T1}{NotoSans-Sup}{m}{it}{
+      <-> ssub * NotoSans-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-Sup}{bx}{sl}{
-      <-> ssub * NotoSans-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ul}{sl}{
+      <-> ssub * NotoSans-Sup/thin/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ul}{n}{
+      <-> ssub * NotoSans-Sup/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ul}{it}{
+      <-> ssub * NotoSans-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSans-Sup}{eb}{sl}{
+      <-> ssub * NotoSans-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{eb}{n}{
+      <-> ssub * NotoSans-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{eb}{it}{
+      <-> ssub * NotoSans-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSans-Sup}{sb}{sl}{
+      <-> ssub * NotoSans-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{sb}{n}{
+      <-> ssub * NotoSans-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{sb}{it}{
+      <-> ssub * NotoSans-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ub}{sl}{
+      <-> ssub * NotoSans-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ub}{n}{
+      <-> ssub * NotoSans-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{ub}{it}{
+      <-> ssub * NotoSans-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSans-Sup}{l}{sl}{
+      <-> ssub * NotoSans-Sup/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{l}{n}{
+      <-> ssub * NotoSans-Sup/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{l}{it}{
+      <-> ssub * NotoSans-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSans-Sup}{b}{sl}{
+      <-> ssub * NotoSans-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{b}{n}{
+      <-> ssub * NotoSans-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{b}{it}{
+      <-> ssub * NotoSans-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSans-Sup}{el}{sl}{
+      <-> ssub * NotoSans-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{el}{n}{
+      <-> ssub * NotoSans-Sup/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-Sup}{el}{it}{
+      <-> ssub * NotoSans-Sup/extralight/it
 }{}
 
 \DeclareFontShape{T1}{NotoSans-Sup}{bx}{n}{
       <-> ssub * NotoSans-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSans-Sup}{bx}{sl}{
+      <-> ssub * NotoSans-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSans-Sup}{bx}{it}{
       <-> ssub * NotoSans-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSans-TLF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSans-TLF.fd
index 90379cde9e3..def288f0e6f 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSans-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSans-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSans-TLF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSans-TLF}{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{scsl}{
-      <-> ssub * NotoSans-TLF/eb/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{eb}{sl}{
-      <-> ssub * NotoSans-TLF/eb/it
+\DeclareFontShape{T1}{NotoSans-TLF}{regular}{sl}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{scsl}{
-      <-> ssub * NotoSans-TLF/sb/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{sb}{sl}{
-      <-> ssub * NotoSans-TLF/sb/it
+\DeclareFontShape{T1}{NotoSans-TLF}{thin}{sl}{
+      <-> ssub * NotoSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{scsl}{
-      <-> ssub * NotoSans-TLF/mb/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{mb}{sl}{
-      <-> ssub * NotoSans-TLF/mb/it
+\DeclareFontShape{T1}{NotoSans-TLF}{semibold}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{scsl}{
-      <-> ssub * NotoSans-TLF/m/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{m}{sl}{
-      <-> ssub * NotoSans-TLF/m/it
+\DeclareFontShape{T1}{NotoSans-TLF}{bold}{sl}{
+      <-> ssub * NotoSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{n}{
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{it}{
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{scsl}{
-      <-> ssub * NotoSans-TLF/l/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{l}{sl}{
-      <-> ssub * NotoSans-TLF/l/it
+\DeclareFontShape{T1}{NotoSans-TLF}{light}{sl}{
+      <-> ssub * NotoSans-TLF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{n}{
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{it}{
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{scsl}{
-      <-> ssub * NotoSans-TLF/k/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{k}{sl}{
-      <-> ssub * NotoSans-TLF/k/it
+\DeclareFontShape{T1}{NotoSans-TLF}{black}{sl}{
+      <-> ssub * NotoSans-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{scsl}{
+      <-> ssub * NotoSans-TLF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{b}{sl}{
-      <-> ssub * NotoSans-TLF/b/it
+\DeclareFontShape{T1}{NotoSans-TLF}{medium}{sl}{
+      <-> ssub * NotoSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{n}{
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{it}{
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{scsl}{
-      <-> ssub * NotoSans-TLF/el/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{el}{sl}{
-      <-> ssub * NotoSans-TLF/el/it
+\DeclareFontShape{T1}{NotoSans-TLF}{extralight}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{sl}{
+      <-> ssub * NotoSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{scsl}{
+      <-> ssub * NotoSans-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{sc}{
+      <-> ssub * NotoSans-TLF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{n}{
+      <-> ssub * NotoSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{scsl}{
-      <-> ssub * NotoSans-TLF/i/scit
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{it}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{i}{sl}{
-      <-> ssub * NotoSans-TLF/i/it
+\DeclareFontShape{T1}{NotoSans-TLF}{m}{scit}{
+      <-> ssub * NotoSans-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{bx}{sl}{
-      <-> ssub * NotoSans-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{sl}{
+      <-> ssub * NotoSans-TLF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{bx}{scsl}{
-      <-> ssub * NotoSans-TLF/b/scsl
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{scsl}{
+      <-> ssub * NotoSans-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TLF}{bx}{sc}{
-      <-> ssub * NotoSans-TLF/b/sc
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{sc}{
+      <-> ssub * NotoSans-TLF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{n}{
+      <-> ssub * NotoSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{it}{
+      <-> ssub * NotoSans-TLF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ul}{scit}{
+      <-> ssub * NotoSans-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{scsl}{
+      <-> ssub * NotoSans-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{sc}{
+      <-> ssub * NotoSans-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{n}{
+      <-> ssub * NotoSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{it}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{eb}{scit}{
+      <-> ssub * NotoSans-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{scsl}{
+      <-> ssub * NotoSans-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{sc}{
+      <-> ssub * NotoSans-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{n}{
+      <-> ssub * NotoSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{it}{
+      <-> ssub * NotoSans-TLF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{sb}{scit}{
+      <-> ssub * NotoSans-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{sl}{
+      <-> ssub * NotoSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{scsl}{
+      <-> ssub * NotoSans-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{sc}{
+      <-> ssub * NotoSans-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{n}{
+      <-> ssub * NotoSans-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{it}{
+      <-> ssub * NotoSans-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{ub}{scit}{
+      <-> ssub * NotoSans-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{sl}{
+      <-> ssub * NotoSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{scsl}{
+      <-> ssub * NotoSans-TLF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{sc}{
+      <-> ssub * NotoSans-TLF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{n}{
+      <-> ssub * NotoSans-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{it}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{l}{scit}{
+      <-> ssub * NotoSans-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{sl}{
+      <-> ssub * NotoSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{scsl}{
+      <-> ssub * NotoSans-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{sc}{
+      <-> ssub * NotoSans-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{n}{
+      <-> ssub * NotoSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{it}{
+      <-> ssub * NotoSans-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{b}{scit}{
+      <-> ssub * NotoSans-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{scsl}{
+      <-> ssub * NotoSans-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{sc}{
+      <-> ssub * NotoSans-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{n}{
+      <-> ssub * NotoSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{it}{
+      <-> ssub * NotoSans-TLF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{el}{scit}{
+      <-> ssub * NotoSans-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSans-TLF}{bx}{n}{
       <-> ssub * NotoSans-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSans-TLF}{bx}{sc}{
+      <-> ssub * NotoSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{bx}{scsl}{
+      <-> ssub * NotoSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TLF}{bx}{sl}{
+      <-> ssub * NotoSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSans-TLF}{bx}{it}{
       <-> ssub * NotoSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSans-TOsF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSans-TOsF.fd
index 5f534828af6..59d8b5b2fdd 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSans-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSans-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSans-TOsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSans-TOsF}{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{sc}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{sc}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{scit}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{scit}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSans-TOsF/eb/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{sl}{
-      <-> ssub * NotoSans-TOsF/eb/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{regular}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{sc}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{sc}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{scit}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{scit}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSans-TOsF/sb/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{sl}{
-      <-> ssub * NotoSans-TOsF/sb/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{thin}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{sc}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{sc}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{scit}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{scit}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSans-TOsF/mb/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{mb}{sl}{
-      <-> ssub * NotoSans-TOsF/mb/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{sc}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{sc}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{scit}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{scit}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{scsl}{
-      <-> ssub * NotoSans-TOsF/m/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{m}{sl}{
-      <-> ssub * NotoSans-TOsF/m/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{bold}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{sc}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{n}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{it}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{scit}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{scsl}{
-      <-> ssub * NotoSans-TOsF/l/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{l}{sl}{
-      <-> ssub * NotoSans-TOsF/l/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{light}{sl}{
+      <-> ssub * NotoSans-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{sc}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{scit}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{sc}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{n}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{it}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{scit}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{scsl}{
-      <-> ssub * NotoSans-TOsF/k/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{k}{sl}{
-      <-> ssub * NotoSans-TOsF/k/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{black}{sl}{
+      <-> ssub * NotoSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{sc}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{sc}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{scit}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{scit}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSans-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{b}{sl}{
-      <-> ssub * NotoSans-TOsF/b/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{medium}{sl}{
+      <-> ssub * NotoSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{sc}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{n}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{it}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{scit}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{scsl}{
-      <-> ssub * NotoSans-TOsF/el/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{el}{sl}{
-      <-> ssub * NotoSans-TOsF/el/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{sc}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{scsl}{
+      <-> ssub * NotoSans-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{sc}{
+      <-> ssub * NotoSans-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{scit}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{n}{
+      <-> ssub * NotoSans-TOsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{scsl}{
-      <-> ssub * NotoSans-TOsF/i/scit
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{it}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{i}{sl}{
-      <-> ssub * NotoSans-TOsF/i/it
+\DeclareFontShape{T1}{NotoSans-TOsF}{m}{scit}{
+      <-> ssub * NotoSans-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{sl}{
-      <-> ssub * NotoSans-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSans-TOsF/b/scsl
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSans-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{sc}{
-      <-> ssub * NotoSans-TOsF/b/sc
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{sc}{
+      <-> ssub * NotoSans-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{n}{
+      <-> ssub * NotoSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{it}{
+      <-> ssub * NotoSans-TOsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ul}{scit}{
+      <-> ssub * NotoSans-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSans-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{sc}{
+      <-> ssub * NotoSans-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{n}{
+      <-> ssub * NotoSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{it}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{eb}{scit}{
+      <-> ssub * NotoSans-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSans-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{sc}{
+      <-> ssub * NotoSans-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{n}{
+      <-> ssub * NotoSans-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{it}{
+      <-> ssub * NotoSans-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{sb}{scit}{
+      <-> ssub * NotoSans-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{sl}{
+      <-> ssub * NotoSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSans-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{sc}{
+      <-> ssub * NotoSans-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{n}{
+      <-> ssub * NotoSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{it}{
+      <-> ssub * NotoSans-TOsF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{ub}{scit}{
+      <-> ssub * NotoSans-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{sl}{
+      <-> ssub * NotoSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{scsl}{
+      <-> ssub * NotoSans-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{sc}{
+      <-> ssub * NotoSans-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{n}{
+      <-> ssub * NotoSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{it}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{l}{scit}{
+      <-> ssub * NotoSans-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{scsl}{
+      <-> ssub * NotoSans-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{sc}{
+      <-> ssub * NotoSans-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{n}{
+      <-> ssub * NotoSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{it}{
+      <-> ssub * NotoSans-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{b}{scit}{
+      <-> ssub * NotoSans-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{scsl}{
+      <-> ssub * NotoSans-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{sc}{
+      <-> ssub * NotoSans-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{n}{
+      <-> ssub * NotoSans-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{it}{
+      <-> ssub * NotoSans-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{el}{scit}{
+      <-> ssub * NotoSans-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSans-TOsF}{bx}{n}{
       <-> ssub * NotoSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{sc}{
+      <-> ssub * NotoSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSans-TOsF}{bx}{sl}{
+      <-> ssub * NotoSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSans-TOsF}{bx}{it}{
       <-> ssub * NotoSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-LF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-LF.fd
index 48a7e10acf5..6c0d39ca5a3 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSerif-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSerif-LF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSerif-LF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSerif-LF}{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{scsl}{
-      <-> ssub * NotoSerif-LF/eb/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{eb}{sl}{
-      <-> ssub * NotoSerif-LF/eb/it
+\DeclareFontShape{T1}{NotoSerif-LF}{regular}{sl}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{scsl}{
-      <-> ssub * NotoSerif-LF/sb/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{sb}{sl}{
-      <-> ssub * NotoSerif-LF/sb/it
+\DeclareFontShape{T1}{NotoSerif-LF}{thin}{sl}{
+      <-> ssub * NotoSerif-LF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{scsl}{
-      <-> ssub * NotoSerif-LF/mb/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{mb}{sl}{
-      <-> ssub * NotoSerif-LF/mb/it
+\DeclareFontShape{T1}{NotoSerif-LF}{semibold}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{scsl}{
-      <-> ssub * NotoSerif-LF/m/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{m}{sl}{
-      <-> ssub * NotoSerif-LF/m/it
+\DeclareFontShape{T1}{NotoSerif-LF}{bold}{sl}{
+      <-> ssub * NotoSerif-LF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{n}{
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{it}{
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{scsl}{
-      <-> ssub * NotoSerif-LF/l/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{l}{sl}{
-      <-> ssub * NotoSerif-LF/l/it
+\DeclareFontShape{T1}{NotoSerif-LF}{light}{sl}{
+      <-> ssub * NotoSerif-LF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{n}{
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{it}{
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{scsl}{
-      <-> ssub * NotoSerif-LF/k/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{k}{sl}{
-      <-> ssub * NotoSerif-LF/k/it
+\DeclareFontShape{T1}{NotoSerif-LF}{black}{sl}{
+      <-> ssub * NotoSerif-LF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{scsl}{
+      <-> ssub * NotoSerif-LF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{b}{sl}{
-      <-> ssub * NotoSerif-LF/b/it
+\DeclareFontShape{T1}{NotoSerif-LF}{medium}{sl}{
+      <-> ssub * NotoSerif-LF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{n}{
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{it}{
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{scsl}{
-      <-> ssub * NotoSerif-LF/el/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{el}{sl}{
-      <-> ssub * NotoSerif-LF/el/it
+\DeclareFontShape{T1}{NotoSerif-LF}{extralight}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{sl}{
+      <-> ssub * NotoSerif-LF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{scsl}{
+      <-> ssub * NotoSerif-LF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{sc}{
+      <-> ssub * NotoSerif-LF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{n}{
+      <-> ssub * NotoSerif-LF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{scsl}{
-      <-> ssub * NotoSerif-LF/i/scit
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{it}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{i}{sl}{
-      <-> ssub * NotoSerif-LF/i/it
+\DeclareFontShape{T1}{NotoSerif-LF}{m}{scit}{
+      <-> ssub * NotoSerif-LF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{bx}{sl}{
-      <-> ssub * NotoSerif-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{sl}{
+      <-> ssub * NotoSerif-LF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{bx}{scsl}{
-      <-> ssub * NotoSerif-LF/b/scsl
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{scsl}{
+      <-> ssub * NotoSerif-LF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-LF}{bx}{sc}{
-      <-> ssub * NotoSerif-LF/b/sc
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{sc}{
+      <-> ssub * NotoSerif-LF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{n}{
+      <-> ssub * NotoSerif-LF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{it}{
+      <-> ssub * NotoSerif-LF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ul}{scit}{
+      <-> ssub * NotoSerif-LF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{scsl}{
+      <-> ssub * NotoSerif-LF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{sc}{
+      <-> ssub * NotoSerif-LF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{n}{
+      <-> ssub * NotoSerif-LF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{it}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{eb}{scit}{
+      <-> ssub * NotoSerif-LF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{scsl}{
+      <-> ssub * NotoSerif-LF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{sc}{
+      <-> ssub * NotoSerif-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{n}{
+      <-> ssub * NotoSerif-LF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{it}{
+      <-> ssub * NotoSerif-LF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{sb}{scit}{
+      <-> ssub * NotoSerif-LF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{sl}{
+      <-> ssub * NotoSerif-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{scsl}{
+      <-> ssub * NotoSerif-LF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{sc}{
+      <-> ssub * NotoSerif-LF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{n}{
+      <-> ssub * NotoSerif-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{it}{
+      <-> ssub * NotoSerif-LF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{ub}{scit}{
+      <-> ssub * NotoSerif-LF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{sl}{
+      <-> ssub * NotoSerif-LF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{scsl}{
+      <-> ssub * NotoSerif-LF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{sc}{
+      <-> ssub * NotoSerif-LF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{n}{
+      <-> ssub * NotoSerif-LF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{it}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{l}{scit}{
+      <-> ssub * NotoSerif-LF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{sl}{
+      <-> ssub * NotoSerif-LF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{scsl}{
+      <-> ssub * NotoSerif-LF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{sc}{
+      <-> ssub * NotoSerif-LF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{n}{
+      <-> ssub * NotoSerif-LF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{it}{
+      <-> ssub * NotoSerif-LF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{b}{scit}{
+      <-> ssub * NotoSerif-LF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{scsl}{
+      <-> ssub * NotoSerif-LF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{sc}{
+      <-> ssub * NotoSerif-LF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{n}{
+      <-> ssub * NotoSerif-LF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{it}{
+      <-> ssub * NotoSerif-LF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{el}{scit}{
+      <-> ssub * NotoSerif-LF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSerif-LF}{bx}{n}{
       <-> ssub * NotoSerif-LF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSerif-LF}{bx}{sc}{
+      <-> ssub * NotoSerif-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{bx}{scsl}{
+      <-> ssub * NotoSerif-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-LF}{bx}{sl}{
+      <-> ssub * NotoSerif-LF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSerif-LF}{bx}{it}{
       <-> ssub * NotoSerif-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-OsF.fd
index b0fb5582a1e..835210f6074 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSerif-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSerif-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSerif-OsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSerif-OsF}{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-OsF/eb/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{sl}{
-      <-> ssub * NotoSerif-OsF/eb/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{regular}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-OsF/sb/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{sl}{
-      <-> ssub * NotoSerif-OsF/sb/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{thin}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-OsF/mb/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{mb}{sl}{
-      <-> ssub * NotoSerif-OsF/mb/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{scsl}{
-      <-> ssub * NotoSerif-OsF/m/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{m}{sl}{
-      <-> ssub * NotoSerif-OsF/m/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{bold}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{n}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{it}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{scsl}{
-      <-> ssub * NotoSerif-OsF/l/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{l}{sl}{
-      <-> ssub * NotoSerif-OsF/l/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{light}{sl}{
+      <-> ssub * NotoSerif-OsF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{n}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{it}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{scsl}{
-      <-> ssub * NotoSerif-OsF/k/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{k}{sl}{
-      <-> ssub * NotoSerif-OsF/k/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{black}{sl}{
+      <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-OsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{b}{sl}{
-      <-> ssub * NotoSerif-OsF/b/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{medium}{sl}{
+      <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{n}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{it}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{scsl}{
-      <-> ssub * NotoSerif-OsF/el/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{el}{sl}{
-      <-> ssub * NotoSerif-OsF/el/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{scsl}{
+      <-> ssub * NotoSerif-OsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{sc}{
+      <-> ssub * NotoSerif-OsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{n}{
+      <-> ssub * NotoSerif-OsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{scsl}{
-      <-> ssub * NotoSerif-OsF/i/scit
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{it}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{i}{sl}{
-      <-> ssub * NotoSerif-OsF/i/it
+\DeclareFontShape{T1}{NotoSerif-OsF}{m}{scit}{
+      <-> ssub * NotoSerif-OsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{sl}{
-      <-> ssub * NotoSerif-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-OsF/b/scsl
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-OsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{sc}{
-      <-> ssub * NotoSerif-OsF/b/sc
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{sc}{
+      <-> ssub * NotoSerif-OsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{n}{
+      <-> ssub * NotoSerif-OsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{it}{
+      <-> ssub * NotoSerif-OsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ul}{scit}{
+      <-> ssub * NotoSerif-OsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-OsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{sc}{
+      <-> ssub * NotoSerif-OsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{n}{
+      <-> ssub * NotoSerif-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{it}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{eb}{scit}{
+      <-> ssub * NotoSerif-OsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-OsF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{sc}{
+      <-> ssub * NotoSerif-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{n}{
+      <-> ssub * NotoSerif-OsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{it}{
+      <-> ssub * NotoSerif-OsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{sb}{scit}{
+      <-> ssub * NotoSerif-OsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{sl}{
+      <-> ssub * NotoSerif-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-OsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{sc}{
+      <-> ssub * NotoSerif-OsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{n}{
+      <-> ssub * NotoSerif-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{it}{
+      <-> ssub * NotoSerif-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{ub}{scit}{
+      <-> ssub * NotoSerif-OsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{sl}{
+      <-> ssub * NotoSerif-OsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{scsl}{
+      <-> ssub * NotoSerif-OsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{sc}{
+      <-> ssub * NotoSerif-OsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{n}{
+      <-> ssub * NotoSerif-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{it}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{l}{scit}{
+      <-> ssub * NotoSerif-OsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{scsl}{
+      <-> ssub * NotoSerif-OsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{sc}{
+      <-> ssub * NotoSerif-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{n}{
+      <-> ssub * NotoSerif-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{it}{
+      <-> ssub * NotoSerif-OsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{b}{scit}{
+      <-> ssub * NotoSerif-OsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{scsl}{
+      <-> ssub * NotoSerif-OsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{sc}{
+      <-> ssub * NotoSerif-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{n}{
+      <-> ssub * NotoSerif-OsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{it}{
+      <-> ssub * NotoSerif-OsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{el}{scit}{
+      <-> ssub * NotoSerif-OsF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSerif-OsF}{bx}{n}{
       <-> ssub * NotoSerif-OsF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{sc}{
+      <-> ssub * NotoSerif-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-OsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-OsF}{bx}{sl}{
+      <-> ssub * NotoSerif-OsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSerif-OsF}{bx}{it}{
       <-> ssub * NotoSerif-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-Sup.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-Sup.fd
index ac39b315c06..0f151778448 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-Sup.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSerif-Sup.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSerif-Sup.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSerif-Sup.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{T1}{NotoSerif-Sup}{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{sl}{
-      <-> ssub * NotoSerif-Sup/eb/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{regular}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{sl}{
-      <-> ssub * NotoSerif-Sup/sb/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{thin}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-sup-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{mb}{sl}{
-      <-> ssub * NotoSerif-Sup/mb/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{semibold}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-sup-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{m}{sl}{
-      <-> ssub * NotoSerif-Sup/m/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{bold}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{l}{it}{
+\DeclareFontShape{T1}{NotoSerif-Sup}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{l}{sl}{
-      <-> ssub * NotoSerif-Sup/l/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{light}{sl}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{k}{n}{
+\DeclareFontShape{T1}{NotoSerif-Sup}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{extrabold}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{k}{it}{
+\DeclareFontShape{T1}{NotoSerif-Sup}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{k}{sl}{
-      <-> ssub * NotoSerif-Sup/k/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{black}{sl}{
+      <-> ssub * NotoSerif-Sup/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-sup-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{b}{sl}{
-      <-> ssub * NotoSerif-Sup/b/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{medium}{sl}{
+      <-> ssub * NotoSerif-Sup/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{el}{it}{
+\DeclareFontShape{T1}{NotoSerif-Sup}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-sup-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{el}{sl}{
-      <-> ssub * NotoSerif-Sup/el/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{extralight}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-sup-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{m}{sl}{
+      <-> ssub * NotoSerif-Sup/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-sup-t1
+\DeclareFontShape{T1}{NotoSerif-Sup}{m}{n}{
+      <-> ssub * NotoSerif-Sup/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{i}{sl}{
-      <-> ssub * NotoSerif-Sup/i/it
+\DeclareFontShape{T1}{NotoSerif-Sup}{m}{it}{
+      <-> ssub * NotoSerif-Sup/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-Sup}{bx}{sl}{
-      <-> ssub * NotoSerif-Sup/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ul}{sl}{
+      <-> ssub * NotoSerif-Sup/thin/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ul}{n}{
+      <-> ssub * NotoSerif-Sup/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ul}{it}{
+      <-> ssub * NotoSerif-Sup/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{sl}{
+      <-> ssub * NotoSerif-Sup/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{n}{
+      <-> ssub * NotoSerif-Sup/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{eb}{it}{
+      <-> ssub * NotoSerif-Sup/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{sl}{
+      <-> ssub * NotoSerif-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{n}{
+      <-> ssub * NotoSerif-Sup/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{sb}{it}{
+      <-> ssub * NotoSerif-Sup/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ub}{sl}{
+      <-> ssub * NotoSerif-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ub}{n}{
+      <-> ssub * NotoSerif-Sup/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{ub}{it}{
+      <-> ssub * NotoSerif-Sup/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{l}{sl}{
+      <-> ssub * NotoSerif-Sup/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{l}{n}{
+      <-> ssub * NotoSerif-Sup/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{l}{it}{
+      <-> ssub * NotoSerif-Sup/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{b}{sl}{
+      <-> ssub * NotoSerif-Sup/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{b}{n}{
+      <-> ssub * NotoSerif-Sup/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{b}{it}{
+      <-> ssub * NotoSerif-Sup/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{el}{sl}{
+      <-> ssub * NotoSerif-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{el}{n}{
+      <-> ssub * NotoSerif-Sup/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-Sup}{el}{it}{
+      <-> ssub * NotoSerif-Sup/extralight/it
 }{}
 
 \DeclareFontShape{T1}{NotoSerif-Sup}{bx}{n}{
       <-> ssub * NotoSerif-Sup/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSerif-Sup}{bx}{sl}{
+      <-> ssub * NotoSerif-Sup/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSerif-Sup}{bx}{it}{
       <-> ssub * NotoSerif-Sup/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TLF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TLF.fd
index 64554945045..ee88d4ffc49 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSerif-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSerif-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSerif-TLF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSerif-TLF}{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TLF/eb/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{sl}{
-      <-> ssub * NotoSerif-TLF/eb/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{regular}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TLF/sb/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{sl}{
-      <-> ssub * NotoSerif-TLF/sb/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{thin}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TLF/mb/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{mb}{sl}{
-      <-> ssub * NotoSerif-TLF/mb/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{scsl}{
-      <-> ssub * NotoSerif-TLF/m/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{m}{sl}{
-      <-> ssub * NotoSerif-TLF/m/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{bold}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{n}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{it}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{scsl}{
-      <-> ssub * NotoSerif-TLF/l/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{l}{sl}{
-      <-> ssub * NotoSerif-TLF/l/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{light}{sl}{
+      <-> ssub * NotoSerif-TLF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{n}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{it}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{scsl}{
-      <-> ssub * NotoSerif-TLF/k/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{k}{sl}{
-      <-> ssub * NotoSerif-TLF/k/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{black}{sl}{
+      <-> ssub * NotoSerif-TLF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TLF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{b}{sl}{
-      <-> ssub * NotoSerif-TLF/b/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{medium}{sl}{
+      <-> ssub * NotoSerif-TLF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{n}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{it}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{scsl}{
-      <-> ssub * NotoSerif-TLF/el/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{el}{sl}{
-      <-> ssub * NotoSerif-TLF/el/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{scsl}{
+      <-> ssub * NotoSerif-TLF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{sc}{
+      <-> ssub * NotoSerif-TLF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{n}{
+      <-> ssub * NotoSerif-TLF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{scsl}{
-      <-> ssub * NotoSerif-TLF/i/scit
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{it}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{i}{sl}{
-      <-> ssub * NotoSerif-TLF/i/it
+\DeclareFontShape{T1}{NotoSerif-TLF}{m}{scit}{
+      <-> ssub * NotoSerif-TLF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{sl}{
-      <-> ssub * NotoSerif-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TLF/b/scsl
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TLF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{sc}{
-      <-> ssub * NotoSerif-TLF/b/sc
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{sc}{
+      <-> ssub * NotoSerif-TLF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{n}{
+      <-> ssub * NotoSerif-TLF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{it}{
+      <-> ssub * NotoSerif-TLF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ul}{scit}{
+      <-> ssub * NotoSerif-TLF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TLF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{sc}{
+      <-> ssub * NotoSerif-TLF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{n}{
+      <-> ssub * NotoSerif-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{it}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{eb}{scit}{
+      <-> ssub * NotoSerif-TLF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TLF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{sc}{
+      <-> ssub * NotoSerif-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{n}{
+      <-> ssub * NotoSerif-TLF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{it}{
+      <-> ssub * NotoSerif-TLF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{sb}{scit}{
+      <-> ssub * NotoSerif-TLF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{sl}{
+      <-> ssub * NotoSerif-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TLF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{sc}{
+      <-> ssub * NotoSerif-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{n}{
+      <-> ssub * NotoSerif-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{it}{
+      <-> ssub * NotoSerif-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{ub}{scit}{
+      <-> ssub * NotoSerif-TLF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{sl}{
+      <-> ssub * NotoSerif-TLF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{scsl}{
+      <-> ssub * NotoSerif-TLF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{sc}{
+      <-> ssub * NotoSerif-TLF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{n}{
+      <-> ssub * NotoSerif-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{it}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{l}{scit}{
+      <-> ssub * NotoSerif-TLF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{scsl}{
+      <-> ssub * NotoSerif-TLF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{sc}{
+      <-> ssub * NotoSerif-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{n}{
+      <-> ssub * NotoSerif-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{it}{
+      <-> ssub * NotoSerif-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{b}{scit}{
+      <-> ssub * NotoSerif-TLF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{scsl}{
+      <-> ssub * NotoSerif-TLF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{sc}{
+      <-> ssub * NotoSerif-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{n}{
+      <-> ssub * NotoSerif-TLF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{it}{
+      <-> ssub * NotoSerif-TLF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{el}{scit}{
+      <-> ssub * NotoSerif-TLF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSerif-TLF}{bx}{n}{
       <-> ssub * NotoSerif-TLF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{sc}{
+      <-> ssub * NotoSerif-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TLF}{bx}{sl}{
+      <-> ssub * NotoSerif-TLF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSerif-TLF}{bx}{it}{
       <-> ssub * NotoSerif-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TOsF.fd b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TOsF.fd
index 4b1b6630535..1e78d69df56 100644
--- a/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/T1NotoSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{T1NotoSerif-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for T1/NotoSerif-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for T1/NotoSerif-TOsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,238 +11,484 @@
 
 \DeclareFontFamily{T1}{NotoSerif-TOsF}{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-t1
+
+%   ----  regular  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/eb/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{sl}{
-      <-> ssub * NotoSerif-TOsF/eb/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{regular}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-t1
+
+%   ----  thin  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/sb/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{sl}{
-      <-> ssub * NotoSerif-TOsF/sb/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{thin}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-t1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{scsl}{
-      <-> ssub * NotoSerif-TOsF/mb/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{mb}{sl}{
-      <-> ssub * NotoSerif-TOsF/mb/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-sc-t1
+
+%   ----  bold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{scsl}{
-      <-> ssub * NotoSerif-TOsF/m/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{sl}{
-      <-> ssub * NotoSerif-TOsF/m/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bold}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{sc}{
+
+%   ----  light  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{n}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{it}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{scit}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{scsl}{
-      <-> ssub * NotoSerif-TOsF/l/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{sl}{
-      <-> ssub * NotoSerif-TOsF/l/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{light}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{sc}{
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{sc}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{n}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{it}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{scit}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{scsl}{
-      <-> ssub * NotoSerif-TOsF/k/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{k}{sl}{
-      <-> ssub * NotoSerif-TOsF/k/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{black}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-sc-t1
+
+%   ----  medium  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{sc}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{scit}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{scsl}{
+      <-> ssub * NotoSerif-TOsF/medium/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{medium}{sl}{
+      <-> ssub * NotoSerif-TOsF/medium/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{sc}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{sc}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{n}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{it}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{scit}{
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{scit}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-sc-t1
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{scsl}{
-      <-> ssub * NotoSerif-TOsF/el/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{sl}{
-      <-> ssub * NotoSerif-TOsF/el/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{sc}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-sc-t1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{scsl}{
+      <-> ssub * NotoSerif-TOsF/regular/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{sc}{
+      <-> ssub * NotoSerif-TOsF/regular/sc
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{scit}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-sc-t1
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{n}{
+      <-> ssub * NotoSerif-TOsF/regular/n
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{scsl}{
-      <-> ssub * NotoSerif-TOsF/i/scit
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{it}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{i}{sl}{
-      <-> ssub * NotoSerif-TOsF/i/it
+\DeclareFontShape{T1}{NotoSerif-TOsF}{m}{scit}{
+      <-> ssub * NotoSerif-TOsF/regular/scit
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/sl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{scsl}{
-      <-> ssub * NotoSerif-TOsF/b/scsl
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{scsl}{
+      <-> ssub * NotoSerif-TOsF/thin/scsl
 }{}
 
-\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{sc}{
-      <-> ssub * NotoSerif-TOsF/b/sc
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{sc}{
+      <-> ssub * NotoSerif-TOsF/thin/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{n}{
+      <-> ssub * NotoSerif-TOsF/thin/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{it}{
+      <-> ssub * NotoSerif-TOsF/thin/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ul}{scit}{
+      <-> ssub * NotoSerif-TOsF/thin/scit
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{sc}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{n}{
+      <-> ssub * NotoSerif-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{it}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{eb}{scit}{
+      <-> ssub * NotoSerif-TOsF/extrabold/scit
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{scsl}{
+      <-> ssub * NotoSerif-TOsF/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{sc}{
+      <-> ssub * NotoSerif-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{n}{
+      <-> ssub * NotoSerif-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{it}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{sb}{scit}{
+      <-> ssub * NotoSerif-TOsF/semibold/scit
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{scsl}{
+      <-> ssub * NotoSerif-TOsF/black/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{sc}{
+      <-> ssub * NotoSerif-TOsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{n}{
+      <-> ssub * NotoSerif-TOsF/black/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{it}{
+      <-> ssub * NotoSerif-TOsF/black/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{ub}{scit}{
+      <-> ssub * NotoSerif-TOsF/black/scit
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{scsl}{
+      <-> ssub * NotoSerif-TOsF/light/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{sc}{
+      <-> ssub * NotoSerif-TOsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{n}{
+      <-> ssub * NotoSerif-TOsF/light/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{it}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{l}{scit}{
+      <-> ssub * NotoSerif-TOsF/light/scit
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{scsl}{
+      <-> ssub * NotoSerif-TOsF/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{sc}{
+      <-> ssub * NotoSerif-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{n}{
+      <-> ssub * NotoSerif-TOsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{it}{
+      <-> ssub * NotoSerif-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{b}{scit}{
+      <-> ssub * NotoSerif-TOsF/bold/scit
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{scsl}{
+      <-> ssub * NotoSerif-TOsF/extralight/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{sc}{
+      <-> ssub * NotoSerif-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{n}{
+      <-> ssub * NotoSerif-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{it}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{el}{scit}{
+      <-> ssub * NotoSerif-TOsF/extralight/scit
 }{}
 
 \DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{n}{
       <-> ssub * NotoSerif-TOsF/b/n
 }{}
 
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{sc}{
+      <-> ssub * NotoSerif-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{scsl}{
+      <-> ssub * NotoSerif-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{sl}{
+      <-> ssub * NotoSerif-TOsF/b/sl
+}{}
+
 \DeclareFontShape{T1}{NotoSerif-TOsF}{bx}{it}{
       <-> ssub * NotoSerif-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd
index 1f9eb1dd149..c841308ee7f 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoMono-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/22
 %%
 \ProvidesFile{TS1NotoMono-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoMono-TLF.]
+    [2019/04/22 (autoinst)  Font definitions for TS1/NotoMono-TLF.]
 
 \expandafter\ifx\csname NotoMono@scale\endcsname\relax
     \let\NotoMono@@scale\@empty
@@ -11,38 +11,77 @@
 
 \DeclareFontFamily{TS1}{NotoMono-TLF}{}
 
-\DeclareFontShape{TS1}{NotoMono-TLF}{b}{n}{
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{regular}{n}{
+      <-> \NotoMono@@scale NotoMono-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{regular}{it}{
+      <-> \NotoMono@@scale NotoMono-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{regular}{sl}{
+      <-> ssub * NotoMono-TLF/regular/it
+}{}
+
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{bold}{n}{
       <-> \NotoMono@@scale NotoMono-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoMono-TLF}{b}{it}{
+\DeclareFontShape{TS1}{NotoMono-TLF}{bold}{it}{
       <-> \NotoMono@@scale NotoMono-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoMono-TLF}{b}{sl}{
-      <-> ssub * NotoMono-TLF/b/it
+\DeclareFontShape{TS1}{NotoMono-TLF}{bold}{sl}{
+      <-> ssub * NotoMono-TLF/bold/it
+}{}
+
+%
+%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{m}{sl}{
+      <-> ssub * NotoMono-TLF/regular/sl
 }{}
 
 \DeclareFontShape{TS1}{NotoMono-TLF}{m}{n}{
-      <-> \NotoMono@@scale NotoMono-tlf-ts1
+      <-> ssub * NotoMono-TLF/regular/n
 }{}
 
 \DeclareFontShape{TS1}{NotoMono-TLF}{m}{it}{
-      <-> \NotoMono@@scale NotoMono-Italic-tlf-ts1
+      <-> ssub * NotoMono-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoMono-TLF}{m}{sl}{
-      <-> ssub * NotoMono-TLF/m/it
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{b}{sl}{
+      <-> ssub * NotoMono-TLF/bold/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoMono-TLF}{bx}{sl}{
-      <-> ssub * NotoMono-TLF/b/sl
+\DeclareFontShape{TS1}{NotoMono-TLF}{b}{n}{
+      <-> ssub * NotoMono-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoMono-TLF}{b}{it}{
+      <-> ssub * NotoMono-TLF/bold/it
 }{}
 
 \DeclareFontShape{TS1}{NotoMono-TLF}{bx}{n}{
       <-> ssub * NotoMono-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoMono-TLF}{bx}{sl}{
+      <-> ssub * NotoMono-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoMono-TLF}{bx}{it}{
       <-> ssub * NotoMono-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-LF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-LF.fd
index 013a65107e5..1181edc02cf 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSans-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSans-LF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSans-LF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSans-LF}{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{eb}{sl}{
-      <-> ssub * NotoSans-LF/eb/it
+\DeclareFontShape{TS1}{NotoSans-LF}{regular}{sl}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{sb}{sl}{
-      <-> ssub * NotoSans-LF/sb/it
+\DeclareFontShape{TS1}{NotoSans-LF}{thin}{sl}{
+      <-> ssub * NotoSans-LF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-lf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{mb}{sl}{
-      <-> ssub * NotoSans-LF/mb/it
+\DeclareFontShape{TS1}{NotoSans-LF}{semibold}{sl}{
+      <-> ssub * NotoSans-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-lf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{m}{sl}{
-      <-> ssub * NotoSans-LF/m/it
+\DeclareFontShape{TS1}{NotoSans-LF}{bold}{sl}{
+      <-> ssub * NotoSans-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSans-LF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{l}{sl}{
-      <-> ssub * NotoSans-LF/l/it
+\DeclareFontShape{TS1}{NotoSans-LF}{light}{sl}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSans-LF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{extrabold}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSans-LF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{k}{sl}{
-      <-> ssub * NotoSans-LF/k/it
+\DeclareFontShape{TS1}{NotoSans-LF}{black}{sl}{
+      <-> ssub * NotoSans-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-lf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{b}{sl}{
-      <-> ssub * NotoSans-LF/b/it
+\DeclareFontShape{TS1}{NotoSans-LF}{medium}{sl}{
+      <-> ssub * NotoSans-LF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSans-LF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSans-LF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{el}{sl}{
-      <-> ssub * NotoSans-LF/el/it
+\DeclareFontShape{TS1}{NotoSans-LF}{extralight}{sl}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-lf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSans-LF}{m}{sl}{
+      <-> ssub * NotoSans-LF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSans-LF}{m}{n}{
+      <-> ssub * NotoSans-LF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{i}{sl}{
-      <-> ssub * NotoSans-LF/i/it
+\DeclareFontShape{TS1}{NotoSans-LF}{m}{it}{
+      <-> ssub * NotoSans-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-LF}{bx}{sl}{
-      <-> ssub * NotoSans-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ul}{sl}{
+      <-> ssub * NotoSans-LF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ul}{n}{
+      <-> ssub * NotoSans-LF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ul}{it}{
+      <-> ssub * NotoSans-LF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSans-LF}{eb}{sl}{
+      <-> ssub * NotoSans-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{eb}{n}{
+      <-> ssub * NotoSans-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{eb}{it}{
+      <-> ssub * NotoSans-LF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSans-LF}{sb}{sl}{
+      <-> ssub * NotoSans-LF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{sb}{n}{
+      <-> ssub * NotoSans-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{sb}{it}{
+      <-> ssub * NotoSans-LF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ub}{sl}{
+      <-> ssub * NotoSans-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ub}{n}{
+      <-> ssub * NotoSans-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{ub}{it}{
+      <-> ssub * NotoSans-LF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSans-LF}{l}{sl}{
+      <-> ssub * NotoSans-LF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{l}{n}{
+      <-> ssub * NotoSans-LF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{l}{it}{
+      <-> ssub * NotoSans-LF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSans-LF}{b}{sl}{
+      <-> ssub * NotoSans-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{b}{n}{
+      <-> ssub * NotoSans-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{b}{it}{
+      <-> ssub * NotoSans-LF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSans-LF}{el}{sl}{
+      <-> ssub * NotoSans-LF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{el}{n}{
+      <-> ssub * NotoSans-LF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-LF}{el}{it}{
+      <-> ssub * NotoSans-LF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSans-LF}{bx}{n}{
       <-> ssub * NotoSans-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSans-LF}{bx}{sl}{
+      <-> ssub * NotoSans-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSans-LF}{bx}{it}{
       <-> ssub * NotoSans-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-OsF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-OsF.fd
index 8b0e4561750..db545ea3317 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSans-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSans-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSans-OsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSans-OsF}{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{sl}{
-      <-> ssub * NotoSans-OsF/eb/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{regular}{sl}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{sl}{
-      <-> ssub * NotoSans-OsF/sb/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{thin}{sl}{
+      <-> ssub * NotoSans-OsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-osf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{mb}{sl}{
-      <-> ssub * NotoSans-OsF/mb/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{semibold}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-osf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{m}{sl}{
-      <-> ssub * NotoSans-OsF/m/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{bold}{sl}{
+      <-> ssub * NotoSans-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSans-OsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{l}{sl}{
-      <-> ssub * NotoSans-OsF/l/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{light}{sl}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSans-OsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSans-OsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{k}{sl}{
-      <-> ssub * NotoSans-OsF/k/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{black}{sl}{
+      <-> ssub * NotoSans-OsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-osf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{b}{sl}{
-      <-> ssub * NotoSans-OsF/b/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{medium}{sl}{
+      <-> ssub * NotoSans-OsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSans-OsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{el}{sl}{
-      <-> ssub * NotoSans-OsF/el/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{extralight}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-osf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{m}{sl}{
+      <-> ssub * NotoSans-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSans-OsF}{m}{n}{
+      <-> ssub * NotoSans-OsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{i}{sl}{
-      <-> ssub * NotoSans-OsF/i/it
+\DeclareFontShape{TS1}{NotoSans-OsF}{m}{it}{
+      <-> ssub * NotoSans-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-OsF}{bx}{sl}{
-      <-> ssub * NotoSans-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ul}{sl}{
+      <-> ssub * NotoSans-OsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ul}{n}{
+      <-> ssub * NotoSans-OsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ul}{it}{
+      <-> ssub * NotoSans-OsF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{sl}{
+      <-> ssub * NotoSans-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{n}{
+      <-> ssub * NotoSans-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{eb}{it}{
+      <-> ssub * NotoSans-OsF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{sl}{
+      <-> ssub * NotoSans-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{n}{
+      <-> ssub * NotoSans-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{sb}{it}{
+      <-> ssub * NotoSans-OsF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ub}{sl}{
+      <-> ssub * NotoSans-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ub}{n}{
+      <-> ssub * NotoSans-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{ub}{it}{
+      <-> ssub * NotoSans-OsF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{l}{sl}{
+      <-> ssub * NotoSans-OsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{l}{n}{
+      <-> ssub * NotoSans-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{l}{it}{
+      <-> ssub * NotoSans-OsF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{b}{sl}{
+      <-> ssub * NotoSans-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{b}{n}{
+      <-> ssub * NotoSans-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{b}{it}{
+      <-> ssub * NotoSans-OsF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{el}{sl}{
+      <-> ssub * NotoSans-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{el}{n}{
+      <-> ssub * NotoSans-OsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-OsF}{el}{it}{
+      <-> ssub * NotoSans-OsF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSans-OsF}{bx}{n}{
       <-> ssub * NotoSans-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSans-OsF}{bx}{sl}{
+      <-> ssub * NotoSans-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSans-OsF}{bx}{it}{
       <-> ssub * NotoSans-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TLF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TLF.fd
index 456133d1750..02e86389ef7 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSans-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSans-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSans-TLF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSans-TLF}{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{sl}{
-      <-> ssub * NotoSans-TLF/eb/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{regular}{sl}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{sl}{
-      <-> ssub * NotoSans-TLF/sb/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{thin}{sl}{
+      <-> ssub * NotoSans-TLF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tlf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{mb}{sl}{
-      <-> ssub * NotoSans-TLF/mb/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{semibold}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tlf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{m}{sl}{
-      <-> ssub * NotoSans-TLF/m/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{bold}{sl}{
+      <-> ssub * NotoSans-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSans-TLF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{l}{sl}{
-      <-> ssub * NotoSans-TLF/l/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{light}{sl}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSans-TLF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSans-TLF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{k}{sl}{
-      <-> ssub * NotoSans-TLF/k/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{black}{sl}{
+      <-> ssub * NotoSans-TLF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tlf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{b}{sl}{
-      <-> ssub * NotoSans-TLF/b/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{medium}{sl}{
+      <-> ssub * NotoSans-TLF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSans-TLF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{el}{sl}{
-      <-> ssub * NotoSans-TLF/el/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{extralight}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tlf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{m}{sl}{
+      <-> ssub * NotoSans-TLF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSans-TLF}{m}{n}{
+      <-> ssub * NotoSans-TLF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{i}{sl}{
-      <-> ssub * NotoSans-TLF/i/it
+\DeclareFontShape{TS1}{NotoSans-TLF}{m}{it}{
+      <-> ssub * NotoSans-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TLF}{bx}{sl}{
-      <-> ssub * NotoSans-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ul}{sl}{
+      <-> ssub * NotoSans-TLF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ul}{n}{
+      <-> ssub * NotoSans-TLF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ul}{it}{
+      <-> ssub * NotoSans-TLF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{sl}{
+      <-> ssub * NotoSans-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{n}{
+      <-> ssub * NotoSans-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{eb}{it}{
+      <-> ssub * NotoSans-TLF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{sl}{
+      <-> ssub * NotoSans-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{n}{
+      <-> ssub * NotoSans-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{sb}{it}{
+      <-> ssub * NotoSans-TLF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ub}{sl}{
+      <-> ssub * NotoSans-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ub}{n}{
+      <-> ssub * NotoSans-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{ub}{it}{
+      <-> ssub * NotoSans-TLF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{l}{sl}{
+      <-> ssub * NotoSans-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{l}{n}{
+      <-> ssub * NotoSans-TLF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{l}{it}{
+      <-> ssub * NotoSans-TLF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{b}{sl}{
+      <-> ssub * NotoSans-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{b}{n}{
+      <-> ssub * NotoSans-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{b}{it}{
+      <-> ssub * NotoSans-TLF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{el}{sl}{
+      <-> ssub * NotoSans-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{el}{n}{
+      <-> ssub * NotoSans-TLF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TLF}{el}{it}{
+      <-> ssub * NotoSans-TLF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSans-TLF}{bx}{n}{
       <-> ssub * NotoSans-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSans-TLF}{bx}{sl}{
+      <-> ssub * NotoSans-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSans-TLF}{bx}{it}{
       <-> ssub * NotoSans-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TOsF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TOsF.fd
index 9a4a685b6e3..49619a62b2a 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSans-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSans-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSans-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSans-TOsF.]
 
 \expandafter\ifx\csname NotoSans@scale\endcsname\relax
     \let\NotoSans@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSans-TOsF}{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{n}{
-      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{regular}{n}{
+      <-> \NotoSans@@scale NotoSans-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{it}{
-      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{regular}{it}{
+      <-> \NotoSans@@scale NotoSans-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{sl}{
-      <-> ssub * NotoSans-TOsF/eb/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{regular}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{n}{
-      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{thin}{n}{
+      <-> \NotoSans@@scale NotoSans-Thin-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{it}{
-      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{thin}{it}{
+      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{sl}{
-      <-> ssub * NotoSans-TOsF/sb/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{thin}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{mb}{n}{
-      <-> \NotoSans@@scale NotoSans-Medium-tosf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{semibold}{n}{
+      <-> \NotoSans@@scale NotoSans-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{mb}{it}{
-      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{semibold}{it}{
+      <-> \NotoSans@@scale NotoSans-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{mb}{sl}{
-      <-> ssub * NotoSans-TOsF/mb/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{n}{
-      <-> \NotoSans@@scale NotoSans-Regular-tosf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{bold}{n}{
+      <-> \NotoSans@@scale NotoSans-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{it}{
-      <-> \NotoSans@@scale NotoSans-Italic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{bold}{it}{
+      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{sl}{
-      <-> ssub * NotoSans-TOsF/m/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{bold}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{light}{n}{
       <-> \NotoSans@@scale NotoSans-Light-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSans-TOsF}{light}{it}{
       <-> \NotoSans@@scale NotoSans-LightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{sl}{
-      <-> ssub * NotoSans-TOsF/l/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{light}{sl}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extrabold}{n}{
+      <-> \NotoSans@@scale NotoSans-ExtraBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extrabold}{it}{
+      <-> \NotoSans@@scale NotoSans-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{black}{n}{
       <-> \NotoSans@@scale NotoSans-Black-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSans-TOsF}{black}{it}{
       <-> \NotoSans@@scale NotoSans-BlackItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{k}{sl}{
-      <-> ssub * NotoSans-TOsF/k/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{black}{sl}{
+      <-> ssub * NotoSans-TOsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{n}{
-      <-> \NotoSans@@scale NotoSans-Bold-tosf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{medium}{n}{
+      <-> \NotoSans@@scale NotoSans-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{it}{
-      <-> \NotoSans@@scale NotoSans-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{medium}{it}{
+      <-> \NotoSans@@scale NotoSans-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{sl}{
-      <-> ssub * NotoSans-TOsF/b/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{medium}{sl}{
+      <-> ssub * NotoSans-TOsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extralight}{n}{
       <-> \NotoSans@@scale NotoSans-ExtraLight-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extralight}{it}{
       <-> \NotoSans@@scale NotoSans-ExtraLightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{sl}{
-      <-> ssub * NotoSans-TOsF/el/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{i}{n}{
-      <-> \NotoSans@@scale NotoSans-Thin-tosf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{sl}{
+      <-> ssub * NotoSans-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{i}{it}{
-      <-> \NotoSans@@scale NotoSans-ThinItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{n}{
+      <-> ssub * NotoSans-TOsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{i}{sl}{
-      <-> ssub * NotoSans-TOsF/i/it
+\DeclareFontShape{TS1}{NotoSans-TOsF}{m}{it}{
+      <-> ssub * NotoSans-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSans-TOsF}{bx}{sl}{
-      <-> ssub * NotoSans-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ul}{sl}{
+      <-> ssub * NotoSans-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ul}{n}{
+      <-> ssub * NotoSans-TOsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ul}{it}{
+      <-> ssub * NotoSans-TOsF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{sl}{
+      <-> ssub * NotoSans-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{n}{
+      <-> ssub * NotoSans-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{eb}{it}{
+      <-> ssub * NotoSans-TOsF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{sl}{
+      <-> ssub * NotoSans-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{n}{
+      <-> ssub * NotoSans-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{sb}{it}{
+      <-> ssub * NotoSans-TOsF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ub}{sl}{
+      <-> ssub * NotoSans-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ub}{n}{
+      <-> ssub * NotoSans-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{ub}{it}{
+      <-> ssub * NotoSans-TOsF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{sl}{
+      <-> ssub * NotoSans-TOsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{n}{
+      <-> ssub * NotoSans-TOsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{l}{it}{
+      <-> ssub * NotoSans-TOsF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{sl}{
+      <-> ssub * NotoSans-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{n}{
+      <-> ssub * NotoSans-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{b}{it}{
+      <-> ssub * NotoSans-TOsF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{sl}{
+      <-> ssub * NotoSans-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{n}{
+      <-> ssub * NotoSans-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSans-TOsF}{el}{it}{
+      <-> ssub * NotoSans-TOsF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSans-TOsF}{bx}{n}{
       <-> ssub * NotoSans-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSans-TOsF}{bx}{sl}{
+      <-> ssub * NotoSans-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSans-TOsF}{bx}{it}{
       <-> ssub * NotoSans-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-LF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-LF.fd
index b743ac395a9..39da2c44b27 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-LF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-LF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSerif-LF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSerif-LF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSerif-LF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSerif-LF}{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{sl}{
-      <-> ssub * NotoSerif-LF/eb/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{regular}{sl}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{sl}{
-      <-> ssub * NotoSerif-LF/sb/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{thin}{sl}{
+      <-> ssub * NotoSerif-LF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{mb}{sl}{
-      <-> ssub * NotoSerif-LF/mb/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{semibold}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-lf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{m}{sl}{
-      <-> ssub * NotoSerif-LF/m/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{bold}{sl}{
+      <-> ssub * NotoSerif-LF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSerif-LF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{l}{sl}{
-      <-> ssub * NotoSerif-LF/l/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{light}{sl}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSerif-LF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSerif-LF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{k}{sl}{
-      <-> ssub * NotoSerif-LF/k/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{black}{sl}{
+      <-> ssub * NotoSerif-LF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-lf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{b}{sl}{
-      <-> ssub * NotoSerif-LF/b/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{medium}{sl}{
+      <-> ssub * NotoSerif-LF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSerif-LF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-lf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{el}{sl}{
-      <-> ssub * NotoSerif-LF/el/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{extralight}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-lf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{m}{sl}{
+      <-> ssub * NotoSerif-LF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-lf-ts1
+\DeclareFontShape{TS1}{NotoSerif-LF}{m}{n}{
+      <-> ssub * NotoSerif-LF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{i}{sl}{
-      <-> ssub * NotoSerif-LF/i/it
+\DeclareFontShape{TS1}{NotoSerif-LF}{m}{it}{
+      <-> ssub * NotoSerif-LF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-LF}{bx}{sl}{
-      <-> ssub * NotoSerif-LF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ul}{sl}{
+      <-> ssub * NotoSerif-LF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ul}{n}{
+      <-> ssub * NotoSerif-LF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ul}{it}{
+      <-> ssub * NotoSerif-LF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{sl}{
+      <-> ssub * NotoSerif-LF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{n}{
+      <-> ssub * NotoSerif-LF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{eb}{it}{
+      <-> ssub * NotoSerif-LF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{sl}{
+      <-> ssub * NotoSerif-LF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{n}{
+      <-> ssub * NotoSerif-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{sb}{it}{
+      <-> ssub * NotoSerif-LF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ub}{sl}{
+      <-> ssub * NotoSerif-LF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ub}{n}{
+      <-> ssub * NotoSerif-LF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{ub}{it}{
+      <-> ssub * NotoSerif-LF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{l}{sl}{
+      <-> ssub * NotoSerif-LF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{l}{n}{
+      <-> ssub * NotoSerif-LF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{l}{it}{
+      <-> ssub * NotoSerif-LF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{b}{sl}{
+      <-> ssub * NotoSerif-LF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{b}{n}{
+      <-> ssub * NotoSerif-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{b}{it}{
+      <-> ssub * NotoSerif-LF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{el}{sl}{
+      <-> ssub * NotoSerif-LF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{el}{n}{
+      <-> ssub * NotoSerif-LF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-LF}{el}{it}{
+      <-> ssub * NotoSerif-LF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSerif-LF}{bx}{n}{
       <-> ssub * NotoSerif-LF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSerif-LF}{bx}{sl}{
+      <-> ssub * NotoSerif-LF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSerif-LF}{bx}{it}{
       <-> ssub * NotoSerif-LF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-OsF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-OsF.fd
index 13de0f985bc..29cd028f5ce 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-OsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSerif-OsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSerif-OsF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSerif-OsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSerif-OsF}{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{sl}{
-      <-> ssub * NotoSerif-OsF/eb/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{regular}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{sl}{
-      <-> ssub * NotoSerif-OsF/sb/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{thin}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{mb}{sl}{
-      <-> ssub * NotoSerif-OsF/mb/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-osf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{sl}{
-      <-> ssub * NotoSerif-OsF/m/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{bold}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSerif-OsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{sl}{
-      <-> ssub * NotoSerif-OsF/l/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{light}{sl}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSerif-OsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{k}{sl}{
-      <-> ssub * NotoSerif-OsF/k/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{black}{sl}{
+      <-> ssub * NotoSerif-OsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-osf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{sl}{
-      <-> ssub * NotoSerif-OsF/b/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{medium}{sl}{
+      <-> ssub * NotoSerif-OsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-osf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{sl}{
-      <-> ssub * NotoSerif-OsF/el/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-osf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{sl}{
+      <-> ssub * NotoSerif-OsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-osf-ts1
+\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{n}{
+      <-> ssub * NotoSerif-OsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{i}{sl}{
-      <-> ssub * NotoSerif-OsF/i/it
+\DeclareFontShape{TS1}{NotoSerif-OsF}{m}{it}{
+      <-> ssub * NotoSerif-OsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-OsF}{bx}{sl}{
-      <-> ssub * NotoSerif-OsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ul}{sl}{
+      <-> ssub * NotoSerif-OsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ul}{n}{
+      <-> ssub * NotoSerif-OsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ul}{it}{
+      <-> ssub * NotoSerif-OsF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{sl}{
+      <-> ssub * NotoSerif-OsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{n}{
+      <-> ssub * NotoSerif-OsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{eb}{it}{
+      <-> ssub * NotoSerif-OsF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{sl}{
+      <-> ssub * NotoSerif-OsF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{n}{
+      <-> ssub * NotoSerif-OsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{sb}{it}{
+      <-> ssub * NotoSerif-OsF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ub}{sl}{
+      <-> ssub * NotoSerif-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ub}{n}{
+      <-> ssub * NotoSerif-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{ub}{it}{
+      <-> ssub * NotoSerif-OsF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{sl}{
+      <-> ssub * NotoSerif-OsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{n}{
+      <-> ssub * NotoSerif-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{l}{it}{
+      <-> ssub * NotoSerif-OsF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{sl}{
+      <-> ssub * NotoSerif-OsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{n}{
+      <-> ssub * NotoSerif-OsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{b}{it}{
+      <-> ssub * NotoSerif-OsF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{sl}{
+      <-> ssub * NotoSerif-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{n}{
+      <-> ssub * NotoSerif-OsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-OsF}{el}{it}{
+      <-> ssub * NotoSerif-OsF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSerif-OsF}{bx}{n}{
       <-> ssub * NotoSerif-OsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSerif-OsF}{bx}{sl}{
+      <-> ssub * NotoSerif-OsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSerif-OsF}{bx}{it}{
       <-> ssub * NotoSerif-OsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TLF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TLF.fd
index ef85936f65c..bc9c3a7cbe2 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TLF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TLF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSerif-TLF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSerif-TLF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSerif-TLF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSerif-TLF}{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{sl}{
-      <-> ssub * NotoSerif-TLF/eb/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{regular}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{sl}{
-      <-> ssub * NotoSerif-TLF/sb/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{thin}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{mb}{sl}{
-      <-> ssub * NotoSerif-TLF/mb/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tlf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{sl}{
-      <-> ssub * NotoSerif-TLF/m/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{bold}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TLF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{sl}{
-      <-> ssub * NotoSerif-TLF/l/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{light}{sl}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TLF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{k}{sl}{
-      <-> ssub * NotoSerif-TLF/k/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{black}{sl}{
+      <-> ssub * NotoSerif-TLF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tlf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{sl}{
-      <-> ssub * NotoSerif-TLF/b/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{medium}{sl}{
+      <-> ssub * NotoSerif-TLF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tlf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{sl}{
-      <-> ssub * NotoSerif-TLF/el/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tlf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{sl}{
+      <-> ssub * NotoSerif-TLF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tlf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{n}{
+      <-> ssub * NotoSerif-TLF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{i}{sl}{
-      <-> ssub * NotoSerif-TLF/i/it
+\DeclareFontShape{TS1}{NotoSerif-TLF}{m}{it}{
+      <-> ssub * NotoSerif-TLF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TLF}{bx}{sl}{
-      <-> ssub * NotoSerif-TLF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ul}{sl}{
+      <-> ssub * NotoSerif-TLF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ul}{n}{
+      <-> ssub * NotoSerif-TLF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ul}{it}{
+      <-> ssub * NotoSerif-TLF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{sl}{
+      <-> ssub * NotoSerif-TLF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{n}{
+      <-> ssub * NotoSerif-TLF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{eb}{it}{
+      <-> ssub * NotoSerif-TLF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{sl}{
+      <-> ssub * NotoSerif-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{n}{
+      <-> ssub * NotoSerif-TLF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{sb}{it}{
+      <-> ssub * NotoSerif-TLF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ub}{sl}{
+      <-> ssub * NotoSerif-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ub}{n}{
+      <-> ssub * NotoSerif-TLF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{ub}{it}{
+      <-> ssub * NotoSerif-TLF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{sl}{
+      <-> ssub * NotoSerif-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{n}{
+      <-> ssub * NotoSerif-TLF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{l}{it}{
+      <-> ssub * NotoSerif-TLF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{sl}{
+      <-> ssub * NotoSerif-TLF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{n}{
+      <-> ssub * NotoSerif-TLF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{b}{it}{
+      <-> ssub * NotoSerif-TLF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{sl}{
+      <-> ssub * NotoSerif-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{n}{
+      <-> ssub * NotoSerif-TLF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TLF}{el}{it}{
+      <-> ssub * NotoSerif-TLF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSerif-TLF}{bx}{n}{
       <-> ssub * NotoSerif-TLF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSerif-TLF}{bx}{sl}{
+      <-> ssub * NotoSerif-TLF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSerif-TLF}{bx}{it}{
       <-> ssub * NotoSerif-TLF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TOsF.fd b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TOsF.fd
index 417abf50ae3..3e70deb1bb7 100644
--- a/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TOsF.fd
+++ b/Master/texmf-dist/tex/latex/noto/TS1NotoSerif-TOsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2019/01/11
+%% Generated by autoinst on 2019/04/05
 %%
 \ProvidesFile{TS1NotoSerif-TOsF.fd}
-    [2019/01/11 (autoinst)  Font definitions for TS1/NotoSerif-TOsF.]
+    [2019/04/05 (autoinst)  Font definitions for TS1/NotoSerif-TOsF.]
 
 \expandafter\ifx\csname NotoSerif@scale\endcsname\relax
     \let\NotoSerif@@scale\@empty
@@ -11,122 +11,272 @@
 
 \DeclareFontFamily{TS1}{NotoSerif-TOsF}{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ts1
+
+%   ----  regular  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{regular}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{regular}{it}{
+      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{sl}{
-      <-> ssub * NotoSerif-TOsF/eb/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{regular}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ts1
+
+%   ----  thin  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{thin}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{thin}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{sl}{
-      <-> ssub * NotoSerif-TOsF/sb/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{thin}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{mb}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ts1
+
+%   ----  semibold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{semibold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{mb}{it}{
-      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{semibold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-SemiBoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{mb}{sl}{
-      <-> ssub * NotoSerif-TOsF/mb/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{semibold}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Regular-tosf-ts1
+
+%   ----  bold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{bold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{it}{
-      <-> \NotoSerif@@scale NotoSerif-Italic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{bold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{sl}{
-      <-> ssub * NotoSerif-TOsF/m/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{bold}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{n}{
+
+%   ----  light  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{light}{n}{
       <-> \NotoSerif@@scale NotoSerif-Light-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{light}{it}{
       <-> \NotoSerif@@scale NotoSerif-LightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{sl}{
-      <-> ssub * NotoSerif-TOsF/l/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{light}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+
+%   ----  extrabold  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extrabold}{n}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBold-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{k}{n}{
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extrabold}{it}{
+      <-> \NotoSerif@@scale NotoSerif-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extrabold}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   ----  black  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{black}{n}{
       <-> \NotoSerif@@scale NotoSerif-Black-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{k}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{black}{it}{
       <-> \NotoSerif@@scale NotoSerif-BlackItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{k}{sl}{
-      <-> ssub * NotoSerif-TOsF/k/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{black}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Bold-tosf-ts1
+
+%   ----  medium  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{medium}{n}{
+      <-> \NotoSerif@@scale NotoSerif-Medium-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{it}{
-      <-> \NotoSerif@@scale NotoSerif-BoldItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{medium}{it}{
+      <-> \NotoSerif@@scale NotoSerif-MediumItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{medium}{sl}{
+      <-> ssub * NotoSerif-TOsF/medium/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{n}{
+
+%   ----  extralight  ----
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extralight}{n}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLight-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{it}{
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extralight}{it}{
       <-> \NotoSerif@@scale NotoSerif-ExtraLightItalic-tosf-ts1
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{sl}{
-      <-> ssub * NotoSerif-TOsF/el/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{extralight}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{i}{n}{
-      <-> \NotoSerif@@scale NotoSerif-Thin-tosf-ts1
+%
+%   ====  Extra 'ssub' rules to map the standard NFSS codes to our fancy names  ====
+%
+
+%   m --> regular
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{sl}{
+      <-> ssub * NotoSerif-TOsF/regular/sl
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{i}{it}{
-      <-> \NotoSerif@@scale NotoSerif-ThinItalic-tosf-ts1
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{n}{
+      <-> ssub * NotoSerif-TOsF/regular/n
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{i}{sl}{
-      <-> ssub * NotoSerif-TOsF/i/it
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{m}{it}{
+      <-> ssub * NotoSerif-TOsF/regular/it
 }{}
 
-\DeclareFontShape{TS1}{NotoSerif-TOsF}{bx}{sl}{
-      <-> ssub * NotoSerif-TOsF/b/sl
+
+%   ul --> thin
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ul}{sl}{
+      <-> ssub * NotoSerif-TOsF/thin/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ul}{n}{
+      <-> ssub * NotoSerif-TOsF/thin/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ul}{it}{
+      <-> ssub * NotoSerif-TOsF/thin/it
+}{}
+
+
+%   eb --> extrabold
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{sl}{
+      <-> ssub * NotoSerif-TOsF/extrabold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{n}{
+      <-> ssub * NotoSerif-TOsF/extrabold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{eb}{it}{
+      <-> ssub * NotoSerif-TOsF/extrabold/it
+}{}
+
+
+%   sb --> semibold
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{sl}{
+      <-> ssub * NotoSerif-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{n}{
+      <-> ssub * NotoSerif-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{sb}{it}{
+      <-> ssub * NotoSerif-TOsF/semibold/it
+}{}
+
+
+%   ub --> black
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ub}{sl}{
+      <-> ssub * NotoSerif-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ub}{n}{
+      <-> ssub * NotoSerif-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{ub}{it}{
+      <-> ssub * NotoSerif-TOsF/black/it
+}{}
+
+
+%   l --> light
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{sl}{
+      <-> ssub * NotoSerif-TOsF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{n}{
+      <-> ssub * NotoSerif-TOsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{l}{it}{
+      <-> ssub * NotoSerif-TOsF/light/it
+}{}
+
+
+%   b --> bold
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{sl}{
+      <-> ssub * NotoSerif-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{n}{
+      <-> ssub * NotoSerif-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{b}{it}{
+      <-> ssub * NotoSerif-TOsF/bold/it
+}{}
+
+
+%   el --> extralight
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{sl}{
+      <-> ssub * NotoSerif-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{n}{
+      <-> ssub * NotoSerif-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{el}{it}{
+      <-> ssub * NotoSerif-TOsF/extralight/it
 }{}
 
 \DeclareFontShape{TS1}{NotoSerif-TOsF}{bx}{n}{
       <-> ssub * NotoSerif-TOsF/b/n
 }{}
 
+\DeclareFontShape{TS1}{NotoSerif-TOsF}{bx}{sl}{
+      <-> ssub * NotoSerif-TOsF/b/sl
+}{}
+
 \DeclareFontShape{TS1}{NotoSerif-TOsF}{bx}{it}{
       <-> ssub * NotoSerif-TOsF/b/it
 }{}
diff --git a/Master/texmf-dist/tex/latex/noto/noto-mono.sty b/Master/texmf-dist/tex/latex/noto/noto-mono.sty
index c93476020be..5629eb20d57 100644
--- a/Master/texmf-dist/tex/latex/noto/noto-mono.sty
+++ b/Master/texmf-dist/tex/latex/noto/noto-mono.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{noto-mono}
-    [2019/01/11 (Bob Tennent)  Supports NotoMono fonts for all LaTeX engines.]
+    [2019/04/22 (Bob Tennent)  Supports NotoMono fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -43,8 +43,8 @@
 
 \ifnotomono@otf
 \else % type1
-  \def\bfseries@tt{b}
-  \def\mdseries@tt{m}
+  \def\bfseries@tt{bold}
+  \def\mdseries@tt{regular}
 \fi
 
 \ifnotomono@otf
@@ -84,6 +84,7 @@
   \def\ttdefault{\notomonofamily} 
 \fi
 
+\newcommand*\notomonolgr{\fontencoding{LGR}\fontfamily{NotoMono-TLF}\selectfont}
 
 \ifnotomono@otf
   % turn off defaults in case other fonts are selected:
diff --git a/Master/texmf-dist/tex/latex/noto/noto-sans.sty b/Master/texmf-dist/tex/latex/noto/noto-sans.sty
index 26c8949afff..baaa9dce745 100644
--- a/Master/texmf-dist/tex/latex/noto/noto-sans.sty
+++ b/Master/texmf-dist/tex/latex/noto/noto-sans.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{noto-sans}
-    [2019/03/15 (Bob Tennent)  Supports NotoSans fonts for all LaTeX engines.]
+    [2019/04/22 (Bob Tennent)  Supports NotoSans fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -69,15 +69,15 @@
   \ifnotosans@medium\def\notosans@regstyle{Medium}\fi
 
 \else % type1
-  \def\bfseries@sf{b}
-  \ifnotosans@semibold\def\bfseries@sf{sb}\fi
-  \ifnotosans@extrabold\def\bfseries@sf{eb}\fi
-  \ifnotosans@black\def\bfseries@sf{k}\fi
-  \def\mdseries@sf{m}
-  \ifnotosans@thin\def\mdseries@sf{t}\fi
-  \ifnotosans@extralight\def\mdseries@sf{el}\fi
-  \ifnotosans@light\def\mdseries@sf{l}\fi
-  \ifnotosans@medium\def\mdseries@sf{mb}\fi
+  \def\bfseries@sf{bold}
+  \ifnotosans@semibold\def\bfseries@sf{semibold}\fi
+  \ifnotosans@extrabold\def\bfseries@sf{extrabold}\fi
+  \ifnotosans@black\def\bfseries@sf{black}\fi
+  \def\mdseries@sf{regular}
+  \ifnotosans@thin\def\mdseries@sf{thin}\fi
+  \ifnotosans@extralight\def\mdseries@sf{extralight}\fi
+  \ifnotosans@light\def\mdseries@sf{light}\fi
+  \ifnotosans@medium\def\mdseries@sf{medium}\fi
   
 \fi
 
@@ -141,6 +141,7 @@
   \ifnotosans@sfdefault\edef\familydefault{\sfdefault}\fi
 \fi
 
+\newcommand*\notosanslgr{\fontencoding{LGR}\fontfamily{NotoSans-TLF}\selectfont}
 
 \ifnotosans@otf
   % turn off defaults in case other fonts are selected:
diff --git a/Master/texmf-dist/tex/latex/noto/noto-serif.sty b/Master/texmf-dist/tex/latex/noto/noto-serif.sty
index 4858ac81713..b0bc533d990 100644
--- a/Master/texmf-dist/tex/latex/noto/noto-serif.sty
+++ b/Master/texmf-dist/tex/latex/noto/noto-serif.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{noto-serif}
-    [2019/03/15 (Bob Tennent)  Supports NotoSerif fonts for all LaTeX engines.]
+    [2019/04/22 (Bob Tennent)  Supports NotoSerif fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -67,15 +67,15 @@
   \ifnotoserif@medium\def\notoserif@regstyle{Medium}\fi
 
 \else % type1
-  \def\bfseries@rm{b}
-  \ifnotoserif@semibold\def\bfseries@rm{sb}\fi
-  \ifnotoserif@extrabold\def\bfseries@rm{eb}\fi
-  \ifnotoserif@black\def\bfseries@rm{k}\fi
-  \def\mdseries@rm{m}
-  \ifnotoserif@thin\def\mdseries@rm{t}\fi
-  \ifnotoserif@extralight\def\mdseries@rm{el}\fi
-  \ifnotoserif@light\def\mdseries@sf{l}\def\mdseries@rm{l}\fi
-  \ifnotoserif@medium\def\mdseries@rm{mb}\fi
+  \def\bfseries@rm{bold}
+  \ifnotoserif@semibold\def\bfseries@rm{semibold}\fi
+  \ifnotoserif@extrabold\def\bfseries@rm{extrabold}\fi
+  \ifnotoserif@black\def\bfseries@rm{black}\fi
+  \def\mdseries@rm{regular}
+  \ifnotoserif@thin\def\mdseries@rm{thin}\fi
+  \ifnotoserif@extralight\def\mdseries@rm{extralight}\fi
+  \ifnotoserif@light\def\mdseries@rm{light}\fi
+  \ifnotoserif@medium\def\mdseries@rm{medium}\fi
   \def\seriesdefault{\mdseries@rm}
   
 \fi
@@ -137,6 +137,7 @@
   \def\rmdefault{\notoseriffamily} 
 \fi
 
+\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-TLF}\selectfont}
 
 \ifnotoserif@otf
   % turn off defaults in case other fonts are selected:
diff --git a/Master/texmf-dist/tex/latex/noto/noto.sty b/Master/texmf-dist/tex/latex/noto/noto.sty
index 84308b5566a..eeec0fb295e 100644
--- a/Master/texmf-dist/tex/latex/noto/noto.sty
+++ b/Master/texmf-dist/tex/latex/noto/noto.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{noto}
-    [2019/03/15 (Bob Tennent)  Supports Noto fonts for all LaTeX engines.]
+    [2019/04/22 (Bob Tennent)  Supports Noto fonts for all LaTeX engines.]
 
 \RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
 
@@ -78,39 +78,39 @@
   \ifnoto@medium\def\noto@regstyle{Medium}\fi
 
 \else % type1
-  \ifnoto@tt\def\bfseries@tt{b}\fi
-  \ifnoto@sf\def\bfseries@sf{b}\fi
-  \ifnoto@rm\def\bfseries@rm{b}\fi
+  \ifnoto@tt\def\bfseries@tt{bold}\fi
+  \ifnoto@sf\def\bfseries@sf{bold}\fi
+  \ifnoto@rm\def\bfseries@rm{bold}\fi
   \ifnoto@semibold
-    \ifnoto@sf\def\bfseries@sf{sb}\fi
-    \ifnoto@rm\def\bfseries@rm{sb}\fi
+    \ifnoto@sf\def\bfseries@sf{semibold}\fi
+    \ifnoto@rm\def\bfseries@rm{semibold}\fi
   \fi
   \ifnoto@extrabold
-    \ifnoto@sf\def\bfseries@sf{eb}\fi
-    \ifnoto@rm\def\bfseries@rm{eb}\fi
+    \ifnoto@sf\def\bfseries@sf{extrabold}\fi
+    \ifnoto@rm\def\bfseries@rm{extrabold}\fi
   \fi
   \ifnoto@black
-    \ifnoto@sf\def\bfseries@sf{k}\fi
-    \ifnoto@rm\def\bfseries@rm{k}\fi
+    \ifnoto@sf\def\bfseries@sf{black}\fi
+    \ifnoto@rm\def\bfseries@rm{black}\fi
   \fi
-  \ifnoto@tt\def\mdseries@tt{m}\fi
-  \ifnoto@sf\def\mdseries@sf{m}\fi
-  \ifnoto@rm\def\mdseries@rm{m}\fi
+  \ifnoto@tt\def\mdseries@tt{regular}\fi
+  \ifnoto@sf\def\mdseries@sf{regular}\fi
+  \ifnoto@rm\def\mdseries@rm{regular}\fi
   \ifnoto@thin
-    \ifnoto@sf\def\mdseries@sf{t}\fi
-    \ifnoto@rm\def\mdseries@rm{t}\fi
+    \ifnoto@sf\def\mdseries@sf{thin}\fi
+    \ifnoto@rm\def\mdseries@rm{thin}\fi
   \fi
   \ifnoto@extralight
-    \ifnoto@sf\def\mdseries@sf{el}\fi
-    \ifnoto@rm\def\mdseries@rm{el}\fi
+    \ifnoto@sf\def\mdseries@sf{extralight}\fi
+    \ifnoto@rm\def\mdseries@rm{extralight}\fi
   \fi
   \ifnoto@light
-    \ifnoto@sf\def\mdseries@sf{l}\fi
-    \ifnoto@rm\def\mdseries@rm{l}\fi
+    \ifnoto@sf\def\mdseries@sf{light}\fi
+    \ifnoto@rm\def\mdseries@rm{light}\fi
   \fi
   \ifnoto@medium
-    \ifnoto@sf\def\mdseries@sf{mb}\fi
-    \ifnoto@rm\def\mdseries@rm{mb}\fi
+    \ifnoto@sf\def\mdseries@sf{medium}\fi
+    \ifnoto@rm\def\mdseries@rm{medium}\fi
   \fi
   \def\seriesdefault{\mdseries@rm}
   
@@ -222,6 +222,10 @@
   \ifnoto@sfdefault\edef\familydefault{\sfdefault}\fi
 \fi
 
+\newcommand*\notoseriflgr{\fontencoding{LGR}\fontfamily{NotoSerif-TLF}\selectfont}
+\newcommand*\notosanslgr{\fontencoding{LGR}\fontfamily{NotoSans-TLF}\selectfont}
+\newcommand*\notomonolgr{\fontencoding{LGR}\fontfamily{NotoMono-TLF}\selectfont}
+
 
 \ifnoto@otf
   % turn off defaults in case other fonts are selected: