diff --git a/acknowledgements.tex b/content-other/acknowledgements.tex
similarity index 100%
rename from acknowledgements.tex
rename to content-other/acknowledgements.tex
diff --git a/content-other/curriculum-vitae.tex b/content-other/curriculum-vitae.tex
new file mode 100644
index 0000000..62d76a3
--- /dev/null
+++ b/content-other/curriculum-vitae.tex
@@ -0,0 +1,20 @@
+\project thesis
+\startcomponent curriculum-vitae
+
+\startchapter
+  [title={Curriculum Vitae},
+   reference=chap:curriculum-vitae]
+
+Joshua Moerman was born in 1991 in Utrecht, the Netherlands.
+After doing gymnasium at the Christiaan Huygens College in Eindhoven (2003 -- 2009), he did a double bachelor programme in {\it mathematics} and {\it computer science} at the Radboud University in Nijmegen.
+In 2013, he obtained both bachelors {\it summa cum laude} and continued with a master in mathematics.
+He obtained the degree of Master of Science {\it summa cum laude} in Mathematics in 2015, with a specialisation in algebra and topology.
+
+In February 2015, he started his Ph.D. under supervision of Frits Vaandrader, Sebastiaan Terwijn, and Alexandra Silva.
+This was a joint project with the computer science institute (iCIS) and the mathematics departement (IMAPP) of the Radboud University.
+During the four years of his Ph.D., he spent a total of six months at University College London, UK.
+
+As of April 2019, Joshua works as a postdoctoral researcher in the group of Joost-Pieter Katoen at the RWTH Aachen, Germany.
+
+\stopchapter
+\stopcomponent
\ No newline at end of file
diff --git a/content-other/references.tex b/content-other/references.tex
new file mode 100644
index 0000000..c5218e3
--- /dev/null
+++ b/content-other/references.tex
@@ -0,0 +1,15 @@
+\project thesis
+\startcomponent references
+
+%\setupheadertexts[{\sc References}][\pagenumber][\pagenumber][{\sc References}]
+
+\startchapter
+  [title={References},
+   reference=chap:references]
+
+\switchtobodyfont[8pt]
+
+\placelistofpublications
+
+\stopchapter
+\stopcomponent
\ No newline at end of file
diff --git a/summary.tex b/content-other/summary.tex
similarity index 100%
rename from summary.tex
rename to content-other/summary.tex
diff --git a/titelblad.tex b/content-other/titelblad.tex
similarity index 63%
rename from titelblad.tex
rename to content-other/titelblad.tex
index ace73cb..7ab58aa 100644
--- a/titelblad.tex
+++ b/content-other/titelblad.tex
@@ -28,21 +28,21 @@ om\\
 
 door\\
 
-{\it Joshua Moerman}\\
+{\it Joshua Samuel Moerman}\\
 geboren op 1 oktober 1991\\
 te Utrecht
 \vfill
 \stopalignment
 
 \page[left]
-\startalignment[flushleft]
-Promotor(en):
+\startalignment[flushleft]\nl
+Promotoren:
 \startitemize[after]
 \item prof. dr. F.W. Vaandrager
-\item prof. dr. A. Silva (University College London, Londen, Verenigd Koninkrijk)
+\item prof. dr. A. Silva (\en University College London, \nl Verenigd Koninkrijk)
 \stopitemize
 
-Copromotor(en):
+Copromotor:
 \startitemize[after]
 \item dr. S.A. Terwijn
 \stopitemize
@@ -50,18 +50,22 @@ Copromotor(en):
 Leden manuscriptcommissie:
 \startitemize[after]
 \item prof. dr. B.P.F. Jacobs
-\item prof. dr. A.R. Cavalli (Institut Mines-T / Télécom SudParis, Évry, Frankrijk)
-\item prof. dr. F. Howar (Dortmund University of Technology, Dortmund, Duitsland)
-\item prof. dr. S. Lasota (University of Warsaw, Warschau, Polen) (verhinderd)
-\item dr. D. Petrisan (Université Paris Diderot, Parijs, Frankrijk) (verhinderd)
-\stopitemize
-
-Overige leden:
-\startitemize[after]
+\item prof. dr. A.R. Cavalli (\fr Télécom SudParis, \nl Frankrijk)
+\item prof. dr. F. Howar (\de Technische Universit\"at, Dortmund, \nl Duitsland)
+\item prof. dr. S. Lasota (\pl Uniwesytet Warszawkski, \nl Polen)
+\item dr. D. Petrisan (\fr Université Paris Diderot, \nl Frankrijk)
 \item prof. dr. ir. J.F. Groote (TUE)
 \item dr. J.A. Perez (RUG)
-\item dr. P. Brunet (University College London, Londen, Verenigd Koninkrijk)
+\item dr. P. Brunet (\en University College London, \nl Verenigd Koninkrijk)
 \stopitemize
+
+\vfill
+Paranimfen:
+\startitemize
+\item Alexis Linard
+\item Tim Steenvoorden
+\stopitemize
+
 \stopalignment
 
 \en\stop
diff --git a/content-other/voorblad-colofon.tex b/content-other/voorblad-colofon.tex
new file mode 100644
index 0000000..ce08ea2
--- /dev/null
+++ b/content-other/voorblad-colofon.tex
@@ -0,0 +1,48 @@
+\project thesis
+\startcomponent voorblad-colofon
+
+\startpagemakeup[align=center, doublesided=no, pagestate=start]
+\switchtobodyfont[20pt]
+\midaligned{\framed[width=8cm, align=center, frame=off]{Nominal Techniques and Black Box Testing for Automata Learning}}
+\blank[2*big]
+
+\switchtobodyfont[12pt]
+{\it Joshua Moerman}
+\stoppagemakeup
+
+\start
+\page[left]
+\startalignment[flushleft]
+\setupindenting[no]
+\setupwhitespace[big]
+
+\null
+
+\vfill
+
+\midaligned{
+\startcombination[nx=2, ny=1, location=middle, distance=1cm]
+{\externalfigure[logo-ipa][scale=500]}{}
+{\externalfigure[logo-radboud]}{}
+\stopcombination}
+
+Work in the thesis has been carried out under the auspices of the research school {\it IPA} (Institute for Programming research and Algorithmics)
+
+Printed by Gildeprint, Enschede
+
+Typeset using \ConTeXt
+
+ISBN: 978--94--632--3696--6
+
+IPA Dissertation series: ???
+
+\blank[2*big]
+
+Copyright \copyright{} Joshua Moerman, 2019
+
+
+\stopalignment
+\stop
+\page[yes]
+
+\stopcomponent
\ No newline at end of file
diff --git a/content.tex b/content.tex
index eb519c7..6637bfb 100644
--- a/content.tex
+++ b/content.tex
@@ -3,20 +3,12 @@
 \project thesis
 
 \starttext
-\startpagemakeup[align=center, doublesided=no, pagestate=start]
-\switchtobodyfont[20pt]
-\midaligned{\framed[width=8cm, align=center, frame=off]{Nominal Techniques and Black Box Testing for Automata Learning}}
-\blank[2*big]
-
-\switchtobodyfont[12pt]
-{\it Joshua Moerman}
-\stoppagemakeup
-\page[yes]
+\component content-other/voorblad-colofon
 
 \startfrontmatter
-\component titelblad
-\component summary
-\component acknowledgements
+\component content-other/titelblad
+\component content-other/summary
+\component content-other/acknowledgements
 
 \setupwhitespace[none]
 \completecontent[criterium=all]
@@ -42,10 +34,8 @@
 
 
 \startbackmatter
-\setupheadertexts[{\sc References}][\pagenumber][\pagenumber][{\sc References}]
-\switchtobodyfont[8pt]
-\title{References}
-\placelistofpublications
+\component content-other/references
+\component content-other/curriculum-vitae
 \stopbackmatter
 
 
diff --git a/images/logo-ipa.pdf b/images/logo-ipa.pdf
new file mode 100644
index 0000000..aa36a0d
Binary files /dev/null and b/images/logo-ipa.pdf differ
diff --git a/images/logo-radboud.pdf b/images/logo-radboud.pdf
new file mode 100644
index 0000000..f81bed8
Binary files /dev/null and b/images/logo-radboud.pdf differ