diff --git a/Folien/CEL_Beamer/templates/beamerthemekit.sty b/Folien/CEL_Beamer/templates/beamerthemekit.sty
index e309021..6f8302a 100644
--- a/Folien/CEL_Beamer/templates/beamerthemekit.sty
+++ b/Folien/CEL_Beamer/templates/beamerthemekit.sty
@@ -1,216 +1,216 @@
-%% LaTeX-Beamer template for KIT design
-%% by Erik Burger, Christian Hammer
-%% title picture by Klaus Krogmann
-%%
-%% version 2.1
-%%
-%% mostly compatible to KIT corporate design v2.0
-%% http://intranet.kit.edu/gestaltungsrichtlinien.php
-%%
-%% Problems, bugs and comments to
-%% burger@kit.edu
-
-\usepackage{templates/beamerthemekitbase}
-
-\setbeamertemplate{title page}
-{
-\thispagestyle{empty}
-
-%middle block with name of institute
-\begin{textblock*}{\paperwidth}(1mm,42mm)
-\begin{pgfpicture}{0mm}{0mm}{\paperwidth-2mm}{6mm}
-	\color{black!50}
-	\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\paperwidth-2mm}{6mm}}
-	\pgfusepath{fill}
-	\pgftext[at=\pgfpoint{5mm}{4mm},left,center]{\textcolor{white}{\tiny\expandafter{\insertinstitute}}}
-	\pgftext[at=\pgfpoint{5mm}{2mm},left,center]{\textcolor{white}{\tiny\expandafter{Prof. Dr.-Ing. Laurent Schmalen}}}
-\end{pgfpicture}
-\end{textblock*}
-
-%elements on title page
-
-%KIT logo
-\begin{textblock*}{24mm}(6mm,5mm)
-\iflanguage{english}{%
-\includegraphics[width=23mm]{logos/kitlogo_en_rgb} 
-}{%
-\includegraphics[width=23mm]{logos/kitlogo_de_rgb} 
-}%
-\end{textblock*}
-
-%CEL logo
-%\begin{textblock*}{20mm}(110mm,4mm)
-%\includegraphics[scale=0.18]{logos/CEL_logo.pdf} 
-%\end{textblock*}
-
-%title
-\begin{textblock*}{120mm}(6mm,16mm)
-\begin{beamercolorbox}[wd=118mm,ht=14mm,dp=3mm,left]{white}%
-\Large\textbf{\inserttitle}
-\end{beamercolorbox}
-\end{textblock*}
-
-%subtitle
-\begin{textblock*}{120mm}(6mm,33mm)
-\scriptsize \insertsubtitle
-\end{textblock*}
-
-%author
-\begin{textblock*}{120mm}(6mm,37mm)
-\scriptsize\insertauthor~\textbar~\insertshortdate
-\end{textblock*}
-
-%legal KIT text
-\begin{textblock*}{80mm}[0,1](6mm,94mm)
-\fontsize{4pt}{6pt}\selectfont
-\iflanguage{english}{
-KIT -- University of the State of Baden-Wuerttemberg and\\National Laboratory of the Helmholtz Association}
-{KIT -- Universit{\"a}t des Landes Baden-W{\"u}rttemberg und\\nationales Forschungszentrum in der Helmholtz-Gemeinschaft}
-\end{textblock*}
-
-\begin{textblock*}{16mm}(112mm,90mm)
-\fontsize{8pt}{8pt}\selectfont
-\bfseries
-\textcolor{white}{
-	\href{http://www.kit.edu}{www.kit.edu}
-}
-\end{textblock*}
-
-% title image
-
-\begin{textblock*}{\paperwidth}(1mm,48.5mm)
-\begin{overpic}[width=126mm,height=40mm]{logos/\@titleimage}
-\put(-6,-3){
-	%mask curve for lower left corner of title image
-	\begin{pgfpicture}{0mm}{0mm}{3mm}{3mm}
-		\pgfpathqmoveto{0mm}{0mm}
-		\pgfpathlineto{\pgfpoint{3mm}{0mm}}
-		\pgfpathlineto{\pgfpoint{3mm}{1mm}}
-
-		{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}} 
-		\pgfpathlineto{\pgfpoint{1mm}{1mm}}
-		\pgfpathlineto{\pgfpoint{1mm}{3mm}}}
-
-		\pgfpathmoveto{\pgfpoint{1mm}{3mm}}
-		\pgfpathlineto{\pgfpoint{0mm}{3mm}}
-		\pgfpathlineto{\pgfpoint{0mm}{0mm}}
-		\pgfpathclose
-
-		\color{black!15}
-		\pgfusepath{fill}
-	\end{pgfpicture}
-}
-\end{overpic}
-\end{textblock*}
-
-}
-
-%background for pages
-%CH: for plain frames
-\newlength{\kitbottom}
-\usebackgroundtemplate{
-	\setlength{\kitbottom}{\ifbeamer@plainframe1mm\else9mm\fi}%
-\begin{pgfpicture}{0mm}{0mm}{\paperwidth}{\paperheight}
-
-	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
-	\pgfpathmoveto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}
-	\pgfpathlineto{\pgfpoint{1mm}{\kitbottom}}
-	\pgfpathlineto{\pgfpoint{1mm}{\paperheight-1mm}}}
-
-	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
-	\pgfpathmoveto{\pgfpoint{1mm}{\paperheight-1mm}}
-	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\paperheight-1mm}}
-	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}}
-
-	\color{white}
-	\pgfusepath{fill}
-
-\end{pgfpicture}%
-}
-
-%frametitle
-\setbeamertemplate{frametitle}
-{
-\vspace{2mm} %\hspace*{-4mm}
-\vbox{\hsize=9cm\bfseries\insertframetitle}
-
-\begin{textblock*}{15mm}(108mm,4mm)
-\iflanguage{english}{%
-\includegraphics[width=14mm]{logos/kitlogo_en_rgb} 
-}{%
-\includegraphics[width=14mm]{logos/kitlogo_de_rgb} 
-}%
-
-\end{textblock*}
-
-% obsolete as of KIT-CD v2.0
-%\begin{textblock*}{1.5mm}(1mm,1mm)
-%\begin{pgfpicture}{0mm}{0mm}{1.5mm}{9mm}
-	%\color{kit-green100}
-	%\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{1.5mm}{9mm}}
-	%\pgfusepath{fill}
-%\end{pgfpicture}%
-%\end{textblock*}
-
-}
-
-
-\setbeamertemplate{headline}
-{
-}
-
-%footer
-\setbeamertemplate{footline}
-{
-%\vskip1mm
-\begin{beamercolorbox}[wd=0.2\textwidth,ht=2mm,dp=4.75mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
-	\usebeamerfont{author in head/foot}%
-	% Date and frame number
-	\textbf{\insertframenumber{}} \hspace{10pt} \insertshortdate
-\end{beamercolorbox}%
-\vspace*{-5.5mm}\hspace*{0.15\textwidth}%
-\begin{beamercolorbox}[wd=0.41\textwidth,ht=2mm,dp=3.5mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
-	\usebeamerfont{title in head/foot}%
-	% Title
-	%\insertshorttitle
-	\begin{tabular}{l} 
-		\insertshorttitle \\
-		\insertshortauthor
-	\end{tabular}
-\end{beamercolorbox}%
-%\vspace*{-7.2mm}\hspace*{0.25\textwidth}%
-\begin{beamercolorbox}[wd=0.3\textwidth,ht=2mm,dp=3.5mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
-	\usebeamerfont{title in head/foot}%
-	% Title
-	\begin{tabular}{r} 
-		Communications Engineering Lab \\
-		Prof. Dr.-Ing. Laurent Schmalen
-	\end{tabular}	
-\end{beamercolorbox}%
-\begin{beamercolorbox}[wd=0\textwidth,ht=2mm,dp=1.5mm,leftskip=2.0em,rightskip=.5em]{title in head/foot}%
-	\usebeamerfont{title in head/foot}%
-	% Title
-	\vspace*{-2.8mm}\hspace*{-0.6mm}%
-	\includegraphics[height=6.75mm]{logos/CEL_logo.pdf}
-\end{beamercolorbox}%
-}
-
-
-%\setbeamertemplate{footline}
-%{
-%\vskip.4mm
-%\begin{beamercolorbox}[ht=2.4mm, dp=3mm]{section in head/foot}
-	%include mini frame navigation
-%	\insertnavigation{\paperwidth}
-%\end{beamercolorbox}
-
-%\begin{beamercolorbox}[wd=0.7\textwidth,ht=2.2mm,dp=1.5mm,leftskip=1.3em,rightskip=.5em]{author in head/foot}%
-%\usebeamerfont{author in head/foot}%
-%\insertshortauthor\hspace{2.5pt}--\hspace{2.5pt}\insertshorttitle
-%\end{beamercolorbox}%
-%\vspace*{-4mm}\hspace*{0.7\textwidth}%
-%\begin{beamercolorbox}[wd=0.3\textwidth,ht=2.2mm,dp=1.5mm,left,leftskip=.5em]{title in head/foot}%
-%\usebeamerfont{title in head/foot}%
-%\hfill\insertshortdate\hspace{30pt}\insertframenumber{}/\inserttotalframenumber
-%\end{beamercolorbox}%
-%}
+%% LaTeX-Beamer template for KIT design
+%% by Erik Burger, Christian Hammer
+%% title picture by Klaus Krogmann
+%%
+%% version 2.1
+%%
+%% mostly compatible to KIT corporate design v2.0
+%% http://intranet.kit.edu/gestaltungsrichtlinien.php
+%%
+%% Problems, bugs and comments to
+%% burger@kit.edu
+
+\usepackage{templates/beamerthemekitbase}
+
+\setbeamertemplate{title page}
+{
+\thispagestyle{empty}
+
+%middle block with name of institute
+\begin{textblock*}{\paperwidth}(1mm,42mm)
+\begin{pgfpicture}{0mm}{0mm}{\paperwidth-2mm}{6mm}
+	\color{black!50}
+	\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\paperwidth-2mm}{6mm}}
+	\pgfusepath{fill}
+	\pgftext[at=\pgfpoint{5mm}{4mm},left,center]{\textcolor{white}{\tiny\expandafter{\insertinstitute}}}
+	\pgftext[at=\pgfpoint{5mm}{2mm},left,center]{\textcolor{white}{\tiny\expandafter{Prof. Dr.-Ing. Laurent Schmalen}}}
+\end{pgfpicture}
+\end{textblock*}
+
+%elements on title page
+
+%KIT logo
+\begin{textblock*}{24mm}(6mm,5mm)
+\iflanguage{english}{%
+\includegraphics[width=23mm]{logos/kitlogo_en_rgb} 
+}{%
+\includegraphics[width=23mm]{logos/kitlogo_de_rgb} 
+}%
+\end{textblock*}
+
+%CEL logo
+%\begin{textblock*}{20mm}(110mm,4mm)
+%\includegraphics[scale=0.18]{logos/CEL_logo.pdf} 
+%\end{textblock*}
+
+%title
+\begin{textblock*}{120mm}(6mm,16mm)
+\begin{beamercolorbox}[wd=118mm,ht=14mm,dp=3mm,left]{white}%
+\Large\textbf{\inserttitle}
+\end{beamercolorbox}
+\end{textblock*}
+
+%subtitle
+\begin{textblock*}{120mm}(6mm,33mm)
+\scriptsize \insertsubtitle
+\end{textblock*}
+
+%author
+\begin{textblock*}{120mm}(6mm,37mm)
+\scriptsize\insertauthor~\textbar~\insertshortdate
+\end{textblock*}
+
+%legal KIT text
+\begin{textblock*}{80mm}[0,1](6mm,94mm)
+\fontsize{4pt}{6pt}\selectfont
+\iflanguage{english}{
+KIT -- University of the State of Baden-Wuerttemberg and\\National Laboratory of the Helmholtz Association}
+{KIT -- Universit{\"a}t des Landes Baden-W{\"u}rttemberg und\\nationales Forschungszentrum in der Helmholtz-Gemeinschaft}
+\end{textblock*}
+
+\begin{textblock*}{16mm}(112mm,90mm)
+\fontsize{8pt}{8pt}\selectfont
+\bfseries
+\textcolor{white}{
+	\href{https://www.kit.edu}{www.kit.edu}
+}
+\end{textblock*}
+
+% title image
+
+\begin{textblock*}{\paperwidth}(1mm,48.5mm)
+\begin{overpic}[width=126mm,height=40mm]{logos/\@titleimage}
+\put(-6,-3){
+	%mask curve for lower left corner of title image
+	\begin{pgfpicture}{0mm}{0mm}{3mm}{3mm}
+		\pgfpathqmoveto{0mm}{0mm}
+		\pgfpathlineto{\pgfpoint{3mm}{0mm}}
+		\pgfpathlineto{\pgfpoint{3mm}{1mm}}
+
+		{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}} 
+		\pgfpathlineto{\pgfpoint{1mm}{1mm}}
+		\pgfpathlineto{\pgfpoint{1mm}{3mm}}}
+
+		\pgfpathmoveto{\pgfpoint{1mm}{3mm}}
+		\pgfpathlineto{\pgfpoint{0mm}{3mm}}
+		\pgfpathlineto{\pgfpoint{0mm}{0mm}}
+		\pgfpathclose
+
+		\color{black!15}
+		\pgfusepath{fill}
+	\end{pgfpicture}
+}
+\end{overpic}
+\end{textblock*}
+
+}
+
+%background for pages
+%CH: for plain frames
+\newlength{\kitbottom}
+\usebackgroundtemplate{
+	\setlength{\kitbottom}{\ifbeamer@plainframe1mm\else9mm\fi}%
+\begin{pgfpicture}{0mm}{0mm}{\paperwidth}{\paperheight}
+
+	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
+	\pgfpathmoveto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}
+	\pgfpathlineto{\pgfpoint{1mm}{\kitbottom}}
+	\pgfpathlineto{\pgfpoint{1mm}{\paperheight-1mm}}}
+
+	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
+	\pgfpathmoveto{\pgfpoint{1mm}{\paperheight-1mm}}
+	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\paperheight-1mm}}
+	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}}
+
+	\color{white}
+	\pgfusepath{fill}
+
+\end{pgfpicture}%
+}
+
+%frametitle
+\setbeamertemplate{frametitle}
+{
+\vspace{2mm} %\hspace*{-4mm}
+\vbox{\hsize=9cm\bfseries\insertframetitle}
+
+\begin{textblock*}{15mm}(108mm,4mm)
+\iflanguage{english}{%
+\includegraphics[width=14mm]{logos/kitlogo_en_rgb} 
+}{%
+\includegraphics[width=14mm]{logos/kitlogo_de_rgb} 
+}%
+
+\end{textblock*}
+
+% obsolete as of KIT-CD v2.0
+%\begin{textblock*}{1.5mm}(1mm,1mm)
+%\begin{pgfpicture}{0mm}{0mm}{1.5mm}{9mm}
+	%\color{kit-green100}
+	%\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{1.5mm}{9mm}}
+	%\pgfusepath{fill}
+%\end{pgfpicture}%
+%\end{textblock*}
+
+}
+
+
+\setbeamertemplate{headline}
+{
+}
+
+%footer
+\setbeamertemplate{footline}
+{
+%\vskip1mm
+\begin{beamercolorbox}[wd=0.2\textwidth,ht=2mm,dp=4.75mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{author in head/foot}%
+	% Date and frame number
+	\textbf{\insertframenumber{}} \hspace{10pt} \insertshortdate
+\end{beamercolorbox}%
+\vspace*{-5.5mm}\hspace*{0.15\textwidth}%
+\begin{beamercolorbox}[wd=0.41\textwidth,ht=2mm,dp=3.5mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	%\insertshorttitle
+	\begin{tabular}{l} 
+		\insertshorttitle \\
+		\insertshortauthor
+	\end{tabular}
+\end{beamercolorbox}%
+%\vspace*{-7.2mm}\hspace*{0.25\textwidth}%
+\begin{beamercolorbox}[wd=0.3\textwidth,ht=2mm,dp=3.5mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	\begin{tabular}{r} 
+		Communications Engineering Lab \\
+		Prof. Dr.-Ing. Laurent Schmalen
+	\end{tabular}	
+\end{beamercolorbox}%
+\begin{beamercolorbox}[wd=0\textwidth,ht=2mm,dp=1.5mm,leftskip=2.0em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	\vspace*{-2.8mm}\hspace*{-0.6mm}%
+	\includegraphics[height=6.75mm]{logos/CEL_logo.pdf}
+\end{beamercolorbox}%
+}
+
+
+%\setbeamertemplate{footline}
+%{
+%\vskip.4mm
+%\begin{beamercolorbox}[ht=2.4mm, dp=3mm]{section in head/foot}
+	%include mini frame navigation
+%	\insertnavigation{\paperwidth}
+%\end{beamercolorbox}
+
+%\begin{beamercolorbox}[wd=0.7\textwidth,ht=2.2mm,dp=1.5mm,leftskip=1.3em,rightskip=.5em]{author in head/foot}%
+%\usebeamerfont{author in head/foot}%
+%\insertshortauthor\hspace{2.5pt}--\hspace{2.5pt}\insertshorttitle
+%\end{beamercolorbox}%
+%\vspace*{-4mm}\hspace*{0.7\textwidth}%
+%\begin{beamercolorbox}[wd=0.3\textwidth,ht=2.2mm,dp=1.5mm,left,leftskip=.5em]{title in head/foot}%
+%\usebeamerfont{title in head/foot}%
+%\hfill\insertshortdate\hspace{30pt}\insertframenumber{}/\inserttotalframenumber
+%\end{beamercolorbox}%
+%}
diff --git a/Folien/CEL_Beamer/templates/beamerthemekitbase.sty b/Folien/CEL_Beamer/templates/beamerthemekitbase.sty
index 9f3580d..3cb1ee9 100644
--- a/Folien/CEL_Beamer/templates/beamerthemekitbase.sty
+++ b/Folien/CEL_Beamer/templates/beamerthemekitbase.sty
@@ -1,70 +1,70 @@
-%% LaTeX-Beamer template for KIT design
-%%
-%% Base template
-%%
-%% by Erik Burger, Christian Hammer
-%% title picture by Klaus Krogmann
-%%
-%% version 2.1
-%%
-%% mostly compatible to KIT corporate design v2.0
-%% http://intranet.kit.edu/gestaltungsrichtlinien.php
-%%
-%% Problems, bugs and comments to
-%% burger@kit.edu
-
-\usepackage[english,ngerman]{babel}
-\usepackage{ifthen} %For choosing the language, see below
-\usepackage{hyperref}
-\usepackage[absolute,overlay]{textpos}
-\usepackage{templates/semirounded}
-\usepackage[abs]{overpic}
-
-\beamertemplatenavigationsymbolsempty
-
-% math font with serif
-\usefonttheme[onlymath]{serif}
-
-\usepackage[scaled=.92]{helvet}
-
-\setbeamercovered{transparent}
-\setbeamersize{text margin left=6mm,text margin right=6mm} 
-
-\useinnertheme{rounded}
-\usepackage{templates/beamercolorthemekit}
-
-%save space in the footer
-\beamer@compresstrue
-
-%title image and logo
-\def\titleimage#1{\def\@titleimage{#1}}
-\def\titlelogo#1{\def\@titlelogo{#1}}
-
-\titleimage{schloss_optimized}
-\titlelogo{CEL_logo}
-
-%CH: KIT-point
-\setbeamertemplate{itemize items}{
-\begin{pgfpicture}{0mm}{0mm}{1ex}{1ex}
-{\pgfsetcornersarced{\pgfpoint{.3ex}{.3ex}} 
-\pgfpathmoveto{\pgfpoint{0cm}{1ex}} 
-\pgfpathlineto{\pgfpoint{1ex}{1ex}}
-\pgfpathlineto{\pgfpoint{1ex}{0cm}}}
-{\pgfsetcornersarced{\pgfpoint{.3ex}{.3ex}}
-\pgfpathmoveto{\pgfpoint{1ex}{0cm}}
-\pgfpathlineto{\pgfpointorigin}
-\pgfpathlineto{\pgfpoint{0cm}{1ex}}}
-\color{kit-green100}
-\pgfusepath{fill}
-\end{pgfpicture}%
-}
-
-%% use this for setting the total page number
-\newcommand{\beginbackup}{
-   \newcounter{framenumbervorappendix}
-   \setcounter{framenumbervorappendix}{\value{framenumber}}
-}
-\newcommand{\backupend}{
-   \addtocounter{framenumbervorappendix}{-\value{framenumber}}
-   \addtocounter{framenumber}{\value{framenumbervorappendix}} 
-}
+%% LaTeX-Beamer template for KIT design
+%%
+%% Base template
+%%
+%% by Erik Burger, Christian Hammer
+%% title picture by Klaus Krogmann
+%%
+%% version 2.1
+%%
+%% mostly compatible to KIT corporate design v2.0
+%% http://intranet.kit.edu/gestaltungsrichtlinien.php
+%%
+%% Problems, bugs and comments to
+%% burger@kit.edu
+
+\usepackage[english,ngerman]{babel}
+\usepackage{ifthen} %For choosing the language, see below
+\usepackage{hyperref}
+\usepackage[absolute,overlay]{textpos}
+\usepackage{templates/semirounded}
+\usepackage[abs]{overpic}
+
+\beamertemplatenavigationsymbolsempty
+
+% math font with serif
+\usefonttheme[onlymath]{serif}
+
+\usepackage[scaled=.92]{helvet}
+
+\setbeamercovered{transparent}
+\setbeamersize{text margin left=6mm,text margin right=6mm} 
+
+\useinnertheme{rounded}
+\usepackage{templates/beamercolorthemekit}
+
+%save space in the footer
+\beamer@compresstrue
+
+%title image and logo
+\def\titleimage#1{\def\@titleimage{#1}}
+\def\titlelogo#1{\def\@titlelogo{#1}}
+
+\titleimage{schloss_optimized}
+\titlelogo{CEL_logo}
+
+%CH: KIT-point
+\setbeamertemplate{itemize items}{
+\begin{pgfpicture}{0mm}{0mm}{1ex}{1ex}
+{\pgfsetcornersarced{\pgfpoint{.3ex}{.3ex}} 
+\pgfpathmoveto{\pgfpoint{0cm}{1ex}} 
+\pgfpathlineto{\pgfpoint{1ex}{1ex}}
+\pgfpathlineto{\pgfpoint{1ex}{0cm}}}
+{\pgfsetcornersarced{\pgfpoint{.3ex}{.3ex}}
+\pgfpathmoveto{\pgfpoint{1ex}{0cm}}
+\pgfpathlineto{\pgfpointorigin}
+\pgfpathlineto{\pgfpoint{0cm}{1ex}}}
+\color{kit-green100}
+\pgfusepath{fill}
+\end{pgfpicture}%
+}
+
+%% use this for setting the total page number
+\newcommand{\beginbackup}{
+   \newcounter{framenumbervorappendix}
+   \setcounter{framenumbervorappendix}{\value{framenumber}}
+}
+\newcommand{\backupend}{
+   \addtocounter{framenumbervorappendix}{-\value{framenumber}}
+   \addtocounter{framenumber}{\value{framenumbervorappendix}} 
+}
diff --git a/Folien/CEL_Beamer/templates/beamerthemekitwide.sty b/Folien/CEL_Beamer/templates/beamerthemekitwide.sty
index 53c6ef2..70dd716 100644
--- a/Folien/CEL_Beamer/templates/beamerthemekitwide.sty
+++ b/Folien/CEL_Beamer/templates/beamerthemekitwide.sty
@@ -1,215 +1,234 @@
-%% LaTeX-Beamer template for KIT design
-%% Widescreen
-%% by Erik Burger, Christian Hammer
-%% title picture by Klaus Krogmann
-%%
-%% version 2.1
-%%
-%% mostly compatible to KIT corporate design v2.0
-%% http://intranet.kit.edu/gestaltungsrichtlinien.php
-%%
-%% Problems, bugs and comments to
-%% burger@kit.edu
-
-\usepackage{templates/beamerthemekitbase}
-
-\usepackage{geometry}
-\geometry{papersize={17.07cm,9.6cm}}
-\setlength{\unitlength}{1mm}
-
-% \useoutertheme[height=0pt,width=4.27cm,left]{sidebar}
-
-\setbeamertemplate{title page}
-{
-\thispagestyle{empty}
-
-%middle block with name of institute
-\begin{textblock*}{\paperwidth}(1mm,47mm)
-\begin{pgfpicture}{0mm}{0mm}{\paperwidth-2mm}{6mm}
-	\color{black!50}
-	\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\paperwidth-2mm}{6mm}}
-	\pgfusepath{fill}
-	\pgftext[at=\pgfpoint{5mm}{3mm},left,center]{\textcolor{white}{\tiny\uppercase\expandafter{\insertinstitute}}}
-\end{pgfpicture}
-\end{textblock*}
-
-%elements on title page
-
-%KIT logo
-\begin{textblock*}{24mm}(6mm,5mm)
-\iflanguage{english}{%
-\includegraphics[width=23mm]{logos/kitlogo_en_rgb} 
-}{%
-\includegraphics[width=23mm]{logos/kitlogo_de_rgb} 
-}%
-\end{textblock*}
-
-%institute logo
-\begin{textblock*}{20mm}(150mm,4mm)
-\includegraphics[width=15mm]{logos/\@titlelogo} 
-\end{textblock*}
-
-%title
-\begin{textblock*}{160mm}(6mm,19mm)
-\begin{beamercolorbox}[wd=118mm,ht=14mm,dp=3mm,left]{white}%
-\Large\textbf{\inserttitle}
-\end{beamercolorbox}
-\end{textblock*}
-
-%subtitle
-\begin{textblock*}{160mm}(6mm,36mm)
-\scriptsize \insertsubtitle
-\end{textblock*}
-
-%author
-\begin{textblock*}{160mm}(6mm,40mm)
-\scriptsize\insertauthor~\textbar~\insertshortdate
-\end{textblock*}
-
-%legal KIT text
-\begin{textblock*}{80mm}[0,1](6mm,94.5mm)
-\fontsize{4pt}{6pt}\selectfont
-\iflanguage{english}{
-KIT -- University of the State of Baden-Wuerttemberg and National Laboratory of the Helmholtz Association}
-{KIT -- Universit{\"a}t des Landes Baden-W{\"u}rttemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft}
-\end{textblock*}
-
-\begin{textblock*}{16mm}(137mm,90mm)
-\fontsize{8pt}{8pt}\selectfont
-\bfseries
-\textcolor{white}{
-	\href{http://www.kit.edu}{www.kit.edu}
-}
-\end{textblock*}
-
-% title image
-
-\begin{textblock*}{\paperwidth}(1mm,53.5mm)
-\begin{overpic}[width=168.7mm,height=40mm]{logos/\@titleimage_wide}
-\put(-2,-1){
-	%mask curve for lower left corner of title image
-	\begin{pgfpicture}{0mm}{0mm}{3mm}{3mm}
-		\pgfpathqmoveto{0mm}{0mm}
-		\pgfpathlineto{\pgfpoint{3mm}{0mm}}
-		\pgfpathlineto{\pgfpoint{3mm}{1mm}}
-
-		{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}} 
-		\pgfpathlineto{\pgfpoint{1mm}{1mm}}
-		\pgfpathlineto{\pgfpoint{1mm}{3mm}}}
-
-		\pgfpathmoveto{\pgfpoint{1mm}{3mm}}
-		\pgfpathlineto{\pgfpoint{0mm}{3mm}}
-		\pgfpathlineto{\pgfpoint{0mm}{0mm}}
-		\pgfpathclose
-
-		\color{black!15}
-		\pgfusepath{fill}
-	\end{pgfpicture}
-}
-\end{overpic}
-\end{textblock*}
-
-}
-
-%background for pages
-%CH: for plain frames
-\newlength{\kitbottom}
-\usebackgroundtemplate{
-	\setlength{\kitbottom}{\ifbeamer@plainframe1mm\else4mm\fi}%
-\begin{pgfpicture}{0mm}{0mm}{\paperwidth}{\paperheight}
-
-	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
-	\pgfpathmoveto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}
-	\pgfpathlineto{\pgfpoint{1mm}{\kitbottom}}
-	\pgfpathlineto{\pgfpoint{1mm}{\paperheight-1mm}}}
-
-	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
-	\pgfpathmoveto{\pgfpoint{1mm}{\paperheight-1mm}}
-	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\paperheight-1mm}}
-	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}}
-
-	\color{white}
-	\pgfusepath{fill}
-
-\end{pgfpicture}%
-}
-
-%frametitle
-\setbeamertemplate{frametitle}
-{
-\vspace{2mm} %\hspace*{-4mm}
-\vbox{\hsize=9cm\bfseries\insertframetitle}
-
-\begin{textblock*}{15mm}(150.6mm,4mm)
-\iflanguage{english}{%
-\includegraphics[width=14mm]{logos/kitlogo_en_rgb} 
-}{%
-\includegraphics[width=14mm]{logos/kitlogo_de_rgb} 
-}%
-
-\end{textblock*}
-
-% obsolete as of KIT-CD v2.0
-%\begin{textblock*}{1.5mm}(1mm,1mm)
-%\begin{pgfpicture}{0mm}{0mm}{1.5mm}{9mm}
-	%\color{kit-green100}
-	%\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{1.5mm}{9mm}}
-	%\pgfusepath{fill}
-%\end{pgfpicture}%
-%\end{textblock*}
-
-}
-
-\setbeamertemplate{headline}
-{
-}
-
-%footer
-\setbeamertemplate{footline}
-{
-
-\begin{beamercolorbox}[wd=0.7\textwidth,ht=2.2mm,dp=1.5mm,leftskip=1.3em,rightskip=.5em]{author in head/foot}%
-\usebeamerfont{author in head/foot}%
-\fontsize{4pt}{6pt}\selectfont
-\iflanguage{english}{
-KIT -- University of the State of Baden-Wuerttemberg and National Laboratory of the Helmholtz Association}
-{KIT -- Universit{\"a}t des Landes Baden-W{\"u}rttemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft}
-\end{beamercolorbox}%
-\vspace*{-4mm}\hspace*{0.7\textwidth}%
-\begin{beamercolorbox}[wd=0.3\textwidth,ht=2.2mm,dp=1.5mm,left,leftskip=.5em]{title in head/foot}%
-\usebeamerfont{title in head/foot}%
-\hfill\insertshortdate\hspace{30pt}\insertframenumber{}/\inserttotalframenumber
-\end{beamercolorbox}%
-}
-
-% \setbeamerfont{title in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{10}{12}}}
-% \setbeamerfont{section in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{9}{12}}}
-% \setbeamerfont{subsection in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{8}{12}}}
-
-% \setbeamertemplate{sidebar \beamer@sidebarside}
-%   {
-%     \beamer@tempdim=\beamer@sidebarwidth%
-%     \advance\beamer@tempdim by -6pt%
-%     {\usebeamerfont{title in sidebar}%
-%       \vskip1.5em%
-%       \hskip3mm%
-%       \usebeamercolor[fg]{title in sidebar}%
-%       \insertshorttitle[width=\beamer@tempdim,left,respectlinebreaks]\par%
-%       \vskip1.25em%
-%     }%
-%     {%
-%       \hskip3mm%
-%       \usebeamercolor[fg]{author in sidebar}%
-%       \usebeamerfont{author in sidebar}%
-%       \insertshortauthor[width=\beamer@tempdim,left,respectlinebreaks]\par%
-%       \vskip1.25em%
-%     }%
-%     \hskip3mm\insertverticalnavigation{\beamer@sidebarwidth}%
-%     \vfill
-%     \ifx\beamer@sidebarside\beamer@lefttext%
-%     \else%
-%       \usebeamercolor{normal text}%
-%       \llap{\usebeamertemplate***{navigation symbols}\hskip0.1cm}%
-%       \vskip2pt%
-%     \fi%
-%   }%
+%% LaTeX-Beamer template for KIT design
+%% Widescreen
+%% by Erik Burger, Christian Hammer
+%% title picture by Klaus Krogmann
+%%
+%% version 2.1
+%%
+%% mostly compatible to KIT corporate design v2.0
+%% http://intranet.kit.edu/gestaltungsrichtlinien.php
+%%
+%% Problems, bugs and comments to
+%% burger@kit.edu
+
+\usepackage{templates/beamerthemekitbase}
+
+\usepackage{geometry}
+\geometry{papersize={17.07cm,9.6cm}}
+\setlength{\unitlength}{1mm}
+
+% \useoutertheme[height=0pt,width=4.27cm,left]{sidebar}
+
+\setbeamertemplate{title page}
+{
+  \thispagestyle{empty}
+
+  % middle block with name of institute
+  \begin{textblock*}{\paperwidth}(1mm,47mm)
+    \begin{pgfpicture}{0mm}{0mm}{\paperwidth-2mm}{6mm}
+      \color{black!50}
+      \pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{\paperwidth-2mm}{6mm}}
+      \pgfusepath{fill}
+	\pgftext[at=\pgfpoint{5mm}{4mm},left,center]{\textcolor{white}{\tiny\expandafter{\insertinstitute}}}
+	\pgftext[at=\pgfpoint{5mm}{2mm},left,center]{\textcolor{white}{\tiny\expandafter{Prof. Dr.-Ing. Laurent Schmalen}}}
+    \end{pgfpicture}
+  \end{textblock*}
+
+  % elements on title page
+
+  % KIT logo
+  \begin{textblock*}{24mm}(6mm,5mm)
+    \iflanguage{english}{%
+      \includegraphics[width=23mm]{logos/kitlogo_en_rgb} 
+    }{%
+      \includegraphics[width=23mm]{logos/kitlogo_de_rgb} 
+    }%
+  \end{textblock*}
+
+  % institute logo
+  \begin{textblock*}{20mm}(150mm,4mm)
+    \includegraphics[width=15mm]{logos/\@titlelogo} 
+  \end{textblock*}
+
+  % title
+  \begin{textblock*}{160mm}(6mm,19mm)
+    \begin{beamercolorbox}[wd=118mm,ht=14mm,dp=3mm,left]{white}%
+      \Large\textbf{\inserttitle}
+    \end{beamercolorbox}
+  \end{textblock*}
+
+  % subtitle
+  \begin{textblock*}{160mm}(6mm,36mm)
+    \scriptsize \insertsubtitle
+  \end{textblock*}
+
+  % author
+  \begin{textblock*}{160mm}(6mm,40mm)
+    \scriptsize\insertauthor~\textbar~\insertshortdate
+  \end{textblock*}
+
+  % legal KIT text
+  \begin{textblock*}{80mm}[0,1](6mm,94.5mm)
+    \fontsize{4pt}{6pt}\selectfont
+    \iflanguage{english}{
+      KIT -- University of the State of Baden-Wuerttemberg and National Laboratory of the Helmholtz Association}
+    {KIT -- Universit{\"a}t des Landes Baden-W{\"u}rttemberg und nationales Forschungszentrum in der Helmholtz-Gemeinschaft}
+  \end{textblock*}
+
+  \begin{textblock*}{16mm}(155mm,93mm)
+    \fontsize{8pt}{8pt}\selectfont
+    \bfseries
+    \textcolor{white}{
+      \href{https://www.kit.edu}{www.kit.edu}
+    }
+  \end{textblock*}
+
+  % title image
+
+  \begin{textblock*}{\paperwidth}(1mm,53.5mm)
+    \begin{overpic}[width=168.7mm,height=38mm]{logos/\@titleimage_wide}
+      \put(-2,-1){
+        % mask curve for lower left corner of title image
+        \begin{pgfpicture}{0mm}{0mm}{3mm}{3mm}
+          \pgfpathqmoveto{0mm}{0mm}
+          \pgfpathlineto{\pgfpoint{3mm}{0mm}}
+          \pgfpathlineto{\pgfpoint{3mm}{1mm}}
+
+          {\pgfsetcornersarced{\pgfpoint{2mm}{2mm}} 
+            \pgfpathlineto{\pgfpoint{1mm}{1mm}}
+            \pgfpathlineto{\pgfpoint{1mm}{3mm}}}
+
+          \pgfpathmoveto{\pgfpoint{1mm}{3mm}}
+          \pgfpathlineto{\pgfpoint{0mm}{3mm}}
+          \pgfpathlineto{\pgfpoint{0mm}{0mm}}
+          \pgfpathclose
+
+          \color{black!15}
+          \pgfusepath{fill}
+        \end{pgfpicture}
+      }
+    \end{overpic}
+  \end{textblock*}
+
+}
+
+%background for pages
+%CH: for plain frames
+\newlength{\kitbottom}
+\usebackgroundtemplate{
+	\setlength{\kitbottom}{\ifbeamer@plainframe1mm\else9mm\fi}%
+\begin{pgfpicture}{0mm}{0mm}{\paperwidth}{\paperheight}
+
+	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
+	\pgfpathmoveto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}
+	\pgfpathlineto{\pgfpoint{1mm}{\kitbottom}}
+	\pgfpathlineto{\pgfpoint{1mm}{\paperheight-1mm}}}
+
+	{\pgfsetcornersarced{\pgfpoint{2mm}{2mm}}
+	\pgfpathmoveto{\pgfpoint{1mm}{\paperheight-1mm}}
+	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\paperheight-1mm}}
+	\pgfpathlineto{\pgfpoint{\paperwidth-1mm}{\kitbottom}}}
+
+	\color{white}
+	\pgfusepath{fill}
+
+\end{pgfpicture}%
+}
+
+%frametitle
+\setbeamertemplate{frametitle}
+{
+\vspace{2mm} %\hspace*{-4mm}
+\vbox{\hsize=9cm\bfseries\insertframetitle}
+
+\begin{textblock*}{15mm}(150.6mm,4mm)
+\iflanguage{english}{%
+\includegraphics[width=14mm]{logos/kitlogo_en_rgb} 
+}{%
+\includegraphics[width=14mm]{logos/kitlogo_de_rgb} 
+}%
+
+\end{textblock*}
+
+% obsolete as of KIT-CD v2.0
+%\begin{textblock*}{1.5mm}(1mm,1mm)
+%\begin{pgfpicture}{0mm}{0mm}{1.5mm}{9mm}
+	%\color{kit-green100}
+	%\pgfpathrectangle{\pgfpoint{0mm}{0mm}}{\pgfpoint{1.5mm}{9mm}}
+	%\pgfusepath{fill}
+%\end{pgfpicture}%
+%\end{textblock*}
+
+}
+
+\setbeamertemplate{headline}
+{
+}
+
+%footer
+\setbeamertemplate{footline}
+{
+%\vskip1mm
+\begin{beamercolorbox}[wd=0.2\textwidth,ht=2mm,dp=4.75mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{author in head/foot}%
+	% Date and frame number
+	\textbf{\insertframenumber{}} \hspace{10pt} \insertshortdate
+\end{beamercolorbox}%
+\vspace*{-5.5mm}\hspace*{0.15\textwidth}%
+\begin{beamercolorbox}[wd=0.33\textwidth,ht=2mm,dp=3.5mm,leftskip=-8.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	%\insertshorttitle
+	\begin{tabular}{l} 
+		\insertshorttitle \\
+		\insertshortauthor
+	\end{tabular}
+\end{beamercolorbox}%
+%\vspace*{-7.2mm}\hspace*{0.25\textwidth}%
+\begin{beamercolorbox}[wd=0.42\textwidth,ht=2mm,dp=3.5mm,leftskip=1.3em,rightskip=.5em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	\begin{tabular}{r} 
+		Communications Engineering Lab \\
+		Prof. Dr.-Ing. Laurent Schmalen
+	\end{tabular}	
+\end{beamercolorbox}%
+\begin{beamercolorbox}[wd=0\textwidth,ht=2mm,dp=1.5mm,leftskip=2.0em,rightskip=.05em]{title in head/foot}%
+	\usebeamerfont{title in head/foot}%
+	% Title
+	\vspace*{-2.8mm}\hspace*{-0.6mm}%
+	\includegraphics[height=6.75mm]{logos/CEL_logo.pdf}
+\end{beamercolorbox}%
+}
+
+% \setbeamerfont{title in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{10}{12}}}
+% \setbeamerfont{section in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{9}{12}}}
+% \setbeamerfont{subsection in sidebar}{family=\sffamily,series=\mdseries,size={\fontsize{8}{12}}}
+
+% \setbeamertemplate{sidebar \beamer@sidebarside}
+%   {
+%     \beamer@tempdim=\beamer@sidebarwidth%
+%     \advance\beamer@tempdim by -6pt%
+%     {\usebeamerfont{title in sidebar}%
+%       \vskip1.5em%
+%       \hskip3mm%
+%       \usebeamercolor[fg]{title in sidebar}%
+%       \insertshorttitle[width=\beamer@tempdim,left,respectlinebreaks]\par%
+%       \vskip1.25em%
+%     }%
+%     {%
+%       \hskip3mm%
+%       \usebeamercolor[fg]{author in sidebar}%
+%       \usebeamerfont{author in sidebar}%
+%       \insertshortauthor[width=\beamer@tempdim,left,respectlinebreaks]\par%
+%       \vskip1.25em%
+%     }%
+%     \hskip3mm\insertverticalnavigation{\beamer@sidebarwidth}%
+%     \vfill
+%     \ifx\beamer@sidebarside\beamer@lefttext%
+%     \else%
+%       \usebeamercolor{normal text}%
+%       \llap{\usebeamertemplate***{navigation symbols}\hskip0.1cm}%
+%       \vskip2pt%
+%     \fi%
+%   }%
diff --git a/Folien/CEL_Beamer/templates/semirounded.sty b/Folien/CEL_Beamer/templates/semirounded.sty
index 961b829..b142492 100644
--- a/Folien/CEL_Beamer/templates/semirounded.sty
+++ b/Folien/CEL_Beamer/templates/semirounded.sty
@@ -1,218 +1,218 @@
-%% LaTeX-Beamer template for KIT design
-%% by Erik Burger, Christian Hammer
-%% title picture by Klaus Krogmann
-%%
-%% version 2.1
-%%
-%% mostly compatible to KIT corporate design v2.0
-%% http://intranet.kit.edu/gestaltungsrichtlinien.php
-%%
-%% Problems, bugs and comments to
-%% burger@kit.edu
-
-%% Semi-rounded boxes
-
-\RequirePackage{keyval}
-\renewcommand\beamerboxesrounded[2][]{%
-  \global\let\beamer@firstlineitemizeunskip=\relax%
-  \vbox\bgroup%
-  \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}%
-  \setkeys{beamerboxes}{#1}%
-  {%
-    \usebeamercolor{\bmb@lower}%
-    \globalcolorstrue%
-    \colorlet{lower.bg}{bg}%
-  }%
-  {%
-    \usebeamercolor{\bmb@upper}%
-    \globalcolorstrue%
-    \colorlet{upper.bg}{bg}%
-  }%
-  %
-  % Typeset head
-  %
-  \vskip4bp
-  \setbox\bmb@box=\hbox{%
-    \begin{minipage}[b]{\bmb@width}%
-      \usebeamercolor[fg]{\bmb@upper}%
-      #2%
-    \end{minipage}}%
-  \ifdim\wd\bmb@box=0pt%
-    \setbox\bmb@box=\hbox{}%
-    \ht\bmb@box=1.5pt%
-    \bmb@prevheight=-4.5pt%
-  \else%
-    \wd\bmb@box=\bmb@width%
-    \bmb@temp=\dp\bmb@box%
-    \ifdim\bmb@temp<1.5pt%
-      \bmb@temp=1.5pt%
-    \fi%
-    \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
-    \dp\bmb@box=0pt%
-    \bmb@prevheight=\ht\bmb@box%
-  \fi%
-  \bmb@temp=\bmb@width%
-  \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
-  \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
-  \hbox{%
-    \begin{pgfpicture}{0bp}{+-\ht\bmb@box}{0bp}{+-\ht\bmb@box}
-      \ifdim\wd\bmb@box=0pt%
-        \color{lower.bg}%
-      \else%        
-        \color{upper.bg}%
-      \fi%  
-      \pgfpathqmoveto{-4bp}{-1bp}
-      % Adaption for "KIT-Design"
-      \pgfpathlineto{\pgfpoint{-4bp}{3bp}}
-      %\pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp}
-      \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}}
-      \pgfpathcurveto%
-      {\pgfpoint{\bmb@dima}{3bp}}%
-      {\pgfpoint{\bmb@dimb}{1.2bp}}%
-      {\pgfpoint{\bmb@dimb}{-1bp}}%
-      \bmb@dima=-\ht\bmb@box%
-      \advance\bmb@dima by-2pt%
-      \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-      \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
-      \pgfusepath{fill}
-    \end{pgfpicture}%
-    \copy\bmb@box%
-  }%
-  \nointerlineskip%
-  \vskip-1pt%
-  \ifdim\wd\bmb@box=0pt%
-  \else%
-  \hbox{%
-    \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
-      \bmb@dima=\bmb@width%
-      \advance\bmb@dima by8bp%
-      \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
-      \pgfusepath{clip}
-      {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
-    \end{pgfpicture}%
-  }%
-  \nointerlineskip%
-  \vskip-0.5pt%
-  \fi%
-  \ifbmb@shadow%
-    \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}%
-    \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}%
-    \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}%
-  \fi%
-  \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}%
-  \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
-    \vskip2pt%
-    \usebeamercolor[fg]{\bmb@lower}%
-    \colorlet{beamerstructure}{upper.bg}%
-    \colorlet{structure}{upper.bg}%
-    %\color{.}%
-  }
-
-\def\endbeamerboxesrounded{%
-  \end{minipage}\egroup%
-  \wd\bmb@box=\bmb@width%
-  \bmb@temp=\dp\bmb@box%
-  \advance\bmb@temp by.5pt%
-  \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
-  \dp\bmb@box=0pt%
-  \bmb@temp=\wd\bmb@box%
-  \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
-  \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
-  \hbox{%
-    \begin{pgfpicture}{0bp}{0bp}{0bp}{0bp}
-      \ifbmb@shadow%
-      {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}}
-      \begin{pgfscope}
-        {%
-        \advance\bmb@temp by-1bp%
-        \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}%
-        \pgfusepath{clip}
-        }%
-        {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}}
-      \end{pgfscope}
-      \begin{pgfscope}
-        \advance\bmb@temp by-4bp%
-        \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}}
-        \pgfusepath{clip}
-        {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}%
-      \end{pgfscope}
-      \begin{pgfscope}
-        \advance\bmb@temp by 4bp%
-        \bmb@dima=\ht\bmb@box%
-        \advance\bmb@dima by\bmb@prevheight%
-        \advance\bmb@dima by 4bp%
-        \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
-        \pgfusepath{clip}
-        \advance\bmb@dima by-4bp%
-        {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}}
-        \advance\bmb@dima by-1bp%
-        \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
-        \pgfusepath{clip}
-        \advance\bmb@temp by4bp%
-        {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}%
-          \pgftransformrotate{90}%
-          \pgftext[left,base]{\box\bmb@boxshadow}}%
-      \end{pgfscope}
-      \fi%
-      \unhbox\bmb@colorbox%
-      \pgfpathqmoveto{-4bp}{1bp}
-      \pgfpathqcurveto{-4bp}{-1.2bp}{-2.2bp}{-3bp}{0bp}{-3bp}
-      %KIT-Design
-      \pgfpathlineto{\pgfpoint{\the\bmb@dimb}{-3bp}}
-      %\pgfpathcurveto%
-      %{\pgfpoint{\the\bmb@dima}{-3bp}}%
-      %{\pgfpoint{\the\bmb@dimb}{-1.2bp}}%
-      %{\pgfpoint{\the\bmb@dimb}{1bp}}%
-      {
-      \bmb@dima=\ht\bmb@box%
-      \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-      \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
-      \pgfusepath{fill}
-      }
-      \ifbmb@shadow%
-      {
-        \color{black!50!bg}
-        \pgfsetlinewidth{0pt}
-        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{-.5bp}}
-        \bmb@dima=\ht\bmb@box%
-        \advance\bmb@dima by\bmb@prevheight%
-        \advance\bmb@dima by 1bp%
-        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-        \pgfusepath{stroke}
-        \bmb@temp=\bmb@dima
-        \advance\bmb@dima by 1bp%
-        \color{black!31!bg}
-        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
-        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-        \pgfusepath{stroke}
-        \advance\bmb@dima by 1bp%
-        \advance\bmb@temp by 1bp%
-        \color{black!19!bg}
-        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
-        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-        \pgfusepath{stroke}
-        \advance\bmb@dima by 1bp%
-        \advance\bmb@temp by 1bp%
-        \color{black!6!bg}
-        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
-        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-        \pgfusepath{stroke}
-        \advance\bmb@dima by 1.5bp%
-        \advance\bmb@temp by 1bp%
-        \color{bg}
-        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
-        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
-        \pgfusepath{stroke}
-      }
-      \fi
-    \end{pgfpicture}%
-    \box\bmb@box%
-  }%
-  \ifbmb@shadow%
-    \vskip4bp minus 2bp%
-  \else%
-    \vskip2bp%
-  \fi%
-  \egroup% of \vbox\bgroup
-}
-
+%% LaTeX-Beamer template for KIT design
+%% by Erik Burger, Christian Hammer
+%% title picture by Klaus Krogmann
+%%
+%% version 2.1
+%%
+%% mostly compatible to KIT corporate design v2.0
+%% http://intranet.kit.edu/gestaltungsrichtlinien.php
+%%
+%% Problems, bugs and comments to
+%% burger@kit.edu
+
+%% Semi-rounded boxes
+
+\RequirePackage{keyval}
+\renewcommand\beamerboxesrounded[2][]{%
+  \global\let\beamer@firstlineitemizeunskip=\relax%
+  \vbox\bgroup%
+  \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}%
+  \setkeys{beamerboxes}{#1}%
+  {%
+    \usebeamercolor{\bmb@lower}%
+    \globalcolorstrue%
+    \colorlet{lower.bg}{bg}%
+  }%
+  {%
+    \usebeamercolor{\bmb@upper}%
+    \globalcolorstrue%
+    \colorlet{upper.bg}{bg}%
+  }%
+  %
+  % Typeset head
+  %
+  \vskip4bp
+  \setbox\bmb@box=\hbox{%
+    \begin{minipage}[b]{\bmb@width}%
+      \usebeamercolor[fg]{\bmb@upper}%
+      #2%
+    \end{minipage}}%
+  \ifdim\wd\bmb@box=0pt%
+    \setbox\bmb@box=\hbox{}%
+    \ht\bmb@box=1.5pt%
+    \bmb@prevheight=-4.5pt%
+  \else%
+    \wd\bmb@box=\bmb@width%
+    \bmb@temp=\dp\bmb@box%
+    \ifdim\bmb@temp<1.5pt%
+      \bmb@temp=1.5pt%
+    \fi%
+    \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
+    \dp\bmb@box=0pt%
+    \bmb@prevheight=\ht\bmb@box%
+  \fi%
+  \bmb@temp=\bmb@width%
+  \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
+  \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
+  \hbox{%
+    \begin{pgfpicture}{0bp}{+-\ht\bmb@box}{0bp}{+-\ht\bmb@box}
+      \ifdim\wd\bmb@box=0pt%
+        \color{lower.bg}%
+      \else%        
+        \color{upper.bg}%
+      \fi%  
+      \pgfpathqmoveto{-4bp}{-1bp}
+      % Adaption for "KIT-Design"
+      \pgfpathlineto{\pgfpoint{-4bp}{3bp}}
+      %\pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp}
+      \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}}
+      \pgfpathcurveto%
+      {\pgfpoint{\bmb@dima}{3bp}}%
+      {\pgfpoint{\bmb@dimb}{1.2bp}}%
+      {\pgfpoint{\bmb@dimb}{-1bp}}%
+      \bmb@dima=-\ht\bmb@box%
+      \advance\bmb@dima by-2pt%
+      \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+      \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+      \pgfusepath{fill}
+    \end{pgfpicture}%
+    \copy\bmb@box%
+  }%
+  \nointerlineskip%
+  \vskip-1pt%
+  \ifdim\wd\bmb@box=0pt%
+  \else%
+  \hbox{%
+    \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
+      \bmb@dima=\bmb@width%
+      \advance\bmb@dima by8bp%
+      \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
+      \pgfusepath{clip}
+      {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
+    \end{pgfpicture}%
+  }%
+  \nointerlineskip%
+  \vskip-0.5pt%
+  \fi%
+  \ifbmb@shadow%
+    \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}%
+    \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}%
+    \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}%
+  \fi%
+  \setbox\bmb@colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}%
+  \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
+    \vskip2pt%
+    \usebeamercolor[fg]{\bmb@lower}%
+    \colorlet{beamerstructure}{upper.bg}%
+    \colorlet{structure}{upper.bg}%
+    %\color{.}%
+  }
+
+\def\endbeamerboxesrounded{%
+  \end{minipage}\egroup%
+  \wd\bmb@box=\bmb@width%
+  \bmb@temp=\dp\bmb@box%
+  \advance\bmb@temp by.5pt%
+  \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
+  \dp\bmb@box=0pt%
+  \bmb@temp=\wd\bmb@box%
+  \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
+  \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
+  \hbox{%
+    \begin{pgfpicture}{0bp}{0bp}{0bp}{0bp}
+      \ifbmb@shadow%
+      {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}}
+      \begin{pgfscope}
+        {%
+        \advance\bmb@temp by-1bp%
+        \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}%
+        \pgfusepath{clip}
+        }%
+        {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}}
+      \end{pgfscope}
+      \begin{pgfscope}
+        \advance\bmb@temp by-4bp%
+        \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}}
+        \pgfusepath{clip}
+        {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}%
+      \end{pgfscope}
+      \begin{pgfscope}
+        \advance\bmb@temp by 4bp%
+        \bmb@dima=\ht\bmb@box%
+        \advance\bmb@dima by\bmb@prevheight%
+        \advance\bmb@dima by 4bp%
+        \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
+        \pgfusepath{clip}
+        \advance\bmb@dima by-4bp%
+        {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}}
+        \advance\bmb@dima by-1bp%
+        \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
+        \pgfusepath{clip}
+        \advance\bmb@temp by4bp%
+        {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}%
+          \pgftransformrotate{90}%
+          \pgftext[left,base]{\box\bmb@boxshadow}}%
+      \end{pgfscope}
+      \fi%
+      \unhbox\bmb@colorbox%
+      \pgfpathqmoveto{-4bp}{1bp}
+      \pgfpathqcurveto{-4bp}{-1.2bp}{-2.2bp}{-3bp}{0bp}{-3bp}
+      %KIT-Design
+      \pgfpathlineto{\pgfpoint{\the\bmb@dimb}{-3bp}}
+      %\pgfpathcurveto%
+      %{\pgfpoint{\the\bmb@dima}{-3bp}}%
+      %{\pgfpoint{\the\bmb@dimb}{-1.2bp}}%
+      %{\pgfpoint{\the\bmb@dimb}{1bp}}%
+      {
+      \bmb@dima=\ht\bmb@box%
+      \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+      \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+      \pgfusepath{fill}
+      }
+      \ifbmb@shadow%
+      {
+        \color{black!50!bg}
+        \pgfsetlinewidth{0pt}
+        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{-.5bp}}
+        \bmb@dima=\ht\bmb@box%
+        \advance\bmb@dima by\bmb@prevheight%
+        \advance\bmb@dima by 1bp%
+        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+        \pgfusepath{stroke}
+        \bmb@temp=\bmb@dima
+        \advance\bmb@dima by 1bp%
+        \color{black!31!bg}
+        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+        \pgfusepath{stroke}
+        \advance\bmb@dima by 1bp%
+        \advance\bmb@temp by 1bp%
+        \color{black!19!bg}
+        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+        \pgfusepath{stroke}
+        \advance\bmb@dima by 1bp%
+        \advance\bmb@temp by 1bp%
+        \color{black!6!bg}
+        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+        \pgfusepath{stroke}
+        \advance\bmb@dima by 1.5bp%
+        \advance\bmb@temp by 1bp%
+        \color{bg}
+        \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+        \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+        \pgfusepath{stroke}
+      }
+      \fi
+    \end{pgfpicture}%
+    \box\bmb@box%
+  }%
+  \ifbmb@shadow%
+    \vskip4bp minus 2bp%
+  \else%
+    \vskip2bp%
+  \fi%
+  \egroup% of \vbox\bgroup
+}
+
diff --git a/Folien/CEL_Beamer/templates/tikzkit.sty b/Folien/CEL_Beamer/templates/tikzkit.sty
index b1aa5af..63b7c94 100644
--- a/Folien/CEL_Beamer/templates/tikzkit.sty
+++ b/Folien/CEL_Beamer/templates/tikzkit.sty
@@ -1,358 +1,358 @@
-%% Tikz-Styles for Palladio Component Model symbols
-%% by Erik Burger
-%%
-%% version 2010-12-13
-%%
-%% Problems, bugs and comments to
-%% burger@kit.edu
-
-\usepackage{tikz}
-\usetikzlibrary{positioning}
-\usetikzlibrary{arrows}
-\usetikzlibrary{fit}
-\usetikzlibrary{petri}
-\usetikzlibrary{decorations.markings}
-\usetikzlibrary{decorations.pathmorphing}
-\usetikzlibrary{fit}
-\usetikzlibrary{automata}
-\usetikzlibrary{shapes}
-\usetikzlibrary{shadows}
-\usetikzlibrary{calc}
-
-%% Vertikal geteilter Kreis
-\pgfdeclareshape{circle vertical split}
-{
-  \inheritsavedanchors[from=circle]
-  \inheritanchorborder[from=circle]
-  \inheritanchor[from=circle]{north}
-  \inheritanchor[from=circle]{north west}
-  \inheritanchor[from=circle]{north east}
-  \inheritanchor[from=circle]{center}
-  \inheritanchor[from=circle]{west}
-  \inheritanchor[from=circle]{east}
-  \inheritanchor[from=circle]{mid}
-  \inheritanchor[from=circle]{mid west}
-  \inheritanchor[from=circle]{mid east}
-  \inheritanchor[from=circle]{base}
-  \inheritanchor[from=circle]{base west}
-  \inheritanchor[from=circle]{base east}
-  \inheritanchor[from=circle]{south}
-  \inheritanchor[from=circle]{south west}
-  \inheritanchor[from=circle]{south east}
-  \inheritbackgroundpath[from=circle]
-  \foregroundpath{
-    \centerpoint%
-    \pgf@xc=\pgf@x%
-    \pgf@yc=\pgf@y%
-    \pgfutil@tempdima=\radius%
-    \pgfmathsetlength{\pgf@xb}{\pgfkeysvalueof{/pgf/outer xsep}}%  
-    \pgfmathsetlength{\pgf@yb}{\pgfkeysvalueof{/pgf/outer ysep}}%  
-    \ifdim\pgf@xb<\pgf@yb%
-      \advance\pgfutil@tempdima by-\pgf@yb%
-    \else%
-      \advance\pgfutil@tempdima by-\pgf@xb%
-    \fi%
-    \advance\pgfutil@tempdima by-.5\pgflinewidth%  
-    \pgfsetshortenstart{0pt}%
-    \pgfsetshortenend{0pt}%
-    \pgfsetarrows{-}%  
-    \pgfpathmoveto{\pgfpointadd{\centerpoint}{\pgfqpoint{0pt}{-1\pgfutil@tempdima}}}%
-    \pgfpathlineto{\pgfpointadd{\centerpoint}{\pgfqpoint{0pt}{\pgfutil@tempdima}}}%
-    \pgfusepath{stroke}%
-  }
-}
-
-\tikzset{
-%% Color Shadings
-blueshading/.style={shade, top color=white, bottom color=kit-blue30, draw=kit-blue100, thick},
-greyshading/.style={shade, top color=white, bottom color=black!30, draw=black!50, thick},
-blackshading/.style={shade, top color=black!50, bottom color=black!95, middle color=black!95, draw=black!95, thick},
-greenshading/.style={shade, top color=white, bottom color=kit-green30, draw=kit-green100, thick},
-redshading/.style={shade, top color=white, bottom color=kit-red30, draw=kit-red100, thick},
-yellowshading/.style={shade, top color=white, bottom color=kit-yellow30, draw=kit-orange50, thick},
-%% Boxes
-roundbox/.style={rectangle, rounded corners=.5ex}, 
-%% PCM Actions
-seffaction/.style={rectangle split, rectangle split parts=2, rectangle split part align={center}, text centered, rounded corners},
-pcmball/.style={shade, ball color=kit-blue100,circle,fill},
-startaction/.style={pcmball,minimum size=1ex},
-stopaction/.style={startaction,draw=black,double},
-%% Petri net/Queueing Petri net symbols
-pnplace/.style={circle, draw, minimum size=2em},
-pntrans/.style={rectangle, draw, minimum height=2em},
-qpnplace/.style={circle vertical split, draw, minimum size=2em},
-subnetplace/.style={qpnplace, double},
-}
-
-%% Baseline adaptation for PCM symbols
-\tikzstyle{pcm} = [baseline=-.2ex]
-
-%% Ragged left text for boxes
-\tikzoption{text badly
-raggedleft}[]{\def\tikz@text@action{\raggedleft\relax}}
-\tikzoption{text raggedleft}[]%
-{\def\tikz@text@action{\raggedleft\rightskip\z@ plus2em
-\spaceskip.3333em \xspaceskip.5em\relax}}
-
-
-%% Layers
-\pgfdeclarelayer{l1}
-\pgfdeclarelayer{l2}
-\pgfdeclarelayer{l3}
-\pgfdeclarelayer{l4}
-\pgfdeclarelayer{l5}
-\pgfdeclarelayer{l6}
-\pgfdeclarelayer{l7}
-\pgfdeclarelayer{l8}
-\pgfdeclarelayer{l9}
-\pgfsetlayers{main,l1,l2,l3,l4,l5,l6,l7,l8,l9}
-
-% Internal Action
-
-\newcommand{\pcmintaction}[2][]{
-	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {};
-	\draw[thick] (#2.north) -- ([yshift=.5ex]#2.north);
-	\draw[thick] (#2.south) -- ([yshift=-.5ex]#2.south);
-}
-
-\newcommand{\pcmextaction}[2][]{
-	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {};
-	\draw[thick,<-] (#2.north) -- ([yshift=1ex]#2.north);
-	\draw[thick,->] (#2.south) -- ([yshift=-.8ex]#2.south);
-	\draw[ultra thick,->,color=red!70!black] (#2.east) -- ([xshift=1ex]#2.east);
-}
-
-
-\newcommand{\pcmloopaction}[2][]{
-	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {} 
-	edge [->, in=30, out=90, looseness=1, distance=2ex, thick] node {} (#2);
-}
-
-\newcommand{\pcmiterator}[2][]{
-\begin{scope}[decoration={
-	markings, mark=at position .5 with {\arrow[red, line width=.2ex]{>}}}, #1]
-	\node[matrix,draw=black!75, row sep=.3ex, inner sep=.3ex]	(#2) {
-	\draw[red,thick] (0,0) -- (.7ex,0);\\
-	\draw[red,thick] (0,0) -- (.7ex,0);\\
-	\draw[red,thick] (0,0) -- (.7ex,0);\\ };
-	\draw [thick,black!75,postaction=decorate] 
-	(#2.south) .. controls (0,-1.5ex) and (1.4ex,-1.5ex) .. 
-	(1.4ex,0) .. controls (1.4ex,1.5ex) and (0,1.5ex) .. (#2.north);
-\end{scope}
-}
-
-\newcommand{\pcmbranch}[2][]{
-	{\pgfsetcornersarced{\pgfpointorigin}
-	\scriptsize
-	\node[diamond, shade, ball color=kit-blue100, inner sep=.1ex, text width=1.2ex, #1] (#2) {\color{white}\scriptsize\textbf?};
-	\draw[thick] (#2.north) -- ([yshift=.8ex]#2.north);
-	\draw[thick] (#2.south west) -- ([xshift=-.7ex,yshift=-.7ex]#2.south west);
-	\draw[thick] (#2.south east) -- ([xshift=.7ex, yshift=-.7ex]#2.south east);
-	}
-}
-
-\newcommand{\pcmfork}{
-\begin{scope}[very thick,black!75]
-	\draw (0,0) -- (0,.4em) -- (1em,.4em) -- (1em,0em);
-	\draw (.33em,.4em) -- (.33em,0em);
-	\draw (.66em,.4em) -- (.66em,0em);
-	\draw (.5em,1em) -- (.5em,.4em);
-	\draw (.2em,.75em) -- (.5em,.45em) -- (.8em,.75em);
-\end{scope}
-}
-
-\newcommand{\pcmnote}{
-	{\pgfsetcornersarced{\pgfpointorigin}
-	\path[draw, black!75, thick, shade, top color=white, bottom color=yellow] (0,0) -- (2ex,0) -- (2ex,1ex) -- (1.5ex,1.5ex) -- (0,1.5ex) -- cycle;
-	\draw[black!75, thick] (2ex,1ex) -- (1.5ex,1ex) -- (1.5ex,1.5ex);
-	}
-}
-
-\newcommand{\pcmstart}[2][]{
-	\node[startaction, text width=0cm, #1] (#2) {};
-}
-
-\newcommand{\pcmstop}[2][]{
-	\node[stopaction, text width=0cm, #1] (#2) {};
-}
-
-\newcommand{\pcmsetvar}[2][]{
-	\node[rectangle,draw=gray,ultra thick,dashed,#1] (#2) {\$x};
-}
-
-\newcommand{\pcmacq}{
-\begin{scope}[every token/.style={color=kit-blue100,minimum size=.2ex}]
-	\node[place, minimum size=1em,shade,
-		bottom color=kit-blue30,top color=white,shading angle=30] {}
-		[children are tokens, token distance=.4ex]
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node (inlier) [token] {}}
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node [token] {}};
-	\node[token] (outlier) at (.6em,.6em) {};
-	\draw[->, red, very thick] (inlier) -- (outlier);
-\end{scope}
-}
-
-\newcommand{\pcmrel}{
-\begin{scope}[every token/.style={color=kit-blue100,minimum size=.2ex}]
-	\node[place, minimum size=1em,shade,
-		bottom color=kit-blue30,top color=white,shading angle=30] {}
-		[children are tokens, token distance=.4ex]
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node (inlier) [token] {}}
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node [token] {}}
-		child {node [token] {}};
-	\node[token] (outlier) at (.6em,.6em) {};
-	\draw[<-, red, very thick] (inlier) -- (outlier);
-\end{scope}
-}
-
-\newcommand{\pcmdice}{
-	\tikzset{point/.style={circle,fill=black,minimum size=.4ex,inner sep=0pt}}
-\begin{scope}[every node/.append style={yslant=-0.5},yslant=-0.5]
-	\shade[right color=white, left color=kit-blue30, draw=black, 
-		rounded corners=.1ex] (0,0) rectangle +(1em,1em);
-	\node [point] 	at (.25em,.25em) {};
-	\node [point] 	at (.25em,.75em) {};
-	\node [point] 	at (.5em,.5em) {};
-	\node [point] 	at (.75em,.25em) {};
-	\node [point] 	at (.75em,.75em) {};
-\end{scope}
-
-\begin{scope}[every node/.append style={yslant=0.5},yslant=0.5]
-	\shade[left color=white, right color=kit-blue30, draw=black, 
-		rounded corners=.1ex] (1em,-1em) rectangle +(1em,1em);
-	\node [point] 	at (1.25em,-.25em) {};
-	\node [point] 	at (1.25em,-.75em) {};
-	\node [point] 	at (1.75em,-.25em) {};
-	\node [point] 	at (1.75em,-.75em) {};
-\end{scope}
-
-
-\begin{scope}[every node/.append style={
-    yslant=0.5,xslant=-1},yslant=0.5,xslant=-1
-  ]
-  \shade[bottom color=white, top color=kit-blue30, draw=black, 
-		rounded corners=.1ex] (2em,1em) rectangle +(-1em,-1em);
-	\node [point] 	at (1.25em,.25em) {};
-	\node [point] 	at (1.25em,.75em) {};
-	\node [point] 	at (1.5em,.25em) {};
-	\node [point] 	at (1.5em,.75em) {};
-	\node [point] 	at (1.75em,.25em) {};
-	\node [point] 	at (1.75em,.75em) {};
-\end{scope}
-
-	\draw[thick, color=black] (.5em,-.25em) -- +(-.7ex,-.7ex);
-	\draw[thick, color=black] (1.5em,-.25em) -- +(.7ex,-.7ex);
-
-}
-
-\newcommand{\pcmcertsign}{
-\begin{scope}[rotate=30]
-\node [draw, red, thick, circle, rotate=30] (certified) at (0,0) {\scriptsize CERTIFIED};
-\draw [red, thick] (.67,.2) arc (16.6:163.4:7mm) -- cycle;
-\draw [red, thick] (-.67,-.2) arc (196.6:343.4:7mm) -- cycle;
-\end{scope}
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Position
-
-\newcommand{\pcmcomponentsymbol}[3]{
-	\node[rectangle, minimum width=1.2em, minimum height=1.2em, #1]	
-		(#2)	#3 {};
-	\filldraw[#1]	
-		($(#2)+(-1em,.1em)$)	rectangle	+(.7em,.3em)
-		($(#2)+(-1em,-.1em)$)	rectangle	+(.7em,-.3em);
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Text
-% #4 = oberer Layer
-% #5 = unterer Layer
-% #6 = Position
-
-\newcommand{\pcmcomponentbodyonlayers}[6]{
-	\begin{pgfonlayer}{#4}
-	\node[minimum width=4em] (#2text) #6 {\small #3};
-	\pcmcomponentsymbol{fill=white, draw=black}{#2componentsymbol}{at ($(#2text.east)+(-1em,1.5em)$)}
-	\end{pgfonlayer}
-	\begin{pgfonlayer}{#5}
-	\node[draw=black, rectangle, inner sep = .2em, #1] 	(#2) [fit=(#2text) (#2componentsymbol)] {};
-	\end{pgfonlayer}
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Text
-% #4 = Position
-\newcommand{\pcmcomponentbody}[4]{
-	\pcmcomponentbodyonlayers{#1}{#2}{#3}{l4}{l3}{#4}
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Position
-
-\newcommand{\pcmlolliwest}[3]{
-	\node[circle, minimum size=1ex, draw, anchor=east, xshift=-1em, #1] (#2) at #3 {};
-	\draw[#1] #3 -- (#2);
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Position
-
-\newcommand{\pcmarceast}[3]{
-	\node[xshift=1em] (#2) at #3 {};
-	\draw[#1] #3 -- (#2.center);
-	\draw[#1] ($(#2)+(1.4ex,1.4ex)$) arc (90:270:1.4ex);
-
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Text
-% #4 = oberer Layer
-% #5 = unterer Layer
-% #6 = Position
-
-\newcommand{\pcmcomponentonlayers}[6]{
-	\pcmcomponentbodyonlayers{#1}{#2}{#3}{#4}{#5}{#6}	
-
-	\begin{pgfonlayer}{#5}
-	\pcmlolliwest{#1}{#2lolli}{(#2.west)}
-	\pcmarceast{#1}{#2arc}{(#2.east)}
-	\end{pgfonlayer}
-}
-
-% #1 = Formatierung
-% #2 = Name des Nodes
-% #3 = Text
-% #4 = Position
-\newcommand{\pcmcomponent}[4]{
-	\pcmcomponentonlayers{#1}{#2}{#3}{l4}{l3}{#4}
-}
-
-
-% Extrudieren von rechteckigen Shapes
-%
-% #1 = Name des Nodes
-% #2 = Abstand
-% #3 = Zeichenoptionen
-
-\newcommand{\pcmextrude}[3]{
-\path[#3] (#1.north west) -- (#1.north east) -- (#1.south east) -- (#1.south west) -- (#1.north west) -- ++(#2,#2) -- ($(#1.north east)+(#2,#2)$) -- ($(#1.south east)+(#2,#2)$) -- (#1.south east) (#1.north east) -- ($(#1.north east)+(#2,#2)$); 
-}
-
-
-
+%% Tikz-Styles for Palladio Component Model symbols
+%% by Erik Burger
+%%
+%% version 2010-12-13
+%%
+%% Problems, bugs and comments to
+%% burger@kit.edu
+
+\usepackage{tikz}
+\usetikzlibrary{positioning}
+\usetikzlibrary{arrows}
+\usetikzlibrary{fit}
+\usetikzlibrary{petri}
+\usetikzlibrary{decorations.markings}
+\usetikzlibrary{decorations.pathmorphing}
+\usetikzlibrary{fit}
+\usetikzlibrary{automata}
+\usetikzlibrary{shapes}
+\usetikzlibrary{shadows}
+\usetikzlibrary{calc}
+
+%% Vertikal geteilter Kreis
+\pgfdeclareshape{circle vertical split}
+{
+  \inheritsavedanchors[from=circle]
+  \inheritanchorborder[from=circle]
+  \inheritanchor[from=circle]{north}
+  \inheritanchor[from=circle]{north west}
+  \inheritanchor[from=circle]{north east}
+  \inheritanchor[from=circle]{center}
+  \inheritanchor[from=circle]{west}
+  \inheritanchor[from=circle]{east}
+  \inheritanchor[from=circle]{mid}
+  \inheritanchor[from=circle]{mid west}
+  \inheritanchor[from=circle]{mid east}
+  \inheritanchor[from=circle]{base}
+  \inheritanchor[from=circle]{base west}
+  \inheritanchor[from=circle]{base east}
+  \inheritanchor[from=circle]{south}
+  \inheritanchor[from=circle]{south west}
+  \inheritanchor[from=circle]{south east}
+  \inheritbackgroundpath[from=circle]
+  \foregroundpath{
+    \centerpoint%
+    \pgf@xc=\pgf@x%
+    \pgf@yc=\pgf@y%
+    \pgfutil@tempdima=\radius%
+    \pgfmathsetlength{\pgf@xb}{\pgfkeysvalueof{/pgf/outer xsep}}%  
+    \pgfmathsetlength{\pgf@yb}{\pgfkeysvalueof{/pgf/outer ysep}}%  
+    \ifdim\pgf@xb<\pgf@yb%
+      \advance\pgfutil@tempdima by-\pgf@yb%
+    \else%
+      \advance\pgfutil@tempdima by-\pgf@xb%
+    \fi%
+    \advance\pgfutil@tempdima by-.5\pgflinewidth%  
+    \pgfsetshortenstart{0pt}%
+    \pgfsetshortenend{0pt}%
+    \pgfsetarrows{-}%  
+    \pgfpathmoveto{\pgfpointadd{\centerpoint}{\pgfqpoint{0pt}{-1\pgfutil@tempdima}}}%
+    \pgfpathlineto{\pgfpointadd{\centerpoint}{\pgfqpoint{0pt}{\pgfutil@tempdima}}}%
+    \pgfusepath{stroke}%
+  }
+}
+
+\tikzset{
+%% Color Shadings
+blueshading/.style={shade, top color=white, bottom color=kit-blue30, draw=kit-blue100, thick},
+greyshading/.style={shade, top color=white, bottom color=black!30, draw=black!50, thick},
+blackshading/.style={shade, top color=black!50, bottom color=black!95, middle color=black!95, draw=black!95, thick},
+greenshading/.style={shade, top color=white, bottom color=kit-green30, draw=kit-green100, thick},
+redshading/.style={shade, top color=white, bottom color=kit-red30, draw=kit-red100, thick},
+yellowshading/.style={shade, top color=white, bottom color=kit-yellow30, draw=kit-orange50, thick},
+%% Boxes
+roundbox/.style={rectangle, rounded corners=.5ex}, 
+%% PCM Actions
+seffaction/.style={rectangle split, rectangle split parts=2, rectangle split part align={center}, text centered, rounded corners},
+pcmball/.style={shade, ball color=kit-blue100,circle,fill},
+startaction/.style={pcmball,minimum size=1ex},
+stopaction/.style={startaction,draw=black,double},
+%% Petri net/Queueing Petri net symbols
+pnplace/.style={circle, draw, minimum size=2em},
+pntrans/.style={rectangle, draw, minimum height=2em},
+qpnplace/.style={circle vertical split, draw, minimum size=2em},
+subnetplace/.style={qpnplace, double},
+}
+
+%% Baseline adaptation for PCM symbols
+\tikzstyle{pcm} = [baseline=-.2ex]
+
+%% Ragged left text for boxes
+\tikzoption{text badly
+raggedleft}[]{\def\tikz@text@action{\raggedleft\relax}}
+\tikzoption{text raggedleft}[]%
+{\def\tikz@text@action{\raggedleft\rightskip\z@ plus2em
+\spaceskip.3333em \xspaceskip.5em\relax}}
+
+
+%% Layers
+\pgfdeclarelayer{l1}
+\pgfdeclarelayer{l2}
+\pgfdeclarelayer{l3}
+\pgfdeclarelayer{l4}
+\pgfdeclarelayer{l5}
+\pgfdeclarelayer{l6}
+\pgfdeclarelayer{l7}
+\pgfdeclarelayer{l8}
+\pgfdeclarelayer{l9}
+\pgfsetlayers{main,l1,l2,l3,l4,l5,l6,l7,l8,l9}
+
+% Internal Action
+
+\newcommand{\pcmintaction}[2][]{
+	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {};
+	\draw[thick] (#2.north) -- ([yshift=.5ex]#2.north);
+	\draw[thick] (#2.south) -- ([yshift=-.5ex]#2.south);
+}
+
+\newcommand{\pcmextaction}[2][]{
+	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {};
+	\draw[thick,<-] (#2.north) -- ([yshift=1ex]#2.north);
+	\draw[thick,->] (#2.south) -- ([yshift=-.8ex]#2.south);
+	\draw[ultra thick,->,color=red!70!black] (#2.east) -- ([xshift=1ex]#2.east);
+}
+
+
+\newcommand{\pcmloopaction}[2][]{
+	\node[pcmball, minimum size=.7ex, text width=0ex, #1] (#2) {} 
+	edge [->, in=30, out=90, looseness=1, distance=2ex, thick] node {} (#2);
+}
+
+\newcommand{\pcmiterator}[2][]{
+\begin{scope}[decoration={
+	markings, mark=at position .5 with {\arrow[red, line width=.2ex]{>}}}, #1]
+	\node[matrix,draw=black!75, row sep=.3ex, inner sep=.3ex]	(#2) {
+	\draw[red,thick] (0,0) -- (.7ex,0);\\
+	\draw[red,thick] (0,0) -- (.7ex,0);\\
+	\draw[red,thick] (0,0) -- (.7ex,0);\\ };
+	\draw [thick,black!75,postaction=decorate] 
+	(#2.south) .. controls (0,-1.5ex) and (1.4ex,-1.5ex) .. 
+	(1.4ex,0) .. controls (1.4ex,1.5ex) and (0,1.5ex) .. (#2.north);
+\end{scope}
+}
+
+\newcommand{\pcmbranch}[2][]{
+	{\pgfsetcornersarced{\pgfpointorigin}
+	\scriptsize
+	\node[diamond, shade, ball color=kit-blue100, inner sep=.1ex, text width=1.2ex, #1] (#2) {\color{white}\scriptsize\textbf?};
+	\draw[thick] (#2.north) -- ([yshift=.8ex]#2.north);
+	\draw[thick] (#2.south west) -- ([xshift=-.7ex,yshift=-.7ex]#2.south west);
+	\draw[thick] (#2.south east) -- ([xshift=.7ex, yshift=-.7ex]#2.south east);
+	}
+}
+
+\newcommand{\pcmfork}{
+\begin{scope}[very thick,black!75]
+	\draw (0,0) -- (0,.4em) -- (1em,.4em) -- (1em,0em);
+	\draw (.33em,.4em) -- (.33em,0em);
+	\draw (.66em,.4em) -- (.66em,0em);
+	\draw (.5em,1em) -- (.5em,.4em);
+	\draw (.2em,.75em) -- (.5em,.45em) -- (.8em,.75em);
+\end{scope}
+}
+
+\newcommand{\pcmnote}{
+	{\pgfsetcornersarced{\pgfpointorigin}
+	\path[draw, black!75, thick, shade, top color=white, bottom color=yellow] (0,0) -- (2ex,0) -- (2ex,1ex) -- (1.5ex,1.5ex) -- (0,1.5ex) -- cycle;
+	\draw[black!75, thick] (2ex,1ex) -- (1.5ex,1ex) -- (1.5ex,1.5ex);
+	}
+}
+
+\newcommand{\pcmstart}[2][]{
+	\node[startaction, text width=0cm, #1] (#2) {};
+}
+
+\newcommand{\pcmstop}[2][]{
+	\node[stopaction, text width=0cm, #1] (#2) {};
+}
+
+\newcommand{\pcmsetvar}[2][]{
+	\node[rectangle,draw=gray,ultra thick,dashed,#1] (#2) {\$x};
+}
+
+\newcommand{\pcmacq}{
+\begin{scope}[every token/.style={color=kit-blue100,minimum size=.2ex}]
+	\node[place, minimum size=1em,shade,
+		bottom color=kit-blue30,top color=white,shading angle=30] {}
+		[children are tokens, token distance=.4ex]
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node (inlier) [token] {}}
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node [token] {}};
+	\node[token] (outlier) at (.6em,.6em) {};
+	\draw[->, red, very thick] (inlier) -- (outlier);
+\end{scope}
+}
+
+\newcommand{\pcmrel}{
+\begin{scope}[every token/.style={color=kit-blue100,minimum size=.2ex}]
+	\node[place, minimum size=1em,shade,
+		bottom color=kit-blue30,top color=white,shading angle=30] {}
+		[children are tokens, token distance=.4ex]
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node (inlier) [token] {}}
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node [token] {}}
+		child {node [token] {}};
+	\node[token] (outlier) at (.6em,.6em) {};
+	\draw[<-, red, very thick] (inlier) -- (outlier);
+\end{scope}
+}
+
+\newcommand{\pcmdice}{
+	\tikzset{point/.style={circle,fill=black,minimum size=.4ex,inner sep=0pt}}
+\begin{scope}[every node/.append style={yslant=-0.5},yslant=-0.5]
+	\shade[right color=white, left color=kit-blue30, draw=black, 
+		rounded corners=.1ex] (0,0) rectangle +(1em,1em);
+	\node [point] 	at (.25em,.25em) {};
+	\node [point] 	at (.25em,.75em) {};
+	\node [point] 	at (.5em,.5em) {};
+	\node [point] 	at (.75em,.25em) {};
+	\node [point] 	at (.75em,.75em) {};
+\end{scope}
+
+\begin{scope}[every node/.append style={yslant=0.5},yslant=0.5]
+	\shade[left color=white, right color=kit-blue30, draw=black, 
+		rounded corners=.1ex] (1em,-1em) rectangle +(1em,1em);
+	\node [point] 	at (1.25em,-.25em) {};
+	\node [point] 	at (1.25em,-.75em) {};
+	\node [point] 	at (1.75em,-.25em) {};
+	\node [point] 	at (1.75em,-.75em) {};
+\end{scope}
+
+
+\begin{scope}[every node/.append style={
+    yslant=0.5,xslant=-1},yslant=0.5,xslant=-1
+  ]
+  \shade[bottom color=white, top color=kit-blue30, draw=black, 
+		rounded corners=.1ex] (2em,1em) rectangle +(-1em,-1em);
+	\node [point] 	at (1.25em,.25em) {};
+	\node [point] 	at (1.25em,.75em) {};
+	\node [point] 	at (1.5em,.25em) {};
+	\node [point] 	at (1.5em,.75em) {};
+	\node [point] 	at (1.75em,.25em) {};
+	\node [point] 	at (1.75em,.75em) {};
+\end{scope}
+
+	\draw[thick, color=black] (.5em,-.25em) -- +(-.7ex,-.7ex);
+	\draw[thick, color=black] (1.5em,-.25em) -- +(.7ex,-.7ex);
+
+}
+
+\newcommand{\pcmcertsign}{
+\begin{scope}[rotate=30]
+\node [draw, red, thick, circle, rotate=30] (certified) at (0,0) {\scriptsize CERTIFIED};
+\draw [red, thick] (.67,.2) arc (16.6:163.4:7mm) -- cycle;
+\draw [red, thick] (-.67,-.2) arc (196.6:343.4:7mm) -- cycle;
+\end{scope}
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Position
+
+\newcommand{\pcmcomponentsymbol}[3]{
+	\node[rectangle, minimum width=1.2em, minimum height=1.2em, #1]	
+		(#2)	#3 {};
+	\filldraw[#1]	
+		($(#2)+(-1em,.1em)$)	rectangle	+(.7em,.3em)
+		($(#2)+(-1em,-.1em)$)	rectangle	+(.7em,-.3em);
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Text
+% #4 = oberer Layer
+% #5 = unterer Layer
+% #6 = Position
+
+\newcommand{\pcmcomponentbodyonlayers}[6]{
+	\begin{pgfonlayer}{#4}
+	\node[minimum width=4em] (#2text) #6 {\small #3};
+	\pcmcomponentsymbol{fill=white, draw=black}{#2componentsymbol}{at ($(#2text.east)+(-1em,1.5em)$)}
+	\end{pgfonlayer}
+	\begin{pgfonlayer}{#5}
+	\node[draw=black, rectangle, inner sep = .2em, #1] 	(#2) [fit=(#2text) (#2componentsymbol)] {};
+	\end{pgfonlayer}
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Text
+% #4 = Position
+\newcommand{\pcmcomponentbody}[4]{
+	\pcmcomponentbodyonlayers{#1}{#2}{#3}{l4}{l3}{#4}
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Position
+
+\newcommand{\pcmlolliwest}[3]{
+	\node[circle, minimum size=1ex, draw, anchor=east, xshift=-1em, #1] (#2) at #3 {};
+	\draw[#1] #3 -- (#2);
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Position
+
+\newcommand{\pcmarceast}[3]{
+	\node[xshift=1em] (#2) at #3 {};
+	\draw[#1] #3 -- (#2.center);
+	\draw[#1] ($(#2)+(1.4ex,1.4ex)$) arc (90:270:1.4ex);
+
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Text
+% #4 = oberer Layer
+% #5 = unterer Layer
+% #6 = Position
+
+\newcommand{\pcmcomponentonlayers}[6]{
+	\pcmcomponentbodyonlayers{#1}{#2}{#3}{#4}{#5}{#6}	
+
+	\begin{pgfonlayer}{#5}
+	\pcmlolliwest{#1}{#2lolli}{(#2.west)}
+	\pcmarceast{#1}{#2arc}{(#2.east)}
+	\end{pgfonlayer}
+}
+
+% #1 = Formatierung
+% #2 = Name des Nodes
+% #3 = Text
+% #4 = Position
+\newcommand{\pcmcomponent}[4]{
+	\pcmcomponentonlayers{#1}{#2}{#3}{l4}{l3}{#4}
+}
+
+
+% Extrudieren von rechteckigen Shapes
+%
+% #1 = Name des Nodes
+% #2 = Abstand
+% #3 = Zeichenoptionen
+
+\newcommand{\pcmextrude}[3]{
+\path[#3] (#1.north west) -- (#1.north east) -- (#1.south east) -- (#1.south west) -- (#1.north west) -- ++(#2,#2) -- ($(#1.north east)+(#2,#2)$) -- ($(#1.south east)+(#2,#2)$) -- (#1.south east) (#1.north east) -- ($(#1.north east)+(#2,#2)$); 
+}
+
+
+
diff --git a/Folien/CEL_Beamer/templates/tikzuml.sty b/Folien/CEL_Beamer/templates/tikzuml.sty
index dbd9751..e5dfecd 100644
--- a/Folien/CEL_Beamer/templates/tikzuml.sty
+++ b/Folien/CEL_Beamer/templates/tikzuml.sty
@@ -1,12 +1,12 @@
-\tikzset{uml box/.style={draw, text width=3cm, minimum height=1.5cm, text badly centered, font=\sffamily\bfseries},
-	uml class/.style={rectangle split, rectangle split parts=2, draw, minimum width=0, font=\sffamily},
-	uml directed/.style={thick, -angle 90},
-	uml aggregation head/.style={shape=diamond, aspect=.5, anchor=north, thick, draw},
-	uml composition head/.style={shape=diamond, aspect=.5, anchor=north, thick, filldraw},
-	uml generalization head/.style={shape=isosceles triangle, isosceles triangle apex angle=60, shape border rotate=90, scale=.8, draw, thick, anchor=apex},
-	uml cardinality start/.style={very near start, auto, font=\sffamily},
-	uml cardinality end/.style={very near end, auto, font=\sffamily},
-	uml role start/.style={very near start, auto, font=\footnotesize\sffamily},
-	uml role end/.style={near end, auto, font=\footnotesize\sffamily},
-	uml association name/.style={midway, auto, font=\footnotesize\sffamily},
-}%
+\tikzset{uml box/.style={draw, text width=3cm, minimum height=1.5cm, text badly centered, font=\sffamily\bfseries},
+	uml class/.style={rectangle split, rectangle split parts=2, draw, minimum width=0, font=\sffamily},
+	uml directed/.style={thick, -angle 90},
+	uml aggregation head/.style={shape=diamond, aspect=.5, anchor=north, thick, draw},
+	uml composition head/.style={shape=diamond, aspect=.5, anchor=north, thick, filldraw},
+	uml generalization head/.style={shape=isosceles triangle, isosceles triangle apex angle=60, shape border rotate=90, scale=.8, draw, thick, anchor=apex},
+	uml cardinality start/.style={very near start, auto, font=\sffamily},
+	uml cardinality end/.style={very near end, auto, font=\sffamily},
+	uml role start/.style={very near start, auto, font=\footnotesize\sffamily},
+	uml role end/.style={near end, auto, font=\footnotesize\sffamily},
+	uml association name/.style={midway, auto, font=\footnotesize\sffamily},
+}%