From 6207c4ec946f2f665f3655de668acd2846e18658 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Fri, 10 Jan 2025 17:39:28 +0530
Subject: [PATCH] Add rustywind as pre-commit hook to sort tailwindcss classes

If there is a merge conflict in your pr run `make fmt` first
---
 .pre-commit-config.yaml                       | 16 ++-
 .../activity/include/comment_form.html        |  6 +-
 .../activity/include/comment_list.html        |  4 +-
 .../templates/activity/notifications.html     |  6 +-
 .../activity/partial_comment_message.html     | 10 +-
 .../activity/ui/activity-action-item.html     | 10 +-
 .../activity/ui/activity-comment-item.html    | 20 ++--
 .../activity/ui/edit_comment_form.html        |  4 +-
 .../dashboard/applicant_dashboard.html        | 44 ++++-----
 .../dashboard/community_dashboard.html        | 22 ++---
 .../dashboard/finance_dashboard.html          |  8 +-
 .../templates/dashboard/includes/flagged.html |  2 +-
 .../dashboard/includes/my-tasks.html          |  2 +-
 .../includes/project_status_bar.html          |  2 +-
 .../includes/projects_in_contracting.html     |  6 +-
 .../submissions-waiting-for-review.html       |  8 +-
 .../partials/applicant_projects.html          | 14 +--
 .../partials/applicant_submissions.html       | 18 ++--
 .../dashboard/partner_dashboard.html          |  2 +-
 .../dashboard/reviewer_dashboard.html         | 12 +--
 .../templates/dashboard/staff_dashboard.html  | 20 ++--
 .../base_determination_form.html              |  8 +-
 .../batch_determination_form.html             |  2 +-
 .../determinations/determination_detail.html  |  4 +-
 hypha/apply/flags/templates/flags/flags.html  |  2 +-
 .../templates/funds/application_base.html     |  2 +-
 .../funds/applicationrevision_list.html       |  2 +-
 .../applicationsubmission_admin_detail.html   | 30 +++---
 ...pplicationsubmission_community_detail.html |  8 +-
 .../applicationsubmission_confirm_delete.html | 10 +-
 .../funds/applicationsubmission_detail.html   | 10 +-
 ...applicationsubmission_reviewer_detail.html |  8 +-
 .../funds/includes/create_reminder_form.html  |  2 +-
 .../funds/includes/dialog_form_base.html      |  4 +-
 .../modal_archive_submission_confirm.html     | 10 +-
 .../modal_unarchive_submission_confirm.html   | 10 +-
 .../funds/includes/reminders_block.html       |  2 +-
 .../funds/includes/rendered_answers.html      | 10 +-
 .../funds/includes/review_sidebar.html        |  2 +-
 .../funds/includes/review_sidebar_item.html   |  2 +-
 .../templates/funds/includes/round-block.html |  2 +-
 .../screening_status_block-button.html        | 10 +-
 .../funds/includes/status-block.html          |  4 +-
 .../templates/funds/includes/status_bar.html  |  2 +-
 .../funds/includes/submission-list-row.html   | 52 +++++-----
 .../funds/includes/submission-table-row.html  | 38 +++----
 .../includes/table_filter_and_search.html     | 10 +-
 .../includes/translate_application_form.html  |  8 +-
 .../funds/includes/update_reviewer_form.html  |  6 +-
 .../templates/funds/revisions_compare.html    |  2 +-
 .../templates/funds/submission-success.html   |  2 +-
 .../templates/funds/submission_sealed.html    |  2 +-
 .../templates/funds/submissions_result.html   | 50 +++++-----
 .../funds/templates/submissions/all.html      | 98 +++++++++----------
 .../submissions/partials/meta-terms-card.html |  6 +-
 .../submissions/partials/submission-lead.html |  2 +-
 .../submission-reviews-list-multi.html        |  2 +-
 .../partials/submissions-inline.html          |  8 +-
 .../submissions/submenu/bulk-update-lead.html | 10 +-
 .../submenu/bulk-update-reviewers.html        |  4 +-
 .../submissions/submenu/category.html         |  6 +-
 .../submissions/submenu/change-status.html    |  8 +-
 .../templates/submissions/submenu/funds.html  |  6 +-
 .../templates/submissions/submenu/leads.html  |  8 +-
 .../submissions/submenu/meta-terms.html       |  6 +-
 .../submissions/submenu/reviewers.html        |  8 +-
 .../templates/submissions/submenu/rounds.html | 10 +-
 .../includes/contracting_documents.html       | 22 ++---
 .../includes/project_documents.html           | 24 ++---
 .../includes/reports.html                     |  4 +-
 .../application_projects/invoice_detail.html  |  4 +-
 .../application_projects/invoice_list.html    |  4 +-
 .../modals/batch_invoice_status_update.html   |  2 +-
 .../modals/report_frequency_config.html       |  2 +-
 .../modals/send_for_approval.html             |  4 +-
 .../contracting_category_documents.html       | 10 +-
 .../partials/invoice_status.html              |  6 +-
 .../partials/invoice_status_table.html        |  4 +-
 .../partials/project-lead.html                |  2 +-
 .../partials/project_title.html               |  4 +-
 .../partials/supporting_documents.html        | 12 +--
 .../project_approval_form.html                |  2 +-
 .../application_projects/project_detail.html  | 22 ++---
 .../application_projects/project_list.html    |  4 +-
 .../project_sow_detail.html                   |  2 +-
 .../project_sow_form.html                     |  2 +-
 .../application_projects/report_form.html     |  2 +-
 .../templates/review/review_detail.html       | 16 +--
 .../templates/review/review_edit_form.html    | 10 +-
 .../review/templates/review/review_form.html  | 14 +--
 .../templates/stream_forms/heading_field.html |  6 +-
 .../stream_forms/includes/file_field.html     |  6 +-
 .../templates/stream_forms/render_field.html  |  4 +-
 .../apply/templates/forms/includes/field.html |  2 +-
 .../templates/todo/todolist_dropdown.html     |  2 +-
 .../todo/templates/todo/todolist_item.html    |  6 +-
 .../users/templates/elevate/elevate.html      | 12 +--
 .../users/templates/two_factor/_base.html     |  4 +-
 .../templates/two_factor/_wizard_actions.html |  2 +-
 .../templates/two_factor/admin/disable.html   |  2 +-
 .../two_factor/core/backup_tokens.html        |  8 +-
 .../two_factor/core/two_factor_required.html  |  2 +-
 .../apply/users/templates/users/account.html  | 22 ++---
 .../templates/users/activation/invalid.html   |  2 +-
 hypha/apply/users/templates/users/become.html | 10 +-
 .../templates/users/change_password.html      |  2 +-
 .../templates/users/email_change/done.html    |  2 +-
 hypha/apply/users/templates/users/login.html  | 20 ++--
 .../partials/confirmation_code_sent.html      |  8 +-
 .../passwordless_login_signup_sent.html       |  2 +-
 .../users/password_reset/complete.html        |  2 +-
 .../users/password_reset/confirm.html         |  2 +-
 .../templates/users/password_reset/done.html  |  2 +-
 .../templates/users/password_reset/form.html  |  4 +-
 .../users/passwordless_login_signup.html      | 14 +--
 .../templates/users/register-success.html     |  4 +-
 .../templates/includes/banner.html            |  4 +-
 .../core/templates/components/admin_bar.html  | 10 +-
 .../templates/components/dropdown-menu.html   | 14 +--
 .../templates/components/modal-title.html     |  4 +-
 .../templates/components/scroll-to-top.html   |  2 +-
 .../core/navigation/primarynav-apply.html     |  8 +-
 hypha/home/templates/home/home.html           |  4 +-
 .../home/includes/fund-list-item.html         |  4 +-
 hypha/templates/base-apply.html               |  8 +-
 .../includes/_modal-placeholder.html          |  8 +-
 .../includes/_toast-placeholder.html          |  8 +-
 hypha/templates/includes/hijack-bar.html      |  6 +-
 .../includes/menu-notifications.html          | 28 +++---
 hypha/templates/includes/message_item.html    |  2 +-
 hypha/templates/includes/messages.html        |  4 +-
 .../templates/includes/org_login_button.html  |  2 +-
 hypha/templates/includes/user_menu.html       | 50 ++++------
 133 files changed, 614 insertions(+), 616 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a2016fa4f5..c423a4c545 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,8 @@ repos:
         args: ["--frozen", "--group", "dev", "-o", "requirements/dev.txt"]
       - id: uv-export
         name: uv-export requirements/docs.txt
-        args: ["--frozen", "--only-group", "docs", "-o", "requirements/docs.txt"]
+        args:
+          ["--frozen", "--only-group", "docs", "-o", "requirements/docs.txt"]
 
       # This is disabled because this doesn't export --find-links. The requirements-translate is maintained manually.
       # - id: uv-export
@@ -48,10 +49,21 @@ repos:
       - id: djhtml
         files: .*/templates/.*\.html$
 
+  - repo: local
+    hooks:
+      - id: rustywind
+        name: rustywind Tailwind CSS class linter
+        language: node
+        additional_dependencies:
+          - rustywind@latest
+        entry: rustywind
+        args: [--write]
+        types_or: [html]
+
   - repo: https://github.com/biomejs/pre-commit
     rev: "v0.6.1"
     hooks:
-    -   id: biome-check
+      - id: biome-check
         additional_dependencies: ["@biomejs/biome@1.9.4"]
 
   - repo: https://github.com/awebdeveloper/pre-commit-stylelint
diff --git a/hypha/apply/activity/templates/activity/include/comment_form.html b/hypha/apply/activity/templates/activity/include/comment_form.html
index e0dd8ed7ab..fed4793699 100644
--- a/hypha/apply/activity/templates/activity/include/comment_form.html
+++ b/hypha/apply/activity/templates/activity/include/comment_form.html
@@ -1,6 +1,6 @@
 {% load i18n static %}
 
-<div class="wrapper wrapper--comments pb-4">
+<div class="pb-4 wrapper wrapper--comments">
     <form
         class="form form__comments"
         method="post"
@@ -15,12 +15,12 @@
         {% endfor %}
 
         <div class="flex flex-wrap gap-4 lg:flex-nowrap lg:gap-8">
-            <div class="w-full lg:flex-1 -mt-4 max-w-[53rem]">
+            <div class="-mt-4 w-full lg:flex-1 max-w-[53rem]">
                 {% include "forms/includes/field.html" with field=comment_form.message label_classes="sr-only" %}
 
                 <div class="text-right">
                     <button
-                        class="button button--primary w-full lg:w-auto"
+                        class="w-full lg:w-auto button button--primary"
                         id="{{ comment_form.name }}-submit"
                         name="{{ form_prefix }}{{ comment_form.name }}"
                         type="submit"
diff --git a/hypha/apply/activity/templates/activity/include/comment_list.html b/hypha/apply/activity/templates/activity/include/comment_list.html
index 78302c78c2..be8cd1f7c6 100644
--- a/hypha/apply/activity/templates/activity/include/comment_list.html
+++ b/hypha/apply/activity/templates/activity/include/comment_list.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <div class="border-b-2 border-b-slate-300">
-    <section class="max-w-3xl ml-4 md:ml-20">
+    <section class="ml-4 max-w-3xl md:ml-20">
 
         <div class="timeline">
             {% for activity in comments %}
@@ -15,7 +15,7 @@
             {% if page.has_next %}
                 <a
                     href="{{ request.path }}?page={{ page.next_page_number }}"
-                    class="block text-sm text-slate-500 hover:text-slate-700 py-2"
+                    class="block py-2 text-sm text-slate-500 hover:text-slate-700"
                     hx-get="{{ request.path }}?page={{ page.next_page_number }}"
                     hx-trigger="intersect"
                     hx-target="this"
diff --git a/hypha/apply/activity/templates/activity/notifications.html b/hypha/apply/activity/templates/activity/notifications.html
index 83d511ac9c..a1ef222e5d 100644
--- a/hypha/apply/activity/templates/activity/notifications.html
+++ b/hypha/apply/activity/templates/activity/notifications.html
@@ -42,7 +42,7 @@ <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Notificatio
                                     <a href="{{ activity.source.get_absolute_url }}#communications">
                                         {{ activity.source.title|capfirst }}</a>
                                     : {{ activity.user.get_full_name }} {% trans "made a comment" %}
-                                    <relative-time class="text-fg-muted text-sm" datetime={{ activity.timestamp|date:"c" }}>
+                                    <relative-time class="text-sm text-fg-muted" datetime={{ activity.timestamp|date:"c" }}>
                                         {{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}
                                     </relative-time>
                                 </p>
@@ -66,11 +66,11 @@ <h1 class="gamma heading heading--no-margin heading--bold">{% trans "Notificatio
                             <div class="js-feed-meta">
                                 <p class="feed__meta-item">
                                     <a href="{{ activity.source.get_absolute_url }}">{{ activity.source.title|capfirst }}</a>
-                                    : {{ activity.user.get_full_name }} {{ activity|display_for:request.user }} <relative-time class="text-fg-muted text-sm" datetime={{ activity.timestamp|date:"c" }}>{{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}</relative-time>
+                                    : {{ activity.user.get_full_name }} {{ activity|display_for:request.user }} <relative-time class="text-sm text-fg-muted" datetime={{ activity.timestamp|date:"c" }}>{{ activity.timestamp|date:"SHORT_DATETIME_FORMAT" }}</relative-time>
                                 </p>
                                 {% if activity.related_object %}
                                     <p>
-                                        <a href="{{ activity.related_object.get_absolute_url }}" class="uppercase font-bold hover:opacity-70 transition-opacity">
+                                        <a href="{{ activity.related_object.get_absolute_url }}" class="font-bold uppercase transition-opacity hover:opacity-70">
                                             <span>{% trans "View" %} {{ activity.related_object|model_verbose_name }}</span>
                                             {% heroicon_outline "arrow-right" size=12 class="inline align-baseline" stroke_width=4 %}
                                         </a>
diff --git a/hypha/apply/activity/templates/activity/partial_comment_message.html b/hypha/apply/activity/templates/activity/partial_comment_message.html
index 23f9052168..dca46bdf01 100644
--- a/hypha/apply/activity/templates/activity/partial_comment_message.html
+++ b/hypha/apply/activity/templates/activity/partial_comment_message.html
@@ -1,24 +1,24 @@
 {% load heroicons activity_tags nh3_tags markdown_tags submission_tags apply_tags users_tags %}
 
-<div class="prose max-w-none">
+<div class="max-w-none prose">
     {{ activity|display_for:request.user|submission_links|markdown|nh3 }}
 </div>
 
 {% if activity.edited %}
-    <span class="text-fg-muted text-sm" data-tippy-content="{{ activity.edited|date:"SHORT_DATETIME_FORMAT" }}">(edited)</span>
+    <span class="text-sm text-fg-muted" data-tippy-content="{{ activity.edited|date:"SHORT_DATETIME_FORMAT" }}">(edited)</span>
 {% endif %}
 
 {% with activity.attachments.all as attachments %}
     {% if attachments %}
-        <div class="flex flex-wrap gap-2 min-w-40 max-w-xl mt-4 pb-2">
+        <div class="flex flex-wrap gap-2 pb-2 mt-4 max-w-xl min-w-40">
             {% for attachment in attachments %}
                 <a href="{{attachment.get_absolute_url }}"
-                   class="inline-flex items-center border rounded px-3 py-2 font-medium bg-slate-50 hover:bg-slate-200 transition-colors"
+                   class="inline-flex items-center py-2 px-3 font-medium rounded border transition-colors bg-slate-50 hover:bg-slate-200"
                    target="_blank"
                    rel="noopener noreferrer"
                    title="{{ attachment.filename }}"
                 >
-                    <span class="truncate text-sm">
+                    <span class="text-sm truncate">
                         {% heroicon_mini "paper-clip" class="inline align-text-bottom" aria_hidden=true %}
                         {{ attachment.filename|truncatechars_middle:45 }}
                     </span>
diff --git a/hypha/apply/activity/templates/activity/ui/activity-action-item.html b/hypha/apply/activity/templates/activity/ui/activity-action-item.html
index 107054075a..502ab76fdd 100644
--- a/hypha/apply/activity/templates/activity/ui/activity-action-item.html
+++ b/hypha/apply/activity/templates/activity/ui/activity-action-item.html
@@ -1,13 +1,13 @@
 {% load i18n activity_tags heroicons %}
 
 {% with activity|display_for:request.user as activity_text %}
-    <div class="timeline-item relative" id="communications#{{ activity.id }}">
+    <div class="relative timeline-item" id="communications#{{ activity.id }}">
         <div
-            class="flex py-2 -ml-3  items-center before:block before:-z-10 before:absolute before:top-0 before:bottom-0 before:left-0 before:w-0.5 before:bg-slate-300"
+            class="flex items-center py-2 -ml-3 before:block before:-z-10 before:absolute before:top-0 before:bottom-0 before:left-0 before:w-0.5 before:bg-slate-300"
         >
-            <div class="relative inline-flex justify-center me-2 items-start">
+            <div class="inline-flex relative justify-center items-start me-2">
                 <div class="relative rounded-full inline-flex items-center justify-center border-white border-2 -ms-0.5 {% if activity.user.is_staff %}bg-slate-200 {% else %}bg-gray-200{% endif %}">
-                    <div class="inline-flex items-center justify-center w-6 h-6 text-fg-muted">
+                    <div class="inline-flex justify-center items-center w-6 h-6 text-fg-muted">
                         {% if 'edit' in activity_text.lower %}
                             {% heroicon_micro "pencil-square" class="inline" aria_hidden=true size=14 %}
                         {% elif 'progressed' in activity_text.lower %}
@@ -40,7 +40,7 @@
                 {% if not submission_title and activity|user_can_see_related:request.user %}
                     {% with url=activity.related_object.get_absolute_url %}
                         {% if url %}
-                            <a href="{{ url }}" class="ms-2 hover:opacity-70 transition-opacity font-semibold">
+                            <a href="{{ url }}" class="font-semibold transition-opacity hover:opacity-70 ms-2">
                                 {% trans "View" %}
                             </a>
                         {% endif %}
diff --git a/hypha/apply/activity/templates/activity/ui/activity-comment-item.html b/hypha/apply/activity/templates/activity/ui/activity-comment-item.html
index 4bfbe663ce..b56bb3578f 100644
--- a/hypha/apply/activity/templates/activity/ui/activity-comment-item.html
+++ b/hypha/apply/activity/templates/activity/ui/activity-comment-item.html
@@ -1,13 +1,13 @@
 {% load i18n activity_tags nh3_tags markdown_tags submission_tags apply_tags heroicons users_tags %}
 
-<article class="timeline-item relative">
+<article class="relative timeline-item">
     <div
-        class="flex py-3 -ms-8 md:-ms-20 before:block before:-z-10 before:absolute before:top-0 before:bottom-0 before:left-0 before:w-0.5 before:bg-slate-300"
+        class="flex py-3 -ms-8 before:block before:-z-10 before:absolute before:top-0 before:bottom-0 before:left-0 before:w-0.5 before:bg-slate-300 md:-ms-20"
     >
         {% with activity|display_activity_author:request.user as author_name %}
-            <div class="relative inline-flex justify-center me-4 items-start">
+            <div class="inline-flex relative justify-center items-start me-4">
                 <div class="relative rounded-full inline-flex items-center justify-center border-white border-2 -ms-0.5 {% if activity.user.is_staff %}bg-slate-200 {% else %}bg-gray-100{% endif %}">
-                    <div class="md:block hidden p-2">
+                    <div class="hidden p-2 md:block">
                         {% user_image author_name size=25 %}
                     </div>
                 </div>
@@ -24,7 +24,7 @@
                                 <span>
                                     {% for role in activity.user.get_role_names  %}
                                         <span
-                                            class="text-fg-muted font-semibold inline-block px-2 py-0.5 text-sm border border-gray-300 rounded-xl"
+                                            class="inline-block py-0.5 px-2 text-sm font-semibold rounded-xl border border-gray-300 text-fg-muted"
                                             data-tippy-content="This user is a {{ role }}"
                                         >
                                             {{ role }}
@@ -44,12 +44,12 @@
 
 
                     </div>
-                    <div class="flex items-center gap-1">
+                    <div class="flex gap-1 items-center">
                         {% if not request.user.is_applicant %}
 
                             {% if request.user.is_apply_staff and activity.assigned_to %}
 
-                                <span class="flex items-center gap-1 text-fg-muted text-xs border rounded-xl border-gray-300 py-0.5 px-1.5">
+                                <span class="flex gap-1 items-center py-0.5 px-1.5 text-xs rounded-xl border border-gray-300 text-fg-muted">
                                     {% heroicon_outline "user-plus" size=14 class="inline" aria_hidden=true %}
                                     {% if activity.assigned_to.id == request.user.id %}
                                         {% trans "Assigned to you" %}
@@ -60,7 +60,7 @@
                             {% endif %}
 
                             {% with activity.visibility|visibility_display:request.user as visibility_text  %}
-                                <span class="text-fg-muted text-xs flex items-center gap-1 uppercase border rounded-xl border-gray-300 py-0.5 px-1.5"
+                                <span class="flex gap-1 items-center py-0.5 px-1.5 text-xs uppercase rounded-xl border border-gray-300 text-fg-muted"
                                       data-tippy-content="This is visible to {{ visibility_text }}">
                                     {% heroicon_outline "eye" size=14 class="inline" aria_hidden=true %}
                                     {{ visibility_text }}
@@ -74,7 +74,7 @@
                                 hx-get="{% url 'activity:edit-comment' activity.id %}"
                                 hx-target="#text-comment-{{activity.id}}"
                                 title="Edit Comment"
-                                class="inline-flex items-center p-0.5 hover:bg-fuchsia-200 hover:opacity-100 opacity-80 transition-all rounded-md"
+                                class="inline-flex items-center p-0.5 rounded-md opacity-80 transition-all hover:bg-fuchsia-200 hover:opacity-100"
                             >
                                 {% heroicon_micro "pencil-square" size=18 class="inline" aria_hidden=true %}
                                 <span class="sr-only">{% trans "Edit" %}</span>
@@ -97,7 +97,7 @@
                             {% with url=activity.related_object.get_absolute_url %}
                                 {% if url %}
                                     <a href="{{ url }}">
-                                        {% trans "View " %}{{ activity.related_object|model_verbose_name }} <svg class="icon inline"><use xlink:href="#arrow-head-pixels--solid"></use></svg>
+                                        {% trans "View " %}{{ activity.related_object|model_verbose_name }} <svg class="inline icon"><use xlink:href="#arrow-head-pixels--solid"></use></svg>
                                     </a>
                                 {% endif %}
                             {% endwith %}
diff --git a/hypha/apply/activity/templates/activity/ui/edit_comment_form.html b/hypha/apply/activity/templates/activity/ui/edit_comment_form.html
index 55ef88ebfe..52ee738f61 100644
--- a/hypha/apply/activity/templates/activity/ui/edit_comment_form.html
+++ b/hypha/apply/activity/templates/activity/ui/edit_comment_form.html
@@ -14,11 +14,11 @@
 
         <textarea
             id="wmd-input-edit-comment-{{ activity.id }}"
-            class="wmd-input w-full not-prose"
+            class="w-full wmd-input not-prose"
             rows="10" name="message"
         >{{ activity.message }}</textarea>
 
-        <div id="wmd-preview-edit-comment-{{ activity.id }}" class="w-full bg-gray-100 p-4 prose max-w-none shadow-sm"></div>
+        <div id="wmd-preview-edit-comment-{{ activity.id }}" class="p-4 w-full max-w-none bg-gray-100 shadow-sm prose"></div>
     </div>
 
     <div class="flex gap-2">
diff --git a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
index 0904effae0..496a694a2c 100644
--- a/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/applicant_dashboard.html
@@ -6,15 +6,15 @@
 
 {% block content %}
     <div class="admin-bar">
-        <div class="admin-bar__inner wrapper--applicant-dashboard gap-4">
+        <div class="gap-4 admin-bar__inner wrapper--applicant-dashboard">
             <div class="my-auto">
-                <h1 class="heading heading--no-margin font-bold">{% trans "My dashboard" %}</h1>
+                <h1 class="font-bold heading heading--no-margin">{% trans "My dashboard" %}</h1>
                 <p class="m-0">{% trans "An overview of active and past submissions and projects" %}</p>
             </div>
-            <div class="wrapper wrapper--cta-box flex items-center">
+            <div class="flex items-center wrapper wrapper--cta-box">
                 <div class="flex-1">
-                    <h3 class="heading heading--no-margin font-bold">{% trans "Submit a new application" %}</h3>
-                    <p class="text-base m-0">{% trans "Apply now for our open rounds" %}</p>
+                    <h3 class="font-bold heading heading--no-margin">{% trans "Submit a new application" %}</h3>
+                    <p class="m-0 text-base">{% trans "Apply now for our open rounds" %}</p>
                 </div>
                 <div>
                     <a class="button button--blue-white" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
@@ -31,12 +31,12 @@ <h3 class="heading heading--no-margin font-bold">{% trans "Submit a new applicat
         {% if my_submissions_exists %}
             <div class="mb-10">
                 <div class="flex">
-                    <h2 class="font-light flex-1">{% trans "My submissions" %}</h2>
+                    <h2 class="flex-1 font-light">{% trans "My submissions" %}</h2>
                 </div>
 
                 <div hx-get="{% url 'dashboard:applicant_submissions' %}" hx-trigger="load" id="submissions_list">
                     {% for dummy_item in per_section_items %}
-                        <div class="wrapper wrapper--status-bar-outer animate-pulse min-h-40">
+                        <div class="animate-pulse wrapper wrapper--status-bar-outer min-h-40">
                             <div class="mt-5 ms-4 lg:max-w-[30%] h-9 bg-gray-200 "></div>
                         </div>
                     {% endfor %}
@@ -48,11 +48,11 @@ <h2 class="font-light flex-1">{% trans "My submissions" %}</h2>
         {% if my_projects_exists %}
             <div class="mb-10">
                 <div class="flex">
-                    <h2 class="font-light flex-1">{% trans "My projects" %}</h2>
+                    <h2 class="flex-1 font-light">{% trans "My projects" %}</h2>
                 </div>
                 <div hx-get="{% url 'dashboard:applicant_projects' %}" hx-trigger="load delay:50" id="projects_list">
                     {% for dummy_item in per_section_items %}
-                        <div class="wrapper wrapper--status-bar-outer animate-pulse min-h-40">
+                        <div class="animate-pulse wrapper wrapper--status-bar-outer min-h-40">
                             <div class="mt-5 ms-4 lg:max-w-[30%] h-9 bg-gray-200 "></div>
                         </div>
                     {% endfor %}
@@ -64,24 +64,24 @@ <h2 class="font-light flex-1">{% trans "My projects" %}</h2>
         {% if active_invoices.count %}
             <div class="mb-10">
                 <div class="flex">
-                    <h2 class="font-light flex-1">{% trans "My active invoices" %}</h2>
+                    <h2 class="flex-1 font-light">{% trans "My active invoices" %}</h2>
                 </div>
                 {% for invoice in active_invoices.data %}
                     <div class="wrapper wrapper--status-bar-outer">
-                        <div class="wrapper flex flex-wrap justify-between ps-4 pe-4">
-                            <div class="md:w-1/3 flex flex-col item-start my-auto">
-                                <h4 class="heading heading--no-margin font-bold"><a class="link" href="{{ invoice.get_absolute_url }}">
+                        <div class="flex flex-wrap justify-between wrapper ps-4 pe-4">
+                            <div class="flex flex-col my-auto md:w-1/3 item-start">
+                                <h4 class="font-bold heading heading--no-margin"><a class="link" href="{{ invoice.get_absolute_url }}">
                                     {% if invoice.invoice_number %}{{ invoice.invoice_number }}{% else %}{{ invoice.vendor_document_number }}{% endif %}
                                 </a></h4>
-                                <p class="m-0 text-fg-muted text-sm">{% trans "Date added: " %} {{ invoice.requested_at }}</p>
+                                <p class="m-0 text-sm text-fg-muted">{% trans "Date added: " %} {{ invoice.requested_at }}</p>
                             </div>
-                            <div class="md:w-1/3 flex flex-col items-center text-center my-auto">
+                            <div class="flex flex-col items-center my-auto text-center md:w-1/3">
                                 <p class="text-2xl">{% if invoice.invoice_amount %}{{ invoice.invoice_amount | format_number_as_currency }}{% else %}-{% endif %}</p>
                             </div>
-                            <div class="md:w-1/3 flex flex-col items-end my-auto">
+                            <div class="flex flex-col items-end my-auto md:w-1/3">
                                 {% display_invoice_table_status_for_user invoice.status request.user as invoice_status %}
-                                <div class="w-full flex-1"></div>
-                                <div class="max-w-fit w-full text-end">
+                                <div class="flex-1 w-full"></div>
+                                <div class="w-full max-w-fit text-end">
                                     <p class="{{ invoice_status|invoice_status_bg_color }} text-base py-2 px-3 {{ invoice_status|invoice_status_fg_color }}">{{ invoice_status }}</p>
                                 </div>
                             </div>
@@ -95,15 +95,15 @@ <h4 class="heading heading--no-margin font-bold"><a class="link" href="{{ invoic
     </div>
 
     {% if historical_submissions.count %}
-        <div class="wrapper wrapper--large wrapper--inner-space-medium mb-8">
-            <h2 class="text-xl mb-2">{% trans "Submission history" %}</h2>
+        <div class="mb-8 wrapper wrapper--large wrapper--inner-space-medium">
+            <h2 class="mb-2 text-xl">{% trans "Submission history" %}</h2>
             {% render_table historical_submissions.table %}
         </div>
     {% endif %}
 
     {% if historical_projects.count %}
-        <div class="wrapper wrapper--large wrapper--inner-space-medium mb-8">
-            <h2 class="text-xl mb-2">{% trans "Project history" %}</h2>
+        <div class="mb-8 wrapper wrapper--large wrapper--inner-space-medium">
+            <h2 class="mb-2 text-xl">{% trans "Project history" %}</h2>
             {% render_table historical_projects.table %}
         </div>
     {% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/community_dashboard.html b/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
index 914d16c406..e16f2745a3 100644
--- a/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/community_dashboard.html
@@ -11,8 +11,8 @@
         {% slot sub_heading %}{% trans "An overview of active and past submissions" %}{% endslot %}
 
         <div class="wrapper wrapper--cta-box">
-            <h3 class="text-xl mb-0">{% trans "Submit a new application" %}</h3>
-            <p class="mt-0 mb-4 text-fg-muted text-sm">{% trans "Apply now for our open rounds" %}</p>
+            <h3 class="mb-0 text-xl">{% trans "Submit a new application" %}</h3>
+            <p class="mt-0 mb-4 text-sm text-fg-muted">{% trans "Apply now for our open rounds" %}</p>
             <a class="button button--primary" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
         </div>
     {% endadminbar %}
@@ -20,8 +20,8 @@ <h3 class="text-xl mb-0">{% trans "Submit a new application" %}</h3>
     <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
         <div class="wrapper wrapper--bottom-space">
-            <h2 class="text-xl mb-2">
-                {% trans "Community review submissions" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded">{{ my_community_review_count }}</span>
+            <h2 class="mb-2 text-xl">
+                {% trans "Community review submissions" %} <span class="py-0.5 px-2.5 text-sm font-medium text-blue-800 bg-blue-100 rounded me-2">{{ my_community_review_count }}</span>
             </h2>
 
             {% if my_community_review.data %}
@@ -33,7 +33,7 @@ <h2 class="text-xl mb-2">
 
         {% if my_reviewed.data %}
             <div class="wrapper wrapper--bottom-space">
-                <h2 class="text-xl mb-2">
+                <h2 class="mb-2 text-xl">
                     {% trans "Your previous reviews" %}
                 </h2>
                 {% render_table my_reviewed %}
@@ -41,21 +41,21 @@ <h2 class="text-xl mb-2">
         {% endif %}
 
         <div class="wrapper wrapper--bottom-space">
-            <h2 class="text-xl mb-2">
+            <h2 class="mb-2 text-xl">
                 {% trans "Your active submissions" %}
             </h2>
             {% for submission in my_submissions %}
                 <div class="wrapper wrapper--status-bar-outer">
                     <div class="wrapper wrapper--status-bar-inner">
-                        <div class="flex max-w-sm sm:max-w-lg flex-col gap-2 md:flex-row md:justify-between md:w-full md:max-w-none lg:flex-col lg:justify-start lg:w-auto lg:max-w-sm">
+                        <div class="flex flex-col gap-2 max-w-sm sm:max-w-lg md:flex-row md:justify-between md:w-full md:max-w-none lg:flex-col lg:justify-start lg:w-auto lg:max-w-sm">
                             <div>
-                                <h3 class="heading heading--no-margin text-base font-bold">
+                                <h3 class="text-base font-bold heading heading--no-margin">
                                     <a class="{% if not submission.is_active %} text-slate-500 {% endif %} hover:underline" href="{% url 'funds:submissions:detail' submission.id %}">
                                         {{ submission.title }}
                                         <span class="text-gray-400">#{{ submission.public_id|default:submission.id }}</span>
                                     </a>
                                 </h3>
-                                <p class="heading heading--no-margin text-fg-muted text-sm">
+                                <p class="text-sm heading heading--no-margin text-fg-muted">
                                     {% trans "Submitted" %}: {{ submission.submit_time.date }} {% trans "by" %} {{ submission.user.get_full_name }}
                                 </p>
                             </div>
@@ -66,7 +66,7 @@ <h3 class="heading heading--no-margin text-base font-bold">
                                             {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
                                         {% else %}
                                             <span class="whitespace-nowrap">
-                                                {% heroicon_mini "pencil-square" size=18 class="inline me-1 align-text-bottom" aria_hidden=true %}
+                                                {% heroicon_mini "pencil-square" size=18 class="inline align-text-bottom me-1" aria_hidden=true %}
                                                 {% trans "Edit" %}
                                             </span>
                                         {% endif %}
@@ -85,7 +85,7 @@ <h3 class="heading heading--no-margin text-base font-bold">
 
         {% if my_inactive_submissions.data %}
             <div class="wrapper wrapper--bottom-space">
-                <h2 class="text-xl mb-2">
+                <h2 class="mb-2 text-xl">
                     {% trans "Submission history" %}
                 </h2>
                 {% render_table my_inactive_submissions %}
diff --git a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
index ffd2854e5c..48a49b52ee 100644
--- a/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/finance_dashboard.html
@@ -10,7 +10,7 @@
 
         {% if perms.wagtailadmin.access_admin %}
             <a href="{% url 'wagtailadmin_home' %}" class="button button--primary">
-                {% heroicon_solid "cog-6-tooth" size=20 class="me-1 inline align-text-bottom" aria_hidden=true %}
+                {% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
                 {% trans "Administration" %}
             </a>
         {% endif %}
@@ -61,7 +61,7 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if active_invoices.count %}
                     {% render_table active_invoices.table %}
                 {% else %}
-                    <div class="border px-2 py-4">
+                    <div class="py-4 px-2 border">
                         {% trans "No Active Invoices" %}
                     </div>
                 {% endif %}
@@ -72,7 +72,7 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if invoices_for_approval.count %}
                     {% render_table invoices_for_approval.table %}
                 {% else %}
-                    <div class="border px-2 py-4">
+                    <div class="py-4 px-2 border">
                         {% trans "No Invoices for Approval " %}
                     </div>
                 {% endif %}
@@ -83,7 +83,7 @@ <h4 class="heading heading--normal heading--no-margin">{% trans 'Invoices' %} </
                 {% if invoices_to_convert.count %}
                     {% render_table invoices_to_convert.table %}
                 {% else %}
-                    <div class="border px-2 py-4">
+                    <div class="py-4 px-2 border">
                         {% trans "No Invoices for Conversion " %}
                     </div>
                 {% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/flagged.html b/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
index c49ca29bfd..ed95d5d28f 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/flagged.html
@@ -1,7 +1,7 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-<h2 class="text-xl mb-2">
+<h2 class="mb-2 text-xl">
     {% trans "Your flagged submissions" %}
 </h2>
 
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/my-tasks.html b/hypha/apply/dashboard/templates/dashboard/includes/my-tasks.html
index 0b827795ac..78fb109c19 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/my-tasks.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/my-tasks.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<div class="max-w-3xl mx-auto mb-10" id="task-list" hx-swap-oob="true">
+<div class="mx-auto mb-10 max-w-3xl" id="task-list" hx-swap-oob="true">
     {% if my_tasks.data %}
         <h2 class="font-light text-center">{% trans "My tasks" %}</h2>
 
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html b/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html
index 21b49360a9..d38782a988 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/project_status_bar.html
@@ -11,7 +11,7 @@
     {% endfor %}
 </div>
 
-<div class="status-bar--mobile mt-5">
+<div class="mt-5 status-bar--mobile">
     <div class="status-bar__subheading status-bar__text">
         {{ current_status }}
     </div>
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
index 8cff89339d..050f375791 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/projects_in_contracting.html
@@ -3,7 +3,7 @@
 
 <div id="projects-in-contracting" class="wrapper wrapper--bottom-space" x-data="{ tab: '{% trans "Waiting for contract" %}' }">
     <section class="flex flex-col justify-between items-center md:flex-row">
-        <h2 class="text-xl mb-2">
+        <h2 class="mb-2 text-xl">
             {% trans 'Projects in contracting' %}
         </h2>
         <nav>
@@ -30,7 +30,7 @@ <h2 class="text-xl mb-2">
         {% if projects_in_contracting.waiting_for_contract.count %}
             {% render_table projects_in_contracting.waiting_for_contract.table %}
         {% else %}
-            <div class="border px-2 py-4">
+            <div class="py-4 px-2 border">
                 {% trans "No project is waiting for contract" %}
             </div>
         {% endif %}
@@ -39,7 +39,7 @@ <h2 class="text-xl mb-2">
         {% if projects_in_contracting.waiting_for_contract_approval.count %}
             {% render_table projects_in_contracting.waiting_for_contract_approval.table %}
         {% else %}
-            <div class="border px-2 py-4">
+            <div class="py-4 px-2 border">
                 {% trans "No project is waiting for contract approval " %}
             </div>
         {% endif %}
diff --git a/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html b/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
index 4c9220f48c..36898a0d24 100644
--- a/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
+++ b/hypha/apply/dashboard/templates/dashboard/includes/submissions-waiting-for-review.html
@@ -1,8 +1,8 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
 
-<h2 class="text-xl mb-2">
-    {% trans "Submissions waiting for your review" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded">{{ in_review_count }}</span>
+<h2 class="mb-2 text-xl">
+    {% trans "Submissions waiting for your review" %} <span class="py-0.5 px-2.5 text-sm font-medium text-blue-800 bg-blue-100 rounded me-2">{{ in_review_count }}</span>
 </h2>
 
 {% if my_review.data %}
@@ -17,8 +17,8 @@ <h2 class="text-xl mb-2">
     {% endif %}
 
 {% else %}
-    <div class="border shadow-sm py-10 bg-white w-full text-center px-2">
-        <p class="text-base my-2">{% trans "Nice! You're all caught up. 🎉" %}</p>
+    <div class="py-10 px-2 w-full text-center bg-white border shadow-sm">
+        <p class="my-2 text-base">{% trans "Nice! You're all caught up. 🎉" %}</p>
         <a class="button button--primary" href="{% url 'apply:submissions:list' %}" hx-boost='true'>{% trans "Find new applications to review" %}</a>
     </div>
     {# TODO Fill in data and update styles in future ticket #}
diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html
index b6c293266c..61467ccb5f 100644
--- a/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html
+++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_projects.html
@@ -4,8 +4,8 @@
     <div class="wrapper wrapper--status-bar-outer">
         <div class="wrapper wrapper--status-bar-inner ms-4">
             <div class="mt-5 lg:max-w-[30%]">
-                <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4>
-                <p class="m-0 text-fg-muted text-sm">{% trans "Project start date: " %} {{ project.created_at.date }}</p>
+                <h4 class="mb-0 font-bold heading line-clamp-3 hover:line-clamp-none"><a class="link" href="{% url 'apply:projects:detail' project.id %}">{{ project.title }}</a></h4>
+                <p class="m-0 text-sm text-fg-muted">{% trans "Project start date: " %} {{ project.created_at.date }}</p>
             </div>
             {% project_status_bar project.status request.user css_class="status-bar--small" %}
         </div>
@@ -15,10 +15,10 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none"><a class="
 {% endfor %}
 
 <nav class="mt-5 mb-20" aria-label="Pagination">
-    <span class="step-links flex gap-2 justify-center items-center">
+    <span class="flex gap-2 justify-center items-center step-links">
         {% if page.has_previous %}
-            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page=1" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">&laquo;</a>
-            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.previous_page_number }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">&lsaquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page=1" hx-target="#projects_list" class="py-2 px-3 border hover:bg-slate-300">&laquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.previous_page_number }}" hx-target="#projects_list" class="py-2 px-3 border hover:bg-slate-300">&lsaquo;</a>
         {% endif %}
 
         <span class="current">
@@ -26,8 +26,8 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none"><a class="
         </span>
 
         {% if page.has_next %}
-            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.next_page_number }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">&rsaquo;</a>
-            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.paginator.num_pages }}" hx-target="#projects_list" class="px-3 py-2 border hover:bg-slate-300">&raquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.next_page_number }}" hx-target="#projects_list" class="py-2 px-3 border hover:bg-slate-300">&rsaquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_projects' %}?page={{ page.paginator.num_pages }}" hx-target="#projects_list" class="py-2 px-3 border hover:bg-slate-300">&raquo;</a>
         {% endif %}
     </span>
 </nav>
diff --git a/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html
index 412e701f56..ab86840c41 100644
--- a/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html
+++ b/hypha/apply/dashboard/templates/dashboard/partials/applicant_submissions.html
@@ -5,13 +5,13 @@
     <div class="wrapper wrapper--status-bar-outer">
         <div class="wrapper wrapper--status-bar-inner ms-4">
             <div class="mt-5 lg:max-w-[30%]">
-                <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none">
+                <h4 class="mb-0 font-bold heading line-clamp-3 hover:line-clamp-none">
                     <a class="{% if not submission.is_active %} text-slate-500 {% endif %} hover:underline" href="{% url 'funds:submissions:detail' submission.id %}">
                         {{ submission.title }}
                         <span class="text-gray-400">#{{ submission.public_id|default:submission.id }}</span>
                     </a>
                 </h4>
-                <p class="m-0 text-fg-muted mb-4 text-sm">
+                <p class="m-0 mb-4 text-sm text-fg-muted">
                     {% if submission.is_draft %}
                         {% trans "Drafted on " %}
                     {% else %}
@@ -24,7 +24,7 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none">
                         {% if submission.status == 'draft_proposal' %}
                             {% trans "Start your" %} {{ submission.stage }} {% trans "application" %}
                         {% else %}
-                            {% heroicon_micro "pencil" class="w-4 h-4 me-1 inline align-middle" aria_hidden=true %}
+                            {% heroicon_micro "pencil" class="inline w-4 h-4 align-middle me-1" aria_hidden=true %}
                             {% trans "Edit" %}
                         {% endif %}
                     </a>
@@ -32,7 +32,7 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none">
                 {% can "delete_submission" submission as can_delete_submission %}
                 {% if can_delete_submission %}
                     <a class="button button--white" href="{% url 'funds:submissions:delete' submission.id %}" hx-get="{% url 'funds:submissions:delete' submission.id %}" hx-target="#htmx-modal">
-                        {% heroicon_micro "trash" class="inline me-1 mt-1 fill-red-600" aria_hidden=true %}
+                        {% heroicon_micro "trash" class="inline mt-1 me-1 fill-red-600" aria_hidden=true %}
                         {% trans "Delete" %}
                     </a>
                 {% endif %}
@@ -45,10 +45,10 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none">
 {% endfor %}
 
 <nav class="mt-5 mb-20" aria-label="Pagination">
-    <span class="step-links flex gap-2 justify-center items-center">
+    <span class="flex gap-2 justify-center items-center step-links">
         {% if page.has_previous %}
-            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page=1" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">&laquo;</a>
-            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.previous_page_number }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">&lsaquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page=1" hx-target="#submissions_list" class="py-2 px-3 border hover:bg-slate-300">&laquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.previous_page_number }}" hx-target="#submissions_list" class="py-2 px-3 border hover:bg-slate-300">&lsaquo;</a>
         {% endif %}
 
         <span class="current">
@@ -56,8 +56,8 @@ <h4 class="heading mb-0 font-bold line-clamp-3 hover:line-clamp-none">
         </span>
 
         {% if page.has_next %}
-            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.next_page_number }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">&rsaquo;</a>
-            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.paginator.num_pages }}" hx-target="#submissions_list" class="px-3 py-2 border hover:bg-slate-300">&raquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.next_page_number }}" hx-target="#submissions_list" class="py-2 px-3 border hover:bg-slate-300">&rsaquo;</a>
+            <a href="#" hx-get="{% url 'dashboard:applicant_submissions' %}?page={{ page.paginator.num_pages }}" hx-target="#submissions_list" class="py-2 px-3 border hover:bg-slate-300">&raquo;</a>
         {% endif %}
     </span>
 </nav>
diff --git a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html
index 548711f037..33053e50f7 100644
--- a/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/partner_dashboard.html
@@ -17,7 +17,7 @@
 
         <div class="wrapper wrapper--bottom-space">
             <h4 class="heading heading--normal">
-                {% trans "You are the partner of these submissions" %} <span class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">{{ partner_submissions_count }}</span>
+                {% trans "You are the partner of these submissions" %} <span class="py-0.5 px-2.5 text-sm font-medium text-blue-800 bg-blue-100 rounded dark:text-blue-300 dark:bg-blue-900 me-2">{{ partner_submissions_count }}</span>
             </h4>
 
             {% if partner_submissions.data %}
diff --git a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
index dd7b7ebcff..33388fab72 100644
--- a/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/reviewer_dashboard.html
@@ -18,14 +18,14 @@
 
         {% if my_flagged.submissions %}
             <div id="submissions-flagged" class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">
+                <h3 class="mb-2 text-xl">
                     <a href="{% url "apply:submissions:list" %}?query=flagged:@me">Your flagged submissions <span class="text-sm">({{ my_flagged.count }})</span></a>
                 </h3>
 
                 {% include "submissions/partials/submissions-inline.html" with submissions=my_flagged.submissions row_layout="table" %}
 
                 {% if my_flagged.display_more  %}
-                    <div class="border-x border-b flex items-center justify-center py-3 font-semibold">
+                    <div class="flex justify-center items-center py-3 font-semibold border-b border-x">
                         <a href="{% url "apply:submissions:list" %}?query=flagged:@me">Show All</a>
                     </div>
                 {% endif %}
@@ -34,12 +34,12 @@ <h3 class="text-xl mb-2">
 
         {% if my_reviewed.table.data %}
             <div class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">Your previous reviews</h3>
+                <h3 class="mb-2 text-xl">Your previous reviews</h3>
 
                 {% include "submissions/partials/submissions-inline.html" with submissions=my_reviewed.table.data row_layout="table" %}
 
                 {% if my_reviewed.display_more %}
-                    <div class="border-x border-b flex items-center justify-center py-3 font-semibold">
+                    <div class="flex justify-center items-center py-3 font-semibold border-b border-x">
                         <a href="{{ my_reviewed.url }}?query=reviewed-by:@me">{% trans "Show all" %}</a>
                     </div>
                 {% endif %}
@@ -48,7 +48,7 @@ <h3 class="text-xl mb-2">Your previous reviews</h3>
 
         {% if my_submissions %}
             <div class="wrapper wrapper--bottom-space">
-                <h2 class="text-xl mb-2">
+                <h2 class="mb-2 text-xl">
                     {% trans "Your active submissions" %}
                 </h2>
                 {% for submission in my_submissions %}
@@ -76,7 +76,7 @@ <h6 class="heading heading--no-margin heading--submission-meta"><span>{% trans "
 
         {% if my_inactive_submissions.data %}
             <div class="wrapper wrapper--bottom-space">
-                <h2 class="text-xl mb-2">
+                <h2 class="mb-2 text-xl">
                     {% trans "Submission history" %}
                 </h2>
                 {% render_table my_inactive_submissions %}
diff --git a/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html b/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
index a488465e23..0f7e86e254 100644
--- a/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
+++ b/hypha/apply/dashboard/templates/dashboard/staff_dashboard.html
@@ -11,7 +11,7 @@
 
         {% if perms.wagtailadmin.access_admin %}
             <a href="{% url 'wagtailadmin_home' %}" id="wagtail-admin-button" class="button button--primary">
-                {% heroicon_solid "cog-6-tooth" size=20 class="me-1 inline align-text-bottom" aria_hidden=true %}
+                {% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
                 {% trans "Administration" %}
             </a>
         {% endif %}
@@ -24,7 +24,7 @@
             {% endif %}
 
             <div class="stat-block">
-                <a href="#submissions-awaiting-review" class="stat-block__item border shadow-sm">
+                <a href="#submissions-awaiting-review" class="border shadow-sm stat-block__item">
                     <p class="stat-block__number">{{ awaiting_reviews.count }}</p>
                     <p class="stat-block__text">{% trans "Submissions waiting for your review" %}</p>
                     {% if awaiting_reviews.count %}
@@ -32,14 +32,14 @@
                     {% endif %}
                 </a>
                 {% if PROJECTS_ENABLED %}
-                    <a href="#active-projects" class="stat-block__item border shadow-sm">
+                    <a href="#active-projects" class="border shadow-sm stat-block__item">
                         <p class="stat-block__number">{{ projects.count }}</p>
                         <p class="stat-block__text">{% trans "Live projects under your management" %}</p>
                         {% if projects.count %}
                             <div class="stat-block__view">{% trans "View" %}</div>
                         {% endif %}
                     </a>
-                    <a href="#active-invoices" class="stat-block__item border shadow-sm">
+                    <a href="#active-invoices" class="border shadow-sm stat-block__item">
                         <p class="stat-block__number">{{ active_invoices.count }}</p>
                         <p class="stat-block__text">{% trans "Requests for invoices requiring your attention" %}</p>
                         {% if active_invoices.count %}
@@ -48,13 +48,13 @@
                     </a>
                 {% else %}
                     {% if my_flagged.table.data %}
-                        <a href="#submissions-flagged" class="stat-block__item border shadow-sm">
+                        <a href="#submissions-flagged" class="border shadow-sm stat-block__item">
                             <p class="stat-block__number">{{ my_flagged.table.rows|length }}</p>
                             <p class="stat-block__text">Your flagged submissions</p>
                         </a>
                     {% endif %}
                     {% if my_reviewed.table.data %}
-                        <a href="#my-review" class="stat-block__item border shadow-sm">
+                        <a href="#my-review" class="border shadow-sm stat-block__item">
                             <p class="stat-block__number">{{ my_reviewed.table.rows|length }}</p>
                             <p class="stat-block__text">Your previous reviews</p>
                         </a>
@@ -69,14 +69,14 @@
 
         {% if my_flagged.submissions %}
             <div id="submissions-flagged" class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">
+                <h3 class="mb-2 text-xl">
                     <a href="{% url "apply:submissions:list" %}?query=flagged:@me">Your flagged submissions <span class="text-sm">({{ my_flagged.count }})</span></a>
                 </h3>
 
                 {% include "submissions/partials/submissions-inline.html" with submissions=my_flagged.submissions row_layout="table" %}
 
                 {% if my_flagged.display_more  %}
-                    <div class="border-x border-b flex items-center justify-center py-3 font-semibold">
+                    <div class="flex justify-center items-center py-3 font-semibold border-b border-x">
                         <a href="{% url "apply:submissions:list" %}?query=flagged:@me">Show All</a>
                     </div>
                 {% endif %}
@@ -89,14 +89,14 @@ <h3 class="text-xl mb-2">
 
         {% if PROJECTS_ENABLED and paf_for_review.count %}
             <div id="paf_for_review" class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">{% trans "Project forms for review" %}</h3>
+                <h3 class="mb-2 text-xl">{% trans "Project forms for review" %}</h3>
                 {% render_table paf_for_review.table %}
             </div>
         {% endif %}
 
         {% if PROJECTS_ENABLED and projects.table.data %}
             <div id="active-projects" class="wrapper wrapper--bottom-space">
-                <h3 class="text-xl mb-2">
+                <h3 class="mb-2 text-xl">
                     {% trans "Your projects" %}
                 </h3>
 
diff --git a/hypha/apply/determinations/templates/determinations/base_determination_form.html b/hypha/apply/determinations/templates/determinations/base_determination_form.html
index 9c30976016..45e806b1a5 100644
--- a/hypha/apply/determinations/templates/determinations/base_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/base_determination_form.html
@@ -9,7 +9,7 @@
             {% slot sub_heading %}{% if submission %}{% trans "For" %} <a class="text-blue-300 hover:underline" href="{% url "funds:submissions:detail" submission.id %}">{{ submission.title_text_display }}</a>{% endif %}{% endslot %}
             {% slot buttons %}
                 <button
-                    class="tab__item ms-auto block pb-4"
+                    class="block pb-4 tab__item ms-auto"
                     x-data
                     @click="showSubmission = !showSubmission"
                 >
@@ -22,11 +22,11 @@
     {% endblock %}
 
     {% block form %}
-        <section class="my-8 flex justify-between" :class="showSubmission ? '' : 'flex-col'">
+        <section class="flex justify-between my-8" :class="showSubmission ? '' : 'flex-col'">
             {% include "forms/includes/form_errors.html" with form=form %}
             {% block determination_information %}
             {% endblock %}
-            <form class="form max-w-3xl flex-1"
+            <form class="flex-1 max-w-3xl form"
                   action="" method="post"
                   x-data="{ isFormSubmitting: false }"
                   x-on:submit="isFormSubmitting = true">
@@ -66,7 +66,7 @@ <h2>{{ value }}</h2>
             {% block show_submission %}
                 <aside :class="showSubmission ? 'flex-1 ps-4' : ''">
                     <section
-                        class="p-4 overflow-y-auto bg-white shadow-xl max-h-screen"
+                        class="overflow-y-auto p-4 max-h-screen bg-white shadow-xl"
                         x-show="showSubmission"
                         x-transition:enter="transition ease-out duration-250"
                         x-transition:enter-start="transform opacity-0 translate-x-full"
diff --git a/hypha/apply/determinations/templates/determinations/batch_determination_form.html b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
index c55a3c9709..ed3c7a9c9d 100644
--- a/hypha/apply/determinations/templates/determinations/batch_determination_form.html
+++ b/hypha/apply/determinations/templates/determinations/batch_determination_form.html
@@ -21,7 +21,7 @@
             {% for submission in submissions %}
                 <a href="{% url "funds:submissions:detail" submission.id %}" class="list-reveal__item" target="_blank" rel="noopener noreferrer" title="{{ submission.title }}">
                     {{ submission.title_text_display }}
-                    {% heroicon_micro "arrow-top-right-on-square" class="inline align-text-bottom w-4 h-4" aria_hidden=true %}
+                    {% heroicon_micro "arrow-top-right-on-square" class="inline w-4 h-4 align-text-bottom" aria_hidden=true %}
                 </a>
             {% endfor %}
         </div>
diff --git a/hypha/apply/determinations/templates/determinations/determination_detail.html b/hypha/apply/determinations/templates/determinations/determination_detail.html
index e1fc9c8c88..170a8913f7 100644
--- a/hypha/apply/determinations/templates/determinations/determination_detail.html
+++ b/hypha/apply/determinations/templates/determinations/determination_detail.html
@@ -16,14 +16,14 @@
 
     {% endadminbar %}
 
-    <div class="flex justify-between pt-2 mb-2 mt-2 max-w-[50em] border-b">
+    <div class="flex justify-between pt-2 mt-2 mb-2 border-b max-w-[50em]">
         <h5>
             {% trans "Determination" %}: {{ determination.get_outcome_display }}
         </h5>
         {% if request.user.is_apply_staff %}
             <a class="text-blue-500 hover:underline" href="{% url 'apply:submissions:determinations:edit' submission_pk=determination.submission.id pk=determination.id %}">
                 <span class="whitespace-nowrap">
-                    {% trans "Edit" %}{% heroicon_mini "pencil-square" size=18 class="inline ms-1 align-text-bottom" aria_hidden=true %}
+                    {% trans "Edit" %}{% heroicon_mini "pencil-square" size=18 class="inline align-text-bottom ms-1" aria_hidden=true %}
                 </span>
             </a>
         {% endif %}
diff --git a/hypha/apply/flags/templates/flags/flags.html b/hypha/apply/flags/templates/flags/flags.html
index 00f1d92de1..b26775c064 100644
--- a/hypha/apply/flags/templates/flags/flags.html
+++ b/hypha/apply/flags/templates/flags/flags.html
@@ -1,5 +1,5 @@
 {% load i18n flag_tags heroicons %}
-<form class="wrapper wrapper--sidebar-buttons flex gap-4" id="submission-flags">
+<form class="flex gap-4 wrapper wrapper--sidebar-buttons" id="submission-flags">
     {% with submission|flagged_by:user as is_flagged %}
         <button
             class="button button--secondary flex items-center gap-4 !px-2 !py-3 w-full"
diff --git a/hypha/apply/funds/templates/funds/application_base.html b/hypha/apply/funds/templates/funds/application_base.html
index 7fae0e3719..5147e91a7d 100644
--- a/hypha/apply/funds/templates/funds/application_base.html
+++ b/hypha/apply/funds/templates/funds/application_base.html
@@ -53,7 +53,7 @@ <h3>{% blocktrans %}Sorry this {{ page|verbose_name }} is not accepting applicat
                                     {{ field.block }}
                                 </div>
                             {% else %}
-                                <div class="field-block prose max-w-none">
+                                <div class="max-w-none field-block prose">
                                     {{ field.block }}
                                 </div>
                             {% endif %}
diff --git a/hypha/apply/funds/templates/funds/applicationrevision_list.html b/hypha/apply/funds/templates/funds/applicationrevision_list.html
index a307aca403..215c5b776b 100644
--- a/hypha/apply/funds/templates/funds/applicationrevision_list.html
+++ b/hypha/apply/funds/templates/funds/applicationrevision_list.html
@@ -11,7 +11,7 @@
     <div class="wrapper wrapper--medium">
         <ul class="my-8 border border-slate-300">
             {% for revision in object_list %}
-                <li class="flex flex-col justify-between p-4 border-b border-dashed first:bg-sky-blue last:border-0 md:flex-row">
+                <li class="flex flex-col justify-between p-4 border-b border-dashed md:flex-row last:border-0 first:bg-sky-blue">
                     <p class="m-0">
                         <span class="font-semibold">{{ revision.timestamp|date:"Y-m-d H:i e"}} </span>
                         {% trans "by" %} {{ revision.author }}
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index ff27dec13d..9558151910 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -21,14 +21,14 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
         <div hx-trigger="revealed, reviewerUpdated from:body" hx-get="{% url "funds:submissions:partial-reviews-card" object.id %}" hx-target="this">
             <div class="animate-pulse min-h-30">
-                <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                <div class="w-20 h-6 mb-3 bg-gray-200"></div>
+                <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                <div class="mb-3 w-20 h-6 bg-gray-200"></div>
             </div>
         </div>
 
-        <div class="wrapper wrapper--sidebar-buttons gap-4">
+        <div class="gap-4 wrapper wrapper--sidebar-buttons">
             {% include 'review/includes/review_button.html' with submission=object class="button--half-width" %}
             {% if request.user.is_apply_staff and object.reviews.exists %}
                 <a href="{% url 'apply:submissions:reviews:list' submission_pk=object.id %}" class="button button--white button--half-width">{% trans "View all" %}</a>
@@ -48,10 +48,10 @@ <h5>{% trans "Reviews & assignees" %}</h5>
          hx-target="this"
     >
         <div class="animate-pulse min-h-30">
-            <div class="w-full mb-3 bg-gray-200 h-9"></div>
-            <div class="w-full h-6 mb-1 bg-gray-200"></div>
-            <div class="w-full h-1 mb-3 bg-gray-200"></div>
-            <div class="w-20 h-6 mb-3 bg-gray-200"></div>
+            <div class="mb-3 w-full h-9 bg-gray-200"></div>
+            <div class="mb-1 w-full h-6 bg-gray-200"></div>
+            <div class="mb-3 w-full h-1 bg-gray-200"></div>
+            <div class="mb-3 w-20 h-6 bg-gray-200"></div>
         </div>
     </div>
 {% endblock %}
@@ -62,10 +62,10 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
 {% block reminders %}
     <div class="sidebar__inner">
-        <div class="flex justify-between gap-4 pb-4">
+        <div class="flex gap-4 justify-between pb-4">
             <h5 class="m-0">{% trans "Reminders" %}</h5>
             <button
-                class="flex items-center px-2 py-1 font-bold transition-colors rounded hover:bg-gray-100 text-dark-blue -me-2"
+                class="flex items-center py-1 px-2 font-bold rounded transition-colors hover:bg-gray-100 text-dark-blue -me-2"
                 hx-get="{% url 'funds:submissions:create_reminder' pk=object.pk %}"
                 hx-target="#htmx-modal"
                 role="button"
@@ -78,10 +78,10 @@ <h5 class="m-0">{% trans "Reminders" %}</h5>
 
         <div hx-trigger="load, remindersUpdated from:body" hx-get="{% url "funds:submissions:partial-reminder-card" object.id %}" hx-target="this">
             <div class="animate-pulse min-h-30">
-                <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                <div class="w-20 h-6 mb-3 bg-gray-200"></div>
+                <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                <div class="mb-3 w-20 h-6 bg-gray-200"></div>
             </div>
         </div>
     </div>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
index 413add3a1a..c76ac6b724 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_community_detail.html
@@ -7,10 +7,10 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
         <div hx-trigger="revealed" hx-get="{% url "funds:submissions:partial-reviews-card" object.id %}" hx-target="this">
             <div class="animate-pulse min-h-30">
-                <div class="w-full h-9 bg-gray-200 mb-3"></div>
-                <div class="w-full h-6 bg-gray-200 mb-1"></div>
-                <div class="w-full h-1 bg-gray-200 mb-3"></div>
-                <div class="w-20 h-6 bg-gray-200 mb-3"></div>
+                <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                <div class="mb-3 w-20 h-6 bg-gray-200"></div>
             </div>
         </div>
 
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
index 5a015982f2..44499fe923 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html
@@ -4,13 +4,13 @@
     {% csrf_token %}
 
     <div class="sm:flex sm:items-start">
-        <div class="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto bg-red-100 rounded-full sm:mx-0 sm:h-10 sm:w-10">
+        <div class="flex flex-shrink-0 justify-center items-center mx-auto w-12 h-12 bg-red-100 rounded-full sm:mx-0 sm:w-10 sm:h-10">
             {% heroicon_outline "exclamation-triangle" class="w-6 h-6 text-red-600" stroke_width="1.5" aria_hidden="true" %}
             {% comment %} <svg class="w-6 h-6 text-red-600" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" aria-hidden="true">
                 <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"></path>
             </svg> {% endcomment %}
         </div>
-        <div class="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
+        <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
             <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">Delete submission</h3>
             <div class="mt-2">
                 {% if request.user.is_applicant %}
@@ -33,15 +33,15 @@ <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">Del
         </div>
     </div>
 
-    <div class="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
         <button
             type="submit"
             x-bind:disabled="value !== 'delete'"
-            class="inline-flex justify-center w-full px-3 py-2 text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm hover:bg-red-500 sm:ml-3 sm:w-auto disabled:opacity-50 disabled:cursor-not-allowed"
+            class="inline-flex justify-center py-2 px-3 w-full text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm sm:ml-3 sm:w-auto hover:bg-red-500 disabled:opacity-50 disabled:cursor-not-allowed"
         >{% trans "Delete" %}</button>
         <button
             type="button"
-            class="inline-flex justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
index d3054a814a..fb131d7730 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -124,7 +124,7 @@ <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
                                     {% display_submission_author True %}
                                 </strong>
                             </span>
-                            <div class="flex gap-4 justify-end flex-1 items-center no-print">
+                            <div class="flex flex-1 gap-4 justify-end items-center no-print">
                                 {% can "delete_submission" object as can_delete_submission %}
                                 {% if can_delete_submission %}
                                     <a
@@ -194,22 +194,22 @@ <h5>{% blocktrans with stage=object.previous.stage %}Your {{ stage }} applicatio
                                 <h5>{% trans "Related submissions" %}</h5>
 
                                 {% if object.previous %}
-                                    <p class="mb-4"><a class="underline font-bold" href="{% url 'funds:submissions:detail' object.previous.id %}">{% trans "View linked" %} {{ object.previous.stage }}</a></p>
+                                    <p class="mb-4"><a class="font-bold underline" href="{% url 'funds:submissions:detail' object.previous.id %}">{% trans "View linked" %} {{ object.previous.stage }}</a></p>
                                 {% endif %}
 
                                 {% if object.next %}
-                                    <p class="mb-4"><a class="underline font-bold" href="{% url 'funds:submissions:detail' object.next.id %}">{% trans "View linked" %} {{ object.next.stage }}</a></p>
+                                    <p class="mb-4"><a class="font-bold underline" href="{% url 'funds:submissions:detail' object.next.id %}">{% trans "View linked" %} {{ object.next.stage }}</a></p>
                                 {% endif %}
 
                                 <section class="flex flex-col gap-2" data-js-collapse>
                                     {% for submission in other_submissions %}
                                         {% if forloop.first %}
-                                            <h6 class="text-fg-muted uppercase mb-0 pb-2 border-b font-semibold">
+                                            <h6 class="pb-2 mb-0 font-semibold uppercase border-b text-fg-muted">
                                                 {% trans "Other Submissions" %}
                                             </h6>
                                         {% endif %}
                                         <div>
-                                            <a class="font-bold line-clamp-2 hover:underline" href="{% url 'funds:submissions:detail' submission.id %}">
+                                            <a class="font-bold hover:underline line-clamp-2" href="{% url 'funds:submissions:detail' submission.id %}">
                                                 {{ submission.title }}
                                             </a>
                                             <div class="text-sm text-fg-muted">
diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
index 3bc8795e13..63bb4de4ff 100644
--- a/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
+++ b/hypha/apply/funds/templates/funds/applicationsubmission_reviewer_detail.html
@@ -14,10 +14,10 @@ <h5>{% trans "Reviews & assignees" %}</h5>
 
         <div hx-trigger="revealed" hx-get="{% url "funds:submissions:partial-reviews-card" object.id %}" hx-target="this">
             <div class="animate-pulse min-h-30">
-                <div class="w-full h-9 bg-gray-200 mb-3"></div>
-                <div class="w-full h-6 bg-gray-200 mb-1"></div>
-                <div class="w-full h-1 bg-gray-200 mb-3"></div>
-                <div class="w-20 h-6 bg-gray-200 mb-3"></div>
+                <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                <div class="mb-3 w-20 h-6 bg-gray-200"></div>
             </div>
         </div>
 
diff --git a/hypha/apply/funds/templates/funds/includes/create_reminder_form.html b/hypha/apply/funds/templates/funds/includes/create_reminder_form.html
index 835b5aa769..452fceafea 100644
--- a/hypha/apply/funds/templates/funds/includes/create_reminder_form.html
+++ b/hypha/apply/funds/templates/funds/includes/create_reminder_form.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="p-6 z-20">
+<div class="z-20 p-6">
     {% url 'funds:submissions:create_reminder' pk=object.pk as reminder_creation_url %}
     {% include 'funds/includes/dialog_form_base.html' with form=form value=value url=reminder_creation_url target="#id_reminders" data_var="reminderUpdated" %}
 </div>
diff --git a/hypha/apply/funds/templates/funds/includes/dialog_form_base.html b/hypha/apply/funds/templates/funds/includes/dialog_form_base.html
index efc89dd3d9..73dd257670 100644
--- a/hypha/apply/funds/templates/funds/includes/dialog_form_base.html
+++ b/hypha/apply/funds/templates/funds/includes/dialog_form_base.html
@@ -24,7 +24,7 @@
         {% endfor %}
     </div>
 
-    <div class="mt-5 sm:gap-4 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
         {% trans "Delete" as delete %}
         <button
             class="button button--{% if invert %}white{% elif value == delete %}warning{% else %}primary{% endif %} w-full sm:w-auto"
@@ -34,7 +34,7 @@
 
         <button
             type="button"
-            class="inline-flex items-center justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center items-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html b/hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html
index b9abfb1554..c3a8fddceb 100644
--- a/hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html
+++ b/hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html
@@ -4,10 +4,10 @@
     {% csrf_token %}
 
     <div class="sm:flex sm:items-start">
-        <div class="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto bg-red-100 rounded-full sm:mx-0 sm:h-10 sm:w-10">
+        <div class="flex flex-shrink-0 justify-center items-center mx-auto w-12 h-12 bg-red-100 rounded-full sm:mx-0 sm:w-10 sm:h-10">
             {% heroicon_outline "exclamation-triangle" class="w-6 h-6 text-red-600" stroke_width="1.5" aria_hidden="true" %}
         </div>
-        <div class="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
+        <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
             <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">Archive Submission</h3>
             <div class="mt-2">
                 <p class="text-sm text-gray-500">
@@ -20,14 +20,14 @@ <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">Arc
         </div>
     </div>
 
-    <div class="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
         <button
             type="submit"
-            class="inline-flex justify-center w-full px-3 py-2 text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm hover:bg-red-500 sm:ml-3 sm:w-auto disabled:opacity-50 disabled:cursor-not-allowed"
+            class="inline-flex justify-center py-2 px-3 w-full text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm sm:ml-3 sm:w-auto hover:bg-red-500 disabled:opacity-50 disabled:cursor-not-allowed"
         >{% trans "Archive" %}</button>
         <button
             type="button"
-            class="inline-flex justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html b/hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html
index 2574656b09..1374978ba9 100644
--- a/hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html
+++ b/hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html
@@ -4,10 +4,10 @@
     {% csrf_token %}
 
     <div class="sm:flex sm:items-start">
-        <div class="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto bg-red-100 rounded-full sm:mx-0 sm:h-10 sm:w-10">
+        <div class="flex flex-shrink-0 justify-center items-center mx-auto w-12 h-12 bg-red-100 rounded-full sm:mx-0 sm:w-10 sm:h-10">
             {% heroicon_outline "exclamation-triangle" class="w-6 h-6 text-red-600" stroke_width="1.5" aria_hidden="true" %}
         </div>
-        <div class="mt-3 text-center sm:ml-4 sm:mt-0 sm:text-left">
+        <div class="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
             <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">
                 {% trans "Unarchive Submission" %}
             </h3>
@@ -22,14 +22,14 @@ <h3 class="text-base font-semibold leading-6 text-gray-900" id="modal-title">
         </div>
     </div>
 
-    <div class="mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
         <button
             type="submit"
-            class="inline-flex justify-center w-full px-3 py-2 text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm hover:bg-red-500 sm:ml-3 sm:w-auto disabled:opacity-50 disabled:cursor-not-allowed"
+            class="inline-flex justify-center py-2 px-3 w-full text-sm font-semibold text-white bg-red-600 rounded-sm shadow-sm sm:ml-3 sm:w-auto hover:bg-red-500 disabled:opacity-50 disabled:cursor-not-allowed"
         >{% trans "Unarchive" %}</button>
         <button
             type="button"
-            class="inline-flex justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/funds/templates/funds/includes/reminders_block.html b/hypha/apply/funds/templates/funds/includes/reminders_block.html
index 822b024d40..0cd568cfa8 100644
--- a/hypha/apply/funds/templates/funds/includes/reminders_block.html
+++ b/hypha/apply/funds/templates/funds/includes/reminders_block.html
@@ -6,7 +6,7 @@
         <li><span class="font-semibold text-fg-muted">{{ action.grouper }}</span>
             <ul class='pt-1 divide-y'>
                 {% for reminder in action.list %}
-                    <li class="flex justify-between gap-4 py-1">
+                    <li class="flex gap-4 justify-between py-1">
                         <span class="{% if reminder.is_expired %}text-red-600{% endif %}">
                             <span class="font-medium line-clamp-2">{{ reminder.title|default:"untitled reminder" }}</span>
                             <datetime class="text-xs text-fg-muted" datetime="{{ reminder.time|date:"c" }}">
diff --git a/hypha/apply/funds/templates/funds/includes/rendered_answers.html b/hypha/apply/funds/templates/funds/includes/rendered_answers.html
index a169981598..c391362483 100644
--- a/hypha/apply/funds/templates/funds/includes/rendered_answers.html
+++ b/hypha/apply/funds/templates/funds/includes/rendered_answers.html
@@ -2,7 +2,7 @@
 {% if request.user|can_translate_submission %}
     {% if from_lang_name and to_lang_name %}
         {# For active translations #}
-        <div class="w-full text-center my-2 py-5 border rounded-lg shadow-md">
+        <div class="py-5 my-2 w-full text-center rounded-lg border shadow-md">
             <span>
                 {% heroicon_outline "language" aria_hidden="true" size=15 stroke_width=2 class="inline align-baseline me-1" %}
                 {% blocktrans %} This application is translated from {{from_lang_name}} to {{to_lang_name}}. {% endblocktrans %}
@@ -13,12 +13,12 @@
         </div>
     {% else %}
         {# For a translation loading indicator #}
-        <div id="translate-card-loading" class="w-full text-center h-0 m-0 p-0 overflow-hidden content-center rounded-lg shadow-md animate-pulse htmx-indicator">
-            <span class="w-[490px] bg-gray-200 rounded-lg"></span>
+        <div id="translate-card-loading" class="overflow-hidden content-center p-0 m-0 w-full h-0 text-center rounded-lg shadow-md animate-pulse htmx-indicator">
+            <span class="bg-gray-200 rounded-lg w-[490px]"></span>
         </div>
     {% endif %}
 {% endif %}
-<h3 class="text-xl border-b pb-2 font-bold">{% trans "Proposal Information" %}</h3>
+<h3 class="pb-2 text-xl font-bold border-b">{% trans "Proposal Information" %}</h3>
 <div class="hypha-grid hypha-grid--proposal-info">
     {% if object.get_value_display != "-" %}
         <div>
@@ -37,7 +37,7 @@ <h5 class="text-base">{% trans "Project Duration" %}</h5>
     {# Hide potential applicant PII if warranted #}
     {% if object|show_applicant_identity:request.user %}
         <div>
-            <h5 class="text-base inline">{% trans "Legal Name" %}</h5>{% if request.user.is_apply_staff %} <span class="text-sm">(<a class="underline" href="{% url 'wagtailusers_users:edit' object.user_id %}">{% trans "Edit" %}</a>)</span>{% endif %}
+            <h5 class="inline text-base">{% trans "Legal Name" %}</h5>{% if request.user.is_apply_staff %} <span class="text-sm">(<a class="underline" href="{% url 'wagtailusers_users:edit' object.user_id %}">{% trans "Edit" %}</a>)</span>{% endif %}
             {{ object.get_full_name_display }}
         </div>
         <div>
diff --git a/hypha/apply/funds/templates/funds/includes/review_sidebar.html b/hypha/apply/funds/templates/funds/includes/review_sidebar.html
index b2a31d83e8..dd3970b61a 100644
--- a/hypha/apply/funds/templates/funds/includes/review_sidebar.html
+++ b/hypha/apply/funds/templates/funds/includes/review_sidebar.html
@@ -1,6 +1,6 @@
 {% load i18n review_tags %}
 
-<div class="flex items-center justify-around px-2 bg-gray-100">
+<div class="flex justify-around items-center px-2 bg-gray-100">
     {% with recommendation|traffic_light as traffic_light_html %}
         {% if traffic_light_html %}
             <span class="py-1">
diff --git a/hypha/apply/funds/templates/funds/includes/review_sidebar_item.html b/hypha/apply/funds/templates/funds/includes/review_sidebar_item.html
index 8d3fa7c570..a76e297fc4 100644
--- a/hypha/apply/funds/templates/funds/includes/review_sidebar_item.html
+++ b/hypha/apply/funds/templates/funds/includes/review_sidebar_item.html
@@ -67,7 +67,7 @@
         <div></div>
         <div class="reviews-sidebar__outcome {{ opinion.get_opinion_display|slugify }}">{{ opinion.get_opinion_display}}</div>
         <div class="text-center"><a href="{% url 'apply:submissions:reviews:delete_opinion' submission_pk=opinion.review.submission.id pk=opinion.id %}">
-            {% heroicon_outline "trash" aria_hidden="true" size=14 class="stroke-red-800 align-middle inline" %}</a>
+            {% heroicon_outline "trash" aria_hidden="true" size=14 class="inline align-middle stroke-red-800" %}</a>
         </div>
     </li>
     {% if forloop.last %}
diff --git a/hypha/apply/funds/templates/funds/includes/round-block.html b/hypha/apply/funds/templates/funds/includes/round-block.html
index 4f456936fd..618b8328ec 100644
--- a/hypha/apply/funds/templates/funds/includes/round-block.html
+++ b/hypha/apply/funds/templates/funds/includes/round-block.html
@@ -4,7 +4,7 @@
      x-init="activeTab = window.location.hash && ['#open-rounds', '#closed-rounds'].includes(window.location.hash) ? window.location.hash.substring(1) : activeTab"
 >
     <section class="flex flex-col justify-between items-center md:flex-row">
-        <h3 class="text-xl mb-2">
+        <h3 class="mb-2 text-xl">
             <a href="{% url 'apply:rounds:list' %}">{{ title }}</a>
         </h3>
         <div>
diff --git a/hypha/apply/funds/templates/funds/includes/screening_status_block-button.html b/hypha/apply/funds/templates/funds/includes/screening_status_block-button.html
index a769565c42..58aec87536 100644
--- a/hypha/apply/funds/templates/funds/includes/screening_status_block-button.html
+++ b/hypha/apply/funds/templates/funds/includes/screening_status_block-button.html
@@ -67,16 +67,16 @@
             @keydown.down.prevent="$focus.wrap().next()"
             @keydown.up.prevent="$focus.wrap().previous()"
         >
-            <header class="subheading border-b px-3 py-2 flex justify-between items-center gap-2">
-                <span class="SubMenuHeading font-medium text-inherit">Options</span>
+            <header class="flex gap-2 justify-between items-center py-2 px-3 border-b subheading">
+                <span class="font-medium SubMenuHeading text-inherit">Options</span>
                 <button type="button" @click='isOpen = false' class="appearance-none">
                     {% heroicon_mini "x-mark" aria_hidden="true" width=16 height=16 class="stroke-1 hover:stroke-2" %}
                 </button>
             </header>
-            <div class="divide-y font-semibold text-inherit">
+            <div class="font-semibold divide-y text-inherit">
                 {% for status in screening_options  %}
                     {% if current_status.id == status.id %}
-                        <span class="text-gray-800 flex items-center gap-2 pe-2 py-2 ps-2 font-medium bg-gray-100">
+                        <span class="flex gap-2 items-center py-2 font-medium text-gray-800 bg-gray-100 pe-2 ps-2">
                             <span class="w-4">
                                 {% heroicon_mini "check" aria_hidden="true" size=18 class="stroke-2 me-1" %}
                             </span>
@@ -98,7 +98,7 @@
                 {% endfor %}
                 {% if current_status %}
                     <a
-                        class="flex ps-8 pe-3 cursor-pointer hover:bg-light-blue/10 py-3 font-normal text-red-600 whitespace-nowrap"
+                        class="flex py-3 font-normal text-red-600 whitespace-nowrap cursor-pointer ps-8 pe-3 hover:bg-light-blue/10"
                         role='button'
                         hx-post="{% url 'funds:submissions:partial-screening-card' object.id %}"
                         hx-swap="outerHTML"
diff --git a/hypha/apply/funds/templates/funds/includes/status-block.html b/hypha/apply/funds/templates/funds/includes/status-block.html
index a80f3caddd..4a6aef70bd 100644
--- a/hypha/apply/funds/templates/funds/includes/status-block.html
+++ b/hypha/apply/funds/templates/funds/includes/status-block.html
@@ -4,8 +4,8 @@
         <ul class="status-block">
             {% for status, data in status_counts.items %}
                 <a class="status-block__item {% if data.is_active %}status-block__item--active{% endif %}" href="{{ data.url }}">
-                    <p class="status-block__title text-black"><strong>{{ data.name }}</strong></p>
-                    <p class="status-block__info text-gray-400">{{ data.count }} {{ type }}</p>
+                    <p class="text-black status-block__title"><strong>{{ data.name }}</strong></p>
+                    <p class="text-gray-400 status-block__info">{{ data.count }} {{ type }}</p>
                 </a>
             {% endfor %}
         </ul>
diff --git a/hypha/apply/funds/templates/funds/includes/status_bar.html b/hypha/apply/funds/templates/funds/includes/status_bar.html
index d54e5ab458..7bcab64d92 100644
--- a/hypha/apply/funds/templates/funds/includes/status_bar.html
+++ b/hypha/apply/funds/templates/funds/includes/status_bar.html
@@ -14,7 +14,7 @@
         {% endifchanged %}
     {% endfor %}
 </div>
-<div class="status-bar--mobile mt-5">
+<div class="mt-5 status-bar--mobile">
     <div class="status-bar__subheading status-bar__text">
         {% if public %}
             {{ current_phase.public_name }}
diff --git a/hypha/apply/funds/templates/funds/includes/submission-list-row.html b/hypha/apply/funds/templates/funds/includes/submission-list-row.html
index 3ab1c1400a..527114254c 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-list-row.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-list-row.html
@@ -1,17 +1,17 @@
 {% load i18n heroicons querystrings %}
 {% load show_applicant_identity from workflow_tags %}
 
-<div class="relative flex-wrap w-full px-2 py-1 border-t last:border-b border-x md:flex md:flex-nowrap hover:bg-gray-100">
+<div class="relative flex-wrap py-1 px-2 w-full border-t md:flex md:flex-nowrap last:border-b hover:bg-gray-100 border-x">
 
     {% comment %} Select {% endcomment %}
     {% if enable_selection %}
-        <label class="hidden ps-1 py-2.5 sm:inline-flex">
+        <label class="hidden py-2.5 sm:inline-flex ps-1">
             <input id="submission-{{ s.id }}"
                    type="checkbox"
                    value="{{ s.id }}"
                    x-model="selectedSubmissions"
                    name="selectedSubmissionIds"
-                   class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"
+                   class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-2 focus:ring-blue-500"
             >
             <span class="sr-only">{% trans "Select submission" %} #{{ s.id }}</span>
         </label>
@@ -21,26 +21,26 @@
     <span class="inline-block pt-2 select-none sm:ps-2" tabindex="-1">
         {% if s.is_archive %}
             {% trans "Archived Submission" as text_archived %}
-            {% heroicon_outline "lock-closed" aria_hidden="true" size=21 class="inline stroke-red-800 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=text_archived data_tippy_delay=200 %}
+            {% heroicon_outline "lock-closed" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom stroke-red-800 stroke-1.5" data_tippy_placement='right' data_tippy_content=text_archived data_tippy_delay=200 %}
             <span class="sr-only">{% trans "Archived" %}</span>
         {% elif s.get_current_screening_status %}
             {% if s.get_yes_screening_status %}
-                {% heroicon_mini "hand-thumb-up" aria_hidden="true" size=21 class="inline fill-green-400 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
+                {% heroicon_mini "hand-thumb-up" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom fill-green-400 stroke-1.5" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
             {% else %}
-                {% heroicon_mini "hand-thumb-down" aria_hidden="true" size=21 class="inline fill-red-400 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
+                {% heroicon_mini "hand-thumb-down" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom fill-red-400 stroke-1.5" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
             {% endif %}
         {% else %}
-            {% heroicon_outline "question-mark-circle" aria_hidden="true" size=21 class="inline stroke-slate-300 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content="Awaiting Screening" data_tippy_delay=200 %}
+            {% heroicon_outline "question-mark-circle" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom stroke-slate-300 stroke-1.5" data_tippy_placement='right' data_tippy_content="Awaiting Screening" data_tippy_delay=200 %}
         {% endif %}
     </span>
 
     {% comment %} Title {% endcomment %}
-    <div class="min-w-0 px-2 pt-1 space-y-1 md:pb-2 md:space-y-0 md:flex md:flex-col md:flex-auto">
+    <div class="px-2 pt-1 space-y-1 min-w-0 md:flex md:flex-col md:flex-auto md:pb-2 md:space-y-0">
         <span>
             <a
                 title="{{ s.form_data.title }}"
                 href="{% url "funds:submissions:detail" s.id %}?ref=all-alt"
-                class="font-semibold text-base text-[#404041] hover:text-blue-600 transition-colors break-words"
+                class="text-base font-semibold break-words transition-colors hover:text-blue-600 text-[#404041]"
             >{{ s.form_data.title }}</a>
 
             <a
@@ -62,7 +62,7 @@
                         hx-swap="outerHTML"
                         data-tippy-content="Meta Term: {{meta_term.name}}"
                         data-tippy-placement="top"
-                        class="hover:opacity-70 transition-opacity rounded-full whitespace-nowrap inline-block ms-1 px-2 pt-0.5 pb-1 text-xs font-medium text-slate-900 bg-slate-200"
+                        class="inline-block px-2 pt-0.5 pb-1 text-xs font-medium whitespace-nowrap rounded-full transition-opacity hover:opacity-70 ms-1 text-slate-900 bg-slate-200"
                     >{{meta_term.name}}</a>
                 {% endfor %}
             {% endif %}
@@ -79,20 +79,20 @@
                     hx-target="#main"
                     hx-push-url="true"
                     hx-swap="outerHTML"
-                    class="text-inherit hover:underline"
+                    class="hover:underline text-inherit"
                 >{{ s.user }}</a>{% endif %} • {{ s.stage }} •
 
 
                 {% if 'round' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
                     {% if s.round %}
-                        {% heroicon_outline "briefcase" aria_hidden="true" size=15 class="stroke-1.5 inline align-text-bottom me-1" %}
+                        {% heroicon_outline "briefcase" aria_hidden="true" size=15 class="inline align-text-bottom stroke-1.5 me-1" %}
                         <a
                             hx-get="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" round=s.round.id %}"
                             href="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" round=s.round.id %}"
                             hx-target="#main"
                             hx-push-url="true"
                             hx-swap="outerHTML"
-                            class="text-inherit hover:underline"
+                            class="hover:underline text-inherit"
                         >{{ s.round }}</a>
 
                         {% if 'fund' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
@@ -102,19 +102,19 @@
                                 hx-target="#main"
                                 hx-push-url="true"
                                 hx-swap="outerHTML"
-                                class="text-inherit hover:underline"
+                                class="hover:underline text-inherit"
                             >{{ s.page }}</a>)
                         {% endif %}
                     {% else %}
                         {% comment %} Render lab {% endcomment %}
-                        {% heroicon_outline "briefcase" aria_hidden="true" size=15 class="stroke-1.5 inline align-text-bottom" %}
+                        {% heroicon_outline "briefcase" aria_hidden="true" size=15 class="inline align-text-bottom stroke-1.5" %}
                         <a
                             hx-get="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" fund=s.page.id %}"
                             href="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" fund=s.page.id %}"
                             hx-target="#main"
                             hx-push-url="true"
                             hx-swap="outerHTML"
-                            class="text-inherit hover:underline"
+                            class="hover:underline text-inherit"
                         >
                             {{ s.page }}</a>
                     {% endif %}
@@ -127,13 +127,13 @@
     <div class="flex gap-2 p-2">
         {% if 'lead' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
             {% comment %} Lead {% endcomment %}
-            <span class="relative inline-block w-32 py-1 text-xs font-medium">
+            <span class="inline-block relative py-1 w-32 text-xs font-medium">
                 <div
                     data-tippy-content="Assigned to {{ s.lead }}"
                     data-tippy-placement="left"
-                    class="truncate flex gap-1"
+                    class="flex gap-1 truncate"
                 >
-                    {% comment %} <span class="text-xs text-fg-muted block mb-1">Lead: </span> {% endcomment %}
+                    {% comment %} <span class="block mb-1 text-xs text-fg-muted">Lead: </span> {% endcomment %}
                     {% heroicon_micro "user-circle" aria_hidden="true" size=16 class="fill-fg-muted" %}
                     <a
                         hx-get="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" leads=s.lead.id %}"
@@ -141,7 +141,7 @@
                         hx-target="#main"
                         hx-push-url="true"
                         hx-swap="outerHTML"
-                        class="text-inherit hover:underline"
+                        class="hover:underline text-inherit"
                     >
                         {{ s.lead }}
                     </a>
@@ -153,7 +153,7 @@
             {% comment %} Reviews {% endcomment %}
             <span class="inline-block w-16">
                 <div
-                    class="relative items-center w-full gap-1 text-sm group"
+                    class="relative gap-1 items-center w-full text-sm group"
                     hx-trigger="mouseover once"
                     hx-get="{% url "funds:submissions:partial-reviews-card" s.id %}"
                     hx-target="find .review-hovercard"
@@ -166,14 +166,14 @@
                     </span>
 
                     <div
-                        class="absolute z-10 hidden w-64 p-2 bg-white border rounded shadow-lg review-hovercard bottom-6 -end-1/2 md:-end-4 group-hover:block"
+                        class="hidden absolute bottom-6 z-10 p-2 w-64 bg-white rounded border shadow-lg group-hover:block review-hovercard -end-1/2 md:-end-4"
                     >
                         {% comment %} pre-loading animation {% endcomment %}
                         <div class="animate-pulse min-h-30">
-                            <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                            <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                            <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                            <div class="w-1/2 h-6 mb-3 bg-gray-200"></div>
+                            <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                            <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                            <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                            <div class="mb-3 w-1/2 h-6 bg-gray-200"></div>
                         </div>
                     </div>
                 </div>
diff --git a/hypha/apply/funds/templates/funds/includes/submission-table-row.html b/hypha/apply/funds/templates/funds/includes/submission-table-row.html
index efec3f0735..ecf3d720c8 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-table-row.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-table-row.html
@@ -2,10 +2,10 @@
 {% load show_applicant_identity from workflow_tags %}
 
 <tr
-    class="relative px-2 py-1 border hover:bg-gray-100"
+    class="relative py-1 px-2 border hover:bg-gray-100"
 >
     {% if enable_selection %}
-        <td class="hidden p-2 md:table-cell text-center align-top">
+        <td class="hidden p-2 text-center align-top md:table-cell">
             <!-- select -->
             <label class="py-2.5">
                 <input id="submission-{{ s.id }}"
@@ -13,7 +13,7 @@
                        value="{{ s.id }}"
                        x-model="selectedSubmissions"
                        name="selectedSubmissionIds"
-                       class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"
+                       class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-2 focus:ring-blue-500"
                 >
                 <span class="sr-only">{% trans "Select submission" %} #{{ s.id }}</span>
             </label>
@@ -24,16 +24,16 @@
         <div class="py-1" tabindex="-1">
             {% if s.is_archive %}
                 {% trans "Archived Submission" as text_archived %}
-                {% heroicon_outline "lock-closed" aria_hidden="true" size=21 class="inline stroke-red-800 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=text_archived data_tippy_delay=200 %}
+                {% heroicon_outline "lock-closed" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom stroke-red-800 stroke-1.5" data_tippy_placement='right' data_tippy_content=text_archived data_tippy_delay=200 %}
                 <span class="sr-only">{% trans "Archived" %}</span>
             {% elif s.get_current_screening_status %}
                 {% if s.get_yes_screening_status %}
-                    {% heroicon_mini "hand-thumb-up" aria_hidden="true" size=21 class="inline fill-green-400 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
+                    {% heroicon_mini "hand-thumb-up" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom fill-green-400 stroke-1.5" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
                 {% else %}
-                    {% heroicon_mini "hand-thumb-down" aria_hidden="true" size=21 class="inline fill-red-400 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
+                    {% heroicon_mini "hand-thumb-down" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom fill-red-400 stroke-1.5" data_tippy_placement='right' data_tippy_content=s.get_current_screening_status data_tippy_delay=200 %}
                 {% endif %}
             {% else %}
-                {% heroicon_outline "question-mark-circle" aria_hidden="true" size=21 class="inline stroke-slate-300 stroke-1.5 -mt-1 align-text-bottom" data_tippy_placement='right' data_tippy_content="Awaiting Screening" data_tippy_delay=200 %}
+                {% heroicon_outline "question-mark-circle" aria_hidden="true" size=21 class="inline -mt-1 align-text-bottom stroke-slate-300 stroke-1.5" data_tippy_placement='right' data_tippy_content="Awaiting Screening" data_tippy_delay=200 %}
             {% endif %}
         </div>
     </td>
@@ -43,7 +43,7 @@
         <a
             title="{{ s.form_data.title }}"
             href="{% url "funds:submissions:detail" s.id %}?ref=table-view"
-            class="font-semibold text-base text-[#404041] hover:text-blue-600 transition-colors break-words line-clamp-2"
+            class="text-base font-semibold break-words transition-colors hover:text-blue-600 text-[#404041] line-clamp-2"
         >{{ s.form_data.title }}</a>
         <div class="text-xs text-fg-muted">
             #{{ s.public_id|default:s.id }}
@@ -71,7 +71,7 @@
                 hx-target="#main"
                 hx-push-url="true"
                 hx-swap="outerHTML"
-                class="text-inherit hover:underline"
+                class="hover:underline text-inherit"
             >
                 {{ s.user }}
             </a>
@@ -83,7 +83,7 @@
 
     {% if "round" not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
         <!-- fund -->
-        <td class="p-2 text-sm align-top text-center">
+        <td class="p-2 text-sm text-center align-top">
             {% if s.round %}
                 <a
                     href="{% url "apply:submissions:list" %}{% modify_query "only_query_string" "page" round=s.round.id %}"
@@ -91,7 +91,7 @@
                     hx-target="#main"
                     hx-push-url="true"
                     hx-swap="outerHTML"
-                    class="text-inherit hover:underline"
+                    class="hover:underline text-inherit"
                 >{{ s.round }}</a>
                 {% if 'fund' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
                     <span class="text-xs text-fg-muted"> / {{ s.page }}</span>
@@ -103,7 +103,7 @@
                     hx-target="#main"
                     hx-push-url="true"
                     hx-swap="outerHTML"
-                    class="text-inherit hover:underline"
+                    class="hover:underline text-inherit"
                 >
                     {{ s.page }}
                 </a>
@@ -119,7 +119,7 @@
                 hx-target="#main"
                 hx-push-url="true"
                 hx-swap="outerHTML"
-                class="text-inherit hover:underline"
+                class="hover:underline text-inherit"
             >{{ s.lead }}</a>
         </td>
     {% endif %}
@@ -129,7 +129,7 @@
                 {% comment %} Reviews {% endcomment %}
                 <span class="inline-block w-16">
                     <div
-                        class="relative items-center w-full gap-1 text-sm group"
+                        class="relative gap-1 items-center w-full text-sm group"
                         hx-trigger="mouseover once"
                         hx-get="{% url "funds:submissions:partial-reviews-card" s.id %}"
                         hx-target="find .review-hovercard"
@@ -142,14 +142,14 @@
                         </span>
 
                         <div
-                            class="absolute z-10 hidden w-64 p-2 bg-white border rounded shadow-lg review-hovercard bottom-6 -end-1/2 md:-end-4 group-hover:block"
+                            class="hidden absolute bottom-6 z-10 p-2 w-64 bg-white rounded border shadow-lg group-hover:block review-hovercard -end-1/2 md:-end-4"
                         >
                                 {% comment %} pre-loading animation {% endcomment %}
                             <div class="animate-pulse min-h-30">
-                                <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                                <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                                <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                                <div class="w-1/2 h-6 mb-3 bg-gray-200"></div>
+                                <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                                <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                                <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                                <div class="mb-3 w-1/2 h-6 bg-gray-200"></div>
                             </div>
                         </div>
                     </div>
diff --git a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
index a430744f99..a7e5ebfd25 100644
--- a/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
+++ b/hypha/apply/funds/templates/funds/includes/table_filter_and_search.html
@@ -22,17 +22,17 @@ <h2 class="mb-2 text-xl">{{ heading }}</h2>
         </div>
 
         {# Right #}
-        <div class="flex items-center gap-4">
+        <div class="flex gap-4 items-center">
             {% get_query 'archived' as archived_param %}
             {% if show_archive %}
                 {% if request.GET.archived == '1' %}
                     <a
-                        class="px-3 py-1.5 flex items-center transition-colors rounded hover:bg-gray-100 hover:shadow-sm"
+                        class="flex items-center py-1.5 px-3 rounded transition-colors hover:bg-gray-100 hover:shadow-sm"
                         href="{% modify_query archived='0' %}"
                     >{% trans "Hide Archived" %}</a>
                 {% else %}
                     <a
-                        class="px-3 py-1.5 flex items-center transition-colors rounded hover:bg-gray-100 hover:shadow-sm"
+                        class="flex items-center py-1.5 px-3 rounded transition-colors hover:bg-gray-100 hover:shadow-sm"
                         href="{% modify_query archived='1' %}"
                     >{% trans "Show Archived" %}</a>
                 {% endif %}
@@ -40,7 +40,7 @@ <h2 class="mb-2 text-xl">{{ heading }}</h2>
             {% with request.get_full_path as path %}
                 {% if 'submission' in path and can_export %}
                     <a
-                        class="px-2 py-1.5 flex items-center transition-colors border rounded hover:bg-gray-100 shadow-sm"
+                        class="flex items-center py-1.5 px-2 rounded border shadow-sm transition-colors hover:bg-gray-100"
                         aria-label="Submissions: Download as CSV"
                         href="{{path}}{% if '?' in path %}&{%else%}?{% endif %}export=true"
                         onclick="return confirm('{% blocktrans %}Are you sure you want to download the submissions as a csv file? This file may contain sensitive information, so please handle it carefully.{% endblocktrans %}');"
@@ -75,7 +75,7 @@ <h2 class="mb-2 text-xl">{{ heading }}</h2>
                     {% endif %}
                     {% trans "submissions" as submissions %}
                     <input
-                        class="rounded shadow-sm input input--search input--secondary md:w-48"
+                        class="rounded shadow-sm md:w-48 input input--search input--secondary"
                         type="text"
                         placeholder="{% trans 'Search' %} {{ search_placeholder|default:submissions }}"
                         name="query"
diff --git a/hypha/apply/funds/templates/funds/includes/translate_application_form.html b/hypha/apply/funds/templates/funds/includes/translate_application_form.html
index f7552c8180..0df997d333 100644
--- a/hypha/apply/funds/templates/funds/includes/translate_application_form.html
+++ b/hypha/apply/funds/templates/funds/includes/translate_application_form.html
@@ -27,7 +27,7 @@
                 </div>
             {% endfor %}
         {% endif %}
-        <div class="flex mt-3 justify-center space-x-2">
+        <div class="flex justify-center mt-3 space-x-2">
             <fieldset class="w-2/5">
                 <div>
                     {{ form.from_lang }}
@@ -44,14 +44,14 @@
         </div>
     </div>
 
-    <div class="mt-5 sm:gap-4 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
 
         {# Button text inserted below to prevent redundant translations #}
-        <button id="translate-btn" class="w-full button button--primary sm:w-auto" type="submit"></button>
+        <button id="translate-btn" class="w-full sm:w-auto button button--primary" type="submit"></button>
 
         <button
             type="button"
-            class="inline-flex items-center justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center items-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
         <span class="inline-block" data-tooltip="{% trans "Translations are an experimental feature and may be inaccurate" %}">{% heroicon_outline "information-circle" aria_hidden="true" size=15 stroke_width=2 class="inline align-baseline me-1" %}</span>
diff --git a/hypha/apply/funds/templates/funds/includes/update_reviewer_form.html b/hypha/apply/funds/templates/funds/includes/update_reviewer_form.html
index ad9536e521..a48f1c30e2 100644
--- a/hypha/apply/funds/templates/funds/includes/update_reviewer_form.html
+++ b/hypha/apply/funds/templates/funds/includes/update_reviewer_form.html
@@ -44,16 +44,16 @@
         {% endfor %}
     </div>
 
-    <div class="mt-5 sm:gap-4 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
         <button
-            class="w-full button button--primary sm:w-auto"
+            class="w-full sm:w-auto button button--primary"
             type="submit">
             {% trans "Update" %}
         </button>
 
         <button
             type="button"
-            class="inline-flex items-center justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center items-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/funds/templates/funds/revisions_compare.html b/hypha/apply/funds/templates/funds/revisions_compare.html
index e810ea8bc8..93b222bebb 100644
--- a/hypha/apply/funds/templates/funds/revisions_compare.html
+++ b/hypha/apply/funds/templates/funds/revisions_compare.html
@@ -17,7 +17,7 @@
 
     {% endadminbar %}
 
-    <table class="prose prose-h4:mt-0 max-w-none mb-8">
+    <table class="mb-8 max-w-none prose prose-h4:mt-0">
         <tr>
             <td>
                 <h3>{% trans "Proposal Information (Old)" %}</h3>
diff --git a/hypha/apply/funds/templates/funds/submission-success.html b/hypha/apply/funds/templates/funds/submission-success.html
index 18058b4846..76f5d5474b 100644
--- a/hypha/apply/funds/templates/funds/submission-success.html
+++ b/hypha/apply/funds/templates/funds/submission-success.html
@@ -3,7 +3,7 @@
 {% block body_class %}{% endblock %}
 
 {% block content %}
-    <div class="wrapper max-w-2xl mt-8">
+    <div class="mt-8 max-w-2xl wrapper">
         {% if form_submission.status == 'draft' %}
             <h3>{% trans "Your application is saved as a draft." %}</h3>
 
diff --git a/hypha/apply/funds/templates/funds/submission_sealed.html b/hypha/apply/funds/templates/funds/submission_sealed.html
index af8755414d..9a76d9eb3b 100644
--- a/hypha/apply/funds/templates/funds/submission_sealed.html
+++ b/hypha/apply/funds/templates/funds/submission_sealed.html
@@ -6,7 +6,7 @@
 {% block content %}
     <div class="admin-bar">
         <div class="admin-bar__inner">
-            <h1 class="text-2xl mb-2 font-medium md:text-3xl md:m-0">{{ object.title }}</h1>
+            <h1 class="mb-2 text-2xl font-medium md:m-0 md:text-3xl">{{ object.title }}</h1>
             <h5 class="heading heading--meta">
                 <span>{{ object.stage }}</span>
                 <span>{{ object.page }}</span>
diff --git a/hypha/apply/funds/templates/funds/submissions_result.html b/hypha/apply/funds/templates/funds/submissions_result.html
index ac0c7df1bb..5a595af2f8 100644
--- a/hypha/apply/funds/templates/funds/submissions_result.html
+++ b/hypha/apply/funds/templates/funds/submissions_result.html
@@ -13,55 +13,55 @@
         <section class="wrapper wrapper--bottom-space">
             <h3>{% trans "Summary" %}</h3>
 
-            <div class="grid grid-cols-[repeat(auto-fit,minmax(300px,1fr))] gap-4 lg:gap-8">
-                <section class="border p-4 shadow" aria-labelledby="amounts-heading">
+            <div class="grid gap-4 lg:gap-8 grid-cols-[repeat(auto-fit,minmax(300px,1fr))]">
+                <section class="p-4 border shadow" aria-labelledby="amounts-heading">
                     <h5 id="amounts-heading">{% trans "Amounts" %}</h5>
 
                     <div class="flex flex-wrap gap-4">
                         <dl role="list" aria-label="{% trans 'Applied amounts' %}" class="flex-grow">
-                            <dt class="text-fg-muted pb-2 border-b">{% trans "Applied" %} ({% get_currency_symbol %})</dt>
-                            <dd class="text-xl font-semibold pt-2">{{ submission_sum|default:"0"|format_number_as_currency }}</dd>
+                            <dt class="pb-2 border-b text-fg-muted">{% trans "Applied" %} ({% get_currency_symbol %})</dt>
+                            <dd class="pt-2 text-xl font-semibold">{{ submission_sum|default:"0"|format_number_as_currency }}</dd>
                         </dl>
                         <dl role="list" aria-label="{% trans 'Accepted amounts' %}" class="flex-grow">
-                            <dt class="text-fg-muted pb-2 border-b">{% trans "Accepted" %} ({% get_currency_symbol %})</dt>
-                            <dd class="text-xl font-semibold pt-2">{{ submission_accepted_sum|default:"0"|format_number_as_currency }}</dd>
+                            <dt class="pb-2 border-b text-fg-muted">{% trans "Accepted" %} ({% get_currency_symbol %})</dt>
+                            <dd class="pt-2 text-xl font-semibold">{{ submission_accepted_sum|default:"0"|format_number_as_currency }}</dd>
                         </dl>
                     </div>
                 </section>
 
-                <section class="border p-4 shadow" aria-labelledby="submissions-heading">
+                <section class="p-4 border shadow" aria-labelledby="submissions-heading">
                     <h5 id="submissions-heading">{% trans "Submissions" %}</h5>
                     <div class="grid grid-cols-3 gap-4">
                         <dl role="list" aria-label="{% trans 'Applied submissions' %}">
-                            <dt class="text-fg-muted pb-2 border-b">{% trans "Applied" %}</dt>
-                            <dd class="text-xl font-semibold pt-2">{{ object_list.count }}</dd>
+                            <dt class="pb-2 border-b text-fg-muted">{% trans "Applied" %}</dt>
+                            <dd class="pt-2 text-xl font-semibold">{{ object_list.count }}</dd>
                         </dl>
                         <dl role="list" aria-label="{% trans 'Accepted submissions' %}">
-                            <dt class="text-fg-muted pb-2 border-b">{% trans "Accepted" %}</dt>
-                            <dd class="text-xl font-semibold pt-2">{{ submission_accepted_count|default:"0" }}</dd>
+                            <dt class="pb-2 border-b text-fg-muted">{% trans "Accepted" %}</dt>
+                            <dd class="pt-2 text-xl font-semibold">{{ submission_accepted_count|default:"0" }}</dd>
                         </dl>
                         <dl role="list" aria-label="{% trans 'Pending submissions' %}">
-                            <dt class="text-fg-muted pb-2 border-b">{% trans "Pending" %}</dt>
-                            <dd class="text-xl font-semibold pt-2">{{ submission_undetermined_count|default:"0" }}</dd>
+                            <dt class="pb-2 border-b text-fg-muted">{% trans "Pending" %}</dt>
+                            <dd class="pt-2 text-xl font-semibold">{{ submission_undetermined_count|default:"0" }}</dd>
                         </dl>
                     </div>
                 </section>
 
-                <section class="border p-4 shadow" aria-labelledby="reviews-heading">
+                <section class="p-4 border shadow" aria-labelledby="reviews-heading">
                     <h5 id="reviews-heading">{% trans "Reviews" %}</h5>
-                    <div class="mb-0 mt-2">
+                    <div class="mt-2 mb-0">
                         <div class="grid grid-cols-4 gap-4">
                             <dl role="list" aria-label="{% trans 'All reviews' %}">
-                                <dt class="text-fg-muted pb-2 border-b">{% trans "All" %}</dt>
-                                <dd class="text-xl font-semibold pt-2">{{ review_count|default:"0" }}</dd>
+                                <dt class="pb-2 border-b text-fg-muted">{% trans "All" %}</dt>
+                                <dd class="pt-2 text-xl font-semibold">{{ review_count|default:"0" }}</dd>
                             </dl>
                             <dl role="list" aria-label="{% trans 'Your reviews' %}">
-                                <dt class="text-fg-muted pb-2 border-b">{% trans "You" %}</dt>
-                                <dd class="text-xl font-semibold pt-2">{{ review_my_count|default:"0" }}</dd>
+                                <dt class="pb-2 border-b text-fg-muted">{% trans "You" %}</dt>
+                                <dd class="pt-2 text-xl font-semibold">{{ review_my_count|default:"0" }}</dd>
                             </dl>
                             <dl role="list" aria-label="{% trans 'Your average score' %}" class="col-span-2">
-                                <dt class="text-fg-muted pb-2 border-b">{% trans "Your avg. score" %}</dt>
-                                <dd class="text-xl font-semibold pt-2">{{ review_my_score|floatformat:"0"|default:"0" }}</dd>
+                                <dt class="pb-2 border-b text-fg-muted">{% trans "Your avg. score" %}</dt>
+                                <dd class="pt-2 text-xl font-semibold">{{ review_my_score|floatformat:"0"|default:"0" }}</dd>
                             </dl>
                         </div>
                     </div>
@@ -74,21 +74,21 @@ <h3 id="submission-value-total">{% trans "Submission value totals" %}</h3>
 
             {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term filter_action=filter_action filter_classes="filters-open" %}
 
-            <div class="prose max-w-none grid grid-cols-[repeat(auto-fit,minmax(300px,1fr))] gap-4 lg:gap-8">
-                <section class='border shadow p-4 flex flex-col gap-4' aria-labelledby="submissions-count-heading">
+            <div class="grid gap-4 max-w-none lg:gap-8 prose grid-cols-[repeat(auto-fit,minmax(300px,1fr))]">
+                <section class='flex flex-col gap-4 p-4 border shadow' aria-labelledby="submissions-count-heading">
                     <span id="submissions-count-heading" class="text-fg-muted">{% trans "Number of submissions" %}</span>
                     <span class="text-2xl font-semibold">
                         {{ count_values }}<sup>{% if not count_values == object_list.count %}*{% endif %}</sup>
                     </span>
                 </section>
-                <section class='border shadow p-4 flex flex-col gap-4' aria-labelledby="average-value-heading">
+                <section class='flex flex-col gap-4 p-4 border shadow' aria-labelledby="average-value-heading">
                     <span id="average-value-heading" class="text-fg-muted">{% trans "Average value" %}</span>
                     <span class="text-2xl font-semibold">
                         {{ average_value|format_number_as_currency }}
                     </span>
                 </section>
 
-                <section class='border shadow p-4 flex flex-col gap-4' aria-labelledby="total-value-heading">
+                <section class='flex flex-col gap-4 p-4 border shadow' aria-labelledby="total-value-heading">
                     <span id="total-value-heading" class="text-fg-muted">{% trans "Total value" %}</span>
                     <span class="text-2xl font-semibold">
                         {{ total_value|format_number_as_currency }}
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index b943e2eb22..655648a8d6 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -18,7 +18,7 @@
 
         {% slot buttons %}
             {% if request.GET.format == 'list' %}
-                <a class="tab__item ms-auto block pb-4"
+                <a class="block pb-4 tab__item ms-auto"
                    href="{% modify_query "page" format="table" %}"
                 >
                     {% heroicon_mini "table-cells" aria_hidden="true" size=16 class="inline align-text-bottom" %}
@@ -26,7 +26,7 @@
                 </a>
             {% else %}
                 <a
-                    class="tab__item ms-auto block pb-4"
+                    class="block pb-4 tab__item ms-auto"
                     href="{% modify_query "page" format="list" %}"
                 >
                     {% heroicon_mini "queue-list" aria_hidden="true" size=16 class="inline align-text-bottom" %}
@@ -39,7 +39,7 @@
 
 
     <form
-        class="flex items-center justify-between gap-2 mt-3 md:gap-4"
+        class="flex gap-2 justify-between items-center mt-3 md:gap-4"
         hx-trigger="change"
         hx-get="./"
         hx-target="#main"
@@ -128,14 +128,14 @@
             {% endif %}
         {% endfor %}
 
-        <label class="relative flex-auto inline-flex items-center">
-            <span class="absolute inset-y-0 flex items-center pointer-events-none start-0 ps-3">
+        <label class="inline-flex relative flex-auto items-center">
+            <span class="flex absolute inset-y-0 items-center pointer-events-none start-0 ps-3">
                 {% heroicon_mini "magnifying-glass" size=20 class="text-fg-muted" aria_hidden=true %}
             </span>
             <input
                 type="text"
                 id="search-navbar"
-                class="block w-full p-2 text-sm text-gray-900 border border-gray-300 rounded-sm ps-10 bg-gray-50 focus:ring-blue-500 focus:border-blue-500"
+                class="block p-2 w-full text-sm text-gray-900 bg-gray-50 rounded-sm border border-gray-300 focus:border-blue-500 focus:ring-blue-500 ps-10"
                 placeholder="{% trans 'Search…' %}"
                 name="query"
                 aria-label="{% trans 'Search submissions' %}"
@@ -145,13 +145,13 @@
 
         {% if can_view_archive %}
             <span>
-                <label class="relative inline-flex items-center cursor-pointer">
+                <label class="inline-flex relative items-center cursor-pointer">
                     <input type="checkbox" {% if show_archived %}checked{% endif %}
                            class="sr-only peer"
                            name="archived"
                     >
                     <div
-                        class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
+                        class="w-11 h-6 bg-gray-200 rounded-full dark:bg-gray-700 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[ dark:peer-focus:ring-blue-800''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
                     </div>
                     <span class="text-sm font-medium text-gray-600 ms-3">{% trans "Archived" %}</span>
                 </label>
@@ -160,13 +160,13 @@
 
         {% if can_access_drafts %}
             <span>
-                <label class="relative inline-flex items-center cursor-pointer">
+                <label class="inline-flex relative items-center cursor-pointer">
                     <input type="checkbox" {% if show_drafts %}checked{% endif %}
                            class="sr-only peer"
                            name="drafts"
                     >
                     <div
-                        class="w-11 h-6 bg-gray-200 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
+                        class="w-11 h-6 bg-gray-200 rounded-full dark:bg-gray-700 peer-focus:outline-none peer-focus:ring-4 peer-focus:ring-blue-300 peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[ dark:peer-focus:ring-blue-800''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600">
                     </div>
                     <span class="text-sm font-medium text-gray-600 ms-3">{% trans "Drafts" %}</span>
                 </label>
@@ -175,7 +175,7 @@
 
         {% if can_export_submissions %}
             <a
-                class="px-2 py-1.5 transition-colors border rounded hover:bg-gray-100 shadow-sm"
+                class="py-1.5 px-2 rounded border shadow-sm transition-colors hover:bg-gray-100"
                 aria-label="Submissions: Download as CSV"
                 href="{% modify_query "page" format="csv" %}"
                 onclick="return confirm('{% blocktrans %}Are you sure you want to download the submissions as a csv file? This file may contain sensitive information, so please handle it carefully.{% endblocktrans %}');"
@@ -197,97 +197,97 @@
             <a
                 href="./"
                 hx-get="./"
-                class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2"
+                class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2"
             >
                 {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                 {% trans "Clear current search query, filters and sorts" %}
             </a>
 
             {% if selected_statuses %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     status:{% for s in selected_statuses %}{{ s }}{% endfor %}
-                    <a href="{% remove_from_query "status" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900" aria-label="Remove">
+                    <a href="{% remove_from_query "status" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove status filter" %}</span>
                     </a>
                 </span>
             {% endif %}
             {% if selected_fund_objects %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     fund:{% for s in selected_fund_objects %}"{{ s }}"{% endfor %}
-                    <a href="{% remove_from_query "fund" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query "fund" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove fund filter" %}</span>
                     </a>
                 </span>
             {% endif %}
             {% if selected_round_objects %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     round:{% for s in selected_round_objects %}"{{ s }}"{% endfor %}
-                    <a href="{% remove_from_query "round" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query "round" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove round filter" %}</span>
                     </a>
                 </span>
             {% endif %}
             {% if selected_leads %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     Lead:{% for s in selected_leads %}{{ s }}{% endfor %}
-                    <a href="{% remove_from_query "lead" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query "lead" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove leads filter" %}</span>
                     </a>
                 </span>
             {% endif %}
             {% if selected_applicants %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     Applicant:{% for s in selected_applicants %}{{ s }}{% endfor %}
-                    <a href="{% remove_from_query "applicants" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query "applicants" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove applicant filter" %}</span>
                     </a>
                 </span>
             {% endif %}
             {% for s in selected_reviewers %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     Reviewer:{{ s }}
-                    <a href="{% remove_from_query reviewers=s %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query reviewers=s %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove reviewer filter" %}</span>
                     </a>
                 </span>
             {% endfor %}
             {% for s in selected_meta_terms %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     Meta Term:{{ s }}
-                    <a href="{% remove_from_query meta_terms=s %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query meta_terms=s %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove meta term filter" %}</span>
                     </a>
                 </span>
             {% endfor %}
             {% for s in selected_category_options %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     Category:{{ s.value }}
-                    <a href="{% remove_from_query category_options=s.id %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query category_options=s.id %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove category filter" %}</span>
                     </a>
                 </span>
             {% endfor %}
             {% for s in selected_screening_statuses_objects %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     screening:"{{ s.title }}"
-                    <a href="{% remove_from_query screening_statuses=s.slug %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query screening_statuses=s.slug %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove screening decisions filter" %}</span>
                     </a>
                 </span>
             {% endfor %}
             {% if selected_sort %}
-                <span class="inline-flex items-center px-2 py-1 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
+                <span class="inline-flex items-center py-1 px-2 text-xs font-medium text-blue-800 bg-blue-100 rounded select-none me-2">
                     sort:{{ selected_sort }}
-                    <a href="{% remove_from_query "sort" %}" role="button" class="inline-flex items-center p-0.5 ms-1 text-xs text-blue-400 bg-transparent rounded-sm hover:bg-blue-200 hover:text-blue-900 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
+                    <a href="{% remove_from_query "sort" %}" role="button" class="inline-flex items-center p-0.5 text-xs text-blue-400 bg-transparent rounded-sm hover:text-blue-900 hover:bg-blue-200 ms-1 dark:hover:bg-blue-800 dark:hover:text-blue-300" aria-label="Remove">
                         {% heroicon_mini "x-mark" aria_hidden="true" fill="currentColor" %}
                         <span class="sr-only">{% trans "Remove sort filter" %}</span>
                     </a>
@@ -341,16 +341,16 @@
         <header
             hx-target="#main"
             hx-swap="outerHTML show:top"
-            class="sticky top-0 z-[5] mt-3 px-3 py-2 flex flex-wrap items-center justify-between border-x border-t md:gap-5 bg-gray-50 md:text-sm md:font-medium border-gray-200"
+            class="flex sticky top-0 flex-wrap justify-between items-center py-2 px-3 mt-3 bg-gray-50 border-t border-gray-200 md:gap-5 md:text-sm md:font-medium z-[5] border-x"
         >
-            <span class="items-center hidden py-1 md:inline-flex">
+            <span class="hidden items-center py-1 md:inline-flex">
                 {% if enable_selection %}
                     <input
                         id="id_select_all"
                         type="checkbox"
                         x-ref="checkboxSelectAll"
                         aria-label="Select all submissions"
-                        class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 focus:ring-2"
+                        class="w-4 h-4 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-2 focus:ring-blue-500"
                         @click="toggleAllCheckboxes()"
                     >
                     <label
@@ -362,10 +362,10 @@
             </span>
 
             <nav x-show="!showSelectedSubmissions"
-                 class="flex flex-wrap items-center gap-2 menu-filters"
+                 class="flex flex-wrap gap-2 items-center menu-filters"
             >
                 <div id="filterupdated" aria-label="Filter by Updated" class="flex items-center">
-                    <button class="flex items-center justify-between w-full py-1 font-medium text-gray-600 border cursor-pointer ps-2 pe-2 md:pe-4 md:border-none hover:bg-gray-50 md:hover:bg-transparent md:hover:text-blue-700 md:p-0">
+                    <button class="flex justify-between items-center py-1 w-full font-medium text-gray-600 border cursor-pointer md:p-0 md:border-none hover:bg-gray-50 ps-2 pe-2 md:pe-4 md:hover:bg-transparent md:hover:text-blue-700">
                         {% trans "Updated" %}
                         {% heroicon_mini "chevron-down" aria_hidden="true" width=18 height=18 class="hidden md:inline-block" %}
                     </button>
@@ -374,7 +374,7 @@
 
                 {% dropdown_menu title="Status" heading="Filter by current status" enable_search=True %}
                     <ul
-                        class="flex flex-col overflow-scroll text-gray-700 divide-y max-h-80"
+                        class="flex overflow-scroll flex-col max-h-80 text-gray-700 divide-y"
                         data-filter-list>
                         {% if selected_statuses %}
                             <li>
@@ -407,12 +407,12 @@
                             </li>
                         {% endfor %}
                     </ul>
-                    <p class="px-3 py-2 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
+                    <p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
                 {% enddropdown_menu %}
 
                 {% dropdown_menu title="Screening" heading="Filter by screening decision"  %}
                     <ul
-                        class="flex flex-col overflow-scroll text-gray-700 divide-y max-h-80"
+                        class="flex overflow-scroll flex-col max-h-80 text-gray-700 divide-y"
                     >
                         {% for s in screening_options %}
                             <li>
@@ -495,7 +495,7 @@
             <section
                 x-cloak
                 x-show="showSelectedSubmissions"
-                class="flex flex-row flex-wrap items-center gap-5 selection-actions"
+                class="flex flex-row flex-wrap gap-5 items-center selection-actions"
             >
                 {% dropdown_menu title="Status" heading="Update Status" enable_search=True %}
                     {% slot "url" hx-include="[name='selectedSubmissionIds']" hx-trigger="mouseover, focus" %}{% url "apply:submissions:submenu-update-status" %}{% endslot %}
@@ -514,7 +514,7 @@
                         hx-post="{% url 'apply:submissions:bulk-archive' %}"
                         hx-include="[name='selectedSubmissionIds']"
                         hx-confirm="Are you sure you want to archive the selected submissions?"
-                        class="flex items-center px-2 py-1 bg-gray-100 border hover:bg-gray-200"
+                        class="flex items-center py-1 px-2 bg-gray-100 border hover:bg-gray-200"
                     >
                         {% heroicon_outline "lock-closed" aria_hidden="true" size=14 class="inline stroke-gray-600 me-1" %}
                         {% trans "Archive" %}
@@ -526,7 +526,7 @@
                         hx-post="{% url 'apply:submissions:bulk-delete' %}"
                         hx-include="[name='selectedSubmissionIds']"
                         hx-confirm="Are you sure you want to delete the selected submissions? This action cannot be undone."
-                        class="flex items-center px-2 py-1 bg-gray-100 border hover:bg-red-300"
+                        class="flex items-center py-1 px-2 bg-gray-100 border hover:bg-red-300"
                     >
                         {% heroicon_outline "trash" aria_hidden="true" size=14 class="inline stroke-gray-600 me-1" %}
                         {% trans "Delete" %}
@@ -545,7 +545,7 @@
             {% if submissions %}
                 {% include "submissions/partials/submissions-inline.html" with submissions=submissions row_layout=request.GET.format enable_selection=enable_selection %}
             {% else %}
-                <div class="flex flex-col items-center justify-center px-4 py-20 border-t">
+                <div class="flex flex-col justify-center items-center py-20 px-4 border-t">
                     <h2 class='text-2xl'>{% trans "No results matched your search" %}</h2>
                     <p>{% trans "Try" %} <a href="./" hx-get="./" hx-target="#main" hx-push-url="true" hx-swap="outerHTML">{% trans "clearing" %}</a> {% trans "the current query and try again" %}.</p>
                 </div>
@@ -553,18 +553,18 @@ <h2 class='text-2xl'>{% trans "No results matched your search" %}</h2>
         </section>
 
         <nav class="mt-5 mb-20" aria-label="Pagination">
-            <span class="flex items-center justify-center gap-2 step-links">
+            <span class="flex gap-2 justify-center items-center step-links">
                 {% if page.has_previous %}
                     <a
                         href="{% modify_query page=1 %}"
-                        class="px-3 py-1.5 border hover:bg-slate-200 font-semibold"
+                        class="py-1.5 px-3 font-semibold border hover:bg-slate-200"
                         aria-label="{% trans "First Page" %}"
                     >
                         &laquo; {% trans "First" %}
                     </a>
                     <a
                         href="{% modify_query page=page.previous_page_number %}"
-                        class="px-3 py-1.5 border hover:bg-slate-200 font-semibold"
+                        class="py-1.5 px-3 font-semibold border hover:bg-slate-200"
                         aria-label={% trans "Previous Page" %}
                     >
                         {% trans "Previous" %}
@@ -578,14 +578,14 @@ <h2 class='text-2xl'>{% trans "No results matched your search" %}</h2>
                 {% if page.has_next %}
                     <a
                         href="{% modify_query page=page.next_page_number %}"
-                        class="px-3 py-1.5 border hover:bg-slate-200 font-semibold"
+                        class="py-1.5 px-3 font-semibold border hover:bg-slate-200"
                         aria-label="{% trans "Next Page" %}"
                     >
                         {% trans "Next" %}
                     </a>
                     <a
                         href="{% modify_query page=page.paginator.num_pages %}"
-                        class="px-3 py-1.5 border hover:bg-slate-200 font-semibold"
+                        class="py-1.5 px-3 font-semibold border hover:bg-slate-200"
                         aria-label="{% trans "Last Page" %}"
                     >
                         {% trans "Last" %} &raquo;
diff --git a/hypha/apply/funds/templates/submissions/partials/meta-terms-card.html b/hypha/apply/funds/templates/submissions/partials/meta-terms-card.html
index e329d9a573..67199a1f66 100644
--- a/hypha/apply/funds/templates/submissions/partials/meta-terms-card.html
+++ b/hypha/apply/funds/templates/submissions/partials/meta-terms-card.html
@@ -1,9 +1,9 @@
 {% load i18n heroicons %}
 
-<div class="flex justify-between gap-4 pb-4">
+<div class="flex gap-4 justify-between pb-4">
     <h5 class="m-0">{% trans "Meta Terms" %}</h5>
     <button
-        class="flex items-center px-2 py-1 font-bold transition-colors rounded hover:bg-gray-100 text-dark-blue -me-2"
+        class="flex items-center py-1 px-2 font-bold rounded transition-colors hover:bg-gray-100 text-dark-blue -me-2"
         hx-get="{% url 'funds:submissions:metaterms_update' pk=submission.pk %}"
         hx-target="#htmx-modal"
         role="button"
@@ -32,7 +32,7 @@ <h2 class="inline-block mb-2 text-base font-semibold text-fg-muted">{{ group.gro
             <div class="flex flex-wrap gap-2">
                 {% for meta_term in group.list %}
                     <a
-                        class="px-2 py-1 text-sm font-semibold transition-opacity border rounded-lg bg-slate-100 hover:opacity-70"
+                        class="py-1 px-2 text-sm font-semibold rounded-lg border transition-opacity hover:opacity-70 bg-slate-100"
                         href="{% url 'apply:submissions:list' %}?meta_terms={{ meta_term.id }}"
                         hx-boost="true"
                         hx-target="#main"
diff --git a/hypha/apply/funds/templates/submissions/partials/submission-lead.html b/hypha/apply/funds/templates/submissions/partials/submission-lead.html
index e08c32a608..5de045eb26 100644
--- a/hypha/apply/funds/templates/submissions/partials/submission-lead.html
+++ b/hypha/apply/funds/templates/submissions/partials/submission-lead.html
@@ -1,6 +1,6 @@
 {% load i18n heroicons %}
 {% if request.user.is_apply_staff %}
-    <a class="link link--edit-lead is-active link--transparent hover:opacity-70 transition-opacity"
+    <a class="transition-opacity hover:opacity-70 link link--edit-lead is-active link--transparent"
        href="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
        hx-get="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
        hx-target="#htmx-modal"
diff --git a/hypha/apply/funds/templates/submissions/partials/submission-reviews-list-multi.html b/hypha/apply/funds/templates/submissions/partials/submission-reviews-list-multi.html
index 747d18cde4..70157b2636 100644
--- a/hypha/apply/funds/templates/submissions/partials/submission-reviews-list-multi.html
+++ b/hypha/apply/funds/templates/submissions/partials/submission-reviews-list-multi.html
@@ -1,7 +1,7 @@
 {% load review_tags %}
 
 {% for s in submissions %}<span id="r{{s.id}}" >
-    <span class="inline-flex items-center justify-center gap-2 rounded border w-full px-3 py-1 text-xs font-medium">
+    <span class="inline-flex gap-2 justify-center items-center py-1 px-3 w-full text-xs font-medium rounded border">
         <span class="inline-flex" title="">
             <span title="Submitted Count" aria-label="Total number of reviews">{{ s.review_submitted_count|default:'0' }}</span>
             <span>/</span>
diff --git a/hypha/apply/funds/templates/submissions/partials/submissions-inline.html b/hypha/apply/funds/templates/submissions/partials/submissions-inline.html
index 6cdd20acb4..0203894ad7 100644
--- a/hypha/apply/funds/templates/submissions/partials/submissions-inline.html
+++ b/hypha/apply/funds/templates/submissions/partials/submissions-inline.html
@@ -8,13 +8,13 @@
     {% endif %}
 >
     {% if row_layout != "list" %}
-        <div class="pt-48 -mt-48 overflow-x-auto">
+        <div class="overflow-x-auto pt-48 -mt-48">
             <table class="w-full relative [&_th]:p-2 [&_td]:p-2">
                 <thead class="bg-gray-50 border">
                     <tr class="">
-                        {% if enable_selection %}<th class="md:table-cell hidden"></th>{% endif %}
+                        {% if enable_selection %}<th class="hidden md:table-cell"></th>{% endif %}
                         <th></th>
-                        <th class="min-w-48 font-semibold">
+                        <th class="font-semibold min-w-48">
                             Title
                         </th>
                         <th class="font-semibold">Status</th>
@@ -26,7 +26,7 @@
                         </th>
 
                         {% if "round" not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
-                            <th class="min-w-36 font-semibold">Round</th>
+                            <th class="font-semibold min-w-36">Round</th>
                         {% endif %}
 
                         {% if 'lead' not in SUBMISSIONS_TABLE_EXCLUDED_FIELDS %}
diff --git a/hypha/apply/funds/templates/submissions/submenu/bulk-update-lead.html b/hypha/apply/funds/templates/submissions/submenu/bulk-update-lead.html
index 97e81f6621..172d0f0fba 100644
--- a/hypha/apply/funds/templates/submissions/submenu/bulk-update-lead.html
+++ b/hypha/apply/funds/templates/submissions/submenu/bulk-update-lead.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings %}
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdown-change-status" data-filter-list>
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdown-change-status" data-filter-list>
     {% for user in leads %}
         <li data-filter-item-text>
             <a
@@ -9,15 +9,15 @@
                 hx-include="[name=selectedSubmissionIds]"
                 hx-confirm='{% blocktrans with user_title=user.title %}Are you sure you want to assign "{{ user_title }}" as lead of the selected submissions?{% endblocktrans %}'
                 title="{% blocktrans with user_title=user.title %}Assign {{ user_title }} as lead.{% endblocktrans %}"
-                class="flex ps-8 pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100">
+                class="flex items-center py-2 text-gray-600 hover:bg-gray-100 focus:bg-gray-100 ps-8 pe-3">
                 <strong class="font-bold">{{ user.title }}</strong>
-                {% if user.slack %} <span class="text-fg-muted font-light ms-1">{{ user.slack }}</span>{% endif %}
+                {% if user.slack %} <span class="font-light text-fg-muted ms-1">{{ user.slack }}</span>{% endif %}
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No lead found. Sorry about that." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No lead found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No lead found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html b/hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html
index 433ec17ca6..9fdbd247a8 100644
--- a/hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html
+++ b/hypha/apply/funds/templates/submissions/submenu/bulk-update-reviewers.html
@@ -3,7 +3,7 @@
 {% comment %} {% trans "Update" as update %}
 {% include 'funds/includes/delegated_form_base.html' with form=form value=update %} {% endcomment %}
 <form
-    class="form px-3"
+    class="px-3 form"
     id="bulk-update-reviewers-form"
     method="POST"
     hx-post="{% url "apply:submissions:submenu-bulk-update-reviewers" %}"
@@ -41,7 +41,7 @@
     {% endfor %}
 
     <button
-        class="button button--primary mt-6 mb-3"
+        class="mt-6 mb-3 button button--primary"
         type="submit"
         @click='open = false'
     >
diff --git a/hypha/apply/funds/templates/submissions/submenu/category.html b/hypha/apply/funds/templates/submissions/submenu/category.html
index f690e1e570..f6be163619 100644
--- a/hypha/apply/funds/templates/submissions/submenu/category.html
+++ b/hypha/apply/funds/templates/submissions/submenu/category.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings %}
-<ul class="text-gray-700 max-h-80 overflow-scroll" aria-labelledby="dropdown-categories"
+<ul class="overflow-scroll max-h-80 text-gray-700" aria-labelledby="dropdown-categories"
     data-filter-list>
     {% if selected_category_options %}
         <li data-filter-item-text>
@@ -37,9 +37,9 @@
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No categories found." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No categories found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No categories found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/change-status.html b/hypha/apply/funds/templates/submissions/submenu/change-status.html
index c7eb927e08..09ab75a112 100644
--- a/hypha/apply/funds/templates/submissions/submenu/change-status.html
+++ b/hypha/apply/funds/templates/submissions/submenu/change-status.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings %}
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdown-change-status">
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdown-change-status">
     {% for slug, value in statuses %}
         <li data-filter-for="change-status-filter-field">
             <a
@@ -9,14 +9,14 @@
                 hx-include="[name=selectedSubmissionIds]"
                 hx-confirm='{% blocktrans %}Are you sure you want to change the status of the selected submissions to "{{ value }}"?{% endblocktrans %}'
                 title="Change status to {{ value }}"
-                class="flex ps-4 pe-3 py-2 text-gray-600 items-center hover:bg-gray-100 focus:bg-gray-100">
+                class="flex items-center py-2 text-gray-600 hover:bg-gray-100 focus:bg-gray-100 ps-4 pe-3">
                 <strong class="font-bold">{{ value }}</strong>
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No status found for currently selected submissions." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/funds.html b/hypha/apply/funds/templates/submissions/submenu/funds.html
index 7abe5ad56d..49642ac30d 100644
--- a/hypha/apply/funds/templates/submissions/submenu/funds.html
+++ b/hypha/apply/funds/templates/submissions/submenu/funds.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load querystrings heroicons %}
 
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdownBgHoverButton" data-filter-list>
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdownBgHoverButton" data-filter-list>
     {% if selected_funds %}
         <li data-filter-item-text>
             <a href="{% url "apply:submissions:list" %}{% remove_from_query "only_query_string" "page" "fund" %}"
@@ -31,9 +31,9 @@
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No funds found." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No funds found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No funds found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/leads.html b/hypha/apply/funds/templates/submissions/submenu/leads.html
index 26ded0c4e1..9daaea7d36 100644
--- a/hypha/apply/funds/templates/submissions/submenu/leads.html
+++ b/hypha/apply/funds/templates/submissions/submenu/leads.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings heroicons %}
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdownBgHoverButton" data-filter-list>
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdownBgHoverButton" data-filter-list>
     {% if selected_leads %}
         <li data-filter-item-text>
             <a href="{% url "apply:submissions:list" %}{% remove_from_query "only_query_string" "page" "lead" %}"
@@ -24,13 +24,13 @@
                     {% heroicon_mini "check" aria_hidden="true" size=16 class="stroke-2 me-1" %}
                 {% endif %}
                 <strong class="font-bold">{{ user.title }}</strong>
-                {% if user.slack %} <span class="text-fg-muted font-light ms-1">{{ user.slack }}</span>{% endif %}
+                {% if user.slack %} <span class="font-light text-fg-muted ms-1">{{ user.slack }}</span>{% endif %}
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No leads found." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No leads found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No leads found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/meta-terms.html b/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
index ed9f8ff54e..e55ad4ef8b 100644
--- a/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
+++ b/hypha/apply/funds/templates/submissions/submenu/meta-terms.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings %}
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdown-meta-terms" data-filter-list>
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdown-meta-terms" data-filter-list>
     {% if selected_meta_terms %}
         <li data-filter-item-text>
             <a href="{% url "apply:submissions:list" %}{% remove_from_query "only_query_string" "page" "meta_terms" %}"
@@ -38,9 +38,9 @@
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No meta terms found." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No meta terms found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No meta terms found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/reviewers.html b/hypha/apply/funds/templates/submissions/submenu/reviewers.html
index e5dcb03f94..4451d33d73 100644
--- a/hypha/apply/funds/templates/submissions/submenu/reviewers.html
+++ b/hypha/apply/funds/templates/submissions/submenu/reviewers.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 {% load querystrings %}
-<ul class="text-gray-700 divide-y max-h-80 overflow-scroll" aria-labelledby="dropdown-reviewers" data-filter-list>
+<ul class="overflow-scroll max-h-80 text-gray-700 divide-y" aria-labelledby="dropdown-reviewers" data-filter-list>
     {% if selected_reviewers %}
         <li data-filter-item-text>
             <a href="{% url "apply:submissions:list" %}{% remove_from_query "only_query_string" "page" "reviewers" %}"
@@ -33,13 +33,13 @@
                     </svg>
                 {% endif %}
                 <strong class="font-bold">{{ user.title }}</strong>
-                {% if user.slack %} <span class="text-fg-muted font-light ms-1">{{ user.slack }}</span>{% endif %}
+                {% if user.slack %} <span class="font-light text-fg-muted ms-1">{{ user.slack }}</span>{% endif %}
             </a>
         </li>
     {% empty %}
-        <li class="ps-4 pe-3 py-2 text-gray-600 max-w-xs">
+        <li class="py-2 max-w-xs text-gray-600 ps-4 pe-3">
             {% trans "No reviewers found." %}
         </li>
     {% endfor %}
 </ul>
-<p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No reviewers found. Sorry about that." %}</p>
+<p class="py-2 px-3 m-0 text-fg-muted" data-filter-empty-state hidden>{% trans "No reviewers found. Sorry about that." %}</p>
diff --git a/hypha/apply/funds/templates/submissions/submenu/rounds.html b/hypha/apply/funds/templates/submissions/submenu/rounds.html
index 5a54458a38..d24c643f2f 100644
--- a/hypha/apply/funds/templates/submissions/submenu/rounds.html
+++ b/hypha/apply/funds/templates/submissions/submenu/rounds.html
@@ -29,20 +29,20 @@
                     <span @click="tab = 'open_rounds'"
                           role="tab"
                           :class="{ 'border-x border-t border-b-transparent': tab === 'open_rounds' }"
-                          class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg round cursor-pointer hover:text-gray-900">{% trans "Open" %}</span>
+                          class="inline-block py-2 px-4 text-center bg-white rounded-t-lg border-b cursor-pointer hover:text-gray-900 round">{% trans "Open" %}</span>
                 {% endif %}
 
                 {% if closed_rounds %}
                     <span @click="tab = 'closed_rounds'"
                           role="tab"
                           :class="{ 'border-x border-t border-b-transparent': tab === 'closed_rounds' }"
-                          class="text-center bg-white inline-block px-4 py-2 border-b rounded-t-lg cursor-pointer hover:text-gray-900">{% trans "Closed" %}</span>
+                          class="inline-block py-2 px-4 text-center bg-white rounded-t-lg border-b cursor-pointer hover:text-gray-900">{% trans "Closed" %}</span>
                 {% endif %}
             </nav>
 
             <div data-filter-list>
                 {% if closed_rounds %}
-                    <div class="tab-closed-rounds divide-y overflow-scroll max-h-80"
+                    <div class="overflow-scroll max-h-80 divide-y tab-closed-rounds"
                          x-show="tab === 'closed_rounds'"
                          :aria-hidden="tab === 'closed_rounds' ? 'false' : 'true'"
                          role="tabpanel"
@@ -63,7 +63,7 @@
                 {% endif %}
 
                 {% if open_rounds %}
-                    <div class="tab-open-rounds divide-y overflow-scroll max-h-80"
+                    <div class="overflow-scroll max-h-80 divide-y tab-open-rounds"
                          x-show="tab === 'open_rounds'"
                          :aria-hidden="tab === 'open_rounds' ? 'false' : 'true'"
                          role="tabpanel"
@@ -86,7 +86,7 @@
                 {% endif %}
             </div>
     {% else %}
-        <div class="block px-3 py-2 text-gray-600">
+        <div class="block py-2 px-3 text-gray-600">
             {% trans "No rounds available" %}
         </div>
     {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
index e766ad1b61..028b3e4783 100644
--- a/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
+++ b/hypha/apply/projects/templates/application_projects/includes/contracting_documents.html
@@ -4,12 +4,12 @@
 <div class="docs-block wrapper--outer-space-large" {% if collapsible_header %} x-data="{ collapsed: true }" {% endif %}>
     <div class="docs-block__header" id="contract-documents-section" {% if collapsible_header %} x-on:click="collapsed = ! collapsed" role="button" aria-label="Toggle Contract documents visibility" aria-controls="contract-documents-elements" {% endif %}>
         <div class="flex justify-between w-full" >
-            <h2 class="text-lg font-semibold m-0">
+            <h2 class="m-0 text-lg font-semibold">
                 {% trans "Contracting documents" %}
             </h2>
 
             {% if collapsible_header %}
-                <button class="align-middle ms-1 transform transition-transform" x-bind:class="collapsed ? '': '-rotate-90' ">
+                <button class="align-middle transition-transform transform ms-1" x-bind:class="collapsed ? '': '-rotate-90' ">
                     {% heroicon_outline 'chevron-left' size=20 stroke_width=2 aria_hidden=true %}
 
                     <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">{% trans "expand" %}</span>
@@ -58,8 +58,8 @@ <h2 class="text-lg font-semibold m-0">
                 </div>
                 {% if contract_uploaded %}
                     <div class="docs-block__row-inner">
-                        <a class="font-bold flex items-center w-auto text-start bg-white text-light-blue me-0 mb-1 p-2.5 border-solid border border-light-blue focus:text-light-blue hover:bg-light-blue hover:text-white" href="{% url 'apply:projects:contract' pk=project.pk file_pk=contract.pk %}" target="_blank">
-                            {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                        <a class="flex items-center p-2.5 mb-1 w-auto font-bold bg-white border border-solid hover:text-white text-start text-light-blue me-0 border-light-blue hover:bg-light-blue focus:text-light-blue" href="{% url 'apply:projects:contract' pk=project.pk file_pk=contract.pk %}" target="_blank">
+                            {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                             {% trans "View" %}
                         </a>
                     </div>
@@ -69,7 +69,7 @@ <h2 class="text-lg font-semibold m-0">
                                 <div class="docs-block__row-inner">
                                 </div>
                                 <div class="docs-block__row-inner">
-                                    {% heroicon_mini "information-circle" class="fill-light-blue inline align-middle me-1" aria_hidden=true %}
+                                    {% heroicon_mini "information-circle" class="inline align-middle fill-light-blue me-1" aria_hidden=true %}
                                     <a class="docs-block__icon-link" href="#communications" target="_blank">
                                         <span>{% trans "Corrections/amendments?" %}</span>
                                     </a>
@@ -92,7 +92,7 @@ <h2 class="text-lg font-semibold m-0">
                             {% user_can_initiate_contract user as can_initiate_contract %}
                             {% if can_upload_contract and can_initiate_contract  %}
                                 <div class="docs-block__row-inner docs-block__row-inner__contract-upload-row">
-                                    <a class="font-bold flex items-center w-auto text-start bg-light-blue text-white me-0 p-2.5 border-none"
+                                    <a class="flex items-center p-2.5 w-auto font-bold text-white border-none text-start bg-light-blue me-0"
                                        hx-get="{% url 'apply:projects:contract_upload' object.id %}"
                                        href="{% url 'apply:projects:contract_upload' object.id %}"
                                        hx-target="#htmx-modal"
@@ -115,7 +115,7 @@ <h2 class="text-lg font-semibold m-0">
                             </div>
                             {% if can_upload_contract and user.is_applicant %}
                                 <div class="docs-block__row-inner docs-block__row-inner__contract-upload-row">
-                                    <a class="font-bold flex items-center w-auto text-start bg-light-blue text-white me-0 p-2.5 border-none"
+                                    <a class="flex items-center p-2.5 w-auto font-bold text-white border-none text-start bg-light-blue me-0"
                                        hx-get="{% url 'apply:projects:contract_upload' object.id %}"
                                        href="{% url 'apply:projects:contract_upload' object.id %}"
                                        hx-target="#htmx-modal"
@@ -143,10 +143,10 @@ <h2 class="text-lg font-semibold m-0">
                     <p class="docs-block__title">{% trans "Contracting documents" %}</p>
 
                     <div class="animate-pulse min-h-30">
-                        <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                        <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                        <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                        <div class="w-20 h-6 mb-3 bg-gray-200"></div>
+                        <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                        <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                        <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                        <div class="mb-3 w-20 h-6 bg-gray-200"></div>
                     </div>
                 </div>
             {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/project_documents.html b/hypha/apply/projects/templates/application_projects/includes/project_documents.html
index aadeb005ed..ff563f248a 100644
--- a/hypha/apply/projects/templates/application_projects/includes/project_documents.html
+++ b/hypha/apply/projects/templates/application_projects/includes/project_documents.html
@@ -3,12 +3,12 @@
 
 <div class="docs-block wrapper--outer-space-large" {% if collapsible_header %} x-data="{ collapsed: true }" {% endif %}>
     <div class="docs-block__header" id="project-documents-section" {% if collapsible_header %} x-on:click="collapsed = ! collapsed" role="button" aria-label="Toggle Project documents visibility" aria-controls="project-documents-elements" {% endif %}>
-        <div class="flex justify-between gap-2 w-full items-center">
-            <h2 class="text-lg font-semibold m-0">
+        <div class="flex gap-2 justify-between items-center w-full">
+            <h2 class="m-0 text-lg font-semibold">
                 {% trans "Project documents" %}
             </h2>
 
-            <div class="flex gap-2 flex-wrap">
+            <div class="flex flex-wrap gap-2">
                 {% user_can_send_for_approval object user as can_send_to_approve %}
                 {% if can_send_to_approve %}
                     <a class="button button--project-action"
@@ -64,7 +64,7 @@ <h2 class="text-lg font-semibold m-0">
                     </a>
                 {% endif %}
                 {% if collapsible_header %}
-                    <button class="align-middle ms-1 transform transition-transform" x-bind:class="collapsed ? '': '-rotate-90' ">
+                    <button class="align-middle transition-transform transform ms-1" x-bind:class="collapsed ? '': '-rotate-90' ">
                         {% heroicon_outline 'chevron-left' size=20 stroke_width=2 aria_hidden=true %}
                         <span class="sr-only" x-text="collapsed ? 'expand' : 'collapse'">{% trans "expand" %}</span>
                     </button>
@@ -89,7 +89,7 @@ <h2 class="text-lg font-semibold m-0">
                     {% if can_edit_pfs %}
                         <a class="{% if not object.user_has_updated_pf_details %}button button--project-action{% else %}docs-block__icon-link{% endif %}" href="{% url 'apply:projects:edit_pf' pk=object.pk %}">
                             {% if object.user_has_updated_pf_details %}
-                                {% heroicon_micro "pencil-square" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                                {% heroicon_micro "pencil-square" class="inline w-4 h-4 me-1" aria_hidden=true %}
                                 {% trans "Edit" %}
                             {% else %}
                                 {% trans "Fill in" %}
@@ -98,7 +98,7 @@ <h2 class="text-lg font-semibold m-0">
                     {% endif %}
                     {% if object.user_has_updated_pf_details and not user.is_applicant %}
                         <a class="docs-block__icon-link" href="{% url 'apply:projects:approval' pk=project.pk %}">
-                            {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                            {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                             {% trans "View" %}
                         </a>
                     {% endif %}
@@ -119,7 +119,7 @@ <h2 class="text-lg font-semibold m-0">
                                 {% if can_edit_pfs %}
                                     <a class="{% if not object.user_has_updated_sow_details %}button button--project-action{% else %}docs-block__icon-link{% endif %}" href="{% url 'apply:projects:edit_sow' pk=object.pk %}">
                                         {% if object.user_has_updated_sow_details %}
-                                            {% heroicon_micro "pencil-square" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                                            {% heroicon_micro "pencil-square" class="inline w-4 h-4 me-1" aria_hidden=true %}
                                             {% trans "Edit" %}
                                         {% else %}
                                             {% trans "Fill in" %}
@@ -128,7 +128,7 @@ <h2 class="text-lg font-semibold m-0">
                                 {% endif %}
                                 {% if object.user_has_updated_sow_details %}
                                     <a class="docs-block__icon-link" href="{% url 'apply:projects:sow' pk=project.pk %}">
-                                        {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                                        {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                                         {% trans "View" %}
                                     </a>
                                 {% endif %}
@@ -147,10 +147,10 @@ <h2 class="text-lg font-semibold m-0">
                     <p class="docs-block__title">{% trans "Supporting documents" %}</p>
 
                     <div class="animate-pulse min-h-30">
-                        <div class="w-full mb-3 bg-gray-200 h-9"></div>
-                        <div class="w-full h-6 mb-1 bg-gray-200"></div>
-                        <div class="w-full h-1 mb-3 bg-gray-200"></div>
-                        <div class="w-20 h-6 mb-3 bg-gray-200"></div>
+                        <div class="mb-3 w-full h-9 bg-gray-200"></div>
+                        <div class="mb-1 w-full h-6 bg-gray-200"></div>
+                        <div class="mb-3 w-full h-1 bg-gray-200"></div>
+                        <div class="mb-3 w-20 h-6 bg-gray-200"></div>
                     </div>
                 </div>
             {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/includes/reports.html b/hypha/apply/projects/templates/application_projects/includes/reports.html
index b9863f6b47..1cb355cd3d 100644
--- a/hypha/apply/projects/templates/application_projects/includes/reports.html
+++ b/hypha/apply/projects/templates/application_projects/includes/reports.html
@@ -63,12 +63,12 @@
                             <td class="py-4 px-2.5">
                                 <span class="data-block__mobile-label">{% trans "Submitted" %}: </span>{{ report.submitted_date|default:"Skipped" }}
                             </td>
-                            <td class="data-block__links py-4 px-2.5">
+                            <td class="py-4 px-2.5 data-block__links">
                                 {% if not report.skipped %}
                                     {% user_can_view_report report user as can_view_report %}
                                     {% if can_view_report %}
                                         <a class="data-block__action-icon-link" href="{% url "apply:projects:reports:detail" pk=report.pk %}">
-                                            {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                                            {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                                             {% trans "View" %}
                                         </a>
                                     {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/invoice_detail.html b/hypha/apply/projects/templates/application_projects/invoice_detail.html
index 97f0f3dd3b..c46f2e8d4d 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_detail.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_detail.html
@@ -32,7 +32,7 @@
                 <p class="card__text"><b>{% trans "Fund" %}:</b> {{ object.project.submission.page }}</p>
             </div>
             <div hx-get="{% url 'apply:projects:partial-invoice-status' pk=object.project.pk invoice_pk=object.pk %}" hx-trigger="load, invoicesUpdated from:body" class="flex card card--solid" x-data="{ collapsed: true }">
-                <div class="flex-none content-center min-h-10"><div class="h-4 min-w-96 bg-gray-400 rounded-full animate-pulse"></div></div>
+                <div class="flex-none content-center min-h-10"><div class="h-4 bg-gray-400 rounded-full animate-pulse min-w-96"></div></div>
                 <div class="ps-2"></div>
             </div>
 
@@ -53,7 +53,7 @@ <h5 class="card__heading">{% trans "Supporting Documents" %}</h5>
             </div>
         </div>
         <aside class="sidebar">
-            <div hx-get="{% url 'apply:projects:partial-invoice-detail-actions' pk=object.project.pk invoice_pk=object.pk %}" hx-trigger="invoicesUpdated from:body" class="sticky sidebar__inner sidebar__inner--light-blue sidebar__inner--actions top-8" data-testid="sidebar-primary-actions">
+            <div hx-get="{% url 'apply:projects:partial-invoice-detail-actions' pk=object.project.pk invoice_pk=object.pk %}" hx-trigger="invoicesUpdated from:body" class="sticky top-8 sidebar__inner sidebar__inner--light-blue sidebar__inner--actions" data-testid="sidebar-primary-actions">
                 {% include "application_projects/partials/invoice_detail_actions.html" %}
             </div>
         </aside>
diff --git a/hypha/apply/projects/templates/application_projects/invoice_list.html b/hypha/apply/projects/templates/application_projects/invoice_list.html
index 12e6985c6c..3d00954745 100644
--- a/hypha/apply/projects/templates/application_projects/invoice_list.html
+++ b/hypha/apply/projects/templates/application_projects/invoice_list.html
@@ -14,8 +14,8 @@
     <div class="wrapper wrapper--large wrapper--inner-space-medium">
         <div hx-get="{% url 'apply:projects:invoices_status_counts' %}" hx-trigger="load delay:50">
             <div class="animate-pulse min-h-40">
-                <div class="w-full h-9 bg-gray-200 mb-5"></div>
-                <div class="w-full h-6 bg-gray-200 mb-5"></div>
+                <div class="mb-5 w-full h-9 bg-gray-200"></div>
+                <div class="mb-5 w-full h-6 bg-gray-200"></div>
             </div>
         </div>
 
diff --git a/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html b/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html
index bc71d5a9f7..e6876d3240 100644
--- a/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html
+++ b/hypha/apply/projects/templates/application_projects/modals/batch_invoice_status_update.html
@@ -10,7 +10,7 @@
         {% for invoice in invoices %}
             <a href="{{ invoice.get_absolute_url }}" x-show="show" class="list-reveal__item" target="_blank" rel="noopener noreferrer" title="{{ invoice.invoice_number }}">
                 {{ invoice.invoice_number }}
-                <svg viewBox="0 0 16 16" fill="currentColor" aria-hidden="" width="16" height="16" class="inline align-text-bottom w-4 h-4">
+                <svg viewBox="0 0 16 16" fill="currentColor" aria-hidden="" width="16" height="16" class="inline w-4 h-4 align-text-bottom">
                     <path d="M6.22 8.72a.75.75 0 0 0 1.06 1.06l5.22-5.22v1.69a.75.75 0 0 0 1.5 0v-3.5a.75.75 0 0 0-.75-.75h-3.5a.75.75 0 0 0 0 1.5h1.69L6.22 8.72Z"></path>
                     <path d="M3.5 6.75c0-.69.56-1.25 1.25-1.25H7A.75.75 0 0 0 7 4H4.75A2.75 2.75 0 0 0 2 6.75v4.5A2.75 2.75 0 0 0 4.75 14h4.5A2.75 2.75 0 0 0 12 11.25V9a.75.75 0 0 0-1.5 0v2.25c0 .69-.56 1.25-1.25 1.25h-4.5c-.69 0-1.25-.56-1.25-1.25v-4.5Z"></path>
                 </svg>
diff --git a/hypha/apply/projects/templates/application_projects/modals/report_frequency_config.html b/hypha/apply/projects/templates/application_projects/modals/report_frequency_config.html
index a0c118523d..f6603f2c72 100644
--- a/hypha/apply/projects/templates/application_projects/modals/report_frequency_config.html
+++ b/hypha/apply/projects/templates/application_projects/modals/report_frequency_config.html
@@ -63,7 +63,7 @@
             {% endfor %}
         </div>
 
-        <div class="mt-5 sm:gap-4 sm:mt-4 sm:flex sm:flex-row-reverse">
+        <div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
 
             <button class="button button--top-space button--primary" type="submit" name="save" value="save">{% trans "Save" %}</button>
             <button class="button button--top-space button--white" type="submit" name="disable-reporting" value="disable-reporting">{% trans "Disable Reporting" %}</button>
diff --git a/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html b/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html
index 558e916d9b..7bf76e11fc 100644
--- a/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html
+++ b/hypha/apply/projects/templates/application_projects/modals/send_for_approval.html
@@ -23,8 +23,8 @@ <h5>{% trans "Are you ready to submit the project documents to be approved in" %
 
         <p>{% trans "By default all the members are notified when an approver is not selected. Optionally, you may select specific approvers to assign and notify them." %}</p>
         <div class="flex items-center text-sm">
-            <p class="flex-shrink font-bold text-slate-500 pe-2 mb-0">{% trans "Optional" %}</p>
-            <p class="flex-grow h-px bg-mid-grey mb-0"></p>
+            <p class="flex-shrink mb-0 font-bold text-slate-500 pe-2">{% trans "Optional" %}</p>
+            <p class="flex-grow mb-0 h-px bg-mid-grey"></p>
         </div>
 
         <p>{% trans "Please note that in "%}{% if project_settings.paf_approval_sequential %}{%trans "sequential order, approvers will approve project form one after the other."%}{% else %}{% trans "parallel order, approvers can approve project form anytime." %}{% endif %}</p>
diff --git a/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html b/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html
index af09c9c0fb..520a97017d 100644
--- a/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html
+++ b/hypha/apply/projects/templates/application_projects/partials/contracting_category_documents.html
@@ -13,9 +13,9 @@
 
     {% if all_contract_document_categories %}
         <div class="w-full ps-7">
-            <ul class="space-y-2 pt-3">
+            <ul class="pt-3 space-y-2">
                 {% for document_category in all_contract_document_categories %}
-                    <li class="flex justify-between bg-gray-100 px-3 py-2 rounded">
+                    <li class="flex justify-between py-2 px-3 bg-gray-100 rounded">
                         <div class="docs-block__document-inner">
                             <span>
                                 {% if document_category in remaining_contract_document_categories %}
@@ -26,7 +26,7 @@
                                 {% endif %}
                                 {% if document_category.required %}<span class="text-red-700">*</span>{% endif %}
                                 {% if document_category.template %}
-                                    {% heroicon_mini "information-circle" class="fill-light-blue inline align-middle" aria_hidden=true %}
+                                    {% heroicon_mini "information-circle" class="inline align-middle fill-light-blue" aria_hidden=true %}
                                     <a class="font-semibold border-b-2 border-dashed" href="{% url 'apply:projects:category_template' pk=object.pk type='contract_document' category_pk=document_category.pk %}" target="_blank">{% trans "View template" %}</a>
                                 {% endif %}
                             </span>
@@ -39,7 +39,7 @@
                         </div>
                         {% if document_category in remaining_contract_document_categories and can_update_documents %}
                             <div class="docs-block__document-inner__actions">
-                                <a class="font-bold flex items-center me-0"
+                                <a class="flex items-center font-bold me-0"
                                    href="{% url 'apply:projects:contract_doc_upload' object.id document_category.id %}"
                                    hx-get="{% url 'apply:projects:contract_doc_upload' object.id document_category.id %}"
                                    hx-target="#htmx-modal"
@@ -54,7 +54,7 @@
                             {% if latest_file %}
                                 <div class="docs-block__document-inner__actions">
                                     <a class="docs-block__icon-link" href="{% url 'apply:projects:contract_document' pk=object.pk file_pk=latest_file.pk %}" target="_blank">
-                                        {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                                        {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                                         {% trans "View" %}
                                     </a>
                                     {% if can_update_documents %}
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html
index 24e7e66e09..e1fa957361 100644
--- a/hypha/apply/projects/templates/application_projects/partials/invoice_status.html
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status.html
@@ -9,7 +9,7 @@
     <p>{{ latest_activity_status }} {% if user.is_applicant and latest_activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ latest_activity.user }}){% endif %}
         <span class="text-gray-400">{{ latest_activity.timestamp }}</span>
         {% if latest_activity_comment %}
-            <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
+            <svg class="mt-1 w-5 h-5 me-1"><use xlink:href="#request-changes"></use></svg>
             <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ latest_activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
         {% endif %}
     </p>
@@ -19,7 +19,7 @@
         <p x-show="!collapsed">{{ activity_status }} {% if user.is_applicant and activity.user != user %} ({{ ORG_SHORT_NAME }}){% else %}({{ activity.user }}){% endif %}
             <span class="text-gray-400">{{ activity.timestamp }}</span>
             {% if activity_comment %}
-                <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
+                <svg class="mt-1 w-5 h-5 me-1"><use xlink:href="#request-changes"></use></svg>
                 <a href="{% url 'apply:projects:detail' pk=object.project.id %}#communications#{{ activity_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
             {% endif %}
         </p>
@@ -28,7 +28,7 @@
 {% if activities %}
     <button
         type="button"
-        class="flex-1 font-bold transition-opacity text-light-blue text-end hover:opacity-70"
+        class="flex-1 font-bold transition-opacity hover:opacity-70 text-light-blue text-end"
         x-on:click="collapsed = ! collapsed"
     >
         <span x-show="collapsed">
diff --git a/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
index b281b4a420..99840e7bde 100644
--- a/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
+++ b/hypha/apply/projects/templates/application_projects/partials/invoice_status_table.html
@@ -7,7 +7,7 @@
         <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice date" %}: </span>{% if invoice.invoice_date %}{{ invoice.invoice_date }}{% else %} {{ invoice.requested_at.date }} {% endif %}</td>
         <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Invoice no." %}: </span>{{ invoice.invoice_number }}</td>
         <td class="py-4 px-2"><span class="data-block__mobile-label">{% trans "Status" %}: </span>{{ invoice_status }}</td>
-        <td class="flex flex-wrap justify-center py-4 px-0 gap-2 xl:flex-nowrap">
+        <td class="flex flex-wrap gap-2 justify-center py-4 px-0 xl:flex-nowrap">
             <a class="data-block__action-icon-link" href="{{ invoice.get_absolute_url }}" >
                 {% heroicon_micro "eye" aria_hidden=true class="me-1" %}
                 {% trans "View" %}
@@ -23,7 +23,7 @@
 
                 {% can_delete invoice user as user_can_delete_request %}
                 {% if user.is_applicant and user_can_delete_request %}
-                    <a class="data-block__action-icon-link text-red-500" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
+                    <a class="text-red-500 data-block__action-icon-link" href="{% url 'apply:projects:invoice-delete' pk=invoice.project.pk invoice_pk=invoice.pk %}">
                         {% heroicon_micro "trash" aria_hidden=true class="me-1" %}
                         {% trans "Delete" %}
                     </a>
diff --git a/hypha/apply/projects/templates/application_projects/partials/project-lead.html b/hypha/apply/projects/templates/application_projects/partials/project-lead.html
index 4b46ec0a7f..0356d3c9a4 100644
--- a/hypha/apply/projects/templates/application_projects/partials/project-lead.html
+++ b/hypha/apply/projects/templates/application_projects/partials/project-lead.html
@@ -1,7 +1,7 @@
 {% load i18n heroicons %}
 
 {% if request.user.is_apply_staff %}
-    <a class="link link--edit-lead is-active link--transparent hover:opacity-70 transition-opacity"
+    <a class="transition-opacity hover:opacity-70 link link--edit-lead is-active link--transparent"
        href="{% url 'apply:projects:lead_update' object.id %}"
        hx-get="{% url 'apply:projects:lead_update' object.id %}"
        hx-target="#htmx-modal"
diff --git a/hypha/apply/projects/templates/application_projects/partials/project_title.html b/hypha/apply/projects/templates/application_projects/partials/project_title.html
index c856c22d66..9930f79879 100644
--- a/hypha/apply/projects/templates/application_projects/partials/project_title.html
+++ b/hypha/apply/projects/templates/application_projects/partials/project_title.html
@@ -2,11 +2,11 @@
 
 {{ object.title }}
 {% if request.user.is_apply_staff %}
-    <a class="link is-active link--transparent hover:opacity-70 transition-opacity"
+    <a class="transition-opacity hover:opacity-70 link is-active link--transparent"
        href="{% url 'apply:projects:project_title_update' object.id %}"
        hx-get="{% url 'apply:projects:project_title_update' object.id %}"
        hx-target="#htmx-modal"
     >
-        {% heroicon_solid "pencil-square" class="inline ms-1 mt-2" aria_hidden=true %}
+        {% heroicon_solid "pencil-square" class="inline mt-2 ms-1" aria_hidden=true %}
     </a>
 {% endif %}
diff --git a/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html b/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html
index dcdaaf4536..7f79c25b11 100644
--- a/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html
+++ b/hypha/apply/projects/templates/application_projects/partials/supporting_documents.html
@@ -14,20 +14,20 @@
     {% if all_document_categories %}
 
         <div class="w-full ps-7">
-            <ul class="space-y-2 pt-3">
+            <ul class="pt-3 space-y-2">
                 {% for document_category in all_document_categories %}
-                    <li class="flex justify-between bg-gray-100 px-3 py-2 rounded">
+                    <li class="flex justify-between py-2 px-3 bg-gray-100 rounded">
                         <div class="docs-block__document-inner">
                             <span>{{ document_category.name }}
                                 {% if document_category.required %}<span class="text-red-700">*</span>{% endif %}
                                 {% if document_category.template %}
-                                    <a class="font-semibold hover:opacity-70 transition-opacity"
+                                    <a class="font-semibold transition-opacity hover:opacity-70"
                                        href="{% url 'apply:projects:category_template' pk=object.pk type='project_document' category_pk=document_category.pk %}"
                                        target="_blank"
                                     >
                                         <span class="border-b-2 border-dashed">
                                             {% trans "View template" %}
-                                        </span>{% heroicon_mini "information-circle" class="fill-light-blue inline align-middle me-1" aria_hidden=true %}
+                                        </span>{% heroicon_mini "information-circle" class="inline align-middle fill-light-blue me-1" aria_hidden=true %}
                                     </a>
                                 {% endif %}
                             </span>
@@ -41,13 +41,13 @@
                         {% can "upload_project_documents" object as can_upload_documents %}
                         {% if document_category in remaining_document_categories and can_upload_documents %}
                             <div class="docs-block__document-inner__actions">
-                                <a class="font-bold flex items-center me-0 hover:opacity-70 transition-opacity"
+                                <a class="flex items-center font-bold transition-opacity hover:opacity-70 me-0"
                                    href="{% url 'apply:projects:supporting_doc_upload' object.id document_category.id %}"
                                    hx-get="{% url 'apply:projects:supporting_doc_upload' object.id document_category.id %}"
                                    hx-target="#htmx-modal"
                                    aria-label="{% trans "Upload Supporting Documents" %}"
                                 >
-                                    {% heroicon_micro "arrow-up-tray" class="inline me-1 w-4 h-4" aria_hidden="true" %}
+                                    {% heroicon_micro "arrow-up-tray" class="inline w-4 h-4 me-1" aria_hidden="true" %}
                                     {% trans "Upload" %}
                                 </a>
 
diff --git a/hypha/apply/projects/templates/application_projects/project_approval_form.html b/hypha/apply/projects/templates/application_projects/project_approval_form.html
index 05c413df74..74ed54335e 100644
--- a/hypha/apply/projects/templates/application_projects/project_approval_form.html
+++ b/hypha/apply/projects/templates/application_projects/project_approval_form.html
@@ -15,7 +15,7 @@
     {% if approval_form_exists %}
         {% include "forms/includes/form_errors.html" with form=pf_form %}
 
-        <div class="pt-8 pb-8 mx-auto mt-4 mb-12 wrapper wrapper--default-bg wrapper--sidebar ps-20 ">
+        <div class="pt-8 pb-8 mx-auto mt-4 mb-12 wrapper wrapper--default-bg wrapper--sidebar ps-20">
             <div class="wrapper--sidebar--inner">
                 <form class="form application-form" action="" method="post" enctype="multipart/form-data">
                     {% csrf_token %}
diff --git a/hypha/apply/projects/templates/application_projects/project_detail.html b/hypha/apply/projects/templates/application_projects/project_detail.html
index cda89d9753..3a32da707f 100644
--- a/hypha/apply/projects/templates/application_projects/project_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_detail.html
@@ -18,7 +18,7 @@
                 <span class="inline-block bg-gray-600 rounded-md animate-pulse"></span>
             </h1>
 
-            <div class="heading heading--meta text-sm mt-1 font-medium">
+            <div class="mt-1 text-sm font-medium heading heading--meta">
 
                 <span>{{ object.submission.page }}</span>
 
@@ -45,7 +45,7 @@
 
             </div>
 
-            <div class="status-bar my-6">
+            <div class="my-6 status-bar">
                 {% for status, text in statuses %}
                     {% if forloop.counter0 == current_status_index %}
                         {% include "funds/includes/status_bar_item.html" with is_current=True is_complete=False label=text %}
@@ -57,7 +57,7 @@
                 {% endfor %}
             </div>
 
-            <div class="status-bar--mobile mt-5">
+            <div class="mt-5 status-bar--mobile">
                 <h6 class="status-bar__subheading">
                     {{ project_status }}
                 </h6>
@@ -89,7 +89,7 @@ <h6 class="status-bar__subheading">
 
     {% show_closing_banner object as show_banner %}
     {% if show_banner %}
-        <div class="bg-red-500 text-white font-semibold text-center p-2">
+        <div class="p-2 font-semibold text-center text-white bg-red-500">
             {% blocktrans with status=project_status %} This project is in {{ status }} state. {% endblocktrans %}
         </div>
     {% endif %}
@@ -144,9 +144,9 @@ <h5>{% trans "E-mail" %}</h5>
                     <aside class="sidebar">
                         {% user_next_step_on_project object user request=request as next_step %}
                         {% if next_step %}
-                            <div class="bg-yellow-100 shadow px-5 py-3 mb-8 sidebar__inner--actions">
-                                <h5 class="border-b pb-2 border-b-orange-200">
-                                    {% heroicon_solid "sparkles" class="inline me-1 fill-orange-500 align-text-top" aria_hidden=true %}
+                            <div class="py-3 px-5 mb-8 bg-yellow-100 shadow sidebar__inner--actions">
+                                <h5 class="pb-2 border-b border-b-orange-200">
+                                    {% heroicon_solid "sparkles" class="inline align-text-top me-1 fill-orange-500" aria_hidden=true %}
                                     {{ next_step.heading }}
                                 </h5>
                                 <p class="">{{ next_step.text }}</p>
@@ -172,10 +172,10 @@ <h5>{% trans "Project form approvals" %}</h5>
                                         {% if rejected %}
                                             <div class="flex">
                                                 <div>
-                                                    <svg class="w-5 h-5 me-1 mt-1"><use xlink:href="#request-changes"></use></svg>
+                                                    <svg class="mt-1 w-5 h-5 me-1"><use xlink:href="#request-changes"></use></svg>
                                                 </div>
                                                 <div>
-                                                    <p class="sidebar__paf-approvals--approved m-0">{% trans "Request changes or more information by " %}{{ paf_approval.user }}</p>
+                                                    <p class="m-0 sidebar__paf-approvals--approved">{% trans "Request changes or more information by " %}{{ paf_approval.user }}</p>
                                                     {% get_comment_for_requested_approval paf_approval as rejected_comment %}
                                                     {% if rejected_comment %}
                                                         <a href="#communications#{{ rejected_comment.id }}" class="font-bold" target="_blank">{% trans "View comment" %}</a>
@@ -183,10 +183,10 @@ <h5>{% trans "Project form approvals" %}</h5>
                                                 </div>
                                             </div>
                                         {% else %}
-                                            <p class="sidebar__paf-approvals--pending m-0">{% trans "Pending approval from " %}{% if paf_approval.user %}{{ paf_approval.user }}{% else %} {{ paf_approval.paf_reviewer_role.label }}{% trans " (nobody assigned yet)" %} {% endif %}</p>
+                                            <p class="m-0 sidebar__paf-approvals--pending">{% trans "Pending approval from " %}{% if paf_approval.user %}{{ paf_approval.user }}{% else %} {{ paf_approval.paf_reviewer_role.label }}{% trans " (nobody assigned yet)" %} {% endif %}</p>
                                         {% endif %}
                                     {% else %}
-                                        <p class="sidebar__paf-approvals--approved m-0">{% trans "Approved by " %}{{ paf_approval.user }} {% if paf_approval.approved_at %}(<i>{{ paf_approval.approved_at|date }}</i>){% endif %}</p>
+                                        <p class="m-0 sidebar__paf-approvals--approved">{% trans "Approved by " %}{{ paf_approval.user }} {% if paf_approval.approved_at %}(<i>{{ paf_approval.approved_at|date }}</i>){% endif %}</p>
                                     {% endif %}
                                     <br>
                                 {% endfor %}
diff --git a/hypha/apply/projects/templates/application_projects/project_list.html b/hypha/apply/projects/templates/application_projects/project_list.html
index 6e247c35fe..0ef8b55a23 100644
--- a/hypha/apply/projects/templates/application_projects/project_list.html
+++ b/hypha/apply/projects/templates/application_projects/project_list.html
@@ -15,8 +15,8 @@
     <div class="wrapper wrapper--large wrapper--inner-space-medium">
         <div hx-get="{% url 'apply:projects:projects_status_counts' %}" hx-trigger="load delay:50">
             <div class="animate-pulse min-h-40">
-                <div class="w-full h-9 bg-gray-200 mb-5"></div>
-                <div class="w-full h-6 bg-gray-200 mb-5"></div>
+                <div class="mb-5 w-full h-9 bg-gray-200"></div>
+                <div class="mb-5 w-full h-6 bg-gray-200"></div>
             </div>
         </div>
 
diff --git a/hypha/apply/projects/templates/application_projects/project_sow_detail.html b/hypha/apply/projects/templates/application_projects/project_sow_detail.html
index 85beafb0b0..f1de6f960c 100644
--- a/hypha/apply/projects/templates/application_projects/project_sow_detail.html
+++ b/hypha/apply/projects/templates/application_projects/project_sow_detail.html
@@ -13,7 +13,7 @@
             {{ object.title }}
         {% endslot %}
         {% slot sub_heading %}
-            <div class="heading heading--meta text-sm mt-1">
+            <div class="mt-1 text-sm heading heading--meta">
                 <span>{{ object.submission.page }}</span>
                 <span>{{ object.submission.round }}</span>
                 <span>{% trans "Lead" %}: {{ object.lead }}</span>
diff --git a/hypha/apply/projects/templates/application_projects/project_sow_form.html b/hypha/apply/projects/templates/application_projects/project_sow_form.html
index 5fed3b31ba..1c03e88483 100644
--- a/hypha/apply/projects/templates/application_projects/project_sow_form.html
+++ b/hypha/apply/projects/templates/application_projects/project_sow_form.html
@@ -14,7 +14,7 @@
 
     {% if sow_form_exists %}
         {% include "forms/includes/form_errors.html" with form=sow_form %}
-        <div class="pt-8 pb-8 mx-auto mt-4 mb-12 wrapper wrapper--default-bg wrapper--sidebar ps-20 ">
+        <div class="pt-8 pb-8 mx-auto mt-4 mb-12 wrapper wrapper--default-bg wrapper--sidebar ps-20">
             <div class="wrapper--sidebar--inner">
                 <form class="form application-form" action="" method="post" enctype="multipart/form-data">
                     {% csrf_token %}
diff --git a/hypha/apply/projects/templates/application_projects/report_form.html b/hypha/apply/projects/templates/application_projects/report_form.html
index f3fb0103d8..689ebfe0a8 100644
--- a/hypha/apply/projects/templates/application_projects/report_form.html
+++ b/hypha/apply/projects/templates/application_projects/report_form.html
@@ -52,7 +52,7 @@
                     <input type="submit" id="submit-report-form-submit" name="submit" class="is-hidden" />
                     <input type="submit" id="submit-report-form-save" name="save" class="is-hidden" />
                     <label class="button button--submit button--top-space button--white" for="submit-report-form-save" onclick="return confirm('{% blocktrans %}Saving a draft means this report will be visible to you and staff from your project page.{% endblocktrans %}')">{% trans "Save draft" %}</label>
-                    <label class="button  button--submit button--top-space button--primary" for="submit-report-form-submit" onclick="return confirm('Are you sure you want to submit your report?')">{% trans "Submit" %}</label>
+                    <label class="button button--submit button--top-space button--primary" for="submit-report-form-submit" onclick="return confirm('Are you sure you want to submit your report?')">{% trans "Submit" %}</label>
                 </form>
             </div>
         </div>
diff --git a/hypha/apply/review/templates/review/review_detail.html b/hypha/apply/review/templates/review/review_detail.html
index ed2a2de572..e2be9f519e 100644
--- a/hypha/apply/review/templates/review/review_detail.html
+++ b/hypha/apply/review/templates/review/review_detail.html
@@ -35,28 +35,28 @@ <h5>{% trans "Score" %}</h5>
             </div>
         </div>
 
-        <div class="flex gap-4 flex-col items-end">
-            <div class="flex gap-4 items-start justify-end">
+        <div class="flex flex-col gap-4 items-end">
+            <div class="flex gap-4 justify-end items-start">
                 <span class="flex items-center">
-                    {% heroicon_micro "eye" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                    {% heroicon_micro "eye" class="inline w-4 h-4 me-1" aria_hidden=true %}
                     {{ review.get_visibility_display }}
                 </span>
                 {% if perms.funds.delete_review or request.user == review.author.reviewer %}
                     <a
-                        class="font-bold flex text-red-500 items-center hover:opacity-70 transition-opacity"
+                        class="flex items-center font-bold text-red-500 transition-opacity hover:opacity-70"
                         href="{% url 'apply:submissions:reviews:delete' submission_pk=object.submission.id pk=object.id %}"
                     >
-                        {% heroicon_micro "trash" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                        {% heroicon_micro "trash" class="inline w-4 h-4 me-1" aria_hidden=true %}
                         {% trans "Delete" %}
                     </a>
                 {% endif %}
 
                 {% if perms.funds.change_review or request.user == review.author.reviewer %}
                     <a
-                        class="font-bold flex items-center hover:opacity-70 transition-opacity"
+                        class="flex items-center font-bold transition-opacity hover:opacity-70"
                         href="{% url 'apply:submissions:reviews:edit' submission_pk=object.submission.id pk=object.id %}"
                     >
-                        {% heroicon_micro "pencil-square" class="inline me-1 w-4 h-4" aria_hidden=true %}
+                        {% heroicon_micro "pencil-square" class="inline w-4 h-4 me-1" aria_hidden=true %}
                         {% trans "Edit" %}
                     </a>
                 {% endif %}
@@ -87,7 +87,7 @@ <h5>{% trans "Score" %}</h5>
             {{ form }}
         </form>
 
-        <em class='text-fg-muted flex items-center mb-8'>
+        <em class='flex items-center mb-8 text-fg-muted'>
             {% heroicon_micro "information-circle" class="mr-1 w-4 h-4 fill-fg-muted" aria_hidden=true %}
             <span>{% trans "An opinion is a replacement for a review. You will no longer be able to submit a review for this application." %}</span>
         </em>
diff --git a/hypha/apply/review/templates/review/review_edit_form.html b/hypha/apply/review/templates/review/review_edit_form.html
index 81da09a48b..80fca0f0d1 100644
--- a/hypha/apply/review/templates/review/review_edit_form.html
+++ b/hypha/apply/review/templates/review/review_edit_form.html
@@ -18,11 +18,11 @@
 
     {% include "forms/includes/form_errors.html" with form=form %}
 
-    <div class="my-8 relative" x-data="reviewScore">
+    <div class="relative my-8" x-data="reviewScore">
         <!-- Review score sticky display -->
-        <div class="absolute h-full right-0 top-0 hidden lg:block">
+        <div class="hidden absolute top-0 right-0 h-full lg:block">
             <div
-                class="bg-arsenic text-white font-semibold inline-block px-3 py-1.5 mt-1 text-center sticky top-1"
+                class="inline-block sticky top-1 py-1.5 px-3 mt-1 font-semibold text-center text-white bg-arsenic"
                 x-clock
                 x-show="showScore"
             >
@@ -30,7 +30,7 @@
             </div>
         </div>
 
-        <form id="review-form-edit" class="form form--scoreable max-w-3xl" action="" method="post" novalidate>
+        <form id="review-form-edit" class="max-w-3xl form form--scoreable" action="" method="post" novalidate>
             {% csrf_token %}
             {% for hidden in form.hidden_fields %}
                 {{ hidden }}
@@ -52,7 +52,7 @@ <h2>{{ value }}</h2>
                     {{ field }}
                 {% endif %}
             {% endfor %}
-            <div class="flex gap-4 items-center flex-wrap">
+            <div class="flex flex-wrap gap-4 items-center">
 
                 <button
                     class="button button--primary min-w-48"
diff --git a/hypha/apply/review/templates/review/review_form.html b/hypha/apply/review/templates/review/review_form.html
index 1a4ccfea60..6e53024b9e 100644
--- a/hypha/apply/review/templates/review/review_form.html
+++ b/hypha/apply/review/templates/review/review_form.html
@@ -16,7 +16,7 @@
         {% endslot %}
         {% slot buttons %}
             <button
-                class="tab__item ms-auto block pb-4"
+                class="block pb-4 tab__item ms-auto"
                 x-data
                 @click="showSubmission = !showSubmission"
             >
@@ -29,10 +29,10 @@
 
     {% include "forms/includes/form_errors.html" with form=form %}
 
-    <section class="my-8 flex justify-between relative" x-data="reviewScore">
-        <div class="absolute h-full right-0 top-0 hidden lg:block">
+    <section class="flex relative justify-between my-8" x-data="reviewScore">
+        <div class="hidden absolute top-0 right-0 h-full lg:block">
             <div
-                class="bg-arsenic text-white font-semibold inline-block px-3 py-1.5 mt-1 text-center sticky top-1 float-end"
+                class="inline-block sticky top-1 py-1.5 px-3 mt-1 font-semibold text-center text-white bg-arsenic float-end"
                 x-clock
                 x-show="showScore"
             >
@@ -40,7 +40,7 @@
             </div>
         </div>
         {% if not has_submitted_review %}
-            <form id="review-form-edit" class="form form--scoreable max-w-3xl flex-1" action="" method="post">
+            <form id="review-form-edit" class="flex-1 max-w-3xl form form--scoreable" action="" method="post">
                 {% csrf_token %}
                 {% for hidden in form.hidden_fields %}
                     {{ hidden }}
@@ -63,7 +63,7 @@ <h2>{{ value }}</h2>
                     {% endif %}
                 {% endfor %}
 
-                <div class="flex gap-4 flex-wrap items-center">
+                <div class="flex flex-wrap gap-4 items-center">
                     {% if not object.id or object.is_draft %}
                         <button class="button button--white" type="submit" name="{{ form.draft_button_name }}" formnovalidate>
                             {% trans "Save draft" %}
@@ -80,7 +80,7 @@ <h2>{{ value }}</h2>
             </form>
             <aside :class="showSubmission ? 'flex-1 ps-4' : ''">
                 <section
-                    class="p-4 overflow-y-auto bg-white shadow-xl max-h-screen"
+                    class="overflow-y-auto p-4 max-h-screen bg-white shadow-xl"
                     x-show="showSubmission"
                     x-transition:enter="transition ease-out duration-250"
                     x-transition:enter-start="transform opacity-0 translate-x-full"
diff --git a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
index 2a6a01b89b..1e97bc724e 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/heading_field.html
@@ -1,10 +1,10 @@
 {% load heroicons %}
-<div class="section-head mb-4 group" id="{{ value.heading_text|slugify }}">
-    <{{ self.size }} tabindex="-1" class="p-2 mb-2 bg-light-blue text-white">
+<div class="mb-4 section-head group" id="{{ value.heading_text|slugify }}">
+    <{{ self.size }} tabindex="-1" class="p-2 mb-2 text-white bg-light-blue">
 
     {{ value.heading_text }}
     <a
-        class="hidden p-1 hover:opacity-70 transition-opacity group-hover:inline-block float-right text-white"
+        class="hidden float-right p-1 text-white transition-opacity group-hover:inline-block hover:opacity-70"
         href="#{{ value.heading_text|slugify }}"
         aria-hidden='true'
         tabindex="-1"
diff --git a/hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html b/hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html
index 6a5c22298e..8a8517b5b6 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/includes/file_field.html
@@ -1,14 +1,14 @@
 {% load i18n heroicons apply_tags %}
 
-<a class="not-prose mb-2 flex justify-between items-center max-w-2xl border rounded px-3 py-2 font-medium bg-slate-50 hover:bg-slate-200 transition-colors"
+<a class="flex justify-between items-center py-2 px-3 mb-2 max-w-2xl font-medium rounded border transition-colors not-prose bg-slate-50 hover:bg-slate-200"
    href="{{ file.url }}"
    target="_blank" rel="noopener noreferrer"
    title="View file - {{ file.filename }}"
 >
-    <span class="truncate text-sm">
+    <span class="text-sm truncate">
         {% heroicon_mini "document-text" class="inline align-text-bottom" aria_hidden=true %}
         {{ file.filename|truncatechars_middle:45 }}
-        <span class="text-fg-muted text-xs">
+        <span class="text-xs text-fg-muted">
             <span class="sr-only">{% trans "uploaded" %}</span>
             <span aria-hidden>•</span>
             <relative-time datetime={{ file.modification_time|date:"c" }}>{{ file.modification_time|date:"SHORT_DATE_FORMAT" }}</relative-time>
diff --git a/hypha/apply/stream_forms/templates/stream_forms/render_field.html b/hypha/apply/stream_forms/templates/stream_forms/render_field.html
index 89c950364e..57b5571a7a 100644
--- a/hypha/apply/stream_forms/templates/stream_forms/render_field.html
+++ b/hypha/apply/stream_forms/templates/stream_forms/render_field.html
@@ -1,9 +1,9 @@
 {% if include_question %}
     <section class="">
-        <h4 class="question text-xl font-bold border-b mb-2 py-2">{{ value.field_label }}</h4>
+        <h4 class="py-2 mb-2 text-xl font-bold border-b question">{{ value.field_label }}</h4>
 {% endif %}
 
-<div class="answer prose max-w-none">
+<div class="max-w-none answer prose">
     {% block data_display %}<p>{{ data }}</p>{% endblock %}
 </div>
 
diff --git a/hypha/apply/templates/forms/includes/field.html b/hypha/apply/templates/forms/includes/field.html
index 2575e9cd4f..619ba5cadc 100644
--- a/hypha/apply/templates/forms/includes/field.html
+++ b/hypha/apply/templates/forms/includes/field.html
@@ -65,7 +65,7 @@
             <p class="form__help-link">
                 <a href="{{ field.field.help_link }}" target="_blank" rel="noopener noreferrer">
                     {% trans "See help guide for more information." %}
-                    {% heroicon_micro "arrow-top-right-on-square" class="inline align-text-bottom w-4 h-4" aria_hidden=true %}
+                    {% heroicon_micro "arrow-top-right-on-square" class="inline w-4 h-4 align-text-bottom" aria_hidden=true %}
                 </a>
             </p>
         {% endif %}
diff --git a/hypha/apply/todo/templates/todo/todolist_dropdown.html b/hypha/apply/todo/templates/todo/todolist_dropdown.html
index 08b74be096..811385d492 100644
--- a/hypha/apply/todo/templates/todo/todolist_dropdown.html
+++ b/hypha/apply/todo/templates/todo/todolist_dropdown.html
@@ -3,7 +3,7 @@
     {% for task in my_tasks.data %}
         {% include "todo/todolist_item.html" with button_type_class=" button--transparent button--narrow" %}
     {% empty %}
-        <p class="m-0 p-3 border-b-2 border-light-grey last:border-b-0">
+        <p class="p-3 m-0 border-b-2 last:border-b-0 border-light-grey">
             {% trans "No pending task." %}
         </p>
     {% endfor %}
diff --git a/hypha/apply/todo/templates/todo/todolist_item.html b/hypha/apply/todo/templates/todo/todolist_item.html
index 2d00fcf302..eeb5d3b74a 100644
--- a/hypha/apply/todo/templates/todo/todolist_item.html
+++ b/hypha/apply/todo/templates/todo/todolist_item.html
@@ -1,19 +1,19 @@
 {% load i18n markdown_tags nh3_tags heroicons %}
 
-<div class="group bg-white p-2 flex items-center">
+<div class="flex items-center p-2 bg-white group">
     <svg class="w-6 h-6 ms-1 me-2"><use xlink:href="#{{ task.icon }}"></use></svg>
     <div class="flex flex-1 items-center">
         <span>{{ task.text|markdown|nh3 }}</span>
         {% if task.type == "Draft" %}
             <span
-                class="bg-red-200 rounded-full whitespace-nowrap inline-block ms-1 my-2 px-2 pt-0.5 pb-1 text-sm font-medium text-gray-800 hidden sm:block"
+                class="inline-block hidden px-2 pt-0.5 pb-1 my-2 text-sm font-medium text-gray-800 whitespace-nowrap bg-red-200 rounded-full sm:block ms-1"
             >
                 {{ task.type }}
             </span>
         {% endif %}
     </div>
     {% if task.user %}
-        <button class="ms-2 invisible group-hover:visible" data-tooltip="Remove task" hx-delete="{% url 'todo:delete' pk=task.id %}" hx-target="this" hx-swap="none" hx-confirm='{% trans "Are you sure you want to remove this task? It will remove this task from your task list." %}'>{% heroicon_micro "x-mark" class="inline me-2" width=24 height=24 aria_hidden=true %}</button>
+        <button class="invisible group-hover:visible ms-2" data-tooltip="Remove task" hx-delete="{% url 'todo:delete' pk=task.id %}" hx-target="this" hx-swap="none" hx-confirm='{% trans "Are you sure you want to remove this task? It will remove this task from your task list." %}'>{% heroicon_micro "x-mark" class="inline me-2" width=24 height=24 aria_hidden=true %}</button>
     {% endif %}
     <a class="button {{ button_type_class }} ms-2" href="{{ task.url }}">{% trans "View" %}</a>
 </div>
diff --git a/hypha/apply/users/templates/elevate/elevate.html b/hypha/apply/users/templates/elevate/elevate.html
index c3ea27bf91..8b712a0c5f 100644
--- a/hypha/apply/users/templates/elevate/elevate.html
+++ b/hypha/apply/users/templates/elevate/elevate.html
@@ -5,11 +5,11 @@
 {% block body_class %}bg-white{% endblock %}
 
 {% block content %}
-    <div class="max-w-md px-4 pt-4 mx-auto md:mt-5 md:py-4">
+    <div class="px-4 pt-4 mx-auto max-w-md md:py-4 md:mt-5">
 
         <h2 class="text-2xl text-center">{% trans "Confirm access" %}</h2>
 
-        <p class="text-center mb-4">
+        <p class="mb-4 text-center">
             Signed in as <strong>{% if request.user.full_name %} {{ request.user.full_name }} ({{ request.user.email }}) {% else %}{{ request.user.email }} {% endif %}</strong>
         </p>
 
@@ -17,7 +17,7 @@ <h2 class="text-2xl text-center">{% trans "Confirm access" %}</h2>
 
             {% if request.user.has_usable_password %}
                 <form
-                    class="form form--error-inline mb-4 px-4 pt-4 border rounded-sm bg-gray-50"
+                    class="px-4 pt-4 mb-4 bg-gray-50 rounded-sm border form form--error-inline"
                     method="post"
                     action="./"
                     data-test-id="section-password-input"
@@ -33,7 +33,7 @@ <h2 class="text-2xl text-center">{% trans "Confirm access" %}</h2>
                     </div>
                 </form>
             {% else %}
-                <section data-test-id="section-confirm" id="confirm-code-input" class="mb-4 px-4 pt-4 text-center">
+                <section data-test-id="section-confirm" id="confirm-code-input" class="px-4 pt-4 mb-4 text-center">
 
                     <button
                         class="button button--primary"
@@ -48,7 +48,7 @@ <h2 class="text-2xl text-center">{% trans "Confirm access" %}</h2>
             {% endif %}
 
             {% if request.user.has_usable_password %}
-                <section data-test-id="section-send-email" class="px-4 border pt-2 pb-4">
+                <section data-test-id="section-send-email" class="px-4 pt-2 pb-4 border">
                     <p>{% trans "Having problems?" %}</p>
                     <ul class="list-disc ms-4">
                         <li>
@@ -68,7 +68,7 @@ <h2 class="text-2xl text-center">{% trans "Confirm access" %}</h2>
         </section>
 
 
-        <p class="text-xs text-center max-w-xs mt-8 text-gray-500 mx-auto leading-relaxed">
+        <p class="mx-auto mt-8 max-w-xs text-xs leading-relaxed text-center text-gray-500">
             {% blocktrans %}
                 <strong>Tip:</strong> You are entering sudo mode. After you've performed a sudo-protected
                 action, you'll only be asked to re-authenticate again after a few hours of inactivity.
diff --git a/hypha/apply/users/templates/two_factor/_base.html b/hypha/apply/users/templates/two_factor/_base.html
index b3ddd4e32d..c0d6c54a27 100644
--- a/hypha/apply/users/templates/two_factor/_base.html
+++ b/hypha/apply/users/templates/two_factor/_base.html
@@ -15,13 +15,13 @@
 
         {% if user.can_access_dashboard %}
             <a href="{% url 'dashboard:dashboard' %}" class="button button--primary" hx-boost='true'>
-                {% heroicon_mini "squares-2x2" size=20 class="mr-1 inline align-text-bottom" %}
+                {% heroicon_mini "squares-2x2" size=20 class="inline mr-1 align-text-bottom" %}
                 {% trans "Go to my dashboard" %}
             </a>
         {% endif %}
     {% endadminbar %}
 
-    <div class="wrapper wrapper--inner-space-medium max-w-2xl  two-factor">
+    <div class="max-w-2xl wrapper wrapper--inner-space-medium two-factor">
         {% block content_inner %}{% endblock %}
     </div>
 {% endblock %}
diff --git a/hypha/apply/users/templates/two_factor/_wizard_actions.html b/hypha/apply/users/templates/two_factor/_wizard_actions.html
index 4931f35879..182bbf53df 100644
--- a/hypha/apply/users/templates/two_factor/_wizard_actions.html
+++ b/hypha/apply/users/templates/two_factor/_wizard_actions.html
@@ -12,7 +12,7 @@
 
 <button
     type="submit"
-    class="button button--primary mb-4"
+    class="mb-4 button button--primary"
 >
     {{ button_text }}
 </button>
diff --git a/hypha/apply/users/templates/two_factor/admin/disable.html b/hypha/apply/users/templates/two_factor/admin/disable.html
index 1e1a97e254..b05335d82e 100644
--- a/hypha/apply/users/templates/two_factor/admin/disable.html
+++ b/hypha/apply/users/templates/two_factor/admin/disable.html
@@ -10,7 +10,7 @@
     <form class="form" action="" method="POST" novalidate>
         <div class="tab-content">
             {% csrf_token %}
-            <section id="account" class="active nice-padding">
+            <section id="account" class="nice-padding active">
                 <p>{% trans "Are you sure you want to disable the Two Factor Authentication for this user?" %}</p>
 
                 <ul class="fields">
diff --git a/hypha/apply/users/templates/two_factor/core/backup_tokens.html b/hypha/apply/users/templates/two_factor/core/backup_tokens.html
index 2fbd567fd0..6f1eb96e3e 100644
--- a/hypha/apply/users/templates/two_factor/core/backup_tokens.html
+++ b/hypha/apply/users/templates/two_factor/core/backup_tokens.html
@@ -14,11 +14,11 @@ <h1>{% block title %}{% trans "Backup Codes" %}{% endblock %}</h1>
                   cols="8"
                   rows="{{ device.token_set.count }}"
                   id="list-backup-tokens"
-                  class="font-mono pe-0 font-medium leading-tight bg-orange-100 resize-none"
+                  class="font-mono font-medium leading-tight bg-orange-100 resize-none pe-0"
         >{% for token in device.token_set.all %}{{ token.token }}{% if not forloop.last %}&#013;&#010;{% endif %}{% endfor %}</textarea>
 
         <form method="post" class="actions actions-footer">{% csrf_token %}{{ form }}
-            <p class="flex justify-start flex-wrap gap-2 mb-4">
+            <p class="flex flex-wrap gap-2 justify-start mb-4">
                 <a href="#" class="btn btn-primary btn-print">{% trans "Print" %}</button>
                 <a href="#"
                    class="btn btn-primary btn-copy-to-clipboard"
@@ -33,8 +33,8 @@ <h1>{% block title %}{% trans "Backup Codes" %}{% endblock %}</h1>
             <p class="text-sm text-fg-muted">{% blocktrans trimmed %} <strong>Note:</strong> Each of the code can be used only once. When they are used up, you can generate a new set of backup codes.{% endblocktrans %}</p>
             <p class="hide-print">{% blocktrans %}Once done, acknowledge you have stored the codes securely and then click "Finish".{% endblocktrans %}</p>
             <div class="form">
-                <ul class="errorlist hidden error-action-agree"><li>Please confirm you have stored the codes securely below.</li></ul>
-                <div class="form__item mb-4">
+                <ul class="hidden errorlist error-action-agree"><li>Please confirm you have stored the codes securely below.</li></ul>
+                <div class="mb-4 form__item">
                     <input type="checkbox" id="action_agree" name="action_agree" value="action_agree">
                     <label for="action_agree"> I have stored the backup codes securely.</label>
                 </div>
diff --git a/hypha/apply/users/templates/two_factor/core/two_factor_required.html b/hypha/apply/users/templates/two_factor/core/two_factor_required.html
index e8c2135d3e..a28e2d5c80 100644
--- a/hypha/apply/users/templates/two_factor/core/two_factor_required.html
+++ b/hypha/apply/users/templates/two_factor/core/two_factor_required.html
@@ -5,7 +5,7 @@
 {% block content %}
     <h1>{% block title %}{% trans "Permission Denied" %}: {{ reason }}{% endblock %}</h1>
 
-    <div class="prose mb-4">
+    <div class="mb-4 prose">
         <p>
             {% blocktrans trimmed %}
                 The page you are trying to access requires users to verify their
diff --git a/hypha/apply/users/templates/users/account.html b/hypha/apply/users/templates/users/account.html
index eb51573dfe..6ae3ddc4d2 100644
--- a/hypha/apply/users/templates/users/account.html
+++ b/hypha/apply/users/templates/users/account.html
@@ -11,14 +11,14 @@
         <span class="flex gap-4">
             {% if user.can_access_dashboard %}
                 <a href="{% url 'dashboard:dashboard' %}" class="button button--primary">
-                    {% heroicon_mini "squares-2x2" size=20 class="me-1 inline align-text-bottom" aria_hidden=true %}
+                    {% heroicon_mini "squares-2x2" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
                     {% trans "Go to my dashboard" %}
                 </a>
             {% else %}
-                <div class="wrapper wrapper--cta-box flex items-center">
+                <div class="flex items-center wrapper wrapper--cta-box">
                     <div class="flex-1">
-                        <h3 class="heading heading--no-margin font-bold">{% trans "Submit a new application" %}</h3>
-                        <p class="text-base m-0">{% trans "Apply now for our open rounds" %}</p>
+                        <h3 class="font-bold heading heading--no-margin">{% trans "Submit a new application" %}</h3>
+                        <p class="m-0 text-base">{% trans "Apply now for our open rounds" %}</p>
                     </div>
                     <div>
                         <a class="button button--blue-white" href="{% pageurl APPLY_SITE.root_page %}" class="button">{% trans "Apply" %}</a>
@@ -28,7 +28,7 @@ <h3 class="heading heading--no-margin font-bold">{% trans "Submit a new applicat
             {% endif %}
             {% if perms.wagtailadmin.access_admin %}
                 <a href="{% url 'wagtailadmin_home' %}" id="wagtail-admin-button" class="button button--primary">
-                    {% heroicon_solid "cog-6-tooth" size=20 class="me-1 inline align-text-bottom" aria_hidden=true %}
+                    {% heroicon_solid "cog-6-tooth" size=20 class="inline align-text-bottom me-1" aria_hidden=true %}
                     {% trans "Administration" %}
                 </a>
             {% endif %}
@@ -55,8 +55,8 @@ <h2 class="text-2xl">{% trans "Profile" %}</h2>
             <h2 class="text-2xl">{% trans "Account Security" %}</h2>
 
             {% if show_change_password %}
-                <div class="block_manage_password mb-8">
-                    <h3 class="text-base mb-0">{% trans "Password" %}</h3>
+                <div class="mb-8 block_manage_password">
+                    <h3 class="mb-0 text-base">{% trans "Password" %}</h3>
                     <p>
                         {% if user.has_usable_password %}
                             <a class="button button--primary" href="{% url 'users:password_change' %}">
@@ -74,11 +74,11 @@ <h3 class="text-base mb-0">{% trans "Password" %}</h3>
                 </div>
             {% endif %}
 
-            <h3 class="text-base mb-2">{% trans "Two-Factor Authentication (2FA)" %}</h3>
+            <h3 class="mb-2 text-base">{% trans "Two-Factor Authentication (2FA)" %}</h3>
             <div>
                 {% if default_device %}
-                    <a class="button button--primary mb-2" href="{% url 'users:backup_tokens' %}">{% trans "Backup codes" %}</a>
-                    <a class="button button--primary button--warning mb-2 w-fit" href="{% url 'two_factor:disable' %}">{% trans "Disable 2FA" %}</a>
+                    <a class="mb-2 button button--primary" href="{% url 'users:backup_tokens' %}">{% trans "Backup codes" %}</a>
+                    <a class="mb-2 button button--primary button--warning w-fit" href="{% url 'two_factor:disable' %}">{% trans "Disable 2FA" %}</a>
                 {% else %}
                     <a class="button button--primary" href="{% url 'two_factor:setup' %}">{% trans "Enable 2FA" %}</a>
                 {% endif %}
@@ -88,7 +88,7 @@ <h3 class="text-base mb-2">{% trans "Two-Factor Authentication (2FA)" %}</h3>
             {% comment %}
             {% can_use_oauth as show_oauth_link %}
             {% if show_oauth_link %}
-            <h3 class="text-base mb-2">Manage OAuth</h3>
+            <h3 class="mb-2 text-base">Manage OAuth</h3>
             <div>
                 <a href="{% url 'users:oauth' %}">
                     {% trans "Manage OAuth" %}
diff --git a/hypha/apply/users/templates/users/activation/invalid.html b/hypha/apply/users/templates/users/activation/invalid.html
index 6a46ff6e20..39435b2fb4 100644
--- a/hypha/apply/users/templates/users/activation/invalid.html
+++ b/hypha/apply/users/templates/users/activation/invalid.html
@@ -5,7 +5,7 @@
 {% block body_class %}bg-white{% endblock %}
 
 {% block content %}
-    <div class="w-full bg-white mt-5 md:py-4">
+    <div class="mt-5 w-full bg-white md:py-4">
 
         <section class="max-w-2xl">
             {% heroicon_outline "exclamation-triangle" aria_hidden="true" size=64 class="stroke-red-600" %}
diff --git a/hypha/apply/users/templates/users/become.html b/hypha/apply/users/templates/users/become.html
index 6a1376c5fc..77fb8699bf 100644
--- a/hypha/apply/users/templates/users/become.html
+++ b/hypha/apply/users/templates/users/become.html
@@ -8,19 +8,19 @@
         <input type="hidden" name="next" value="{{ next }}" />
     {% endif %}
 
-    <label for="id_user_pk" class="block text-sm font-semibold text-fg-muted mb-2">
+    <label for="id_user_pk" class="block mb-2 text-sm font-semibold text-fg-muted">
         {% trans "Select User:" %}
     </label>
 
     {{ form.user_pk }}
 
-    <p class="m-0 pt-2 text-fg-muted text-sm">
+    <p class="pt-2 m-0 text-sm text-fg-muted">
         {{ form.user_pk.help_text }}
     </p>
 
-    <div class="mt-5 sm:gap-4 sm:mt-4 sm:flex sm:flex-row-reverse">
+    <div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
         <button
-            class="button button--warning w-full sm:w-auto"
+            class="w-full sm:w-auto button button--warning"
             type="submit"
         >
             {% trans "Switch User" %}
@@ -28,7 +28,7 @@
 
         <button
             type="button"
-            class="inline-flex items-center justify-center w-full px-3 py-2 mt-3 text-sm font-semibold text-gray-900 bg-white rounded-sm shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 sm:mt-0 sm:w-auto"
+            class="inline-flex justify-center items-center py-2 px-3 mt-3 w-full text-sm font-semibold text-gray-900 bg-white rounded-sm ring-1 ring-inset ring-gray-300 shadow-sm sm:mt-0 sm:w-auto hover:bg-gray-50"
             @click="show = false"
         >{% trans "Cancel" %}</button>
     </div>
diff --git a/hypha/apply/users/templates/users/change_password.html b/hypha/apply/users/templates/users/change_password.html
index 21b9d60dce..e5505cc388 100644
--- a/hypha/apply/users/templates/users/change_password.html
+++ b/hypha/apply/users/templates/users/change_password.html
@@ -13,7 +13,7 @@
         {% endslot %}
     {% endadminbar %}
 
-    <div class="wrapper mt-6 max-w-2xl">
+    <div class="mt-6 max-w-2xl wrapper">
         <form class="form form--error-inline" action="" method="POST" novalidate>
             {% if redirect_url %}
                 <input type="hidden" value="{{ redirect_url }}" name="next">
diff --git a/hypha/apply/users/templates/users/email_change/done.html b/hypha/apply/users/templates/users/email_change/done.html
index fcf6194f7d..d660d81941 100644
--- a/hypha/apply/users/templates/users/email_change/done.html
+++ b/hypha/apply/users/templates/users/email_change/done.html
@@ -9,7 +9,7 @@
         {% slot header %}{% trans "Email Update" %}{% endslot %}
     {% endadminbar %}
 
-    <div class="wrapper mt-6 prose">
+    <div class="mt-6 wrapper prose">
         <h2>{% trans "Confirm &amp; verify your new email!" %} </h2>
         <p>
             {% trans "We have sent a confirmation link to your new email." %}
diff --git a/hypha/apply/users/templates/users/login.html b/hypha/apply/users/templates/users/login.html
index 11e093751c..a6e5c5678a 100644
--- a/hypha/apply/users/templates/users/login.html
+++ b/hypha/apply/users/templates/users/login.html
@@ -5,7 +5,7 @@
 {% block body_class %}bg-white{% endblock %}
 
 {% block content %}
-    <div class="max-w-2xl bg-white my-5">
+    <div class="my-5 max-w-2xl bg-white">
 
         <section>
             <div class="px-4 pt-4">
@@ -25,7 +25,7 @@ <h2 class="text-2xl">{% trans "Two factor verification" %}</h2>
                     <p>
                         {% blocktrans trimmed %}Please enter one of the backup codes to log in to your account.{% endblocktrans %}
                     </p>
-                    <p class="text-sm mb-4 text-fg-muted">
+                    <p class="mb-4 text-sm text-fg-muted">
                         {% blocktrans trimmed %}Those codes were generated for you during 2FA setup to print or keep safe in a password manager.{% endblocktrans %}
                     </p>
                 {% endif %}
@@ -48,26 +48,26 @@ <h2 class="text-2xl">{% blocktrans %}Log in to {{ ORG_SHORT_NAME }}{% endblocktr
                                 {% include "forms/includes/field.html" %}
                                 {% if field.auto_id == "id_auth-password" %}
                                     <div class="text-end">
-                                        <a class="link text-sm hover:opacity-75" href="{% url 'users:password_reset' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true">{% trans "Forgot your password?" %}</a>
+                                        <a class="text-sm hover:opacity-75 link" href="{% url 'users:password_reset' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}" hx-boost="true">{% trans "Forgot your password?" %}</a>
                                     </div>
                                 {% endif %}
                             </div>
                         {% endfor %}
 
                         {% if settings.users.AuthSettings.extra_text %}
-                            <div class="prose prose-sm mb-6 rounded-sm bg-slate-50 p-4">
+                            <div class="p-4 mb-6 rounded-sm prose prose-sm bg-slate-50">
                                 {{ settings.users.AuthSettings.extra_text|richtext}}
                             </div>
                         {% endif %}
 
-                        <div class="form__group max-w-sm flex items-center justify-between gap-4">
+                        <div class="flex gap-4 justify-between items-center max-w-sm form__group">
                             <button class="button button--primary button--login" type="submit">{% trans "Log in" %}</button>
                         </div>
 
-                        <div class="flex items-center justify-center min-[465px]:justify-start relative mb-4">
-                            <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
-                            <span class="px-3 text-gray-400 font-medium">{% trans "or" %}</span>
-                            <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
+                        <div class="flex relative justify-center items-center mb-4 min-[465px]:justify-start">
+                            <hr class="inline my-6 w-32 h-px bg-gray-300 border-0">
+                            <span class="px-3 font-medium text-gray-400">{% trans "or" %}</span>
+                            <hr class="inline my-6 w-32 h-px bg-gray-300 border-0">
                         </div>
 
                         <section class="space-y-0.5">
@@ -107,7 +107,7 @@ <h2 class="text-2xl">{% blocktrans %}Log in to {{ ORG_SHORT_NAME }}{% endblocktr
                                     type="submit"
                                     value="backup"
                                     aria-label="Click here to use a backup code"
-                                    class="inline font-bold text-dark-blue hover:opacity-70 transition-opacity"
+                                    class="inline font-bold transition-opacity hover:opacity-70 text-dark-blue"
                                 >
                                     {% trans "Use a Backup Code" %}
                                 </button>
diff --git a/hypha/apply/users/templates/users/partials/confirmation_code_sent.html b/hypha/apply/users/templates/users/partials/confirmation_code_sent.html
index e8f1c43420..aeba2ce475 100644
--- a/hypha/apply/users/templates/users/partials/confirmation_code_sent.html
+++ b/hypha/apply/users/templates/users/partials/confirmation_code_sent.html
@@ -1,6 +1,6 @@
 {% load i18n heroicons %}
 <form
-    class="form form--error-inline px-4 py-4 mb-4 border rounded-sm bg-gray-50 w-full text-center"
+    class="py-4 px-4 mb-4 w-full text-center bg-gray-50 rounded-sm border form form--error-inline"
     id="elevate-check-code-form"
     x-data="{ code: '' }"
 >
@@ -33,7 +33,7 @@
 
     <div>
         <button
-            class="button button--primary block mb-4"
+            class="block mb-4 button button--primary"
             type="submit"
             hx-post="{% url 'users:elevate_check_code' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}"
             hx-validate="true"
@@ -45,7 +45,7 @@
     </div>
     {% if error %}
         <button
-            class="link hover:underline"
+            class="hover:underline link"
             hx-post="{% url 'users:elevate_send_confirm_access_email' %}{% if request.GET.next %}?next={{request.GET.next}}{% endif %}"
             hx-target="#section-form"
         >
@@ -55,7 +55,7 @@
 </form>
 
 {% if request.user.has_usable_password %}
-    <section data-test-id="section-send-email" class="px-4 border pt-2 pb-4">
+    <section data-test-id="section-send-email" class="px-4 pt-2 pb-4 border">
         <p>{% trans "Having problems?" %}</p>
         <ul class="list-disc ms-4">
             <li>
diff --git a/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html b/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
index d0ad389242..bd4f75c4c7 100644
--- a/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
+++ b/hypha/apply/users/templates/users/partials/passwordless_login_signup_sent.html
@@ -2,7 +2,7 @@
 {% load i18n heroicons %}
 
 {% block content %}
-    <section class="prose mt-8">
+    <section class="mt-8 prose">
         <div>
             {% heroicon_outline "document-check" aria_hidden="true" size=64 %}
         </div>
diff --git a/hypha/apply/users/templates/users/password_reset/complete.html b/hypha/apply/users/templates/users/password_reset/complete.html
index 1891387dcb..98dec30d53 100644
--- a/hypha/apply/users/templates/users/password_reset/complete.html
+++ b/hypha/apply/users/templates/users/password_reset/complete.html
@@ -8,7 +8,7 @@
         {% slot header %}{% trans "Password change successful" %}{% endslot %}
     {% endadminbar %}
 
-    <div class="wrapper mt-6 max-w-2xl">
+    <div class="mt-6 max-w-2xl wrapper">
         <p>
             <a href="{% url 'users:login' %}">{% trans "Log in" %}</a>
         </p>
diff --git a/hypha/apply/users/templates/users/password_reset/confirm.html b/hypha/apply/users/templates/users/password_reset/confirm.html
index e51ba2dffa..ffc0426a47 100644
--- a/hypha/apply/users/templates/users/password_reset/confirm.html
+++ b/hypha/apply/users/templates/users/password_reset/confirm.html
@@ -5,7 +5,7 @@
 
 {% block content %}
 
-    <div class="wrapper max-w-xl mt-12">
+    <div class="mt-12 max-w-xl wrapper">
         {% if validlink %}
 
             <h2 class="text-2xl">{% trans "Reset password" %}</h2>
diff --git a/hypha/apply/users/templates/users/password_reset/done.html b/hypha/apply/users/templates/users/password_reset/done.html
index 67e68d228c..9b85d98ae9 100644
--- a/hypha/apply/users/templates/users/password_reset/done.html
+++ b/hypha/apply/users/templates/users/password_reset/done.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-    <div class="wrapper mt-12 max-w-xl">
+    <div class="mt-12 max-w-xl wrapper">
 
         <h2 class="text-xl">
             {% trans "Check your inbox for a password reset email!" %}
diff --git a/hypha/apply/users/templates/users/password_reset/form.html b/hypha/apply/users/templates/users/password_reset/form.html
index b1d130fa82..e04f26eb4e 100644
--- a/hypha/apply/users/templates/users/password_reset/form.html
+++ b/hypha/apply/users/templates/users/password_reset/form.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 
-    <section class="my-5 py-4">
+    <section class="py-4 my-5">
         <div class="wrapper">
             {% if form.non_field_errors %}
                 <div class="messages">
@@ -18,7 +18,7 @@
                 </div>
             {% endif %}
 
-            <form class="form form--with-p-tags pt-4" method="post">
+            <form class="pt-4 form form--with-p-tags" method="post">
                 <h2 class="text-2xl">{% trans "Forgot password?" %}</h2>
                 <p class="form__help">{% trans "Please enter your user account's email address and we will send you a password reset link." %}</p>
                 {% csrf_token %}
diff --git a/hypha/apply/users/templates/users/passwordless_login_signup.html b/hypha/apply/users/templates/users/passwordless_login_signup.html
index 86b1945ca9..d0f48dcff8 100644
--- a/hypha/apply/users/templates/users/passwordless_login_signup.html
+++ b/hypha/apply/users/templates/users/passwordless_login_signup.html
@@ -6,9 +6,9 @@
 {% endblock %}
 
 {% block content %}
-    <div class="max-w-2xl bg-white my-5">
+    <div class="my-5 max-w-2xl bg-white">
 
-        <section class="pt-4 px-5">
+        <section class="px-5 pt-4">
             <form class="form form--user-login" method="post" hx-post="./" hx-swap="outerHTML" hx-target="#main">
                 {% csrf_token %}
 
@@ -38,7 +38,7 @@ <h2 class="text-2xl">
                 </div>
 
                 {% if settings.users.AuthSettings.extra_text %}
-                    <div class="prose prose-sm mb-6 p-4 rounded-sm bg-slate-50">
+                    <div class="p-4 mb-6 rounded-sm prose prose-sm bg-slate-50">
                         {{ settings.users.AuthSettings.extra_text|richtext}}
                     </div>
                 {% endif %}
@@ -47,10 +47,10 @@ <h2 class="text-2xl">
                     <button class="button button--primary button--login" type="submit">{% trans "Next" %}</button>
                 </div>
 
-                <div class="flex items-center justify-center min-[465px]:justify-start relative mb-4">
-                    <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
-                    <span class="px-3 text-gray-400 font-medium">{% trans "or" %}</span>
-                    <hr class="inline w-32 h-px my-6 bg-gray-300 border-0">
+                <div class="flex relative justify-center items-center mb-4 min-[465px]:justify-start">
+                    <hr class="inline my-6 w-32 h-px bg-gray-300 border-0">
+                    <span class="px-3 font-medium text-gray-400">{% trans "or" %}</span>
+                    <hr class="inline my-6 w-32 h-px bg-gray-300 border-0">
                 </div>
 
                 <section class="space-y-0.5">
diff --git a/hypha/apply/users/templates/users/register-success.html b/hypha/apply/users/templates/users/register-success.html
index bb50fb5a54..5aa80e9d47 100644
--- a/hypha/apply/users/templates/users/register-success.html
+++ b/hypha/apply/users/templates/users/register-success.html
@@ -6,12 +6,12 @@
 
 {% block content %}
 
-    <div class="wrapper mt-12 max-w-2xl">
+    <div class="mt-12 max-w-2xl wrapper">
 
         <div>
             {% heroicon_outline "document-check" aria_hidden="true" size=64 %}
         </div>
-        <h2 class="text-2xl mt-4">
+        <h2 class="mt-4 text-2xl">
             Account created, check your email to activate!
         </h2>
         <p>
diff --git a/hypha/cookieconsent/templates/includes/banner.html b/hypha/cookieconsent/templates/includes/banner.html
index 05fec25835..47392748c4 100644
--- a/hypha/cookieconsent/templates/includes/banner.html
+++ b/hypha/cookieconsent/templates/includes/banner.html
@@ -1,7 +1,7 @@
 {% load i18n wagtailcore_tags %}
 
 {% if show_banner %}
-    <div class="cookieconsent w-full z-20 py-8">
+    <div class="z-20 py-8 w-full cookieconsent">
         <div class="cookieconsent__content">
             <div class="cookieconsent__brief">
                 <div>
@@ -53,7 +53,7 @@ <h2 class="cookieconsent__title">
                             <span class="font-bold">{% trans "Always enabled." %}</span>
                         </div>
                         {% if settings.cookieconsent_analytics %}
-                            <div class="cookieconsent__info lg:pl-10">
+                            <div class="lg:pl-10 cookieconsent__info">
                                 <p class="font-semibold">{% trans "Analytics Cookies" %}</p>
                                 {{ settings.cookieconsent_analytics_about|richtext }}
                             </div>
diff --git a/hypha/core/templates/components/admin_bar.html b/hypha/core/templates/components/admin_bar.html
index 9753a1fce1..34402b9d7c 100644
--- a/hypha/core/templates/components/admin_bar.html
+++ b/hypha/core/templates/components/admin_bar.html
@@ -1,13 +1,13 @@
 {% load components i18n %}
 
-<div class="admin-bar bg-arsenic text-white">
-    <div class="admin-bar__inner items-center md:flex md:justify-between">
+<div class="text-white admin-bar bg-arsenic">
+    <div class="items-center md:flex md:justify-between admin-bar__inner">
         <div>
             {% render_slot slots.back_link %}
-            <h1 class="text-2xl mb-2 font-medium md:text-3xl md:m-0">{% render_slot slots.header %}</h1>
-            {% if slots.sub_heading %}<p class="text-sm m-0">{% render_slot slots.sub_heading %}</p>{% endif %}
+            <h1 class="mb-2 text-2xl font-medium md:m-0 md:text-3xl">{% render_slot slots.header %}</h1>
+            {% if slots.sub_heading %}<p class="m-0 text-sm">{% render_slot slots.sub_heading %}</p>{% endif %}
         </div>
-        {% if slots.buttons %}<div class="-mb-5 self-end">{% render_slot slots.buttons %}</div>{% endif %}
+        {% if slots.buttons %}<div class="self-end -mb-5">{% render_slot slots.buttons %}</div>{% endif %}
         {% render_slot slots.inner_block %}
     </div>
 </div>
diff --git a/hypha/core/templates/components/dropdown-menu.html b/hypha/core/templates/components/dropdown-menu.html
index 07bb9217be..29d6b51f0b 100644
--- a/hypha/core/templates/components/dropdown-menu.html
+++ b/hypha/core/templates/components/dropdown-menu.html
@@ -22,7 +22,7 @@
 >
     <button
         type="button"
-        class="flex cursor-pointer items-center justify-between w-full py-1 ps-2 pe-2 border md:border-none font-medium text-gray-600 hover:bg-gray-50 md:hover:bg-transparent md:hover:text-blue-700"
+        class="flex justify-between items-center py-1 w-full font-medium text-gray-600 border cursor-pointer md:border-none hover:bg-gray-50 ps-2 pe-2 md:hover:bg-transparent md:hover:text-blue-700"
         x-ref="button"
         @click="toggle()"
         :aria-expanded="open"
@@ -36,7 +36,7 @@
     >
         {{ attributes.title }}
 
-        {% heroicon_micro attributes.icon|default:"chevron-down" aria_hidden="true" size="16" class="hidden md:inline-block ms-0.5 w-4 h-4" %}
+        {% heroicon_micro attributes.icon|default:"chevron-down" aria_hidden="true" size="16" class="hidden w-4 h-4 md:inline-block ms-0.5" %}
     </button>
 
     <!-- Panel -->
@@ -51,8 +51,8 @@
          x-cloak
     >
         {% if attributes.heading %}
-            <header class="subheading border-b px-3 py-2 flex justify-between items-center gap-2">
-                <span class="SubMenuHeading font-medium text-inherit">{{ attributes.heading }}</span>
+            <header class="flex gap-2 justify-between items-center py-2 px-3 border-b subheading">
+                <span class="font-medium SubMenuHeading text-inherit">{{ attributes.heading }}</span>
                 <button type="button" @click='open = false' class="appearance-none">
                     {% heroicon_mini "x-mark" aria_hidden="true" width=16 height=16 class="stroke-1 hover:stroke-2" %}
                 </button>
@@ -60,14 +60,14 @@
         {% endif %}
 
         {% if attributes.enable_search %}
-            <filter-input aria-owns="dd-content-{{ id }}" class="py-3 px-3 border-b flex grow">
+            <filter-input aria-owns="dd-content-{{ id }}" class="flex py-3 px-3 border-b grow">
                 <label for="search-{{ id }}" class="sr-only">{% trans "Filter" %} {{ attributes.title }}</label>
                 <input type="text"
                        autofocus
                        id="search-{{ id }}"
                        @keydown.down="$focus.next()"
                        placeholder="Filter {{ attributes.title }}"
-                       class="grow p-2 md:py-1 text-inherit font-normal w-max text-gray-900 border border-gray-300 rounded focus:ring-blue-500 focus:border-blue-500">
+                       class="p-2 w-max font-normal text-gray-900 rounded border border-gray-300 md:py-1 focus:border-blue-500 focus:ring-blue-500 grow text-inherit">
             </filter-input>
         {% endif %}
 
@@ -78,7 +78,7 @@
             {% render_slot slots.inner_block %}
             {% if slots.url %}
                 <div role="status" class="flex justify-center items-center py-4">
-                    <svg aria-hidden="true" width="8" height="8" class="w-8 h-8 me-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+                    <svg aria-hidden="true" width="8" height="8" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 me-2 fill-blue-600"
                          viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
                         <path
                             d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
diff --git a/hypha/core/templates/components/modal-title.html b/hypha/core/templates/components/modal-title.html
index 6fd48d8bea..9ae354ad39 100644
--- a/hypha/core/templates/components/modal-title.html
+++ b/hypha/core/templates/components/modal-title.html
@@ -1,13 +1,13 @@
 {% load components heroicons %}
 
-<header class="flex items-center justify-between gap-4 p-2 border-b">
+<header class="flex gap-4 justify-between items-center p-2 border-b">
     <h1 id="model-title" class="py-2 pl-2 m-0 text-base font-semibold">
         {% render_slot slots.inner_block %}
     </h1>
 
     <div>
         <button
-            class="p-1.5 opacity-70 rounded hover:bg-gray-100 hover:opacity-100"
+            class="p-1.5 rounded opacity-70 hover:bg-gray-100 hover:opacity-100"
             aria-label="Close Modal"
             @click="show = false"
             type="button"
diff --git a/hypha/core/templates/components/scroll-to-top.html b/hypha/core/templates/components/scroll-to-top.html
index a98216ddb6..606e1e44b4 100644
--- a/hypha/core/templates/components/scroll-to-top.html
+++ b/hypha/core/templates/components/scroll-to-top.html
@@ -8,7 +8,7 @@
         x-on:scroll.window.throttle.50ms="scrollBackTop = (window.pageYOffset < lastScrollTop && window.pageYOffset > window.outerHeight * 0.4) ? true : false; lastScrollTop = window.pageYOffset;"
         @click="window.scrollTo({top: 0, behavior: 'smooth'})"
         aria-label="Back to top"
-        class="fixed top-0 end-1/2 px-3 py-2 mt-10 -me-[64px] text-white bg-light-blue/80 z-30 hover:bg-light-blue hover:text-white hover:shadow-lg transition-all focus:outline-none cursor-pointer shadow-lg rounded-2xl">
+        class="fixed top-0 z-30 py-2 px-3 mt-10 text-white rounded-2xl shadow-lg transition-all cursor-pointer hover:text-white hover:shadow-lg focus:outline-none end-1/2 -me-[64px] bg-light-blue/80 hover:bg-light-blue">
         {% heroicon_mini "arrow-long-up" class="inline align-text-bottom" size=18 aria_hidden=true %} Back to top
     </button>
 </template>
diff --git a/hypha/core/templates/core/navigation/primarynav-apply.html b/hypha/core/templates/core/navigation/primarynav-apply.html
index a7253d2271..e82d060da2 100644
--- a/hypha/core/templates/core/navigation/primarynav-apply.html
+++ b/hypha/core/templates/core/navigation/primarynav-apply.html
@@ -9,11 +9,11 @@
     x-transition:leave="transition ease-in duration-150"
     x-transition:leave-start="transform opacity-100 translate-x-0"
     x-transition:leave-end="transform opacity-0 translate-x-full"
-    class="fixed top-0 bottom-0 z-20 pt-10 overflow-y-auto bg-white shadow-xl md:static md:bg-transparent md:pt-0 md:top-auto end-0 md:z-auto md:shadow-none md:overflow-clip"
+    class="overflow-y-auto fixed top-0 bottom-0 z-20 pt-10 bg-white shadow-xl md:static md:top-auto md:z-auto md:pt-0 md:bg-transparent md:shadow-none end-0 md:overflow-clip"
 >
     <!-- Mobile Menu Opener -->
     <button
-        class="absolute top-6 end-4 md:hidden border rounded p-1.5 z-30 hover:bg-slate-100 transition-colors"
+        class="absolute top-6 z-30 p-1.5 rounded border transition-colors md:hidden end-4 hover:bg-slate-100"
         @click="showDesktopMenu = false"
     >
         {% heroicon_outline "x-mark" aria_hidden="true" size=24 stroke_width=3 class="inline" %}
@@ -21,7 +21,7 @@
 
     <!-- Menu -->
     {% primary_navigation_items request.user as nav_items %}
-    <ul class="flex flex-col p-4 md:gap-8 md:p-0 md:flex-row" role="menubar">
+    <ul class="flex flex-col p-4 md:flex-row md:gap-8 md:p-0" role="menubar">
         {% for item in nav_items %}
             <li
                 role="presentation"
@@ -60,7 +60,7 @@
                         x-transition:leave-start="transform opacity-100 scale-100 translate-y-0"
                         x-transition:leave-end="transform opacity-0 scale-95 -translate-y-3"
                         @click.outside="open = false"
-                        class="relative z-20 block bg-white rounded-sm min-w-48 md:absolute md:shadow-xl md:border-y"
+                        class="block relative z-20 bg-white rounded-sm md:absolute md:shadow-xl min-w-48 md:border-y"
                     >
                         {% for sub_item in item.sub_items %}
                             <a
diff --git a/hypha/home/templates/home/home.html b/hypha/home/templates/home/home.html
index 1a5ef48fb8..e220f3e3d6 100644
--- a/hypha/home/templates/home/home.html
+++ b/hypha/home/templates/home/home.html
@@ -6,9 +6,9 @@
 {% block meta_description %}{{ settings.core.SystemSettings.home_strapline|striptags|truncatechars:200 }}{% endblock %}
 
 {% block content %}
-    <div class="py-8 lg:py-16  max-w-3xl mx-auto">
+    <div class="py-8 mx-auto max-w-3xl lg:py-16">
 
-        <h1 class="font-bold text-5xl text-balance">
+        <h1 class="text-5xl font-bold text-balance">
             {{ settings.core.SystemSettings.home_title}}
         </h1>
 
diff --git a/hypha/home/templates/home/includes/fund-list-item.html b/hypha/home/templates/home/includes/fund-list-item.html
index fc0de6210f..8a7f6564ee 100644
--- a/hypha/home/templates/home/includes/fund-list-item.html
+++ b/hypha/home/templates/home/includes/fund-list-item.html
@@ -1,14 +1,14 @@
 {% load i18n nh3_tags wagtailcore_tags markdown_tags heroicons %}
 
 {% if page.open_round and page.list_on_front_page %}
-  <article class="flex justify-between items-center px-4 py-8 gap-4 hover:bg-slate-50 transition-colors">
+  <article class="flex gap-4 justify-between items-center py-8 px-4 transition-colors hover:bg-slate-50">
 
     <div>
       <h2>{{ page.title }}</h2>
 
       {% if page.next_deadline and page.show_deadline %}
         <p class="mb-4">
-          <span class="bg-orange-100 px-3 py-2 text-sm rounded">
+          <span class="py-2 px-3 text-sm bg-orange-100 rounded">
             {% heroicon_micro 'calendar-days' class='inline align-text-bottom' aria_hidden=true %}
             <span class="font-medium">{% trans 'Next deadline' %}: {{ page.next_deadline|date:'M j, Y' }}</span>
           </span>
diff --git a/hypha/templates/base-apply.html b/hypha/templates/base-apply.html
index b21b013a3c..ff1ae7202d 100644
--- a/hypha/templates/base-apply.html
+++ b/hypha/templates/base-apply.html
@@ -3,7 +3,7 @@
 
 {% block header %}
     <header
-        class="header max-w-[1280px] py-2 flex gap-4 items-center justify-between mx-auto w-full"
+        class="flex gap-4 justify-between items-center py-2 mx-auto w-full header max-w-[1280px]"
         x-data="{'showDesktopMenu': false, isDesktop: false, mm: null}"
         x-init="mm = window.matchMedia(`(min-width: 768px)`); isDesktop = mm.matches; mm.addListener((e) => { isDesktop = e.matches }); "
     >
@@ -30,7 +30,7 @@
             {% endif %}
 
             <button
-                class="text-center p-1.5 border rounded md:hidden hover:bg-slate-100 transition-colors"
+                class="p-1.5 text-center rounded border transition-colors md:hidden hover:bg-slate-100"
                 @click="showDesktopMenu = true"
             >
                 <span class="sr-only">{% trans "Menu" %}</span>
@@ -42,8 +42,8 @@
 
 {% block footer %}
     {% if settings.core.SystemSettings.footer_content %}
-        <footer class="footer px-4 py-10 shrink-0  bg-dark-blue">
-            <div class="wrapper wrapper--large prose prose-invert max-w-none text-white">
+        <footer class="py-10 px-4 footer shrink-0 bg-dark-blue">
+            <div class="max-w-none text-white wrapper wrapper--large prose prose-invert">
                 {{ settings.core.SystemSettings.footer_content|safe }}
             </div>
         </footer>
diff --git a/hypha/templates/includes/_modal-placeholder.html b/hypha/templates/includes/_modal-placeholder.html
index 62e89c06a4..a1b35500c1 100644
--- a/hypha/templates/includes/_modal-placeholder.html
+++ b/hypha/templates/includes/_modal-placeholder.html
@@ -26,13 +26,13 @@
         x-transition:leave-start="opacity-100"
         x-transition:leave-end="opacity-0"
         x-description="Background backdrop, show/hide based on modal state."
-        class="fixed inset-0 transition-opacity bg-gray-500 bg-opacity-75"
+        class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"
         aria-hidden="true"
     ></div>
 
     <!-- Modal panel, show/hide based on modal state. -->
-    <div class="fixed inset-0 z-10 w-screen overflow-y-auto">
-        <div class="flex items-end justify-center min-h-full p-4 text-center sm:items-center sm:p-0">
+    <div class="overflow-y-auto fixed inset-0 z-10 w-screen">
+        <div class="flex justify-center items-end p-4 min-h-full text-center sm:items-center sm:p-0">
             <div
                 x-show="show"
                 x-trap="show"
@@ -43,7 +43,7 @@
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
                 x-description="Modal panel, show/hide based on modal state."
-                class="relative w-full text-left transition-all transform bg-white border rounded-lg shadow-xl sm:my-8 sm:max-w-lg"
+                class="relative w-full text-left bg-white rounded-lg border shadow-xl transition-all transform sm:my-8 sm:max-w-lg"
                 id="htmx-modal"
                 hx-target="this"
                 @htmx:after-swap="show = true"
diff --git a/hypha/templates/includes/_toast-placeholder.html b/hypha/templates/includes/_toast-placeholder.html
index 8ebc4c7a87..253db04b68 100644
--- a/hypha/templates/includes/_toast-placeholder.html
+++ b/hypha/templates/includes/_toast-placeholder.html
@@ -85,7 +85,7 @@
 
 <div
     x-data="toastHandler()"
-    class="fixed inset-0 flex flex-col items-end justify-start w-screen h-screen px-4 pointer-events-none"
+    class="flex fixed inset-0 flex-col justify-start items-end px-4 w-screen h-screen pointer-events-none"
     @notice.window="add($event.detail)"
 >
     <template x-for="toast of toasts" :key="toast.id">
@@ -103,7 +103,7 @@
             @click="remove(toast.id)"
             @mouseenter="pause(toast.id)"
             @mouseleave="resume(toast.id)"
-            class="relative w-full max-w-full px-4 py-3 mt-4 text-sm font-bold text-white rounded-md shadow-xl cursor-pointer sm:max-w-sm sm:w-auto group"
+            class="relative py-3 px-4 mt-4 w-full max-w-full text-sm font-bold text-white rounded-md shadow-xl cursor-pointer sm:w-auto sm:max-w-sm group"
             :class="{
                     'bg-gray-500': toast.type === 'debug',
                     'bg-green-500': toast.type === 'success',
@@ -113,7 +113,7 @@
                     }"
             style="pointer-events:all"
         >
-            <div class="flex items-center gap-2">
+            <div class="flex gap-2 items-center">
                 <span x-show="toast.type == 'info'" aria-hidden="true">
                     {% heroicon_solid "information-circle" size=24 class="inline-block rounded-full" %}
                 </span>
@@ -122,7 +122,7 @@
                 </span>
                 <span x-text="toast.text"></span>
             </div>
-            <button class="absolute invisible p-1 transition-all -top-3 -left-3 group-hover:visible">
+            <button class="absolute -top-3 -left-3 invisible p-1 transition-all group-hover:visible">
                 <span class="inline-block p-1 text-white rounded-full shadow-md bg-dark-blue" aria-label="Close">
                     {% heroicon_mini "x-mark" size=18 class="" %}
                 </span>
diff --git a/hypha/templates/includes/hijack-bar.html b/hypha/templates/includes/hijack-bar.html
index 0ef64a7e3c..3ada581b71 100644
--- a/hypha/templates/includes/hijack-bar.html
+++ b/hypha/templates/includes/hijack-bar.html
@@ -2,7 +2,7 @@
 
 <form action="{% url 'hijack:release' %}"
       method="POST"
-      class="bg-yellow-500 text-black px-4 py-2 border-t-4 border-warning border-stripe text-center"
+      class="py-2 px-4 text-center text-black bg-yellow-500 border-t-4 border-warning border-stripe"
 >
     {% csrf_token %}
     <input type="hidden" name="next" value="{{ request.path }}">
@@ -15,7 +15,7 @@
         {% endblocktrans %}
         &LT;{{ request.user.email }}&GT;
         {% for role in request.user.get_role_names %}
-            <span class="inline-block bg-gray-200 text-gray-800 text-xs font-semibold px-2 rounded-full uppercase">
+            <span class="inline-block px-2 text-xs font-semibold text-gray-800 uppercase bg-gray-200 rounded-full">
                 {{ role }}
             </span>
         {% endfor %}
@@ -23,7 +23,7 @@
 
     </span>
 
-    <button class="button button--link underline ms-2 font-semibold uppercase" type="submit">
+    <button class="font-semibold underline uppercase button button--link ms-2" type="submit">
         {% translate 'Release' %}
     </button>
 </form>
diff --git a/hypha/templates/includes/menu-notifications.html b/hypha/templates/includes/menu-notifications.html
index f1db5e7812..211ae04b53 100644
--- a/hypha/templates/includes/menu-notifications.html
+++ b/hypha/templates/includes/menu-notifications.html
@@ -1,13 +1,13 @@
 {% load i18n heroicons %}
 <!-- Notification Bell -->
 <div
-    class="relative inline-block"
+    class="inline-block relative"
     x-data="{open: false}"
     x-on:keydown.escape="open = false"
     x-init="$watch('open', value => { if (value) { document.getElementById('id-task-list').dispatchEvent(new Event('htmx:fetch')); } })"
 >
     <a href="{% url "todo:list" %}"
-       class="flex p-2 rounded-full transition-all group text-gray-900"
+       class="flex p-2 text-gray-900 rounded-full transition-all group"
        aria-label="{% trans "Task List" %}"
        aria-haspopup="task_list"
        aria-expanded="false"
@@ -16,26 +16,26 @@
        @click.prevent="open = ! open"
        :class="open ? 'bg-gray-900 text-white' : 'hover:bg-slate-200'"
     >
-        {% heroicon_outline "bell-alert" class="inline group-hover:scale-110 transition-transform" aria_hidden="true" %}
+        {% heroicon_outline "bell-alert" class="inline transition-transform group-hover:scale-110" aria_hidden="true" %}
     </a>
 
     <!-- panel -->
     <div
-        class="z-30 shadow-md bg-white border overflow-y-scroll rounded fixed top-0 start-0 end-0 md:absolute md:start-auto md:top-auto md:min-w-[400px] md:max-h-[500px]"
+        class="overflow-y-scroll fixed top-0 z-30 bg-white rounded border shadow-md md:absolute md:top-auto start-0 end-0 md:start-auto md:min-w-[400px] md:max-h-[500px]"
         x-cloak
         x-show="open"
         x-trap="open"
         x-transition
         x-transition.origin.top
         @click.outside="open = false"
-        class="relative "
+        class="relative"
         role="task_list"
     >
-        <header class="subheading border-b px-3 py-2 flex justify-between items-center gap-2 bg-gray-100">
-            <span class="SubMenuHeading font-medium text-inherit">
+        <header class="flex gap-2 justify-between items-center py-2 px-3 bg-gray-100 border-b subheading">
+            <span class="font-medium SubMenuHeading text-inherit">
                 {% trans "Your Tasks" %}
             </span>
-            <button type="button" @click='open = false' class="appearance-none opacity-70 hover:opacity-100">
+            <button type="button" @click='open = false' class="opacity-70 appearance-none hover:opacity-100">
                 {% heroicon_solid "x-mark" aria_hidden="true" class="" %}
             </button>
         </header>
@@ -46,14 +46,14 @@
             hx-swap="innerHTML"
             hx-trigger="htmx:fetch, taskListUpdated from:body"
         >
-            <div class="min-h-4 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
-            <div class="min-h-4 w-2/3 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
+            <div class="my-3 mx-4 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
+            <div class="my-3 mx-4 w-2/3 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
             <hr>
-            <div class="min-h-4 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
-            <div class="min-h-4 w-2/3 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
+            <div class="my-3 mx-4 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
+            <div class="my-3 mx-4 w-2/3 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
             <hr>
-            <div class="min-h-4 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
-            <div class="min-h-4 w-2/3 mx-4 my-3 rounded-lg bg-gray-200 animate-pulse"></div>
+            <div class="my-3 mx-4 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
+            <div class="my-3 mx-4 w-2/3 bg-gray-200 rounded-lg animate-pulse min-h-4"></div>
         </div>
     </div>
 </div>
diff --git a/hypha/templates/includes/message_item.html b/hypha/templates/includes/message_item.html
index 7082480492..05ff2a1564 100644
--- a/hypha/templates/includes/message_item.html
+++ b/hypha/templates/includes/message_item.html
@@ -11,7 +11,7 @@
         {% if close %}
             <button
                 type="button"
-                class="messages__button hover:opacity-70 transition-opacity"
+                class="transition-opacity hover:opacity-70 messages__button"
                 @click="show = false"
             >
                 {% trans "Ok" %}
diff --git a/hypha/templates/includes/messages.html b/hypha/templates/includes/messages.html
index 3efbe4b3c0..a627bfc61b 100644
--- a/hypha/templates/includes/messages.html
+++ b/hypha/templates/includes/messages.html
@@ -2,12 +2,12 @@
 <ul class="messages">
     {% for message in messages %}
         {% if 'project_action_message' in message.tags %}
-            <li class="messages__actions border px-3 py-2 shadow-md rounded"
+            <li class="py-2 px-3 rounded border shadow-md messages__actions"
                 x-data="{ show: true }"
                 x-show="show"
                 x-transition
             >
-                {% heroicon_outline "check" stroke_width=2 class="inline-block me-1 w-4 h-4" aria_hidden=true %}
+                {% heroicon_outline "check" stroke_width=2 class="inline-block w-4 h-4 me-1" aria_hidden=true %}
                 <p class="messages__copy">{{ message }}</p>
                 <button type="button" class="p-2 hover:opacity-70" x-on:click="show = ! show">
                     <span class="sr-only">{% trans "Close" %}</span>
diff --git a/hypha/templates/includes/org_login_button.html b/hypha/templates/includes/org_login_button.html
index bf201e961b..ba2afddc12 100644
--- a/hypha/templates/includes/org_login_button.html
+++ b/hypha/templates/includes/org_login_button.html
@@ -1,6 +1,6 @@
 {% load i18n heroicons %}
 <a
-    class="button button--secondary button--login mb-4"
+    class="mb-4 button button--secondary button--login"
     href="{% url "social:begin" "google-oauth2" %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}"
 >
     {% heroicon_mini "building-office" size=18 class="inline align-text-bottom me-1" aria_hidden=true %}
diff --git a/hypha/templates/includes/user_menu.html b/hypha/templates/includes/user_menu.html
index 571646a7c3..62a821c0ad 100644
--- a/hypha/templates/includes/user_menu.html
+++ b/hypha/templates/includes/user_menu.html
@@ -1,14 +1,14 @@
 {% load i18n heroicons %}
 
 {% if request.user.is_authenticated %}
-    <div x-data="{ show: false }" x-on:keydown.escape="show = false" class="relative flex">
+    <div x-data="{ show: false }" x-on:keydown.escape="show = false" class="flex relative">
         <button
             x-on:click="show = ! show"
-            class="font-bold flex items-center transition-all rounded-sm px-1.5 group"
+            class="flex items-center px-1.5 font-bold rounded-sm transition-all group"
             type="button"
             :class="show ? 'bg-gray-900 text-white' : 'hover:bg-slate-200'"
         >
-            {% heroicon_micro "user-circle" class="inline group-hover:scale-110 transition-transform align-text-bottom w-8 h-8 md:me-1" aria_hidden=true %}
+            {% heroicon_micro "user-circle" class="inline w-8 h-8 align-text-bottom transition-transform group-hover:scale-110 md:me-1" aria_hidden=true %}
             <span class="hidden md:inline-block truncate max-w-36">{{ request.user }}</span>
         </button>
 
@@ -20,62 +20,52 @@
             x-transition
             x-transition.origin.top
             @click.outside="show = false"
-            class="min-w-48 absolute block bg-white shadow-xl z-[100000] border-y rounded-sm end-0 top-10"
+            class="block absolute top-10 bg-white rounded-sm shadow-xl min-w-48 z-[100000] border-y end-0"
         >
             <a
                 href="{% url 'users:account' %}"
                 title="Goto your account"
-                class="px-3 py-2 text-black flex items-center gap-2
-                       focus-visible:outline-dashed outline-1 transition-colors border-x
-                       hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                class="flex gap-2 items-center py-2 px-3 text-black transition-colors hover:font-semibold outline-1 border-x group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
             >
-                {% heroicon_outline "user" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                {% heroicon_outline "user" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                 {% trans 'My account' %}
             </a>
             {% if request.user.is_apply_staff %}
                 <a
                     href="{% url 'activity:notifications' %}"
                     title="Check latest notifications"
-                    class="px-3 py-2 text-black flex items-center gap-2
-                           focus-visible:outline-dashed outline-1 transition-colors border-x
-                           hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                    class="flex gap-2 items-center py-2 px-3 text-black transition-colors hover:font-semibold outline-1 border-x group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
                 >
-                    {% heroicon_outline "bolt" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                    {% heroicon_outline "bolt" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                     {% trans "Activity feed" %}
                 </a>
                 <a
                     href="{% url "apply:submissions:list" %}?query=flagged:@me"
                     title="Goto your flagged submissions"
-                    class="px-3 py-2 text-black flex items-center gap-2
-                           focus-visible:outline-dashed outline-1 transition-colors border-r
-                           hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                    class="flex gap-2 items-center py-2 px-3 text-black border-r transition-colors hover:font-semibold outline-1 group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
                 >
-                    {% heroicon_outline "flag" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                    {% heroicon_outline "flag" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                     {% trans "My flagged" %}
                 </a>
                 {% if perms.wagtailadmin.access_admin %}
                     <a
                         href="{% url 'wagtailadmin_home' %}"
                         title="Goto wagtail admin"
-                        class="px-3 py-2 text-black flex items-center gap-2
-                               focus-visible:outline-dashed outline-1 transition-colors border-x
-                               hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                        class="flex gap-2 items-center py-2 px-3 text-black transition-colors hover:font-semibold outline-1 border-x group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
                     >
-                        {% heroicon_outline "cog-6-tooth" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                        {% heroicon_outline "cog-6-tooth" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                         {% trans "Administration" %}
                     </a>
                 {% endif %}
             {% endif %}
             {% if HIJACK_ENABLE and not user.is_hijacked and user.is_superuser %}
                 <a
-                    class="px-3 py-2 text-black flex items-center gap-2
-                           focus-visible:outline-dashed outline-1 transition-colors border-x
-                           hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                    class="flex gap-2 items-center py-2 px-3 text-black transition-colors hover:font-semibold outline-1 border-x group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
                     hx-get="{% url 'users:hijack' %}?next={{ request.path }}"
                     hx-target="#htmx-modal"
                     x-on:click="show = false"
                 >
-                    {% heroicon_outline "arrows-right-left" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                    {% heroicon_outline "arrows-right-left" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                     {% trans "Switch User" %}
                 </a>
             {% endif %}
@@ -87,11 +77,9 @@
                     <input type="hidden" name="next" value="{{ request.path }}">
 
                     <button type="submit"
-                            class="px-3 py-2 text-black flex items-center gap-2 w-full
-                                   focus-visible:outline-dashed outline-1 transition-colors border-x
-                                   hover:bg-slate-100 hover:text-dark-blue hover:font-semibold group"
+                            class="flex gap-2 items-center py-2 px-3 w-full text-black transition-colors hover:font-semibold outline-1 border-x group hover:bg-slate-100 hover:text-dark-blue focus-visible:outline-dashed"
                     >
-                        {% heroicon_outline "user-minus" size=18 class="stroke-gray-500 inline group-hover:scale-110 group-hover:stroke-2 group-hover:stroke-dark-blue transition-transform" aria_hidden=true %}
+                        {% heroicon_outline "user-minus" size=18 class="inline transition-transform group-hover:scale-110 group-hover:stroke-2 stroke-gray-500 group-hover:stroke-dark-blue" aria_hidden=true %}
                         {% translate 'Release User' %}
                     </button>
                 </form>
@@ -100,9 +88,7 @@
             <a
                 href="{% url 'users:logout' %}"
                 title="Log out"
-                class="px-3 py-2 block focus-visible:outline-dashed
-                       outline-1 transition-all border-x text-center font-semibold text-red-600
-                       hover:bg-red-100 hover:text-red-900 hover:font-semibold"
+                class="block py-2 px-3 font-semibold text-center text-red-600 transition-all hover:font-semibold hover:text-red-900 hover:bg-red-100 outline-1 border-x focus-visible:outline-dashed"
             >
                 {% trans "Log out" %}
             </a>
@@ -113,7 +99,7 @@
         class="button button--transparent button--narrow"
         href="{{ APPLY_SITE.root_url }}{% url 'users:passwordless_login_signup' %}{% if redirect_url %}?next={{ redirect_url }}{% endif %}"
     >
-        {% heroicon_micro "user" class="inline align-text-bottom w-4 h-4 me-1" aria_hidden=true %}
+        {% heroicon_micro "user" class="inline w-4 h-4 align-text-bottom me-1" aria_hidden=true %}
         {% trans "Log in" %} {% if ENABLE_PUBLIC_SIGNUP %} {% trans " or Sign up" %} {% endif %}
     </a>
 {% endif %}