diff --git a/doc/latex/uosdocs/uosdocs.pdf b/doc/latex/uosdocs/uosdocs.pdf
index e69e71f307c4f251d3d41571fd483ee0fd0e6fb9..28159e2bacd2884323f613b103d2f084143a4ce3 100644
Binary files a/doc/latex/uosdocs/uosdocs.pdf and b/doc/latex/uosdocs/uosdocs.pdf differ
diff --git a/source/latex/uosdocs/uosdocs.dtx b/source/latex/uosdocs/uosdocs.dtx
index 722cfc69fb33be217d5748c9dfa7ea0defb8c943..5008e552cface9ce17f9c5113454f335f81ef083 100644
--- a/source/latex/uosdocs/uosdocs.dtx
+++ b/source/latex/uosdocs/uosdocs.dtx
@@ -750,7 +750,8 @@
 %<*minithesis|progress|project>
       \vfill
       {\normalsize Supervisor\supplural: \supname \par}
-      {\normalsize Examiner\examplural: \examname \par}
+      \ifthenelse{\isempty{\examname}}
+      {\normalsize Examiner\examplural: \examname \par}{}
       \vfill
       \hspace{6mm}\parbox[t][51mm][s]{89mm}{
         \center
@@ -1583,7 +1584,8 @@ Data: Author (Year) Title. URI [dataset]}
 \FACULTY     {\MakeUppercase{\facname}}
 \title      {An Investigation into \dots}
 %<*testthesis>
-\authors    {Insert name, for example, Sarah Alison Watson} % Use of Soton Email unadvised, use ORCiD instead.
+%% TODO: Replace with your name removing []
+\authors    {[Insert full name, for example, Sarah Alison Watson]} % Use of Soton Email unadvised, use ORCiD instead.
 %</testthesis>
 %<*testminithesis|testprogress|testproject|testreport|testarticle|testgdp|testgdpsummary>
 \authors    {\texorpdfstring
@@ -1605,8 +1607,9 @@ Data: Author (Year) Title. URI [dataset]}
 %<*testgdp|testgdpsummary>
 \degree     {Master of Engineering}
 %</testgdp|testgdpsummary>
-%% Optional Fields
-%<testthesis|testminithesis|testprogress> \qualifications{MEng PhD}
+%% Optional Fields TODO: Replace these fields with your own data
+%<testthesis|testminithesis|testprogress>
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 %<*testthesis>
 \orcidid{0000-0002-1825-0097}
 \doi{10.1002/0470841559.ch1}
@@ -1651,7 +1654,7 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% Either include citations like below (as many as required spaced with commas or 'and').
 %% \bibentry command must be used here with prepublished papers
 % https://www.stefaanlippens.net/bibentry/
-\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}\newline\bibentry{Lovell:2011:updated}\newline\bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
@@ -1688,12 +1691,12 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %<*testthesis|testminithesis|testprogress|testproject|testreport|testgdp>
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/Article.tex b/templates/latex/uosdocs/Article.tex
index 82a62ad3f3e5fac4f15f7908d1c7f8f3d7bee240..325a505adbdf98dcacea5adffafd21210db05701 100644
--- a/templates/latex/uosdocs/Article.tex
+++ b/templates/latex/uosdocs/Article.tex
@@ -21,7 +21,8 @@
             }
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
-%% Optional Fields
+%% Optional Fields TODO: Replace these fields with your own data
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
diff --git a/templates/latex/uosdocs/GDP.tex b/templates/latex/uosdocs/GDP.tex
index 0ed196085b1178d46bc7f73f5c8a42c397ba4f70..2f75fd69718ab144d9648b5724d174d52bf1a383 100644
--- a/templates/latex/uosdocs/GDP.tex
+++ b/templates/latex/uosdocs/GDP.tex
@@ -27,7 +27,8 @@
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
 \degree     {Master of Engineering}
-%% Optional Fields
+%% Optional Fields TODO: Replace these fields with your own data
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
@@ -71,12 +72,12 @@ This work is all about \dots
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/GDPSummary.tex b/templates/latex/uosdocs/GDPSummary.tex
index ac1ee2f743c0f52caeacee454bf590e11fc23de2..c075cac8c9e20095495ce40dca984a5fe3564b73 100644
--- a/templates/latex/uosdocs/GDPSummary.tex
+++ b/templates/latex/uosdocs/GDPSummary.tex
@@ -24,7 +24,8 @@
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
 \degree     {Master of Engineering}
-%% Optional Fields
+%% Optional Fields TODO: Replace these fields with your own data
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
diff --git a/templates/latex/uosdocs/MiniThesis.tex b/templates/latex/uosdocs/MiniThesis.tex
index c6690248b4ef4e4e338dca000708af2a91dd107d..c4435b2bed9e757b1de0bbb4719fc436cbf9b737 100644
--- a/templates/latex/uosdocs/MiniThesis.tex
+++ b/templates/latex/uosdocs/MiniThesis.tex
@@ -26,8 +26,9 @@
 \date       {\today}
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
-%% Optional Fields
- \qualifications{MEng PhD}
+%% Optional Fields TODO: Replace these fields with your own data
+
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
@@ -54,7 +55,7 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
 %% \bibentry command must be used here with prepublished papers
-\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}\newline\bibentry{Lovell:2011:updated}\newline\bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
@@ -67,12 +68,12 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/Progress.tex b/templates/latex/uosdocs/Progress.tex
index 024a75c61b80cf033eb267981858a330976027d2..15c717c8c95da35eea607f86102cb0d82b56d669 100644
--- a/templates/latex/uosdocs/Progress.tex
+++ b/templates/latex/uosdocs/Progress.tex
@@ -23,8 +23,9 @@
 \date       {\today}
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
-%% Optional Fields
- \qualifications{MEng PhD}
+%% Optional Fields TODO: Replace these fields with your own data
+
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
@@ -55,12 +56,12 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/Project.tex b/templates/latex/uosdocs/Project.tex
index e0f7f76facc2461ea89fcd5c763fe5c4b1291dc9..05f91bb0d9a07a4f75d18b03619e1d3c3a5aca5f 100644
--- a/templates/latex/uosdocs/Project.tex
+++ b/templates/latex/uosdocs/Project.tex
@@ -27,7 +27,8 @@
 \supervisor {Mr Beavis}
 \examiner   {Dr Butthead}
 \degree     {BEng Electronic Engineering}
-%% Optional Fields
+%% Optional Fields TODO: Replace these fields with your own data
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
@@ -51,7 +52,7 @@ This work is all about \dots
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
 %% \bibentry command must be used here with prepublished papers
-\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}\newline\bibentry{Lovell:2011:updated}\newline\bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
@@ -64,12 +65,12 @@ This work is all about \dots
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/Report.tex b/templates/latex/uosdocs/Report.tex
index 926f461d41ff70c62c142c2188c19cdbe1be7402..5beb6faa94717eed14e99d3f14cec7fb36ad3f6a 100644
--- a/templates/latex/uosdocs/Report.tex
+++ b/templates/latex/uosdocs/Report.tex
@@ -24,7 +24,8 @@
             }
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
-%% Optional Fields
+%% Optional Fields TODO: Replace these fields with your own data
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \subject    {}
 \keywords   {}
 
@@ -48,7 +49,7 @@ This work is all about \dots
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
 %% \bibentry command must be used here with prepublished papers
-\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}\newline\bibentry{Lovell:2011:updated}\newline\bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
@@ -61,12 +62,12 @@ This work is all about \dots
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/templates/latex/uosdocs/Thesis.tex b/templates/latex/uosdocs/Thesis.tex
index 44e5e937946adcb38c7d19659e2efacdcc9742c2..94c65f6fab4e8a91cb881ffbfc484796b7f96f89 100644
--- a/templates/latex/uosdocs/Thesis.tex
+++ b/templates/latex/uosdocs/Thesis.tex
@@ -18,11 +18,13 @@
 \faculty     {Faculty of [Insert faculty]}
 \FACULTY     {\MakeUppercase{\facname}}
 \title      {An Investigation into \dots}
-\authors    {Insert name, for example, Sarah Alison Watson} % Use of Soton Email unadvised, use ORCiD instead.
+%% TODO: Replace with your name removing []
+\authors    {[Insert full name, for example, Sarah Alison Watson]} % Use of Soton Email unadvised, use ORCiD instead.
 \addresses  {\groupname\\\deptname\\\univname}
 \date       {\today}
-%% Optional Fields
- \qualifications{MEng PhD}
+%% Optional Fields TODO: Replace these fields with your own data
+
+\qualifications{[Insert Previous Qualifications, for example MEng]}
 \orcidid{0000-0002-1825-0097}
 \doi{10.1002/0470841559.ch1}
 \volume{n}{m} %Optional Volume Numbering Volume n of m
@@ -56,7 +58,7 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% ---------- AUTHORSHIP DECLARATION/ ACKNOW. / DEDICATORY ----------
 %% Either include citations like below (as many as required spaced with commas or 'and').
 %% \bibentry command must be used here with prepublished papers
-\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}, \bibentry{Lovell:2011:updated} and \bibentry{Gunn:2011:updated2}}
+\authorshipdeclaration{\bibentry{Gunn:2001:pdflatex}\newline\bibentry{Lovell:2011:updated}\newline\bibentry{Gunn:2011:updated2}}
 %% Or state no citations like below
 %% \authorshipdeclaration{}
 %% -----------------------
@@ -69,12 +71,12 @@ There is no prescribed font, you should use a font appropriate to your disciplin
 %% ------------------ MAIN MATTER (CONTENT) --------------------
 \include{Introduction}
 \include{Conclusions}
-\begin{lstlisting}[caption=Without a title it doesn't appear in the table]
+\begin{lstlisting}[caption=Listing of what an example listing would be like]
 This is a test listing
 
-It has several lines
-That
-say not much at all
+The test listing has serveral lines
+to show how the listings
+will be displayed
 \end{lstlisting}
 \appendix
 \include{AppendixA}
diff --git a/tex/latex/uosdocs/uosminithesis.cls b/tex/latex/uosdocs/uosminithesis.cls
index e211131a30550168289fba7838db4085bb97b5ff..7b90bc3bd4f346f73f021af975b7b15a8786f4e6 100644
--- a/tex/latex/uosdocs/uosminithesis.cls
+++ b/tex/latex/uosdocs/uosminithesis.cls
@@ -224,7 +224,8 @@
       {\large MPhil to PhD \par}
       \vfill
       {\normalsize Supervisor\supplural: \supname \par}
-      {\normalsize Examiner\examplural: \examname \par}
+      \ifthenelse{\isempty{\examname}}
+      {\normalsize Examiner\examplural: \examname \par}{}
       \vfill
       \hspace{6mm}\parbox[t][51mm][s]{89mm}{
         \center
diff --git a/tex/latex/uosdocs/uosprogress.cls b/tex/latex/uosdocs/uosprogress.cls
index 38135622b6bdc3f1ec52bab437e919359e8e0068..8fd78d9121e739c397b252ac9d0faa06f6cfc7d1 100644
--- a/tex/latex/uosdocs/uosprogress.cls
+++ b/tex/latex/uosdocs/uosprogress.cls
@@ -224,7 +224,8 @@
       {\large towards a PhD \par}
       \vfill
       {\normalsize Supervisor\supplural: \supname \par}
-      {\normalsize Examiner\examplural: \examname \par}
+      \ifthenelse{\isempty{\examname}}
+      {\normalsize Examiner\examplural: \examname \par}{}
       \vfill
       \hspace{6mm}\parbox[t][51mm][s]{89mm}{
         \center
diff --git a/tex/latex/uosdocs/uosproject.cls b/tex/latex/uosdocs/uosproject.cls
index ada327450beae560e5e9830c8fd9bc9c650e19c7..617eb6310fd05811020548f3e17a9a2de27b0fbd 100644
--- a/tex/latex/uosdocs/uosproject.cls
+++ b/tex/latex/uosdocs/uosproject.cls
@@ -224,7 +224,8 @@
       {\large award of \par \degreename \par}
       \vfill
       {\normalsize Supervisor\supplural: \supname \par}
-      {\normalsize Examiner\examplural: \examname \par}
+      \ifthenelse{\isempty{\examname}}
+      {\normalsize Examiner\examplural: \examname \par}{}
       \vfill
       \hspace{6mm}\parbox[t][51mm][s]{89mm}{
         \center