diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
index a677d446..99cefa0c 100644
--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@@ -1,6 +1,6 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
-    form_themes: ['bootstrap_4_horizontal_layout.html.twig', 'Form/extendedBootstrap4_layout.html.twig', 'Form/permissionLayout.html.twig' ]
+    form_themes: ['bootstrap_5_horizontal_layout.html.twig', 'Form/extendedBootstrap4_layout.html.twig', 'Form/permissionLayout.html.twig' ]
 
     paths:
         '%kernel.project_dir%/assets/css': css
diff --git a/templates/Form/extendedBootstrap4_layout.html.twig b/templates/Form/extendedBootstrap4_layout.html.twig
index 08fda2a9..42f8a1d6 100644
--- a/templates/Form/extendedBootstrap4_layout.html.twig
+++ b/templates/Form/extendedBootstrap4_layout.html.twig
@@ -1,4 +1,10 @@
-{% extends 'bootstrap_4_horizontal_layout.html.twig' %}
+{% extends 'bootstrap_5_horizontal_layout.html.twig' %}
+
+{# Make form rows smaller #}
+{% block form_row -%}
+    {%- set row_attr = row_attr|merge({"class": "mb-2"})  -%}
+    {{- parent() -}}
+{%- endblock form_row %}
 
 {% block file_widget -%}
     {%- set type = type|default('file') -%}