diff --git a/README.md b/README.md
index cba95b4..3badd17 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # LaTeX - Preamble and Examples
-[![version](https://img.shields.io/badge/version-2.0-blue.svg)](https://github.com/SSoelvsten/LaTeX-Preamble_and_Examples/tree/main)
+[![version](https://img.shields.io/badge/version-2-blue.svg)](https://github.com/SSoelvsten/LaTeX-Preamble_and_Examples/tree/main)
 [![MIT License](https://img.shields.io/badge/license-MIT%20License-blue.svg)](LICENSE.md)
 [![test](https://github.com/SSoelvsten/LaTeX-Preamble_and_Examples/workflows/test/badge.svg?branch=main)](https://github.com/SSoelvsten/LaTeX-Preamble_and_Examples/actions?query=workflow%3Atest+branch%3Amain)
 
diff --git a/documents/examples_article.pdf b/documents/examples_article.pdf
index 6a765bf..91d95f6 100644
Binary files a/documents/examples_article.pdf and b/documents/examples_article.pdf differ
diff --git a/documents/examples_article.tex b/documents/examples_article.tex
index 1aad3ad..d3a7c5e 100644
--- a/documents/examples_article.tex
+++ b/documents/examples_article.tex
@@ -69,7 +69,7 @@
 % Font sizes of relevance: \normalsize, \large, \Large, \LARGE, \huge, \Huge
 \title{{\LARGE Reverse engineerable \LaTeX examples}}
 
-\author{Steffan Sølvsten\footnote{Together with numerous many other beautiful
+\author{Steffan S{\o}lvsten\footnote{Together with numerous many other beautiful
     people at Aarhus Univesity.}}
 \date{Aarhus University \\ \mailto{soelvsten@cs.au.dk} \\[\baselineskip] \today}
 
@@ -339,17 +339,17 @@ \section{Tables and figures}
 
   \begin{subfigure}{0.59\linewidth}
     \centering
-    
+
     \includegraphics[width=\linewidth]{img/picture_1.jpg}
-    
+
     \caption{An image}
     \label{fig example: sub figure 1}
   \end{subfigure}
   \begin{subfigure}{0.39\linewidth}
     \centering
-    
+
     \includegraphics[width=\linewidth]{img/picture_2.jpg}
-    
+
     \caption{Another image}
     \label{fig example: sub figure 2}
   \end{subfigure}
@@ -556,7 +556,7 @@ \subsection{Math and grammars}
     \\
     Aa &\quad \rightarrow\quad aa
   \end{align*}
-  
+
   \caption{A context-sensitive grammar for the language $\set{a^nb^na^nb^n}{n \geq 0}$}
   \label{fig:csl}
 \end{figure}
@@ -609,7 +609,7 @@ \section{Code}
 
 \begin{lstfloat}
   \centering
-  
+
   \begin{blstlisting}[firstnumber=1]
   Algorithm : *@\textbf{Linear Exponentiation}@*(x,p)
   Input     : $p \geq 0$
diff --git a/documents/examples_beamer.pdf b/documents/examples_beamer.pdf
index 1edb131..bbaede3 100644
Binary files a/documents/examples_beamer.pdf and b/documents/examples_beamer.pdf differ
diff --git a/documents/examples_beamer.tex b/documents/examples_beamer.tex
index 2b9197b..7612a7d 100644
--- a/documents/examples_beamer.tex
+++ b/documents/examples_beamer.tex
@@ -32,7 +32,7 @@
 \title{Reverse engineerable \LaTeX examples:}
 \subtitle{Beamer presentations}
 
-\author{\textbf{Steffan Christ S\o lvsten}}
+\author{\textbf{Steffan Christ S{\o}lvsten}}
 
 \institute{Aarhus University}
 
@@ -110,10 +110,10 @@ \section{Figures, Tables, and Graphics}
       \\ \hline
       $\gamma$ & $\beta$
     \end{tabular}
-    
+
     \caption{A table}
     \label{tab:label}
-  \end{table}  
+  \end{table}
 \end{frame}
 
 
@@ -149,7 +149,7 @@ \subsection{Simple use of pause and onslide}
   To animate slides it is luckily not necessary to copy paste all of the code
   and change one thing after the other! Otherwise Bærbak would definitely have
   been very sad.
-  
+
   The simplest animations you need is slowly revealing the slide, such as the
   bullet points below. This is done using the \lstinline{\\pause}
   command.
@@ -158,7 +158,7 @@ \subsection{Simple use of pause and onslide}
   \item An item, that is shown at the very beginning.
 
     \pause
-    
+
   \item An item, that is first shown on the ``next slide''
   \end{itemize}
 
@@ -277,7 +277,7 @@ \subsection{Tikz animations}
         \onslide<1-1>{
           \node[state, label=left:$\rightarrow$, cyan] {$q_0$};
         }
-  
+
         \onslide<2-2>{
           \draw[->, cyan]
             (q0) edge[bend left] node[below left] {$a$} (q1)
@@ -286,7 +286,7 @@ \subsection{Tikz animations}
           \node[state, above left=of q0, cyan] {$q_1$};
           \node[state, below left=1cm and 0.2cm of q0, cyan] {$q_2$};
         }
-      
+
         \onslide<3-3>{
           \draw[->, cyan]
             (q1) edge[bend left] node[above right] {$a$} (q0)
@@ -295,7 +295,7 @@ \subsection{Tikz animations}
           \node[state, label=left:$\rightarrow$, cyan] {$q_0$};
           \node[state, below right=1cm and 0.2cm of q0, cyan] {$q_3$};
         }
-      
+
         \onslide<4-4>{
           \draw[->, cyan]
             (q0) edge node[below right] {$b$} (q4)
@@ -307,7 +307,7 @@ \subsection{Tikz animations}
         }
       \end{tikzpicture}
     \end{column}
-  \end{columns}  
+  \end{columns}
 \end{frame}
 
 \subsection{Animating code}
@@ -317,7 +317,7 @@ \subsection{Animating code}
   be useful for showing a \emph{Coq} proof as below
   \begin{lstlisting}[language=coq]
   Theorem plus_n_O : forall n:nat, n = n + 0.
-  Proof.*@\pause@* 
+  Proof.*@\pause@*
     induction n as [| n' IHn'].*@\pause@*
     - (* n = 0 *)
       reflexivity.*@\pause@*
@@ -333,7 +333,7 @@ \subsection{Animating code}
   {\hrule width0.5\linewidth}
 
   \vspace{5pt}
-  
+
   \begin{itemize}
   \item[\faIcon{envelope}] \mailto{soelvsten@cs.au.dk}
   \item[\faIcon{twitter}] \href{https://www.twitter.com/ssoelvsten}{@ssoelvsten}
diff --git a/documents/template_beamer.pdf b/documents/template_beamer.pdf
index 43be329..47e8590 100644
Binary files a/documents/template_beamer.pdf and b/documents/template_beamer.pdf differ
diff --git a/documents/template_blank.tex b/documents/template_blank.tex
index d83f53f..0b412fb 100644
--- a/documents/template_blank.tex
+++ b/documents/template_blank.tex
@@ -31,7 +31,7 @@
 % Font sizes of relevance: \normalsize, \large, \Large, \LARGE, \huge, \Huge
 \title{{\LARGE \coursename} \\ {\large \handinname}}
 
-\author{Steffan Sølvsten}
+\author{Steffan S{\o}lvsten}
 
 % ---------------------------------------------------------------------------- %
 % Content
diff --git a/documents/template_dissertation.pdf b/documents/template_dissertation.pdf
index 66c19b0..bdb5d55 100644
Binary files a/documents/template_dissertation.pdf and b/documents/template_dissertation.pdf differ
diff --git a/documents/template_dissertation.tex b/documents/template_dissertation.tex
index fa44e9e..3590836 100644
--- a/documents/template_dissertation.tex
+++ b/documents/template_dissertation.tex
@@ -32,7 +32,7 @@
 % Page layout
 % ---------------------------------------------------------------------------- %
 \usepackage[a4paper]{geometry}
-\usepackage{lastpage, fancyhdr}
+\usepackage{fancyhdr}
 \pagestyle{fancy}
 
 % Top: Odd pages (Main for onesided)
@@ -73,7 +73,7 @@
 % ---------------------------------------------------------------------------- %
 % Authors
 % ---------------------------------------------------------------------------- %
-\author{Steffan Sølvsten and Lorem Ipsum}
+\author{Steffan S{\o}lvsten and Lorem Ipsum}
 \date{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk} \\[2\baselineskip] \today}
 
 % ---------------------------------------------------------------------------- %
diff --git a/documents/template_report.pdf b/documents/template_report.pdf
index cb476fa..f89a881 100644
Binary files a/documents/template_report.pdf and b/documents/template_report.pdf differ
diff --git a/documents/template_report.tex b/documents/template_report.tex
index 9b6136b..9362826 100644
--- a/documents/template_report.tex
+++ b/documents/template_report.tex
@@ -31,7 +31,7 @@
 % Page layout
 % ---------------------------------------------------------------------------- %
 \usepackage[a4paper]{geometry}
-\usepackage{lastpage, fancyhdr}
+\usepackage{fancyhdr}
 \pagestyle{fancy}
 
 % Top: Odd pages (Main for onesided)
@@ -72,7 +72,7 @@
 % ---------------------------------------------------------------------------- %
 % Authors
 % ---------------------------------------------------------------------------- %
-\author{Steffan Sølvsten and Lorem Ipsum}
+\author{Steffan S{\o}lvsten and Lorem Ipsum}
 \date{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk} \\[\baselineskip] \today}
 
 % ---------------------------------------------------------------------------- %
diff --git a/preamble/preamble_base_p1.tex b/preamble/preamble_base_p1.tex
index 4e8e4e7..9193d32 100644
--- a/preamble/preamble_base_p1.tex
+++ b/preamble/preamble_base_p1.tex
@@ -174,7 +174,7 @@
 }
 \DeclareCaptionFormat{listing}{%
   \makebox[2.1cm][l]{\qquad#1#2}%
-  \parbox[t]{\dimexpr \captionwidth-2.1cm}{#3}%
+  \parbox[t]{\dimexpr \textwidth-2.1cm}{#3}%
 }
 \captionsetup[lstlisting]{format=listing, singlelinecheck=off, labelsep=colon}