diff --git a/demo-cap-1.tex b/demo-cap-1.tex
index b261350..3ea85da 100644
--- a/demo-cap-1.tex
+++ b/demo-cap-1.tex
@@ -1,6 +1,5 @@
 %!TEX root = main.tex
-\chapter[linha1 \\ linha 2]{Introdução}
-\chaptermark{\protect\parbox{0.3\linewidth}{linha 11\\ linha 12}}
+\chapter{Introdução}
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae est vitae risus varius malesuada et eget velit. Morbi tincidunt venenatis tellus, in volutpat ante varius et. Fusce congue maximus velit ac dignissim. Integer hendrerit pharetra libero, at vehicula odio vestibulum eget. Etiam eget fringilla leo, sit amet posuere nisl. Aenean at tincidunt felis. Cras rhoncus mauris libero, a vestibulum risus faucibus quis. Aenean malesuada vitae nibh ut dapibus. Pellentesque vel blandit odio.
 
diff --git a/main.lof b/main.lof
index 87bdc93..9762e82 100644
--- a/main.lof
+++ b/main.lof
@@ -1,8 +1,8 @@
+\select@language {english}
 \select@language {portuges}
+\select@language {english}
 \select@language {portuges}
-\select@language {portuges}
-\select@language {portuges}
-\select@language {portuges}
+\select@language {english}
 \addvspace {10\p@ }
 \contentsline {figure}{\numberline {1.1}{\ignorespaces Exemplo de uma figura.}}{2}
 \addvspace {10\p@ }
diff --git a/main.lot b/main.lot
index b8d33e9..99cb4ba 100644
--- a/main.lot
+++ b/main.lot
@@ -1,8 +1,8 @@
+\select@language {english}
 \select@language {portuges}
+\select@language {english}
 \select@language {portuges}
-\select@language {portuges}
-\select@language {portuges}
-\select@language {portuges}
+\select@language {english}
 \addvspace {10\p@ }
 \contentsline {table}{\numberline {1.1}{\ignorespaces Exemplo de uma tabela.}}{3}
 \addvspace {10\p@ }
diff --git a/main.pdf b/main.pdf
index cfa1d56..b589dfc 100644
Binary files a/main.pdf and b/main.pdf differ
diff --git a/main.tex b/main.tex
index a33c081..1009cb7 100644
--- a/main.tex
+++ b/main.tex
@@ -30,7 +30,7 @@
 %	- PT: Português (novo acordo ortográfico)
 %	- EN: Inglês
 %
-\tueLINGUA{PT}
+\tueLINGUA{EN}
 %
 % ----------------------------------------------------------------
 %
@@ -164,6 +164,7 @@
 %	do texto do documento.
 %
 \tuePREAMBULOLATEX{
+	\usepackage[figureright]{rotating}
 }
 %
 % ----------------------------------------------------------------
diff --git a/teseue.cls b/teseue.cls
index f5a5c25..9fd10d4 100644
--- a/teseue.cls
+++ b/teseue.cls
@@ -33,21 +33,27 @@
 \RequirePackage{acronym}
 \RequirePackage{tikz}
 \RequirePackage{makeidx}
-\RequirePackage{fontspec}
 \RequirePackage{array} % para alinhar verticalmente as linhas das tabelas (na lombada)
 \RequirePackage{polyglossia}	% Língua
-\setmainfont{Source Sans Pro}[
-	UprightFont = {* Light},
-	ItalicFont = {* Light Italic},
-	BoldFont = {*}
+%
+%	Tratamento das fontes
+%
+\RequirePackage{fontspec}
+\setmainfont{SourceSansPro-Light.otf}[
+	UprightFont = SourceSansPro-Light.otf,
+	ItalicFont = SourceSansPro-LightIt.otf,
+	BoldFont = SourceSansPro-Regular.otf
 ]
 %
-\newfontfamily\xlightfont{Source Sans Pro}[
-	UprightFont = {* ExtraLight},
-	ItalicFont = {* ExtraLight Italic},
-	BoldFont = {* Light}
+\newfontfamily\xlightfont{SourceSansPro-ExtraLight.otf}[
+	UprightFont = SourceSansPro-ExtraLight.otf,
+	ItalicFont = SourceSansPro-ExtraLightIt.otf,
+	BoldFont = SourceSansPro-Light.otf
 ]
 %\newfontfamily\lightfont{Source Sans Pro}[UprightFont = {* Light}]
+%
+%
+%
 %\RequirePackage[rgb]{xcolor}
 \definecolor{uered}{RGB}{158 27 50}
 \definecolor{uegray}{RGB}{88 89 91}
@@ -133,6 +139,16 @@
 \newcommand{\@LST@TAB@EN}{List of Tables}
 \newcommand{\@LST@TAB@PT}{Lista de Tabelas}
 \newcommand{\@LST@TAB}{\@LST@TAB@PT}
+% --- Termos intermutaveis ---
+\newcommand{\@TXT@SUMARIO@PT}{Sum\'{a}rio}
+\newcommand{\@TXT@SUMARIO@EN}{Abstact}
+\newcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@PT}
+\newcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@EN}
+%
+\newcommand{\@TXT@PALCHAVE@PT}{Palavras chave}
+\newcommand{\@TXT@PALCHAVE@EN}{Keywords}
+\newcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}
+\newcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN}
 %
 \DeclareRobustCommand{\tueLINGUA}[1]{%
 	\renewcommand{\@LINGUA}{#1}
@@ -147,6 +163,10 @@
 		\renewcommand{\@LST@CONT}{\@LST@CONT@EN}
 		\renewcommand{\@LST@TAB}{\@LST@TAB@EN}
   		\renewcommand{\contentsname}{\@LST@CONT@EN}
+		\renewcommand{\@TXT@SUMARIO@A}{\@TXT@SUMARIO@EN}
+		\renewcommand{\@TXT@SUMARIO@B}{\@TXT@SUMARIO@PT}
+		\renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@EN}
+		\renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@PT}
 	}{
 		%
 		% Portugues
@@ -158,6 +178,10 @@
 		\renewcommand{\@LST@CONT}{\@LST@CONT@PT}
 		\renewcommand{\@LST@TAB}{\@LST@TAB@PT}
   		\renewcommand{\contentsname}{\@LST@CONT@PT}
+		\renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}
+		\renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN}
+		\renewcommand{\@TXT@PALCHAVE@A}{\@TXT@PALCHAVE@PT}
+		\renewcommand{\@TXT@PALCHAVE@B}{\@TXT@PALCHAVE@EN}
   	}
 }
 %
@@ -381,21 +405,21 @@
 %% Sumario/Resumo
 %
 \newenvironment{tueSUMARIO}{
-	\chapter*{Sum\'{a}rio}
-	\addcontentsline{toc}{chapter}{Sum\'{a}rio}
-	\markboth{\uppercase{Sum\'{a}rio}}{}
+	\chapter*{\@TXT@SUMARIO@A}
+	\addcontentsline{toc}{chapter}{\@TXT@SUMARIO@A}
+	\markboth{\uppercase{\@TXT@SUMARIO@A}}{}
 }{
 	\par
 	\bigskip
-	\textbf{Palavras chave:}~\@PALAVRASCHAVE
+	\textbf{\@TXT@PALCHAVE@A:}~\@PALAVRASCHAVE
 }
 %
 %% Abstract
 %
 \newenvironment{tueABSTRACT}{
-	\chapter*{Abstract}
-	\addcontentsline{toc}{chapter}{Abstract}
-	\markboth{\uppercase{Abstract}}{}
+	\chapter*{\@TXT@SUMARIO@B}
+	\addcontentsline{toc}{chapter}{\@TXT@SUMARIO@B}
+	\markboth{\uppercase{\@TXT@SUMARIO@B}}{}
 	\begin{center}
 		\huge
 		\textbf{\@TITLE}
@@ -410,7 +434,7 @@
 }{
 	\par
 	\bigskip
-	\textbf{Keywords:}~\@KEYWORDS
+	\textbf{\@TXT@PALCHAVE@B:}~\@KEYWORDS
 }
 %
 %% Abstract
--
libgit2 0.21.2