Index: openacs-4/packages/openacs-bootstrap5-theme/resources/forms/form-horizontal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/forms/form-horizontal.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/openacs-bootstrap5-theme/resources/forms/form-horizontal.adp	23 Jun 2022 07:39:45 -0000	1.1.2.3
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/forms/form-horizontal.adp	23 Jun 2022 08:29:45 -0000	1.1.2.4
@@ -44,7 +44,7 @@
                    <!-- no label tag -->
                  </if>
                  <else>
-				   <label class="control-label col-sm-2" for="@elements.id@">
+				   <label class="col-form-label col-sm-2" for="@elements.id@">
                  </else>
 
                  <if \@formerror.@elements.id@\@ not nil>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	23 Jun 2022 08:29:45 -0000	1.1.2.3
@@ -26,7 +26,7 @@
                 <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="sr-only">(current)</span></a></li>
+                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
@@ -275,7 +275,7 @@
                 <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="sr-only">(current)</span></a></li>
+                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	23 Jun 2022 08:29:45 -0000	1.1.2.3
@@ -26,7 +26,7 @@
                 <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="sr-only">(current)</span></a></li>
+                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
@@ -273,7 +273,7 @@
                 <li><a href="\@paginator_pages.url@" title="\@paginator_pages.context@">\@paginator_pages.page@</a></li>
               </if>
               <else>
-                <li class="active"><a href="#">\@paginator_pages.page@ <span class="sr-only">(current)</span></a></li>
+                <li class="active"><a href="#">\@paginator_pages.page@ <span class="visually-hidden">(current)</span></a></li>
               </else>
             </multiple>
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp,v
diff -u -r1.1.2.7 -r1.1.2.8
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp	27 Apr 2022 16:37:23 -0000	1.1.2.7
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp	23 Jun 2022 08:29:45 -0000	1.1.2.8
@@ -25,7 +25,7 @@
         <div id="bootstrap5-alert-message">
             <multiple name="user_messages">
                 <div class="alert alert-success">
-		    <a class="close" data-bs-dismiss="alert">×</a>
+		    <a class="btn-close" data-bs-dismiss="alert">×</a>
 		    <i class="bi bi-info-square-fill"></i>
                     @user_messages.message;noquote@
                 </div>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/search/lib/navbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/search/lib/navbar.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/search/lib/navbar.adp	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/search/lib/navbar.adp	23 Jun 2022 08:29:45 -0000	1.1.2.2
@@ -16,7 +16,7 @@
       </else>
       <multiple name="results_paginator">
         <if @results_paginator.current_p;literal@ true>
-          <li class="active"><a href="#">@results_paginator.item@ <span class="sr-only">(current)</span></a></li>
+          <li class="active"><a href="#">@results_paginator.item@ <span class="visually-hidden">(current)</span></a></li>
         </if>
         <else>
           <li><a href="@results_paginator.link@" title="@results_paginator.item@">@results_paginator.item@</a></li>
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	21 Jun 2022 17:24:15 -0000	1.1.2.4
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/login.adp	23 Jun 2022 08:29:45 -0000	1.1.2.5
@@ -19,7 +19,7 @@
                     #acs-subsite.Online#
                 </a>
             </li>
-            <li class="divider"></li>
+            <li class="dropdown-divider"></li>
             <li class="dropdown-item">
                 <a href="@subsite_url;literal@register/logout" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
             </li>