diff --git a/content.tex b/content.tex
index c8a2d08..99868f1 100644
--- a/content.tex
+++ b/content.tex
@@ -11,15 +11,15 @@
 \midaligned{\framed[width=12cm,align=center,offset=2cm,frame=off]{Nominal Techniques \& Black Box Testing for Automata Learning}}
 \switchtobodyfont[12pt]
 \midaligned{Joshua Moerman}
-\midaligned{draft 16 November 2018}
+\midaligned{draft Christmas 2018}
 \stop
 \page[yes]
 
 \setupwhitespace[none]
 \completecontent
-\completelistoffigures
-\completelistoftables
-\completelistofalgorithms
+%\completelistoffigures
+%\completelistoftables
+%\completelistofalgorithms
 \stopfrontmatter
 
 
diff --git a/environment.tex b/environment.tex
index df8db2d..be74996 100644
--- a/environment.tex
+++ b/environment.tex
@@ -5,7 +5,7 @@
 
 \setupexternalfigures[directory={images,../images}]
 
-% \definemode[afloop][yes]
+\definemode[afloop][yes]
 % \definemode[draft][yes]
 
 \environment bib
@@ -62,6 +62,17 @@ This chapter is based on the following publication:
 \def\href#1{\useURL[#1][{#1}]{\tt\goto{\url[#1]}[url(#1)]}}
 
 
+\definelayer[Logo]
+  [x=\paperwidth, y=0mm, location={left, bottom}, hoffset=1mm, state=repeat]
+
+\startsetups LogoSetup
+\setlayer[Logo]{
+\framed[frame=off, width=1cm, height=1cm, background=color, backgroundcolor=gray, foregroundcolor=white]{\getmarking[chapternumber]}
+}
+\stopsetups
+
+\setupbackgrounds[page][setups=LogoSetup, background=Logo]
+
 
 % Debugging
 %\enabletrackers[references.references, visualizers.justification]
diff --git a/environment/headers.tex b/environment/headers.tex
index 7fbd250..bd06e66 100644
--- a/environment/headers.tex
+++ b/environment/headers.tex
@@ -4,10 +4,10 @@
 \setupcombinedlist[content][list={part,chapter,section}, alternative=c]
 \setuplist[section][margin=1cm, headnumber=no]
 \setuplist[chapter][style=bold]
-\setuplist[part][style=bold]
+\setuplist[part][style=bold, height=broad, starter={Part }, stopper={:}]
 
 % How numbers are shown
-\setuphead[part][placehead=yes, align=middle, sectionstarter=Part , sectionstopper=:]
+\setuphead[part][placehead=yes, command=\MyPart]
 \setuphead[chapter][sectionsegments=chapter, command=\MyChapter]
 \setuphead[section][sectionsegments=section]
 \setuphead[subsection][sectionsegments=section:subsection]
@@ -15,7 +15,11 @@
 \define[2]\MyChapter
   {\framed[frame=off, width=max, align={flushleft,nothyphenated,verytolerant}, offset=0cm, toffset=1cm]{#1\\#2}}
 
+\define[2]\MyPart
+  {\framed[frame=off, width=max, align={middle}, offset=0cm, toffset=5cm]{Part #1:\\#2}}
+
 \setuplabeltext [en] [chapter=Chapter~]
+\setuplabeltext [en] [part=Part~]
 
 
 % een teller voor alles, prefix is chapter