diff --git a/.github/tl_packages b/.github/tl_packages
index fe3f881..7a28349 100644
--- a/.github/tl_packages
+++ b/.github/tl_packages
@@ -51,6 +51,7 @@ epstopdf-pkg
 etoolbox
 everysel
 fancyvrb
+fbox
 fetamont
 fira
 fontspec
@@ -85,6 +86,7 @@ sidenotesplus
 siunitx
 sttools
 times
+titlecaps
 underscore
 unicode-math
 units
@@ -92,3 +94,4 @@ upquote
 varwidth
 xcolor
 xits
+zref
diff --git a/examples/se2thesis-master-thesis-example.pdf b/examples/se2thesis-master-thesis-example.pdf
index cdfb050..8d32821 100644
Binary files a/examples/se2thesis-master-thesis-example.pdf and b/examples/se2thesis-master-thesis-example.pdf differ
diff --git a/se2thesis.dtx b/se2thesis.dtx
index 9bb1673..cec9157 100644
--- a/se2thesis.dtx
+++ b/se2thesis.dtx
@@ -613,6 +613,8 @@
 % Load required packages early.
 %    \begin{macrocode}
 \RequirePackage{graphicx}
+\RequirePackage{titlecaps}
+\Addlcwords{a an the that to this is are and with on}
 \RequirePackage{translations}
 \LoadDictionary{se2translations}
 \DeclareTranslationFallback{version-of-date}{%
@@ -1211,10 +1213,10 @@
 \cs_new:Nn \__@@_print_title:
   {
     \group_begin:
-      \usekomafont{title}\centering\@title\par
+      \usekomafont{title}\centering\titlecap{\@title}\par
     \group_end:
     \ifx\@subtitle\@empty\else{%
-      \medskip\usekomafont{subtitle}\centering\@subtitle\par%
+      \medskip\usekomafont{subtitle}\centering\titlecap{\@subtitle}\par%
     }\fi
     \bigskip
     \group_begin:
@@ -1331,7 +1333,7 @@
 \renewcommand*{\@lowertitleback}{%
   \group_begin:
     \noindent\textbf{\@author}:\\
-    \emph{\@title}\\
+    \emph{\titlecap{\@title}}\\
     \tl_if_eq:NnT \l_@@_thesis_type_tl { bachelor }
       { \GetTranslation{Bachelor-thesis},~ }
     \tl_if_eq:NnT \l_@@_thesis_type_tl { master }
@@ -1359,9 +1361,13 @@
 }
 \renewcommand{\chapterlinesformat}[3]{%
   \parbox[b]{\textwidth}{\hrulefill#2}\par%
-  #3\par\bigskip%
+  \titlecap{#3}\par\bigskip%
   \hrule%
 }
+\let\orig@addtocentrydefault\addtocentrydefault
+\renewcommand*{\addtocentrydefault}[3]{%
+  \orig@addtocentrydefault{#1}{#2}{\titlecap{#3}}%
+}
 \RedeclareSectionCommand[afterskip=1.5\baselineskip]{chapter}
 \renewcommand*{\chapterlineswithprefixformat}[3]{%
   \Ifstr{#1}{chapter}
@@ -1373,7 +1379,7 @@
 }
 %    \end{macrocode}
 %
-% Change the loop of a \cmd{\paragraph} to be italic and end with a full stop.
+% Change the look of a \cmd{\paragraph} to be italic and end with a full stop.
 %    \begin{macrocode}
 \setkomafont{paragraph}{\normalsize\normalfont\itshape}
 \AddtoDoHook{heading/endgroup/paragraph}{\headingdot}