diff --git a/src/components/bcl-accordion/accordion.html.twig b/src/components/bcl-accordion/accordion.html.twig
index 692f07c81..7a740f04b 100644
--- a/src/components/bcl-accordion/accordion.html.twig
+++ b/src/components/bcl-accordion/accordion.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - title (string) (default: '')
@@ -141,4 +139,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-alert/alert.html.twig b/src/components/bcl-alert/alert.html.twig
index a1b0e363d..dded835c0 100644
--- a/src/components/bcl-alert/alert.html.twig
+++ b/src/components/bcl-alert/alert.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - message (string) (default: '')
   - heading (string) (default: '')
@@ -80,4 +78,3 @@
 {%- endif -%}
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-badge/badge.html.twig b/src/components/bcl-badge/badge.html.twig
index 47cba476c..b2230eb0e 100644
--- a/src/components/bcl-badge/badge.html.twig
+++ b/src/components/bcl-badge/badge.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - label (string) (default: '')
   - background: (string) (default: 'primary')
@@ -76,4 +74,3 @@
 </span>
 {%- endif -%}
 
-{% endapply %}
diff --git a/src/components/bcl-blockquote/blockquote.html.twig b/src/components/bcl-blockquote/blockquote.html.twig
index 2c2e431cb..eae1c60ea 100644
--- a/src/components/bcl-blockquote/blockquote.html.twig
+++ b/src/components/bcl-blockquote/blockquote.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title (string) (default: '')
   - title_tag (string) (default: 'h2')
@@ -70,4 +68,3 @@
 {% endif %}
 </figure>
 
-{% endapply %}
diff --git a/src/components/bcl-breadcrumb/breadcrumb.html.twig b/src/components/bcl-breadcrumb/breadcrumb.html.twig
index f4685526a..78e9dafd2 100644
--- a/src/components/bcl-breadcrumb/breadcrumb.html.twig
+++ b/src/components/bcl-breadcrumb/breadcrumb.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - links (link[]) (default: [])
   - icon_path (string) (default: '')
@@ -59,4 +57,3 @@
 </nav>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-button-group/button-group.html.twig b/src/components/bcl-button-group/button-group.html.twig
index 090434ccf..14ab56743 100644
--- a/src/components/bcl-button-group/button-group.html.twig
+++ b/src/components/bcl-button-group/button-group.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - vertical (boolean) (default: false)
   - size (string) (default: 'md')
@@ -64,4 +62,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-button/button.html.twig b/src/components/bcl-button/button.html.twig
index f3c527d45..864bd2ffb 100644
--- a/src/components/bcl-button/button.html.twig
+++ b/src/components/bcl-button/button.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - label (string) (default: '')
@@ -111,4 +109,3 @@
 {%- endif -%}
 </button>
 
-{% endapply %}
diff --git a/src/components/bcl-card-layout/__snapshots__/card-layout.test.js.snap b/src/components/bcl-card-layout/__snapshots__/card-layout.test.js.snap
index d184b1936..a8f94913b 100644
--- a/src/components/bcl-card-layout/__snapshots__/card-layout.test.js.snap
+++ b/src/components/bcl-card-layout/__snapshots__/card-layout.test.js.snap
@@ -585,7 +585,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
@@ -632,7 +632,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
@@ -678,7 +678,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
@@ -730,7 +730,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
@@ -777,7 +777,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
@@ -819,7 +819,7 @@ exports[`OE - Card grid renders correctly with cards having equal height 1`] = `
       class="col"
     >
       <article
-        class="mb-3 h-100 card"
+        class="mb-3 card h-100"
       >
         <div
           class="card-header"
diff --git a/src/components/bcl-card-layout/card-layout.html.twig b/src/components/bcl-card-layout/card-layout.html.twig
index 3bf50afca..41e9b2ccc 100644
--- a/src/components/bcl-card-layout/card-layout.html.twig
+++ b/src/components/bcl-card-layout/card-layout.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - type (string) (default: 'group')
     options: ['group', 'grid', 'masonry']
@@ -84,4 +82,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-card/card.html.twig b/src/components/bcl-card/card.html.twig
index 9bd5ee991..e07e295a2 100644
--- a/src/components/bcl-card/card.html.twig
+++ b/src/components/bcl-card/card.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h1')
@@ -272,4 +270,3 @@
 {% endif %}
 </article>
 
-{% endapply %}
diff --git a/src/components/bcl-carousel/carousel.html.twig b/src/components/bcl-carousel/carousel.html.twig
index 39e601b00..d1ae521f7 100644
--- a/src/components/bcl-carousel/carousel.html.twig
+++ b/src/components/bcl-carousel/carousel.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title (string) (default: '')
   - title_tag (string) (default: 'h2')
@@ -177,4 +175,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-dropdown/dropdown.html.twig b/src/components/bcl-dropdown/dropdown.html.twig
index 7db3dfe28..4f0147be1 100644
--- a/src/components/bcl-dropdown/dropdown.html.twig
+++ b/src/components/bcl-dropdown/dropdown.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: dropdown-random(10000))
   - trigger (link or button)
@@ -132,4 +130,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-form-input/form-input.html.twig b/src/components/bcl-form-input/form-input.html.twig
index 559a1f73b..c3b32b500 100644
--- a/src/components/bcl-form-input/form-input.html.twig
+++ b/src/components/bcl-form-input/form-input.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - id (string) (default: '')
@@ -180,4 +178,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-form/form.html.twig b/src/components/bcl-form/form.html.twig
index c3e4b51df..eb7a74b85 100644
--- a/src/components/bcl-form/form.html.twig
+++ b/src/components/bcl-form/form.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h2')
@@ -147,4 +145,3 @@
 {% endif %}
 </form>
 
-{% endapply %}
diff --git a/src/components/bcl-heading/heading.html.twig b/src/components/bcl-heading/heading.html.twig
index 94e382b27..6e6b5663d 100644
--- a/src/components/bcl-heading/heading.html.twig
+++ b/src/components/bcl-heading/heading.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title (string) (default: '')
   - title_tag (string) (default: 'h2')
@@ -37,4 +35,3 @@
 </{{ _title_tag }}>
 {% endif -%}
 
-{% endapply %}
diff --git a/src/components/bcl-icon/icon.html.twig b/src/components/bcl-icon/icon.html.twig
index cf5c7e24d..8567e85c5 100644
--- a/src/components/bcl-icon/icon.html.twig
+++ b/src/components/bcl-icon/icon.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - name (string) (default: '')
   - path (string) (default: '')
@@ -33,4 +31,3 @@
   <use xlink:href="{{ _path ~ "#" ~ _name }}"/>
 </svg>
 
-{% endapply %}
diff --git a/src/components/bcl-link/link.html.twig b/src/components/bcl-link/link.html.twig
index 171972fcf..a073f6df4 100644
--- a/src/components/bcl-link/link.html.twig
+++ b/src/components/bcl-link/link.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - label (string) (default: '')
   - path (string) (default: '#')
@@ -86,4 +84,3 @@
   {%- endif -%}
 </a>
 
-{% endapply %}
diff --git a/src/components/bcl-list-group/list-group.html.twig b/src/components/bcl-list-group/list-group.html.twig
index 39c1dade3..1ac1e8bc8 100644
--- a/src/components/bcl-list-group/list-group.html.twig
+++ b/src/components/bcl-list-group/list-group.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - flush (boolean) (default: false)
   - horizontal (string) (default: '')
@@ -117,4 +115,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-modal/modal.html.twig b/src/components/bcl-modal/modal.html.twig
index 126fa4558..920f7a93d 100644
--- a/src/components/bcl-modal/modal.html.twig
+++ b/src/components/bcl-modal/modal.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - size (string) default('')
     options: sm, lg, xl, fullscreen
@@ -92,4 +90,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-navbar/navbar.html.twig b/src/components/bcl-navbar/navbar.html.twig
index 0e46f65cc..0ce2067f1 100644
--- a/src/components/bcl-navbar/navbar.html.twig
+++ b/src/components/bcl-navbar/navbar.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - collapse_id (string) (default: '')
   - background (string) (default: '')
@@ -106,4 +104,3 @@
   </div>
 </nav>
 
-{% endapply %}
diff --git a/src/components/bcl-navigation/navigation.html.twig b/src/components/bcl-navigation/navigation.html.twig
index 8a78735b8..8abd40f7f 100644
--- a/src/components/bcl-navigation/navigation.html.twig
+++ b/src/components/bcl-navigation/navigation.html.twig
@@ -1,6 +1,4 @@
 {% import _self as navigation %}
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: '')
   - pills (boolean) (default: false)
@@ -27,8 +25,7 @@
 
 {# Define main macro #}
 {% macro render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) %}
-{% apply spaceless %}
-  {% import _self as navigation %}
+{% import _self as navigation %}
 
   {% set _id = id|default('') %}
   {% set _pills = pills ?? false %}
@@ -181,9 +178,7 @@
     {%- endblock -%}
   </div>
   {% endif %}
-{% endapply %}
 {% endmacro %}
 
 {{ navigation.render(items, pills, tabs, tabs_content, vertical, full_width, alignment, id, nav, navbar, attributes) }}
 
-{% endapply %}
diff --git a/src/components/bcl-offcanvas/offcanvas.html.twig b/src/components/bcl-offcanvas/offcanvas.html.twig
index 6ba8d4ff6..4bf14b6b2 100644
--- a/src/components/bcl-offcanvas/offcanvas.html.twig
+++ b/src/components/bcl-offcanvas/offcanvas.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h2')
@@ -119,4 +117,3 @@
 {%- endif -%}
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-pagination-v2/pagination-item.html.twig b/src/components/bcl-pagination-v2/pagination-item.html.twig
index b6c445901..488390267 100644
--- a/src/components/bcl-pagination-v2/pagination-item.html.twig
+++ b/src/components/bcl-pagination-v2/pagination-item.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - path (string) (default: '')
   - label (string) (default: '')
@@ -87,4 +85,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-pagination-v2/pagination.html.twig b/src/components/bcl-pagination-v2/pagination.html.twig
index 60c007948..8ffe70b22 100644
--- a/src/components/bcl-pagination-v2/pagination.html.twig
+++ b/src/components/bcl-pagination-v2/pagination.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - size (string) (default: '')
     - options ['sm', 'lg']
@@ -210,4 +208,3 @@
   </ul>
 </nav>
 
-{% endapply %}
diff --git a/src/components/bcl-pagination/pagination-item.html.twig b/src/components/bcl-pagination/pagination-item.html.twig
index 76e6ec9d9..a4137d4e5 100644
--- a/src/components/bcl-pagination/pagination-item.html.twig
+++ b/src/components/bcl-pagination/pagination-item.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - path (string) (default: '')
   - label (string) (default: '')
@@ -70,4 +68,3 @@
   <div {{ attributes }}>{{- _label -}}</div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-pagination/pagination.html.twig b/src/components/bcl-pagination/pagination.html.twig
index 9a3117cde..6688db766 100644
--- a/src/components/bcl-pagination/pagination.html.twig
+++ b/src/components/bcl-pagination/pagination.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - size (string) (default: '')
     - options ['sm', 'lg']
@@ -158,4 +156,3 @@
   </ul>
 </nav>
 
-{% endapply %}
diff --git a/src/components/bcl-placeholder/placeholder.html.twig b/src/components/bcl-placeholder/placeholder.html.twig
index d299ac654..fd4fcbd54 100644
--- a/src/components/bcl-placeholder/placeholder.html.twig
+++ b/src/components/bcl-placeholder/placeholder.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - width (int) (default: 0) - between 0-100
   - variant (string) (default: '')
@@ -42,4 +40,3 @@
   </p>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-progress/progress.html.twig b/src/components/bcl-progress/progress.html.twig
index 3e1ec2011..c39063479 100644
--- a/src/components/bcl-progress/progress.html.twig
+++ b/src/components/bcl-progress/progress.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - progress (int) (default: 0)
   - min (int) (default: 0)
@@ -70,4 +68,3 @@
   <small class="form-text text-muted progress-bar-message">{{ _message }}</small>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-select/select.html.twig b/src/components/bcl-select/select.html.twig
index 636f482d2..822a1d1e7 100644
--- a/src/components/bcl-select/select.html.twig
+++ b/src/components/bcl-select/select.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - id (string) (default: '')
@@ -181,4 +179,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-spinner/spinner.html.twig b/src/components/bcl-spinner/spinner.html.twig
index 9ec2e32cb..26def0eba 100644
--- a/src/components/bcl-spinner/spinner.html.twig
+++ b/src/components/bcl-spinner/spinner.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - type (string) (default: 'border')
     - options ['border', 'grow']
@@ -37,4 +35,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/components/bcl-table/table.html.twig b/src/components/bcl-table/table.html.twig
index d2b9efa0f..315522ff4 100644
--- a/src/components/bcl-table/table.html.twig
+++ b/src/components/bcl-table/table.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - striped (boolean) (default: false)
   - hoverable (boolean) (default: false)
@@ -192,4 +190,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/components/bcl-textarea/textarea.html.twig b/src/components/bcl-textarea/textarea.html.twig
index b9816700a..774cc8a93 100644
--- a/src/components/bcl-textarea/textarea.html.twig
+++ b/src/components/bcl-textarea/textarea.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - id (string) (default: '')
@@ -146,4 +144,3 @@
 {% if _floating or _horizontal %}
 </div>
 {% endif %}
-{% endapply %}
diff --git a/src/components/bcl-toasts/__snapshots__/toasts.test.js.snap b/src/components/bcl-toasts/__snapshots__/toasts.test.js.snap
index c84e28f65..40efe1da6 100644
--- a/src/components/bcl-toasts/__snapshots__/toasts.test.js.snap
+++ b/src/components/bcl-toasts/__snapshots__/toasts.test.js.snap
@@ -11,7 +11,7 @@ exports[`OE - Toasts render correctly with body wrapper classes 1`] = `
     <div
       class="test-class toast-header"
     >
-      Toast title                    
+      Toast title
       <button
         aria-label="Close"
         class="test-class btn-close"
@@ -143,7 +143,7 @@ exports[`OE - Toasts renders correctly with a single toast 1`] = `
     <div
       class="test-class toast-header"
     >
-      Toast title                    
+      Toast title
       <button
         aria-label="Close"
         class="test-class btn-close"
diff --git a/src/components/bcl-toasts/toasts.html.twig b/src/components/bcl-toasts/toasts.html.twig
index c07481160..4f04e11a3 100644
--- a/src/components/bcl-toasts/toasts.html.twig
+++ b/src/components/bcl-toasts/toasts.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - with_wrapper (boolean) (default: false)
@@ -129,4 +127,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-attributes/__snapshots__/attributes.test.js.snap b/src/compositions/bcl-attributes/__snapshots__/attributes.test.js.snap
index 2efcf3753..023b5b724 100644
--- a/src/compositions/bcl-attributes/__snapshots__/attributes.test.js.snap
+++ b/src/compositions/bcl-attributes/__snapshots__/attributes.test.js.snap
@@ -8,100 +8,73 @@ exports[`OE - Attributes default renders correctly 1`] = `
   >
     Boolean true attribute
   </div>
-  
-
   <div
     data-case="value-matches-key"
     data-match
   >
     Value matches key attribute
   </div>
-  
-
   <div
     data-case="string-true"
     data-flag="true"
   >
     String literal "true" attribute
   </div>
-  
-
   <div
     data-case="empty-string"
     data-empty=""
   >
     Empty string attribute
   </div>
-  
-
   <div
     data-case="zero"
     data-zero="0"
   >
     Zero attribute
   </div>
-  
-
   <div
     data-case="null"
   >
     Null attribute
   </div>
-  
-
   <div
     data-case="false"
   >
     False attribute
   </div>
-  
-
   <div
     data-case="undefined"
   >
     Undefined attribute
   </div>
-  
-
   <div
     data-case="string-value"
     data-value="example"
   >
     String value attribute
   </div>
-  
-
   <div
     data-case="array"
     data-list="one two three"
   >
     Array attribute with values
   </div>
-  
-
   <div
     data-case="array-empty-values"
     data-list="one"
   >
     Array attribute with empty values
   </div>
-  
-
   <div
     data-case="empty-array"
   >
     Empty array attribute
   </div>
-  
-
   <div
     data-case="array-only-empty-strings"
   >
     Array attribute with only empty strings
   </div>
-  
-
-
   <form
     data-empty=""
     data-value="form"
@@ -109,39 +82,25 @@ exports[`OE - Attributes default renders correctly 1`] = `
     id="attribute-form"
     novalidate
   >
-    
-  
     <fieldset>
-      
-    
       <legend>
         Form attribute examples
       </legend>
-      
-    
       <label
         for="sample-input"
       >
         Sample input
       </label>
-      
-    
       <input
         id="sample-input"
         type="text"
       />
-      
-    
       <button
         type="submit"
       >
         Submit
       </button>
-      
-  
     </fieldset>
-    
-
   </form>
 </jest>
 `;
diff --git a/src/compositions/bcl-banner/banner.html.twig b/src/compositions/bcl-banner/banner.html.twig
index 8f3012e62..140584cfa 100644
--- a/src/compositions/bcl-banner/banner.html.twig
+++ b/src/compositions/bcl-banner/banner.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'div')
@@ -93,4 +91,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-base-templates/content-type.html.twig b/src/compositions/bcl-base-templates/content-type.html.twig
index a6da669ff..f8a7ab0fe 100644
--- a/src/compositions/bcl-base-templates/content-type.html.twig
+++ b/src/compositions/bcl-base-templates/content-type.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - with_header (boolean) (default: false)
@@ -136,4 +134,3 @@
   {% include '@oe-bcl/bcl-footer/footer.html.twig' with footer only %}
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-colors/colors.html.twig b/src/compositions/bcl-colors/colors.html.twig
index bf06c224a..0d8390fb8 100644
--- a/src/compositions/bcl-colors/colors.html.twig
+++ b/src/compositions/bcl-colors/colors.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
     - "colors"
@@ -24,4 +22,3 @@
 {% endfor %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap b/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap
index d4dd62340..b48abffa2 100644
--- a/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap
+++ b/src/compositions/bcl-contact-form/__snapshots__/contact-form.test.js.snap
@@ -1039,7 +1039,7 @@ exports[`OE - Contact-form contact-form error page renders correctly 1`] = `
                 >
                   Contact form
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
@@ -2523,7 +2523,7 @@ exports[`OE - Contact-form contact-form page renders correctly 1`] = `
                 >
                   Contact form
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
@@ -4110,7 +4110,7 @@ exports[`OE - Contact-form contact-form success page renders correctly 1`] = `
                 >
                   Contact form
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
diff --git a/src/compositions/bcl-content-banner/content-banner.html.twig b/src/compositions/bcl-content-banner/content-banner.html.twig
index 25c968e94..d3d51134a 100644
--- a/src/compositions/bcl-content-banner/content-banner.html.twig
+++ b/src/compositions/bcl-content-banner/content-banner.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
     - title: (string) (default: '')
@@ -136,4 +134,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-date-block/date-block.html.twig b/src/compositions/bcl-date-block/date-block.html.twig
index adc467fb6..3a108823e 100644
--- a/src/compositions/bcl-date-block/date-block.html.twig
+++ b/src/compositions/bcl-date-block/date-block.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
     - day (integer) (default: '')
@@ -77,4 +75,3 @@
   </div>
 </time>
 
-{% endapply %}
diff --git a/src/compositions/bcl-description-list/description-list-details.html.twig b/src/compositions/bcl-description-list/description-list-details.html.twig
index 05fb37120..98ca6a505 100644
--- a/src/compositions/bcl-description-list/description-list-details.html.twig
+++ b/src/compositions/bcl-description-list/description-list-details.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - button: (button object) (default: {})
@@ -41,4 +39,3 @@
 {% endblock %}
 </dd>
 
-{% endapply %}
diff --git a/src/compositions/bcl-description-list/description-list-title.html.twig b/src/compositions/bcl-description-list/description-list-title.html.twig
index 1a8c3a7ba..01a4a4300 100644
--- a/src/compositions/bcl-description-list/description-list-title.html.twig
+++ b/src/compositions/bcl-description-list/description-list-title.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - icon: (icon object) (default: {})
@@ -30,4 +28,3 @@
   </div>
 </dt>
 
-{% endapply %}
diff --git a/src/compositions/bcl-description-list/description-list.html.twig b/src/compositions/bcl-description-list/description-list.html.twig
index 09a83159a..36d13206c 100644
--- a/src/compositions/bcl-description-list/description-list.html.twig
+++ b/src/compositions/bcl-description-list/description-list.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - title: (string) (default: '')
@@ -118,4 +116,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-fact-figures/fact-figures.html.twig b/src/compositions/bcl-fact-figures/fact-figures.html.twig
index eed41cef9..7ba78e89f 100644
--- a/src/compositions/bcl-fact-figures/fact-figures.html.twig
+++ b/src/compositions/bcl-fact-figures/fact-figures.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - title (string) (default: '')
@@ -125,4 +123,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-featured-media/featured-media.html.twig b/src/compositions/bcl-featured-media/featured-media.html.twig
index 6ec3205cd..39024dcaa 100644
--- a/src/compositions/bcl-featured-media/featured-media.html.twig
+++ b/src/compositions/bcl-featured-media/featured-media.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title (string) (default: '')
   - title_tag (string) (default: 'h2')
@@ -169,4 +167,3 @@
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-file/file-translations.html.twig b/src/compositions/bcl-file/file-translations.html.twig
index af1d29bf3..32c0d3c0a 100644
--- a/src/compositions/bcl-file/file-translations.html.twig
+++ b/src/compositions/bcl-file/file-translations.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: language-dropdown-random(10000))
   - label (string) (default: '')
@@ -93,4 +91,3 @@
   {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-file/file.html.twig b/src/compositions/bcl-file/file.html.twig
index bb18963b1..7400a98ba 100644
--- a/src/compositions/bcl-file/file.html.twig
+++ b/src/compositions/bcl-file/file.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - title (string) (default: '')
@@ -162,4 +160,3 @@
   {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-footer/footer.html.twig b/src/compositions/bcl-footer/footer.html.twig
index 57f0d8961..2c8647a80 100644
--- a/src/compositions/bcl-footer/footer.html.twig
+++ b/src/compositions/bcl-footer/footer.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - variant (string) (default: 'neutral')
     - options: ['eu', 'ec', 'neutral']
@@ -87,4 +85,3 @@
   </div>
 </footer>
 
-{% endapply %}
diff --git a/src/compositions/bcl-gallery/__snapshots__/gallery.test.js.snap b/src/compositions/bcl-gallery/__snapshots__/gallery.test.js.snap
index 204848c92..a42b18407 100644
--- a/src/compositions/bcl-gallery/__snapshots__/gallery.test.js.snap
+++ b/src/compositions/bcl-gallery/__snapshots__/gallery.test.js.snap
@@ -682,7 +682,7 @@ exports[`OE - Gallery default renders correctly 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
@@ -831,7 +831,7 @@ exports[`OE - Gallery default renders correctly 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
@@ -1866,7 +1866,7 @@ exports[`OE - Gallery renders correctly with new counter 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
@@ -2015,7 +2015,7 @@ exports[`OE - Gallery renders correctly with new counter 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
@@ -2767,7 +2767,7 @@ exports[`OE - Gallery renders correctly with title and link 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
@@ -2916,7 +2916,7 @@ exports[`OE - Gallery renders correctly with title and link 1`] = `
                   class="carousel-item"
                 >
                   <video
-                    controls="controls"
+                    controls
                     poster="https://picsum.photos/id/1081/800/400"
                   >
                     <source
diff --git a/src/compositions/bcl-gallery/gallery-item.html.twig b/src/compositions/bcl-gallery/gallery-item.html.twig
index 53274fbd5..dc8d85870 100644
--- a/src/compositions/bcl-gallery/gallery-item.html.twig
+++ b/src/compositions/bcl-gallery/gallery-item.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
 Parameters:
   - item (object) (default: {})
@@ -62,4 +60,3 @@ Parameters:
   {{ _item.thumbnail }}
 </a>
 
-{% endapply %}
diff --git a/src/compositions/bcl-gallery/gallery.html.twig b/src/compositions/bcl-gallery/gallery.html.twig
index 02dacb5dd..8f75124a0 100644
--- a/src/compositions/bcl-gallery/gallery.html.twig
+++ b/src/compositions/bcl-gallery/gallery.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
 Parameters:
   - id (string) (default: gallery-random(10000))
@@ -192,4 +190,3 @@ Parameters:
 </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap b/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap
index 669a9967a..445379cc3 100644
--- a/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap
+++ b/src/compositions/bcl-glossary/__snapshots__/glossary.test.js.snap
@@ -1007,7 +1007,7 @@ exports[`OE - Glossary detail renders correctly 1`] = `
                 >
                   Active substance
                 </h1>
-                  The substance responsible for the activity of a medicine.    
+                The substance responsible for the activity of a medicine.    
               </div>
             </div>
           </div>
diff --git a/src/compositions/bcl-header/header.html.twig b/src/compositions/bcl-header/header.html.twig
index edb7dfaf4..3979a25e3 100644
--- a/src/compositions/bcl-header/header.html.twig
+++ b/src/compositions/bcl-header/header.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - variant (string) (default: 'neutral')
     - options: ['ec', 'eu', 'neutral']
@@ -143,4 +141,3 @@
   {% include '@oe-bcl/bcl-language-list/language-list.html.twig' with _language_modal only %}
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-icons-list/icons-list.html.twig b/src/compositions/bcl-icons-list/icons-list.html.twig
index 81e159802..54a2d1afc 100644
--- a/src/compositions/bcl-icons-list/icons-list.html.twig
+++ b/src/compositions/bcl-icons-list/icons-list.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - icons: (icon[]) (default: [])
   - path (string) (default: '')
@@ -27,4 +25,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-inpage-navigation/inpage-navigation.html.twig b/src/compositions/bcl-inpage-navigation/inpage-navigation.html.twig
index 943f4fd92..60bd82f62 100644
--- a/src/compositions/bcl-inpage-navigation/inpage-navigation.html.twig
+++ b/src/compositions/bcl-inpage-navigation/inpage-navigation.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
 Parameters:
   - title: (string) (default: '')
@@ -77,4 +75,3 @@ Parameters:
   </div>
 </nav>
 
-{% endapply %}
diff --git a/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap b/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap
index fb2116062..94dcacebb 100644
--- a/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap
+++ b/src/compositions/bcl-landing-page/__snapshots__/landing-page.test.js.snap
@@ -1031,8 +1031,7 @@ exports[`OE - Landing page renders correctly 1`] = `
                 <div
                   class="col-12 col-md-6"
                 >
-                  
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                   <br />
                     Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                   <br />
@@ -1263,8 +1262,7 @@ exports[`OE - Landing page renders correctly 1`] = `
                 <div
                   class="col-12 col-md-6"
                 >
-                  
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                   <br />
                     Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                   <br />
diff --git a/src/compositions/bcl-language-list/language-list-grid.html.twig b/src/compositions/bcl-language-list/language-list-grid.html.twig
index acf3bb3bb..15f2c3952 100644
--- a/src/compositions/bcl-language-list/language-list-grid.html.twig
+++ b/src/compositions/bcl-language-list/language-list-grid.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
   Parameters:
   - items (array) (default: []) format: [
@@ -65,4 +63,3 @@
   {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-language-list/language-list.html.twig b/src/compositions/bcl-language-list/language-list.html.twig
index df790ef6c..9d876a8ec 100644
--- a/src/compositions/bcl-language-list/language-list.html.twig
+++ b/src/compositions/bcl-language-list/language-list.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - overlay (boolean) (default: false)
   - inside_container (boolean) (default: false)
@@ -108,4 +106,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-language-switcher/language-switcher.html.twig b/src/compositions/bcl-language-switcher/language-switcher.html.twig
index aef75910a..e0661bdbb 100644
--- a/src/compositions/bcl-language-switcher/language-switcher.html.twig
+++ b/src/compositions/bcl-language-switcher/language-switcher.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: collapse-random(10000), optional)
   - message (alert object) (default: {})
@@ -47,4 +45,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-links-block/links-block.html.twig b/src/compositions/bcl-links-block/links-block.html.twig
index cd2080159..46d7f1764 100644
--- a/src/compositions/bcl-links-block/links-block.html.twig
+++ b/src/compositions/bcl-links-block/links-block.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h2')
@@ -73,4 +71,3 @@
   </div>
 {% endif %}
 
-{% endapply %}
diff --git a/src/compositions/bcl-listing/listing.html.twig b/src/compositions/bcl-listing/listing.html.twig
index a2900fd71..2a85a14a0 100644
--- a/src/compositions/bcl-listing/listing.html.twig
+++ b/src/compositions/bcl-listing/listing.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - title_tag: (string) (default: 'h2')
@@ -196,4 +194,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-mega-menu/mega-menu-items.html.twig b/src/compositions/bcl-mega-menu/mega-menu-items.html.twig
index f1449383d..2a5564f19 100644
--- a/src/compositions/bcl-mega-menu/mega-menu-items.html.twig
+++ b/src/compositions/bcl-mega-menu/mega-menu-items.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {% set _label = label ?? null %}
 {% set _items = items ?? [] %}
 {% set _icon_path = icon_path ?? '' %}
@@ -32,4 +30,3 @@
   {% endfor %}
 </ul>
 
-{% endapply %}
diff --git a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig
index f0336ebb4..58d11242b 100644
--- a/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig
+++ b/src/compositions/bcl-mega-menu/mega-menu-submenu.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {% set _items = items ?? [] %}
 {% set _trigger = trigger ?? null %}
 {% set _icon_path = icon_path ?? '' %}
@@ -62,4 +60,3 @@
   } only %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-mega-menu/mega-menu.html.twig b/src/compositions/bcl-mega-menu/mega-menu.html.twig
index 21d7ed1fa..0d16b6870 100644
--- a/src/compositions/bcl-mega-menu/mega-menu.html.twig
+++ b/src/compositions/bcl-mega-menu/mega-menu.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: dropdown-random(1000))
   - link (boolean) (default: false) - sets trigger to link, default is button
@@ -112,4 +110,3 @@
   </nav>
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap b/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap
index 96090f288..282575c56 100644
--- a/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap
+++ b/src/compositions/bcl-procurement/__snapshots__/procurement.test.js.snap
@@ -1007,7 +1007,7 @@ exports[`OE - Procurement details (closed) renders correctly 1`] = `
                 >
                   Procurement title example
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
@@ -2984,7 +2984,7 @@ exports[`OE - Procurement details (opened) renders correctly 1`] = `
                 >
                   Procurement title example
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
@@ -4969,7 +4969,7 @@ exports[`OE - Procurement listing renders correctly 1`] = `
                 >
                   Procurements
                 </h1>
-                  Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
                 <br />
                   Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
                 <br />
diff --git a/src/compositions/bcl-project-status/project-contributions.html.twig b/src/compositions/bcl-project-status/project-contributions.html.twig
index 541be3453..efef893f0 100644
--- a/src/compositions/bcl-project-status/project-contributions.html.twig
+++ b/src/compositions/bcl-project-status/project-contributions.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - corporate_contributions (string) (default: '') // value every 5 percent
   - legend (description list object) (default: {})
@@ -53,4 +51,3 @@
   </div> 
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-project-status/project-status.html.twig b/src/compositions/bcl-project-status/project-status.html.twig
index ed48ff127..104f85ea6 100644
--- a/src/compositions/bcl-project-status/project-status.html.twig
+++ b/src/compositions/bcl-project-status/project-status.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - label (string) (default: '')
   - status (string) (default: 'planned')
@@ -96,4 +94,3 @@
 
 
 
-{% endapply %}
diff --git a/src/compositions/bcl-project/__snapshots__/project.test.js.snap b/src/compositions/bcl-project/__snapshots__/project.test.js.snap
index d88795b16..466689b4f 100644
--- a/src/compositions/bcl-project/__snapshots__/project.test.js.snap
+++ b/src/compositions/bcl-project/__snapshots__/project.test.js.snap
@@ -5434,19 +5434,17 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
             Summary
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
            Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="objective"
@@ -5454,14 +5452,12 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
             Objective
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="impact"
@@ -6018,12 +6014,10 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
             Achievements and Milestones
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
@@ -6711,7 +6705,7 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
@@ -6860,7 +6854,7 @@ exports[`OE - Project page (closed) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
@@ -8760,19 +8754,17 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
             Summary
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
            Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="objective"
@@ -8780,14 +8772,12 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
             Objective
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="impact"
@@ -9344,12 +9334,10 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
             Achievements and Milestones
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
@@ -10037,7 +10025,7 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
@@ -10186,7 +10174,7 @@ exports[`OE - Project page (ongoing) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
@@ -12086,19 +12074,17 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
             Summary
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
            Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="objective"
@@ -12106,14 +12092,12 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
             Objective
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
-            Duis fermentum facilisis ex, ac porta massa.      
+            Duis fermentum facilisis ex, ac porta massa.
           <h2
             class="mb-4 pt-3 bcl-heading"
             id="impact"
@@ -12670,12 +12654,10 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
             Achievements and Milestones
           </h2>
           <p>
-            
-        This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
+            This is the first item's accordion body. It is hidden by default, until the collapse plugin adds the appropriate classes that we use to style each element. These classes control the overall appearance, as well as the showing and hiding via CSS transitions.
       
           </p>
-          
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
           <br />
             Duis fermentum facilisis ex, ac porta massa. Lorem ipsum dolor sit amet, consectetur adipiscing elit.  Duis fermentum facilisis ex, ac porta massa. 
           <br />
@@ -13363,7 +13345,7 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
@@ -13512,7 +13494,7 @@ exports[`OE - Project page (planned) renders correctly 1`] = `
                             class="carousel-item"
                           >
                             <video
-                              controls="controls"
+                              controls
                               poster="https://picsum.photos/id/1081/800/400"
                             >
                               <source
diff --git a/src/compositions/bcl-project/project-lists.html.twig b/src/compositions/bcl-project/project-lists.html.twig
index 1e8e3cfb1..20e0b919c 100644
--- a/src/compositions/bcl-project/project-lists.html.twig
+++ b/src/compositions/bcl-project/project-lists.html.twig
@@ -1,6 +1,3 @@
-{% apply spaceless %}
-
-
 {#
   Parameters:
   - title: (string) (default: '')
@@ -70,4 +67,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-recent-activities/recent-activities.html.twig b/src/compositions/bcl-recent-activities/recent-activities.html.twig
index bc6873c46..c59163161 100644
--- a/src/compositions/bcl-recent-activities/recent-activities.html.twig
+++ b/src/compositions/bcl-recent-activities/recent-activities.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - activities (object[]) (default: [])
     format: [
@@ -60,4 +58,3 @@
 {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-search-form/search-form.html.twig b/src/compositions/bcl-search-form/search-form.html.twig
index b28acb98c..7ffc6ac4f 100644
--- a/src/compositions/bcl-search-form/search-form.html.twig
+++ b/src/compositions/bcl-search-form/search-form.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - pill (boolean) (default: false)
   - icon (icon Object) (default: {})
@@ -50,4 +48,3 @@
   </div>
 </form>
 
-{% endapply %}
diff --git a/src/compositions/bcl-subscription-block/subscription-block.html.twig b/src/compositions/bcl-subscription-block/subscription-block.html.twig
index 8138ffd94..381cbed9a 100644
--- a/src/compositions/bcl-subscription-block/subscription-block.html.twig
+++ b/src/compositions/bcl-subscription-block/subscription-block.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - title: (string) (default: '')
   - content: (string) (default: '')
@@ -35,4 +33,3 @@
   {% endif %}
 </div>
 
-{% endapply %}
diff --git a/src/compositions/bcl-timeline/timeline-item.html.twig b/src/compositions/bcl-timeline/timeline-item.html.twig
index 40596e814..72fc56650 100644
--- a/src/compositions/bcl-timeline/timeline-item.html.twig
+++ b/src/compositions/bcl-timeline/timeline-item.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - id (string) (default: '')
   - label (string) (default: '')
@@ -31,4 +29,3 @@
   {% endif %}
 </li>
 
-{% endapply %}
diff --git a/src/compositions/bcl-timeline/timeline.html.twig b/src/compositions/bcl-timeline/timeline.html.twig
index cab57aea3..8d38ade06 100644
--- a/src/compositions/bcl-timeline/timeline.html.twig
+++ b/src/compositions/bcl-timeline/timeline.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {#
 Parameters:
   - id: (integer) (default: random(10000))
@@ -112,4 +110,3 @@ Parameters:
   {% endif %}
 </ol>
 
-{% endapply %}
diff --git a/src/compositions/bcl-user/user-compact.html.twig b/src/compositions/bcl-user/user-compact.html.twig
index 3aee6364d..b6c45fcdf 100644
--- a/src/compositions/bcl-user/user-compact.html.twig
+++ b/src/compositions/bcl-user/user-compact.html.twig
@@ -1,5 +1,3 @@
-{% apply spaceless %}
-
 {# Parameters:
   - picture (object) (default: {})
     format: {
@@ -61,4 +59,3 @@
   </div>
 </div>
 
-{% endapply %}
diff --git a/tools/test-utils/index.js b/tools/test-utils/index.js
index 51f29d68f..e75e55aff 100644
--- a/tools/test-utils/index.js
+++ b/tools/test-utils/index.js
@@ -7,13 +7,126 @@ const { StorybookDrupalAttribute } = require(
 );
 
 const { DOMElement, DOMCollection } = prettyFormat.plugins;
+const PRE_FORMATTED_TAGS = new Set(["PRE", "TEXTAREA"]);
+const TEXT_NODE = 3;
+const ELEMENT_NODE = 1;
+const BOOLEAN_ATTRIBUTES = new Set([
+  "allowfullscreen",
+  "async",
+  "autofocus",
+  "autoplay",
+  "checked",
+  "controls",
+  "default",
+  "defer",
+  "disabled",
+  "formnovalidate",
+  "hidden",
+  "inert",
+  "ismap",
+  "loop",
+  "multiple",
+  "muted",
+  "novalidate",
+  "open",
+  "playsinline",
+  "readonly",
+  "required",
+  "reversed",
+  "scoped",
+  "selected",
+]);
+
+/**
+ * ---------------------------------------------------------------------------
+ * DOM helpers
+ * ---------------------------------------------------------------------------
+ */
+
+const trimBoundaryWhitespace = (value) => {
+  if (!value) {
+    return value;
+  }
 
-const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  let start = 0;
+  let seenLineBreak = false;
+
+  while (start < value.length) {
+    const char = value[start];
+
+    if (char === "\n" || char === "\r") {
+      seenLineBreak = true;
+      start += 1;
+      continue;
+    }
+
+    if (seenLineBreak && (char === " " || char === "\t")) {
+      start += 1;
+      continue;
+    }
+
+    break;
+  }
+
+  let end = value.length - 1;
+  seenLineBreak = false;
+
+  while (end >= start) {
+    const char = value[end];
+
+    if (char === "\n" || char === "\r") {
+      seenLineBreak = true;
+      end -= 1;
+      continue;
+    }
+
+    if (seenLineBreak && (char === " " || char === "\t")) {
+      end -= 1;
+      continue;
+    }
+
+    break;
+  }
+
+  return value.slice(start, end + 1);
+};
+
+const cleanWhitespace = (node) => {
+  for (let child = node.firstChild; child; ) {
+    const next = child.nextSibling;
+
+    if (child.nodeType === TEXT_NODE) {
+      if (!child.textContent.trim()) {
+        child.parentNode.removeChild(child);
+      } else {
+        const parentName = child.parentNode?.nodeName?.toUpperCase();
+        if (!parentName || !PRE_FORMATTED_TAGS.has(parentName)) {
+          const trimmed = trimBoundaryWhitespace(child.textContent);
+          if (trimmed) {
+            child.textContent = trimmed;
+          } else {
+            child.parentNode.removeChild(child);
+          }
+        }
+      }
+    } else if (child.nodeType === ELEMENT_NODE) {
+      cleanWhitespace(child);
+    }
+
+    child = next;
+  }
+};
+
+/**
+ * ---------------------------------------------------------------------------
+ * Option cloning
+ * ---------------------------------------------------------------------------
+ */
 
 const isPlainObject = (value) =>
   Object.prototype.toString.call(value) === "[object Object]";
 
-function cloneValue(value) {
+const cloneValue = (value) => {
   if (value === null || value === undefined) {
     return value;
   }
@@ -23,13 +136,11 @@ function cloneValue(value) {
   }
 
   if (value instanceof BaseDrupalAttribute) {
-    const converted = new StorybookDrupalAttribute();
-
+    const clone = new StorybookDrupalAttribute();
     for (const [key, attributeValue] of value.entries()) {
-      converted.set(key, cloneValue(attributeValue));
+      clone.set(key, cloneValue(attributeValue));
     }
-
-    return converted;
+    return clone;
   }
 
   if (Array.isArray(value)) {
@@ -37,26 +148,38 @@ function cloneValue(value) {
   }
 
   if (isPlainObject(value)) {
-    return Object.entries(value).reduce((accumulator, [key, item]) => {
-      accumulator[key] = cloneValue(item);
-      return accumulator;
-    }, {});
+    return Object.fromEntries(
+      Object.entries(value).map(([key, item]) => [key, cloneValue(item)]),
+    );
   }
 
   return value;
-}
+};
 
-function normalizeOptions(options) {
-  if (options === null || options === undefined) {
-    return options;
+const prepareOptions = (options = {}, reset = false) => {
+  if (reset) {
+    return {
+      ...(isPlainObject(options) ? options : {}),
+      attributes: new StorybookDrupalAttribute(),
+    };
   }
 
-  return cloneValue(options);
-}
+  if (isPlainObject(options)) {
+    return cloneValue(options);
+  }
+
+  return options;
+};
+
+/**
+ * ---------------------------------------------------------------------------
+ * Snapshot formatting
+ * ---------------------------------------------------------------------------
+ */
+
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 
-// Track attributes rendered without explicit values so snapshots can mirror
-// Drupal's boolean attribute output.
-const getValuelessAttributeCounts = (markup) => {
+const countValuelessAttributes = (markup) => {
   const counts = new Map();
   const tagRegex = /<([A-Za-z][^\s/>]*)([^>]*)>/g;
 
@@ -75,12 +198,7 @@ const getValuelessAttributeCounts = (markup) => {
     while ((attributeMatch = attributeRegex.exec(attributesChunk)) !== null) {
       const [fullAttribute, attributeName] = attributeMatch;
 
-      if (!attributeName) {
-        continue;
-      }
-
-      const hasAssignment = fullAttribute.includes("=");
-      if (!hasAssignment) {
+      if (attributeName && !fullAttribute.includes("=")) {
         counts.set(attributeName, (counts.get(attributeName) ?? 0) + 1);
       }
     }
@@ -89,8 +207,7 @@ const getValuelessAttributeCounts = (markup) => {
   return counts;
 };
 
-// Re-apply valueless attributes within the pretty-printed DOM snapshot string.
-const applyValuelessAttributes = (snapshot, counts) => {
+const restoreValuelessAttributes = (snapshot, counts) => {
   if (!counts || counts.size === 0) {
     return snapshot;
   }
@@ -98,12 +215,7 @@ const applyValuelessAttributes = (snapshot, counts) => {
   let result = snapshot;
 
   for (const [attributeName, occurrences] of counts.entries()) {
-    if (!occurrences) {
-      continue;
-    }
-
-    const escapedName = escapeRegExp(attributeName);
-    const pattern = new RegExp(`${escapedName}=""`, "g");
+    const pattern = new RegExp(`${escapeRegExp(attributeName)}=""`, "g");
     let remaining = occurrences;
 
     result = result.replace(pattern, (match) => {
@@ -118,21 +230,32 @@ const applyValuelessAttributes = (snapshot, counts) => {
   return result;
 };
 
-// Remove escape sequences inside attribute values so JSON-like payloads render
-// with plain double quotes, matching the Twig templates.
 const normalizeAttributeQuotes = (snapshot) =>
   snapshot.replace(
     /([^\s=]+)="((?:[^"\\]|\\.)*)"/g,
-    (fullMatch, name, value) => {
-      if (!value.includes('\\"')) {
-        return fullMatch;
-      }
+    (fullMatch, name, value) =>
+      value.includes('\\"')
+        ? `${name}="${value.replace(/\\"/g, '"')}"`
+        : fullMatch,
+  );
+
+const normalizeBooleanAttributes = (snapshot) =>
+  snapshot.replace(/([^\s=\/>]+)="\1"/g, (match, name) => {
+    if (BOOLEAN_ATTRIBUTES.has(name.toLowerCase())) {
+      return name;
+    }
+    return match;
+  });
 
-      const unescaped = value.replace(/\\"/g, '"');
+const formatSnapshot = (jest, counts) => {
+  const raw = prettyFormat.format(jest, {
+    plugins: [DOMElement, DOMCollection],
+  });
 
-      return `${name}="${unescaped}"`;
-    },
+  return normalizeBooleanAttributes(
+    normalizeAttributeQuotes(restoreValuelessAttributes(raw, counts)),
   );
+};
 
 if (
   typeof expect !== "undefined" &&
@@ -148,44 +271,32 @@ if (
   });
 }
 
-const renderTwigFileAsNode = async (file, options = {}, reset) => {
-  let baseOptions = options;
-
-  if (reset) {
-    baseOptions = {
-      ...(isPlainObject(options) ? options : {}),
-      attributes: new StorybookDrupalAttribute(),
-    };
-  } else if (isPlainObject(options)) {
-    baseOptions = { ...options };
-  }
-
-  const renderOptions = normalizeOptions(baseOptions);
+/**
+ * ---------------------------------------------------------------------------
+ * Public API
+ * ---------------------------------------------------------------------------
+ */
 
+const renderTwigFileAsNode = async (file, options = {}, reset = false) => {
+  const renderOptions = prepareOptions(options, reset);
   const html = await twing.render(file, renderOptions);
   const markup = html.trim();
-  const valuelessCounts = getValuelessAttributeCounts(markup);
+  const valuelessCounts = countValuelessAttributes(markup);
 
   const jest = document.createElement("jest");
   jest.innerHTML = markup;
-
-  const prettySnapshot = prettyFormat.format(jest, {
-    plugins: [DOMElement, DOMCollection],
-  });
-  const snapshotHtml = normalizeAttributeQuotes(
-    applyValuelessAttributes(prettySnapshot, valuelessCounts),
-  );
+  cleanWhitespace(jest);
 
   Object.defineProperty(jest, "__storybookDrupalHtml", {
-    value: snapshotHtml,
+    value: formatSnapshot(jest, valuelessCounts),
     configurable: true,
   });
 
   return jest;
 };
 
-const renderTwigFileAsHtml = async (file, options = {}, main) => {
-  const renderOptions = normalizeOptions(options);
+const renderTwigFileAsHtml = async (file, options = {}, main = false) => {
+  const renderOptions = prepareOptions(options);
   const html = await twing.render(file, renderOptions);
 
   if (!main) {
@@ -209,9 +320,14 @@ const getVariants = (outline, add) => {
     "light",
     "dark",
   ];
+
   if (outline) {
-    variants = [...variants, ...variants.map((el) => `outline-${el}`)];
+    variants = [
+      ...variants,
+      ...variants.map((variant) => `outline-${variant}`),
+    ];
   }
+
   if (add) {
     variants = [...variants, ...add];
   }