diff --git a/ptbposter/ptbposter-2020.clo b/ptbposter/ptbposter-2020.clo
index c6703c9eb4eeac272057f7f72a5711c3b86af3f3..6f9c13e84974f93fbc86833d7c796e1ff15e9224 100644
--- a/ptbposter/ptbposter-2020.clo
+++ b/ptbposter/ptbposter-2020.clo
@@ -7,13 +7,14 @@
 
 \setlength\PTB@default@fontsize@base{0.0118336635635\PTB@scale@base}% 10pt bei A4
 \setlength\PTB@default@author@fontsize{0.0157550946737\PTB@scale@base}%   53.3pt bei A0
-\setlength\PTB@default@title@fontsize@base{.03147352426532526036\PTB@scale@base}%  106.6pt bei A0 ???
+\setlength\PTB@default@title@fontsize@base{.0282849711986\PTB@scale@base}% 95.7pt bei A0
 \setlength\PTB@default@foot@fontsize{0.00567538119577\PTB@scale@base}%  19.2pt bei A0   
 
 \ifPTB@XeOrLua
   \setfontfamily\PTBdesignFont{UniversNextPro-Light}[%
     BoldFont=*,
     ItalicFont=*Italic,
+    Scale=1.01,
     Extension=.ttf]
   \setsansfont{texgyreheros}[
     Ligatures=TeX,
@@ -27,57 +28,35 @@
 \fi
 
 \AtEndPreamble{%
-  \ifx\@author\@empty
-    \setlength\PTB@topmargin{0.152\PTB@scale@base}%
-  \else
-    \setlength\PTB@topmargin{0.180824222418\PTB@scale@base}%
-  \fi
-  \ifPTBlandscape
+  \setlength\PTB@topmargin{0.193953\PTB@scale@base}%
+  \ifPTBlandscape  % ???
     \setlength\PTB@framewidth{0.950378471315\PTB@scale@base}%  3215pt (1130mm) bei A0 
-    \ifx\@author\@empty
-      \setlength\PTB@frameheight{0.490824222418\PTB@scale@base}% 1660pt  (584mm) bei A0
-    \else
-      \setlength\PTB@frameheight{0.462\PTB@scale@base}% 1563pt  (549mm) bei A0 
-    \fi
+    \setlength\PTB@frameheight{0.462\PTB@scale@base}% 1563pt  (549mm) bei A0 
   \else
     \setlength\PTB@framewidth{0.656013458076\PTB@scale@base}%  2219pt  (780mm) bei A0
-    \ifx\@author\@empty
-      \setlength\PTB@frameheight{0.769\PTB@scale@base}% 2602pt  (914mm) bei A0
-    \else
-      \setlength\PTB@frameheight{0.740117747573\PTB@scale@base}% 2504pt  (880mm) bei A0
-    \fi
+    \setlength\PTB@frameheight{0.740117747573\PTB@scale@base}% 2504pt  (880mm) bei A0
   \fi
 }
 
 \AddToShipoutPictureBG*{% Kopf (relativ zur oberen Blattkante)
-  \PTB@tempdima=-0.077\PTB@scale@base
-  \put(\PTB@leftmargin,\PTB@tempdima){%
-    \parbox[b]{\PTB@framewidth}{% TODO: vereinfachen?
-      \parbox[b]{.401\PTB@scale@base}{%
-        \textcolor{PTBcolor}{% TODO: Tikz-Grafik erzeugen (autom.?) und verwenden
-          \includegraphics[height=.055\PTB@scale@base]{ptbposter-logo-A.mps}
-        }%    1,58365758755
-        \ifPTB@logo@long@
-        \hfill
-        \raisebox{.0025\PTB@scale@base}{% 
-          %\includegraphics[width=.612\linewidth]{ptbposter-logo-B.mps}%
-          \resizebox{.61\linewidth}{!}{%
-            \hspace{-.2ex}% 
-            \begin{varwidth}[b]{\linewidth}%
-              \PTBdesignFont\bfseries
-              Physikalisch-Technische Bundesanstalt\\
-              Braunschweig und Berlin\\
-              \mdseries
-              Nationales Metrologieinstitut
-            \end{varwidth}%
-          }%
-        }%
-        \fi
-      }%
+  \PTB@tempdima=-0.07\PTB@scale@base
+  \put(\PTB@leftmargin,-0.07\PTB@scale@base){%
+    \textcolor{PTBcolor}{\includegraphics[height=.04545\PTB@scale@base]%
+          {ptbposter-logo-A.mps}}
+  }
+  \put(\PTB@leftmargin,-0.085\PTB@scale@base){%
+    \parbox[t]{\PTB@framewidth}{%
+      \PTBdesignFont\normalsize
+      \begin{varwidth}[t]{.32\linewidth}
+        Physikalisch-Technische Bundesanstalt\\
+        Nationales Metrologieinstitut
+      \end{varwidth}
       \hfill
-      \ifx\PTB@logo\@empty\else
-        \includegraphics[height=.055\PTB@scale@base]{\PTB@logo}%
-      \fi
+      \begin{varwidth}[t]{.6\linewidth}
+        \begin{hyphenrules}{nohyphenation}
+          \def\and{, }\@author % hier wird \@thanks gefüllt
+        \end{hyphenrules}
+      \end{varwidth}  
     }
   }%
   \def\PTB@tempa{\parbox[c]{\PTB@framewidth}{% Komplette Titeldefinition
@@ -97,21 +76,18 @@
     \fi
   \repeat
   \endgroup
-  \PTB@tempdima=-0.127\PTB@scale@base
-  \put(\PTB@leftmargin,\PTB@tempdima){\PTB@tempa}% Title
+  \put(\PTB@leftmargin,-0.158\PTB@scale@base){%
+    \begin{hyphenrules}{nohyphenation}
+      \PTB@tempa% Title
+    \end{hyphenrules}
+  }%
   \PTB@tempdima=-0.172\PTB@scale@base
-  \def\and{, }%
-  \put(\PTB@leftmargin,\PTB@tempdima){\parbox[b]{\PTB@framewidth}{% Autoren
-    \PTB@authors@justification\PTBdesignFont\authorFontSize\@author}}%
-  % hier wird \@thanks gefüllt
-  \linethickness{\PTB@framethickness}\color{PTBcolor}%\color{PTBcolor}%
-  \PTB@tempdima=-0.0883095039717\PTB@scale@base
-  \put(\PTB@leftmargin,\PTB@tempdima){%
-    \line(1,0){\dimexpr\paperwidth-2\PTB@leftmargin}}%
+  %\linethickness{\PTB@framethickness}\color{PTBcolor}%\color{PTBcolor}%
   % blauer Rahmen
-  \put(\PTB@leftmargin,\dimexpr-\textheight-2\PTB@textvsep-\PTB@topmargin)%
-    {\framebox(\dimexpr\textwidth+2\PTB@texthsep,%
-     \dimexpr\textheight+2\PTB@textvsep){\backgroundContent}}%
+  \put(\PTB@leftmargin,\dimexpr-\textheight-2\PTB@textvsep-\PTB@topmargin){%
+    \linethickness{\PTB@framethickness}\color{PTBcolor}%
+    \framebox(\dimexpr\textwidth+2\PTB@texthsep,%
+      \dimexpr\textheight+2\PTB@textvsep){\backgroundContent}}%
 }
 
 \AddToShipoutPictureFG*{% Fuß (relativ zur unteren Kante des Textbereichs)
diff --git a/ptbposter/ptbposter-doc-1.pdf b/ptbposter/ptbposter-doc-1.pdf
index e1cbfa33470937540842f3d786f6be4f66da5d7b..899e71e03ae8476dda9d355f341b0e5a15e138b1 100644
Binary files a/ptbposter/ptbposter-doc-1.pdf and b/ptbposter/ptbposter-doc-1.pdf differ
diff --git a/ptbposter/ptbposter-doc-1.tex b/ptbposter/ptbposter-doc-1.tex
index 346aff5b120a658e3c6019d90a717fc8ad1cd63b..cc93025cacd677d23aa56045ef872f78e4c48306 100644
--- a/ptbposter/ptbposter-doc-1.tex
+++ b/ptbposter/ptbposter-doc-1.tex
@@ -1,6 +1,8 @@
 
 \documentclass[
 %,english
+%,a4paper
+,layout2020
 ]{ptbposter}
 
 \phone{+49-30-3481-7316}
@@ -22,7 +24,7 @@
 
 %%\scaleFontSizes{1.05}%     Werte nahe an "1" wählen!
 
-\title{Die \LaTeX"=Dokumentenklasse "`ptbposter"'}
+\title{Die \LaTeX-Dokumentenklasse "`ptbposter"'}
 
 \begin{document}
 
@@ -56,8 +58,7 @@ zu entnehmen.
   \item \textbf{raggedTitle}: Den Titel mit "`Flatterrand"' setzen.
   \item \textbf{centerAuthors}: Die Autoren zentriert setzen.
   \item \textbf{shortPTBlogo}: verkürztes PTB-Logo  (Text entfällt)
-  \item \textbf{version-\textit{X}}: Wählt ältere Versionen der Posterklasse 
-  (z.\,B.\ "`version-1"') aus, um das Layout älterer Dokumente zu bewahren.
+  \item \textbf{layout2018, layout2020}: Layoutvarianten
 \end{itemize}
 
 Ohne Angabe einer Sprachoption werden die Trennregeln für "`ngerman"' (neue
diff --git a/ptbposter/ptbposter-doc-2.pdf b/ptbposter/ptbposter-doc-2.pdf
index 4a1a2d56d4a0459219fdf7f7d20817b78ad23375..ba33ee4183132694ab48af8ad040f8589b16f631 100644
Binary files a/ptbposter/ptbposter-doc-2.pdf and b/ptbposter/ptbposter-doc-2.pdf differ
diff --git a/ptbposter/ptbposter-doc-2.tex b/ptbposter/ptbposter-doc-2.tex
index e9a9263e2b844de10130b05ce5d9702d1b3b9ad1..d8da2f1024d11a127203028799fee3952a364036 100644
--- a/ptbposter/ptbposter-doc-2.tex
+++ b/ptbposter/ptbposter-doc-2.tex
@@ -1,6 +1,10 @@
 
-\documentclass[landscape]{ptbposter}
-%\documentclass[english]{ptbposter}
+\documentclass[
+,landscape
+%,english
+%,a4paper
+,layout2018
+]{ptbposter}
 
 \phone{+49-30-3481-7316}
 \fax{+49-30-3481-7503}
diff --git a/ptbposter/ptbposter.cls b/ptbposter/ptbposter.cls
index 9f68b7047aaaeadbbe848681e733d8a8276b3618..75c3339dec0b00aaebc43a0dac23bd5500d6c5b5 100644
--- a/ptbposter/ptbposter.cls
+++ b/ptbposter/ptbposter.cls
@@ -106,7 +106,7 @@
   \def\PTB@layout{1}%
 }
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{babel}}
-\ExecuteOptions{serif,layout2020}
+\ExecuteOptions{serif,raggedTitle,layout2020}
 \ProcessOptions\relax
 
 \RequirePackage{hyphsubst}% Trennregeln austauschen
diff --git a/ptbposter/tcb-example2.pdf b/ptbposter/tcb-example2.pdf
index f97ae90806603a2d8b5bdea29096953eef683276..6457b13073d72db17a1b4cee2ba36844ed8351f1 100644
Binary files a/ptbposter/tcb-example2.pdf and b/ptbposter/tcb-example2.pdf differ