diff --git a/.gitmessage b/.gitmessage
index 4afc0c8..d8d282a 100644
--- a/.gitmessage
+++ b/.gitmessage
@@ -21,6 +21,7 @@
 # 
 # Scope:
 #   latex    (changes to thesis LaTeX)
+#   documentclass (LaTeX in-house document class changes)
 #   src      (changes to Python source code)
 #   nb       (changes to notebooks)
 #   ml       (ML model specific changes)
diff --git a/latex/thesis.cls b/latex/thesis.cls
index cdb5606..7aeb853 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -21,17 +21,25 @@
 \RequirePackage{tocloft}
 \RequirePackage{tocbibind}
 \RequirePackage{amsmath,amsfonts,amssymb}
+\RequirePackage{svg}           % Allows including SVG images directly
+\RequirePackage{indentfirst}   % Makes first paragraph after headings indented
+\RequirePackage{float}         % Provides [H] option to force figure/table placement
 
 % Polyglossia set language
-\setmainlanguage{bahasai}
-% \setotherlanguage{english}
++ \setdefaultlanguage[variant=indonesian]{malay}  % Proper Indonesian language setup
++ \setotherlanguage{english}             % Enables English as secondary language
+
++ \DefineBibliographyStrings{english}{%  % Customizes bibliography text
++   andothers={dkk\adddot},              % Changes "et al." to "dkk."
++   pages={hlm\adddot},                  % Changes "pp." to "hlm."
++ }
 
 % Conditionally load the watermark package and settings
 \if@draftmark
   \RequirePackage{draftwatermark}
-  \SetWatermarkText{Draft: \today [wip]}
-  \SetWatermarkColor[gray]{0.7}
-  \SetWatermarkFontSize{2cm}
+  \SetWatermarkText{nuluh/thesis (wip) draft: \today}
+  \SetWatermarkColor[gray]{0.8}                    % Opacity: 0.8 = 20% transparent  
+  \SetWatermarkFontSize{1.5cm}
   \SetWatermarkAngle{90}
   \SetWatermarkHorCenter{1.5cm}
 \fi
@@ -79,7 +87,10 @@
 }
 
 % Chapter formatting
-\titlespacing{\chapter}{0pt}{0pt}{*1.5}
+\titlespacing{\chapter}{0pt}{0cm}{*1.5}    % 0pt→0cm: same value, different unit
+                                             % 0pt = no space above chapter title
+                                             % *1.5 = 1.5× line spacing after title
+
 \titleformat{\chapter}[display]
   {\normalsize\bfseries\centering}
   {BAB~\Roman{chapter}} % << display format
@@ -91,6 +102,10 @@
 \titleformat{\subsection}
     {\normalsize\bfseries}{\thesubsection}{1em}{}
 
+% Section numbering depth
+\setcounter{secnumdepth}{3}               % Enables numbering for:
+                                          % 1 = chapters, 2 = sections, 3 = subsections
+
 % Ensure chapter reference in TOC matches
 \renewcommand{\cftchappresnum}{BAB~}
 \renewcommand{\cftchapaftersnum}{\quad}
@@ -108,16 +123,22 @@
 
 
 % Dot leaders, spacing, indentation
+\setlength{\cftbeforetoctitleskip}{0cm}   % Space above "DAFTAR ISI" title
+\setlength{\cftbeforeloftitleskip}{0cm}   % Space above "DAFTAR GAMBAR" title  
+\setlength{\cftbeforelottitleskip}{0cm}   % Space above "DAFTAR TABEL" title
+
 \setlength{\cftbeforechapskip}{0em}
 \setlength{\cftchapindent}{0pt}
 \setlength{\cftsecindent}{0em}
-\setlength{\cftsubsecindent}{2.5em}
+\setlength{\cftsubsecindent}{2em}
 \setlength{\cftchapnumwidth}{3.5em}
-\setlength{\cftsecnumwidth}{3.5em}
+\setlength{\cftsecnumwidth}{2em}
 \setlength{\cftsubsecnumwidth}{2.5em}
 \setlength{\cftfignumwidth}{5em}
 \setlength{\cfttabnumwidth}{4em}
-\renewcommand \cftchapdotsep{4.5} % https://tex.stackexchange.com/a/273764
+\renewcommand \cftchapdotsep{1}           % Denser dots (closer together) https://tex.stackexchange.com/a/273764
+\renewcommand \cftsecdotsep{1}            % Apply to sections too
+\renewcommand \cftsubsecdotsep{1}         % Apply to subsections too
 \renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftsecdotsep}}
 \renewcommand{\cftchappagefont}{\normalfont}
 \renewcommand{\cftfigpresnum}{\figurename~}