diff --git a/latex/main.tex b/latex/main.tex
index 9c927d5..5da58f5 100644
--- a/latex/main.tex
+++ b/latex/main.tex
@@ -22,41 +22,23 @@
 \input{frontmatter/glossaries}
 \input{frontmatter/notations}
 
-% \makeatletter
-% \hypersetup{
-%   keeppdfinfo,
-%   pdftitle={\thetitle},
-%   pdfauthor={\theauthor},
-%   % pdfdate={\thedate},
-%   pdfsubject={Bachelor Thesis},
-%   pdfkeywords={structural health monitoring, machine learning, stft, vibration, signal},
-%   pdfpublisher={Universitas Muhammadiyah Yogyakarta},
-%   pdfcontactemail={rifqi.damar.ft21mail.umy.ac.id},
-%   pdflicenseurl={https://github.com/nuluh/thesis/blob/main/LICENSE},
-%   pdflang={id},
-%   pdfcreator={XeLaTeX with hyperref and hyperxmp},
-%   pdfproducer={TeX Live 2024},
-%   pdftrapped=False,
-%   pdfpubtype=book
-% }
-% \makeatother
 \begin{document}
 \frontmatter
 % \maketitle
-\input{frontmatter/maketitle}
-\input{frontmatter/maketitle_secondary}
-\input{frontmatter/approval}\clearpage
-\input{frontmatter/originality}\clearpage
-\input{frontmatter/acknowledgement}\clearpage
-\tableofcontents\clearpage
-\listoffigures\clearpage
+\include{frontmatter/maketitle}
+\include{frontmatter/maketitle_secondary}
+\include{frontmatter/approval}
+\include{frontmatter/originality}
+\include{frontmatter/acknowledgement}
+\tableofcontents
+\listoffigures
 \listoftables
 \glsaddall[types={main,notation,\acronymtype}]
 
 \printglossary[type=notation,style=altlong3customheader,title=Daftar Simbol dan Lambang]
 \printglossary[type=\acronymtype,style=supercol,title=Daftar Singkatan]
 \printglossary[type=main,style=mylistalt]
-\input{frontmatter/abstract}
+\include{frontmatter/abstract}
 % \pagestyle{fancyplain}
 \mainmatter
 % Include content
diff --git a/latex/thesis.cls b/latex/thesis.cls
index 90f1515..ba413fe 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -24,7 +24,7 @@
 \RequirePackage{graphicx}
 \RequirePackage{svg}
 \RequirePackage{etoolbox}
-\RequirePackage{tocloft}
+\RequirePackage[titles]{tocloft}
 \RequirePackage{tocbibind}
 \RequirePackage{indentfirst}
 \RequirePackage{float}