diff --git a/ngslides.isy b/ngslides.isy
index d47466e..bff7ab6 100644
--- a/ngslides.isy
+++ b/ngslides.isy
@@ -4,117 +4,179 @@
\usepackage[sansdefault]{fontsetup}
\usepackage{ngutils}
-\newcommand{\labelfont}{\normalfont\bfseries\color{dark blue}}
-
-%\setlength{\leftmargini}{1.33em}
-%\setlength{\leftmarginii}{1.33em}
-%\setlength{\leftmarginiii}{1.33em}
-%\setlength{\leftmarginvi}{1.33em}
+\newcommand{\labelfont}{\normalfont\bfseries\color{title}}
+\setlength{\leftmargini}{1.6em}
+\setlength{\leftmarginii}{1.3em}
+\setlength{\leftmarginiii}{0.97em}
+\setlength{\leftmarginiv}{0.8em}
+
\renewcommand{\labelenumi}{\labelfont\arabic{enumi}.}
\renewcommand{\labelenumii}{\labelfont\alph{enumii})}
\renewcommand{\labelenumiii}{\labelfont\roman{enumiii}.}
\renewcommand{\labelenumiv}{\labelfont\Alph{enumiv}.}
-\renewcommand{\labelitemi}{\labelfont $\blockfull$}
-\renewcommand{\labelitemii}{\labelfont $\blackpointerright$}
-\renewcommand{\labelitemiii}{\labelfont $\bullet$}
-\renewcommand{\labelitemiv}{\labelfont $\bullet$}
+\renewcommand{\labelitemi}{\labelfont \large \textbullet}
+\renewcommand{\labelitemii}{\labelfont \large \textopenbullet}
+\renewcommand{\labelitemiii}{\labelfont \textbullet}
+\renewcommand{\labelitemiv}{\labelfont \textopenbullet}
\setlength{\fboxsep}{1pt}
+
+\newlength{\theoremskip}
+\setlength{\theoremskip}{1em}
-\newcommand{\bk}{\color{black}}
-\newcommand{\wt}{\color{white}}
-\newcommand{\bu}{\color{dark blue}}
-\newcommand{\bn}{\color{dark brown}}
-\newcommand{\cn}{\color{dark cyan}}
-\newcommand{\gy}{\color{dark gray}}
-\newcommand{\gn}{\color{dark green}}
-\newcommand{\og}{\color{dark orange}}
-\newcommand{\pk}{\color{dark pink}}
-\newcommand{\pl}{\color{dark purple}}
-\newcommand{\rd}{\color{dark red}}
-\newcommand{\yo}{\color{dark yellow}}
-\newcommand{\tl}{\color{title}}
+ \newcommand{\theoremfont}{\normalfont\bfseries\color{dark blue}}
+ \newcommand{\definitionfont}{\normalfont\bfseries\color{dark gray}}
+ \newcommand{\problemfont}{\normalfont\bfseries\color{dark green}}
+
+\newenvironment{theoremic}[3][]{
+ \newdimen\header
+ \setbox0=\hbox{#2}
+ \header=\wd0
+ {#3 #2 #1}
+ \hfill
+ \begin{minipage}[t]{\the\dimexpr\linewidth-\header-\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{corollary}[1][]{
+ \begin{theoremic}[#1]{Korollar}{\theoremfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{proof}[1][]{
+ \begin{theoremic}[#1]{Beweis}{\theoremfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{definition}[1][]{
+ \begin{theoremic}[#1]{Definition}{\definitionfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{example}[1][]{
+ \begin{theoremic}[#1]{Beispiel}{\definitionfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{remark}[1][]{
+ \begin{theoremic}[#1]{Bemerkung}{\definitionfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{property}[1][]{
+ \begin{theoremic}[#1]{Eigenschaft}{\definitionfont}
+ }{
+ \end{theoremic}
+}
+
+\newenvironment{problem}[1][]{
+ \begin{theoremic}[#1]{Problem}{\problemfont}
+ }{
+ \end{theoremic}
+}
+
+
+
+
-
--0.7 0 m
--1.7 0.333 l
--1.7 -0.333 l
+
+0 0 m
+-1 0.333 l
+-1 -0.333 l
h
-
--0.7 0 m
--1.7 0.333 l
--1.7 -0.333 l
+
+0 0 m
+-1 0.333 l
+-1 -0.333 l
h
-
--0.7 0 m
--1.7 0.333 l
+
+0 0 m
+-1 0.333 l
-0.8 0 l
--1.7 -0.333 l
+-1 -0.333 l
h
-
--0.7 0 m
--1.7 0.333 l
+
+0 0 m
+-1 0.333 l
-0.8 0 l
--1.7 -0.333 l
+-1 -0.333 l
h
-
--1.7 0.333 m
--0.7 0 l
--1.7 -0.333 l
+
+-1 0.333 m
+0 0 l
+-1 -0.333 l
-
--0.7 0 m
--1.7 0.333 l
--1.7 -0.333 l
+
+0 0 m
+-1 0.333 l
+-1 -0.333 l
h
--1.7 0 m
--2.7 0.333 l
--2.7 -0.333 l
+1 0 m
+-2 0.333 l
+-2 -0.333 l
h
-
--0.7 0 m
--1.7 0.333 l
--1.7 -0.333 l
+
+0 0 m
+-1 0.333 l
+-1 -0.333 l
h
--1.7 0 m
--2.7 0.333 l
--2.7 -0.333 l
+-1 0 m
+-2 0.333 l
+-2 -0.333 l
h
@@ -162,6 +224,20 @@ h
+
+
+100 204 m
+4 0 0 4 100 200 96 200 a
+96 100 l
+4 0 0 4 100 100 100 96 a
+300 96 l
+4 0 0 4 300 100 304 100 a
+304 200 l
+4 0 0 4 300 200 300 204 a
+h
+
+
+
96 96 m
@@ -173,7 +249,7 @@ h
-
+
96 96 m
304 96 l
304 204 l
@@ -184,10 +260,10 @@ h
-92 92 m
-308 92 l
-308 208 l
-92 208 l
+90 90 m
+310 90 l
+310 210 l
+90 210 l
h
@@ -325,7 +401,7 @@ h
2 0 0 2 0 0 e
--5 0 m
+-4 0 m
-2 0 l
@@ -350,8 +426,8 @@ h
1.5 0.5 -0.5 1.5 0 0 e
-
--5 0 m
+
+-4 0 m
-2 0 l
@@ -381,27 +457,36 @@ h
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+