diff --git a/tex/latex/ngsummary/ngsummary.cls b/tex/latex/ngsummary/ngsummary.cls
index 9f9e465..91d834c 100644
--- a/tex/latex/ngsummary/ngsummary.cls
+++ b/tex/latex/ngsummary/ngsummary.cls
@@ -9,7 +9,7 @@
 \ProcessOptions\relax
 
 % More declarations %
-\LoadClass[sfdefaults=false, parskip=half]{scrartcl}
+\LoadClass[sfdefaults=false, parskip=half]{scrreprt}
 
 %\KOMAoptions{mpinclude=true}
 %\recalctypearea
@@ -29,7 +29,7 @@
 
 % Use sansfont for all title elements
 \addtokomafont{titlehead}{\sffamily}
-\addtokomafont{subject}{\normalfont \sffamily \itshape}
+\addtokomafont{subject}{\sffamily}
 \addtokomafont{title}{\sffamily}
 \addtokomafont{subtitle}{\sffamily}
 \addtokomafont{author}{\sffamily}
@@ -52,3 +52,11 @@
 	listname={Algorithmenverzeichnis}
 ]
 {loa}
+
+\newtheorem{theorem}{Satz}[chapter]
+\newtheorem{lemma}[theorem]{Lemming}
+\newtheorem{corollary}[theorem]{Korall}
+\newtheorem{definition}[theorem]{Definition}
+\newtheorem{property}[theorem]{Eigenschaft}
+\newtheorem{example}[theorem]{Beispiel}
+\newtheorem{proof}{Beweis}
diff --git a/tex/latex/ngutils/ngutils.sty b/tex/latex/ngutils/ngutils.sty
index 7fb21db..615c953 100644
--- a/tex/latex/ngutils/ngutils.sty
+++ b/tex/latex/ngutils/ngutils.sty
@@ -77,48 +77,53 @@
 	\end{minipage}
 }
 
-\newlength{\theoremskip}
-\setlength{\theoremskip}{6em}
-
-\newcommand{\theoremfont}{\normalfont\bfseries}
-\newcommand{\definitionfont}{\normalfont\bfseries}
-
-\newenvironment{theoremic}[2][\theoremfont]{
-	{#1 #2}
-	\hfill
-	\begin{minipage}[t]{\the\dimexpr\linewidth-\theoremskip\relax}
-		}{
-	\end{minipage}
-}
-
-\newenvironment{theorem}{
-	\begin{theoremic}{Satz.}
-		}{
-	\end{theoremic}
-}
-
-\newenvironment{lemma}{
-	\begin{theoremic}{Lemma.}
-		}{
-	\end{theoremic}
-}
-
-\newenvironment{proof}{
-	\begin{theoremic}{Beweis.}
-		}{
-	\end{theoremic}
-}
-
-\newenvironment{definition}{
-	\begin{theoremic}[\definitionfont]{Definition.}
-		}{
-	\end{theoremic}
-}
-
-\newenvironment{example}{
-	\begin{theoremic}[\definitionfont]{Beispiel.}
-		}{
-	\end{theoremic}
-}
-
-
+% \newlength{\theoremskip}
+% \setlength{\theoremskip}{6em}
+%
+% \newcommand{\theoremfont}{\normalfont\bfseries}
+% \newcommand{\definitionfont}{\normalfont\bfseries}
+%
+% \newenvironment{theoremic}[3][]{
+% 	{#3 #2 #1}
+% 	\hfill
+% 	\begin{minipage}[t]{\the\dimexpr\linewidth-\theoremskip\relax}
+% 		}{
+% 	\end{minipage}
+% }
+%
+% \newenvironment{theorem}[1][]{
+% 	\begin{theoremic}[#1]{Satz}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%
+% \newenvironment{lemma}[1][]{
+% 	\begin{theoremic}[#1]{Lemma}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%
+% \newenvironment{corrolary}[1][]{
+% 	\begin{theoremic}[#1]{Korall}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%
+% \newenvironment{proof}[1][]{
+% 	\begin{theoremic}[#1]{Beweis}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%
+% \newenvironment{definition}[1][]{
+% 	\begin{theoremic}[#1]{Definition}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%
+% \newenvironment{example}[1][]{
+% 	\begin{theoremic}[#1]{Beispiel}{\theoremfont}
+% 		}{
+% 	\end{theoremic}
+% }
+%