diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index 813c296..ca9da36 100644
Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index ed5fbdd..11ade98 100644
Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ
diff --git a/examples/template.pdf b/examples/template.pdf
index 4d2e01e..751a67a 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_banking_black.pdf b/examples/template_banking_black.pdf
index 47dd6f7..a4d0652 100644
Binary files a/examples/template_banking_black.pdf and b/examples/template_banking_black.pdf differ
diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index 7934b92..7bb59b6 100644
Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index 5aa5b48..98e0f81 100644
Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ
diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index ced7299..54f22f2 100644
Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ
diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index d7429e4..fbe1e5a 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf
index d49b1a4..12bb9bf 100644
Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ
diff --git a/moderncv.cls b/moderncv.cls
index 158d730..7dee9d4 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -78,14 +78,39 @@
 
 % if... then... else... constructs
 \RequirePackage{ifthen}
+% TODO: move to xifthen and \isempty{<arg>} instead of \equal{<arg>}{}
+
+% TODO: replace \newcommand by \NewDocumentCommand (LaTeX 3)
 
 % color
 \RequirePackage{xcolor}
 
-% automatic loading of latin modern fonts if present on the system
-\IfFileExists{lmodern.sty}
-  {\RequirePackage[T1]{fontenc}\RequirePackage{lmodern}}
-  {}
+% font loading
+%\usepackage{ifxetex,ifluatex}
+%\newif\ifxetexorluatex
+%\ifxetex
+%  \xetexorluatextrue
+%\else
+%  \ifluatex
+%    \xetexorluatextrue
+%  \else
+%    \xetexorluatexfalse
+%  \fi
+%\fi
+% automatic loading of latin modern fonts
+%\ifxetexorluatex
+%  \RequirePackage{fontspec}
+%  \defaultfontfeatures{Ligatures=TeX}
+%  \RequirePackage{unicode-math}
+%  \setmainfont{Latin Modern}
+%  \setsansfont{Latin Modern Sans}
+%  \setmathfont{Latin Modern Math}
+%\else
+  \RequirePackage[T1]{fontenc}
+  \IfFileExists{lmodern.sty}%
+    {\RequirePackage{lmodern}}%
+    {}
+%\fi
 
 % symbols like \Telefon, \Mobilefone, \Letter and \Email
 \RequirePackage{marvosym}
diff --git a/moderncvstylebanking.sty b/moderncvstylebanking.sty
index a8ca0e9..03e0f0e 100644
--- a/moderncvstylebanking.sty
+++ b/moderncvstylebanking.sty
@@ -21,13 +21,27 @@
 %-------------------------------------------------------------------------------
 %                package options
 %-------------------------------------------------------------------------------
-\RequirePackage{tgpagella}
-\renewcommand*{\familydefault}{\rmdefault}
 
 
 %-------------------------------------------------------------------------------
 %                overall style definition
 %-------------------------------------------------------------------------------
+% fonts
+%\ifxetexorluatex
+%  \setmainfont{Tex-Gyre Pagella}
+%  \setsansfont{Tex-Gyre Pagella}
+%  \setmathfont{Tex-Gyre Pagella}
+%  \setmathfont[range=\mathit,\mathsfit]{Tex-Gyre Pagella Italic}
+%  \setmathfont[range=\mathbfup,\mathbfsfup]{Tex-Gyre Pagella Bold}
+%  \setmathfont[range=\mathbfit,\mathbfsfit]{Tex-Gyre Pagella Bold Italic}
+%\else
+  \IfFileExists{tgpagella.sty}%
+    {%
+      \RequirePackage{tgpagella}%
+      \renewcommand*{\familydefault}{\rmdefault}}%
+    {}
+%\fi
+
 % commands
 \newcommand*{\maketitlesymbol}{%
     {~~~\textbullet~~~}}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
diff --git a/moderncvstyleclassic.sty b/moderncvstyleclassic.sty
index bb9d6c1..4e116ca 100644
--- a/moderncvstyleclassic.sty
+++ b/moderncvstyleclassic.sty
@@ -26,6 +26,16 @@
 %-------------------------------------------------------------------------------
 %                overall style definition
 %-------------------------------------------------------------------------------
+% fonts
+%\ifxetexorluatex
+%  \setmainfont{Latin Modern Roman}
+%  \setsansfont{Latin Modern Sans}
+%  \setmathfont{Latin Modern Math}
+%\else
+  \IfFileExists{lmodern.sty}%
+    {\RequirePackage{lmodern}}%
+    {}
+%\fi
 
 
 %-------------------------------------------------------------------------------
diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty
index 3718c48..9cd796d 100644
--- a/moderncvstyleoldstyle.sty
+++ b/moderncvstyleoldstyle.sty
@@ -29,9 +29,18 @@
 %                overall style definition
 %-------------------------------------------------------------------------------
 % fonts
-\IfFileExists{kurier.sty}
-  {\RequirePackage[light,math]{kurier}}
-  {}
+%\ifxetexorluatex
+%  \setmainfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light}
+%  \setsansfont[Numbers={OldStyle,Proportional}, BoldFont={Kurier Bold}, ItalicFont={Kurier Light Italic}, BoldItalicFont={Kurier Bold Italic}]{Kurier Light}
+%  \setmathfont{Kurier Light}
+%  \setmathfont[range=\mathit,\mathsfit]{Kurier Light Italic}
+%  \setmathfont[range=\mathbfup,\mathbfsfup]{Kurier Bold}
+%  \setmathfont[range=\mathbfit,\mathbfsfit]{Kurier Bold Italic}
+%\else
+  \IfFileExists{kurier.sty}%
+    {\RequirePackage[light,math]{kurier}}%
+    {}
+%\fi
 
 % symbols
 \renewcommand*{\listitemsymbol}{\labelitemi~}