diff --git a/.screenshots/demo-01.jpg b/.screenshots/demo-01.jpg
deleted file mode 100644
index 71983b33e150b40e76329a274b245ed6654d22a7..0000000000000000000000000000000000000000
Binary files a/.screenshots/demo-01.jpg and /dev/null differ
diff --git a/.screenshots/demo-01.png b/.screenshots/demo-01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b616a1c9dfbce2fd334cf2c326152a957b642ce8
Binary files /dev/null and b/.screenshots/demo-01.png differ
diff --git a/.screenshots/demo-02.jpg b/.screenshots/demo-02.jpg
deleted file mode 100644
index f8a22586a6b7effc99cd6813b90023f19c7a9ab9..0000000000000000000000000000000000000000
Binary files a/.screenshots/demo-02.jpg and /dev/null differ
diff --git a/.screenshots/demo-02.png b/.screenshots/demo-02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6ffb1a7e29f6143b70e784b1b167c474af58bf2
Binary files /dev/null and b/.screenshots/demo-02.png differ
diff --git a/.screenshots/demo-03.jpg b/.screenshots/demo-03.jpg
deleted file mode 100644
index cee125dc62df63c247b8edc6b7a6b2ad41e7ed23..0000000000000000000000000000000000000000
Binary files a/.screenshots/demo-03.jpg and /dev/null differ
diff --git a/.screenshots/demo-03.png b/.screenshots/demo-03.png
new file mode 100644
index 0000000000000000000000000000000000000000..376293ff6711e7b9cfc56b6ef12a5f1fcfe7f8c5
Binary files /dev/null and b/.screenshots/demo-03.png differ
diff --git a/.screenshots/demo-04.jpg b/.screenshots/demo-04.jpg
deleted file mode 100644
index 7e65d07cdd79ac8b7fed8c1feee06e5272cd5ac4..0000000000000000000000000000000000000000
Binary files a/.screenshots/demo-04.jpg and /dev/null differ
diff --git a/.screenshots/demo-04.png b/.screenshots/demo-04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ced8abacf4594e8494f3cff083c4c320c872d127
Binary files /dev/null and b/.screenshots/demo-04.png differ
diff --git a/.screenshots/demo-05.jpg b/.screenshots/demo-05.jpg
deleted file mode 100644
index 8032748a14de3b2b174f9568285905a8dd4a1938..0000000000000000000000000000000000000000
Binary files a/.screenshots/demo-05.jpg and /dev/null differ
diff --git a/.screenshots/demo-05.png b/.screenshots/demo-05.png
new file mode 100644
index 0000000000000000000000000000000000000000..28d5925d27da5fdde4d9e3bc57f92d55f2afdd0a
Binary files /dev/null and b/.screenshots/demo-05.png differ
diff --git a/Makefile b/Makefile
index 253347839755ddabae3b36a693134203afa3837a..2d88a0c342d2c946e088436cd255b7d9fd0f3108 100644
--- a/Makefile
+++ b/Makefile
@@ -9,15 +9,16 @@ demo-xelatex: LATEXMK_GEN := -xelatex
 demo-lualatex: LATEXMK_GEN := -lualatex
 demo-pdflatex: LATEXMK_GEN := -pdf
 
-demo-xelatex demo-lualatex demo-pdflatex: clean
-
-demo demo-xelatex demo-lualatex demo-pdflatex: $(TARGET)
+demo demo-xelatex demo-lualatex demo-pdflatex: | clean $(TARGET)
 	test -d "$(SCREENSHOT_DIR)" || mkdir "$(SCREENSHOT_DIR)"
-	pdftoppm -scale-to 500 -f 1 -l 5 -png $< "$(SCREENSHOT_DIR)/$@"
+	pdftoppm -scale-to 500 -f 1 -l 5 -png $(TARGET) "$(SCREENSHOT_DIR)/$@"
+
+clean::
+	rm -f "$(TARGET)"
 
 mrproper::
-	rm -f "$(TARGET)" "$(SCREENSHOT_DIR)"/demo-*.png
-	test -d "$(SCREENSHOT_DIR)" && rmdir --ignore-fail-on-non-empty "$(SCREENSHOT_DIR)"
+	rm -f "$(SCREENSHOT_DIR)"/demo-*.png
+	rmdir --ignore-fail-on-non-empty "$(SCREENSHOT_DIR)" || true
 
 include theme/Makefile
 
diff --git a/README.md b/README.md
index e7a511844797d567731a313635f98cae7cb83e03..9fc52b6508499fd73ac3758b4e08ccb0aad220cd 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,33 @@
 # i4neo Demo
 
-![Titlepage](.screenshots/demo-01.jpg)
-![Table of contents](.screenshots/demo-02.jpg)
-![Section](.screenshots/demo-03.jpg)
-![Plain slide](.screenshots/demo-04.jpg)
-![Slide with title](.screenshots/demo-05.jpg)
+![Titlepage](.screenshots/demo-01.png)
+![Table of contents](.screenshots/demo-02.png)
+![Section](.screenshots/demo-03.png)
+![Plain slide](.screenshots/demo-04.png)
+![Slide with title](.screenshots/demo-05.png)
+
+Make sure to checkout the submodule as well, for example by using
+
+	git clone --recursive https://gitlab.cs.fau.de/i4/tex/i4neo-demo.git
+
+To build the demo, make sure you have a TeX distribution (like *TeX Live*)
+installed and simply run
+
+	make demo.pdf
+
+to create the PDF using *XeLaTeX* (predefined by the theme).
+
+You can use different generators like *pdfLaTeX* (which requires FiraSans.sty)
+
+	make demo-pdflatex
+
+or *LuaLaTeX*
+
+	make demo-lualatex
+
+or explicitly the default *XeLaTeX* with
+
+	make demo-xelatex
+
+Although there are a few minor differences between the three generators above
+regarding the typesetting, these should not be visible to the naked eye.
diff --git a/demo.tex b/demo.tex
index 711085a4a7b5c976a27bc27247d4324655c574de..10a4d862e541a6a6c0a004ebbe51ffecbdfd19df 100644
--- a/demo.tex
+++ b/demo.tex
@@ -89,7 +89,7 @@ or show \textbf{bold} results.\end{verbatim}
       \colorsample{Yellow}{i4yellow} \\
       \colorsample{Grey}{i4grey} \\
       \textcolor{nBlack}{nBlack} \\
-      \colorbox{nBlack}{\textcolor{nWhite}{nWhite}} \\ 
+      \colorbox{nBlack}{\textcolor{nWhite}{nWhite}} \\
     \end{tabular}
   \end{center}
 \end{frame}
diff --git a/theme b/theme
index 689d48955240f580ab439f46815c791df5e1a7f6..87e3c13bcdebd9de9f8d780f6848d7e0dddc5225 160000
--- a/theme
+++ b/theme
@@ -1 +1 @@
-Subproject commit 689d48955240f580ab439f46815c791df5e1a7f6
+Subproject commit 87e3c13bcdebd9de9f8d780f6848d7e0dddc5225