diff --git a/ptbposter/ptbposter-new-engines.clo b/ptbposter/ptbposter-new-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..22efbdfa29c6e8d454d00d0e66ae8c488c32d385
--- /dev/null
+++ b/ptbposter/ptbposter-new-engines.clo
@@ -0,0 +1,43 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{ptbposter-new-engines.clo}%
+  [2019/05/09 v0.1a `PTB-Poster' new engines (RN/PTB)]
+  
+\RequirePackage[no-math]{fontspec}
+\RequirePackage{unicode-math}
+\setmainfont{texgyrepagella}[
+  Ligatures=TeX,
+  Extension=.otf,
+  UprightFont=*-regular,
+  BoldFont=*-bold,
+  ItalicFont=*-italic,
+  BoldItalicFont=*-bolditalic]
+\setsansfont{texgyreheros}[
+  Ligatures=TeX,
+  Extension=.otf,
+  UprightFont=*-regular,
+  BoldFont=*-bold,
+  ItalicFont=*-italic,
+  BoldItalicFont=*-bolditalic]
+\setmonofont{AnonymousPro-Regular}[%
+  Extension = .ttf,
+  BoldFont = AnonymousPro-Bold,
+  ItalicFont = AnonymousPro-Italic,
+  BoldItalicFont = AnonymousPro-BoldItalic,
+  Scale     = MatchLowercase
+]
+\let\LogoFont=\sffamily
+\ifPTB@serif
+  \setmathfont{texgyrepagella-math.otf}[math-style=ISO,bold-style=ISO]
+\else
+  \renewcommand*\familydefault{\sfdefault} 
+  \RequirePackage[usefilenames,weight=Regular]{firamath-otf}
+  \RequirePackage[italic]{mathastext}  
+\fi
+\RequirePackage{newunicodechar}
+\newunicodechar{^^^^202f}{\,}% 'NARROW NO-BREAK SPACE' (\u202F, 8239)
+\newunicodechar{^^^^2009}{\,\hspace{0pt}}% 'THIN SPACE'
+\newunicodechar{^^^^00ad}{\-}% 'SOFT HYPHEN'    
+  
+\endinput
+  
diff --git a/ptbposter/ptbposter-old-engines.clo b/ptbposter/ptbposter-old-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..8101b636b1366106501389d5244f0fb4efdddcf2
--- /dev/null
+++ b/ptbposter/ptbposter-old-engines.clo
@@ -0,0 +1,20 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{ptbposter-old-engines.clo}%
+  [2019/05/09 v0.1a `PTB-Poster' old engines (RN/PTB)]
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{textcomp}
+\RequirePackage{tgpagella}
+\RequirePackage{tgheros}
+\let\LogoFont=\sffamily
+\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
+\ifPTB@serif
+  \RequirePackage{qpxmath}
+\else
+  \renewcommand*\familydefault{\sfdefault} 
+  \RequirePackage{sfmath}
+\fi
+
+\endinput
diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index 0cafc8bbf679892a5138dca77300ae281914ef33..1d27b1fcd16d51bfcafec75c608e63422a864857 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -90,54 +90,9 @@
 \newcommand*\LogoFont{}
 
 \ifPTB@XeOrLua
-  \RequirePackage[no-math]{fontspec}
-  \RequirePackage{unicode-math}
-  \setromanfont[Ligatures=TeX]{TeX Gyre Pagella}
-  \setsansfont[Ligatures=TeX]{TeX Gyre Heros}
-  \let\LogoFont=\sffamily
-  %\setmonofont[Scale=0.88]{DejaVu Sans Mono}
-  %%%\setmonofont[Scale=1.05]{Latin Modern Mono}
-  \setmonofont{AnonymousPro-Regular}[%
-    Extension = .ttf,
-    BoldFont = AnonymousPro-Bold,
-    ItalicFont = AnonymousPro-Italic,
-    BoldItalicFont = AnonymousPro-BoldItalic,
-    Scale     = MatchLowercase
-  ]
-  %%%\setmonofont[Scale=MatchLowercase]{Anonymous Pro}%
-  %%% Fehler "This font using the "seac" command for accented characters"
-  %%% Behoben in "XeTeX 3.14159265-2.6-0.99992 "!
-  \ifPTB@serif
-    \setmathfont[math-style=ISO,bold-style=ISO]{TeXGyrePagellaMath-Regular}
-  \else
-    \setmathfont[math-style=ISO,bold-style=ISO]{Asana Math}
-    \setmathfont[range=\mathup,Scale=MatchLowercase]{TeXGyreHeros-Regular}
-    \setmathfont[range=\mathit,Scale=MatchLowercase]{TeXGyreHeros-Italic}
-    \setmathfont[range=\mathbfup,Scale=MatchLowercase]{TeXGyreHeros-Bold}
-    \setmathfont[range=\mathbfit,Scale=MatchLowercase]{TeXGyreHeros-BoldItalic}
-    \setmathfont[range=\mathsfup,Scale=MatchLowercase]{TeXGyreHeros-Regular}
-    \setmathfont[range=\mathsfit,Scale=MatchLowercase]{TeXGyreHeros-Italic}
-    \setmathfont[range=\mathbfsfup,Scale=MatchLowercase]{TeXGyreHeros-Bold}
-    \setmathfont[range=\mathbfsfit,Scale=MatchLowercase]{TeXGyreHeros-BoldItalic}
-    \setmathfont[range=\mathpunct]{TeXGyreHeros-Regular}
-  \fi
-\else
-  \RequirePackage[utf8]{inputenc}
-  \RequirePackage[T1]{fontenc}
-  \RequirePackage{textcomp}
-  \RequirePackage{tgpagella,qpxmath}
-  \RequirePackage{tgheros}
-  \let\LogoFont=\sffamily
-  %\RequirePackage[scaled=.88]{DejaVuSansMono}
-  %%%\RequirePackage[scaled=1.05]{zlmtt}% ist lmodern!
-  \RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
-  \ifPTB@serif\else\RequirePackage{sfmath}\fi
-\fi
-
-\ifPTB@serif
-  \renewcommand*\familydefault{\rmdefault}
+  \input{ptbposter-new-engines.clo}
 \else
-  \renewcommand*\familydefault{\sfdefault}
+  \input{ptbposter-old-engines.clo}
 \fi
 
 \RequirePackage[verbose]{geometry}% Papiergröße steht bereits fest (Standard: A0)