diff --git a/README.md b/README.md
index 7200f1ed700ef0615b370509e88e5427b3c9d2b1..4516919b1c3d23e134134c06a18106fdd3d17379 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ them with specific configurations and presets as well as providing commonly need
 	HsH-book (planed)  
 	HsH-standalone
 
-**Version:** BETA 0.3, 24.01.2021
+**Version:** BETA 0.4, 08.02.2021
 
 ## Check out the **Example-Branche**
 
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 09c65b3d1c55c13585d1d2f0f3f4d14f1d72de4c..bdf8bf87ac431aaa47558cf6755efb2230d73bba 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -1,32 +1,23 @@
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-01-22> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-02-09> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-report}
-\ProvidesClass{\myClassName}[2021/01/22 HsH Report based on KOMA]
-\LoadClass[bibliography=totoc,listof=totoc]{scrreprt}
+\ProvidesClass{\myClassName}[2021/02/09 HsH Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
-\newcommand{\includeHsHlogohere}{\includegraphics[width=5cm,page=\HsHlogoPage]{\HsHlogoPath}}
-
-
 \newif\if@german%
+
 \DeclareOption{german}{%
 	\PassOptionsToPackage{ngerman}{babel}
-	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
-	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
 	\@germantrue
 }
 \DeclareOption{ngerman}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
-	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
-	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
 	\@germantrue
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
-	\renewcaptionname{english}{\figurename}{Fig.} %Figure
-	\renewcaptionname{english}{\tablename}{Tab.} %Table
 }
 \DeclareOption{f1}{%
 	\renewcommand{\HsHlogoPage}{2}
@@ -48,6 +39,10 @@
 \@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}}
 \ProcessOptions\relax
 
+% Load KOMA class
+\LoadClass{scrreprt}
+\KOMAoption{toc}{bibliography,listof}
+
 % standart options for packages
 \PassOptionsToPackage{utf8}{inputenc}
 \PassOptionsToPackage{T1}{fontenc}
@@ -116,6 +111,7 @@
 \MakeOuterQuote{"} % easy quotationmarks
 
 % custom commands
+\newcommand{\includeHsHlogohere}{\includegraphics[width=5cm,page=\HsHlogoPage]{\HsHlogoPath}}
 \providecommand{\abs}[1]{\ensuremath{\left\vert#1\right\vert}} % Makro for vertical lines around absolute values
 \newcommand\declarationAuthorship{
 	\thispagestyle{plain}
diff --git a/src/config.tex b/src/config.tex
index 06e533a6f97ba692698750f4758a181de51ccff7..2a4f58ea45dd925bde7a850f18cbd3ad58352e0e 100644
--- a/src/config.tex
+++ b/src/config.tex
@@ -1,4 +1,11 @@
-\renewcommand{\abstractname}{Abstract} % Abstract
+\if@german
+	\renewcommand{\abstractname}{Abstract} % Abstract
+	\renewcaptionname{ngerman}{\figurename}{Abb.} %Figure
+	\renewcaptionname{ngerman}{\tablename}{Tab.} %Table
+\else
+	\renewcaptionname{english}{\figurename}{Fig.} %Figure
+	\renewcaptionname{english}{\tablename}{Tab.} %Table
+\fi
 
 \ifx\KOMAScriptVersion\undefined\else % check if KOMA is used
 	\g@addto@macro\@floatboxreset\centering % center all floats