diff --git a/xespdfont.sty b/xespdfont.sty
index cc9d87d..42e0201 100644
--- a/xespdfont.sty
+++ b/xespdfont.sty
@@ -32,7 +32,7 @@
 \ifxetex
   \RequirePackage{fontspec}
   \defaultfontfeatures{Mapping=tex-text}
-%  \defaultfontfeatures{Scale=MatchLowercase}
+  \defaultfontfeatures{Scale=MatchLowercase}
 \fi
 
 \newcommand{\XESPDfontShape}{\rmfamily}
@@ -81,6 +81,7 @@
   \DeclareSymbolFont{letters}{\encodingdefault}{\rmdefault}{m}{it}
   \usepackage{unicode-math}
   \setmathfont{XITS Math}
+  \usepackage[T2A]{fontenc}
 \else
   \RequirePackage[T2A]{fontenc}
   \RequirePackage{mathptmx}
diff --git a/xespdinfo.sty b/xespdinfo.sty
index 9bca2bb..1d140bc 100644
--- a/xespdinfo.sty
+++ b/xespdinfo.sty
@@ -105,11 +105,18 @@
 \renewcommand{\date}[1]{\XESPDdate{#1}}
 
 \RequirePackage{xespdafterpkg}
+\RequirePackage{ifxetex}
 \XESPD@after@package{hyperref}{%
-  \hypersetup{%
-    \XESPD@lang,unicode=true,pdfusetitle,breaklinks=false,%
-    bookmarks=true,bookmarksnumbered=false,bookmarksopen=false,%
-    pdfborder={0 0 0},pdfborderstyle={},backref=false,colorlinks=false,%
-    pdftitle=\XESPDtheUnitName,pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+  \ifxetex
+    \hypersetup{xetex,%
+      breaklinks,pdftitle=\XESPDtheUnitName,%
+      \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+      pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+  \else
+    \hypersetup{%
+      breaklinks,pdftitle=\XESPDtheUnitName,%
+      \XESPD@lang,unicode=true,pdfusetitle,bookmarks=true,%
+      pdfsubject=\XESPDtheDocName,pdfauthor=\XESPDtheAuthor}
+  \fi
 }
 
diff --git a/xespdlang.sty b/xespdlang.sty
index e5905ec..43bb5ef 100644
--- a/xespdlang.sty
+++ b/xespdlang.sty
@@ -38,13 +38,13 @@
 \RequirePackage{csquotes}
 \RequirePackage{ifxetex}
 \ifxetex
-  \RequirePackage[\XESPD@lang]{babel}
   \RequirePackage{textcase}
   \RequirePackage{xltxtra}
   \RequirePackage{xunicode}
   \RequirePackage{xecyr}
   \RequirePackage{polyglossia}
-  \setmainlanguage{russian}
+  \setmainlanguage{\XESPD@lang}
+  \let\cyr\relax
   \setkeys{\XESPD@lang}{babelshorthands=true}
   \setotherlanguage{english}
 \else
diff --git a/xespdtext.cls b/xespdtext.cls
index 86b08da..a6b59d2 100644
--- a/xespdtext.cls
+++ b/xespdtext.cls
@@ -73,7 +73,6 @@
 \RequirePackage{xespdinfo}
 \RequirePackage{xespdtitlebase}
 \RequirePackage{xespdtitle}
-
 \RequirePackage{xltabular}
 \RequirePackage{multirow}
 \newcommand{\HY}{\hyphenpenalty=25\exhyphenpenalty=25}
diff --git a/xespdtitle.sty b/xespdtitle.sty
index 8f2da78..79ac119 100644
--- a/xespdtitle.sty
+++ b/xespdtitle.sty
@@ -136,7 +136,7 @@
   \par\vspace{10mm \@plus 2mm \@minus 4mm}\noindent
   \parbox[c][.30\vsize][t]{\hsize}{%
     \ifthenelse{\equal{\XESPDtheTitleFieldIV}{}}{}
-	{\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
+    {\begin{center}\XESPDtitleFontIV\XESPDtheTitleFieldIV\end{center}}
     \ifthenelse{\equal{\XESPDtheTitleFieldV}{}}{}
     {\begin{center}\XESPDtitleFontV\XESPDtheTitleFieldV\end{center}}
     \ifthenelse{\equal{\XESPDtheTitleFieldVI}{}}{}