diff --git a/Thesis.tex b/Thesis.tex
index 651e0a7..634dab0 100644
--- a/Thesis.tex
+++ b/Thesis.tex
@@ -56,12 +56,15 @@
 % Fonts
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\usepackage[cmintegrals,cmbraces]{newtxmath}
-\usepackage{ebgaramond-maths}
-\ifpdftex
-  \usepackage[scale=0.8]{sourcecodepro}
+\ifxetexorluatex
+  \usepackage{unicode-math}
+  \setmainfont{EB Garamond}
+  \setmathfont{Garamond Math}
+  \setmonofont[Scale=MatchLowercase]{Source Code Pro}
 \else
-  \usepackage[scale=MatchLowercase]{sourcecodepro}
+  \usepackage[lf]{ebgaramond}
+  \usepackage[oldstyle,scale=0.7]{sourcecodepro}
+  \singlespacing
 \fi
 
 \newacronym[description={Principal component analysis}]{PCA}{PCA}{principal component analysis}