diff --git a/Resources/views/Form/fields.html.twig b/Resources/views/Form/fields.html.twig
index 97e2896dc..aea99ca8d 100644
--- a/Resources/views/Form/fields.html.twig
+++ b/Resources/views/Form/fields.html.twig
@@ -17,9 +17,9 @@
 #}
 
 {% block form_row %}
-{% spaceless %}
+{% apply spaceless %}
     <div class="container">
-        <div class="{% spaceless %}
+        <div class="{% apply spaceless %}
             {% if attr.class is defined and ('cf-title' in attr.class or 'cf-fields' in attr.class ) %} 
                 grid-12
             {% elseif attr.class is defined and 'multiple-cf-inline' in attr.class %} 
@@ -27,12 +27,12 @@
             {% else %}
                 grid-4 clear
             {% endif %}
-        {% endspaceless %}">
+        {% endapply %}">
         {% if attr.class is not defined or ('cf-title' not in attr.class and 'cf-fields' not in attr.class ) %} 
             {{ form_label(form) }}
         {% endif %}
         </div>
-        <div class="{% spaceless %}
+        <div class="{% apply spaceless %}
             {% if attr.class is defined and 'cf-title' in attr.class  %} 
                 grid-12
             {% elseif attr.class is defined and 'cf-fields' in attr.class %}
@@ -42,16 +42,16 @@
             {% else %}
                 grid-8
             {% endif %}
-        {% endspaceless %}">
+        {% endapply %}">
             {{ form_widget(form)  }}
             {{ form_errors(form) }}
         </div>
     </div>
-{% endspaceless %}
+{% endapply %}
 {% endblock form_row %}
     
 {% block choice_widget_expanded %}
-{% spaceless %}
+{% apply spaceless %}
     <div {{ block('widget_container_attributes') }} class="choice-widget-expanded">
     {% for child in form %}
         <span class="inline-choice">
@@ -66,12 +66,12 @@
             chill.checkNullValuesInChoices("{{ form.vars.full_name }}");
         });
     </script>
-{% endspaceless %}
+{% endapply %}
 {% endblock choice_widget_expanded %}
 
 
 {% block  choice_with_other_widget %}
-{% spaceless %}
+{% apply spaceless %}
     {% for child in form._choices %}
         {%- if child.vars.value != '_other'  -%}
             <div class="inline-choice">
@@ -98,7 +98,7 @@
             chill.checkNullValuesInChoices("{{ form._choices.vars.full_name }}");
         });
     </script>
-{% endspaceless %}
+{% endapply %}
 {% endblock  choice_with_other_widget %}
 
 {% block money_widget %}
@@ -110,7 +110,7 @@
 
 
 {% block date_widget %}
-{% spaceless %}
+{% apply spaceless %}
     {% if widget == 'single_text' %}
         {% set attr = {'class' : 'input datepicker'} %}
         {{ block('form_widget_simple') }}
@@ -123,7 +123,7 @@
             })|raw }}
         </div>
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock date_widget %}
 
 {%- block time_widget -%}
@@ -139,7 +139,7 @@
 {%- endblock time_widget -%}
         
 {% block form_errors %}
-{% spaceless %}
+{% apply spaceless %}
     {% if errors|length > 0 %}
     <ul class="errors chill-form__errors">
         {% for error in errors %}
@@ -147,7 +147,7 @@
         {% endfor %}
     </ul>
     {% endif %}
-{% endspaceless %}
+{% endapply %}
 {% endblock form_errors %}
 
 {% block _formatter__aggregator_placement_csv_formatter_row %}
diff --git a/Resources/views/Menu/adminSection.html.twig b/Resources/views/Menu/adminSection.html.twig
index 5434b4be8..7fabd0ae9 100644
--- a/Resources/views/Menu/adminSection.html.twig
+++ b/Resources/views/Menu/adminSection.html.twig
@@ -27,13 +27,13 @@
                         <div style="font-family: 'Open Sans'; font-weight:300; font-size: 0.75em; text-align:left; height: 46px; display:inline-block;  width: calc(100% - 5em - 1px); vertical-align:top;">
                             <a href="{{ menu.uri }}">{{ menu.label|trans }}</a>
                         </div>
-                        <div style="background-color: #333333;  text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% spaceless %}
+                        <div style="background-color: #333333;  text-align:center;width: 2em; margin-left:-0.15em; font-size:1.5em; color:#FFF; height: 46px; display:inline-block; vertical-align:top;float:right">{% apply spaceless %}
                             {% if menu.extras.icons is defined %}
                             {% for icon in menu.extras.icons %}
                                 <i class="fa fa-{{ icon }}"></i> 
                             {% endfor %}
                             {% endif %}
-                        {% endspaceless %}</div>
+                        {% endapply %}</div>
                 </div>
             </li>
         {% endfor %}