diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 6a77e2991ba6d272c61f5ce20cc4f325e93b59ac..2c66ab6e83c0857ab9de997542f27d22261c32a1 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -1,8 +1,8 @@
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-03-08> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-03-13> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-article}
-\ProvidesClass{\myClassName}[2021-03-08 HsH Report based on KOMA]
+\ProvidesClass{\myClassName}[2021/03/13 HsH Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -18,25 +18,32 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
 
-\@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}}
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
 % Load KOMA class
@@ -107,7 +114,6 @@
 \renewcommand{\fps@figure}{h!t} % positioning of figures
 \renewcommand{\fps@table}{h!t} % Positonierung of tables
 \renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled
-\renewcommand{\familydefault}{\sfdefault} % Sans-Serif Font as standard
 \MakeOuterQuote{"} % easy quotationmarks
 
 % custom commands
@@ -172,8 +178,9 @@
 }
 
 % load config at beginning of document
-\AtBeginDocument {
+\AtBeginDocument{
 	\makeatletter
+	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 0005cdd7ec5bf89f031105a26db06717c0164ffc..e4f96525a00ac849ff4f26be4cf7ef394c59829c 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -1,8 +1,8 @@
-\typeout{Adapted from KOMA script for use in Hochschule Hannover <2022-02-09> Jan Wille}
+\typeout{Adapted from KOMA script for use in Hochschule Hannover <2021-03-13> Jan Wille}
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-report}
-\ProvidesClass{\myClassName}[2021/02/09 HsH Report based on KOMA]
+\ProvidesClass{\myClassName}[2021/03/13 HsH-Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -18,25 +18,32 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrreprt}}
 
-\@ifclasswith{\myClassName}{english}{}{\@ifclasswith{\myClassName}{ngerman}{}{\ExecuteOptions{ngerman}}}
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
 % Load KOMA class
@@ -108,7 +115,6 @@
 \renewcommand{\fps@figure}{h!t} % positioning of figures
 \renewcommand{\fps@table}{h!t} % Positonierung of tables
 \renewcommand{\layercontentsmeasure}{\empty} % rulers when using draft disabled
-\renewcommand{\familydefault}{\sfdefault} % Sans-Serif Font as standard
 \MakeOuterQuote{"} % easy quotationmarks
 
 % custom commands
@@ -182,8 +188,9 @@
 }
 
 % load config at beginning of document
-\AtBeginDocument {
+\AtBeginDocument{
 	\makeatletter
+	\renewcommand*{\mkbibacro}[1]{\MakeUppercase{#1}} % solves fontype warning in San-Serif
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}
 	}{
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index bd9faa5ab65f0519464f443ee38092532a09f057..fcca06ae8fa1951bc3ca005096a39089c108354d 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -2,8 +2,7 @@
 \NeedsTeXFormat{LaTeX2e}
 
 \newcommand{\myClassName}{HsH-standalone}
-\ProvidesClass{\myClassName}[2020/01/22 HsH Report based on KOMA]
-\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone}
+\ProvidesClass{\myClassName}[2020/03/13 HsH Report based on KOMA]
 
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
@@ -21,25 +20,37 @@
 }
 \DeclareOption{english}{%
 	\PassOptionsToPackage{\CurrentOption}{babel}
+	\@germanfalse
 }
-\DeclareOption{f1}{%
+\DeclareOption{f1}{% use logo of fakulty 1
 	\renewcommand{\HsHlogoPage}{2}
 }
-\DeclareOption{f2}{%
+\DeclareOption{f2}{% use logo of fakulty 2
 	\renewcommand{\HsHlogoPage}{3}
 }
-\DeclareOption{f3}{%
+\DeclareOption{f3}{% use logo of fakulty 3
 	\renewcommand{\HsHlogoPage}{4}
 }
-\DeclareOption{f4}{%
+\DeclareOption{f4}{% use logo of fakulty 4
 	\renewcommand{\HsHlogoPage}{5}
 }
-\DeclareOption{f5}{%
+\DeclareOption{f5}{% use logo of fakulty 5
 	\renewcommand{\HsHlogoPage}{6}
 }
+\DeclareOption{sans}{% use san serif font
+	\renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOption{roman}{% use roman/serif font
+	\renewcommand{\familydefault}{\rmdefault}
+}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{standalone}}
+
+\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
 \ProcessOptions\relax
 
+\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone}
+
+
 \newcommand*{\@titlehead}{}%
 \newcommand{\titlehead}[1]{\gdef\@titlehead{#1}}%
 \newcommand*{\@subject}{}%
@@ -85,7 +96,7 @@
 \providecommand{\abs}[1]{\ensuremath{\left\vert#1\right\vert}} % Makro for vertical lines around absolute values
 
 % load config at beginning of document
-\AtBeginDocument {
+\AtBeginDocument{
 	\makeatletter
 	\InputIfFileExists{config.tex}{
 		\ClassInfo{\myClassName}{config.tex was found. Using it...}