diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
index 1553df0261..c73f858d2d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt
@@ -33,7 +33,7 @@
                     <div id="errormsg[% errno | html %]">
                         <h1>Sorry, the requested page is not available</h1>
                         <h2>Error [% errno | html %]</h2>
-                        <h3>This message can have the following reason(s):</h3>
+                        <p><strong>This message can have the following reason(s):</strong></p>
                         <ul>
                             [% IF ( errno == 400 ) %]
                                 <li>The link is broken and the page does not exist.</li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
index 50db000cb8..2e6a6538c4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt
@@ -100,7 +100,7 @@
                             <p>Given a set of bibliographic or item identifiers, returns a
                             list with availability of the items associated with the identifiers.</p>
 
-                            <h4>Parameters</h4>
+                            <h3>Parameters</h3>
                             <dl>
                                 <dt><strong>id</strong> (Required)</dt>
                                 <dd>list of either bibliographic or item identifiers</dd>
@@ -122,12 +122,12 @@
                                 <dd>requests a particular format or set of formats in reporting availability</dd>
                             </dl>
 
-                            <h4>Example call</h4>
+                            <h3>Example call</h3>
                             <a href="ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item">
                                 ilsdi.pl?service=GetAvailability&amp;id=1+2+99999&amp;id_type=item
                             </a>
 
-                            <h4>Example response</h4>
+                            <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;dlf:collection
   xmlns:dlf="http://diglib.org/ilsdi/1.1"
@@ -185,7 +185,7 @@
                                 time lookup by bibliographic identifier.</p>
                                 <p>You can use OAI-PMH ListRecords instead of this service.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>id</strong> (Required)</dt>
                                     <dd>list of system record identifiers</dd>
@@ -198,12 +198,12 @@
                                     </dd>
                                 </dl>
 
-                                <h4>Example Call</h4>
+                                <h3>Example Call</h3>
                                 <a href="ilsdi.pl?service=GetRecords&amp;id=1+2+99999">
                                     ilsdi.pl?service=GetRecords&amp;id=1+2+99999
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetRecords&gt;
   &lt;record&gt;
@@ -400,7 +400,7 @@
                                 of record objects that contain the authority records. The function
                                 user may request a specific metadata schema for the record objects.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>id</strong> (Required)</dt>
                                     <dd>list of authority record identifiers</dd>
@@ -412,12 +412,12 @@
                                     </dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999">
                                     ilsdi.pl?service=GetAuthorityRecords&amp;id=1+2+99999
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;xml version="1.0" encoding="UTF-8"&gt;;
 &lt;GetAuthorityRecords&gt;
   &lt;record&gt;
@@ -459,7 +459,7 @@
                                 <p>Looks up a patron in the ILS by an identifier, and returns
                                 the ILS identifier for that patron, aka the patron identifier.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>id</strong> (Required)</dt>
                                     <dd>an identifier used to look up the patron in Koha</dd>
@@ -476,12 +476,12 @@
                                     </dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber">
                                     ilsdi.pl?service=LookupPatron&amp;id=815&amp;id_type=cardnumber
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;LookupPatron&gt;
   &lt;id&gt;419&lt;/id&gt;
@@ -492,19 +492,19 @@
                                 <h2>AuthenticatePatron</h2>
                                 <p>Authenticates a user's login credentials and returns the identifier for the patron.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>username</strong> (Required)</dt>
                                     <dd>user's login identifier</dd>
                                     <dt><strong>password</strong> (Required)</dt>
                                     <dd>user's password</dd>
                                 </dl>
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul">
                                     ilsdi.pl?service=AuthenticatePatron&amp;username=john9&amp;password=soul
                                 </a>
 
-                                <h4>Example Response</h4>
+                                <h3>Example Response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;AuthenticatePatron&gt;
   &lt;id&gt;419&lt;/id&gt;
@@ -518,7 +518,7 @@
                                 patron's contact information, fine information, hold request
                                 information, loan information, and messages.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
@@ -534,12 +534,12 @@
                                     <dd>whether or not to return extended patron attributes information in the response</dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1">
                                     ilsdi.pl?service=GetPatronInfo&amp;patron_id=1&amp;show_contact=0&amp;show_loans=1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetPatronInfo&gt;
   &lt;category_type&gt;A&lt;/category_type&gt;
@@ -651,18 +651,18 @@
                                 <h2>GetPatronStatus</h2>
                                 <p>Returns a patron's status information from Koha.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=GetPatronStatus&amp;patron_id=1">
                                     ilsdi.pl?service=GetPatronStatus&amp;patron_id=1
                                 </a>
 
-                                <h4>Example Response</h4>
+                                <h3>Example Response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetPatronStatus&gt;
   &lt;expiry&gt;2010-03-04&lt;/expiry&gt;
@@ -675,7 +675,7 @@
                                 <h2>GetServices</h2>
                                 <p>Returns information about the services available on a particular item for a particular patron.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
@@ -683,12 +683,12 @@
                                     <dd>system item identifier</dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1">
                                     ilsdi.pl?service=GetServices&amp;patron_id=1&amp;item_id=1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;GetServices&gt;
   &lt;AvailableFor&gt;title level hold&lt;/AvailableFor&gt;
@@ -700,7 +700,7 @@
                                 <h2>RenewLoan</h2>
                                 <p>Extends the due date for a patron's existing loan.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
@@ -710,12 +710,12 @@
                                     <dd>the date the patron would like the item returned by</dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1">
                                     ilsdi.pl?service=RenewLoan&amp;patron_id=1&amp;item_id=1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;RenewLoan&gt;
   &lt;success&gt;0&lt;/success&gt;
@@ -728,7 +728,7 @@
                                 <h2>HoldTitle</h2>
                                 <p>Creates, for a patron, a title-level hold request on a given bibliographic record in Koha.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the ILS identifier for the patron for whom the request is placed</dd>
@@ -744,12 +744,12 @@
                                     <dd>date after which item returned to shelf if item is not picked up</dd>
                                 </dl>
 
-                                <h4>Example Call</h4>
+                                <h3>Example Call</h3>
                                 <a href="ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1">
                                     ilsdi.pl?service=HoldTitle&amp;patron_id=1&amp;bib_id=1&amp;request_location=127.0.0.1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) galères de l'Orfèvre&lt;/title&gt;
@@ -762,7 +762,7 @@
                                 <h2>HoldItem</h2>
                                 <p>Creates, for a patron, an item-level hold request on a specific item of a bibliographic record Koha.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the ILS identifier for the patron for whom the request is placed</dd>
@@ -778,12 +778,12 @@
                                     <dd>date after which item returned to shelf if item is not picked up</dd>
                                 </dl>
 
-                                <h4>Example Call</h4>
+                                <h3>Example Call</h3>
                                 <a href="ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1">
                                     ilsdi.pl?service=HoldItem&amp;patron_id=1&amp;bib_id=1&amp;item_id=1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;HoldTitle&gt;
   &lt;title&gt;(les) galères de l'Orfèvre&lt;/title&gt;
@@ -796,7 +796,7 @@
                                 <h2>CancelHold</h2>
                                 <p>Cancels an active hold request for the patron.</p>
 
-                                <h4>Parameters</h4>
+                                <h3>Parameters</h3>
                                 <dl>
                                     <dt><strong>patron_id</strong> (Required)</dt>
                                     <dd>the unique patron identifier in the ILS; the same identifier returned by LookupPatron or AuthenticatePatron</dd>
@@ -804,12 +804,12 @@
                                     <dd>system hold identifier (returned by GetRecords and GetPatronInfo into element 'reserve_id')</dd>
                                 </dl>
 
-                                <h4>Example call</h4>
+                                <h3>Example call</h3>
                                 <a href="ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1">
                                     ilsdi.pl?service=CancelHold&amp;patron_id=1&amp;item_id=1
                                 </a>
 
-                                <h4>Example response</h4>
+                                <h3>Example response</h3>
 <pre>&lt;?xml version="1.0" encoding="ISO-8859-1" ?&gt;
 &lt;CancelHold&gt;
   &lt;message&gt;Canceled&lt;/message&gt;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
index 9ff0ccda8c..10625d8b1b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
@@ -23,7 +23,7 @@
                             <h2>Subscribe to a subscription alert</h2>
                             <form action="opac-alert-subscribe.pl" method="post">
                                 <p>Do you want to receive an email when a new issue for this subscription arrives?</p>
-                                <h4>[% bibliotitle | html %]</h4>
+                                <h3>[% bibliotitle | html %]</h3>
                                 [% IF ( notes ) %]<p>[% notes | html %]</p>[% END %]
                                 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]">
                                 <input type="hidden" name="referer" value="[% referer | html %]">
@@ -37,7 +37,7 @@
                             <h2>Unsubscribe from a subscription alert</h2>
                             <form action="opac-alert-subscribe.pl" method="post">
                                 <p>Please confirm that you do not want to receive email when a new issue arrives for this subscription.</p>
-                                <h4>[% bibliotitle | html %]</h4>
+                                <h3>[% bibliotitle | html %]</h3>
                                 [% IF ( notes ) %]<p>[% notes | html %]</p>[% END %]
                                 <input type="hidden" name="subscriptionid" value="[% subscriptionid | html %]">
                                 <input type="hidden" name="referer" value="[% referer | html %]">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index 6392fda6cd..f15beea5fc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -40,7 +40,7 @@
                         [% IF ( nopermission ) %]
                             <!-- This is what is displayed if user doesn't have permission -->
                             <div class="alert alert-warning">
-                                <h2>Access denied</h2>
+                                <h1>Access denied</h1>
                                 <p>Sorry, the system doesn't think you have permission to access this page. </p>
                                 [% IF SCO_login %]
                                     <p><a href="/cgi-bin/koha/sco/sco-main.pl?logout.x=1">Log out and try again with a different user.</a></p>
@@ -95,15 +95,15 @@
                                         [% END %]
                                     </div>
                                 [% ELSE %]
-                                    <h3>Shibboleth Login</h3>
+                                    <h2>Shibboleth Login</h2>
                                     <p><a href="[% shibbolethLoginUrl | $raw %]">Log in using a Shibboleth account.</a></p>
                                 [% END # /IF invalidShibLogin %]
                                 [% UNLESS ( Koha.Preference('OPACShibOnly') ) %]
                                     [% IF ( casAuthentication ) %]
-                                        <h3>CAS login</h3>
+                                        <h2>CAS login</h2>
                                         <p>If you do not have a Shibboleth account, but you do have a CAS account, you can use CAS.</p>
                                     [% ELSE %]
-                                        <h3>Local login</h3>
+                                        <h2>Local login</h2>
                                         <p>If you do not have a Shibboleth account, but you do have a local login, then you may login below.</p>
                                     [% END %]
                                 [% END %]
@@ -125,7 +125,7 @@
                                         </ul>
                                     [% END %]
                                 [% ELSE %]
-                                    <h3>CAS login</h3>
+                                    <h2>CAS login</h2>
 
                                     [% IF ( invalidCasLogin ) %]
                                         <!-- This is what is displayed if cas login has failed -->
@@ -149,7 +149,7 @@
                                 [% IF ( shibbolethAuthentication ) %]
                                     <p>Nothing</p>
                                 [% ELSE %]
-                                    <h3>Local login</h3>
+                                    <h2>Local login</h2>
                                     <p>If you do not have a CAS account, but do have a local account, you can still log in: </p>
                                 [% END %]
 
@@ -157,7 +157,7 @@
 
                             [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
                                 [% IF ( invalidGoogleOpenIDConnectLogin ) %]
-                                    <h3>Google login</h3>
+                                    <h2>Google login</h2>
                                     <p>Sorry, your Google login failed. <span class="error">[% invalidGoogleOpenIDConnectLogin | html %]</span></p>
                                     <p>Please note that the Google login will only work if you are using the e-mail address registered with this library.</p>
                                     <p>If you want to, you can try to <a href="/cgi-bin/koha/svc/auth/googleopenidconnect?reauthenticate=select_account">log in using a different account</a>
@@ -204,9 +204,9 @@
                                     [% IF ( OpacLoginInstructions ) %]
                                         [% PROCESS koha_news_block news => OpacLoginInstructions %]
                                     [% ELSE %]
-                                        <h3>Don't have a password yet?</h3>
+                                        <h2>Don't have a password yet?</h2>
                                         <p>If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.</p>
-                                        <h3>Don't have a library card?</h3>
+                                        <h2>Don't have a library card?</h2>
                                         <p>If you don't have a library card, stop by your local library to sign up.</p>
                                     [% END # / IF  OpacLoginInstructions %]
 
@@ -221,7 +221,7 @@
                     [% END # / IF loginprompt %]
 
                     [% ELSE %]
-                        <h2>Logging on to the catalog has not been enabled by the library.</h2>
+                        <h1>Logging on to the catalog has not been enabled by the library.</h1>
                         <ul>
                             <li>To report this error, you can email the Koha Administrator.<a href="mailto:[% admin | uri %]">Email</a></li>
                             <li>Use top menu bar to navigate to another part of Koha.</li>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 6adf406504..3bd7623c8a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -684,7 +684,7 @@
                             <div class="content_set">
 
                                 [% IF ( SyndeticsEnabled && SyndeticsSummary && SYNDETICS_SUMMARY ) %]
-                                    <h4>Enhanced descriptions from Syndetics:</h4>
+                                    <h2>Enhanced descriptions from Syndetics:</h2>
                                     <p>[% SYNDETICS_SUMMARY | $raw %]</p>
                                 [% END %]
 
@@ -714,7 +714,7 @@
                         [% IF ( SyndeticsTOC && SYNDETICS_TOC ) %]
                             <div id="toc">
                                 <div class="content_set">
-                                    <h3>Table of contents provided by Syndetics</h3>
+                                    <h2>Table of contents provided by Syndetics</h2>
                                         <ul>
                                             [% FOREACH SYNDETICS_TO IN SYNDETICS_TOC %]
                                                 <li><strong>[% SYNDETICS_TO.l | html %] [% SYNDETICS_TO.t | html %]</strong>[% IF ( SYNDETICS_TO.p ) %] ([% SYNDETICS_TO.p | $raw %])[% END %]</li>
@@ -727,7 +727,7 @@
                         [% IF ( SyndeticsExcerpt && SYNDETICS_EXCERPT ) %]
                             <div id="excerpt">
                                 <div class="content_set">
-                                    <h3>Excerpt provided by Syndetics</h3>
+                                    <h2>Excerpt provided by Syndetics</h2>
                                     [% SYNDETICS_EXCERPT | $raw %]
                                 </div>
                             </div>
@@ -736,10 +736,10 @@
                         [% IF ( SyndeticsReviews && SYNDETICS_REVIEWS ) %]
                             <div id="reviews">
                                 <div class="content_set">
-                                    <h3>Reviews provided by Syndetics</h3>
+                                    <h2>Reviews provided by Syndetics</h2>
                                     [% FOREACH SYNDETICS_REVIEW IN SYNDETICS_REVIEWS %]
                                         [% IF ( SYNDETICS_REVIEW.title ) %]
-                                            <h4>[% SYNDETICS_REVIEW.title | html %]</h4>
+                                            <h3>[% SYNDETICS_REVIEW.title | html %]</h3>
                                                 [% FOREACH review IN SYNDETICS_REVIEW.reviews %]
 
                                                     [% IF ( review.content ) %]
@@ -756,7 +756,7 @@
                         [% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %]
                             <div id="anotes">
                                 <div class="content_set">
-                                    <h3>Author notes provided by Syndetics</h3>
+                                    <h2>Author notes provided by Syndetics</h2>
                                     [% FOREACH SYNDETICS_ANOTE IN SYNDETICS_ANOTES %]
                                         [% IF ( SYNDETICS_ANOTE.content ) %]
                                             [% SYNDETICS_ANOTE.content | $raw %]
@@ -892,9 +892,9 @@
                                                     <img class="avatar" src="[% review.avatarurl | html %]" height="80" width="80" alt="" />
                                                 [% END %]
                                                 [% IF review.approved %]
-                                                    <h5>Your comment</h5>
+                                                    <h2 id="comment">Your comment</h2>
                                                 [% ELSE %]
-                                                    <h5>Your comment (preview, pending approval)</h5>
+                                                    <h2 id="comment">Your comment (preview, pending approval)</h2>
                                                 [% END %]
                                                 <small>[% review.datereviewed | $KohaDates %]</small>
                                                 <p>
@@ -913,20 +913,20 @@
                                                     [% END %]
                                                     [% SWITCH ShowReviewer %]
                                                     [% CASE 'full' %]
-                                                        <h5>Comment by [% review.patron.title | html %] [% review.patron.firstname | html %] [% review.patron.surname | html %]</h5>
+                                                        <h2 id="comment">Comment by [% review.patron.title | html %] [% review.patron.firstname | html %] [% review.patron.surname | html %]</h2>
                                                     [% CASE 'first' %]
-                                                        <h5>Comment by [% review.patron.firstname | html %]</h5>
+                                                        <h2 id="comment">Comment by [% review.patron.firstname | html %]</h2>
                                                     [% CASE 'surname' %]
-                                                        <h5>Comment by [% review.patron.surname | html %]</h5>
+                                                        <h2 id="comment">Comment by [% review.patron.surname | html %]</h2>
                                                     [% CASE 'firstandinitial' %]
-                                                        <h5>Comment by [% review.patron.firstname | html %] [% review.patron.surname|truncate(2,'.') | html %]</h5>
+                                                        <h2 id="comment">Comment by [% review.patron.firstname | html %] [% review.patron.surname|truncate(2,'.') | html %]</h2>
                                                     [% CASE 'username' %]
-                                                        <h5>Comment by [% review.patron.userid | html %]</h5>
+                                                        <h2 id="comment">Comment by [% review.patron.userid | html %]</h2>
                                                     [% END %]
 
                                                     <small>[% review.datereviewed | $KohaDates %]</small>
                                                 [% ELSE %]
-                                                    <h5>Patron comment on [% review.datereviewed | $KohaDates %]</h5>
+                                                    <h2 id="comment">Patron comment on [% review.datereviewed | $KohaDates %]</h2>
                                                 [% END # / IF ShowReviewer != "none" && review.patron %]
                                                 <p>
                                                     [% FILTER html_break %]
@@ -958,7 +958,7 @@
 
                         [% IF ( OPACFRBRizeEditions && XISBNS ) %]
                             <div id="editions">
-                                <h4>Other editions of this work</h4>
+                                <h2>Other editions of this work</h2>
                                 <table class="table table-bordered table-striped">
                                     [% FOREACH XISBN IN XISBNS %]
                                         <tr>
@@ -1029,7 +1029,7 @@
 
                 [% IF ( NovelistSelectProfile && NovelistSelectView == 'below' && ( normalized_isbn || normalized_upc ) ) %]
                     <div id="NovelistSelect">
-                        <h3>Novelist Select</h3>
+                        <h2>Novelist Select</h2>
                         <div data-novelist-novelistselect="[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]"></div>
                     </div>
                 [% END %]
@@ -1130,7 +1130,7 @@
 
                     [% IF ( NovelistSelectProfile && NovelistSelectView == 'right' && ( normalized_isbn || normalized_upc ) ) %]
                         <div id="NovelistSelect">
-                            <h4>Novelist Select</h4>
+                            <h2>Novelist Select</h2>
                             <div data-novelist-novelistselect="[% IF normalized_isbn %][% normalized_isbn | html %][% ELSE %][% normalized_upc | html %][% END %]"></div>
                         </div>
                     [% END %]
@@ -1187,7 +1187,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h3 id="multiSearchLabel">Select the item(s) to search</h3>
+                    <h1 id="multiSearchLabel">Select the item(s) to search</h1>
                     <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 </div>
                 <div class="modal-body">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
index 2a2506e853..2c3add4825 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
@@ -121,13 +121,13 @@
                         <h1>[% IF ( singleBranchMode ) %]Library[% ELSE %]Libraries[% END %]</h1>
 
                         [% FOREACH library IN libraries %]
-                            <h3 property="name">
+                            <h2 property="name">
                                 [% IF ( libraries.count > 1 ) %]
                                     <a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">[% library.branchname | html %]</a>
                                 [% ELSE %]
                                     [% library.branchname | html %]
                                 [% END %]
-                            </h3>
+                            </h2>
                             [% PROCESS library_info %]
                             <hr>
                             [% IF ( libraries.count == 1 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
index b744d9dd6b..696be73fd7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
@@ -32,7 +32,7 @@
                 <div class="col-10 order-first order-lg-2">
                     <div id="update-submitted" class="maincontent">
                         <div class="alert alert-success">
-                            <h3>Thank you</h3>
+                            <p><strong>Thank you</strong></p>
                           [% IF ( Koha.Preference('AutoApprovePatronProfileSettings') ) %]
                             <p>Your updates have been submitted and your patron account has been modified.</p>
                           [% ELSE %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index a8a7b95938..1420a33b4b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -35,7 +35,7 @@
                     <div id="usermessaging" class="maincontent">
                         <h1>Your messaging settings</h1>
                         [% IF ( settings_updated ) %]
-                            <div class="alert alert-success"><h4>Settings updated</h4></div>
+                        <div class="alert alert-success"><p><strong>Settings updated</strong></p></div>
                         [% END %]
                         <form action="/cgi-bin/koha/opac-messaging.pl" method="post" name="opacmessaging">
                             <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
@@ -233,7 +233,7 @@
                         </form>
                     </div> <!-- / #usermessaging -->
                 [% ELSE %]
-                    <h4>You are not allowed to call this page directly</h4>
+                <p><strong>You are not allowed to call this page directly</strong></p>
                 [% END # /IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
            </div> <!-- / .col-lg-10 -->
         </div> <!-- / .row -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index 581a923f33..748f1e9690 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -37,7 +37,7 @@
 
                     [% IF ( Error_messages ) %]
                         <div class="alert alert-warning">
-                            <h3>There was a problem with your submission</h3>
+                            <h2>There was a problem with your submission</h2>
                             <p>
                                 [% IF ( passwords_mismatch ) %]
                                 Passwords do not match.  Please re-type your new password.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
index 8415896a13..6cc8eabd56 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
@@ -72,7 +72,7 @@
                 <h1>Forgotten password recovery</h1>
                 [% IF (hasError) %]
                     <div class="alert alert-warning">
-                        <h3>Error</h3>
+                        <h2>Error</h2>
                         <p>
                         [% IF (sendmailError) %]
                             An error has occurred while sending you the password recovery link.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index 498390545e..9e4d2605b1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -44,7 +44,7 @@
 
                     <form action="/cgi-bin/koha/opac-patron-consent.pl" method="post">
                         [% IF Koha.Preference('GDPR_Policy') %]
-                            <h5>GDPR consents</h5>
+                            <h2 id="GDPR_consents">GDPR consents</h2>
                             <input type="hidden" name="op" value="gdpr_proc_save"/>
                             <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]"/>
                             <fieldset>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
index 263b292002..a0288f4ae6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt
@@ -33,7 +33,7 @@
                     <div id="recordedbooks-results-content" class="maincontent searchresults">
                         <h1>RecordedBooks search for '[% q | html %]'</h1>
                             [% UNLESS ( logged_in_user ) %]
-                                 <h3 class="rb_login">Sign in to view availability and checkout items or place holds</h3>
+                                 <h2 class="rb_login">Sign in to view availability and checkout items or place holds</h2>
                             [% END %]
 
                             <div id="breadcrumbs">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 2fe0ecd021..361103afea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -154,7 +154,7 @@
                     [% END %]
                     [% IF ( query_error ) %]
                         <div class="dialog alert">
-                            <h4>Error:</h4>
+                            <h2>Error:</h2>
                             [% query_error | html %]
                         </div>
                     [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index bee29b71b2..0429ba71d6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -53,7 +53,7 @@
                         <form method="post" name="f">
                             [% FOREACH subscription_LOO IN subscription_LOOP %]
                                 <div id="subscriptionline[% subscription_LOO.subscriptionid | html %]" class="subscriptionline">
-                                    <h3>Subscription information for [% subscription_LOO.bibliotitle | html %]</h3>
+                                    <h2>Subscription information for [% subscription_LOO.bibliotitle | html %]</h2>
                                     <p>
                                         The current subscription began on [% subscription_LOO.startdate | html %] and is issued
                                         [% IF ( subscription_LOO.periodicity1 ) %]
@@ -127,24 +127,24 @@
                                         <p>The subscription expired on [% subscription_LOO.histenddate | html %]</p>
                                     [% END %]
 
-                                    <h4>[% subscription_LOO.branchname | html %]</h4>
+                                    <h3>[% subscription_LOO.branchname | html %]</h3>
 
                                     [% IF ( subscription_LOO.notes ) %]
                                         <p>[% subscription_LOO.notes | html | html_line_break %]</p>
                                     [% END %]
 
                                     [% IF ( subscription_LOO.recievedlist ) %]
-                                        <h5>Available issues</h5>
+                                        <h4>Available issues</h4>
                                             <p>[% subscription_LOO.recievedlist | html | html_line_break %]</p>
                                     [% END %]
 
                                     [% IF ( subscription_LOO.missinglist ) %]
-                                        <h5>Unavailable issues</h5>
+                                        <h4>Unavailable issues</h4>
                                         <p>[% subscription_LOO.missinglist | html | html_line_break %]</p>
                                     [% END %]
 
                                     [% IF ( subscription_LOO.opacnote ) %]
-                                        <h5>Issues summary</h5>
+                                        <h4>Issues summary</h4>
                                         <p>
                                             [% subscription_LOO.opacnote | html | html_line_break %]
                                         </p>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
index e6d1d36294..0086e7e40b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt
@@ -45,10 +45,10 @@
                         [% IF ( op_add ) %]
                             [% IF ( Koha.Preference('MaxTotalSuggestions') != '' && patrons_total_suggestions_count >= Koha.Preference('MaxTotalSuggestions') ) %]
                                     <h2 class="TooManySuggestions">You cannot place any more suggestions</h2>
-                                    <h3 class="TooManySuggestionsText">You may only add up to [% Koha.Preference('MaxTotalSuggestions') | html %] suggestions in [% Koha.Preference('NumberOfSuggestionDays') | html %] days.</h3>
+                                    <p class="TooManySuggestionsText">You may only add up to [% Koha.Preference('MaxTotalSuggestions') | html %] suggestions in [% Koha.Preference('NumberOfSuggestionDays') | html %] days.</p>
                             [% ELSIF ( Koha.Preference('MaxOpenSuggestions') != '' && patrons_pending_suggestions_count >= Koha.Preference('MaxOpenSuggestions') ) %]
                                     <h2 class="TooManySuggestions">You cannot place any more suggestions</h2>
-                                    <h3 class="TooManySuggestionsText">You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more.</h3>
+                                    <p class="TooManySuggestionsText">You have reached your limit for suggestions you can place at this time ([% Koha.Preference('MaxOpenSuggestions') | html %]). Once the library has processed those suggestions you will be able to place more.</p>
                             [% ELSE %]
 
                             [% IF ( opacsuggestion ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index f08d23279f..5c2f4bf760 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -58,11 +58,11 @@
                     <br />
                     <a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here if you're not [% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></p>
 
-                    [% IF ( patronupdate ) %]<div class="alert alert-info"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %]
+                    [% IF ( patronupdate ) %]<div class="alert alert-info"><h2>Thank you!</h2><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div>[% END %]
 
                     [% IF failed_holds %]
                         <div class="alert alert-info">
-                            <h3>Notice:</h3>
+                            <h2>Notice:</h2>
                             <p>One or more holds were not placed due to existing holds.</p>
                         </div>
                     [% END %]
@@ -482,7 +482,7 @@
                         [% IF ( OPACFinesTab ) %]
                             <!-- FINES BOX -->
                             [% IF ( amountoutstanding > 0 ) %]
-                                <div id="opac-user-fines"> <h3>Charges</h3>
+                                <div id="opac-user-fines"> <h2>Charges</h2>
                                     <table class="table table-bordered table-striped">
                                         <thead><tr><th colspan="2">Amount</th></tr></thead>
                                         <tbody>
@@ -496,7 +496,7 @@
                             [% END %]
 
                             [% IF ( amountoutstanding < 0 ) %]
-                                <div id="opac-user-fines">  <h3>Credits</h3>
+                                <div id="opac-user-fines">  <h2>Credits</h2>
                                     <table class="table table-bordered table-striped">
                                         <thead><tr><th colspan="2">Amount</th></tr></thead>
                                         <tbody>
@@ -509,7 +509,7 @@
                             [% END %]
 
                             [% IF relatives_with_fines %]
-                               <div id="opac-user-relative-fines"> <h3>Fines and charges</h3>
+                               <div id="opac-user-relative-fines"> <h2>Fines and charges</h2>
                                     <table class="table table-bordered table-striped">
                                         <thead>
                                             <tr>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
index 5f3ca04918..ca12b62018 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
@@ -62,20 +62,20 @@
                     [% IF ( nopermission ) %]
                         [%# This is what is displayed if user doesn't have permission %]
                         <div class="alert alert-warning">
-                            <h3>Access denied</h3>
+                            <h2>Access denied</h2>
                             <p>Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.</p>
                         </div>
                     [% ELSIF ( different_ip ) %]
                         [%# This is what is displayed if user doesn't have permission %]
                         <div class="alert alert-warning">
-                            <h3>Session lost</h3>
+                            <h2>Session lost</h2>
                             <p>You are accessing self check-in from a different IP address! Please log in again.</p>
                         </div>
                     [% ELSIF ( checkins ) %]
                         [%# We have results from a check-in attempt %]
                         <div id="checkins" class="sci_results_list">
                             [% IF ( success && success.size > 0 || errors && errors.size > 0 ) %]
-                                <h3>Results</h3>
+                                <h2>Results</h2>
                                     <table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer">
                                         <thead>
                                             <th>Barcode</th>
@@ -163,7 +163,7 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h3 id="helpModalLabel">Self check-in help</h3>
+                <h2 id="helpModalLabel">Self check-in help</h2>
                 <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index 91ff1b3d96..339a0818e7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -46,7 +46,7 @@
                     [% IF ( impossible ) %]<!-- We tried to issue, but failed. -->
                         <div class="alert alert-warning">
                             <span class="sco-alert-warning noissue"></span>
-                            <h3>Item cannot be checked out.</h3>
+                            <h2>Item cannot be checked out.</h2>
                             <p>Sorry, this item cannot be checked out at this station.</p>
                             [% IF ( title ) %]
                                 <p>Title: <em>[% title | html %]</em> </p>
@@ -110,7 +110,7 @@
                     [% END # / IF ( impossible %]
 
                     [% IF ( confirm ) %]<!-- We need to confirm the issue.. -->
-                        <div class="alert alert-warning"><h3>Please confirm the checkout:</h3>
+                        <div class="alert alert-warning"><h2>Please confirm the checkout:</h2>
                             <span class="sco-alert-warning confirm"></span>
                             [% IF ( confirm_renew_issue ) %]
                                 <p>This item is already checked out to you.</p>
@@ -160,7 +160,7 @@
                         <!-- This is what is displayed if user doesn't have permission -->
                         <div class="alert alert-warning">
                             <span class="sco-alert-warning nopermission"></span>
-                            <h3>Access denied</h3>
+                            <h2>Access denied</h2>
                             <p>Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem.</p>
                         </div>
                     [% END %]
@@ -169,7 +169,7 @@
                         <!-- This is what is displayed if user doesn't have permission -->
                         <div class="alert alert-warning">
                             <span class="sco-alert-warning sessionlost"></span>
-                            <h3>Session lost</h3>
+                            <h2>Session lost</h2>
                             <p>You are accessing self-checkout from a different IP address! please log in again.</p>
                         </div>
                     [% END %]
@@ -178,7 +178,7 @@
                         <!-- This is what is displayed if user doesn't have permission -->
                         <div class="alert alert-warning">
                             <span class="sco-alert-warning notfound"></span>
-                            <h3>Record not found</h3>
+                            <h2>Record not found</h2>
                             <p>Your userid was not found in the database.  Please try again.</p>
                         </div>
                     [% END %]
@@ -219,7 +219,7 @@
 
                             [% IF ( nouser ) %]
                                 <div class="alert alert-warning">
-                                    <h4>Sorry</h4>
+                                    <h3>Sorry</h3>
                                     <p>The userid <strong>[% patronid | html %]</strong> was not found in the database.  Please try again.</p>
                                 </div>
                             [% END %]