diff --git a/README.md b/README.md
index 3840f0d..cba95b4 100644
--- a/README.md
+++ b/README.md
@@ -125,13 +125,13 @@ depends on where you have the preamble files located compared to your document.
 
 **Case: Same folder**
 ```tex
-\documentclass[a4, english]{article}
+\documentclass[english]{article}
 \input{preamble_en.tex}
 ```
 
 **Case: Relative path**
 ```tex
-\documentclass[a4, english]{article}
+\documentclass[english]{article}
 \usepackage{import}
 \subimport{../preamble/}{preamble_en.tex}
 ```
@@ -139,14 +139,14 @@ depends on where you have the preamble files located compared to your document.
 **Case: Absolute path**
 > **On Windows**
 ```tex
-\documentclass[a4, english]{article}
+\documentclass[english]{article}
 \usepackage{import}
 \import{C:/GitHub/LaTeX-Preamble_and_Examples/preamble/}{preamble_en.tex}
 ```
 
 > **On Unix**
 ```tex
-\documentclass[a4, english]{article}
+\documentclass[english]{article}
 \usepackage{import}
 \import{/home/username/Documents/LaTeX-Preamble_and_Examples/preamble/}{preamble_en.tex}
 ```
diff --git a/documents/examples_article.pdf b/documents/examples_article.pdf
index 16b6920..6a765bf 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 ddac392..1aad3ad 100644
--- a/documents/examples_article.tex
+++ b/documents/examples_article.tex
@@ -71,7 +71,7 @@
 
 \author{Steffan Sølvsten\footnote{Together with numerous many other beautiful
     people at Aarhus Univesity.}}
-\affil{Aarhus University \\ \mailto{soelvsten@cs.au.dk}}
+\date{Aarhus University \\ \mailto{soelvsten@cs.au.dk} \\[\baselineskip] \today}
 
 \begin{document}
 
diff --git a/documents/template_blank.pdf b/documents/template_blank.pdf
index f3dbb48..1b0e6d4 100644
Binary files a/documents/template_blank.pdf and b/documents/template_blank.pdf differ
diff --git a/documents/template_blank.tex b/documents/template_blank.tex
index b890cb2..d83f53f 100644
--- a/documents/template_blank.tex
+++ b/documents/template_blank.tex
@@ -1,7 +1,7 @@
 % ---------------------------------------------------------------------------- %
 % Load preamble
 % ---------------------------------------------------------------------------- %
-\documentclass[a4, english]{article}
+\documentclass[english]{article}
 
 % Import from absolute path:
 %\usepackage{import}
diff --git a/documents/template_dissertation.pdf b/documents/template_dissertation.pdf
index 6e66bb1..66c19b0 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 3bb4813..fa44e9e 100644
--- a/documents/template_dissertation.tex
+++ b/documents/template_dissertation.tex
@@ -1,7 +1,7 @@
 % ---------------------------------------------------------------------------- %
 % Load base preamble
 % ---------------------------------------------------------------------------- %
-\documentclass[a4, english, twoside]{book}
+\documentclass[english, twoside]{book}
 
 % Import from the same folder
 %\input{preamble_en.tex}
@@ -73,9 +73,8 @@
 % ---------------------------------------------------------------------------- %
 % Authors
 % ---------------------------------------------------------------------------- %
-\author{Steffan Sølvsten}
-\author{Lorem Ipsum}
-\affil{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk}}
+\author{Steffan Sølvsten and Lorem Ipsum}
+\date{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk} \\[2\baselineskip] \today}
 
 % ---------------------------------------------------------------------------- %
 % Main content
diff --git a/documents/template_report.pdf b/documents/template_report.pdf
index ece92ef..cb476fa 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 498b000..9b6136b 100644
--- a/documents/template_report.tex
+++ b/documents/template_report.tex
@@ -1,7 +1,7 @@
 % ---------------------------------------------------------------------------- %
 % Load base preamble
 % ---------------------------------------------------------------------------- %
-\documentclass[a4, english, twoside]{article}
+\documentclass[english, twoside]{article}
 
 % Import from the same folder
 %\input{preamble_en.tex}
@@ -72,9 +72,8 @@
 % ---------------------------------------------------------------------------- %
 % Authors
 % ---------------------------------------------------------------------------- %
-\author{Steffan Sølvsten}
-\author{Lorem Ipsum}
-\affil{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk}}
+\author{Steffan Sølvsten and Lorem Ipsum}
+\date{Aarhus University \\ \mailto{{soelvsten,ipsum}@cs.au.dk} \\[\baselineskip] \today}
 
 % ---------------------------------------------------------------------------- %
 % Main content
diff --git a/preamble/lang_dk.tex b/preamble/lang_dk.tex
index 08e990d..473113e 100644
--- a/preamble/lang_dk.tex
+++ b/preamble/lang_dk.tex
@@ -27,7 +27,7 @@
 \usepackage[danish]{babel}
 \renewcommand{\danishhyphenmins}{22}
 
-\renewcommand\Authand{ og }
-\renewcommand\Authands{, og }
-\renewcommand\Affilfont{\small}
+\newcommand\Authand{ og }
+\newcommand\Authands{, og }
+\newcommand\Affilfont{\small}
 
diff --git a/preamble/preamble_base_p1.tex b/preamble/preamble_base_p1.tex
index 6b6b9e0..4e8e4e7 100644
--- a/preamble/preamble_base_p1.tex
+++ b/preamble/preamble_base_p1.tex
@@ -255,8 +255,5 @@
 
 \declare{}
 
-% import standard variables
-\input{lang_en.tex}
-
-% FROM HERE LOAD preamble_base_p2.tex with any custom settings in between!
+% FROM HERE LOAD lang_en.tex/lang_dk.tex and then preamble_base_p2.tex.
 
diff --git a/preamble/preamble_base_p2.tex b/preamble/preamble_base_p2.tex
index 302df10..37d9e55 100644
--- a/preamble/preamble_base_p2.tex
+++ b/preamble/preamble_base_p2.tex
@@ -1,6 +1,4 @@
-% LOAD THIS AFTER preamble_base_p1.tex !
-
-\usepackage{authblk}
+% LOAD THIS AFTER lang_{dk,en}.tex !
 
 % ---------------------------------------------------------------------------- %
 % lstlisting