diff --git a/demo-cap-1.tex b/demo-cap-1.tex
index 34cf95a..3ea85da 100644
--- a/demo-cap-1.tex
+++ b/demo-cap-1.tex
@@ -1,5 +1,5 @@
 %!TEX root = main.tex
-\chapter[\tiny{Intro}]{Introdução}
+\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 c406500..87bdc93 100644
--- a/main.lof
+++ b/main.lof
@@ -1,5 +1,8 @@
 \select@language {portuges}
-\select@language {english}
+\select@language {portuges}
+\select@language {portuges}
+\select@language {portuges}
+\select@language {portuges}
 \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 5a18be7..b8d33e9 100644
--- a/main.lot
+++ b/main.lot
@@ -1,5 +1,8 @@
 \select@language {portuges}
-\select@language {english}
+\select@language {portuges}
+\select@language {portuges}
+\select@language {portuges}
+\select@language {portuges}
 \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 76827e3..2dfadfc 100644
Binary files a/main.pdf and b/main.pdf differ
diff --git a/main.tex b/main.tex
index ef02694..a33c081 100644
--- a/main.tex
+++ b/main.tex
@@ -17,13 +17,23 @@
 %
 % ================================================================
 %	DOCUMENTO:
-%
-%		Título, Nome do Candidato, Curso, etc
+%		 
+%		Língua, Título, Nome do Candidato, Curso, etc
 %		Estrutura
 % ================================================================
 %
 % ----------------------------------------------------------------
 %
+%	LÍNGUA DA TESE
+%
+%	Opções atuais:
+%	- PT: Português (novo acordo ortográfico)
+%	- EN: Inglês
+%
+\tueLINGUA{PT}
+%
+% ----------------------------------------------------------------
+%
 %	TÍTULO DA TESE
 %
 %	Em Português e Inglês.
@@ -40,7 +50,7 @@
 %
 \tueSUBTITULO
 {Controlar e fomentar a actividade da pesca no litoral sul do reino}
-{Monitor and encourage the fishing activity in coastal southern kingdom}
+{Monitor and encourage the fishing activity in coastal southern kingdom }
 %
 % ----------------------------------------------------------------
 %
@@ -154,7 +164,6 @@
 %	do texto do documento.
 %
 \tuePREAMBULOLATEX{
-	\setmainlanguage{english}
 }
 %
 % ----------------------------------------------------------------
diff --git a/teseue.cls b/teseue.cls
index ec5c954..f5a5c25 100644
--- a/teseue.cls
+++ b/teseue.cls
@@ -5,8 +5,7 @@
 %
 %	Free as in freedom
 %
-
-
+%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesClass{teseue}[
 	2015/02/05 --- 
@@ -14,8 +13,6 @@
 	Com o contributo de fc, jsaias, tcg, dmendes e quase todos @di.uevora.pt --- 
 	Codigo Livre 
 ]
-% Language adjustment
-
 % Hyperref adjustments
 % \RequirePackage{hyperref}
 % \hypersetup{
@@ -38,6 +35,7 @@
 \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},
@@ -116,11 +114,51 @@
 %
 % ================================================================
 %
-%% Linguagem
-%}
-\newcommand{\@LINGUAGEM}{PT}
-\DeclareRobustCommand{\tueLINGUAGEM}[1]{%
-	\renewcommand{\@LINGUAGEM}{#1}
+%% Língua
+%
+\newcommand{\@LINGUA}{PT}
+% --- Lista de Acrónimos ---
+\newcommand{\@LST@ACRON@EN}{Acronyms}
+\newcommand{\@LST@ACRON@PT}{Lista de Acr\'{o}nimos}
+\newcommand{\@LST@ACRON}{\@LST@ACRON@PT}
+% --- Lista de Figuras ---
+\newcommand{\@LST@FIG@EN}{List of Figures}
+\newcommand{\@LST@FIG@PT}{Lista de Figuras}
+\newcommand{\@LST@FIG}{\@LST@FIG@PT}
+% --- Tabela de Conteúdos ---
+\newcommand{\@LST@CONT@EN}{Contents}
+\newcommand{\@LST@CONT@PT}{Conteúdo}
+\newcommand{\@LST@CONT}{\@LST@CONT@PT}
+% --- Lista de Tabelas ---
+\newcommand{\@LST@TAB@EN}{List of Tables}
+\newcommand{\@LST@TAB@PT}{Lista de Tabelas}
+\newcommand{\@LST@TAB}{\@LST@TAB@PT}
+%
+\DeclareRobustCommand{\tueLINGUA}[1]{%
+	\renewcommand{\@LINGUA}{#1}
+	\ifdefstring{\@LINGUA}{EN}{
+		%
+		%	English
+		%
+		\setmainlanguage{english}
+		\setotherlanguage{portuges}
+		\renewcommand{\@LST@ACRON}{\@LST@ACRON@EN}
+		\renewcommand{\@LST@FIG}{\@LST@FIG@EN}
+		\renewcommand{\@LST@CONT}{\@LST@CONT@EN}
+		\renewcommand{\@LST@TAB}{\@LST@TAB@EN}
+  		\renewcommand{\contentsname}{\@LST@CONT@EN}
+	}{
+		%
+		% Portugues
+		%
+		\setmainlanguage{portuges}
+		\setotherlanguage{english}
+		\renewcommand{\@LST@ACRON}{\@LST@ACRON@PT}
+		\renewcommand{\@LST@FIG}{\@LST@FIG@PT}
+		\renewcommand{\@LST@CONT}{\@LST@CONT@PT}
+		\renewcommand{\@LST@TAB}{\@LST@TAB@PT}
+  		\renewcommand{\contentsname}{\@LST@CONT@PT}
+  	}
 }
 %
 %% Titulo
@@ -301,8 +339,6 @@
 	%
 	%\usepackage[portuguese]{babel}
 	%
-	\usepackage{polyglossia}
-	\setmainlanguage{portuges}
 	\@PREAMBULOLATEX
 	\begin{document}
 		\frontmatter
@@ -324,7 +360,7 @@
 %% CAPA E SUBCAPA
 %
 \DeclareRobustCommand{\tueCAPAS}{
-	\usepackage[portuguese]{babel}
+	%\usepackage[portuguese]{babel}
 	\@PREAMBULOLATEX
 	\begin{document}
 		\frontmatter
@@ -345,7 +381,9 @@
 %% Sumario/Resumo
 %
 \newenvironment{tueSUMARIO}{
-	\chapter*{Sumário}\addcontentsline{toc}{chapter}{Sumário}\markboth{\uppercase{Sumário}}{}
+	\chapter*{Sum\'{a}rio}
+	\addcontentsline{toc}{chapter}{Sum\'{a}rio}
+	\markboth{\uppercase{Sum\'{a}rio}}{}
 }{
 	\par
 	\bigskip
@@ -355,7 +393,9 @@
 %% Abstract
 %
 \newenvironment{tueABSTRACT}{
-	\chapter*{Abstract}\addcontentsline{toc}{chapter}{Abstract}\markboth{\uppercase{Abstract}}{}
+	\chapter*{Abstract}
+	\addcontentsline{toc}{chapter}{Abstract}
+	\markboth{\uppercase{Abstract}}{}
 	\begin{center}
 		\huge
 		\textbf{\@TITLE}
@@ -375,16 +415,8 @@
 %
 %% Abstract
 %
-\newcommand{\@LSTACRONEN}{Acronyms}
-\newcommand{\@LSTACRONPT}{Lista de Acr\'{o}nimos}
-\newcommand{\@LSTACRON}{\@LSTACRONPT}
-\ifdefstring{\@LINGUAGEM}{PT}{
-	\renewcommand{\@LSTACRON}{\@LSTACRONPT}
-}{	% EN
-	\renewcommand{\@LSTACRON}{\@LSTACRONEN}
-}
 \newenvironment{tueACRONIMOS}{
-	\chapter*{\@LSTACRON}\addcontentsline{toc}{chapter}{\@LSTACRON}
+	\chapter*{\@LST@ACRON}\addcontentsline{toc}{chapter}{\@LST@ACRON}
 }{
 }
 %
@@ -400,17 +432,17 @@
 		\@blankoddpage
 		\cleardoublepage
 		\tableofcontents
-		\addcontentsline{toc}{chapter}{Conte\'{u}do}
+		\addcontentsline{toc}{chapter}{\@LST@CONT}
 		%
 		\@blankoddpage
 		\cleardoublepage
 		\listoffigures
-		\addcontentsline{toc}{chapter}{Lista de Figuras}
+		\addcontentsline{toc}{chapter}{\@LST@FIG}
 		%
 		\@blankoddpage
 		\cleardoublepage
 		\listoftables
-		\addcontentsline{toc}{chapter}{Lista de Tabelas}
+		\addcontentsline{toc}{chapter}{\@LST@TAB}
 		%
 		\@blankoddpage
 		\cleardoublepage
@@ -435,7 +467,8 @@
 % ================================================================
 %
 \DeclareRobustCommand{\@CAPA}{   % v.2013: capa uniforme, jsaias
-	\thispagestyle{empty}
+	\begin{portuges}
+		\thispagestyle{empty}
 		\vspace*{-2.1cm}
 		\begin{flushright}
 			\includegraphics[width=6cm]{teseue-logo.pdf}
@@ -496,16 +529,16 @@
 			\vspace{2em}
 			%
 			\begin{centering}
-			    %\includegraphics[trim=0.89cm 0cm 0.38cm 0cm, clip, width=\textwidth]{\@AZULEJOS}
 			    \includegraphics[width=\linewidth]{\@AZULEJOS}
 			\end{centering}
 			%
 			\par
-			\vspace{2em}
+			\vspace*{\fill}
 			%
 			{INSTITUTO DE INVESTIGA\c{C}\~{A}O E FORMA\c{C}\~{A}O AVAN\c{C}ADA}
 			%
 		\end{flushright}
+	\end{portuges}
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\newpage\hspace{1mm}\thispagestyle{empty}
 	\cleardoublepage
@@ -519,93 +552,94 @@
 %
 \DeclareRobustCommand{\@SUBCAPA}{   % v.2013: capa uniforme, jsaias
 	\thispagestyle{empty}
-	%\vspace*{-0.8cm}
-	\begin{tabular}{lcr}
-		%
-		% pomba
-		%
-	    \vspace*{-1.5cm}\parbox[t][\textheight][t]{2.63cm}{\includegraphics[width=8em]{teseue-pomba} \\ } 
-	    & 
-	    %
-	    % tracejado vertical a esquerda
-	    %
-	    \hspace{1em}
-	  	\parbox[t][\textheight][t]{0.4cm}{
-	  		\vspace*{-3.2cm}
-	  		\begin{tikzpicture}
-	  			\foreach \y in {1, ..., 42} {
-	  				\fill[fill=uegrey] (0,\y*0.55) circle (0.05cm);
-	  			}
-	  		\end{tikzpicture}
-	  	}
-	  	& 
-	  	%
-	  	%	resumo
-	  	%
-	    \vspace*{-1.5cm}
-	    \parbox[t][0.9\textheight][t]{10.1cm}{
-	    	%
-			\vspace{-2.8cm} % recuo vertical igual ao comprimento da imagem
-			%
-			{\Large \textbf{{\color{uered} UNIVERSIDADE DE ÉVORA}}}\\
-			%
-			\par
-			%
-			{\large \textbf{\@ESCOLA}} \\
-			%
-			\par
-			%
-			{\large \@DEPARTAMENTO} \\
-			%
-			\par
-			\vspace*{12em}
-			%
-			{\Large \textbf{\@TITULO}} \\
-			%
-			\par			%
-			\vspace{2em}
-			%
-			{\large \textbf{\@CANDIDATO}}\\
-			%
-			\par			%
-			\vspace{4em}
-			%
-			%	Orientacao
-			%
-			\begin{tabular}{rl}%
-				Orienta\c{c}\~{a}o & \textit{\@NOMEORIENTADOR}\\%
-				\ifbool{@comSegOrientador}{%
-					& \textit{\@NOMESEGORIENTADOR}\\%				
-					\ifbool{@comTerOrientador}%
-						{& \textit{\@NOMETERORIENTADOR}\\}%
-						{\\}%
-				}{~ \\ ~ \\}%
-			\end{tabular}%
-			%
-			\par
-			\vspace{4em}
-			%
-			% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-			%
-			{\large \textbf{\@CURSO}}
-			%
-			\par
-			\vspace{2em}
-			%
-			{\normalsize \@Monografia}
-			%
-			\par
-			\vspace{6em}
-			%
-			{\small \@DATA}
-			%
-			\par
-			\vspace*{3em}
-			%
-			{\footnotesize\textit{Esta \@monografia\ n\~{a}o inclui as cr\'{i}ticas e sugest\~{o}es feitas pelo J\'{u}ri}\\}
-			%
-		}
-	\end{tabular} 
+	\begin{portuges}
+		\begin{tabular}{lcr}
+			%
+			% pomba
+			%
+		    \vspace*{-1.5cm}\parbox[t][\textheight][t]{2.63cm}{\includegraphics[width=8em]{teseue-pomba} \\ } 
+		    & 
+		    %
+		    % tracejado vertical a esquerda
+		    %
+		    \hspace{1em}
+		  	\parbox[t][\textheight][t]{0.4cm}{
+		  		\vspace*{-3.2cm}
+		  		\begin{tikzpicture}
+		  			\foreach \y in {1, ..., 42} {
+		  				\fill[fill=uegrey] (0,\y*0.55) circle (0.05cm);
+		  			}
+		  		\end{tikzpicture}
+		  	}
+		  	& 
+		  	%
+		  	%	resumo
+		  	%
+		    \vspace*{-1.5cm}
+		    \parbox[t][0.9\textheight][t]{10.1cm}{
+		    	%
+				\vspace{-2.8cm} % recuo vertical igual ao comprimento da imagem
+				%
+				{\Large \textbf{{\color{uered} UNIVERSIDADE DE \'{E}VORA}}}\\
+				%
+				\par
+				%
+				{\large \textbf{\@ESCOLA}} \\
+				%
+				\par
+				%
+				{\large \@DEPARTAMENTO} \\
+				%
+				\par
+				\vspace*{12em}
+				%
+				{\Large \textbf{\@TITULO}} \\
+				%
+				\par			%
+				\vspace{2em}
+				%
+				{\large \textbf{\@CANDIDATO}}\\
+				%
+				\par			%
+				\vspace{4em}
+				%
+				%	Orientacao
+				%
+				\begin{tabular}{rl}%
+					Orienta\c{c}\~{a}o & \textit{\@NOMEORIENTADOR}\\%
+					\ifbool{@comSegOrientador}{%
+						& \textit{\@NOMESEGORIENTADOR}\\%				
+						\ifbool{@comTerOrientador}%
+							{& \textit{\@NOMETERORIENTADOR}\\}%
+							{\\}%
+					}{~ \\ ~ \\}%
+				\end{tabular}%
+				%
+				\par
+				\vspace{4em}
+				%
+				% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+				%
+				{\large \textbf{\@CURSO}}
+				%
+				\par
+				\vspace{2em}
+				%
+				{\normalsize \@Monografia}
+				%
+				\par
+				\vspace{6em}
+				%
+				{\small \@DATA}
+				%
+				\par
+				\vspace*{3em}
+				%
+				{\footnotesize\textit{Esta \@monografia\ n\~{a}o inclui as cr\'{i}ticas e sugest\~{o}es feitas pelo J\'{u}ri}\\}
+				%
+			}
+		\end{tabular}
+	\end{portuges}
 	% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 	\newpage\hspace{1mm}\thispagestyle{empty}
 	\cleardoublepage
--
libgit2 0.21.2