diff --git a/main.lof b/main.lof
index 9762e82..87bdc93 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 {english}
+\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 99cb4ba..b8d33e9 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 {english}
+\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 c97bfc1..b909397 100644
Binary files a/main.pdf and b/main.pdf differ
diff --git a/main.tex b/main.tex
index 1009cb7..02cee56 100644
--- a/main.tex
+++ b/main.tex
@@ -30,7 +30,7 @@
 %	- PT: Português (novo acordo ortográfico)
 %	- EN: Inglês
 %
-\tueLINGUA{EN}
+\tueLINGUA{PT}
 %
 % ----------------------------------------------------------------
 %
diff --git a/teseue.cls b/teseue.cls
index ecca9e7..700fa64 100644
--- a/teseue.cls
+++ b/teseue.cls
@@ -25,21 +25,65 @@
 % }
 
 % Document adjustment
+%
+%	Classe base: book
+%
 \LoadClass[11pt,a4paper]{book}
+%
+%	Paginas pares limpas no fim dos capitulos
+%
 \RequirePackage{emptypage}
+%
+%	Mancha do texto
+%
 \RequirePackage[top=3cm, bottom=3cm, left=2cm, right=2cm]{geometry} 
+%
+%	Espaco entre itens, linhas, etc
+%
 \RequirePackage{setspace} % for spacing environment
+%
+%	Alguma programacao LaTeX simplificada
+%
 \RequirePackage{etoolbox} % for advanced authoring
+%
+%	Importacao de imagens
+%
 \RequirePackage{graphicx}
-\RequirePackage{acronym}
+%
+%	Construcao avancada de graficos
+%
 \RequirePackage{tikz}
+%
+%	Acronimos
+%
+\RequirePackage{acronym}
+%
+%	Colocacao de bibliografia e outras listas na tabela de conteudos
+%
+\RequirePackage{tocbibind}
+%
+%	Indice Remissivo
+%
 \RequirePackage{makeidx}
-\RequirePackage{array} % para alinhar verticalmente as linhas das tabelas (na lombada)
+%
+%	Alinhamento vertical das linhas das tabelas (na lombada)
+%
+\RequirePackage{array} % 
+%
+%	Suporte para varias linguas
+%
 \RequirePackage{polyglossia}	% Língua
 %
 %	Tratamento das fontes
 %
 \RequirePackage{fontspec}
+%
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%	Configuracao das fontes
+%
 \setmainfont{SourceSansPro-Light.otf}[
 	UprightFont = SourceSansPro-Light.otf,
 	ItalicFont = SourceSansPro-LightIt.otf,
@@ -55,27 +99,39 @@
 %
 %
 %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%	Cores comuns
+%
 %\RequirePackage[rgb]{xcolor}
 \definecolor{uered}{RGB}{158 27 50}
 \definecolor{uegray}{RGB}{88 89 91}
 \definecolor{uegrey}{RGB}{88 89 91}
 \definecolor{ueblack}{RGB}{0 0 0}
-
-% Paragraph ajustement
+%
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%	Ajuste do espaco entre linhas, paragrafos, etc
+%
 \setlength{\parindent}{0mm}
 \setlength{\parskip}{3mm}
 \renewcommand{\baselinestretch}{1.0} % 1.5 for double-space
-
 %
-%\RequirePackage{anyfontsize}
-
-%%%%%%%%%%%%%%%%%%
-% Style definition
-%%%%%%%%%%%%%%%%%%
+%
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%	Termos fixos
+%
 \newcommand{\@Monografia}{Disserta\c{c}\~{a}o}
 \newcommand{\@monografia}{disserta\c{c}\~{a}o}
-
-
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Opcao: doutoramento / mestrado
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \DeclareOption{doutoramento}{
 	\newcommand{\@Grau}{Doutor}
 	\newcommand{\@grau}{doutor}
@@ -85,6 +141,11 @@
 	\newcommand{\@grau}{mestre}
 }
 %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Opcao escola: ct,ctR / csh, cshR / artes,artesR
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
 %	Os azulejos da capa determinam a area cientifica (e vice-versa)
 %
 \newcommand{\@AZULEJOS}{rascunhocet.jpg}
@@ -107,10 +168,16 @@
 	\renewcommand{\@AZULEJOS}{rascunhoart.jpg}
 }
 %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Restantes opcoes
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
 \ProcessOptions
 %
-% ----------------------------------------------------------------
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Fonte sem-serifas
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \renewcommand{\familydefault}{\sfdefault}
 %
@@ -120,37 +187,70 @@
 %	INTERFACE PUBLICO
 %
 % ================================================================
+
 %
-%% Língua
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Lingua
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 \newcommand{\@LINGUA}{PT}
-% --- Lista de Acrónimos ---
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: lista de acronimos
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@LST@ACRON@EN}{Acronyms}
 \newcommand{\@LST@ACRON@PT}{Lista de Acr\'{o}nimos}
 \newcommand{\@LST@ACRON}{ND}
-% --- Lista de Figuras ---
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: lista de figuras
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@LST@FIG@EN}{List of Figures}
 \newcommand{\@LST@FIG@PT}{Lista de Figuras}
 \newcommand{\@LST@FIG}{ND}
-% --- Tabela de Conteúdos ---
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: Conteudos
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@LST@CONT@EN}{Contents}
 \newcommand{\@LST@CONT@PT}{Conteúdo}
 \newcommand{\@LST@CONT}{ND}
-% --- Lista de Tabelas ---
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: lista de tabelas
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@LST@TAB@EN}{List of Tables}
 \newcommand{\@LST@TAB@PT}{Lista de Tabelas}
 \newcommand{\@LST@TAB}{ND}
-% --- Termos intermutaveis ---
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: sumario
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@TXT@SUMARIO@PT}{Sum\'{a}rio}
 \newcommand{\@TXT@SUMARIO@EN}{Abstact}
 \newcommand{\@TXT@SUMARIO@A}{ND}
 \newcommand{\@TXT@SUMARIO@B}{ND}
 %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%	Termo fixo: palavras chave
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 \newcommand{\@TXT@PALCHAVE@PT}{Palavras chave}
 \newcommand{\@TXT@PALCHAVE@EN}{Keywords}
 \newcommand{\@TXT@PALCHAVE@A}{ND}
 \newcommand{\@TXT@PALCHAVE@B}{ND}
 %
+%
+%
+%	tueLINGUA 
+%
+%
+%
 \DeclareRobustCommand{\tueLINGUA}[1]{%
 	\renewcommand{\@LINGUA}{#1}
 	\typeout{***}
@@ -193,7 +293,11 @@
 	\typeout{*** ------ KEYWORDS(\@TXT@PALCHAVE@B)}
 }
 %
-%% Titulo
+%
+%
+%	tueTITULO 
+%
+%
 %
 \newcommand{\@TITULO}{T\'{i}tulo da tese}
 \newcommand{\@TITLE}{Thesis title}
@@ -202,7 +306,11 @@
 	\renewcommand{\@TITLE}{#2}
 }
 %
-%% Subtitulo
+%
+%
+%	tueSUBTITULO
+%
+%
 %
 \providebool{@comSubtitulo}
 \newcommand{\@SUBTITULO}{Subt\'{i}tulo da tese}
@@ -213,21 +321,33 @@
 	\booltrue{@comSubtitulo}
 }
 %
-%% Candidato
+%
+%
+%	tueCANDIDATO
+%
+%
 %
 \newcommand{\@CANDIDATO}{Nome do candidato}
 \DeclareRobustCommand{\tueCANDIDATO}[1]{%
 	\renewcommand{\@CANDIDATO}{#1}
 }
 %
-%% Curso
+%
+%
+%	tueCURSO
+%
+%
 %
 \newcommand{\@CURSO}{Curso}
 \DeclareRobustCommand{\tueCURSO}[1]{%
 	\renewcommand{\@CURSO}{#1}
 }
 %
-%% Especialidade
+%
+%
+%	tueESPECIALIDADE
+%
+%
 %
 \providebool{@comEspecialidade}
 \boolfalse{@comEspecialidade}
@@ -237,7 +357,11 @@
 	\booltrue{@comEspecialidade}
 }
 %
-%% Orientador ou Orientadora
+%
+%
+%	tueMFORIENTADOR
+%
+%
 %
 \newcommand{\@MFORIENTADOR}{Orientador}
 \newcommand{\@NOMEORIENTADOR}{Nome do/a orientador/a}
@@ -246,7 +370,11 @@
 	\renewcommand{\@NOMEORIENTADOR}{#2}
 }
 %
-%% CoOrientador ou CoOrientadora
+%
+%
+%	tueSEGUNDOORIENTADOR
+%
+%
 %
 \providebool{@comSegOrientador}
 \boolfalse{@comSegOrientador}
@@ -258,7 +386,11 @@
 	\renewcommand{\@NOMESEGORIENTADOR}{#2}
 }
 %
-%% Terceiro Orientador ou Orientadora
+%
+%
+%	tueTERCEIROORIENTADOR
+%
+%
 %
 \providebool{@comTerOrientador}
 \boolfalse{@comTerOrientador}
@@ -270,28 +402,44 @@
 	\renewcommand{\@NOMETERORIENTADOR}{#2}
 }
 %
-%% Departamento
+%
+%
+%	tueDEPARTAMENTO
+%
+%
 %
 \newcommand{\@DEPARTAMENTO}{Departamento}
 \DeclareRobustCommand{\tueDEPARTAMENTO}[1]{%
 	\renewcommand{\@DEPARTAMENTO}{#1}
 }
 %
-%% Escola
+%
+%
+%	tueESCOLA
+%
+%
 %
 \newcommand{\@ESCOLA}{Escola}
 \DeclareRobustCommand{\tueESCOLA}[1]{%
 	\renewcommand{\@ESCOLA}{#1}
 }
 %
-%% Data
+%
+%
+%	tueDATA
+%
+%
 %
 \newcommand{\@DATA}{Data}
 \DeclareRobustCommand{\tueDATA}[1]{%
 	\renewcommand{\@DATA}{#1}
 }
 %
-%% Palavras chave
+%
+%
+%	tuePALAVRASCHAVE
+%
+%
 %
 \newcommand{\@PALAVRASCHAVE}{palavra chave 1, palavra chave 2, palavra chave 3, palavra chave 4, palavra chave 5}
 \newcommand{\@KEYWORDS}{keyword 1, keyword 2, keyword 3, keyword 4, keyword 5}
@@ -300,21 +448,33 @@
 	\renewcommand{\@KEYWORDS}{#2}
 }
 %
-%% Dedicatoria
+%
+%
+%	tueDEDICATORIA
+%
+%
 %
 \newcommand{\@DEDICATORIA}{Dedicat\'{o}ria}
 \DeclareRobustCommand{\tueDEDICATORIA}[1]{%
 	\renewcommand{\@DEDICATORIA}{#1}
 }
 %
-%% Preambulo
+%
+%
+%	tuePREAMBULOLATEX
+%
+%
 %
 \newcommand{\@PREAMBULOLATEX}{\makeindex}
 \DeclareRobustCommand{\tuePREAMBULOLATEX}[1]{%
 	\renewcommand{\@PREAMBULOLATEX}{#1}
 }
 %
-%% Prefacio
+%
+%
+%	tuePREAMBULO
+%
+%
 %
 \newcommand{\@PREAMBULO}{	
 	\include{prefacio}
@@ -327,21 +487,33 @@
 	\renewcommand{\@PREAMBULO}{#1}
 }
 %
-%% Conteudo
+%
+%
+%	tueCONTEUDO
+%
+%
 %
 \newcommand{\@CONTEUDO}{}
 \DeclareRobustCommand{\tueCONTEUDO}[1]{%
 	\renewcommand{\@CONTEUDO}{#1}
 }
 %
-%% Apendices
+%
+%
+%	tueAPENDICES
+%
+%
 %
 \newcommand{\@APENDICES}{}
 \DeclareRobustCommand{\tueAPENDICES}[1]{%
 	\renewcommand{\@APENDICES}{#1}
 }
 %
-%% Bibliografia
+%
+%
+%	tueBIBLOGRAFIA
+%
+%
 %
 \newcommand{\@BIBLIOGRAFIA}{
 	%	Incluir todas as entradas na bibliografia
@@ -355,7 +527,11 @@
 	\renewcommand{\@BIBLIOGRAFIA}{#1}
 }
 %
-%% Indice remissivo
+%
+%
+%	tueINDICEREMISSIVO
+%
+%
 %
 \newcommand{\@INDICEREMISSIVO}{
 	\cleardoublepage 
@@ -365,7 +541,11 @@
 	\renewcommand{\@INDICEREMISSIVO}{#1}
 }
 %
-%% DISSERTACAO
+%
+%
+%	tueDOCUMENTO
+%
+%
 %
 \DeclareRobustCommand{\tueDOCUMENTO}{
 	%
@@ -389,7 +569,11 @@
 	\end{document}
 }
 %
-%% CAPA E SUBCAPA
+%
+%
+%	tueCAPAS
+%
+%
 %
 \DeclareRobustCommand{\tueCAPAS}{
 	%\usepackage[portuguese]{babel}
@@ -404,13 +588,10 @@
 }
 %
 %
-% ================================================================
 %
-%	Identificacao do documento
+%	tueSUMARIO
 %
-% ================================================================
 %
-%% Sumario/Resumo
 %
 \newenvironment{tueSUMARIO}{
 	\typeout{***}
@@ -426,7 +607,11 @@
 	\textbf{\@TXT@PALCHAVE@A:}~\@PALAVRASCHAVE
 }
 %
-%% Abstract
+%
+%
+%	tueABSTRACT
+%
+%
 %
 \newenvironment{tueABSTRACT}{
 	\chapter*{\@TXT@SUMARIO@B}
@@ -449,35 +634,36 @@
 	\textbf{\@TXT@PALCHAVE@B:}~\@KEYWORDS
 }
 %
-%% Acronimos
+%
+%
+%	tueACRONIMOS
+%
+%
 %
 \newenvironment{tueACRONIMOS}{
 	\chapter*{\@LST@ACRON}\addcontentsline{toc}{chapter}{\@LST@ACRON}
 }{
 }
 %
-% ================================================================
 %
-%	Tabela de conteudos
 %
-% ================================================================
+%	tueTABELAS
+%
+%
 %
 \newcommand{\@TABELAS}{	
-	\begin{spacing}{.5}
+	\begin{spacing}{0.5}
 		%
 		\@blankoddpage
 		\cleardoublepage
-		\addcontentsline{toc}{chapter}{\@LST@CONT}
 		\tableofcontents
 		%
 		\@blankoddpage
 		\cleardoublepage
-		\addcontentsline{toc}{chapter}{\@LST@FIG}
 		\listoffigures
 		%
 		\@blankoddpage
 		\cleardoublepage
-		\addcontentsline{toc}{chapter}{\@LST@TAB}
 		\listoftables
 		%
 		\@blankoddpage
--
libgit2 0.21.2