diff --git a/misc/packages.tex b/misc/packages.tex
index 1dfb418..5ee2b97 100644
--- a/misc/packages.tex
+++ b/misc/packages.tex
@@ -4,7 +4,7 @@
 \usepackage[subpreambles=true]{standalone}
 
 % Paper size and margins
-\usepackage{geometry}
+\usepackage[a4paper, top=2.5cm, bottom=2.5cm, left=2.2cm, right=2.2cm]{geometry}
 
 % --- Languages & Fonts ---
 \usepackage{polyglossia}
@@ -31,7 +31,15 @@
 \usepackage{appendix}							% Appendix helpers
 \usepackage[onehalfspacing]{setspace}
 
-% --- TikZ and UML diagrams
+% --- fancyhdr ---
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+\fancyhead[L]{\nouppercase{\rightmark}}
+\fancyhead[R]{\nouppercase{\leftmark}}
+\setlength{\headheight}{15pt}
+
+% --- TikZ and UML diagrams ---
 \usepackage{pgf-umlsd}
 
 % --- Bibliography ---
diff --git a/thesis.pdf b/thesis.pdf
index f375353..65d2d92 100644
Binary files a/thesis.pdf and b/thesis.pdf differ
diff --git a/thesis.tex b/thesis.tex
index 5960d31..3790b29 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -6,9 +6,6 @@
 % Sets up the bib files
 \input{bibliography/bib-setup}
 
-% Paper size and margins
-\geometry{a4paper, top=2.5cm, bottom=2.5cm, left=2.2cm, right=2.2cm}
-
 % Make title page
 \input{misc/title-page}