diff --git a/0-front/toc.tex b/0-front/toc.tex
index 14a2e81..2ac1067 100644
--- a/0-front/toc.tex
+++ b/0-front/toc.tex
@@ -1,9 +1,6 @@
-{
-  \hypersetup{linkcolor=black}
 
+\begin{listof}
   \renewcommand{\contentsname}{\textsf{Contents}}
-  \pdfbookmark[chapter]{\contentsname}{toc}
-
-  \renewcommand{\cftsecfont}{}% Unbold sections in ToC
+  \renewcommand{\cftsecfont}{}% Unbold sections
   \tableofcontents
-}
+\end{listof}
diff --git a/5-back/bibliography.tex b/5-back/bibliography.tex
index b100dbc..a1dd0d4 100644
--- a/5-back/bibliography.tex
+++ b/5-back/bibliography.tex
@@ -1,4 +1,4 @@
-\chapter*{Bibliography}
-\label{bibliography}
-
-\printbibliography[heading=none]
+{
+  \singlespacing
+  \printbibliography[heading=bibliography]
+}
diff --git a/5-back/figures.tex b/5-back/figures.tex
index 88df9f8..6fc1323 100644
--- a/5-back/figures.tex
+++ b/5-back/figures.tex
@@ -1,9 +1,4 @@
-\chapter*{List of Figures}
-\label{figures}
-
-{% Set the link color to black only for the list of figures
-  \hypersetup{linkcolor=black}%
-  \makeatletter%
-  \@starttoc{lof}% Print the list of figures without the title
-  \makeatother%
-}%
+\begin{listof}
+  \renewcommand{\listfigurename}{\textsf{List of Figures}}
+  \listoffigures
+\end{listof}
diff --git a/5-back/tables.tex b/5-back/tables.tex
index 7f0513b..359d816 100644
--- a/5-back/tables.tex
+++ b/5-back/tables.tex
@@ -1,10 +1,4 @@
-\chapter*{List of Tables}
-\label{tables}
-
-{% Set the link color to black only for the list of tables
-  \hypersetup{linkcolor=black}%
-  \makeatletter%
-  \@starttoc{lot}% Print the list of tables without the title
-  \makeatother%
-}%
-
+\begin{listof}
+  \renewcommand{\listtablename}{\textsf{List of Tables}}
+  \listoftables
+\end{listof}
diff --git a/config/content.tex b/config/content.tex
index a8f1794..61c0230 100644
--- a/config/content.tex
+++ b/config/content.tex
@@ -17,7 +17,8 @@
 % Formatting
 \usepackage[autostyle]{csquotes} % For quotes
 \usepackage[dvipsnames]{xcolor} % More colors
-\usepackage{tocloft}
+\usepackage{tocloft} % Customise the table of contents
+\usepackage[nottoc]{tocbibind} % Add bibliography and lists to the table of contents
 
 % Footnotes
 \usepackage[hang]{footmisc}
diff --git a/config/thesis_commands.tex b/config/thesis_commands.tex
index 04cd1c3..b21b006 100644
--- a/config/thesis_commands.tex
+++ b/config/thesis_commands.tex
@@ -7,6 +7,12 @@
   \end{oldequation}%
 }
 
+% Contents, figures and tables
+\NewDocumentEnvironment{listof}{}{
+  \hypersetup{linkcolor=black}
+  \singlespacing
+}{}
+
 % Images
 % example: \fig[1]{filename}{Caption}[Additional caption text, not shown in the list of figures]
 % reference later with: \figref{filename}