diff --git a/Dissertation.md b/Dissertation.md
index c5242f1..7fb2b78 100644
--- a/Dissertation.md
+++ b/Dissertation.md
@@ -12,6 +12,7 @@ degreetitle:  'BSc: Ethical Hacking and cybersecurity'
 
 #Hide the Declaration and Ethics Form
 draft: False
+#draft: True
 
 #Ethics form,  REPLACE THIS WITH YOUR ONE
 PDF-ethics: Supporting/ethics-certificate.pdf
@@ -22,8 +23,15 @@ PDF-declaration: Supporting/submission-declaration.pdf
 #Finally the Bibtex file for your references.
 bibliography: bibliography.bib
 
+# Various Tables of Contents
+toc: false
+toc-depth: 2
+lof: false
+lot: false
+
+
 #Font to use
-fontfamily: helvet
+#fontfamily: helvet
 ---
 
 !include Template/Header.md
@@ -35,3 +43,4 @@ the sections as "Includes files"
 
 -----------------------------------------------
 -->
+
diff --git a/Dockerfile/Dockerfile b/Dockerfile/Dockerfile
index 7785e08..c708deb 100644
--- a/Dockerfile/Dockerfile
+++ b/Dockerfile/Dockerfile
@@ -1,7 +1,7 @@
 FROM pandoc/latex:latest
 
 RUN apk update && apk --no-cache add py3-pip
-RUN pip install pandocfilters pandoc-include
-RUN tlmgr install tocbibind appendix datetime fmtcount nomencl
+RUN pip3 install pandocfilters pandoc-include
+RUN tlmgr install tocbibind appendix datetime fmtcount nomencl pdfpages
 ADD buildscript.sh /bin
 ENTRYPOINT '/bin/buildscript.sh'
\ No newline at end of file
diff --git a/Template/Header.md b/Template/Header.md
index 2833903..7300a08 100644
--- a/Template/Header.md
+++ b/Template/Header.md
@@ -8,12 +8,9 @@ classoption:
   - index
   - twoside
 
-toc: true
-toc-depth: 2
-lof: true
-lot: false
 
 #header-includes:
+#    - 
 #   - \renewcommand{\familydefault}{\sfdefault}
 #   - \renewcommand{\chaptername}{}
 #   - \renewcommand{\thechapter}{}
diff --git a/Template/disso.latex b/Template/disso.latex
index 9881c97..ad754b2 100644
--- a/Template/disso.latex
+++ b/Template/disso.latex
@@ -94,6 +94,7 @@ $if(fontfamily)$
 $else$
 \usepackage{lmodern}
 $endif$
+\usepackage{pdfpages}
 
 $if(linestretch)$
 \usepackage{setspace}
@@ -357,8 +358,8 @@ $endif$
 
 %\stuid{42}
 
-$if(sid)$
-\stuid{$sid$}
+$if(stuid)$
+\stuid{$stuid$}
 $endif$
 
 $if(dept)$
@@ -393,7 +394,7 @@ $endif$
 $if(draft)$
   $else$
   $if(PDF-ethics)$
-    \includepdf[pages=-]{$PDF-ethics$}
+    \includepdf{$PDF-ethics$}
   $endif$
   %
   $if(TEX-declaration)$