diff --git a/src/Resources/views/crud/detail.html.twig b/src/Resources/views/crud/detail.html.twig
index abfe7d36e0..d8a0d7b069 100644
--- a/src/Resources/views/crud/detail.html.twig
+++ b/src/Resources/views/crud/detail.html.twig
@@ -37,8 +37,8 @@
     {%- apply spaceless -%}
         {% set custom_page_title = ea.crud.customPageTitle(pageName, entity ? entity.instance : null, ea.i18n.translationParameters) %}
         {{ custom_page_title is null
-        ? ea.crud.defaultPageTitle(null, null, ea.i18n.translationParameters)|trans|raw
-        : custom_page_title|trans|raw }}
+            ? ea.crud.defaultPageTitle(null, null, ea.i18n.translationParameters)|trans|raw
+            : custom_page_title|trans|raw }}
     {%- endapply -%}
 {% endblock %}
 
@@ -146,45 +146,45 @@
 {% endmacro %}
 
 {% macro render_tab_group_open(field) %}
-<div class="nav-tabs-custom form-tabs">
-    {% endmacro %}
+    <div class="nav-tabs-custom form-tabs">
+{% endmacro %}
 
-    {% macro render_tab_group_close(field) %}
-</div>
+{% macro render_tab_group_close(field) %}
+    </div>
 {% endmacro %}
 
 {% macro render_tab_open(field) %}
     {% set tab_id_option_name = constant('EasyCorp\\Bundle\\EasyAdminBundle\\Field\\FormField::OPTION_TAB_ID') %}
     {% set tab_is_active_option_name = constant('EasyCorp\\Bundle\\EasyAdminBundle\\Field\\FormField::OPTION_TAB_IS_ACTIVE') %}
 
-<div class="tab-content">
-    <div id="{{ field.getCustomOption(tab_id_option_name) }}" class="tab-pane {% if field.getCustomOption(tab_is_active_option_name) %}active{% endif %} {{ field.cssClass }}">
-        {% if field.help %}
-            <div class="content-header-help tab-help">
-                {{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}
-            </div>
-        {% endif %}
+    <div class="tab-content">
+        <div id="{{ field.getCustomOption(tab_id_option_name) }}" class="tab-pane {% if field.getCustomOption(tab_is_active_option_name) %}active{% endif %} {{ field.cssClass }}">
+            {% if field.help %}
+                <div class="content-header-help tab-help">
+                    {{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}
+                </div>
+            {% endif %}
 
-        <div class="row">
-            {% endmacro %}
+            <div class="row">
+{% endmacro %}
 
-            {% macro render_tab_close(field) %}
+{% macro render_tab_close(field) %}
+            </div>
         </div>
     </div>
-</div>
 {% endmacro %}
 
 {% macro render_column_group_open(field) %}
     {# if columns are inside tabs, don't add a '.row' element because the tab pane already opens it #}
     {% if not field.getFormTypeOption('ea_is_inside_tab')|default(false) %}
-<div class="row">
+        <div class="row">
     {% endif %}
-    {% endmacro %}
+{% endmacro %}
 
-    {% macro render_column_group_close(field) %}
+{% macro render_column_group_close(field) %}
     {# if columns are inside tabs, don't add a '.row' element because the tab pane already opens it #}
     {% if not field.getFormTypeOption('ea_is_inside_tab')|default(false) %}
-</div>
+        </div>
     {% endif %}
 {% endmacro %}
 
@@ -192,23 +192,23 @@
     {% set field_icon = field.getCustomOption('icon') %}
     {% set column_has_title = field_icon != null or field.label != false or field.label != null or field.label != '' or field.help != null %}
 
-<div class="form-column {{ not column_has_title ? 'form-column-no-header' }} {{ field.cssClass }}">
-    {% if column_has_title %}
-        <div class="form-column-title">
-            <div class="form-column-title-content">
-                {% if field_icon %}<i class="form-column-icon fa fa-fw fa-{{ field_icon }}"></i>{% endif %}
-                {% if field.label %}{{ field.label|trans(domain = ea.i18n.translationDomain)|raw }}{% endif %}
-            </div>
+    <div class="form-column {{ not column_has_title ? 'form-column-no-header' }} {{ field.cssClass }}">
+        {% if column_has_title %}
+            <div class="form-column-title">
+                <div class="form-column-title-content">
+                    {% if field_icon %}<i class="form-column-icon fa fa-fw fa-{{ field_icon }}"></i>{% endif %}
+                    {% if field.label %}{{ field.label|trans(domain = ea.i18n.translationDomain)|raw }}{% endif %}
+                </div>
 
-            {% if field.help %}
-                <div class="form-column-help">{{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}</div>
-            {% endif %}
-        </div>
-    {% endif %}
-    {% endmacro %}
+                {% if field.help %}
+                    <div class="form-column-help">{{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}</div>
+                {% endif %}
+            </div>
+        {% endif %}
+{% endmacro %}
 
-    {% macro render_column_close(field) %}
-</div>
+{% macro render_column_close(field) %}
+    </div>
 {% endmacro %}
 
 {% macro render_fieldset_open(field) %}
@@ -218,51 +218,51 @@
     {% set is_collapsible = field.getCustomOption(is_collapsible_option_name) %}
     {% set is_collapsed = field.getCustomOption(is_collapsed_option_name) %}
 
-<div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ field.cssClass }}">
-    <fieldset>
-        {% if fieldset_has_header %}
-            <div class="form-fieldset-header {{ is_collapsible ? 'collapsible' }} {{ field.help is not empty ? 'with-help' }}">
-                <div class="form-fieldset-title">
-                    {% set fieldset_title_contents %}
-                        {% if is_collapsible %}
-                            <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
-                        {% endif %}
+    <div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ field.cssClass }}">
+        <fieldset>
+            {% if fieldset_has_header %}
+                <div class="form-fieldset-header {{ is_collapsible ? 'collapsible' }} {{ field.help is not empty ? 'with-help' }}">
+                    <div class="form-fieldset-title">
+                        {% set fieldset_title_contents %}
+                            {% if is_collapsible %}
+                                <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
+                            {% endif %}
 
-                        {% if field.getCustomOption('icon') %}
-                            <i class="form-fieldset-icon {{ field.getCustomOption('icon') }}"></i>
-                        {% endif %}
+                            {% if field.getCustomOption('icon') %}
+                                <i class="form-fieldset-icon {{ field.getCustomOption('icon') }}"></i>
+                            {% endif %}
 
-                        {{ field.label|trans|raw }}
-                    {% endset %}
+                            {{ field.label|trans|raw }}
+                        {% endset %}
 
-                    {% if is_collapsible %}
-                        <a href="#content-{{ field.property }}" data-bs-toggle="collapse"
-                           class="form-fieldset-title-content form-fieldset-collapse {{ is_collapsed ? 'collapsed' }}"
-                           aria-expanded="{{ is_collapsed ? 'false' : 'true' }}" aria-controls="content-{{ field.property }}">
-                            {{ fieldset_title_contents|raw }}
-                        </a>
-                    {% else %}
-                        <span class="not-collapsible form-fieldset-title-content">
+                        {% if is_collapsible %}
+                            <a href="#content-{{ field.property }}" data-bs-toggle="collapse"
+                               class="form-fieldset-title-content form-fieldset-collapse {{ is_collapsed ? 'collapsed' }}"
+                               aria-expanded="{{ is_collapsed ? 'false' : 'true' }}" aria-controls="content-{{ field.property }}">
+                                {{ fieldset_title_contents|raw }}
+                            </a>
+                        {% else %}
+                            <span class="not-collapsible form-fieldset-title-content">
                                 {{ fieldset_title_contents|raw }}
                             </span>
-                    {% endif %}
+                        {% endif %}
 
-                    {% if field.help %}
-                        <div class="form-fieldset-help">{{ field.help|trans|raw }}</div>
-                    {% endif %}
+                        {% if field.help %}
+                            <div class="form-fieldset-help">{{ field.help|trans|raw }}</div>
+                        {% endif %}
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        <div id="content-{{ field.property }}" class="form-fieldset-body {{ not fieldset_has_header ? 'without-header' }} {{ is_collapsible ? 'collapse' }} {{ not is_collapsed ? 'show'}}">
-            <div class="row">
-                {% endmacro %}
+            <div id="content-{{ field.property }}" class="form-fieldset-body {{ not fieldset_has_header ? 'without-header' }} {{ is_collapsible ? 'collapse' }} {{ not is_collapsed ? 'show'}}">
+                <div class="row">
+{% endmacro %}
 
-                {% macro render_fieldset_close(field) %}
+{% macro render_fieldset_close(field) %}
+                </div>
             </div>
-        </div>
-    </fieldset>
-</div>
+        </fieldset>
+    </div>
 {% endmacro %}
 
 
@@ -342,42 +342,42 @@
     {% set fieldset_help = field is null ? null : field.help|default(false)%}
     {% set fieldset_has_header = collapsible or fieldset_icon or fieldset_label or fieldset_help %}
 
-<div class="{{ field.cssClass ?? '' }}">
-    <div class="form-fieldset">
-        {% if fieldset_has_header %}
-            <div class="form-fieldset-header {{ collapsible ? 'collapsible' }} {{ fieldset_help is not empty ? 'with-help' }}">
-                <div class="form-fieldset-title">
-                    <a {% if not collapsible %}
-                        href="#" class="not-collapsible"
-                    {% else %}
-                        href="#{{ fieldset_name }}" data-bs-toggle="collapse"
-                        class="form-fieldset-collapse {{ collapsed ? 'collapsed' }}"
-                        aria-expanded="{{ collapsed ? 'false' : 'true' }}" aria-controls="{{ fieldset_name }}"
-                    {% endif %}
-                    >
-                        {% if collapsible %}
-                            <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
+    <div class="{{ field.cssClass ?? '' }}">
+        <div class="form-fieldset">
+            {% if fieldset_has_header %}
+                <div class="form-fieldset-header {{ collapsible ? 'collapsible' }} {{ fieldset_help is not empty ? 'with-help' }}">
+                    <div class="form-fieldset-title">
+                        <a {% if not collapsible %}
+                            href="#" class="not-collapsible"
+                        {% else %}
+                            href="#{{ fieldset_name }}" data-bs-toggle="collapse"
+                            class="form-fieldset-collapse {{ collapsed ? 'collapsed' }}"
+                            aria-expanded="{{ collapsed ? 'false' : 'true' }}" aria-controls="{{ fieldset_name }}"
                         {% endif %}
+                        >
+                            {% if collapsible %}
+                                <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
+                            {% endif %}
+
+                            {% if fieldset_icon %}
+                                <i class="form-fieldset-icon {{ fieldset_icon }}"></i>
+                            {% endif %}
+                            {{ fieldset_label|trans|raw }}
+                        </a>
 
-                        {% if fieldset_icon %}
-                            <i class="form-fieldset-icon {{ fieldset_icon }}"></i>
+                        {% if fieldset_help %}
+                            <div class="form-fieldset-help">{{ fieldset_help|trans|raw }}</div>
                         {% endif %}
-                        {{ fieldset_label|trans|raw }}
-                    </a>
-
-                    {% if fieldset_help %}
-                        <div class="form-fieldset-help">{{ fieldset_help|trans|raw }}</div>
-                    {% endif %}
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        <div {% if fieldset_name %}id="{{ fieldset_name }}"{% endif %} class="form-fieldset-body {{ collapsible ? 'collapse' }} {{ not collapsed ? 'show'}}">
-            <dl class="datalist">
-                {% endmacro %}
+            <div {% if fieldset_name %}id="{{ fieldset_name }}"{% endif %} class="form-fieldset-body {{ collapsible ? 'collapse' }} {{ not collapsed ? 'show'}}">
+                <dl class="datalist">
+{% endmacro %}
 
-                {% macro close_form_fieldset() %}
-                {% deprecated 'The "close_form_fieldset" macro is deprecated because the layout building logic has been revamped for the "detail" page. Check EasyAdmin\'s `detail.html.page` for more details.' %}
+{% macro close_form_fieldset() %}
+    {% deprecated 'The "close_form_fieldset" macro is deprecated because the layout building logic has been revamped for the "detail" page. Check EasyAdmin\'s `detail.html.page` for more details.' %}
 
             </dl>
         </div>
diff --git a/src/Resources/views/crud/form_theme.html.twig b/src/Resources/views/crud/form_theme.html.twig
index fa072db4dd..cd3bc58e1c 100644
--- a/src/Resources/views/crud/form_theme.html.twig
+++ b/src/Resources/views/crud/form_theme.html.twig
@@ -12,9 +12,9 @@
 {% endblock form_start %}
 
 {% block form_end %}
-    {% if not render_rest is defined or render_rest %}
-        {{ form_rest(form) }}
-    {% endif %}
+        {% if not render_rest is defined or render_rest %}
+            {{ form_rest(form) }}
+        {% endif %}
     </form>
 {% endblock %}
 
@@ -95,7 +95,7 @@
                     {% if has_append_html %}
                         <span class="input-group-text">{{ field.append_html|raw }}</span>
                     {% endif %}
-                    {% if has_input_groups %}</div>{% endif %}
+                {% if has_input_groups %}</div>{% endif %}
 
                 {% if field.help ?? false %}
                     <small class="form-help">{{ field.help|trans(label_translation_parameters, translation_domain)|raw }}</small>
@@ -530,15 +530,15 @@
 {% block ea_form_column_group_open_row %}
     {# if columns are inside tabs, don't add a '.row' element because the tab pane already opens it #}
     {% if not form.vars.ea_is_inside_tab|default(false) %}
-<div class="row">
+        <div class="row">
     {% endif %}
-    {% endblock ea_form_column_group_open_row %}
+{% endblock ea_form_column_group_open_row %}
 
-    {% block ea_form_column_group_close_row %}
+{% block ea_form_column_group_close_row %}
     {# if columns are inside tabs, we don't add a '.row' element because
        the tab pane already opens it; so, don't close it here #}
     {% if not form.vars.ea_is_inside_tab|default(false) %}
-</div>
+        </div>
     {% endif %}
 {% endblock ea_form_column_group_close_row %}
 
@@ -547,73 +547,73 @@
     {% set field_icon = field.getCustomOption('icon') %}
     {% set column_has_title = field_icon != null or field.label != false or field.label != null or field.label != '' or field.help != null %}
 
-<div class="form-column {{ not column_has_title ? 'form-column-no-header' }} {{ field.cssClass }}">
-    {% if column_has_title %}
-        <div class="form-column-title">
-            <div class="form-column-title-content">
-                {% if field_icon %}<i class="form-column-icon fa fa-fw fa-{{ field_icon }}"></i>{% endif %}
-                {% if field.label %}{{ field.label|default('')|trans(domain = ea.i18n.translationDomain)|raw }}{% endif %}
-            </div>
+    <div class="form-column {{ not column_has_title ? 'form-column-no-header' }} {{ field.cssClass }}">
+        {% if column_has_title %}
+            <div class="form-column-title">
+                <div class="form-column-title-content">
+                    {% if field_icon %}<i class="form-column-icon fa fa-fw fa-{{ field_icon }}"></i>{% endif %}
+                    {% if field.label %}{{ field.label|default('')|trans(domain = ea.i18n.translationDomain)|raw }}{% endif %}
+                </div>
 
-            {% if field.help %}
-                <div class="form-column-help">{{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}</div>
-            {% endif %}
-        </div>
-    {% endif %}
-    {% endblock ea_form_column_open_row %}
+                {% if field.help %}
+                    <div class="form-column-help">{{ field.help|trans(domain = ea.i18n.translationDomain)|raw }}</div>
+                {% endif %}
+            </div>
+        {% endif %}
+{% endblock ea_form_column_open_row %}
 
-    {% block ea_form_column_close_row %}
-</div>
+{% block ea_form_column_close_row %}
+    </div>
 {% endblock ea_form_column_close_row %}
 
 {% block ea_form_fieldset_open_row %}
     {% set fieldset_has_header = form.vars.label or ea_icon or ea_help %}
 
-<div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ ea_css_class }}">
-    <fieldset>
-        {% if fieldset_has_header %}
-            <div class="form-fieldset-header {{ ea_is_collapsible ? 'collapsible' }} {{ ea_help is not empty ? 'with-help' }}">
-                <div class="form-fieldset-title">
-                    {% set fieldset_title_contents %}
-                        {% if ea_is_collapsible %}
-                            <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
-                        {% endif %}
+    <div class="form-fieldset {{ not fieldset_has_header ? 'form-fieldset-no-header' }} {{ ea_css_class }}">
+        <fieldset>
+            {% if fieldset_has_header %}
+                <div class="form-fieldset-header {{ ea_is_collapsible ? 'collapsible' }} {{ ea_help is not empty ? 'with-help' }}">
+                    <div class="form-fieldset-title">
+                        {% set fieldset_title_contents %}
+                            {% if ea_is_collapsible %}
+                                <i class="fas fw fa-chevron-right form-fieldset-collapse-marker"></i>
+                            {% endif %}
 
-                        {% if ea_icon %}
-                            <i class="form-fieldset-icon {{ ea_icon }}"></i>
-                        {% endif %}
+                            {% if ea_icon %}
+                                <i class="form-fieldset-icon {{ ea_icon }}"></i>
+                            {% endif %}
 
-                        {{ form.vars.label|trans|raw }}
-                    {% endset %}
+                            {{ form.vars.label|trans|raw }}
+                        {% endset %}
 
-                    {% if ea_is_collapsible %}
-                        <a href="#content-{{ form.vars.name }}" data-bs-toggle="collapse"
-                           class="form-fieldset-title-content form-fieldset-collapse {{ ea_is_collapsed ? 'collapsed' }}"
-                           aria-expanded="{{ ea_is_collapsed ? 'false' : 'true' }}" aria-controls="content-{{ form.vars.name }}">
-                            {{ fieldset_title_contents|raw }}
-                        </a>
-                    {% else %}
-                        <span class="not-collapsible form-fieldset-title-content">
+                        {% if ea_is_collapsible %}
+                            <a href="#content-{{ form.vars.name }}" data-bs-toggle="collapse"
+                               class="form-fieldset-title-content form-fieldset-collapse {{ ea_is_collapsed ? 'collapsed' }}"
+                               aria-expanded="{{ ea_is_collapsed ? 'false' : 'true' }}" aria-controls="content-{{ form.vars.name }}">
+                                {{ fieldset_title_contents|raw }}
+                            </a>
+                        {% else %}
+                            <span class="not-collapsible form-fieldset-title-content">
                                 {{ fieldset_title_contents|raw }}
                             </span>
-                    {% endif %}
+                        {% endif %}
 
-                    {% if ea_help %}
-                        <div class="form-fieldset-help">{{ ea_help|trans|raw }}</div>
-                    {% endif %}
+                        {% if ea_help %}
+                            <div class="form-fieldset-help">{{ ea_help|trans|raw }}</div>
+                        {% endif %}
+                    </div>
                 </div>
-            </div>
-        {% endif %}
+            {% endif %}
 
-        <div id="content-{{ form.vars.name }}" class="form-fieldset-body {{ not fieldset_has_header ? 'without-header' }} {{ ea_is_collapsible ? 'collapse' }} {{ not ea_is_collapsed ? 'show'}}">
-            <div class="row">
-                {% endblock ea_form_fieldset_open_row %}
+            <div id="content-{{ form.vars.name }}" class="form-fieldset-body {{ not fieldset_has_header ? 'without-header' }} {{ ea_is_collapsible ? 'collapse' }} {{ not ea_is_collapsed ? 'show'}}">
+                <div class="row">
+{% endblock ea_form_fieldset_open_row %}
 
-                {% block ea_form_fieldset_close_row %}
+{% block ea_form_fieldset_close_row %}
+                </div>
             </div>
-        </div>
-    </fieldset>
-</div>
+        </fieldset>
+    </div>
 {% endblock ea_form_fieldset_close_row %}
 
 {% block ea_form_tablist_row %}
@@ -646,31 +646,31 @@
 {% endblock ea_form_tablist_row %}
 
 {% block ea_form_tabpane_group_open_row %}
-<div class="nav-tabs-custom form-tabs">
-    {% endblock ea_form_tabpane_group_open_row %}
+    <div class="nav-tabs-custom form-tabs">
+{% endblock ea_form_tabpane_group_open_row %}
 
-    {% block ea_form_tabpane_group_close_row %}
-</div>
+{% block ea_form_tabpane_group_close_row %}
+    </div>
 {% endblock ea_form_tabpane_group_close_row %}
 
 {% block ea_form_tabpane_open_row %}
     {% set tab_is_active_option_name = constant('EasyCorp\\Bundle\\EasyAdminBundle\\Field\\FormField::OPTION_TAB_IS_ACTIVE') %}
     {% set field = form.vars.ea_vars.field %}
-<div class="tab-content">
-    <div id="{{ ea_tab_id }}" class="tab-pane {% if field.getCustomOption(tab_is_active_option_name) %}active{% endif %} {{ ea_css_class }}">
-        {% if ea_help %}
-            <div class="content-header-help tab-help">
-                {{ ea_help|trans(domain = ea.i18n.translationDomain)|raw }}
-            </div>
-        {% endif %}
+    <div class="tab-content">
+        <div id="{{ ea_tab_id }}" class="tab-pane {% if field.getCustomOption(tab_is_active_option_name) %}active{% endif %} {{ ea_css_class }}">
+            {% if ea_help %}
+                <div class="content-header-help tab-help">
+                    {{ ea_help|trans(domain = ea.i18n.translationDomain)|raw }}
+                </div>
+            {% endif %}
 
-        <div class="row">
-            {% endblock ea_form_tabpane_open_row %}
+            <div class="row">
+{% endblock ea_form_tabpane_open_row %}
 
-            {% block ea_form_tabpane_close_row %}
+{% block ea_form_tabpane_close_row %}
+            </div>
         </div>
     </div>
-</div>
 {% endblock ea_form_tabpane_close_row %}
 
 {# EasyAdminFilters form type #}
@@ -683,8 +683,8 @@
                 <div class="filter-heading" id="filter-heading-{{ loop.index }}">
                     <input type="checkbox" class="filter-checkbox" {% if field.vars.name in applied_filters %}checked{% endif %}>
                     <a data-bs-toggle="collapse" href="#filter-content-{{ loop.index }}" aria-expanded="{{ field.vars.name in applied_filters ? 'true' : 'false' }}" aria-controls="filter-content-{{ loop.index }}"
-                    {% for name, value in field.vars.label_attr|default([]) %}{{ name }}="{{ value|e('html_attr') }}" {% endfor %}>
-                    {{ field.vars.label|default(field.vars.name|humanize)|trans(domain = ea.i18n.translationDomain) }}
+                        {% for name, value in field.vars.label_attr|default([]) %}{{ name }}="{{ value|e('html_attr') }}" {% endfor %}>
+                        {{ field.vars.label|default(field.vars.name|humanize)|trans(domain = ea.i18n.translationDomain) }}
                     </a>
                 </div>
                 <div id="filter-content-{{ loop.index }}" class="filter-content collapse {% if field.vars.name in applied_filters %}show{% endif %}" aria-labelledby="filter-heading-{{ loop.index }}">
@@ -763,7 +763,7 @@
                                     <span title="{{ file.mTime|date }}">
                                         <i class="fa fa-file-o"></i> {{ file.filename }}
                                     </span>
-                                    {% if download_path %}</a>{% endif %}
+                                {% if download_path %}</a>{% endif %}
                             </td>
                             <td class="text-right file-size">{{ file.size|ea_filesize }}</td>
                         </tr>