diff --git a/images/upb_logo_de.pdf b/images/upb_logo_de.pdf
index 40adc4ecee143fba54c23e5913447f0dcb02ec8d..714dcbe934a44b0e3e84c8fd932c2ca90c592a4b 100644
Binary files a/images/upb_logo_de.pdf and b/images/upb_logo_de.pdf differ
diff --git a/images/upb_logo_en.pdf b/images/upb_logo_en.pdf
index ce18a1d18003507eb2d4bb39cb7f3cedce255035..6809404a891a120b7eaccee9e96836bac7a5a408 100644
Binary files a/images/upb_logo_en.pdf and b/images/upb_logo_en.pdf differ
diff --git a/misc/custom_preamble.tex b/misc/custom_preamble.tex
index 884b6716b0e299bf94f4967a0ade8b394d85dc9c..3ea38c54eedf4d69e852e369864decb71300052d 100644
--- a/misc/custom_preamble.tex
+++ b/misc/custom_preamble.tex
@@ -1,17 +1,17 @@
 % example of a custom listing language definition
 \lstdefinelanguage{XML}{
     morestring=[b]",
-    moredelim=[s][\bfseries\color{upbblue}]{<}{\ },
-    moredelim=[s][\bfseries\color{upbblue}]{</}{>},
-    moredelim=[l][\bfseries\color{upbblue}]{/>},
-    moredelim=[l][\bfseries\color{upbblue}]{>},
+    moredelim=[s][\bfseries\color{upbIris}]{<}{\ },
+    moredelim=[s][\bfseries\color{upbIris}]{</}{>},
+    moredelim=[l][\bfseries\color{upbIris}]{/>},
+    moredelim=[l][\bfseries\color{upbIris}]{>},
     morecomment=[s]{<?}{?>},
     morecomment=[s]{<!--}{-->},
     alsoletter={-:},
-    identifierstyle=\color{upbdarkgreen},
-    keywordstyle=\color{upbblue},
-    stringstyle=\color{upborange},
-    commentstyle=\color{upbgray},
+    identifierstyle=\color{upbFuchsia},
+    keywordstyle=\color{upbArctic},
+    stringstyle=\color{upbAzure},
+    commentstyle=\color{gray},
 }
 
 \usepackage{todonotes} % provides the \todo command
diff --git a/misc/preamble.tex b/misc/preamble.tex
index a7f7b4895c6800ef1413d24f9a00a2a5d374a459..2bb597dc61cecf490c93a55dd89866ed3aa892f2 100644
--- a/misc/preamble.tex
+++ b/misc/preamble.tex
@@ -21,19 +21,36 @@
 \usepackage{ifpdf} % if else structure that checks if a PDF is compiled
 \usepackage{ifthen} % adds support for if else structures
 
-% defining the UPB-colors
-\usepackage{xcolor}
-\definecolor{upbblue}{RGB}{0,62,121}
-\definecolor{upbdarkgray}{RGB}{45,45,45}
-\definecolor{upbgray}{RGB}{85,85,85}
-\definecolor{upblightgray}{RGB}{170,170,170}
-\definecolor{upbred}{RGB}{165,1,53}
-\definecolor{upbgreen}{RGB}{134,166,6}
-\definecolor{upbdarkgreen}{RGB}{94,126,20}
-\definecolor{upbcyan}{RGB}{4,156,206}
-\definecolor{upborange}{RGB}{202,109,0}
-\definecolor{upbcassis}{RGB}{169,57,131}
-\definecolor{upblightblue}{RGB}{0,127,185}
+% UPB colors
+\usepackage{xcolor} % for color definitions
+% internal color definitions
+% the main color names of the secondary colors are numbered A, B, C
+% the letter before that indicate the color group (G = green, P = pink) relative
+% to the tertiary colors
+\makeatletter
+\definecolor{@upbTertiaryGreen}{RGB}{166,207,66} % #A6CF42
+\definecolor{@upbSecondaryGC}{RGB}{88,197,199} % #58C5C7
+\definecolor{@upbSecondaryGB}{RGB}{58,169,200} % #3AA9C8
+\definecolor{@upbSecondaryGA}{RGB}{4,123,193} % #047BC1
+\definecolor{@upbPrimary}{RGB}{41,56,150} % #293896
+\definecolor{@upbSecondaryPA}{RGB}{24,28,98} % #181C62
+\definecolor{@upbSecondaryPB}{RGB}{108,63,152} % #6C3F98
+\definecolor{@upbSecondaryPC}{RGB}{180,48,146} % #B43092
+\definecolor{@upbTertiaryPink}{RGB}{237,40,138} % #ED288A
+% names you should use
+% naming is translated/adapted from the official German names
+\colorlet{upbAccentGreen}{@upbTertiaryGreen}
+\colorlet{upbLime}{@upbTertiaryGreen}
+\colorlet{upbArctic}{@upbSecondaryGC}
+\colorlet{upbOcean}{@upbSecondaryGB}
+\colorlet{upbAzure}{@upbSecondaryGA}
+\colorlet{upbUltraBlue}{@upbPrimary}
+\colorlet{upbSapphire}{@upbSecondaryPA}
+\colorlet{upbIris}{@upbSecondaryPB}
+\colorlet{upbFuchsia}{@upbSecondaryPC}
+\colorlet{upbPomegranate}{@upbTertiaryPink}
+\colorlet{upbAccentPink}{@upbTertiaryPink}
+\makeatother
 
 %% Floats
 \usepackage{caption} % captions for floats
@@ -48,6 +65,7 @@
 
 % Tables
 \usepackage{booktabs} % adds rules for tables in a formal style
+\usepackage[flushleft]{threeparttable} % text below tables
 \usepackage{multirow} % add support for multi-rows
 \usepackage{multicol} % add support for multi-columns
 \usepackage{longtable} % long tables can break pages
@@ -89,10 +107,10 @@
 \lstset{
     floatplacement=htp,
     basicstyle=\ttfamily\footnotesize,
-    identifierstyle=\color{upbblue},
-    keywordstyle=\color{upborange},
-    stringstyle=\color{upbdarkgreen},
-    commentstyle=\color{upbgray},
+    identifierstyle=\color{upbArctic},
+    keywordstyle=\color{upbFuchsia},
+    stringstyle=\color{upbUltraBlue},
+    commentstyle=\color{gray},
     columns=flexible,
     tabsize=4,
     aboveskip={1.5\baselineskip},
diff --git a/paper.pdf b/paper.pdf
index 9388ba7c94aa2cb9a73d79d3bc6d8a2a9073fcb1..7f5e7c5cb7841967da76d7fd4be439575b3af1d6 100644
Binary files a/paper.pdf and b/paper.pdf differ
diff --git a/sections/00_dummy_text.tex b/sections/00_dummy_text.tex
index f1ed1c738c899f3298a9d954b43a72384d11e584..3d1641355456705b4b64ab698de464d1c1b5a83b 100644
--- a/sections/00_dummy_text.tex
+++ b/sections/00_dummy_text.tex
@@ -25,4 +25,9 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 
+\begin{figure}
+\includegraphics[width=\linewidth]{upb_logo_de}
+\caption{test}
+\end{figure}
+
 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\footnote{Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.}