diff --git a/hhuthesis.cls b/hhuthesis.cls
index 70df22e4e1b8db60e4b25cfac83e0281a9bd230b..dd7968aa3df0a3bef4983b1e881e59ff0c0e88f5 100644
--- a/hhuthesis.cls
+++ b/hhuthesis.cls
@@ -1,5 +1,5 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hhuthesis}[2023/10/23 HHU Thesis LaTeX document class v1.24]
+\ProvidesClass{hhuthesis}[2023/10/23 HHU Thesis LaTeX document class v1.25]
 
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} % Options fallback.
 \ProcessOptions\relax
@@ -261,12 +261,12 @@
 
 %% Format listofs.
 \AtBeginDocument{%
-  \preto\listoftables{\thispagestyle{headings}}%
-  \preto\listoffigures{\thispagestyle{headings}}%
-  \@ifpackageloaded{lstlisting}{%
-    \preto\lstlistoflistings{\thispagestyle{headings}}%
+  \appto\listoftables{\thispagestyle{headings}}%
+  \appto\listoffigures{\thispagestyle{headings}}%
+  \@ifpackageloaded{listings}{%
+    \appto\lstlistoflistings{\thispagestyle{headings}}%
   }{}%
-  \preto\listofalgorithms{\thispagestyle{headings}}%
+  \appto\listofalgorithms{\thispagestyle{headings}}%
 }
 
 
diff --git a/thesis.tex b/thesis.tex
index 6aa8a7ec48a27088a6ff577e140939c2cd205a48..769ec37cfdb4f8900ff1a15c76cebe0d14fb841c 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -129,6 +129,12 @@
 
 \tableofcontents
 
+%% Listings of figures, tables, etc. Delete what is not needed.
+\clearpage
+\listoftables\thispagestyle{headings}
+\listoffigures
+\listofalgorithms % Algorithms
+\lstlistoflistings % Code Listings
 
 \mainmatter
 
@@ -155,12 +161,6 @@
 
 \backmatter
 
-%% Listings of figures, tables, etc. Delete what is not needed.
-\listoffigures
-\listoftables
-\listofalgorithms % Algorithms
-\lstlistoflistings % Code Listings
-
 \clearpage
 \bibliography{references}
 %% Depending on Language, use german alphadin or original alpha