3 files changed, 60 insertions, 53 deletions
diff --git a/latex/common.tex b/latex/common.tex
index d71a2492..5d959155 100644
--- a/latex/common.tex
+++ b/latex/common.tex
@@ -20,9 +20,57 @@
 
 \newcommand{\iflehrer}[2]{\iftoggle{lehrerversion}{#1}{#2}}
 
-\newcommand{\solution}[1]{\iftoggle{lehrerversion}{#1}{\phantom{#1}}}
+\newcommand{\solution}[1]{\iftoggle{lehrerversion}{#1}{\textcolor{white}{#1}}}
 
-\newcommand{\gap}[1]{\underline{\solution{#1}}}
+\newcommand{\gap}[1]{\underLine{\solution{#1}}}
+
+\newtheoremstyle{Aufg}% name of the style to be used
+{2pt}% measure of space to leave above the theorem. E.g.: 3pt
+{}% measure of space to leave below the theorem. E.g.: 3pt
+{}% name of font to use in the body of the theorem
+{}% measure of space to indent
+{}% name of head font
+{}% punctuation between head and body
+{\newline }% space after theorem head; " " = normal interword space
+{\textbf{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}\ifdefined\Verteilung{}: \  \Verteilung \hfill {/}\AnzahlPunkte \ BE\fi}}
+
+\theoremstyle{Aufg}
+\newtheorem{Aufg}{Aufgabe}
+
+\newtheoremstyle{Lsg}% name of the style to be used
+{2pt}% measure of space to leave above the theorem. E.g.: 3pt
+{}% measure of space to leave below the theorem. E.g.: 3pt
+{}% name of font to use in the body of the theorem
+{}% measure of space to indent
+{}% name of head font
+{}% punctuation between head and body
+{\newline }% space after theorem head; " " = normal interword space
+{\textbf{\thmname{#1}\thmnote{ (#3)}:}}
+
+\theoremstyle{Lsg}
+\newtheorem{Lsg}{Lösung}
+
+\newtheoremstyle{Bearbeitung}% name of the style to be used
+{0pt}% measure of space to leave above the theorem. E.g.: 3pt
+{25pt}% measure of space to leave below the theorem. E.g.: 3pt
+{}% name of font to use in the body of the theorem
+{}% measure of space to indent
+{}% name of head font
+{}% punctuation between head and body
+{ }% space after theorem head; " " = normal interword space
+{\thmname{#1}}
+
+\theoremstyle{Bearbeitung}
+\newtheorem{Bearbeitung}{}
+
+\newcommand{\Lehrerversion}{\excludecomment{Bearbeitung}}
+\newcommand{\Schuelerversion}{\excludecomment{Lsg}}
+
+\iftoggle{lehrerversion}{
+  \Lehrerversion
+}{
+  \Schuelerversion
+}
 
 % Add new paired delimiter 'abs' using mathtools
 \DeclarePairedDelimiter\abs{\lvert}{\rvert}%
diff --git a/latex/common_packages.tex b/latex/common_packages.tex
index c32f140c..48363673 100644
--- a/latex/common_packages.tex
+++ b/latex/common_packages.tex
@@ -1,14 +1,23 @@
 \RequirePackage{geometry}
 \RequirePackage[utf8]{inputenc}
 \RequirePackage{amssymb,amsthm,amsmath}
+\RequirePackage{gensymb}
 \RequirePackage{mathtools}
 \RequirePackage{ifthen}
 \RequirePackage{graphicx}
 \RequirePackage[table]{xcolor}
 \RequirePackage{tikz}
 \usetikzlibrary{calc,tikzmark,backgrounds,arrows.meta}
-\RequirePackage{multicol}
 \RequirePackage[most]{tcolorbox}
 \RequirePackage{lmodern}
 \RequirePackage{minted}
 \RequirePackage[school]{pgf-umlcd}
+\RequirePackage{comment}
+\RequirePackage[ngerman]{babel}
+\RequirePackage{setspace}
+\RequirePackage{lua-ul}
+\RequirePackage{array}
+\RequirePackage{tabularx}
+\RequirePackage{multicol}
+\RequirePackage{multirow}
+\RequirePackage{caption}
diff --git a/latex/test.cls b/latex/test.cls
index e57d1bb0..ee3c2e68 100644
--- a/latex/test.cls
+++ b/latex/test.cls
@@ -22,9 +22,7 @@
 \RequirePackage{floatflt}
 \RequirePackage{footnote}
 \RequirePackage{float}
-\RequirePackage[ngerman]{babel}
 \RequirePackage{underscore}
-\RequirePackage{comment}
 \RequirePackage{afterpage}
 
 \input{common_packages.tex}
@@ -78,54 +76,6 @@
 \newcommand{\Verteilung}{}
 \newcommand{\AnzahlPunkte}{0} %%Anzahl der Punkte festlegen
 
-\newtheoremstyle{Aufg}% name of the style to be used
-{2pt}% measure of space to leave above the theorem. E.g.: 3pt
-{}% measure of space to leave below the theorem. E.g.: 3pt
-{}% name of font to use in the body of the theorem
-{}% measure of space to indent
-{}% name of head font
-{}% punctuation between head and body
-{\newline }% space after theorem head; " " = normal interword space
-{\textbf{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}: \ \Verteilung \hfill {/}\AnzahlPunkte \ BE}}
-
-\theoremstyle{Aufg}
-\newtheorem{Aufg}{Aufgabe}
-
-\newtheoremstyle{Lsg}% name of the style to be used
-{2pt}% measure of space to leave above the theorem. E.g.: 3pt
-{}% measure of space to leave below the theorem. E.g.: 3pt
-{}% name of font to use in the body of the theorem
-{}% measure of space to indent
-{}% name of head font
-{}% punctuation between head and body
-{\newline }% space after theorem head; " " = normal interword space
-{\textbf{\thmname{#1}\thmnote{ (#3)}:}}
-
-\theoremstyle{Lsg}
-\newtheorem{Lsg}{Lösung}
-
-\newtheoremstyle{Bearbeitung}% name of the style to be used
-{0pt}% measure of space to leave above the theorem. E.g.: 3pt
-{25pt}% measure of space to leave below the theorem. E.g.: 3pt
-{}% name of font to use in the body of the theorem
-{}% measure of space to indent
-{}% name of head font
-{}% punctuation between head and body
-{ }% space after theorem head; " " = normal interword space
-{\thmname{#1}}
-
-\theoremstyle{Bearbeitung}
-\newtheorem{Bearbeitung}{}
-
-\newcommand{\Lehrerversion}{\excludecomment{Bearbeitung}}
-\newcommand{\Schuelerversion}{\excludecomment{Lsg}}
-  
-\iftoggle{lehrerversion}{
-  \Lehrerversion
-}{
-  \Schuelerversion
-}
-
 \newcommand{\Intro}{
    \fcolorbox{black}{testgrauRGB}{%
      \parbox{14.3cm}{