diff --git a/legacy/psipresentation.cls b/legacy/psipresentation.cls
index 70846f3..4b89516 100644
--- a/legacy/psipresentation.cls
+++ b/legacy/psipresentation.cls
@@ -23,22 +23,31 @@
 %\RequirePackage{unicode-math}
 
 
-\setmainfont[Path = psipresentation/fonts/Georgia/,
-BoldFont = Georgia Bold.ttf,
-ItalicFont = Georgia Italic.ttf,
-BoldItalicFont = Georgia Bold Italic.ttf
-]{Georgia.ttf}
+\setmainfont{Georgia}[
+Path = psipresentation/fonts/Georgia/,
+Extension = .ttf,
+UprightFont = *-Regular,
+BoldFont = *-Bold,
+ItalicFont = *-Italic,
+BoldItalicFont = *-Bold-Italic
+]
 
-\setsansfont[Path = psipresentation/fonts/MetaPro/,
-BoldFont = MetaPro-Bold.otf,
-ItalicFont = MetaPro-NormalItalic.otf,
-BoldItalicFont = MetaPro-BoldItalic.otf
-]{MetaPro-Normal.otf}
+\setsansfont{MetaPro}[
+Path = psipresentation/fonts/MetaPro/,
+Extension = .otf,
+UprightFont = *-Regular,
+BoldFont = *-Bold,
+ItalicFont = *-Italic,
+BoldItalicFont = *-Bold-Italic
+]
 
-\setmonofont[Path = psipresentation/fonts/FiraMono/,
-Scale = MatchLowercase,
-BoldFont = FiraMono-Bold.otf,
-]{FiraMono-Regular.otf}
+\setmonofont{FiraMono}[
+Path = psipresentation/fonts/FiraMono/,
+Extension = .otf,
+UprightFont = *-Regular,
+BoldFont = *-Bold,
+Scale = MatchLowercase
+]
 
 
 \RequirePackage{tikz}
diff --git a/legacy/psipresentation/fonts/Georgia/Georgia Bold Italic.ttf b/legacy/psipresentation/fonts/Georgia/Georgia-Bold-Italic.ttf
similarity index 100%
rename from legacy/psipresentation/fonts/Georgia/Georgia Bold Italic.ttf
rename to legacy/psipresentation/fonts/Georgia/Georgia-Bold-Italic.ttf
diff --git a/legacy/psipresentation/fonts/Georgia/Georgia Bold.ttf b/legacy/psipresentation/fonts/Georgia/Georgia-Bold.ttf
similarity index 100%
rename from legacy/psipresentation/fonts/Georgia/Georgia Bold.ttf
rename to legacy/psipresentation/fonts/Georgia/Georgia-Bold.ttf
diff --git a/legacy/psipresentation/fonts/Georgia/Georgia Italic.ttf b/legacy/psipresentation/fonts/Georgia/Georgia-Italic.ttf
similarity index 100%
rename from legacy/psipresentation/fonts/Georgia/Georgia Italic.ttf
rename to legacy/psipresentation/fonts/Georgia/Georgia-Italic.ttf
diff --git a/legacy/psipresentation/fonts/Georgia/Georgia.ttf b/legacy/psipresentation/fonts/Georgia/Georgia-Regular.ttf
similarity index 100%
rename from legacy/psipresentation/fonts/Georgia/Georgia.ttf
rename to legacy/psipresentation/fonts/Georgia/Georgia-Regular.ttf
diff --git a/legacy/psipresentation/fonts/MetaPro/MetaPro-BoldItalic.otf b/legacy/psipresentation/fonts/MetaPro/MetaPro-Bold-Italic.otf
similarity index 100%
rename from legacy/psipresentation/fonts/MetaPro/MetaPro-BoldItalic.otf
rename to legacy/psipresentation/fonts/MetaPro/MetaPro-Bold-Italic.otf
diff --git a/legacy/psipresentation/fonts/MetaPro/MetaPro-NormalItalic.otf b/legacy/psipresentation/fonts/MetaPro/MetaPro-Italic.otf
similarity index 100%
rename from legacy/psipresentation/fonts/MetaPro/MetaPro-NormalItalic.otf
rename to legacy/psipresentation/fonts/MetaPro/MetaPro-Italic.otf
diff --git a/legacy/psipresentation/fonts/MetaPro/MetaPro-Normal.otf b/legacy/psipresentation/fonts/MetaPro/MetaPro-Regular.otf
similarity index 100%
rename from legacy/psipresentation/fonts/MetaPro/MetaPro-Normal.otf
rename to legacy/psipresentation/fonts/MetaPro/MetaPro-Regular.otf