diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e0c4631
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "smile"]
+	path = smile
+	url = https://github.com/LukasPietzschmann/smile
diff --git a/beamerthemeawesome.sty b/beamerthemeawesome.sty
index 525ee00..3613924 100644
--- a/beamerthemeawesome.sty
+++ b/beamerthemeawesome.sty
@@ -39,43 +39,23 @@
 \RequirePackage{calc}
 \RequirePackage{microtype}
 \RequirePackage{etoolbox}
-\RequirePackage{contour}
-\RequirePackage[normalem]{ulem}
 \RequirePackage{underscore}
 \RequirePackage{tcolorbox}
-\RequirePackage{hyperref}
-
-\RequirePackage{listings}
-\RequirePackage[verbatim=true]{lstfiracode}
-\lstdefinestyle{animateblocks}{
-	basicstyle=\ttfamily\color{black!20},
-	moredelim=**[is][\only<+>{\color{black}}]{@}{@},
-}
-\lstset{
-	style=FiraCodeStyle,
-	basicstyle=\ttfamily,
-	commentstyle=\color{gray}\itshape,
-	keywordstyle=\bfseries,
-	escapeinside={<!}{!>},
-}
+\RequirePackage[
+	color,
+	minted,
+	tikz,
+	htmlunderline,
+	footnote,
+	hyperref,
+	pdftitle={\noexpand\inserttitle},
+	pdfauthor={\noexpand\insertauthor},
+	pdfsubject={\noexpand\inserttitle}
+]{smile/smile}
 
 \RequirePackage{tikz}
-\usetikzlibrary{shapes.geometric, arrows, arrows.meta, shapes, automata, positioning, positioning, fit, calc, fadings, overlay-beamer-styles, decorations.markings}
+\usetikzlibrary{overlay-beamer-styles, decorations.markings}
 \tikzstyle{every picture}+=[remember picture]
-\tikzstyle{inline} = [shape=rectangle,inner sep=0pt,text depth=0pt]
-\tikzstyle{squarenode} = [rectangle, draw=black, line width=0.6pt]
-\tikzstyle{roundednode} = [squarenode, rounded corners=1mm]
-\tikzstyle{roundnode} = [squarenode, circle]
-\tikzstyle{arrow} = [thick,->,>=stealth]
-\tikzstyle{textarrow} = [awesomegray,shorten >=1mm,shorten <=1mm,thick,->,-{Kite[open]}]
-\tikzstyle{thickarrow} = [
-	thick,
-	decoration={markings, mark=at position 1 with {\arrow[scale=2]{open triangle 60}}},
-	double distance=5pt,
-	shorten >= 13pt,
-	preaction = {decorate},
-	postaction = {draw, line width=5pt, white, shorten >= 7pt}
-]
 
 \tikzset{
 	node distance = 5mm,
@@ -99,14 +79,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\AtEndPreamble{
-	\hypersetup{
-		pdftitle = {\inserttitle},
-		pdfauthor = {\insertauthor},
-		pdfsubject = {\inserttitle}
-	}
-}
-
 \renewcommand{\maketitle}{
 	\begin{frame}[noframenumbering, plain]
 		\titlepage
@@ -119,28 +91,16 @@
 	\fi
 }
 
-\renewcommand{\ULdepth}{1.8pt}
-\contourlength{0.8pt}
-\newcommand{\gul}[1]{%
-	\uline{\phantom{#1}}%
-	\llap{\contour{white}{#1}}%
-}
-
-
-\renewcommand{\textsubscript}[1]{%
-	\scalebox{0.7}{#1}
-}
-
 \let\oldft\frametitle
 \renewcommand\frametitle[2][]{
 	\ifx\relax#1\relax\oldft{#2}\else%
-		\oldft{#2\hfill\normalfont\large\color{awesomegray}\raisebox{0.3ex}{#1}}%
+		\oldft{#2\hfill\normalfont\large\color{darkgray}\raisebox{0.3ex}{#1}}%
 	\fi
 }
 
 \BeforeBeginEnvironment{tabular}{
 	\renewcommand{\arraystretch}{1.1}
-	\rowcolors{2}{awesomelightgray}{white}
+	\rowcolors{2}{lightgray}{white}
 }
 
 
@@ -240,35 +200,25 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
-\definecolor{awesomeblack}{HTML}{241f31}
-\definecolor{awesomemarroon}{HTML}{63452c}
-\definecolor{awesomegray}{HTML}{77767b}
-\definecolor{awesomelightgray}{HTML}{f6f5f4}
-\definecolor{awesomewhite}{HTML}{ffffff}
-\definecolor{awesomeblue}{HTML}{1c71d8}
-\definecolor{awesomegreen}{HTML}{26a269}
-\definecolor{awesomehighlight}{HTML}{ae3342}
-\definecolor{awesomehighlightlight}{HTML}{c85250}
+\setbeamercolor{alerted text}{fg=accent}
 
-\setbeamercolor{alerted text}{fg=awesomehighlight}
+\setbeamercolor{subtitle}{fg=darkgray}
+\setbeamercolor{frametitle}{fg=black}
+\setbeamercolor{framesubtitle}{fg=darkgray}
 
-\setbeamercolor{subtitle}{fg=awesomegray}
-\setbeamercolor{frametitle}{fg=awesomeblack}
-\setbeamercolor{framesubtitle}{fg=awesomegray}
+\setbeamercolor{details}{fg=black}
+\setbeamercolor{author}{fg=black}
 
-\setbeamercolor{details}{fg=awesomeblack}
-\setbeamercolor{author}{fg=awesomeblack}
+\setbeamercolor{section number projected}{bg=black, fg=accent}
+\setbeamercolor{subsection number projected}{fg=lightgray, fg=accent}
 
-\setbeamercolor{section number projected}{bg=awesomeblack, fg=awesomehighlight}
-\setbeamercolor{subsection number projected}{fg=awesomelightgray, fg=awesomehighlightlight}
+\setbeamercolor{structure}{fg=black}
+\setbeamercolor{normal text}{fg=black}
+\setbeamercolor{separator}{fg=marroon, bg=marroon}
+\setbeamercolor{footline}{bg=lightgray}
 
-\setbeamercolor{structure}{fg=awesomeblack}
-\setbeamercolor{normal text}{fg=awesomeblack}
-\setbeamercolor{separator}{fg=awesomemarroon, bg=awesomemarroon}
-\setbeamercolor{footline}{bg=awesomelightgray}
-
-\setbeamercolor{block body}{bg=awesomelightgray}
-\setbeamercolor{block title}{bg=awesomeblack, fg=awesomewhite}
+\setbeamercolor{block body}{bg=lightgray}
+\setbeamercolor{block title}{bg=black, fg=white}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -388,48 +338,29 @@
 \newtcolorbox{beamerbox}[2]{IfBlankTF={#2}{toprule=2mm}{title=#2},colback=#1!5!white,colframe=#1!75!black}
 
 \renewenvironment{definition}[1][\empty]{
-	\begin{beamerbox}{awesomemarroon}{#1}
+	\begin{beamerbox}{marroon}{#1}
 }{\end{beamerbox}}
 
 \renewenvironment{block}[1][]{
-	\begin{beamerbox}{awesomeblue}{#1}
+	\begin{beamerbox}{blue}{#1}
 }{\end{beamerbox}}
 
 \renewenvironment{examples}[1][]{
-	\begin{beamerbox}{awesomegreen}{#1}
+	\begin{beamerbox}{green}{#1}
 }{\end{beamerbox}}
 
 \renewenvironment{alertblock}[1][]{
-	\begin{beamerbox}{awesomehighlight}{#1}
+	\begin{beamerbox}{red}{#1}
 }{\end{beamerbox}}
 
-\newcommand{\background}[1]{
-	\newcommand{\awesome@background}{#1}
-}
 
-\newcommand{\email}[1]{
-	\newcommand{\awesome@email}{#1}
-}
-
-\newcommand{\insertemail}[0]{
-	\href{mailto:\awesome@email}{\awesome@email}
-}
-
-\newcommand{\uni}[1]{
-	\newcommand{\awesome@uni}{#1}
-}
-
-\newcommand{\insertuni}[0]{
-	\awesome@uni
-}
-
-\newcommand{\location}[1]{
-	\newcommand{\awesome@location}{#1}
-}
-
-\newcommand{\insertlocation}[0]{
-	\awesome@location
-}
+\ensureinfocommand{background}
+\ensureinfocommand{email}
+\ensureinfocommand{uni}
+\ensureinfocommand{location}
+\newcommand{\insertemail}[0]{\href{mailto:\@email}{\@email}}
+\newcommand{\insertuni}[0]{\@uni}
+\newcommand{\insertlocation}[0]{\@location}
 
 \tikzfading[
 	name=title page picture fading,
@@ -473,7 +404,7 @@
 		\insertdate
 	\end{minipage}
 
-	\ifdefined\awesome@background
+	\ifdefined\@background
 		\begin{tikzpicture}[remember picture, overlay]
 			\clip (current page.south east)
 				-- (current page.north east)
@@ -486,7 +417,7 @@
 				inner sep=0,
 				outer sep=0
 			] at (current page.south east) {
-				\includegraphics[height=\paperheight]{\awesome@background}
+				\includegraphics[height=\paperheight]{\@background}
 			};
 
 			\fill[
@@ -543,7 +474,7 @@
 				\fi%
 			\fi%
 			\hfill%
-			\colorbox{awesomehighlight}{
+			\colorbox{accent}{
 				\color{white}
 				\hspace{0.3cm}
 				\ifawesome@english@
@@ -575,7 +506,7 @@
 			\hfill%
 			\hyperlinkdocumentstart{\inserttitle}%
 			\hfill%
-			\colorbox{awesomehighlight}{
+			\colorbox{accent}{
 				\color{white}
 				\hspace{0.3cm}%
 				Agenda
@@ -603,7 +534,7 @@
 			\hfill%
 			\hyperlinkdocumentstart{\inserttitle}%
 			\hfill%
-			\colorbox{awesomehighlight}{
+			\colorbox{accent}{
 				\color{white}
 				\hspace{0.3cm}%
 				\ifawesome@english@
@@ -677,7 +608,7 @@
 }
 
 \AtEndDocument{
-	{\setbeamercolor{background canvas}{bg=awesomehighlight!70!black}
+	{\setbeamercolor{background canvas}{bg=accent!70!black}
 	\begin{frame}[b, noframenumbering]
 		\color{white}
 		\thispagestyle{navigation@titlepage}
diff --git a/example.pdf b/example.pdf
index 20257f3..a463b1e 100644
Binary files a/example.pdf and b/example.pdf differ
diff --git a/example.tex b/example.tex
index 7c3e910..cf1b6af 100644
--- a/example.tex
+++ b/example.tex
@@ -69,12 +69,12 @@
 \begin{frame}
 	\frametitle{Another Slide}
 	\begin{itemize}
-		\item That info is sooooooo \tikz\node[na] (A) {\gul{important}};
-		\item This is a key \tikz\node[na] (D) {\gul{word}};, isn't it?
+		\item That info is sooooooo \tikz\node[na] (A) {\uline{important}};
+		\item This is a key \tikz\node[na] (D) {\uline{word}};, isn't it?
 	\end{itemize}
 	\vskip2em
 	\uncover<2->{
-		\Rightarrow~Two important \tikz \node[na] (B) {\gul{items}};!
+		\Rightarrow~Two important \tikz \node[na] (B) {\uline{items}};!
 		\begin{tikzpicture}[overlay, remember picture]
 			\draw[textarrow] (A) to [bend left=40] (B);
 			\draw[textarrow] (D) to (B);
@@ -93,18 +93,18 @@
 					remember picture,
 					overlay,
 			]
-				\node[squarenode](P1)[background default draw=black, draw=awesomehighlight, draw on=<3>, yshift=1cm]{P1};
-				\node[squarenode](P2)[right=of P1, background default draw=black, draw=awesomehighlight, draw on=<3>]{P2};
-				\node[squarenode](P3)[right=of P2, background default draw=black, draw=awesomehighlight, draw on=<3>]{P3};
-				\node[squarenode](P4)[right=of P3, background default draw=black, draw=awesomehighlight, draw on=<3>]{P4};
-				\node[squarenode](P5)[right=of P4, background default draw=black, draw=awesomehighlight, draw on=<3>]{P5};
+				\node[squarenode](P1)[background default draw=black, draw=accent, draw on=<3>, yshift=1cm]{P1};
+				\node[squarenode](P2)[right=of P1, background default draw=black, draw=accent, draw on=<3>]{P2};
+				\node[squarenode](P3)[right=of P2, background default draw=black, draw=accent, draw on=<3>]{P3};
+				\node[squarenode](P4)[right=of P3, background default draw=black, draw=accent, draw on=<3>]{P4};
+				\node[squarenode](P5)[right=of P4, background default draw=black, draw=accent, draw on=<3>]{P5};
 				\node[draw=none](etc)[right=of P5]{...};
-				\node[squarenode, draw=awesomehighlight!70, background default draw=black, draw on=<{2,6,7}>, fit=(P1) (P2) (P3) (P4) (P5) (etc)] {};
+				\node[squarenode, draw=accent!70, background default draw=black, draw on=<{2,6,7}>, fit=(P1) (P2) (P3) (P4) (P5) (etc)] {};
 				\node[draw=none] at (6.2, 1.5) {\fontspec{Symbola}\symbol{"1F512}};
 
-				\node[squarenode](N1)[below=of P2, background default draw=black, draw=awesomehighlight, draw on=<4>, visible on=<{4-7}>]{N1};
-				\node[squarenode](N2)[right=of N1, background default draw=black, draw=awesomehighlight, draw on=<4>, visible on=<{4-7}>]{N2};
-				\node[squarenode](N3)[right=of N2, background default draw=black, draw=awesomehighlight, draw on=<4>, visible on=<{4-7}>]{N3};
+				\node[squarenode](N1)[below=of P2, background default draw=black, draw=accent, draw on=<4>, visible on=<{4-7}>]{N1};
+				\node[squarenode](N2)[right=of N1, background default draw=black, draw=accent, draw on=<4>, visible on=<{4-7}>]{N2};
+				\node[squarenode](N3)[right=of N2, background default draw=black, draw=accent, draw on=<4>, visible on=<{4-7}>]{N3};
 
 				\node[squarenode](P1p)[below=1.5cm of P1, visible on=<{7-9}>]{P1'};
 				\node[squarenode](P2p)[right=of P1p, visible on=<{7-9}>]{P2'};
@@ -112,10 +112,10 @@
 				\node[squarenode](P4p)[right=of P3p, visible on=<{7-9}>]{P4'};
 				\node[squarenode](P5p)[right=of P4p, visible on=<{7-9}>]{P5'};
 				\node[draw=none, visible on=<{7-9}>](etcp)[right=of P5p]{...};
-				\node[squarenode, draw=awesomegreen, background default draw=black, visible on=<{7-9}>, draw on=<7>, fit=(P1p) (P2p) (P3p) (P4p) (P5p) (etcp)] {};
+				\node[squarenode, draw=green, background default draw=black, visible on=<{7-9}>, draw on=<7>, fit=(P1p) (P2p) (P3p) (P4p) (P5p) (etcp)] {};
 				\node[draw=none, visible on=<{7-9}>] at (6.55, -0.55) {\fontspec{Symbola}\symbol{"1F512}};
 
-				\node[squarenode](S)[below=of N2, background default draw=black, draw=awesomeblue, draw on=<6>, visible on=<6>]{S};
+				\node[squarenode](S)[below=of N2, background default draw=black, draw=blue, draw on=<6>, visible on=<6>]{S};
 
 				\draw[arrow, visible on=<{4-7}>] (P1) -- (N1);
 				\draw[arrow, visible on=<{4-7}>] (P2) -- (N2);
diff --git a/smile b/smile
new file mode 160000
index 0000000..7cfb037
--- /dev/null
+++ b/smile
@@ -0,0 +1 @@
+Subproject commit 7cfb03765f7cb740812f9de80ee1deb6cd099c01