diff --git a/.gitignore b/.gitignore
index cfe28c2..861a04d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,16 @@
 /Uebungen/uebung-08.pdf
 /Uebungen/uebung-08.synctex.gz
 /Uebungen/auto/uebung-06-03-musterloesung.el
+/Vorlesungen/auto
+/Vorlesungen/tmplecturefile-*
+/Vorlesungen/TheoLog2017-Vorlesung-*.pdf
+/Vorlesungen/lecture-*.pdf
+/Vorlesungen/*.aux
+/Vorlesungen/*.fdb_latexmk
+/Vorlesungen/*.fls
+/Vorlesungen/*.log
+/Vorlesungen/*.nav
+/Vorlesungen/*.out
+/Vorlesungen/*.snm
+/Vorlesungen/*.synctex.gz
+/Vorlesungen/*.toc
\ No newline at end of file
diff --git a/Vorlesungen/beamerouterthemetud.sty b/Vorlesungen/beamerouterthemetud.sty
index e399ef5..8305f75 100644
--- a/Vorlesungen/beamerouterthemetud.sty
+++ b/Vorlesungen/beamerouterthemetud.sty
@@ -31,6 +31,7 @@
 \ProcessOptionsBeamer\relax
 
 \RequirePackage{calc}
+\RequirePackage{ifpdf}
 
 % Templates
 
@@ -130,18 +131,11 @@
 \newcommand*{\inserttotalpagenumber}{\textbf{??}}
 
 
-\def\logo@front{logo_weiss}
-\def\logo@default{logo_blau}
-\ifx\pdfoutput\undefined
+\ifpdf
+  \def\logo@front{TU_Logo_SW}%
+  \def\logo@default{TU_Logo_SW}%
 \else
-  \ifx\pdfoutput\relax
-  \else
-    \ifcase\pdfoutput
-    \else
-      \def\logo@front{TU_Logo_SW}%
-      \def\logo@default{TU_Logo_SW}%
-    \fi
-  \fi
+  \errmessage{non-PDF output is not supported by this style}%
 \fi
 
 
diff --git a/Vorlesungen/build.sh b/Vorlesungen/build.sh
index 1cc447b..c17ae5b 100755
--- a/Vorlesungen/build.sh
+++ b/Vorlesungen/build.sh
@@ -5,23 +5,16 @@
 # Usage sh build.sh <lectureNumberAsString>
 
 fileprefix="TheoLog2017-Vorlesung-" # the start of generated PDFs
-tmpfilename="tmplecturefile" # don't have any files called like this!
 
-printfilename=$fileprefix$1-print.pdf
-overlayfilename=$fileprefix$1-overlay.pdf
+inputfilename=lecture-${1}.tex
+printfilename=${fileprefix}${1}-print.pdf
+overlayfilename=${fileprefix}${1}-overlay.pdf
 
-printf "\\documentclass[aspectratio=1610,onlymath,handout]{beamer}\n\n" > $tmpfilename.tex
-tail -n +3 lecture-$1.tex >> $tmpfilename.tex
-pdflatex $tmpfilename.tex
-pdflatex $tmpfilename.tex
-pdfnup --nup 2x2 --outfile $printfilename $tmpfilename.pdf
+latexmk -lualatex -pdflatex="lualatex --shell-escape %O %S" ${inputfilename}
+cp lecture-${1}-print.pdf ${printfilename}
+cp lecture-${1}.pdf ${overlayfilename}
 
-printf "\\documentclass[aspectratio=1610,onlymath]{beamer}\n\n" > $tmpfilename.tex
-tail -n +3 lecture-$1.tex >> $tmpfilename.tex
-pdflatex $tmpfilename.tex
-pdflatex $tmpfilename.tex
-mv $tmpfilename.pdf $overlayfilename
-
-rm $tmpfilename.*
-
-printf "\n\n*** Finished creating files '$overlayfilename' and '$printfilename' ***\n"
+echo
+echo
+echo "*** Finished creating files '${overlayfilename}' and '${printfilename}' ***"
+echo
diff --git a/Vorlesungen/lecture-01.tex b/Vorlesungen/lecture-01.tex
index 4391257..b1d0795 100644
--- a/Vorlesungen/lecture-01.tex
+++ b/Vorlesungen/lecture-01.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-02.tex b/Vorlesungen/lecture-02.tex
index a3b5b86..f895c1d 100644
--- a/Vorlesungen/lecture-02.tex
+++ b/Vorlesungen/lecture-02.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-03.tex b/Vorlesungen/lecture-03.tex
index 2863963..95793dd 100644
--- a/Vorlesungen/lecture-03.tex
+++ b/Vorlesungen/lecture-03.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-04.tex b/Vorlesungen/lecture-04.tex
index 9dfcf33..1635345 100644
--- a/Vorlesungen/lecture-04.tex
+++ b/Vorlesungen/lecture-04.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-05.tex b/Vorlesungen/lecture-05.tex
index d8f65d7..a9ae812 100644
--- a/Vorlesungen/lecture-05.tex
+++ b/Vorlesungen/lecture-05.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-06.tex b/Vorlesungen/lecture-06.tex
index 3c3f3de..5c4c355 100644
--- a/Vorlesungen/lecture-06.tex
+++ b/Vorlesungen/lecture-06.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-07.tex b/Vorlesungen/lecture-07.tex
index a2d2054..a9969ad 100644
--- a/Vorlesungen/lecture-07.tex
+++ b/Vorlesungen/lecture-07.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-08.tex b/Vorlesungen/lecture-08.tex
index d0b2b0a..63cf22f 100644
--- a/Vorlesungen/lecture-08.tex
+++ b/Vorlesungen/lecture-08.tex
@@ -1,6 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
-
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 \input{macros-lecture}
 
 \defineTitle{8}{Beziehungen zwischen Komplexitätsklassen / Effizient lösbare Probleme}{3. Mai 2017}
diff --git a/Vorlesungen/lecture-09.tex b/Vorlesungen/lecture-09.tex
index a3c0826..9d16fa2 100644
--- a/Vorlesungen/lecture-09.tex
+++ b/Vorlesungen/lecture-09.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-10.tex b/Vorlesungen/lecture-10.tex
index a724d50..bbb0c09 100644
--- a/Vorlesungen/lecture-10.tex
+++ b/Vorlesungen/lecture-10.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-11.tex b/Vorlesungen/lecture-11.tex
index 3858456..4b2adc8 100644
--- a/Vorlesungen/lecture-11.tex
+++ b/Vorlesungen/lecture-11.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-12.tex b/Vorlesungen/lecture-12.tex
index 6f1fc12..7ed1d0a 100644
--- a/Vorlesungen/lecture-12.tex
+++ b/Vorlesungen/lecture-12.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-13.tex b/Vorlesungen/lecture-13.tex
index 5836ac1..5693656 100644
--- a/Vorlesungen/lecture-13.tex
+++ b/Vorlesungen/lecture-13.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}
 
diff --git a/Vorlesungen/lecture-14.tex b/Vorlesungen/lecture-14.tex
index b277130..c74073b 100644
--- a/Vorlesungen/lecture-14.tex
+++ b/Vorlesungen/lecture-14.tex
@@ -1,5 +1,11 @@
-\documentclass[onlymath]{beamer}
-% \documentclass[onlymath,handout]{beamer}
+\newcommand*{\BeamerSuffix}{-overlay}
+\newcommand*{\HandoutSuffix}{-print}
+\PassOptionsToClass{onlymath}{beamer}
+\documentclass[also={handout}]{beamerswitch}
+\handoutlayout{nup=4}
+\makeatletter
+\beamer@ignorenonframefalse
+\makeatother
 
 \input{macros-lecture}