diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 5148676e9b679da23720bbeb239326a88577c83c..646cb560fa8794a6aa769b3006fec8aa5385876a 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -298,8 +298,8 @@
   }{}
 }
 \RequirePackage{scrhack}
-\AddToHook{package/siunitx/before}{\RequirePackage{xcolor}}
-\AddToHook{package/siunitx/after}{
+\AddToHook{package/listings/before}{\RequirePackage{xcolor}}
+\AddToHook{package/listings/after}{
   \lstset{
     commentstyle=\color{gray},
     keywordstyle=\color{FireBrick}\bfseries,
@@ -479,9 +479,13 @@
 \renewcommand{\labelitemiii}{\raisebox{-.1ex}{\scalebox{1.3}{$\cdot$}}}
 \renewcommand{\labelitemiv}{\raisebox{.1ex}{-}}
 \renewenvironment{abstract}{
+  \begingroup
+    \edef\raggedsection{\raggedsection%
+      \hskip\leftmargini}
+    \HsH@abstract@heading{\abstractname}
+  \endgroup
   \quotation
   \setparsizes{\z@}{\z@}{.25\linewidth \@plus 1fil}\selectfont
-  \HsH@abstract@heading{\abstractname}
 }{%
   \ifx\@keywords\@empty\else\if@HsH@option@abstract@show@keywords
     \par\bigskip
diff --git a/src/HsH-classes.dtx b/src/HsH-classes.dtx
index f863bcce807edd692a32712552707ca18f903957..d0b420905a55e628ee4f7e34e4a4656e007b7ba5 100644
--- a/src/HsH-classes.dtx
+++ b/src/HsH-classes.dtx
@@ -1582,13 +1582,20 @@ http://www.latex-project.org/lppl.txt
 %    \end{macrocode}
 %
 %     \paragraph{Abstract}
-%     We define some custom behavior for the abstract.
+%     We define some custom behavior for the abstract. Its typeset as a quote, so
+%     its a little smaller than the rest of the text. We also indent the heading to
+%     match that.
 %    \begin{macrocode}
 %<*!standalone>
 \renewenvironment{abstract}{
+  \begingroup
+%<article>    \edef\raggedsection{\raggedsection%
+%<report>    \edef\raggedchapter{\raggedchapter%
+      \hskip\leftmargini}
+    \HsH@abstract@heading{\abstractname}
+  \endgroup
   \quotation
   \setparsizes{\z@}{\z@}{.25\linewidth \@plus 1fil}\selectfont
-  \HsH@abstract@heading{\abstractname}
 }{%
   \ifx\@keywords\@empty\else\if@HsH@option@abstract@show@keywords
     \par\bigskip
diff --git a/src/HsH-classes.pdf b/src/HsH-classes.pdf
index c276977fdd20d210b334e967cc924ceed32a7798..18ec272b470fc3ebc4a019742e99aa5930a4aae8 100644
--- a/src/HsH-classes.pdf
+++ b/src/HsH-classes.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b05e69d4ca6bf46617ec02aa4f403aee5da410bd8a23774a49945c9815dd2bb9
-size 329851
+oid sha256:b2c8c512067240d6aab00ca43324e05190f14837e44117a94d05e479589080a5
+size 304928
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 1481a67867b424543eacf32d79d3aff9d1710693..3ce504f2f1658fbac266b30b3c72b7d75e39310d 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -298,8 +298,8 @@
   }{}
 }
 \RequirePackage{scrhack}
-\AddToHook{package/siunitx/before}{\RequirePackage{xcolor}}
-\AddToHook{package/siunitx/after}{
+\AddToHook{package/listings/before}{\RequirePackage{xcolor}}
+\AddToHook{package/listings/after}{
   \lstset{
     commentstyle=\color{gray},
     keywordstyle=\color{FireBrick}\bfseries,
@@ -492,9 +492,13 @@
 \renewcommand{\labelitemiii}{\raisebox{-.1ex}{\scalebox{1.3}{$\cdot$}}}
 \renewcommand{\labelitemiv}{\raisebox{.1ex}{-}}
 \renewenvironment{abstract}{
+  \begingroup
+    \edef\raggedchapter{\raggedchapter%
+      \hskip\leftmargini}
+    \HsH@abstract@heading{\abstractname}
+  \endgroup
   \quotation
   \setparsizes{\z@}{\z@}{.25\linewidth \@plus 1fil}\selectfont
-  \HsH@abstract@heading{\abstractname}
 }{%
   \ifx\@keywords\@empty\else\if@HsH@option@abstract@show@keywords
     \par\bigskip
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index 8014e6e85cc9dec95e9b77d09e7f27fd15e98c8e..b336a04ee4e5dd5f0d00160d9f80f54a3b18e903 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -141,8 +141,8 @@
   }{}
 }
 \RequirePackage{scrhack}
-\AddToHook{package/siunitx/before}{\RequirePackage{xcolor}}
-\AddToHook{package/siunitx/after}{
+\AddToHook{package/listings/before}{\RequirePackage{xcolor}}
+\AddToHook{package/listings/after}{
   \lstset{
     commentstyle=\color{gray},
     keywordstyle=\color{FireBrick}\bfseries,