diff --git a/HsH-classes.dtx b/HsH-classes.dtx
index a06d5b807abee12bff16d00ec52036743c130d20..a5196abf58be228ab08635725e87e4d6e4e73ed6 100644
--- a/HsH-classes.dtx
+++ b/HsH-classes.dtx
@@ -16,13 +16,13 @@
 % \fi
 %
 %<*article|report|standalone>
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-11> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 %
 %<article>\newcommand{\myClassName}{HsH-article}
 %<report>\newcommand{\myClassName}{HsH-report}
 %<standalone>\newcommand{\myClassName}{HsH-standalone}
-\ProvidesClass{\myClassName}[2023/08/08 v2.0 HsH-Class based on KOMA]
+\ProvidesClass{\myClassName}[2023/08/11 v2.0 HsH-Class based on KOMA]
 
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
@@ -115,7 +115,9 @@
 % required for changing layout
 \PassOptionsToPackage{vmargin=5\baselineskip,bindingoffset=0.08\paperwidth,textwidth=0.75\paperwidth}{geometry}
 \if@todos
-  \PassOptionsToPackage{paperwidth=1.2\paperwidth,left=2cm}{geometry}
+% new paperwidth is everything without the right marging plus new stuff for marginpar
+% rightmargin = ((1-0,75<paperwidth>) - 0.08<bindingoffset>)/2 = 0.915
+  \PassOptionsToPackage{paperwidth=0.915\paperwidth+\marginparsep+\marginparwidth+0.25cm, right=\marginparsep+\marginparwidth+0.25cm}{geometry}
 \else
   \PassOptionsToPackage{nomarginpar}{geometry}
 \fi
diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 7e7513e8df6f987d39028ac5b0b6f83f251cd69d..675aae7609c7d1cac9296db04fcad66b4437dfc3 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -20,10 +20,10 @@
 %% and version 1.3 or later is part of all distributions of LaTeX version
 %% 2021/01/01 or later.
 %% 
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-11> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 \newcommand{\myClassName}{HsH-article}
-\ProvidesClass{\myClassName}[2023/08/08 v2.0 HsH-Class based on KOMA]
+\ProvidesClass{\myClassName}[2023/08/11 v2.0 HsH-Class based on KOMA]
 
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
@@ -92,7 +92,7 @@
 \if@german\RequirePackage{ziffer}\fi
 \PassOptionsToPackage{vmargin=5\baselineskip,bindingoffset=0.08\paperwidth,textwidth=0.75\paperwidth}{geometry}
 \if@todos
-  \PassOptionsToPackage{paperwidth=1.2\paperwidth,left=2cm}{geometry}
+  \PassOptionsToPackage{paperwidth=0.915\paperwidth+\marginparsep+\marginparwidth+0.25cm, right=\marginparsep+\marginparwidth+0.25cm}{geometry}
 \else
   \PassOptionsToPackage{nomarginpar}{geometry}
 \fi
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index b2c75deb847afc5e6b7d1e4d470dcfaf100d4ab2..498a9ba44be6b0e566b360b113a6a817dbc55d09 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -20,10 +20,10 @@
 %% and version 1.3 or later is part of all distributions of LaTeX version
 %% 2021/01/01 or later.
 %% 
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-11> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 \newcommand{\myClassName}{HsH-report}
-\ProvidesClass{\myClassName}[2023/08/08 v2.0 HsH-Class based on KOMA]
+\ProvidesClass{\myClassName}[2023/08/11 v2.0 HsH-Class based on KOMA]
 
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
@@ -92,7 +92,7 @@
 \if@german\RequirePackage{ziffer}\fi
 \PassOptionsToPackage{vmargin=5\baselineskip,bindingoffset=0.08\paperwidth,textwidth=0.75\paperwidth}{geometry}
 \if@todos
-  \PassOptionsToPackage{paperwidth=1.2\paperwidth,left=2cm}{geometry}
+  \PassOptionsToPackage{paperwidth=0.915\paperwidth+\marginparsep+\marginparwidth+0.25cm, right=\marginparsep+\marginparwidth+0.25cm}{geometry}
 \else
   \PassOptionsToPackage{nomarginpar}{geometry}
 \fi
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index b27db0e3e87846fd681efa49ab40a5026b5adb5c..4b2e13b6d1c6b1cee78ab23812e062f075aa4616 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -20,10 +20,10 @@
 %% and version 1.3 or later is part of all distributions of LaTeX version
 %% 2021/01/01 or later.
 %% 
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2023-08-11> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 \newcommand{\myClassName}{HsH-standalone}
-\ProvidesClass{\myClassName}[2023/08/08 v2.0 HsH-Class based on KOMA]
+\ProvidesClass{\myClassName}[2023/08/11 v2.0 HsH-Class based on KOMA]
 
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
diff --git a/src/titlepage.tex b/src/titlepage.tex
new file mode 100644
index 0000000000000000000000000000000000000000..001d5f31e3df54f0f9e7c550c933f59dd5a1fa40
--- /dev/null
+++ b/src/titlepage.tex
@@ -0,0 +1,38 @@
+% !TeX root = ..\test.tex
+
+\begin{titlepage}
+    \makeatletter
+    \begin{center}
+        \vspace*{-2cm}
+        \includegraphics[width=0.8cm,page=2]{HsH-logo-simple.pdf}
+        \vskip .75\baselineskip
+        {\Huge\bfseries{Hochschule Hannover}}
+        \vskip .5\baselineskip
+        {\large\bfseries{University of Applied Sciences and Arts}}
+        \vskip 2cm
+        {\LARGE\textbf{Fakultät I -- Elektro und Informationstechnik}}
+        \vskip \baselineskip
+        {\Large{Fachgebiet: \@titlehead}}
+        \vskip 4cm
+        {\Huge\bfseries\@subject}
+        \vskip \baselineskip
+        {\LARGE{Thema}}
+        \vskip \baselineskip
+        {\Large\bfseries\enquote{\@title}}
+    \end{center}
+    \vskip 2cm
+    \renewcommand{\arraystretch}{1.2}
+    \begin{tabular}{l l}
+        \textbf{eingereicht von:}                             \\
+        Name:                 & \@author                      \\
+        Matrikelnummer:       & \@matrikelnr                  \\
+        \\
+        \textbf{Zeitraum:}                                    \\
+        von:                  & 09.05.2022                    \\
+        bis:                  & \@date                        \\
+        \\
+        \textbf{Erstprüfer:}  & Prof. Dr.-Ing. Joachim Imiela \\
+        \textbf{Zweitprüfer:} & Prof. Dr.-Ing. Hanno Homann   \\
+    \end{tabular}
+    \enlargethispage{3\baselineskip}
+\end{titlepage}