diff --git a/latex/thesis.cls b/latex/thesis.cls
index cd34b29..227bc91 100644
--- a/latex/thesis.cls
+++ b/latex/thesis.cls
@@ -109,9 +109,13 @@
 \setlength{\cftchapnumwidth}{3.5em}
 \setlength{\cftsecnumwidth}{3.5em}
 \setlength{\cftsubsecnumwidth}{2.5em}
+\setlength{\cftfignumwidth}{5em}
+\setlength{\cfttabnumwidth}{4em}
 \renewcommand \cftchapdotsep{4.5} % https://tex.stackexchange.com/a/273764
 \renewcommand{\cftchapleader}{\normalfont\cftdotfill{\cftsecdotsep}}
 \renewcommand{\cftchappagefont}{\normalfont}
+\renewcommand{\cftfigpresnum}{\figurename~}
+\renewcommand{\cfttabpresnum}{\tablename~}
 
 % Ensure TOC and References Respect Custom Numbering
 \renewcommand{\thechapter}{\Roman{chapter}}