diff --git a/.gitignore b/.gitignore
index d082f8c..ad826f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@
 *.mtc1
 *.out
 *.synctex.gz
-*.pdf
+main.pdf
 *.vscodeLog
 
 .swp
diff --git a/src/assets/abstract.pdf b/src/assets/abstract.pdf
new file mode 100644
index 0000000..45dd523
Binary files /dev/null and b/src/assets/abstract.pdf differ
diff --git a/src/assets/gegevens.pdf b/src/assets/gegevens.pdf
new file mode 100644
index 0000000..e89370b
Binary files /dev/null and b/src/assets/gegevens.pdf differ
diff --git a/src/assets/rtc.png b/src/assets/rtc.png
new file mode 100644
index 0000000..054efb2
Binary files /dev/null and b/src/assets/rtc.png differ
diff --git a/src/assets/voorblad.pdf b/src/assets/voorblad.pdf
new file mode 100644
index 0000000..b10b880
Binary files /dev/null and b/src/assets/voorblad.pdf differ
diff --git a/src/chapters/bijlagen.tex b/src/chapters/bijlagen.tex
index fb21fcf..c4bdd23 100644
--- a/src/chapters/bijlagen.tex
+++ b/src/chapters/bijlagen.tex
@@ -1,6 +1,6 @@
 % !TEX root = ../main.tex
 
-\section*{Bijlagen} % (fold)
+\chapter*{Bijlagen} % (fold)
 \addcontentsline{toc}{section}{Bijlagen}
 \label{sec:een-titel}
 
@@ -8,7 +8,7 @@ \section*{Bijlagen} % (fold)
 
 \renewcommand{\thesubsection}{\Alph{subsection}}
 
-\subsection{Een bijlage} % (fold)
+\section{Een bijlage} % (fold)
 \label{sub:nog-een-titel}
 
 \lipsum[1]
diff --git a/src/chapters/uitwerking.tex b/src/chapters/uitwerking.tex
index b4e10f8..97a49e5 100644
--- a/src/chapters/uitwerking.tex
+++ b/src/chapters/uitwerking.tex
@@ -11,7 +11,7 @@ \subsection{Ondertitel} % (fold)
 \begin{figure}[H]
   \label{figure:golden-circle}
   \centering
-  \includegraphics[width=0.5\textwidth]{logo.pdf}
+  \includegraphics[width=0.5\textwidth]{rtc}
   \caption{Figuur met referentie en bijschrift \cite{voorbeeld-ref}}
 \end{figure}
 
diff --git a/src/chapters/voorstelling.tex b/src/chapters/voorstelling.tex
index 279eb0b..b077ba6 100644
--- a/src/chapters/voorstelling.tex
+++ b/src/chapters/voorstelling.tex
@@ -9,15 +9,15 @@ \subsection{Het bedrijf} % (fold)
 \lipsum[1]
 
 \begin{figure}[H]
-  \label{figure:golden-circle}
+  \label{figure:webrtc}
   \centering
-  \includegraphics[width=0.5\textwidth]{logo.pdf}
+  \includegraphics[width=0.8\textwidth]{rtc}
   \caption{Figuur met referentie en bijschrift \cite{voorbeeld-ref}}
 \end{figure}
 
 \subsubsection{Werkomgeving}
 
-Citeer bronnen van websites \cite{voorbeeld-ref} en boeken \cite{boek-ref}.
+Citeer bronnen van websites \cite{voorbeeld-ref} en boeken \cite{boek-ref}. Verwijs naar figuren: zie figuur~\ref{figure:webrtc}
 
 \lipsum[1]
 
diff --git a/src/main.tex b/src/main.tex
index 991bb90..68443ed 100644
--- a/src/main.tex
+++ b/src/main.tex
@@ -2,20 +2,31 @@
 
 \begin{document}
 
-\include{titlepage}
+% \include{titlepage}
 
-\include{chapters/abstract}
+\includepdf{voorblad.pdf}
+
+\newpage\null\thispagestyle{empty}\newpage
+
+\includepdf{voorblad.pdf}
+
+\includepdf{gegevens.pdf}
+
+\setcounter{page}{1}
+\addtocontents{toc}{\protect\renewcommand{\protect\numberline}[1]{}}
+\includepdf[pagecommand={}, addtotoc={1,chapter,1,Abstract,abstract}]{abstract.pdf}
+\addtocontents{toc}{\let\protect\numberline\protect\oldnumberline}
 
 \include{chapters/woord-vooraf}
 
-% TOC
-\setcounter{tocdepth}{3}
+\setcounter{tocdepth}{2}
+\addcontentsline{toc}{chapter}{Inhoudsopgave}
 \tableofcontents
-% end TOC
 
 \include{chapters/lijst-afkortingen}
 
 \newpage
+\setcounter{chapter}{0}
 
 % main content
 \include{chapters/voorstelling}
@@ -29,11 +40,17 @@
 \newpage
 
 % references
-\addcontentsline{toc}{section}{Referenties}
-\bibliographystyle{ieeetr}
-\bibliography{references}
+\addcontentsline{toc}{chapter}{Referenties}
+\printbibliography[title={Referenties},keyword={ref}]
 % end references
 
+\newpage
+
+% bibliography
+\addcontentsline{toc}{chapter}{Bibliographie}
+\printbibliography[keyword={bib}]
+% end bibliography
+
 \include{chapters/bijlagen}
 
 \end{document}
diff --git a/src/preamble.tex b/src/preamble.tex
index b7146e2..b3a0331 100644
--- a/src/preamble.tex
+++ b/src/preamble.tex
@@ -1,12 +1,12 @@
-\documentclass[a4paper]{article}
+\documentclass[a4paper]{report}
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage[dutch]{babel}
-\usepackage{siunitx,amsmath, epic, eepic, float, subfig, amsfonts, color, amsthm, textcomp, microtype, fullpage}
+\usepackage{siunitx,amsmath, epic, eepic, float, subfig, amsfonts, color, amsthm, textcomp, microtype, fullpage, csquotes}
 \usepackage[parfill]{parskip}
 \usepackage[pdftex]{graphicx}
 \graphicspath{{./assets/}}
-\usepackage[titletoc,title]{appendix}
+\usepackage[titletoc,title,page]{appendix}
 \usepackage{standalone}
 \usepackage{array}
 \usepackage{tikz}
@@ -17,6 +17,7 @@
 \definecolor{bluekeywords}{rgb}{0.13,0.13,1}
 \definecolor{greencomments}{rgb}{0,0.5,0}
 \definecolor{redstrings}{rgb}{0.9,0,0}
+\definecolor{light-gray}{gray}{0.95}
 \usepackage[font=small,format=plain,labelfont=bf,textfont=it]{caption}
 \usepackage[linkcolor=black,urlcolor=black,citecolor=black]{hyperref}
 \hypersetup{colorlinks=true}
@@ -31,19 +32,38 @@
 \tabulinesep=1.2mm
 \renewcommand*{\familydefault}{\sfdefault}
 \renewcommand\arraystretch{1.7}
+\newcommand{\code}[1]{\colorbox{light-gray}{\texttt{#1}}}
 \usepackage{multirow}
 \usepackage{abstract}
+\usepackage[style=ieee,backend=biber,urldate=iso8601,date=iso8601]{biblatex}
+\renewbibmacro*{bbx:savehash}{}
+\addbibresource{references.bib}
 \renewcommand{\abstractnamefont}{\normalfont\large\bfseries}
 \makeatletter
 \newcommand{\tocfill}{\cleaders\hbox{$\m@th \mkern\@dotsep mu . \mkern\@dotsep mu$}\hfill}
 \makeatother
 \newcommand{\abbrlabel}[1]{\makebox[3cm][l]{\textbf{#1}\ \tocfill}}
-\newenvironment{abbreviations}{\begin{list}{}{\renewcommand{\makelabel}{\abbrlabel}%
-                                              \setlength{\itemsep}{0pt}}}{\end{list}}
+\newenvironment{abbreviations}{
+	\begin{list}{}{
+			\renewcommand{\makelabel}{\abbrlabel}
+			\setlength{\itemsep}{0pt}
+		}}{\end{list}
+}
+
+\usepackage{longtable}
+\usepackage[normalem]{ulem}
+\useunder{\uline}{\ul}{}
+
+\usepackage{titlesec}
+\titleformat{\chapter}
+{\normalfont\LARGE\bfseries}{\thechapter}{1em}{}
+\titlespacing*{\chapter}{0pt}{3.5ex plus 1ex minus .2ex}{2.3ex plus .2ex}
+
+\let\oldnumberline\numberline
 
 \usepackage{listings}
 \lstdefinelanguage{JavaScript}{
-  keywords={typeof, new, true, false, catch, function, return, null, catch, switch, var, let, const, if, in, while, do, else, case, break},
+  keywords={typeof, new, true, false, catch, function, return, null, catch, switch, var, let, const, if, in, while, do, else, case, break, async, await},
   keywordstyle=\color{blue}\bfseries,
   ndkeywords={class, export, boolean, throw, implements, import, this},
   ndkeywordstyle=\color{darkgray}\bfseries,
@@ -72,4 +92,4 @@
   breaklines=true,
   breakatwhitespace=true,
   tabsize=3
-}
+}
\ No newline at end of file
diff --git a/src/references.bib b/src/references.bib
index 8272356..e3a4e95 100644
--- a/src/references.bib
+++ b/src/references.bib
@@ -1,14 +1,19 @@
-@electronic{voorbeeld-ref,
-	Author = {\relax Jane Doe, Company Inc.},
-	Date-Added = {2017-01-09 16:25:41 +0000},
-	Date-Modified = {2017-01-09 16:26:29 +0000},
-	Title = {Source's title},
-	HowPublished = {\url{https://google.com/}}}
+@online{voorbeeld-ref,
+	author    = "Jane Doe",
+	company   = "Company Inc",
+	year      = "2017",
+	title     = "Source Title",
+	url       = "https://www.google.com",
+	urldate = {2017-04-03},
+	keywords  = "bib"
+}
 
 @book{boek-ref,
-	Author = {John Doe and Jane Doe},
-	Isbn = {978-1-4493-6842-5},
-	Publisher = {Doe Media},
-	Title = {Book Title},
-	HowPublished = {\url{http://books.com}},
-	Year = {2017}}
+	title={Book Title},
+	author={John Doe},
+	isbn={9781449360726},
+	year={2014},
+	publisher={Publisher Name},
+	keywords = "bib"
+}
+