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.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table-2third.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
@@ -94,7 +94,7 @@
 </if>
 
 <div class="row">
-    <div class="col-lg-8 col-md-10 col-xs-12">
+    <div class="col-xl-8 col-lg-10 col-12">
         <table class="table table-striped" cellpadding="3" cellspacing="1"@list_properties.table_attributes;noquote@>
           <if "@list_properties.caption@" ne ""><caption>@list_properties.caption;noquote@</caption></if>
           <multiple name="elements">
@@ -154,7 +154,7 @@
         <noparse>
           <if \@@list_properties.multirow@:rowcount@ eq 0>
             <tbody>
-            <tr class="list-odd last">
+            <tr class="list-last">
                 <td colspan="@elements:rowcount@">
                 @list_properties.no_data@
               </td>
@@ -184,20 +184,10 @@
                 
           <noparse>
                   <if \@@list_properties.multirow@.rownum@ lt \@@list_properties.multirow@:rowcount@>
-                    <if \@@list_properties.multirow@.rownum@ odd>
-                      <tr class="odd">
-                    </if>
-                    <else>
-                      <tr class="even">
-                    </else>
+                    <tr>
                   </if>
                   <else>
-                    <if \@@list_properties.multirow@.rownum@ odd>
-                      <tr class="odd last">
-                    </if>
-                    <else>
-                      <tr class="even last">
-                    </else>
+                    <tr class="last">
                   </else>
           </noparse>
         
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.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/lists/table.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
@@ -153,7 +153,7 @@
 <noparse>
   <if \@@list_properties.multirow@:rowcount@ eq 0>
     <tbody>
-    <tr class="list-odd last">
+    <tr class="last">
         <td colspan="@elements:rowcount@">
         @list_properties.no_data@
       </td>
@@ -183,20 +183,10 @@
         
   <noparse>
           <if \@@list_properties.multirow@.rownum@ lt \@@list_properties.multirow@:rowcount@>
-            <if \@@list_properties.multirow@.rownum@ odd>
-              <tr class="odd">
-            </if>
-            <else>
-              <tr class="even">
-            </else>
+            <tr class="">
           </if>
           <else>
-            <if \@@list_properties.multirow@.rownum@ odd>
-              <tr class="odd last">
-            </if>
-            <else>
-              <tr class="even last">
-            </else>
+            <tr class="last">
           </else>
   </noparse>
 
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.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-master.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
@@ -17,7 +17,7 @@
     <div class="row header">     
         <widget src="header-bar" ds="0" &="subsite_logo" &="navigation" &="subsite_url" &="subsite_name">
         <widget src="search" ds="0">
-        <if @context_bar@ defined and @context_bar@ ne ""> <div class="col-xs-12 context"> @context_bar;noquote@ </div> </if>
+        <if @context_bar@ defined and @context_bar@ ne ""> <div class="m-0 col-12 context">@context_bar;noquote@</div> </if>
     </div>
     <!-- END HEADER -->
   
@@ -34,7 +34,7 @@
     </if>
     
     <div class="block-marker">Begin main content</div>
-    <div class="main-content" style="margin-bottom:100px;">
+    <div class="m-3 main-content" style="margin-bottom:100px;">
         <slave>
     </div>
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.adp	1 Apr 2022 13:38:22 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/masters/plain-streaming-head.adp	2 Apr 2022 13:36:32 -0000	1.1.2.2
@@ -7,7 +7,7 @@
     <div class="row header">     
         <widget src="header-bar" ds="0" &="subsite_logo" &="navigation" &="subsite_url" &="subsite_name">
         <widget src="search" ds="0">
-        <if @context_bar@ defined and @context_bar@ ne ""> <div class="col-xs-12 context"> @context_bar;noquote@ </div> </if>
+        <if @context_bar@ defined and @context_bar@ ne ""> <div class="col-12 context"> @context_bar;noquote@ </div> </if>
     </div>
     <!-- END HEADER -->
 
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-admin/www/apm/repository-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-admin/www/apm/repository-index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-admin/www/apm/repository-index.adp	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/templates/packages/acs-admin/www/apm/repository-index.adp	2 Apr 2022 13:36:33 -0000	1.1.2.2
@@ -4,7 +4,7 @@
 <h2> Available channels: </h2>
 
 <div class="row">
-    <div class="col-lg-4 col-md-6 col-sm-8 col-xs-12">
+    <div class="col-xl-4 col-lg-6 col-sm-8 col-12">
     
         <p>This is a list of the current and previous OpenACS releases and their contained packages. The information on the following pages includes a description of each package, their level of maturity, their co-dependencies with other packages and a bug tracker summary.</p>
         
Index: openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/search.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/search.adp	1 Apr 2022 13:38:23 -0000	1.1.2.1
+++ openacs-4/packages/openacs-bootstrap5-theme/resources/widgets/search.adp	2 Apr 2022 13:36:33 -0000	1.1.2.2
@@ -1,5 +1,5 @@
 <div class="searchfield d-flex justify-content-end">
-    <div class="col-xs-12 col-sm-6 col-md-3 col-sm-offset-6 col-md-offset-9 search">
+    <div class="col-12 col-sm-6 col-md-3 col-sm-offset-6 col-md-offset-9 search">
         <form method="GET" action="/search/search" class="form-inline">
             <div class="input-group">
                 <input type="search" class="form-control" name="q" title="#search.Enter_keywords_to_search_for#" maxlength="256" placeholder="Search">