diff --git a/ptbletter/ptbletter-new-engines.clo b/ptbletter/ptbletter-new-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..1787d5298a44e632dee108570ae1b434fad10125
--- /dev/null
+++ b/ptbletter/ptbletter-new-engines.clo
@@ -0,0 +1,37 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{ptbletter-new-engines.clo}%
+  [2017/12/04 v0.1a PTB-Brief -- new engines (RN)]
+  
+\RequirePackage{fontspec}
+\RequirePackage{unicode-math}
+\AtBeginDocument{% ???
+  \setromanfont{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]
+}
+\RequirePackage[TT={Scale=0.85}]{dejavu-otf}
+\iffalse
+\setmonofont{AnonymousPro-Regular}[%
+  Extension = .ttf,
+  BoldFont = AnonymousPro-Bold,
+  ItalicFont = AnonymousPro-Italic,
+  BoldItalicFont = AnonymousPro-BoldItalic,
+  Scale     = MatchLowercase
+]
+\fi
+\RequirePackage{newunicodechar}
+\newunicodechar{^^^^20ac}{\officialeuro}
+
+\endinput
diff --git a/ptbletter/ptbletter-old-engines.clo b/ptbletter/ptbletter-old-engines.clo
new file mode 100644
index 0000000000000000000000000000000000000000..d3af9ef2ddc691d67929a8af24a7bbae1c0596a5
--- /dev/null
+++ b/ptbletter/ptbletter-old-engines.clo
@@ -0,0 +1,15 @@
+% Rolf Niepraschk, Rolf.Niepraschk@ptb.de
+
+\ProvidesFile{ptbletter-old-engines.clo}%
+  [2017/12/04 v0.1a PTB-Brief -- old engines (RN)]
+
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\usepackage[scaled=0.85]{DejaVuSansMono}
+\RequirePackage{textcomp}
+\RequirePackage{mathpazo}
+\RequirePackage{tgpagella}
+\RequirePackage{tgheros}
+%\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
+
+\endinput
diff --git a/ptbletter/ptbletter.cls b/ptbletter/ptbletter.cls
index 074cc7f87facfb12c1eb2803962683bc9d008dcd..0e0012d6c7efb1c1ba15ff05cabdd46a00d0ab89 100644
--- a/ptbletter/ptbletter.cls
+++ b/ptbletter/ptbletter.cls
@@ -70,61 +70,32 @@
 \newif\ifXeOrLua \XeOrLuafalse
 \ifxetex\XeOrLuatrue\else\ifluatex\XeOrLuatrue\fi\fi
 
-% TODO: Mathematik?
+\RequirePackage[right]{eurosym}
+
 \ifXeOrLua% XeLaTeX oder luaLaTeX
-  \RequirePackage{fontspec}
-  \RequirePackage{unicode-math}
-  \AtBeginDocument{% ???
-    \setromanfont{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]
-  }
-  \RequirePackage[TT={Scale=0.85}]{dejavu-otf}
-  \iffalse
-  \setmonofont{AnonymousPro-Regular}[%
-    Extension = .ttf,
-    BoldFont = AnonymousPro-Bold,
-    ItalicFont = AnonymousPro-Italic,
-    BoldItalicFont = AnonymousPro-BoldItalic,
-    Scale     = MatchLowercase
-  ]
-  \fi
+  \input{ptbletter-new-engines.clo}
 \else
-  \RequirePackage[utf8]{inputenc}
-  \RequirePackage[T1]{fontenc}
-  \usepackage[scaled=0.85]{DejaVuSansMono}
-  \RequirePackage{textcomp}
-  \RequirePackage{mathpazo}
-  \RequirePackage{tgpagella}
-  \RequirePackage{tgheros}
-  %\RequirePackage[ttdefault=true,scale=1.034]{AnonymousPro}
+  \input{ptbletter-old-engines.clo}
 \fi
+
 \def\tiny{\@setfontsize\tiny{7}{8.17}}
+
 \ifptb@serif 
   \renewcommand*\familydefault{\rmdefault}
 \else
   \renewcommand*\familydefault{\sfdefault}
 \fi
 
+\let\texteuro=\officialeuro
+
 
 %\RequirePackage{etoolbox}
 %\preto\@classoptionslist{ngerman,}
 % Ohne Sprachangabe "deutsch" verwenden. Bessere Lösung?
 
 \RequirePackage[\ptb@lang]{babel}
-\RequirePackage{iflang}
-\AtBeginDocument{%
+\RequirePackage{etoolbox,iflang}
+\AtEndPreamble{%
   \IfLanguageName{ngerman}{
     \RequirePackage[babel=once,german=guillemets]{csquotes}
   }{%