diff --git a/eisvogel.tex b/eisvogel.tex
index c7fba87..4bf7f98 100644
--- a/eisvogel.tex
+++ b/eisvogel.tex
@@ -449,6 +449,28 @@
 \ifluatex
   \usepackage{selnolig}  % disable illegal ligatures
 \fi
+%
+% captions
+% caption must be loaded before bidi
+%
+\definecolor{caption-color}{HTML}{777777}
+$if(beamer)$
+$else$
+\usepackage[font={stretch=1.2}, textfont={color=caption-color}, position=top, skip=4mm, labelfont=bf, singlelinecheck=false, justification=$if(caption-justification)$$caption-justification$$else$raggedright$endif$]{caption}
+\setcapindent{0em}
+$endif$
+
+%
+% blockquote
+% mdframed must be loaded before bidi
+%
+\definecolor{blockquote-border}{RGB}{221,221,221}
+\definecolor{blockquote-text}{RGB}{119,119,119}
+\usepackage{mdframed}
+\newmdenv[rightline=false,bottomline=false,topline=false,linewidth=3pt,linecolor=blockquote-border,skipabove=\parskip]{customblockquote}
+\renewenvironment{quote}{\begin{customblockquote}\list{}{\rightmargin=0em\leftmargin=0em}%
+\item\relax\color{blockquote-text}\ignorespaces}{\unskip\unskip\endlist\end{customblockquote}}
+
 $if(dir)$
 \ifxetex
   % Load bidi as late as possible as it modifies e.g. graphicx
@@ -554,8 +576,8 @@
   \renewcommand*\familydefault{\sfdefault}
   $endif$
   % load polyglossia as late as possible as it *could* call bidi if RTL lang (e.g. Hebrew or Arabic)
-  \usepackage{polyglossia}
-  \setmainlanguage[]{english}
+  %%%\usepackage{polyglossia}
+  %%%\setmainlanguage[]{english}
 $for(polyglossia-otherlangs)$
   \setotherlanguage[$polyglossia-otherlangs.options$]{$polyglossia-otherlangs.name$}
 $endfor$
@@ -592,26 +614,6 @@
 %
 \usepackage{csquotes}
 
-%
-% captions
-%
-\definecolor{caption-color}{HTML}{777777}
-$if(beamer)$
-$else$
-\usepackage[font={stretch=1.2}, textfont={color=caption-color}, position=top, skip=4mm, labelfont=bf, singlelinecheck=false, justification=$if(caption-justification)$$caption-justification$$else$raggedright$endif$]{caption}
-\setcapindent{0em}
-$endif$
-
-%
-% blockquote
-%
-\definecolor{blockquote-border}{RGB}{221,221,221}
-\definecolor{blockquote-text}{RGB}{119,119,119}
-\usepackage{mdframed}
-\newmdenv[rightline=false,bottomline=false,topline=false,linewidth=3pt,linecolor=blockquote-border,skipabove=\parskip]{customblockquote}
-\renewenvironment{quote}{\begin{customblockquote}\list{}{\rightmargin=0em\leftmargin=0em}%
-\item\relax\color{blockquote-text}\ignorespaces}{\unskip\unskip\endlist\end{customblockquote}}
-
 %
 % Source Sans Pro as the de­fault font fam­ily
 % Source Code Pro for monospace text
diff --git a/examples/language-persian/build.sh b/examples/language-persian/build.sh
new file mode 100644
index 0000000..b675436
--- /dev/null
+++ b/examples/language-persian/build.sh
@@ -0,0 +1 @@
+pandoc "document.md" -o "document.pdf" --from markdown --template "../../eisvogel.tex" --listings
diff --git a/examples/language-persian/document.md b/examples/language-persian/document.md
new file mode 100644
index 0000000..b7995de
--- /dev/null
+++ b/examples/language-persian/document.md
@@ -0,0 +1,8 @@
+---
+mainfont: 'Nazli'
+---
+<div dir="rtl" markdown="1">
+
+انقلاب‌های فناورانه می
+
+</div>
diff --git a/examples/language-persian/document.pdf b/examples/language-persian/document.pdf
new file mode 100644
index 0000000..1e3ba29
Binary files /dev/null and b/examples/language-persian/document.pdf differ