diff --git a/AUTHReport.cls b/AUTHReport.cls
index 9021a2c..ad517d7 100644
--- a/AUTHReport.cls
+++ b/AUTHReport.cls
@@ -38,8 +38,10 @@
 \ifPDFTeX
     \RequirePackage[utf8]{inputenc}
     \RequirePackage[T1]{fontenc}
+    \RequirePackage[english, greek]{babel}
 \else
     \RequirePackage{fontspec}
+    \RequirePackage{polyglossia}
 \fi
 
 \RequirePackage{xargs}      % Commands
@@ -117,8 +119,6 @@
     \setmainfont{#1}[SmallCapsFeatures={Letters=SmallCaps}]
     \setsansfont{#2}
     \setmonofont{#3}
-
-%    \newfontface\smallcapsfont{Libertinus Serif}[Letters=SmallCaps]
 }
 
 
@@ -205,13 +205,22 @@
 }
 \setlist[itemize]{topsep=0pt, partopsep=0pt, itemsep=3pt, parsep=3pt}
 
+
+
 \AtBeginDocument{%
     % Page layout (check above for the geometry setup)
     \authSetPageLayout
 
-    % Fonts
-    \authFontEnvSetup{CMU Serif}{CMU Sans Serif}{Courier New}
+	% Fonts
+	\authFontEnvSetup{CMU Serif}{CMU Sans Serif}{Courier New}
+	
+	\setdefaultlanguage{greek} % Main language
+	\setotherlanguage{english} % Other language
 
+	%hyphenation settiongs
+	\lefthyphenmin=2 	% minimum characters before 
+	\righthyphenmin=2 	% minimum characters after
+    
     % Header - Footer
   	\pagestyle{plain}
     \thispagestyle{authTitlePageStyle}
@@ -282,13 +291,13 @@
                 \else
                     \emph{Συντάκτης:}
                 \fi  \\
-                \textsc{\auth@authorName}     \\
-                \textsc{AEM:\auth@authorAEM}  \\[0.35ex]
+                \auth@authorName     \\
+                AEM:\auth@authorAEM  \\[0.35ex]
                 \normalsize	\href{mailto:\auth@authorMail}{\auth@authorMail}  \\[2ex]
                 \large
                 \ifdefined \auth@coauthorName
-                    \textsc{\auth@coauthorName}    \\
-                    \textsc{AEM:\auth@coauthorAEM} \\[0.35ex]
+                    \auth@coauthorName    \\
+                    AEM:\auth@coauthorAEM \\[0.35ex]
                     \normalsize \href{mailto:\auth@coauthorMail}{\auth@coauthorMail}  \\[2ex]
                 \fi
             \end{flushleft}
@@ -301,11 +310,11 @@
                 \else
                     \emph{Διδάσκων:}
                 \fi  \\
-                \textsc{\auth@instructorName} \\[0.35ex]
+                \auth@instructorName \\[0.35ex]
                 \normalsize \href{mailto:\auth@instructorMail}{\auth@instructorMail}  \\[2ex]
                 \large
                 \ifdefined \auth@coinstructorName
-                    \textsc{\auth@coinstructorName} \\[0.35ex]
+                    \auth@coinstructorName \\[0.35ex]
                     \normalsize \href{mailto:\auth@coinstructorMail}{\auth@coinstructorMail}  \\[2ex]
                 \fi
             \end{flushright}