diff --git a/lib/titlepage.tex b/lib/titlepage.tex
index bf8846631fae591591ff631649daa97fb9aa67d9..93cc105fe5fd69470e85283dbc0bcec479dbcd70 100644
--- a/lib/titlepage.tex
+++ b/lib/titlepage.tex
@@ -293,8 +293,9 @@
 }
 
 
-
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%		Titlepage layout									%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NewDocumentCommand{\SetAuthorData}{+m}{
 	\prop_gclear:N \g_ift_author_prop% Clearing the property list
 	% Set the keys
@@ -329,37 +330,6 @@
 \ExplSyntaxOff
 
 
-%%TODO: obsolete - remove
-%% Default Werte für die Variablen
-%\setkeys{TitleIFT}{
-%	authorFirstname=Martha ,
-%	authorLastname=Musterfrau ,
-%	authorPreTitle= ,
-%	authorPostTitle= ,
-%	authorGender={f} ,
-%	MatrNum={01234567\\(066 445)},
-%	title=Titel,
-%	subtitle=Untertitel,
-%	instituteA={Institut für Fertigungstechnik und \\
-%	Photonische Technologien},
-%	profA={Univ.-Prof. Dipl. Ing. Dr. Bleicher},
-%	instituteB={Institut für Fertigungstechnik und \\
-%	Photonische Technologien},
-%	profB={Univ.-Prof. Dipl. Ing. Dr. Bleicher},
-%	address={Mat.Nr. \\Straße und Nummer \\ Ort},
-%	location=Wien,
-%	date={\today},
-%	type=bacc
-%}{}
-
-\hypersetup{
-pdfauthor = {},
-pdftitle = {},
-pdfsubject = {},
-pdfkeywords = {},
-pdfdisplaydoctitle = true,
-colorlinks = false
-}
 
 \newcommand*{\createTitleIFT}{%
 	\begingroup % Create the command for including the title page in the document
diff --git a/thesis.tex b/thesis.tex
index c858d0438b09510520beb1fcb3264e38b74d50bf..df180c8ffb5875d2d6c17a54cae55bb97ebba4dd 100644
--- a/thesis.tex
+++ b/thesis.tex
@@ -5,61 +5,51 @@
 \makeglossaries
 \input{lib/titlepage}
 \input{lib/tangocolors.sty}   					%tango colors 
-\hypersetup{ 									%change boxes to colored links
-	colorlinks = true,
-	%allcolors={ta3gray},
-	linkcolor= black,
-	urlcolor= {ta2skyblue},
-	citecolor= black,
-	pdfauthor = {Student},   					%PDFAutor
-	pdftitle = {Diplomarbeit\_Student\_V0.1},	%PDFTitle 
-}
+
 
 \setlength{\headheight}{15pt}					% ...at least 14.49pt
 \begin{document}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % HEAD
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%\TitleIFT{
-%	title={Titel der Diplomarbeit},
-%	subtitle={Untertitel},%no subtitle
-%	profA={Ao.Univ.Prof Dipl.-Ing. Dr.techn Burkhard Kittl},
-%	instituteA={Institut für Fertigungstechnik und Photonische Technologien},
-%	profB={Mitbetreuer},
-%	instituteB={Institut für Fertigungstechnik und Photonische Technologien},
-%	authorFirstname={Martha Maria},
-%	authorLastname={Musterfrau },
-%	authorPostTitle={BSc},
-%	%authorPreTitle={Sir},
-%	authorGender={f}, % f, m, d
-%	MatrNum={01234567\\ (066 445)},
-%	address={Musterstraße 1\\1234 Musterstadt \\Austria},
-%	location={Wien},
-%	date={\monthformat\today},
-%	type={mast} % sem,bacc,proj,mast,diss
-%}
-%		This is an invoice for \GetAuthorData{FirstName}\ \GetAuthorData{LastName} about the manufacturing and delivery of 100 \GetAuthorData{Gender} Mage staffs. Please pay to penis
 \SetAuthorData{%
 	FirstName 	=	{Martha},%
-	MiddleNames	=	{Magdalena},		% if applicable
+	MiddleNames	=	{Magdalena},		% only if applicable, omit otherwise
 	LastName	=	{Musterfrau},%
-	Gender		=	{f},				% f/m/d
-	PreTitle	=	{Dipl.-Ing.},%
-	PostTitle	=	{},%
+	Gender		=	{f},				% f/m/d for proper spelling
+	PreTitle	=	{Dipl.-Ing.},		% only if applicable, omit otherwise
+	%PostTitle	=	{},					% only if applicable, omit otherwise
 	MatricleNr	=	{01234567},%
 	StudyCode	=	{066 445}%
 }
 
 \SetDocData{%
-	ThesisType	=	{BA},%
+	ThesisType	=	{BA},	% SEM,PA,BA,MA,DA,PHD and some other spellings. Type something wrong and refer to the error message
 	Title		=	{Thesis title},%
 	Subtitle	=	{Thesis subtitle},
 	ReviewerA	=	{Ao.Univ.Prof Dipl.-Ing. Dr.techn Burkhard Kittl},%
 	AffiliationA=	{Institut für Fertigungstechnik und Photonische Technologien},%
-	ReviewerB	=	{Mitbetruer},%
-	AffiliationB=	{Institut für Fertigungstechnik und Photonische Technologien},%
-	Date		=	\monthformat\formatdate{27}{9}{2004}	% omit in case if you need current date on your thesis
+	ReviewerB	=	{Mitbetreuer},%
+	AffiliationB=	{Institut für Fertigungstechnik und Photonische Technologien}%
+	%Date		=	\monthformat\formatdate{27}{9}{2004}	% omit in case if you need current date on your thesis
 }
+
+\hypersetup{ 									%change boxes to colored links
+	colorlinks = true,
+	%allcolors={ta3gray},
+	linkcolor= black,
+	urlcolor= {ta2skyblue},
+	citecolor= black,
+	%TODO: move to document setup page
+	%pdfauthor = {Student},   					% only if needed to explicitly overwrite
+	%pdftitle = {Diplomarbeit\_Student\_V0.1},	% only if needed to explicitly overwrite 
+	pdfauthor = {\iftAuthorPreTitle \ \iftAuthorFirstName \ \iftAuthorMNames \ \iftAuthorLastName , \ \iftAuthorPostTitle},
+	pdftitle = {\iftDocumentTypeShortID\_\iftAuthorLastName},
+	pdfsubject = {\iftDocumentTitle \ - \ \iftDocumentSubtitle},
+	pdfkeywords = {},
+	pdfdisplaydoctitle = true
+}
+
 \createTitleIFT
 
 \listoftodos\todo[color=red]{Remove before submitting!}
@@ -103,7 +93,7 @@ Abkürzungen, die nicht zum Sprachgebrauch gehören sind beim erstmaligen verwen
     \item \gls{rami} ermöglicht deshalb [\ldots]
 \end{itemize}
 	
-Wenn Sie die Abkürzung im weitern Textverlauf nicht mehr verwenden, ist es auch nicht sinnvoll diese einzuführen. 
+Wenn Sie die Abkürzung im weiteren Textverlauf nicht mehr verwenden, ist es auch nicht sinnvoll diese einzuführen. 
 
 \tableofcontents