diff --git a/.gitignore b/.gitignore
index 06c3b040afcf667e359c96ac93305045e1941954..86cc747d2ee6b7031db5d3f1fd167d4de9eb3727 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,28 @@
-linux_beginner/_static/1280px-Unix_history-simple.svg.png
-linux_beginner/_static/File-permissions-in-Linux-2.png
-linux_beginner/_static/Unix_history-simple.svg
+_old_/
+git_beginner/_build/doctrees/
+git_beginner/_build/html/
+git_beginner/_build/latex/
+git_beginner/_build/linkcheck/
+git_beginner/_build/singlehtml/
+linux_beginner/_build/certificates/
 linux_beginner/_build/doctrees/
 linux_beginner/_build/html/
 linux_beginner/_build/latex/
 linux_beginner/_build/singlehtml/
+linux_beginner/_static/1280px-Unix_history-simple.svg.png
+linux_beginner/_static/File-permissions-in-Linux-2.png
+linux_beginner/_static/Unix_history-simple.svg
+linux_beginner/clmystery-master
+linux_beginner/exercises_all
+linux_combined/_build/certificates/
+linux_combined/_build/doctrees/
+linux_combined/_build/html/
+linux_combined/_build/latex/
+linux_intermediate/_build/certificates/
 linux_intermediate/_build/doctrees/
 linux_intermediate/_build/html/
 linux_intermediate/_build/latex/
-linux_intermediate/_build/singlehtml/
 linux_intermediate/_build/linkcheck/
+linux_intermediate/_build/singlehtml/
 linux_intermediate/attendees/*.csv
 linux_intermediate/attendees/*.pdf
-linux_combined/_build/doctrees/
-linux_combined/_build/html/
-linux_combined/_build/latex/
-linux_beginner/exercises_all
-linux_beginner/clmystery-master
-git_beginner/_build/doctrees/
-git_beginner/_build/html/
-git_beginner/_build/latex/
-git_beginner/_build/singlehtml/
-git_beginner/_build/linkcheck/
-_old_/
-linux_intermediate/_build/certificates/
diff --git a/git_beginner/Makefile b/git_beginner/Makefile
index c74091bd75a84bdf3cee462f1bd983e2f59e9003..022ebcf3d1d8141963011d65c496d70b206c6da1 100644
--- a/git_beginner/Makefile
+++ b/git_beginner/Makefile
@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext certificates
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -37,6 +37,7 @@ help:
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  certificates    to create certificates of participation (fill in list of names first)"
 
 clean:
 	-rm -rf $(BUILDDIR)/*
@@ -95,6 +96,12 @@ epub:
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
+certificates:
+	mkdir -p $(BUILDDIR)/certificates
+	pdflatex -interaction=nonstopmode  -output-directory=$(BUILDDIR)/certificates "\def\coursetitle{Introductory Course:\\\\GIT for Beginners} \input{../general/CertificateOfParticipation.tex}"
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/certificates."
+
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
diff --git a/linux_beginner/Makefile b/linux_beginner/Makefile
index c74091bd75a84bdf3cee462f1bd983e2f59e9003..6283d657839e3082d55cbc2e0523d9a5e76f7667 100644
--- a/linux_beginner/Makefile
+++ b/linux_beginner/Makefile
@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext certificates
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -37,6 +37,7 @@ help:
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  certificates    to create certificates of participation (fill in list of names first)"
 
 clean:
 	-rm -rf $(BUILDDIR)/*
@@ -95,6 +96,11 @@ epub:
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
+certificates:
+	mkdir -p $(BUILDDIR)/certificates
+	pdflatex -interaction=nonstopmode  -output-directory=$(BUILDDIR)/certificates "\def\coursetitle{Basic Linux Course:\\\\Introduction to the Linux Commandline} \input{../general/CertificateOfParticipation.tex}"
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/certificates."
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
diff --git a/linux_combined/Makefile b/linux_combined/Makefile
index bc4331d9151c8339b1f2a5f723abe4494ef6153a..9c9bcf01a28701d9e0e729653af9f7dd6ab672be 100644
--- a/linux_combined/Makefile
+++ b/linux_combined/Makefile
@@ -14,7 +14,7 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext certificates
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -37,6 +37,7 @@ help:
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  certificates    to create certificates of participation (fill in list of names first)"
 
 clean:
 	-rm -rf $(BUILDDIR)/*
@@ -95,6 +96,11 @@ epub:
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
+certificates:
+	mkdir -p $(BUILDDIR)/certificates
+	pdflatex -interaction=nonstopmode  -output-directory=$(BUILDDIR)/certificates "\def\coursetitle{Linux Course:\\\\Introduction \& Basic Scripting} \input{../general/CertificateOfParticipation.tex}"
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/certificates."
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
diff --git a/linux_intermediate/_build/latex/arguments.png b/linux_intermediate/_build/latex/arguments.png
deleted file mode 100644
index febfec7fb73ddecaec1a4a86c97f9a442734c963..0000000000000000000000000000000000000000
Binary files a/linux_intermediate/_build/latex/arguments.png and /dev/null differ
diff --git a/linux_intermediate/_build/latex/shift_arguments.png b/linux_intermediate/_build/latex/shift_arguments.png
deleted file mode 100644
index be3163b83d7ef3d9b95c23ed2582c69e9486b034..0000000000000000000000000000000000000000
Binary files a/linux_intermediate/_build/latex/shift_arguments.png and /dev/null differ