diff --git a/documents/thesis/chapters/titlepage.tex b/documents/thesis/chapters/titlepage.tex
new file mode 100644
index 0000000..5608e2c
--- /dev/null
+++ b/documents/thesis/chapters/titlepage.tex
@@ -0,0 +1,49 @@
+\documentclass[../main.tex]{subfiles}
+
+% Thesis titling
+\def\thesistitle{Enhancing Timing Accuracy \\[0.3cm] in Air Shower Radio Detectors}
+\def\thesissubtitle{}
+\def\thesisauthorfirst{E.T.}
+\def\thesisauthorsecond{de Boone}
+\def\thesissupervisorfirst{dr. Harm}
+\def\thesissupervisorsecond{Schoorlemmer}
+\def\thesissecondreaderfirst{dr. Katherine}
+\def\thesissecondreadersecond{Mulrey}
+\def\thesisdate{2022-11}
+\definecolor{radboud}{RGB}{227, 0, 11}
+
+\begin{document}
+\begin{titlepage}
+	\thispagestyle{empty}
+	\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
+	\center
+	\textcolor{radboud}{\textsc{\Large Radboud Universiteit Nijmegen}}\\[.7cm]
+	\includegraphics[width=25mm]{radboud/in_dei_nomine_feliciter}\\[.5cm]
+	\textsc{Faculteit der Natuurwetenschappen, Wiskunde en Informatica}\\[0.5cm]
+
+	\HRule \\[0.4cm]
+	{ \huge \bfseries \thesistitle}\\[0.1cm]
+	\textsc{\thesissubtitle}\\
+	\HRule \\[.5cm]
+	\textsc{\large Master's thesis Physics and Astronomy}\\[.5cm]
+
+	\begin{minipage}{0.4\textwidth}
+	\begin{flushleft} \large
+	\emph{Author:}\\
+	\thesisauthorfirst\space \textsc{\thesisauthorsecond}
+	\end{flushleft}
+	\end{minipage}
+	~
+	\begin{minipage}{0.4\textwidth}
+	\begin{flushright} \large
+	\emph{Supervisor:} \\
+	\thesissupervisorfirst\space \textsc{\thesissupervisorsecond} \\[1em]
+	\emph{Second Reader:} \\
+	\thesissecondreaderfirst\space \textsc{\thesissecondreadersecond}
+	\end{flushright}
+	\end{minipage}\\[4cm]
+	\vfill
+	{\large \thesisdate}
+	\clearpage
+\end{titlepage}
+\end{document}
diff --git a/documents/thesis/thesis.tex b/documents/thesis/thesis.tex
index b803630..25b9b0a 100644
--- a/documents/thesis/thesis.tex
+++ b/documents/thesis/thesis.tex
@@ -6,7 +6,7 @@
 \usepackage[sorting=none,natbib=true,citestyle=numeric-comp,backend=bibtex]{biblatex}
 \addbibresource{../../bibliotheca/bibliography.bib}
 
-% % Document
+% Document
 \usepackage{subfiles}
 \usepackage{amsmath}
 \usepackage{mathtools}
@@ -33,6 +33,11 @@
 \usepackage[margin=1.0in]{geometry}
 \usepackage[nobottomtitles]{titlesec}
 
+
+
+
+%%%%%%%%%%%%%%%%%%%           Settings            %%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \titleformat{\chapter}[hang] % shape
 {\normalfont\bfseries\huge} % format
 {\thechapter.} % label
@@ -43,6 +48,12 @@
 ] % after-code
 
 \setlength{\parindent}{0cm}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%           Shortcuts           %%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newcommand*{\captionsource}[2]{%
   \caption[{#1}]{%
     #1%
@@ -51,81 +62,50 @@
   }%
 }
 
-% Shortcuts
-
 % Math
 \newcommand{\dif}[1]{\mathop{}\!\mathrm{d} #1}
 \newcommand{\pdif}[1]{\mathop{}\!\mathrm{\partial} #1}
+\newcommand{\dbyd}[2]{\ensuremath{\mathrm{d}{#1}/\mathrm{d}{#2}}\xspace}
 
 
-% Thesis titling
-\def\thesistitle{Enhancing Timing Accuracy \\[0.3cm] in Air Shower Radio Detectors}
-\def\thesissubtitle{}
-\def\thesisauthorfirst{E.T.}
-\def\thesisauthorsecond{de Boone}
-\def\thesissupervisorfirst{dr. Harm}
-\def\thesissupervisorsecond{Schoorlemmer}
-\def\thesissecondreaderfirst{dr. Katherine}
-\def\thesissecondreadersecond{Mulrey}
-\def\thesisdate{2022-11}
-\definecolor{radboud}{RGB}{227, 0, 11}
+% Units
+\newcommand{\eV}{\text{e\kern-0.15exV}\xspace}
+\newcommand{\MeV}{\text{M\eV}\xspace}
+\newcommand{\GeV}{\text{G\eV}\xspace}
+\newcommand{\TeV}{\text{T\kern-0.1ex\eV}\xspace}
 
+\newcommand{\ns}{\text{ns}\xspace}
+
+\newcommand{\MHz}{\text{MHz}\xspace}
+
+
+%%%%%%%%%%%%%%%%%%%       Start    Document       %%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}
 \frontmatter
-\begin{titlepage}
-	\thispagestyle{empty}
-	\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
-	\center
-	\textcolor{radboud}{\textsc{\Large Radboud Universiteit Nijmegen}}\\[.7cm]
-	\includegraphics[width=25mm]{radboud/in_dei_nomine_feliciter}\\[.5cm]
-	\textsc{Faculteit der Natuurwetenschappen, Wiskunde en Informatica}\\[0.5cm]
 
-	\HRule \\[0.4cm]
-	{ \huge \bfseries \thesistitle}\\[0.1cm]
-	\textsc{\thesissubtitle}\\
-	\HRule \\[.5cm]
-	\textsc{\large Master's thesis Physics and Astronomy}\\[.5cm]
-
-	\begin{minipage}{0.4\textwidth}
-	\begin{flushleft} \large
-	\emph{Author:}\\
-	\thesisauthorfirst\space \textsc{\thesisauthorsecond}
-	\end{flushleft}
-	\end{minipage}
-	~
-	\begin{minipage}{0.4\textwidth}
-	\begin{flushright} \large
-	\emph{Supervisor:} \\
-	\thesissupervisorfirst\space \textsc{\thesissupervisorsecond} \\[1em]
-	\emph{Second Reader:} \\
-	\thesissecondreaderfirst\space \textsc{\thesissecondreadersecond}
-	\end{flushright}
-	\end{minipage}\\[4cm]
-	\vfill
-	{\large \thesisdate}
-	\clearpage
-\end{titlepage}
-
-%\newpage
-%\hrule
-%\bigskip
+%% Titlepage
+\subfile{chapters/titlepage.tex}
 
+%% Table of Contents
 \tableofcontents
+
+% Main matter
 \clearpage
 \mainmatter
+%%	Introduction
 \subfile{chapters/introduction.tex}
 
-% Airshowers
+%%	Airshowers
 \subfile{chapters/airshowers.tex}
 
-% Timing
+%%	Timing
 \subfile{chapters/timing.tex}
 
-% Conclusion
+%%	Conclusion
 \subfile{chapters/conclusion.tex}
 
-%%%%%%%%%%%%%%%%%%%   Appendix and Bibliography   %%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Appendix and Bibliography
 %\pagebreak[3]
 %\phantomsection
 %\subfile{appendix.tex}