diff --git a/Resources/views/Form/BootstrapCollection/collection_add.html.twig b/Resources/views/Form/BootstrapCollection/collection_add.html.twig
index 02f786e..186e7cb 100644
--- a/Resources/views/Form/BootstrapCollection/collection_add.html.twig
+++ b/Resources/views/Form/BootstrapCollection/collection_add.html.twig
@@ -1,8 +1,6 @@
 {% if allow_add %}
-{% apply spaceless %}
 <a class="btn btn-primary new">
     <i class="fa fa-plus"></i>
     {{- ' ' ~ 's2a_bootstrap_collection.add'|trans({}, 'AdmingeneratorFormExtensions') -}}
 </a>
-{% endapply %}
 {% endif %}
\ No newline at end of file
diff --git a/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig b/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig
index 3dade71..d439bf1 100644
--- a/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig
+++ b/Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig
@@ -1,5 +1,4 @@
 {% if allow_delete %}
-{% apply spaceless %}
 <a class="btn btn-danger batch-delete">
     <i class="fa fa-trash-can fa-regular"></i>
     {{- ' ' ~ 's2a_bootstrap_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') -}}
@@ -7,5 +6,4 @@
 <label class="btn btn-link btn-toggle input-append">
     <input type="checkbox" name="toggle">
 </label>
-{% endapply %}
 {% endif %}
diff --git a/Resources/views/Form/BootstrapCollection/collection_delete.html.twig b/Resources/views/Form/BootstrapCollection/collection_delete.html.twig
index d5f1b4b..fd86da6 100644
--- a/Resources/views/Form/BootstrapCollection/collection_delete.html.twig
+++ b/Resources/views/Form/BootstrapCollection/collection_delete.html.twig
@@ -1,5 +1,4 @@
 {% if allow_delete %}
-{% apply spaceless %}
 <div class="collection-item-actions {{ id ~ '_actions' }}">
     <label class="btn btn-link btn-toggle input-append">
         <input type="checkbox" name="delete" value="1">
@@ -8,5 +7,4 @@
         <i class="fa fa-times"></i>
     </a>
 </div>
-{% endapply %}
 {% endif %}
\ No newline at end of file
diff --git a/Resources/views/Form/SingleUpload/macros.html.twig b/Resources/views/Form/SingleUpload/macros.html.twig
index 2e147ce..c5c4a5e 100644
--- a/Resources/views/Form/SingleUpload/macros.html.twig
+++ b/Resources/views/Form/SingleUpload/macros.html.twig
@@ -1,5 +1,4 @@
 {% macro bytesToSize(bytes) %}
-{% apply spaceless %}
     {% set kilobyte = 1000 %}
     {% set megabyte = kilobyte * 1000 %}
     {% set gigabyte = megabyte * 1000 %}
@@ -7,17 +6,16 @@
     {% set petabyte = terabyte * 1000 %}
 
     {% if bytes < kilobyte %}
-        {{ bytes ~ ' B' }}
+        {{- bytes ~ ' B' -}}
     {% elseif bytes < megabyte %}
-        {{ (bytes / kilobyte)|number_format(2, '.') ~ ' KB' }}
+        {{- (bytes / kilobyte)|number_format(2, '.') ~ ' KB' -}}
     {% elseif bytes < gigabyte %}
-        {{ (bytes / megabyte)|number_format(2, '.') ~ ' MB' }}
+        {{- (bytes / megabyte)|number_format(2, '.') ~ ' MB' -}}
     {% elseif bytes < terabyte %}
-        {{ (bytes / gigabyte)|number_format(2, '.') ~ ' GB' }}
+        {{- (bytes / gigabyte)|number_format(2, '.') ~ ' GB' -}}
     {% elseif bytes < petabyte %}
-        {{ (bytes / terabyte)|number_format(2, '.') ~ ' TB' }}
+        {{- (bytes / terabyte)|number_format(2, '.') ~ ' TB' -}}
     {% else %}
-        {{ (bytes / petabyte)|number_format(2, '.') ~ ' PB' }}
+        {{- (bytes / petabyte)|number_format(2, '.') ~ ' PB' -}}
     {% endif %}
-{% endapply %}
 {% endmacro %}
diff --git a/Resources/views/Form/form_css.html.twig b/Resources/views/Form/form_css.html.twig
index 6adccaa..d47bf85 100644
--- a/Resources/views/Form/form_css.html.twig
+++ b/Resources/views/Form/form_css.html.twig
@@ -1,24 +1,16 @@
 {% block s2a_collection_fieldset_css %}
-{% apply spaceless %}
-    {% include "@AdmingeneratorFormExtensions/Form/BootstrapCollection/stylesheet.html.twig" %}
-{% endapply %}
+    {%- include "@AdmingeneratorFormExtensions/Form/BootstrapCollection/stylesheet.html.twig" -%}
 {% endblock s2a_collection_fieldset_css %}
 
 {% block s2a_collection_table_css %}
-{% apply spaceless %}
-    {% include "@AdmingeneratorFormExtensions/Form/BootstrapCollection/stylesheet.html.twig" %}
-{% endapply %}
+    {%- include "@AdmingeneratorFormExtensions/Form/BootstrapCollection/stylesheet.html.twig" -%}
 {% endblock s2a_collection_table_css %}
 
 {% block s2a_collection_upload_css %}
-{% apply spaceless %}
-    {% include "@AdmingeneratorFormExtensions/Form/UploadCollection/stylesheet.html.twig" %}
-{% endapply %}
+    {%- include "@AdmingeneratorFormExtensions/Form/UploadCollection/stylesheet.html.twig" -%}
 {% endblock s2a_collection_upload_css %}
 
 {% block s2a_google_map_css %}
-{% apply spaceless %}
-    {% include "@AdmingeneratorFormExtensions/Form/GoogleMap/stylesheet.html.twig" %}
-{% endapply %}
+    {%- include "@AdmingeneratorFormExtensions/Form/GoogleMap/stylesheet.html.twig" -%}
 {% endblock s2a_google_map_css %}
 
diff --git a/Resources/views/Form/form_html.html.twig b/Resources/views/Form/form_html.html.twig
index 0e717f2..b704e51 100644
--- a/Resources/views/Form/form_html.html.twig
+++ b/Resources/views/Form/form_html.html.twig
@@ -1,31 +1,26 @@
 {% block form_row %}
-{% apply spaceless %}
     <div class="control-group control-group-{{ name }}{% if errors|length > 0 %} has-error{% endif %}">
         {{ form_label(form) }}
         {{ form_widget(form) }}
         {{ form_errors(form) }}
         {{ block('form_help') }}
     </div>
-{% endapply %}
 {% endblock form_row %}
 
 {% block form_help %}
-{% apply spaceless %}
-    {% if help %}
+    {%- if help -%}
         <span class="help-block">
             <p class="muted">{{ help|trans({}, translation_domain) }}</p>
         </span>
-    {% endif %}
-{% endapply %}
+    {%- endif -%}
 {% endblock form_help %}
 
 {% block s2a_collection_fieldset_widget %}
-{% apply spaceless %}
-{% if prototype is defined %}
+{%- if prototype is defined %}
     {% set item = prototype %}
     {% set attr = attr|merge({'data-prototype': block('s2a_collection_fieldset_item') }) %}
 {% endif %}
-{% set attr = attr|merge({'class': 'control-group' }) %}
+{% set attr = attr|merge({'class': 'control-group' }) -%}
 <div {{ block('widget_container_attributes') }}>
     <div id="{{ id ~ '_toolbar' }}" class="btn-toolbar form-actions form-actions-condensed">
         {%- include "@AdmingeneratorFormExtensions/Form/BootstrapCollection/collection_add.html.twig" -%}
@@ -39,7 +34,6 @@
     <div class="clearfix"></div>
     {{ form_rest(form) }}
 </div>
-{% endapply %}
 {% endblock s2a_collection_fieldset_widget %}
 
 {% block s2a_collection_fieldset_item %}
@@ -54,7 +48,6 @@
 {% endblock s2a_collection_fieldset_item %}
 
 {% block s2a_collection_table_widget %}
-{% apply spaceless %}
 {% if prototype is defined %}
     {% set item = prototype %}
     {% set attr = attr|merge({'data-prototype': block('s2a_collection_table_item') }) %}
@@ -75,7 +68,6 @@
         {% endfor %}
     </tbody>
 </table>
-{% endapply %}
 {% endblock s2a_collection_table_widget %}
 
 {% block s2a_collection_table_item %}
@@ -119,7 +111,6 @@
 {% endblock s2a_collection_table_item %}
 
 {% block s2a_upload_collection_widget %}
-{% apply spaceless %}
     {% set original_full_name = full_name %}
     {% set full_name = full_name ~ '[uploads][]' %}
     <div id="{{ id ~ '_widget_container' }}">
@@ -164,11 +155,9 @@
             {% include "@AdmingeneratorFormExtensions/Form/UploadCollection/template_upload.html.twig" %}
         {% endif %}
     </div>
-{% endapply %}
 {% endblock s2a_upload_collection_widget %}
 
 {% block s2a_double_list_prototype %}
-{% apply spaceless %}
     <div id="{{ id ~ '_widget_container' }}" class="double-list">
         <div class="col-xs-12 col-sm-5 list-unselected dropdown open">
             {% include "@AdmingeneratorFormExtensions/Form/DoubleList/unselected_list.html.twig" %}
@@ -181,7 +170,6 @@
         </div>
         {{ block('choice_widget') }}
     </div>
-{% endapply %}
 {% endblock s2a_double_list_prototype %}
 
 {% block s2a_double_list_document_widget %}
@@ -197,7 +185,6 @@
 {% endblock s2a_double_list_model_widget %}
 
 {% block s2a_single_upload_widget %}
-{% apply spaceless %}
     <div id="{{ id ~ '_widget_container' }}" class="single-upload">
         <div class="btn-toolbar form-actions form-actions-condensed singleupload-buttonbar">
             <span class="btn btn-success fileinput">
@@ -210,7 +197,6 @@
             {% include "@AdmingeneratorFormExtensions/Form/SingleUpload/preview.html.twig" %}
         </div>
     </div>
-{% endapply %}
 {% endblock s2a_single_upload_widget %}
 
 {% block s2a_select2_choice_widget %}
@@ -246,7 +232,6 @@
 {% endblock %}
 
 {% block s2a_datetime_family_prototype %}
-{% apply spaceless %}
 <input id="{{ id }}" name="{{ full_name }}" type="hidden" value="{{ value }}" />
 <div id="{{ id ~ '_widget' }}" class="s2a-date" {% if width is defined and width is not null %}style="width: {{ width }}px"{% endif %}>
     <input {{ block('s2a_datetime_family_widget_attributes') }} />
@@ -257,7 +242,6 @@
         <i class="{{ widgetIcon }}"></i>
     </a>
 </div>
-{% endapply %}
 {% endblock s2a_datetime_family_prototype %}
 
 {% block s2a_datetime_family_widget_attributes -%}
@@ -280,28 +264,21 @@
 {%- endblock s2a_datetime_family_widget_attributes %}
 
 {% block s2a_datetime_picker_widget %}
-{% apply spaceless %}
     {% set widgetIcon = 'fa-regular fa-calendar-days' %}
     {{ block('s2a_datetime_family_prototype') }}
-{% endapply %}
 {% endblock s2a_datetime_picker_widget %}
 
 {% block s2a_date_picker_widget %}
-{% apply spaceless %}
     {% set widgetIcon = 'fa-regular fa-calendar-days' %}
     {{ block('s2a_datetime_family_prototype') }}
-{% endapply %}
 {% endblock s2a_date_picker_widget %}
 
 {% block s2a_time_picker_widget %}
-{% apply spaceless %}
     {% set widgetIcon = 'fa-regular fa-clock' %}
     {{ block('s2a_datetime_family_prototype') }}
-{% endapply %}
 {% endblock s2a_time_picker_widget %}
 
 {% block s2a_google_map_widget %}
-{% apply spaceless %}
 <div {{ block('widget_container_attributes') }}>
     <div id="{{ id }}_container">
         <div class="input-group">
@@ -323,23 +300,18 @@
         {{ form_row(child) }}
     {% endfor %}
 </div>
-{% endapply %}
 {% endblock s2a_google_map_widget %}
 
 {% block s2a_money_widget %}
-{% apply spaceless %}
 <div class="input-group">
   <span class="input-group-addon">{{ money_pattern|replace({ '{{ widget }}': '' })|raw }}</span>
   {{ block('form_widget_simple')|raw }}
 </div>
-{% endapply %}
 {% endblock %}
 
 {% block s2a_daterange_picker_widget %}
-{% apply spaceless %}
-   <div class="input-group">
-   <span class="input-group-addon"><i class="fa fa-calendar-days fa-regular fa-fw"></i></span>
+<div class="input-group">
+    <span class="input-group-addon"><i class="fa fa-calendar-days fa-regular fa-fw"></i></span>
     {{ block('form_widget_simple') }}
-</div> 
-{% endapply %}
+</div>
 {% endblock s2a_daterange_picker_widget %}
diff --git a/Resources/views/Form/form_js.html.twig b/Resources/views/Form/form_js.html.twig
index 6aacbd5..549407a 100644
--- a/Resources/views/Form/form_js.html.twig
+++ b/Resources/views/Form/form_js.html.twig
@@ -1,6 +1,5 @@
 {% block s2a_bootstrap_collection_js_prototype %}
 {% autoescape false %}
-{% apply spaceless %}
     $field.bootstrapCollection({
         allow_add:        {{ allow_add|e4js }},
         allow_delete:     {{ allow_delete|e4js }},
@@ -26,13 +25,11 @@
         {% endif %}
         }
     });
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_bootstrap_collection_js_prototype %}
 
 {% block s2a_collection_fieldset_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -46,13 +43,11 @@
 {% for child in form %}
     {{ form_js(child) }}
 {% endfor %}
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_collection_fieldset_js %}
 
 {% block s2a_collection_table_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -66,13 +61,11 @@
 {% for child in form %}
     {{ form_js(child) }}
 {% endfor %}
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_collection_table_js %}
 
 {% block s2a_upload_collection_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     $(document).ready(function(){
         var $field = $('#{{ id }}');
@@ -142,13 +135,11 @@
         $field.uploadCollection('loadFiles', files);
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_upload_collection_js %}
 
 {% block s2a_daterange_picker_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -193,21 +184,17 @@
     {% endblock s2a_daterange_picker_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_daterange_picker_js %}
 
 {% block s2a_double_list_family_js_prototype_template %}
 {% autoescape false %}
-{% apply spaceless %}
     $field.doubleList();
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_double_list_family_js_prototype_template %}
 
 {% block s2a_double_list_document_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -217,13 +204,11 @@
     {% endblock s2a_double_list_document_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_double_list_document_js %}
 
 {% block s2a_double_list_entity_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -233,13 +218,11 @@
     {% endblock s2a_double_list_entity_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_double_list_entity_js %}
 
 {% block s2a_double_list_model_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -249,13 +232,11 @@
     {% endblock s2a_double_list_model_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_double_list_model_js %}
 
 {% block s2a_knob_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -281,12 +262,10 @@
     {% endblock s2a_knob_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_knob_js %}
 
 {% block s2a_mini_colors_js %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -305,12 +284,10 @@
     {% endblock s2a_mini_colors_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endblock s2a_mini_colors_js %}
 
 {% block s2a_select2_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         $field = $('#{{ id }}');
@@ -320,13 +297,11 @@
     {% endblock s2a_select2_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_select2_js %}
 
 {% block s2a_single_upload_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -361,13 +336,11 @@
     {% endblock s2a_single_upload_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_single_upload_js %}
 
 {% block s2a_elastic_textarea_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -377,12 +350,10 @@
     {% endblock s2a_elastic_textarea_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_elastic_textarea_js %}
 
 {% block choice_js %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -396,12 +367,10 @@
     {% endblock choice_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endblock choice_js %}
 
 {% block s2a_datetime_family_js_prototype_template %}
 {% autoescape false %}
-{% apply spaceless %}
     var $widget = $('#'+$field.attr('id')+'_widget');
     var config = {{ {
         'locale': app.request.locale,
@@ -434,13 +403,11 @@
         $widget.trigger("dp.change");
     });
     $field.closest('form').on('submit', copyValue);
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_datetime_family_js_prototype_template %}
 
 {% block s2a_datetime_picker_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -450,13 +417,11 @@
     {% endblock s2a_datetime_picker_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_datetime_picker_js %}
 
 {% block s2a_date_picker_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -466,13 +431,11 @@
     {% endblock s2a_date_picker_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_date_picker_js %}
 
 {% block s2a_time_picker_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -482,13 +445,11 @@
     {% endblock s2a_time_picker_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_time_picker_js %}
 
 {% block s2a_google_map_js %}
 {% autoescape false %}
-{% apply spaceless %}
 <script type="text/javascript">
     jQuery(document).ready(function($) {
         var $field = $('#{{ id }}');
@@ -510,6 +471,5 @@
     {% endblock s2a_google_map_js_prototype %}
     });
 </script>
-{% endapply %}
 {% endautoescape %}
 {% endblock s2a_google_map_js %}