From 2be57d3d75a79b5eeb5cee178a6be1939d00d2ca Mon Sep 17 00:00:00 2001
From: hellodeloo <hello@hellodeloo.com>
Date: Fri, 8 Sep 2023 12:19:24 +0200
Subject: [PATCH] feat: update utility classnames

---
 lacommunaute/forum/tests/tests_views.py       | 22 +++----
 .../forum_conversation/tests/tests_views.py   | 16 ++---
 .../tests/tests_views_htmx.py                 | 10 ++--
 .../tests/test_forumupvoteview.py             |  4 +-
 .../forum_upvote/tests/test_postupvoteview.py |  4 +-
 .../templates/event/event_calendar.html       |  2 +-
 lacommunaute/templates/event/event_form.html  |  6 +-
 lacommunaute/templates/event/event_list.html  |  2 +-
 .../templates/forum/category_forum_list.html  | 10 ++--
 .../templates/forum/forum_detail.html         | 58 +++++++++----------
 lacommunaute/templates/forum/forum_list.html  | 38 ++++++------
 .../forum_attachments/attachment_formset.html |  6 +-
 .../forum_polls/poll_detail.html              |  4 +-
 .../forum_polls/poll_option_formset.html      |  6 +-
 .../forum_polls/poll_vote_form.html           | 14 ++---
 .../forum_polls/topic_list_poll_detail.html   | 10 ++--
 .../topic_list_poll_vote_form.html            | 32 +++++-----
 .../partials/post_certified.html              | 16 ++---
 .../partials/post_certified_actions.html      | 18 +++---
 .../partials/post_certified_badge.html        |  2 +-
 .../partials/post_feed.html                   |  2 +-
 .../partials/post_feed_form_collapsable.html  | 14 ++---
 .../forum_conversation/partials/poster.html   |  8 +--
 .../partials/posts_list.html                  |  4 +-
 .../partials/topic_detail_actions.html        | 22 +++----
 .../partials/topic_filter.html                | 16 ++---
 .../partials/topic_form.html                  | 24 ++++----
 .../partials/topic_likes.html                 | 18 +++---
 .../partials/topic_tags.html                  |  2 +-
 .../forum_conversation/topic_list.html        | 38 ++++++------
 .../topic_list_newsfeed.html                  | 40 ++++++-------
 .../forum_member/forum_profile_detail.html    |  8 +--
 .../forum_member/join_forum_landing.html      |  4 +-
 .../forum_member/moderator_profiles.html      |  8 +--
 .../templates/forum_member/profiles.html      |  8 +--
 .../templates/forum_search/search.html        | 16 ++---
 .../templates/forum_search/search_form.html   |  8 +--
 .../templates/forum_upvote/upvote_list.html   | 16 ++---
 lacommunaute/templates/pages/contact.html     | 14 ++---
 lacommunaute/templates/pages/home.html        | 30 +++++-----
 .../templates/partials/ask_a_question.html    | 18 +++---
 lacommunaute/templates/partials/banner.html   | 12 ++--
 lacommunaute/templates/partials/footer.html   | 24 ++++----
 .../templates/partials/form_field.html        |  6 +-
 .../partials/form_field_mentions.html         |  8 +--
 .../partials/header_nav_primary_items.html    | 44 +++++++-------
 lacommunaute/templates/partials/messages.html |  4 +-
 .../partials/social_share_buttons.html        |  2 +-
 lacommunaute/templates/partials/upvotes.html  | 20 +++----
 49 files changed, 358 insertions(+), 360 deletions(-)

diff --git a/lacommunaute/forum/tests/tests_views.py b/lacommunaute/forum/tests/tests_views.py
index 3649d4883..aecded4c5 100644
--- a/lacommunaute/forum/tests/tests_views.py
+++ b/lacommunaute/forum/tests/tests_views.py
@@ -128,27 +128,27 @@ def test_has_liked(self):
         self.client.force_login(self.user)
         response = self.client.get(self.url)
         # icon: solid heart
-        self.assertContains(response, '<i class="ri-heart-3-fill mr-1" aria-hidden="true"></i><span>1</span>')
+        self.assertContains(response, '<i class="ri-heart-3-fill me-1" aria-hidden="true"></i><span>1</span>')
 
     def test_has_not_liked(self):
         self.client.force_login(self.user)
         response = self.client.get(self.url)
         # icon: regular heart (outlined)
-        self.assertContains(response, '<i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>0</span>')
+        self.assertContains(response, '<i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>0</span>')
 
     def test_has_liked_TOPIC_ANNOUNCE(self):
         TopicFactory(forum=self.forum, poster=self.user, with_post=True, with_like=True, type=Topic.TOPIC_ANNOUNCE)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
-        self.assertContains(response, '<i class="ri-heart-3-fill mr-1" aria-hidden="true"></i><span>1</span>')
+        self.assertContains(response, '<i class="ri-heart-3-fill me-1" aria-hidden="true"></i><span>1</span>')
 
     def test_has_not_liked_TOPIC_ANNOUNCE(self):
         TopicFactory(forum=self.forum, poster=self.user, with_post=True, type=Topic.TOPIC_ANNOUNCE)
 
         self.client.force_login(self.user)
         response = self.client.get(self.url)
-        self.assertContains(response, '<i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>0</span>')
+        self.assertContains(response, '<i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>0</span>')
 
     def test_anonymous_like(self):
         params = {"next_url": self.url}
@@ -342,7 +342,7 @@ def test_share_buttons(self):
         response = self.client.get(url)
         self.assertContains(
             response,
-            'div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuSocialShare">',
+            'div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuSocialShare">',
             status_code=200,
         )
 
@@ -357,7 +357,7 @@ def test_upvote_actions(self):
             ' rel="nofollow"'
             ' class="btn btn-sm btn-ico-only btn-link btn-secondary" data-toggle="tooltip" data-placement="top"'
             ' title="Connectez-vous pour sauvegarder">'
-            '\n                <i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>'
+            '\n                <i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>'
         )
         response = self.client.get(
             reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": child_forum.slug})
@@ -374,7 +374,7 @@ def test_upvote_actions(self):
             '\n                        data-matomo-action="upvote"'
             '\n                        data-matomo-option="post"'
             "\n                >"
-            '\n                    <i class="ri-bookmark-line mr-1" aria-hidden="true"></i>'
+            '\n                    <i class="ri-bookmark-line me-1" aria-hidden="true"></i>'
             "<span>0</span>"
         )
         response = self.client.get(reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": forum.slug}))
@@ -389,7 +389,7 @@ def test_upvote_actions(self):
             '\n                        data-matomo-action="upvote"'
             '\n                        data-matomo-option="post"'
             "\n                >"
-            '\n                    <i class="ri-bookmark-fill mr-1" aria-hidden="true"></i>'
+            '\n                    <i class="ri-bookmark-fill me-1" aria-hidden="true"></i>'
             "<span>1</span>"
         )
         response = self.client.get(
@@ -405,7 +405,7 @@ def test_upvotes_count(self):
             reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": child_forum.slug})
         )
         self.assertContains(
-            response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200
+            response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200
         )
 
         child_forum.upvotes.create(voter=self.user)
@@ -414,7 +414,7 @@ def test_upvotes_count(self):
             reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": child_forum.slug})
         )
         self.assertContains(
-            response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>1</span>', status_code=200
+            response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>1</span>', status_code=200
         )
 
         child_forum.upvotes.create(voter=UserFactory())
@@ -423,5 +423,5 @@ def test_upvotes_count(self):
             reverse("forum_extension:forum", kwargs={"pk": child_forum.pk, "slug": child_forum.slug})
         )
         self.assertContains(
-            response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>2</span>', status_code=200
+            response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>2</span>', status_code=200
         )
diff --git a/lacommunaute/forum_conversation/tests/tests_views.py b/lacommunaute/forum_conversation/tests/tests_views.py
index 9297b3fb2..18ea4e9e7 100644
--- a/lacommunaute/forum_conversation/tests/tests_views.py
+++ b/lacommunaute/forum_conversation/tests/tests_views.py
@@ -389,13 +389,13 @@ def test_has_liked(self):
         self.client.force_login(self.poster)
         response = self.client.get(self.url)
         # icon: solid heart
-        self.assertContains(response, '<i class="ri-heart-3-fill mr-1" aria-hidden="true"></i><span>1</span>')
+        self.assertContains(response, '<i class="ri-heart-3-fill me-1" aria-hidden="true"></i><span>1</span>')
 
     def test_has_not_liked(self):
         self.client.force_login(self.poster)
         response = self.client.get(self.url)
         # icon: regular heart (outlined)
-        self.assertContains(response, '<i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>0</span>')
+        self.assertContains(response, '<i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>0</span>')
 
     def test_pluralized_likes(self):
         self.topic.likers.add(UserFactory())
@@ -405,7 +405,7 @@ def test_pluralized_likes(self):
         self.client.force_login(self.poster)
         response = self.client.get(self.url)
         # icon: regular heart (outlined)
-        self.assertContains(response, '<i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>2</span>')
+        self.assertContains(response, '<i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>2</span>')
 
     def test_anonymous_like(self):
         assign_perm("can_read_forum", AnonymousUser(), self.topic.forum)
@@ -425,7 +425,7 @@ def test_post_has_no_upvote(self):
 
         response = self.client.get(self.url)
         self.assertContains(
-            response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200
+            response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200
         )
 
     def test_post_has_upvote_by_user(self):
@@ -435,7 +435,7 @@ def test_post_has_upvote_by_user(self):
 
         response = self.client.get(self.url)
         self.assertContains(
-            response, '<i class="ri-bookmark-fill mr-1" aria-hidden="true"></i><span>1</span>', status_code=200
+            response, '<i class="ri-bookmark-fill me-1" aria-hidden="true"></i><span>1</span>', status_code=200
         )
 
     def test_certified_post_is_highlighted(self):
@@ -525,7 +525,7 @@ def test_has_liked(self):
         self.client.force_login(self.user)
         response = self.client.get(self.url)
         # icon: solid heart
-        self.assertContains(response, '<i class="ri-heart-3-fill mr-1" aria-hidden="true"></i><span>1</span>')
+        self.assertContains(response, '<i class="ri-heart-3-fill me-1" aria-hidden="true"></i><span>1</span>')
 
     def test_queryset(self):
         TopicFactory(with_post=True, forum=ForumFactory(kind=ForumKind.PRIVATE_FORUM, with_public_perms=True))
@@ -619,11 +619,11 @@ def test_showmoretopics_url_with_params(self):
 
     def test_filter_dropdown_visibility(self):
         response = self.client.get(self.url)
-        self.assertContains(response, '<div class="dropdown-menu dropdown-menu-right" id="filterTopicsDropdown">')
+        self.assertContains(response, '<div class="dropdown-menu dropdown-menu-end" id="filterTopicsDropdown">')
         self.assertEqual(response.context_data["display_filter_dropdown"], True)
 
         response = self.client.get(self.url + "?page=1")
-        self.assertNotContains(response, '<div class="dropdown-menu dropdown-menu-right" id="filterTopicsDropdown">')
+        self.assertNotContains(response, '<div class="dropdown-menu dropdown-menu-end" id="filterTopicsDropdown">')
         self.assertEqual(response.context_data["display_filter_dropdown"], False)
 
     def test_template_name(self):
diff --git a/lacommunaute/forum_conversation/tests/tests_views_htmx.py b/lacommunaute/forum_conversation/tests/tests_views_htmx.py
index 62792d226..36849a4b5 100644
--- a/lacommunaute/forum_conversation/tests/tests_views_htmx.py
+++ b/lacommunaute/forum_conversation/tests/tests_views_htmx.py
@@ -131,13 +131,13 @@ def test_post_like_unlike_topic(self):
         response = self.client.post(self.url)
         # icon: solid heart
         self.assertContains(
-            response, '<i class="ri-heart-3-fill mr-1" aria-hidden="true"></i><span>1</span>', status_code=200
+            response, '<i class="ri-heart-3-fill me-1" aria-hidden="true"></i><span>1</span>', status_code=200
         )
 
         response = self.client.post(self.url)
         # icon: regular heart (outlined)
         self.assertContains(
-            response, '<i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200
+            response, '<i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200
         )
 
     def test_post_topic_not_found(self):
@@ -341,7 +341,7 @@ def test_upvote_annotations(self):
 
         response = view.get(request)
         self.assertContains(
-            response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200
+            response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200
         )
 
         UpVoteFactory(content_object=post, voter=UserFactory())
@@ -349,7 +349,7 @@ def test_upvote_annotations(self):
 
         response = view.get(request)
         self.assertContains(
-            response, '<i class="ri-bookmark-fill mr-1" aria-hidden="true"></i><span>2</span>', status_code=200
+            response, '<i class="ri-bookmark-fill me-1" aria-hidden="true"></i><span>2</span>', status_code=200
         )
 
     def test_certified_post_highlight(self):
@@ -429,7 +429,7 @@ def test_create_post_as_authenticated_user(self, *args):
         self.assertContains(response, self.content, status_code=200)
         self.assertIsInstance(response.context["form"], PostForm)
         self.assertEqual(1, ForumReadTrack.objects.count())
-        self.assertContains(response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>')
+        self.assertContains(response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>')
         self.topic.refresh_from_db()
         self.assertEqual(self.topic.posts.count(), 2)
         self.assertEqual(
diff --git a/lacommunaute/forum_upvote/tests/test_forumupvoteview.py b/lacommunaute/forum_upvote/tests/test_forumupvoteview.py
index b4db213d5..ec0402acf 100644
--- a/lacommunaute/forum_upvote/tests/test_forumupvoteview.py
+++ b/lacommunaute/forum_upvote/tests/test_forumupvoteview.py
@@ -33,12 +33,12 @@ def test_upvote_downvote_with_permission(client, db):
 
     # upvote
     response = client.post(url, data=form_data)
-    assertContains(response, '<i class="ri-bookmark-fill mr-1" aria-hidden="true"></i><span>1</span>', status_code=200)
+    assertContains(response, '<i class="ri-bookmark-fill me-1" aria-hidden="true"></i><span>1</span>', status_code=200)
     assert UpVote.objects.get()
 
     # downvote
     response = client.post(url, data=form_data)
-    assertContains(response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200)
+    assertContains(response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200)
     assert not UpVote.objects.all()
 
 
diff --git a/lacommunaute/forum_upvote/tests/test_postupvoteview.py b/lacommunaute/forum_upvote/tests/test_postupvoteview.py
index f62a5a130..4dcde56ea 100644
--- a/lacommunaute/forum_upvote/tests/test_postupvoteview.py
+++ b/lacommunaute/forum_upvote/tests/test_postupvoteview.py
@@ -35,7 +35,7 @@ def test_upvote_with_permission(client, db):
 
     # upvote
     response = client.post(url, data=form_data)
-    assertContains(response, '<i class="ri-bookmark-fill mr-1" aria-hidden="true"></i><span>1</span>', status_code=200)
+    assertContains(response, '<i class="ri-bookmark-fill me-1" aria-hidden="true"></i><span>1</span>', status_code=200)
     assert UpVote.objects.get(
         voter_id=user.id,
         object_id=topic.first_post.id,
@@ -44,7 +44,7 @@ def test_upvote_with_permission(client, db):
 
     # downvote
     response = client.post(url, data=form_data)
-    assertContains(response, '<i class="ri-bookmark-line mr-1" aria-hidden="true"></i><span>0</span>', status_code=200)
+    assertContains(response, '<i class="ri-bookmark-line me-1" aria-hidden="true"></i><span>0</span>', status_code=200)
     assert not UpVote.objects.all()
 
 
diff --git a/lacommunaute/templates/event/event_calendar.html b/lacommunaute/templates/event/event_calendar.html
index 6dcb2d452..47672a8d2 100644
--- a/lacommunaute/templates/event/event_calendar.html
+++ b/lacommunaute/templates/event/event_calendar.html
@@ -33,7 +33,7 @@ <h1 class="s-title-01__title h1"><strong>Les évènements à venir</strong></h1>
                 <div class="s-section__col col-12">
                     {% if user.is_authenticated %}
                         <a href="{% url 'event:create' %}"
-                           role="button" class="btn btn-primary">
+                            role="button" class="btn btn-primary">
                             {% trans "Post a new Public Event" %}
                         </a>
                     {% else %}
diff --git a/lacommunaute/templates/event/event_form.html b/lacommunaute/templates/event/event_form.html
index 9ae224ea2..5862b937a 100644
--- a/lacommunaute/templates/event/event_form.html
+++ b/lacommunaute/templates/event/event_form.html
@@ -52,9 +52,9 @@ <h1 class="s-title-01__title h1"><strong>{% trans "Post a new Public Event" %}</
                             <div class="form-actions form-row">
                                 <div class="form-group col-auto">
                                     <input type="submit" class="btn btn-primary matomo-event" value="{% trans "Submit" %}"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="contribute"
-                                           data-matomo-option="event">
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="contribute"
+                                        data-matomo-option="event">
                                     {% if event %}
                                         <a href="{% url 'event:delete' pk=event.pk %}" role="button" class="btn btn-outline-danger" value="{% trans "Delete" %}">{% trans "Delete" %}</a>
                                     {% endif %}
diff --git a/lacommunaute/templates/event/event_list.html b/lacommunaute/templates/event/event_list.html
index 34fa0e112..09e9d0875 100644
--- a/lacommunaute/templates/event/event_list.html
+++ b/lacommunaute/templates/event/event_list.html
@@ -14,7 +14,7 @@ <h1 class="s-title-01__title h1"><strong>{% trans "Manage My Events" %}</strong>
             <div class="s-title-01__row row">
                 <div class="col-12 col-md-auto">
                     <a href="{% url 'event:create' %}"
-                       role="button" class="btn btn-primary">
+                        role="button" class="btn btn-primary">
                         {% trans "Post a new Public Event" %}
                     </a>
                 </div>
diff --git a/lacommunaute/templates/forum/category_forum_list.html b/lacommunaute/templates/forum/category_forum_list.html
index 1f005b535..39db004d5 100644
--- a/lacommunaute/templates/forum/category_forum_list.html
+++ b/lacommunaute/templates/forum/category_forum_list.html
@@ -36,12 +36,12 @@ <h2 class="mt-3">Retrouver les ressources nécessaires pour améliorer ses diagn
                                     </div>
                                 {% endif %}
                             </div>
-                            <div class="card-footer text-right">
+                            <div class="card-footer text-end">
                                 <a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
-                                   class="btn btn-ico btn-link stretched-link matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="show"
-                                   data-matomo-option="fichestechniques">
+                                    class="btn btn-ico btn-link stretched-link matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="show"
+                                    data-matomo-option="fichestechniques">
                                     <span>Consulter les fiches du thème</span>
                                     <i class="ri-arrow-right-up-line ri-lg"></i>
                                 </a>
diff --git a/lacommunaute/templates/forum/forum_detail.html b/lacommunaute/templates/forum/forum_detail.html
index 23781813c..8df890af6 100644
--- a/lacommunaute/templates/forum/forum_detail.html
+++ b/lacommunaute/templates/forum/forum_detail.html
@@ -34,7 +34,7 @@ <h2 class="mt-3">
                     <div class="col-12 col-lg-9">
                         <div class="row align-items-sm-center mb-3">
                             <div class="col-12 col-sm">
-                                <span class="badge badge-xs badge-pill bg-communaute text-white text-decoration-none">
+                                <span class="badge badge-xs rounded-pill bg-communaute text-white text-decoration-none">
                                     <i class="ri-checkbox-circle-fill"></i>
                                     Certifié par la Plateforme de l'Inclusion le {{ forum.updated|date:"d/m/Y" }}
                                 </span>
@@ -48,10 +48,10 @@ <h2 class="mt-3">
                     </div>
                     <div class="col-12 col-lg-3">
                         <a href="{% url 'forum_extension:forum' parent_forum.slug parent_forum.id %}"
-                           class="matomo-event h3 text-decoration-none d-inline-block"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
+                            class="matomo-event h3 text-decoration-none d-inline-block"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forum">
                             Les autres fiches du thème
                         </a>
                         <ul class="nav nav-tabs flex-column">
@@ -97,11 +97,11 @@ <h2 class="mt-3">
                         <div class="col-12 col-sm-auto forum-actions-block">
                             {% if user_can_add_topic %}
                                 <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-                                   rel="nofollow"
-                                   class="btn btn-primary btn-ico matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="contribute"
-                                   data-matomo-option="new_topic">
+                                    rel="nofollow"
+                                    class="btn btn-primary btn-ico matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="contribute"
+                                    data-matomo-option="new_topic">
                                     <i class="ri-chat-new-line ri-lg"></i>
                                     <span>{% if forum.kind == 'NEWS' %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
                                 </a>
@@ -112,10 +112,10 @@ <h2 class="mt-3">
                                 </button>
                                 <div class="dropdown-menu" aria-labelledby="id_dropdown_moderators_stats_button">
                                     <a href="{% url 'members:forum_profiles' forum.slug forum.pk %}"
-                                       class="dropdown-item matomo-event"
-                                       data-matomo-category="engagement"
-                                       data-matomo-action="view"
-                                       data-matomo-option="directory">
+                                        class="dropdown-item matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="view"
+                                        data-matomo-option="directory">
                                         {% trans "Members" %}
                                     </a>
                                 </div>
@@ -135,22 +135,22 @@ <h2 class="mt-3">
                         <ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link active" id="topics-tab"
-                                   data-toggle="tab"
-                                   href="#topics"
-                                   role="tab"
-                                   aria-controls="topics"
-                                   aria-selected="true">
+                                    data-toggle="tab"
+                                    href="#topics"
+                                    role="tab"
+                                    aria-controls="topics"
+                                    aria-selected="true">
                                     Sujets
                                 </a>
                             </li>
                             {% if announces %}
                                 <li class="nav-item" role="presentation">
                                     <a class="nav-link" id="announces-tab"
-                                       data-toggle="tab"
-                                       href="#announces"
-                                       role="tab"
-                                       aria-controls="announces"
-                                       aria-selected="false">
+                                        data-toggle="tab"
+                                        href="#announces"
+                                        role="tab"
+                                        aria-controls="announces"
+                                        aria-selected="false">
                                         Annonces
                                     </a>
                                 </li>
@@ -158,21 +158,21 @@ <h2 class="mt-3">
                             <li class="nav-item-dropdown dropdown">
                                 <!-- for responsive needs -->
                                 <a class="nav-link dropdown-toggle" href="#" role="button" id="sTabs01DropdownMoreLink" data-toggle="dropdown" aria-expanded="false"><i class="ri-more-line" aria-hidden="true"></i></a>
-                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="sTabs01DropdownMoreLink"></div>
+                                <div class="dropdown-menu dropdown-menu-end" aria-labelledby="sTabs01DropdownMoreLink"></div>
                             </li>
                         </ul>
                         <div class="tab-content topiclist">
                             <div class="tab-pane fade show active" id="topics"
-                                 role="tabpanel"
-                                 aria-labelledby="topics-tab">
+                                role="tabpanel"
+                                aria-labelledby="topics-tab">
                                 {% with unread_topics=unread_topics  %}
                                     {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                 {% endwith %}
                             </div>
                             {% if announces %}
                                 <div class="tab-pane fade" id="announces"
-                                     role="tabpanel"
-                                     aria-labelledby="announces-tab">
+                                    role="tabpanel"
+                                    aria-labelledby="announces-tab">
                                     {% with topics=announces hide_if_empty=True unread_topics=unread_topics loadmoretopic_url=None %}
                                         {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                     {% endwith %}
diff --git a/lacommunaute/templates/forum/forum_list.html b/lacommunaute/templates/forum/forum_list.html
index d8e60e51d..721d6f165 100644
--- a/lacommunaute/templates/forum/forum_list.html
+++ b/lacommunaute/templates/forum/forum_list.html
@@ -13,17 +13,17 @@
             <div class="c-card card mb-3">
                 <div class="card-header d-flex position-relative">
                     {% if node.obj.image %}
-                        <div class="d-none d-md-flex-inline forum-image pr-2">
+                        <div class="d-none d-md-flex-inline forum-image pe-2">
                             <img src="{{ node.obj.image.url }}" alt="{{ node.obj.name }}" class="img-fluid" />
                         </div>
                     {% endif %}
                     <div class="flex-grow-1">
                         <h3 class="h3 mb-0">
                             <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                               class="matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="forum">
+                                class="matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="view"
+                                data-matomo-option="forum">
                                 {{ node.obj.name }}
                             </a>
                         </h3>
@@ -37,7 +37,7 @@ <h3 class="h3 mb-0">
                         {{ node.obj.description.rendered|urlizetrunc_target_blank:30 }}
                     {% endif %}
                     {% if node.children %}
-                        <a data-toggle="collapse" href="#collapse{{node.obj.id}}" role="button" aria-expanded="false" aria-controls="collapse{{node.obj.id}}" class="btn btn-link pt-0 pl-0">
+                        <a data-toggle="collapse" href="#collapse{{node.obj.id}}" role="button" aria-expanded="false" aria-controls="collapse{{node.obj.id}}" class="btn btn-link pt-0 ps-0">
                             {% if node.obj.is_forum %}
                                 Voir les sous-communautés
                             {% else %}
@@ -50,10 +50,10 @@ <h3 class="h3 mb-0">
                                     <li class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-md-between">
                                         <div class="flex-grow-1">
                                             <a href="{% url 'forum_extension:forum' child.obj.slug child.obj.id %}"
-                                               class="h5 d-block mb-0 matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="view"
-                                               data-matomo-option="forum">
+                                                class="h5 d-block mb-0 matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="view"
+                                                data-matomo-option="forum">
                                                 {{ child.obj.name }}
                                             </a>
                                             <small class="text-muted">
@@ -81,12 +81,12 @@ <h3 class="h3 mb-0">
                                 </div>
                             {% endif %}
                         </div>
-                        <div class="card-footer text-right">
+                        <div class="card-footer text-end">
                             <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                               class="btn btn-ico btn-link stretched-link matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="fiches_techniques">
+                                class="btn btn-ico btn-link stretched-link matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="view"
+                                data-matomo-option="fiches_techniques">
                                 <span>Consulter la fiche</span>
                                 <i class="ri-arrow-right-up-line ri-lg"></i>
                             </a>
@@ -101,10 +101,10 @@ <h3 class="h3 mb-0">
                 <li class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-md-between">
                     <div class="flex-grow-1">
                         <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                           class="matomo-event h4 d-block mb-0"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
+                            class="matomo-event h4 d-block mb-0"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forum">
                             {{ node.obj.name }}
                         </a>
                         <small class="text-muted">
diff --git a/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html b/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html
index 3bf8bca20..a5d779773 100644
--- a/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html
+++ b/lacommunaute/templates/forum_conversation/forum_attachments/attachment_formset.html
@@ -17,9 +17,9 @@
                     {% endfor %}
                 {% endif %}
                 {% if field.name == 'DELETE' %}
-                    <div class="custom-control custom-checkbox mt-3">
-                        {{ field | add_class:'custom-control-input' }}
-                        <label class="custom-control-label" for="{{ field.auto_id }}">{{ field.label }}</label>
+                    <div class="form-check mt-3">
+                        {{ field | add_class:'form-check-input' }}
+                        <label class="form-check-label" for="{{ field.auto_id }}">{{ field.label }}</label>
                     </div>
                 {% elif field.name == 'file' %}
                     <div id="div_id_{{ field.html_name }}" class="form-group{% if field.errors %} has-error{% endif %}">
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html
index 5a3f02b94..5d0e7dc07 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_detail.html
@@ -35,11 +35,11 @@
         </div>
         {% if view_results_action %}
             <div class="form-actions">
-                <a href="." class="btn btn-sm btn-link pl-0">{% trans "Vote" %}</a>
+                <a href="." class="btn btn-sm btn-link ps-0">{% trans "Vote" %}</a>
             </div>
         {% elif can_be_completed and has_been_completed and not change_vote_action %}
             <div class="form-actions">
-                <a href="?change_vote=true" class="btn btn-sm btn-link pl-0">{% trans "Change your vote" %}</a>
+                <a href="?change_vote=true" class="btn btn-sm btn-link ps-0">{% trans "Change your vote" %}</a>
             </div>
         {% endif %}
     {% endwith %}
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html
index 7affcac5b..20dc8c8d1 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_option_formset.html
@@ -11,9 +11,9 @@
                     {{ form.id }}
                 {% endif %}
                 {% if field.name == 'DELETE' %}
-                    <div class="custom-control custom-checkbox mt-2">
-                        {{ field | add_class:'custom-control-input' }}
-                        <label class="custom-control-label" for="{{ field.auto_id }}">{{ field.label }}</label>
+                    <div class="form-check mt-2">
+                        {{ field | add_class:'form-check-input' }}
+                        <label class="form-check-label" for="{{ field.auto_id }}">{{ field.label }}</label>
                     </div>
                 {% else %}
                     {% include "partials/form_field.html" with field=field %}
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html b/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html
index a580c5e76..798cf8c2c 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/poll_vote_form.html
@@ -6,14 +6,14 @@
         {% for option in poll_form.options.field.queryset %}
             <li>
                 {% if poll.max_options == 1 %}
-                    <div class="custom-control custom-radio">
-                        <input type="radio" class="custom-control-input" name="options" value="{{ option.id }}" id="option{{ option.id }}"  >
-                        <label class="custom-control-label" for="option{{ option.id }}">{{ option.text }}</label>
+                    <div class="form-check">
+                        <input type="radio" class="form-check-input" name="options" value="{{ option.id }}" id="option{{ option.id }}"  >
+                        <label class="form-check-label" for="option{{ option.id }}">{{ option.text }}</label>
                     </div>
                 {% else %}
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" name="options" value="{{ option.id }}" id="option{{ option.id }}">
-                        <label class="custom-control-label" for="option{{ option.id }}">{{ option.text }}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" name="options" value="{{ option.id }}" id="option{{ option.id }}">
+                        <label class="form-check-label" for="option{{ option.id }}">{{ option.text }}</label>
                     </div>
                 {% endif %}
             </li>
@@ -21,6 +21,6 @@
     </ul>
     <div class="form-actions">
         <input type="submit" class="btn btn-sm btn-secondary" value="{% trans "Submit" %}" />
-        <a href="{% if change_vote_action %}.{% else %}?view_results=true{% endif %}" class="btn btn-sm btn-link ml-3">{% trans "View results" %}</a>
+        <a href="{% if change_vote_action %}.{% else %}?view_results=true{% endif %}" class="btn btn-sm btn-link ms-3">{% trans "View results" %}</a>
     </div>
 </form>
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
index 9b84a5cfc..a58d71d45 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
@@ -35,15 +35,15 @@
         </div>
         {% if view_results_action %}
             <div class="form-actions">
-                <a href="." class="btn btn-sm btn-link pl-0">{% trans "Vote" %}</a>
+                <a href="." class="btn btn-sm btn-link ps-0">{% trans "Vote" %}</a>
             </div>
         {% elif can_be_completed and has_been_completed and not change_vote_action %}
             <div class="form-actions">
                 <a href="{% url 'forum_conversation:topic' poll.topic.forum.slug poll.topic.forum.pk poll.topic.slug poll.topic.pk %}?change_vote=true"
-                   class="btn btn-sm btn-link pl-0 matomo-event"
-                   data-matomo-category="engagement"
-                   data-matomo-action="view"
-                   data-matomo-option="topic">
+                    class="btn btn-sm btn-link ps-0 matomo-event"
+                    data-matomo-category="engagement"
+                    data-matomo-action="view"
+                    data-matomo-option="topic">
                     {% trans "Change your vote" %}
                 </a>
             </div>
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
index a916d810f..3b58ffce9 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
@@ -1,26 +1,26 @@
 {% load i18n %}
 
 <form method="post"
-      action=""
-      hx-post="{% url 'forum_polls_extension:topic_poll_vote' poll.topic.forum.slug poll.topic.forum.pk poll.pk %}"
-      id="poll-form{{poll.pk}}"
-      hx-target="#pollarea{{poll.pk}}"
-      hx-swap="outerHTML"
-      novalidate>
+    action=""
+    hx-post="{% url 'forum_polls_extension:topic_poll_vote' poll.topic.forum.slug poll.topic.forum.pk poll.pk %}"
+    id="poll-form{{poll.pk}}"
+    hx-target="#pollarea{{poll.pk}}"
+    hx-swap="outerHTML"
+    novalidate>
     {% csrf_token %}
 
     <ul class="list-unstyled mb-3">
         {% for option in poll.options.all %}
             <li>
                 {% if poll.max_options == 1 %}
-                    <div class="custom-control custom-radio">
-                        <input type="radio" class="custom-control-input" name="options" value="{{ option.id }}" id="option{{poll.pk}}_{{ option.id }}">
-                        <label class="custom-control-label" for="option{{poll.pk}}_{{ option.id }}">{{ option.text }}</label>
+                    <div class="form-check">
+                        <input type="radio" class="form-check-input" name="options" value="{{ option.id }}" id="option{{poll.pk}}_{{ option.id }}">
+                        <label class="form-check-label" for="option{{poll.pk}}_{{ option.id }}">{{ option.text }}</label>
                     </div>
                 {% else %}
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" name="options" value="{{ option.id }}" id="option{{poll.pk}}_{{ option.id }}">
-                        <label class="custom-control-label" for="option{{poll.pk}}_{{ option.id }}">{{ option.text }}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" name="options" value="{{ option.id }}" id="option{{poll.pk}}_{{ option.id }}">
+                        <label class="form-check-label" for="option{{poll.pk}}_{{ option.id }}">{{ option.text }}</label>
                     </div>
                 {% endif %}
             </li>
@@ -28,9 +28,9 @@
     </ul>
     <div class="form-actions">
         <input type="submit" class="btn btn-sm btn-secondary matomo-event"
-               value="{% trans "Submit" %}"
-               data-matomo-category="engagement"
-               data-matomo-action="vote"
-               data-matomo-option="poll"/>
+            value="{% trans "Submit" %}"
+            data-matomo-category="engagement"
+            data-matomo-action="vote"
+            data-matomo-option="poll"/>
     </div>
 </form>
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified.html b/lacommunaute/templates/forum_conversation/partials/post_certified.html
index df9bfe3ac..006490271 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified.html
@@ -6,7 +6,7 @@
 
 
 {% if post %}
-    <div class="card post my-3 bg-communaute-lighter border-communaute has-links-inside ml-3">
+    <div class="card post my-3 bg-communaute-lighter border-communaute has-links-inside ms-3">
         <div class="card-body">
             <div class="row">
                 <div class="col-12 post-content-wrapper">
@@ -22,13 +22,13 @@
                         {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                         {% if post.content.rendered|length > 200 %}
                             <a hx-get="{% url 'forum_conversation_extension:showmore_certified' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                               id="showmorecertified-button{{topic.pk}}"
-                               hx-target="#showmorecertifiedpostsarea{{topic.pk}}"
-                               hx-swap="outerHTML"
-                               class="btn btn-link p-0 mh-auto matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="showmore"
-                               data-matomo-option="certified"
+                                id="showmorecertified-button{{topic.pk}}"
+                                hx-target="#showmorecertifiedpostsarea{{topic.pk}}"
+                                hx-swap="outerHTML"
+                                class="btn btn-link p-0 mh-auto matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="showmore"
+                                data-matomo-option="certified"
                             >
                                 {% trans "+ show more" %}
                             </a>
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
index eae5989ff..25d6d1eda 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
@@ -2,17 +2,17 @@
     {% if not topic.is_certified or post.is_certified %}
         - <i class="ri-award-line small" aria-hidden="true"></i>
         <form hx-post="{%  url 'forum_conversation_extension:certify' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-              id="certifiedpost-button{{post.pk}}"
-              class="d-inline-block"
-              hx-target="#showmorepostsarea{{topic.pk}}"
-              hx-confirm="Êtes-vous sûr de vouloir {% if post.is_certified %}retirer la certification de{% else %}certifier{% endif %} cette réponse ?"
-              hx-swap="outerHTML">
+            id="certifiedpost-button{{post.pk}}"
+            class="d-inline-block"
+            hx-target="#showmorepostsarea{{topic.pk}}"
+            hx-confirm="Êtes-vous sûr de vouloir {% if post.is_certified %}retirer la certification de{% else %}certifier{% endif %} cette réponse ?"
+            hx-swap="outerHTML">
             <input type='hidden' name='post_pk' value="{{post.pk}}"/>
             <button type="submit"
-                    class="btn-poster small text-muted text-nowrap text-decoration-underline matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="certify"
-                    data-matomo-option="post"
+                class="btn-poster small text-muted text-nowrap text-decoration-underline matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="certify"
+                data-matomo-option="post"
             >
                 {% if post.is_certified %}
                     Retirer la certification
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified_badge.html b/lacommunaute/templates/forum_conversation/partials/post_certified_badge.html
index 6ac374346..27da02792 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified_badge.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified_badge.html
@@ -1,7 +1,7 @@
 {% load forum_member_tags %}
 
 {% if post.is_certified %}
-    <span class="badge badge-xs badge-pill bg-communaute text-white text-decoration-none">
+    <span class="badge badge-xs rounded-pill bg-communaute text-white text-decoration-none">
         Certifié par la Plateforme de l'Inclusion
     </span>
 {% endif %}
diff --git a/lacommunaute/templates/forum_conversation/partials/post_feed.html b/lacommunaute/templates/forum_conversation/partials/post_feed.html
index 0a22c4ab0..f3e6dc646 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_feed.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_feed.html
@@ -6,7 +6,7 @@
 
 {% get_permission 'can_download_files' topic.forum request.user as user_can_download_files %}
 
-<div class="card post my-3 bg-light has-links-inside ml-3">
+<div class="card post my-3 bg-light has-links-inside ms-3">
     <div class="card-body">
         <div class="row">
             <div class="col-12 post-content-wrapper">
diff --git a/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html b/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
index 10d7f4c68..4cee57843 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
@@ -5,17 +5,17 @@
 {% get_permission 'can_add_post' topic request.user as user_can_add_post %}
 {% if user_can_add_post %}
     <div class="collapse" id="collapsePost{{topic.pk}}">
-        <div class="card mb-3{% if inline %} ml-3{% endif %}">
+        <div class="card mb-3{% if inline %} ms-3{% endif %}">
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 post-content-wrapper">
                         <form hx-post="{% url 'forum_conversation_extension:post_create' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                              hx-target="#postinfeedarea{{topic.pk}}"
-                              hx-swap="outerHTML"
-                              class="majorpoints matomo-event"
-                              data-matomo-category="engagement"
-                              data-matomo-action="contribute"
-                              data-matomo-option="post">
+                            hx-target="#postinfeedarea{{topic.pk}}"
+                            hx-swap="outerHTML"
+                            class="majorpoints matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="contribute"
+                            data-matomo-option="post">
                             {% csrf_token %}
 
                             {% if post_form.non_field_errors %}
diff --git a/lacommunaute/templates/forum_conversation/partials/poster.html b/lacommunaute/templates/forum_conversation/partials/poster.html
index e15439cf2..93de925e1 100644
--- a/lacommunaute/templates/forum_conversation/partials/poster.html
+++ b/lacommunaute/templates/forum_conversation/partials/poster.html
@@ -14,10 +14,10 @@
             {% blocktrans trimmed with poster_url=poster_url poster=post.poster_display_name creation_date=post.created %}
                 By:
                 <a href="{{ poster_url }}"
-                   class="matomo-event"
-                   data-matomo-category="engagement"
-                   data-matomo-action="view"
-                   data-matomo-option="member">
+                    class="matomo-event"
+                    data-matomo-category="engagement"
+                    data-matomo-action="view"
+                    data-matomo-option="member">
                     {{ poster }}
                 </a>,
             {% endblocktrans %}
diff --git a/lacommunaute/templates/forum_conversation/partials/posts_list.html b/lacommunaute/templates/forum_conversation/partials/posts_list.html
index bb1082ab9..3abd1681c 100644
--- a/lacommunaute/templates/forum_conversation/partials/posts_list.html
+++ b/lacommunaute/templates/forum_conversation/partials/posts_list.html
@@ -8,8 +8,8 @@
 
 <div id="showmorepostsarea{{topic.pk}}">
     {% for post in posts %}
-        <div class="card post mb-3 {% if post.is_certified %}bg-communaute-lighter border-communaute {% else %}bg-light {% endif %} has-links-inside ml-3"
-             id="certifiedpostsarea{{post.pk}}">
+        <div class="card post mb-3 {% if post.is_certified %}bg-communaute-lighter border-communaute {% else %}bg-light {% endif %} has-links-inside ms-3"
+            id="certifiedpostsarea{{post.pk}}">
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 post-content-wrapper">
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
index ae587d1bc..b1521ba90 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
@@ -11,7 +11,7 @@
 
 
 {% if user_can_add_post %}
-    <a data-toggle="collapse" href="#collapsePost{{topic.pk}}" role="button" aria-expanded="false" aria-controls="collapsePost{{topic.pk}}" id="collapseButtonPost{{topic.pk}}" class="btn btn-primary btn-ico btn-sm btn-post-reply justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0">
+    <a data-toggle="collapse" href="#collapsePost{{topic.pk}}" role="button" aria-expanded="false" aria-controls="collapsePost{{topic.pk}}" id="collapseButtonPost{{topic.pk}}" class="btn btn-primary btn-ico btn-sm btn-post-reply justify-content-center w-100 w-sm-auto me-sm-1 mb-2 mb-sm-0">
         <i class="ri-question-answer-line" aria-hidden="true"></i>
         <span>{% trans "Post reply" %}</span>
     </a>
@@ -19,16 +19,16 @@
 
 {% if posts_count > 1 %}
     <a hx-get="{% url 'forum_conversation_extension:showmore_posts' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-       id="showmoreposts-button{{topic.pk}}"
-       hx-target="#showmorepostsarea{{topic.pk}}"
-       hx-swap="outerHTML"
-       class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0"
-       data-matomo-category="engagement"
-       data-matomo-action="showmore"
-       data-matomo-option="post"
-       onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
-       aria-label="{% trans "Show me the comment" %}"
-       role="button"
+        id="showmoreposts-button{{topic.pk}}"
+        hx-target="#showmorepostsarea{{topic.pk}}"
+        hx-swap="outerHTML"
+        class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto me-sm-1 mb-2 mb-sm-0"
+        data-matomo-category="engagement"
+        data-matomo-action="showmore"
+        data-matomo-option="post"
+        onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
+        aria-label="{% trans "Show me the comment" %}"
+        role="button"
     >
         <i class="ri-eye-line font-weight-normal" aria-hidden="true"></i>
         <span>
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_filter.html b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
index d6635a12e..6e5c618eb 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_filter.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
@@ -13,18 +13,18 @@
                     <button type="button" class="btn btn-sm btn-link dropdown-toggle p-0" data-toggle="dropdown" aria-haspopup="true" aria-controls="filterTopicsDropdown" aria-expanded="false">
                         {{ active_filter_name }}
                     </button>
-                    <div class="dropdown-menu dropdown-menu-right" id="filterTopicsDropdown">
+                    <div class="dropdown-menu dropdown-menu-end" id="filterTopicsDropdown">
                         <ul class="list-unstyled">
                             {% for filter in filters %}
                                 <li>
                                     <button id="filtertopics-button"
-                                            hx-target="#topicsarea"
-                                            hx-swap="outerHTML"
-                                            hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}"
-                                            class="dropdown-item matomo-event"
-                                            data-matomo-category="engagement"
-                                            data-matomo-action="filter"
-                                            data-matomo-option="topics">
+                                        hx-target="#topicsarea"
+                                        hx-swap="outerHTML"
+                                        hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}"
+                                        class="dropdown-item matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="filter"
+                                        data-matomo-option="topics">
                                         {{ filter.1 }}
                                     </button>
                                 </li>
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_form.html b/lacommunaute/templates/forum_conversation/partials/topic_form.html
index 199ca2b3c..fd5417e60 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_form.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_form.html
@@ -34,9 +34,9 @@
                     {% if post_form.lock_topic %}
                         <div class="form-group">
                             {% with field=post_form.lock_topic %}
-                                <div class="custom-control custom-checkbox mt-2">
-                                    {{ field | add_class:'custom-control-input' }}
-                                    <label class="custom-control-label" for="{{ field.auto_id }}">{{ field.label }}</label>
+                                <div class="form-check mt-2">
+                                    {{ field | add_class:'form-check-input' }}
+                                    <label class="form-check-label" for="{{ field.auto_id }}">{{ field.label }}</label>
                                 </div>
                             {% endwith %}
                         </div>
@@ -60,16 +60,16 @@
                         {% include "partials/form_field.html" with field=post_form.poll_max_options %}
                         {% include "partials/form_field.html" with field=post_form.poll_duration %}
                         <div class="form-group{% if post_form.poll_user_changes.errors %} has-error{% endif %}">
-                            <div class="custom-control custom-checkbox mt-3">
-                                {{ post_form.poll_user_changes | add_class:'custom-control-input' }}
-                                <label class="custom-control-label" for="{{ post_form.poll_user_changes.auto_id }}">{{ post_form.poll_user_changes.label }}</label>
+                            <div class="form-check mt-3">
+                                {{ post_form.poll_user_changes | add_class:'form-check-input' }}
+                                <label class="form-check-label" for="{{ post_form.poll_user_changes.auto_id }}">{{ post_form.poll_user_changes.label }}</label>
                             </div>
                         </div>
                         {% if post_form.poll_hide_results %}
                             <div class="form-group{% if post_form.poll_hide_results.errors %} has-error{% endif %}">
-                                <div class="custom-control custom-checkbox mt-3">
-                                    {{ post_form.poll_hide_results | add_class:'custom-control-input' }}
-                                    <label class="custom-control-label" for="{{ post_form.poll_hide_results.auto_id }}">{{ post_form.poll_hide_results.label }}</label>
+                                <div class="form-check mt-3">
+                                    {{ post_form.poll_hide_results | add_class:'form-check-input' }}
+                                    <label class="form-check-label" for="{{ post_form.poll_hide_results.auto_id }}">{{ post_form.poll_hide_results.label }}</label>
                                 </div>
                             </div>
                         {% endif %}
@@ -94,9 +94,9 @@
     <div class="form-actions form-row">
         <div class="form-group col-auto">
             <input type="submit" class="btn btn-primary matomo-event" value="{% trans "Submit" %}"
-                   data-matomo-category="engagement"
-                   data-matomo-action="contribute"
-                   data-matomo-option="submit_topic" />
+                data-matomo-category="engagement"
+                data-matomo-action="contribute"
+                data-matomo-option="submit_topic" />
         </div>
         {% if post %}
             {% get_permission 'can_delete_post' post request.user as user_can_delete_post %}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_likes.html b/lacommunaute/templates/forum_conversation/partials/topic_likes.html
index c7a990671..e331d4bce 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_likes.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_likes.html
@@ -5,18 +5,18 @@
     {% with topic.likes as counter %}
         {% if user.is_authenticated %}
             <button hx-post="{% url 'forum_conversation_extension:like_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}" id="like-button{{topic.pk}}"
-                    hx-target="#likesarea{{topic.pk}}"
-                    hx-swap="outerHTML"
-                    class="btn btn-ico btn-link btn-like px-0 text-nowrap matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="like"
-                    data-matomo-option="topic"
+                hx-target="#likesarea{{topic.pk}}"
+                hx-swap="outerHTML"
+                class="btn btn-ico btn-link btn-like px-0 text-nowrap matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="like"
+                data-matomo-option="topic"
             >
-                <i class="{% if topic.has_liked %}ri-heart-3-fill{% else %}ri-heart-3-line{% endif %} mr-1" aria-hidden="true"></i><span>{{counter}}</span>
+                <i class="{% if topic.has_liked %}ri-heart-3-fill{% else %}ri-heart-3-line{% endif %} me-1" aria-hidden="true"></i><span>{{counter}}</span>
             </button>
         {% else %}
-            <a href="{% inclusion_connect_url next_url topic.pk %}" rel="nofollow" class="btn btn-ico btn-link btn-like pr-0 text-nowrap" data-toggle="tooltip" data-placement="top" title="Connectez-vous pour contribuer">
-                <i class="ri-heart-3-line mr-1" aria-hidden="true"></i><span>{{counter}}</span>
+            <a href="{% inclusion_connect_url next_url topic.pk %}" rel="nofollow" class="btn btn-ico btn-link btn-like pe-0 text-nowrap" data-toggle="tooltip" data-placement="top" title="Connectez-vous pour contribuer">
+                <i class="ri-heart-3-line me-1" aria-hidden="true"></i><span>{{counter}}</span>
             </a>
         {% endif %}
     {% endwith %}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_tags.html b/lacommunaute/templates/forum_conversation/partials/topic_tags.html
index 547aad54b..917b113c1 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_tags.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_tags.html
@@ -1,3 +1,3 @@
 {% for tag in tags %}
-    <span class="badge badge-xs badge-pill badge-info-lighter text-info">{{ tag }}</span>
+    <span class="badge badge-xs rounded-pill bg-info-lighter text-info">{{ tag }}</span>
 {% endfor %}
diff --git a/lacommunaute/templates/forum_conversation/topic_list.html b/lacommunaute/templates/forum_conversation/topic_list.html
index e60c4979c..98efdc340 100644
--- a/lacommunaute/templates/forum_conversation/topic_list.html
+++ b/lacommunaute/templates/forum_conversation/topic_list.html
@@ -32,10 +32,10 @@
                                     <i class="{% if topic.is_sticky %}ri-lightbulb-flash-line{% elif topic.is_announce %}ri-information-line{% else %}ri-record-circle-line{% endif %} ri-xl aria-hidden="true""></i>
                                 </span>
                                 <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                   class="matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="view"
-                                   data-matomo-option="topic">
+                                    class="matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="view"
+                                    data-matomo-option="topic">
                                     {{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
                                 </a>
                             </p>
@@ -56,13 +56,13 @@
                                         {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                                         {% if topic.first_post.content.rendered|length > 200 %}
                                             <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                               id="showmoretopic-button{{topic.pk}}"
-                                               hx-target="#showmoretopicsarea{{topic.pk}}"
-                                               hx-swap="outerHTML"
-                                               class="btn btn-link p-0 mh-auto matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="showmore"
-                                               data-matomo-option="topic"
+                                                id="showmoretopic-button{{topic.pk}}"
+                                                hx-target="#showmoretopicsarea{{topic.pk}}"
+                                                hx-swap="outerHTML"
+                                                class="btn btn-link p-0 mh-auto matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="showmore"
+                                                data-matomo-option="topic"
                                             >
                                                 {% trans "+ show more" %}
                                             </a>
@@ -108,7 +108,7 @@
             </div>
         {% empty %}
             <div class="row m-0 p-3">
-                <div class="col-12 pl-0">
+                <div class="col-12 ps-0">
                     {% if empty_message %}
                         {{ empty_message }}
                     {% else %}
@@ -121,13 +121,13 @@
             <div id="loadmoretopicsarea{{ loadmoretopic_suffix }}" class="row mx-3 mt-md-5 justify-content-center">
                 <div class="col-12 col-md-auto">
                     <a hx-get="{% url_add_query loadmoretopic_url page=page_obj.next_page_number %}"
-                       id="loadmoretopics-button"
-                       hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
-                       hx-swap="outerHTML"
-                       class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="loadmore"
-                       data-matomo-option="topic">
+                        id="loadmoretopics-button"
+                        hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
+                        hx-swap="outerHTML"
+                        class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="loadmore"
+                        data-matomo-option="topic">
                         <i class="ri-loop-right-line" aria-hidden="true"></i>
                         <span>{% trans "load more topics" %}</span>
                     </a>
diff --git a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
index 291e9beba..b2fed9e60 100644
--- a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
+++ b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
@@ -20,14 +20,14 @@
                     <div id="{{ topic.pk }}" class="card post mb-3">
                         <div class="card-header mb-1 d-flex align-items-center">
                             <div class="topic-thumbnail bg-light d-none d-md-block">
-                                <i class="ri-newspaper-line ri-xl mr-1" aria-hidden="true"></i>
+                                <i class="ri-newspaper-line ri-xl me-1" aria-hidden="true"></i>
                             </div>
                             <p class="h4 mb-0 flex-grow-1">
                                 <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                   class="matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="view"
-                                   data-matomo-option="news">
+                                    class="matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="view"
+                                    data-matomo-option="news">
                                     {{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
                                 </a>
                             </p>
@@ -45,13 +45,13 @@
                                         {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                                         {% if topic.first_post.content.rendered|length > 200 %}
                                             <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                               id="showmoretopic-button{{topic.pk}}"
-                                               hx-target="#showmoretopicsarea{{topic.pk}}"
-                                               hx-swap="outerHTML"
-                                               class="btn btn-link p-0 mh-auto matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="showmore"
-                                               data-matomo-option="news"
+                                                id="showmoretopic-button{{topic.pk}}"
+                                                hx-target="#showmoretopicsarea{{topic.pk}}"
+                                                hx-swap="outerHTML"
+                                                class="btn btn-link p-0 mh-auto matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="showmore"
+                                                data-matomo-option="news"
                                             >
                                                 {% trans "+ show more" %}
                                             </a>
@@ -71,7 +71,7 @@
             </div>
         {% empty %}
             <div class="row m-0 p-3">
-                <div class="col-12 pl-0">
+                <div class="col-12 ps-0">
                     {% if empty_message %}
                         {{ empty_message }}
                     {% else %}
@@ -84,13 +84,13 @@
             <div id="loadmoretopicsarea{{ loadmoretopic_suffix }}" class="row mx-3 mt-md-5 justify-content-center">
                 <div class="col-12 col-md-auto">
                     <a hx-get="{% url_add_query loadmoretopic_url page=page_obj.next_page_number %}"
-                       id="loadmoretopics-button"
-                       hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
-                       hx-swap="outerHTML"
-                       class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="loadmore"
-                       data-matomo-option="topic">
+                        id="loadmoretopics-button"
+                        hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
+                        hx-swap="outerHTML"
+                        class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="loadmore"
+                        data-matomo-option="topic">
                         <i class="ri-loop-right-line" aria-hidden="true"></i>
                         <span>{% trans "load more topics" %}</span>
                     </a>
diff --git a/lacommunaute/templates/forum_member/forum_profile_detail.html b/lacommunaute/templates/forum_member/forum_profile_detail.html
index bd9ae5196..373045d0f 100644
--- a/lacommunaute/templates/forum_member/forum_profile_detail.html
+++ b/lacommunaute/templates/forum_member/forum_profile_detail.html
@@ -39,10 +39,10 @@ <h3 class="my-3 text-center text-muted">{{ profile.user|forum_member_display_nam
                                     <div class="col-12 post-content-wrapper">
                                         <div class="post-title">
                                             <a href="{% url 'forum_conversation:topic' post.topic.forum.slug post.topic.forum.pk post.topic.slug post.topic.pk %}?post={{ post.pk }}#{{ post.pk }}"
-                                               class="matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="view"
-                                               data-matomo-option="topic">
+                                                class="matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="view"
+                                                data-matomo-option="topic">
                                                 {{ post.topic.subject }}
                                             </a>
                                         </div>
diff --git a/lacommunaute/templates/forum_member/join_forum_landing.html b/lacommunaute/templates/forum_member/join_forum_landing.html
index 09bfa0914..4f174a1d8 100644
--- a/lacommunaute/templates/forum_member/join_forum_landing.html
+++ b/lacommunaute/templates/forum_member/join_forum_landing.html
@@ -28,7 +28,7 @@ <h3 class="h3 mb-0">J'ai un compte Inclusion Connect</h3>
                         <div class="card-body">
                             <p>Si vous avez déjà utilisé un service à destination des professionnels de l'inclusion, vous avez probablement déjà un compte Inclusion Connect.</p>
                         </div>
-                        <div class="card-footer text-right">
+                        <div class="card-footer text-end">
                             <a href="{{ inclusion_connect_url }}" rel="nofollow" class="btn btn-ico btn-outline-primary stretched-link">
                                 <i class="ri-login-box-line ri-lg"></i>
                                 <span>{% trans "Login" %}</span>
@@ -44,7 +44,7 @@ <h3 class="h3 mb-0">Je n'ai pas de compte Inclusion Connect</h3>
                         <div class="card-body">
                             <p>Si vous n'avez pas encore de compte, vous pouvez le créer maintenant et l'utiliser sur tous les services proposant Inclusion Connect.</p>
                         </div>
-                        <div class="card-footer text-right">
+                        <div class="card-footer text-end">
                             <a href="{{ inclusion_connect_url }}&sign_in=1" rel="nofollow" class="btn btn-ico btn-outline-primary stretched-link">
                                 <i class="ri-login-box-line ri-lg"></i>
                                 <span>{% trans "Sign in" %}</span>
diff --git a/lacommunaute/templates/forum_member/moderator_profiles.html b/lacommunaute/templates/forum_member/moderator_profiles.html
index 3f531144e..a43d94d96 100644
--- a/lacommunaute/templates/forum_member/moderator_profiles.html
+++ b/lacommunaute/templates/forum_member/moderator_profiles.html
@@ -26,10 +26,10 @@ <h2 class="h2">{{paginator.count}} membre{{ paginator.count|pluralizefr }}</h2>
                                 <div class="card-body">
                                     <h3 class="h5 card-title">
                                         <a href="{%url 'members:profile' username=forum_profile.user.username%}"
-                                           class="matomo-event"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="member">
+                                            class="matomo-event"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="member">
                                             {{ forum_profile.user.get_full_name }}
                                         </a>
                                     </h3>
diff --git a/lacommunaute/templates/forum_member/profiles.html b/lacommunaute/templates/forum_member/profiles.html
index 087a2431f..06612c855 100644
--- a/lacommunaute/templates/forum_member/profiles.html
+++ b/lacommunaute/templates/forum_member/profiles.html
@@ -27,10 +27,10 @@ <h2 class="h2">Liste des membres de la communauté.</h2>
                                 <div class="card-body">
                                     <h3 class="h5 card-title">
                                         <a href="{%url 'members:profile' username=forum_profile.user.username%}"
-                                           class="matomo-event"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="member">
+                                            class="matomo-event"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="member">
                                             {{ forum_profile.user.get_full_name }}
                                         </a>
                                     </h3>
diff --git a/lacommunaute/templates/forum_search/search.html b/lacommunaute/templates/forum_search/search.html
index 36e18d6d5..56cef09f0 100644
--- a/lacommunaute/templates/forum_search/search.html
+++ b/lacommunaute/templates/forum_search/search.html
@@ -43,10 +43,10 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_conversation:topic' result.forum_slug result.forum result.topic_slug result.topic %}"
-                                                               class="btn-link stretched-link btn-ico matomo-event"
-                                                               data-matomo-category="engagement"
-                                                               data-matomo-action="view"
-                                                               data-matomo-option="topic"
+                                                                class="btn-link stretched-link btn-ico matomo-event"
+                                                                data-matomo-category="engagement"
+                                                                data-matomo-action="view"
+                                                                data-matomo-option="topic"
                                                             >
                                                                 <i class="ri-user-line ri-lg" aria-hidden="true"></i>
                                                                 <span>{{ result.topic_subject }}</span>
@@ -68,10 +68,10 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_extension:forum' result.forum_slug result.forum %}"
-                                                               class="btn-link btn-ico stretched-link matomo-event"
-                                                               data-matomo-category="engagement"
-                                                               data-matomo-action="view"
-                                                               data-matomo-option="forum"
+                                                                class="btn-link btn-ico stretched-link matomo-event"
+                                                                data-matomo-category="engagement"
+                                                                data-matomo-action="view"
+                                                                data-matomo-option="forum"
                                                             >
                                                                 <i class="ri-article-line" aria-hidden="true"></i>
                                                                 <span>{{ result.forum_name }}</span>
diff --git a/lacommunaute/templates/forum_search/search_form.html b/lacommunaute/templates/forum_search/search_form.html
index 7ae53b764..bdf89b958 100644
--- a/lacommunaute/templates/forum_search/search_form.html
+++ b/lacommunaute/templates/forum_search/search_form.html
@@ -7,10 +7,10 @@
         </div>
         <div class="col-auto mb-3">
             <button type="submit"
-                    class="btn btn-primary btn-ico matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="search"
-                    data-matomo-option="submit_query"
+                class="btn btn-primary btn-ico matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="submit_query"
             >
                 <i class="ri-search-line"></i>
                 <span>{% trans "Search" %}</span>
diff --git a/lacommunaute/templates/forum_upvote/upvote_list.html b/lacommunaute/templates/forum_upvote/upvote_list.html
index f23926a8f..5bba79874 100644
--- a/lacommunaute/templates/forum_upvote/upvote_list.html
+++ b/lacommunaute/templates/forum_upvote/upvote_list.html
@@ -31,10 +31,10 @@ <h1>{% trans "My UpVotes" %}</h1>
                                                 <td class="position-relative">
                                                     {% if upvote.content_type.model == 'forum' %}
                                                         <a href="{% url 'forum_extension:forum' upvote.content_object.slug upvote.content_object.pk %}"
-                                                           class="btn-link btn-ico stretched-link matomo-event"
-                                                           data-matomo-category="engagement"
-                                                           data-matomo-action="view"
-                                                           data-matomo-option="upvoted-forum"
+                                                            class="btn-link btn-ico stretched-link matomo-event"
+                                                            data-matomo-category="engagement"
+                                                            data-matomo-action="view"
+                                                            data-matomo-option="upvoted-forum"
                                                         >
                                                             <i class="ri-article-line" aria-hidden="true"></i>
                                                             <span>{{ upvote.content_object.name }}</span>
@@ -50,10 +50,10 @@ <h1>{% trans "My UpVotes" %}</h1>
                                                         </div>
                                                     {% elif upvote.content_type.model == 'post' %}
                                                         <a href="{% url 'forum_conversation:topic' upvote.content_object.topic.forum.slug upvote.content_object.topic.forum.pk upvote.content_object.topic.slug upvote.content_object.topic.pk %}"
-                                                           class="btn-link stretched-link btn-ico matomo-event"
-                                                           data-matomo-category="engagement"
-                                                           data-matomo-action="view"
-                                                           data-matomo-option="upvoted-topic"
+                                                            class="btn-link stretched-link btn-ico matomo-event"
+                                                            data-matomo-category="engagement"
+                                                            data-matomo-action="view"
+                                                            data-matomo-option="upvoted-topic"
                                                         >
                                                             <i class="ri-user-line ri-lg" aria-hidden="true"></i>
                                                             <span>{{ upvote.content_object.topic.subject }}</span>
diff --git a/lacommunaute/templates/pages/contact.html b/lacommunaute/templates/pages/contact.html
index c068b1d95..be5912e28 100644
--- a/lacommunaute/templates/pages/contact.html
+++ b/lacommunaute/templates/pages/contact.html
@@ -10,13 +10,13 @@
                 <div class="s-title-01__col col-12">
                     <h1 class="s-title-01__title h1"><strong>Contact</strong></h1>
                     <iframe data-tally-src="https://tally.so/embed/n0VN1P?alignLeft=1&hideTitle=1&transparentBackground=1&dynamicHeight=1"
-                            loading="lazy"
-                            width="100%"
-                            height="310"
-                            frameborder="0"
-                            marginheight="0"
-                            marginwidth="0"
-                            title="Contact form">
+                        loading="lazy"
+                        width="100%"
+                        height="310"
+                        frameborder="0"
+                        marginheight="0"
+                        marginwidth="0"
+                        title="Contact form">
                     </iframe>
                     <script>var d=document,w="https://tally.so/widgets/embed.js",v=function(){"undefined"!=typeof Tally?Tally.loadEmbeds():d.querySelectorAll("iframe[data-tally-src]:not([src])").forEach((function(e){e.src=e.dataset.tallySrc}))};if("undefined"!=typeof Tally)v();else if(d.querySelector('script[src="'+w+'"]')==null){var s=d.createElement("script");s.src=w,s.onload=v,s.onerror=v,d.body.appendChild(s);}</script>
                 </div>
diff --git a/lacommunaute/templates/pages/home.html b/lacommunaute/templates/pages/home.html
index a39fb831e..aa2bb8ffe 100644
--- a/lacommunaute/templates/pages/home.html
+++ b/lacommunaute/templates/pages/home.html
@@ -25,15 +25,15 @@ <h2 class="h1 mb-3 mb-lg-5">Améliorez votre pratique professionnelle d’accomp
                     <ul class="lead list-unstyled mb-md-5">
                         <li class="d-flex mb-2">
                             <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
-                            <span class="ml-2">Posez vos questions et répondre aux autres professionnels</span>
+                            <span class="ms-2">Posez vos questions et répondre aux autres professionnels</span>
                         </li>
                         <li class="d-flex mb-2">
                             <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
-                            <span class="ml-2">Retrouvez les dernières actus et infos pour sa veille informelle</span>
+                            <span class="ms-2">Retrouvez les dernières actus et infos pour sa veille informelle</span>
                         </li>
                         <li class="d-flex mb-2">
                             <i class="text-success ri-checkbox-circle-fill ri-xxl"></i>
-                            <span class="ml-2">Progressez grâce à des ressources exclusives</span>
+                            <span class="ms-2">Progressez grâce à des ressources exclusives</span>
                         </li>
                     </ul>
                     {% include "partials/ask_a_question.html" %}
@@ -64,10 +64,10 @@ <h3 class="m-0">
                                 {% for topic in topics_public %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="topic">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="topic">
                                             {{ topic.subject }}
                                         </a>
                                     </li>
@@ -89,10 +89,10 @@ <h3 class="m-0">
                                 {% for forum in forums_category %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_extension:forum' forum.slug forum.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="forum">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="forum">
                                             [{{ forum.parent.name }}] {{ forum.name }}
                                         </a>
                                     </li>
@@ -114,10 +114,10 @@ <h3 class="m-0">
                                 {% for topic in topics_newsfeed %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="news">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="news">
                                             {{ topic.subject }}
                                         </a>
                                     </li>
diff --git a/lacommunaute/templates/partials/ask_a_question.html b/lacommunaute/templates/partials/ask_a_question.html
index 8293e82ec..5f0acfab1 100644
--- a/lacommunaute/templates/partials/ask_a_question.html
+++ b/lacommunaute/templates/partials/ask_a_question.html
@@ -4,11 +4,11 @@
     <div class="row align-items-center">
         <div class="col-12 col-md-auto">
             <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-               rel="nofollow"
-               class="btn btn-primary btn-ico btn-block matomo-event"
-               data-matomo-category="engagement"
-               data-matomo-action="contribute"
-               data-matomo-option="new_topic">
+                rel="nofollow"
+                class="btn btn-primary btn-ico btn-block matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="contribute"
+                data-matomo-option="new_topic">
                 <i class="ri-chat-new-line ri-lg"></i>
                 <span>{% trans "New topic" %}</span>
             </a>
@@ -18,10 +18,10 @@
         </div>
         <div class="col-12 col-md-auto">
             <a href="{% url 'forum_search_extension:search' %}"
-               class="btn btn-outline-primary btn-ico btn-block matomo-event"
-               data-matomo-category="engagement"
-               data-matomo-action="search"
-               data-matomo-option="query">
+                class="btn btn-outline-primary btn-ico btn-block matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="query">
                 <i class="ri-search-line ri-lg"></i>
                 <span>{% trans "Search forums" %}</span>
             </a>
diff --git a/lacommunaute/templates/partials/banner.html b/lacommunaute/templates/partials/banner.html
index 56baeeebf..a928b89fa 100644
--- a/lacommunaute/templates/partials/banner.html
+++ b/lacommunaute/templates/partials/banner.html
@@ -2,13 +2,13 @@
     <p class="mb-0">
         Une difficulté avec le site des emplois ? Une question à propos d'un Pass IAE ? Posez votre question sur la page du
         <a href="https://aide.emplois.inclusion.beta.gouv.fr/hc/fr"
-           class="font-weight-bold matomo-event"
-           data-matomo-category="support"
-           data-matomo-action="site_emplois"
-           data-matomo-option="banner"
-           aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)">
+            class="font-weight-bold matomo-event"
+            data-matomo-category="support"
+            data-matomo-action="site_emplois"
+            data-matomo-option="banner"
+            aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)">
             support des emplois de l'inclusion
         </a>
-        <i class="ri-external-link-line ml-2 font-weight-bold" aria-hidden="true"></i> !
+        <i class="ri-external-link-line ms-2 font-weight-bold" aria-hidden="true"></i> !
     </p>
 </div>
diff --git a/lacommunaute/templates/partials/footer.html b/lacommunaute/templates/partials/footer.html
index b676228af..f778250d6 100644
--- a/lacommunaute/templates/partials/footer.html
+++ b/lacommunaute/templates/partials/footer.html
@@ -43,23 +43,23 @@
                     <ul>
                         <li>
                             <a href="/glossaire/"
-                               target="_blank"
-                               aria-label="glossaire des mots de l'inclusion"
-                               class="matomo-event"
-                               data-matomo-category="landing"
-                               data-matomo-action="glossaire"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="glossaire des mots de l'inclusion"
+                                class="matomo-event"
+                                data-matomo-category="landing"
+                                data-matomo-action="glossaire"
+                                data-matomo-option="footer">
                                 Glossaire de l'inclusion
                             </a>
                         </li>
                         <li>
                             <a href="https://documentation.inclusion.beta.gouv.fr/aide/emplois/"
-                               target="_blank"
-                               aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
-                               class="matomo-event"
-                               data-matomo-category="support"
-                               data-matomo-action="site_emplois"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
+                                class="matomo-event"
+                                data-matomo-category="support"
+                                data-matomo-action="site_emplois"
+                                data-matomo-option="footer">
                                 Support des emplois de l'inclusion
                             </a>
                         </li>
diff --git a/lacommunaute/templates/partials/form_field.html b/lacommunaute/templates/partials/form_field.html
index 96d87a6eb..3af6fc978 100644
--- a/lacommunaute/templates/partials/form_field.html
+++ b/lacommunaute/templates/partials/form_field.html
@@ -5,9 +5,9 @@
     {% if field.label %}<label class="control-label" for="{{ field.auto_id }}">{{ field.label }}{% if not field.field.required %} <span class="text-muted">{% trans "(optional)" %}</span>{% endif %}</label>{% endif %}
     {% if field|widget_type == "checkboxselectmultiple" %}
         {% for checkbox in field %}
-            <div class="custom-control custom-checkbox custom-control-inline">
-                <input id="{{ checkbox.id_for_label }}" class="custom-control-input" type="checkbox" name="{{ checkbox.data.name }}" value="{{ checkbox.data.value }}"{% if checkbox.data.selected %} checked=""{% endif %}>
-                <label class="custom-control-label badge badge-sm badge-pill badge-info-lighter text-info" for="{{ checkbox.id_for_label }}">
+            <div class="form-check form-check-inline">
+                <input id="{{ checkbox.id_for_label }}" class="form-check-input" type="checkbox" name="{{ checkbox.data.name }}" value="{{ checkbox.data.value }}"{% if checkbox.data.selected %} checked=""{% endif %}>
+                <label class="form-check-label badge badge-sm rounded-pill bg-info-lighter text-info" for="{{ checkbox.id_for_label }}">
                     {{ checkbox.choice_label }}
                 </label>
             </div>
diff --git a/lacommunaute/templates/partials/form_field_mentions.html b/lacommunaute/templates/partials/form_field_mentions.html
index adf6fa695..359d9b0de 100644
--- a/lacommunaute/templates/partials/form_field_mentions.html
+++ b/lacommunaute/templates/partials/form_field_mentions.html
@@ -1,9 +1,9 @@
 <small class="form-text text-muted">
     <a data-toggle="collapse"
-       href="#collapseMentionsHelp"
-       role="button"
-       aria-expanded="false"
-       aria-controls="collapseMentionsHelp">
+        href="#collapseMentionsHelp"
+        role="button"
+        aria-expanded="false"
+        aria-controls="collapseMentionsHelp">
         mention d'informations
     </a>
     sur les champs libres
diff --git a/lacommunaute/templates/partials/header_nav_primary_items.html b/lacommunaute/templates/partials/header_nav_primary_items.html
index 69e0ce9b0..c82e360ef 100644
--- a/lacommunaute/templates/partials/header_nav_primary_items.html
+++ b/lacommunaute/templates/partials/header_nav_primary_items.html
@@ -3,15 +3,15 @@
 {% load theme_inclusion %}
 <ul>
     <li>
-        <form class="mb-3 mb-xl-0 mr-xl-2" action="{% url 'forum_search_extension:search' %}">
+        <form class="mb-3 mb-xl-0 me-xl-2" action="{% url 'forum_search_extension:search' %}">
             <div class="input-group input-group-rounded-pill">
                 <input class="form-control" type="search" placeholder="{% trans "Search" %}" aria-label="{% trans "Search" %}" name="q">
                 <div class="input-group-append">
                     <button type="submit"
-                            class="btn btn-link btn-ico matomo-event"
-                            data-matomo-category="engagement"
-                            data-matomo-action="search"
-                            data-matomo-option="submit_query_header"
+                        class="btn btn-link btn-ico matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="search"
+                        data-matomo-option="submit_query_header"
                     >
                         <i class="ri-search-line font-weight-bold" aria-label="{% trans "Search" %}"></i>
                     </button>
@@ -29,7 +29,7 @@
                     <li>
                         <div class="dropdown-item">
                             <div class="media align-items-center">
-                                <span class="mr-2"><i class="ri-user-line ri-2x"></i></span>
+                                <span class="me-2"><i class="ri-user-line ri-2x"></i></span>
                                 <div class="media-body">
                                     {% if user.get_username %}
                                         <span>{{ user|forum_member_display_name }}</span>
@@ -45,37 +45,37 @@
                     </li>
                     <li>
                         <a href="{% url 'members:profile' user.username %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="member">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="member">
                             Accéder à mon profil
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'forum_upvote:mine' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="upvotes">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="upvotes">
                             Accéder à mes sauvegardes
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'event:myevents' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="event">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="event">
                             Accéder à mes évènements
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'forum_extension:index' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forums">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forums">
                             Accéder à mes thématiques
                         </a>
                     </li>
diff --git a/lacommunaute/templates/partials/messages.html b/lacommunaute/templates/partials/messages.html
index e6bc4c1eb..0664bad65 100644
--- a/lacommunaute/templates/partials/messages.html
+++ b/lacommunaute/templates/partials/messages.html
@@ -2,9 +2,7 @@
     {% if messages %}
         {% for message in messages %}
             <div class="alert alert-{{ message.tags }} {% if 'error' in message.tags %}alert-danger{% endif %} alert-dismissible fade show mt-3" role="status">
-                <button type="button" class="close" data-dismiss="alert" aria-label="Fermer">
-                    <i class="ri-close-line"></i>
-                </button>
+                <button type="button" class="btn-close" data-dismiss="alert" aria-label="Fermer"></button>
                 {{ message | safe }}
             </div>
         {% endfor %}
diff --git a/lacommunaute/templates/partials/social_share_buttons.html b/lacommunaute/templates/partials/social_share_buttons.html
index 643023164..ec6b980ce 100644
--- a/lacommunaute/templates/partials/social_share_buttons.html
+++ b/lacommunaute/templates/partials/social_share_buttons.html
@@ -4,7 +4,7 @@
 <button class="btn btn-sm btn-ico-only btn-secondary" type="button" id="dropdownMenuSocialShare" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
     <i class="ri-share-fill ri-lg" aria-label="{% trans "Share this topics on " %}"></i>
 </button>
-<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuSocialShare">
+<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dropdownMenuSocialShare">
     {% post_to_facebook instance '<i class="ri-facebook-fill ri-lg"></i> Partager sur Facebook' %}
     {% post_to_whatsapp instance '<i class="ri-whatsapp-line ri-lg"></i> Partager sur Whatsapp' %}
     {% post_to_twitter text instance '<i class="ri-twitter-line ri-lg"></i> Partager sur Twitter' %}
diff --git a/lacommunaute/templates/partials/upvotes.html b/lacommunaute/templates/partials/upvotes.html
index 1a9ef81f6..13a099c4c 100644
--- a/lacommunaute/templates/partials/upvotes.html
+++ b/lacommunaute/templates/partials/upvotes.html
@@ -5,23 +5,23 @@
     {% with obj.upvotes_count as counter %}
         {% if user.is_authenticated %}
             <form hx-post="{% if kind == 'post' %}{% url 'forum_upvote:post' %}{% elif kind == 'forum' %}{% url 'forum_upvote:forum' %}{% endif %}"
-                  id="upvote-button{{obj.pk}}"
-                  hx-target="#upvotesarea{{obj.pk}}"
-                  hx-swap="outerHTML">
+                id="upvote-button{{obj.pk}}"
+                hx-target="#upvotesarea{{obj.pk}}"
+                hx-swap="outerHTML">
                 <input type='hidden' name='pk' value="{{obj.pk}}"/>
                 <button type="submit"
-                        title="{% trans "UpVotes" %}"
-                        class="btn btn-sm btn-ico btn-secondary matomo-event px-2"
-                        data-matomo-category="engagement"
-                        data-matomo-action="upvote"
-                        data-matomo-option="post"
+                    title="{% trans "UpVotes" %}"
+                    class="btn btn-sm btn-ico btn-secondary matomo-event px-2"
+                    data-matomo-category="engagement"
+                    data-matomo-action="upvote"
+                    data-matomo-option="post"
                 >
-                    <i class="{% if obj.has_upvoted %}ri-bookmark-fill{% else %}ri-bookmark-line{% endif %} mr-1" aria-hidden="true"></i><span>{{counter}}</span>
+                    <i class="{% if obj.has_upvoted %}ri-bookmark-fill{% else %}ri-bookmark-line{% endif %} me-1" aria-hidden="true"></i><span>{{counter}}</span>
                 </button>
             </form>
         {% else %}
             <a href="{% inclusion_connect_url next_url obj.id %}" rel="nofollow" class="btn btn-sm btn-ico-only btn-link btn-secondary" data-toggle="tooltip" data-placement="top" title="Connectez-vous pour sauvegarder">
-                <i class="{% if obj.has_upvoted %}ri-bookmark-fill{% else %}ri-bookmark-line{% endif %} mr-1" aria-hidden="true"></i><span>{{counter}}</span>
+                <i class="{% if obj.has_upvoted %}ri-bookmark-fill{% else %}ri-bookmark-line{% endif %} me-1" aria-hidden="true"></i><span>{{counter}}</span>
             </a>
         {% endif %}
     {% endwith %}