diff --git a/datasheet.cls b/datasheet.cls
index 74fd651..0d33523 100644
--- a/datasheet.cls
+++ b/datasheet.cls
@@ -5,7 +5,7 @@
 %% https://github.com/PetteriAimonen/latex-datasheet-template/
 %%
 %% --------------------------------------------------------------------------
-%% 
+%%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
 %% of this license or (at your option) any later version.
@@ -13,11 +13,11 @@
 %%   http://www.latex-project.org/lppl.txt
 %% and version 1.3 or later is part of all distributions of LaTeX
 %% version 2003/12/01 or later.
-%% 
+%%
 %% This work has the LPPL maintenance status "maintained".
-%% 
+%%
 %% This Current Maintainer of this work is Petteri Aimonen.
-%% 
+%%
 %% This work consists of the file datasheet.cls and the example
 %% document example.tex.
 
@@ -40,17 +40,12 @@
 \RequirePackage{threeparttable}
 
 % Align figure and table captions to left.
-\RequirePackage[font=bf, skip=5pt, justification=raggedright, format=hang, singlelinecheck=off]{caption}
-
-% Format hyperlinks as blue and set PDF title based on \title{} in the document.
-\RequirePackage[pdfusetitle]{hyperref}
-\hypersetup{
-    pdftex,
-    breaklinks=true,
-    colorlinks=true,
-    linkcolor=.,
-    urlcolor=blue
-}
+\RequirePackage[font=bf,
+    skip=5pt,
+    justification=raggedright,
+    format=hang,
+    singlelinecheck=off,
+    hypcap=false]{caption}
 
 % Configure page margins
 \RequirePackage{geometry}
@@ -124,6 +119,17 @@
 % No numbering for section titles
 \setcounter{secnumdepth}{0}
 
+% Section and subsection spacing
 \usepackage{titlesec}
 \titlespacing*{\section}{0pt}{.2ex}{.2ex}
 \titlespacing*{\subsection}{0pt}{.2ex}{.2ex}
+
+% Format hyperlinks as blue and set PDF title based on \title{} in the document.
+% Hyperref must be loaded last (in particular after titlesec)
+\RequirePackage[pdfusetitle]{hyperref}
+\hypersetup{
+    breaklinks=true,
+    colorlinks=true,
+    linkcolor=.,
+    urlcolor=blue
+}
\ No newline at end of file
diff --git a/preamble.tex b/preamble.tex
index ef55588..ec8195e 100644
--- a/preamble.tex
+++ b/preamble.tex
@@ -16,6 +16,7 @@
 
 \usepackage{tikz}
 \usepackage{pgfplots}
+\pgfplotsset{compat=1.18}
 \usepackage{circuitikz}
 \usepackage{pifont}