diff --git a/config.json b/config.json
index 189cbd5147..f0ea388bc6 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,7 @@
 {
   "name": "Cornerstone",
   "version": "4.11.0",
+  "template_engine": "handlebars_v4",
   "meta": {
     "price": 0,
     "documentation_url": "https://support.bigcommerce.com/articles/Public/Cornerstone-Theme-Manual",
diff --git a/templates/components/account/messages-list.html b/templates/components/account/messages-list.html
index eada17de00..229030f4b5 100644
--- a/templates/components/account/messages-list.html
+++ b/templates/components/account/messages-list.html
@@ -13,7 +13,7 @@ <h5 class="account-product-title {{#unless unread}}is-read{{/unless}}">
                 </h5>
                 <p class="{{#unless unread}}is-read{{/unless}}">
                     {{#if is_reply}}
-                        {{lang 'account.messages.merchant_said' store_name=../../settings.store_name}}
+                        {{lang 'account.messages.merchant_said' store_name=../settings.store_name}}
                     {{else}}
                         {{lang 'account.messages.customer_said'}}
                     {{/if}}
diff --git a/templates/components/account/order-contents.html b/templates/components/account/order-contents.html
index 5da01600f2..dcde21d207 100644
--- a/templates/components/account/order-contents.html
+++ b/templates/components/account/order-contents.html
@@ -21,14 +21,18 @@ <h5 class="account-listShipping-title">{{lang 'account.orders.details.ship_to_mu
             </div>
             <figure class="account-product-figure">
                 {{#if type '===' 'giftcertificate'}}
-                    <img src="{{cdn ../../theme_settings.default_image_gift_certificate}}" alt="Gift Certificate" title="Gift Certificate">
+                    <img
+                        src="{{cdn ../theme_settings.default_image_gift_certificate}}"
+                        alt="Gift Certificate"
+                        title="Gift Certificate"
+                    >
                 {{else}}
                     {{> components/common/responsive-img
                         image=image
                         class="account-product-image"
-                        fallback_size=../../theme_settings.productthumb_size
-                        lazyload=../../theme_settings.lazyload_mode
-                        default_image=../../theme_settings.default_image_product
+                        fallback_size=../theme_settings.productthumb_size
+                        lazyload=../theme_settings.lazyload_mode
+                        default_image=../theme_settings.default_image_product
                     }}
                 {{/if}}
                 {{#unless refunded}}
diff --git a/templates/components/account/orders-list.html b/templates/components/account/orders-list.html
index 95be65bfec..71193a0c65 100644
--- a/templates/components/account/orders-list.html
+++ b/templates/components/account/orders-list.html
@@ -6,14 +6,17 @@ <h3 class="account-heading">{{lang 'account.orders.heading' }}</h3>
         <div class="account-product">
             <div class="account-product-figure">
                 {{#if items.0.type '===' 'giftcertificate'}}
-                    <img src="{{cdn ../../theme_settings.default_image_gift_certificate}}" alt="GiftCertificate" title="GiftCertificate">
+                    <img
+                        alt="GiftCertificate"
+                        title="GiftCertificate"
+                        src="{{cdn ../theme_settings.default_image_gift_certificate}}">
                 {{else}}
                     {{> components/common/responsive-img
                         image=image
                         class="account-product-image"
-                        fallback_size=../../theme_settings.productthumb_size
-                        lazyload=../../theme_settings.lazyload_mode
-                        default_image=../../theme_settings.default_image_product
+                        fallback_size=../theme_settings.productthumb_size
+                        lazyload=../theme_settings.lazyload_mode
+                        default_image=../theme_settings.default_image_product
                     }}
                 {{/if}}
             </div>
diff --git a/templates/components/account/payment-methods-list.html b/templates/components/account/payment-methods-list.html
index e656173e7b..3a10495d0b 100644
--- a/templates/components/account/payment-methods-list.html
+++ b/templates/components/account/payment-methods-list.html
@@ -17,7 +17,7 @@ <h4 class="paymentMethodsTitle">
                                 {{#if type '===' 'stored_card'}}
                                     {{!-- If credit card STARTS --}}
                                     {{#if brand}}
-                                        {{#inArray ../../../../../theme_settings.supported_card_type_icons brand}}
+                                        {{#inArray ../../theme_settings.supported_card_type_icons brand) }}
                                             <img class="methodHeader-icon" src="{{cdn (concat (concat 'img/payment-methods/' brand) '.svg')}}" alt="{{lang (concat 'account.payment_methods.card_types.' brand)}}" title="{{lang (concat 'account.payment_methods.card_types.' brand)}}">
                                         {{/inArray}}
                                         <span class="methodHeader-brand">{{lang (concat 'account.payment_methods.card_types.' brand)}} {{lang 'account.payment_methods.card_ending_in' last_four=last_4}}</span>
diff --git a/templates/components/cart/content.html b/templates/components/cart/content.html
index 79f3423d54..119b21c432 100644
--- a/templates/components/cart/content.html
+++ b/templates/components/cart/content.html
@@ -12,14 +12,19 @@
             <tr class="cart-item" data-item-row>
                 <td class="cart-item-block cart-item-figure">
                     {{#if type '==' 'GiftCertificate'}}
-                        <img class="cart-item-fixed-image" src="{{cdn ../../theme_settings.default_image_gift_certificate}}" alt="{{lang 'cart.gift_certificate'}}" title="{{lang 'cart.gift_certificate'}}">
+                        <img
+                            class="cart-item-fixed-image"
+                            src="{{cdn ../theme_settings.default_image_gift_certificate}}"
+                            alt="{{lang 'cart.gift_certificate'}}"
+                            title="{{lang 'cart.gift_certificate'}}"
+                        >
                     {{else}}
                         {{> components/common/responsive-img
                             image=image
                             class="cart-item-image"
-                            fallback_size=../../theme_settings.productthumb_size
+                            fallback_size=../theme_settings.productthumb_size
                             lazyload='disabled'
-                            default_image=../../theme_settings.default_image_product
+                            default_image=../theme_settings.default_image_product
                         }}
                     {{/if}}
                 </td>
@@ -38,7 +43,7 @@ <h2 class="cart-item-name"><a href="{{url}}">{{name}}</a></h2>
                                 <dt class="definitionList-key">{{name}}:</dt>
                                 <dd class="definitionList-value">
                                     {{#if is_file}}
-                                        <a href="/viewfile.php?attributeId={{../id}}&cartitem={{../../id}}">{{value}}</a>
+                                        <a href="/viewfile.php?attributeId={{id}}&cartitem={{../id}}">{{value}}</a>
                                     {{else}}
                                         {{{ sanitize value}}}
                                     {{/if}}
diff --git a/templates/components/cart/modals/gift-wrapping-form.html b/templates/components/cart/modals/gift-wrapping-form.html
index 08a20aaca3..11480d7426 100644
--- a/templates/components/cart/modals/gift-wrapping-form.html
+++ b/templates/components/cart/modals/gift-wrapping-form.html
@@ -53,7 +53,7 @@ <h2 class="modal-header-title">{{lang 'cart.gift_wrapping.title'}}</h2>
                             {{lang 'cart.gift_wrapping.item_multiple' index=$index name=product_name}}
                             {{#each gift_wrappings}}
                                 {{#if preview_image}}
-                                    <a id="giftWrapping-image-{{../../$index}}-{{id}}" class="giftWrapping-image-{{../../$index}}" style="display:none" target="_blank" href="{{getImage preview_image}}">
+                                    <a id="giftWrapping-image-{{../$index}}-{{id}}" class="giftWrapping-image-{{../$index}}" style="display:none" target="_blank" href="{{getImage preview_image}}">
                                         {{lang 'cart.gift_wrapping.preview'}}
                                     </a>
                                 {{/if}}
diff --git a/templates/components/common/cart-preview.html b/templates/components/common/cart-preview.html
index f027a3b0dc..e5e5e2b8d5 100644
--- a/templates/components/common/cart-preview.html
+++ b/templates/components/common/cart-preview.html
@@ -5,13 +5,17 @@
                 <li class="previewCartItem">
                     <div class="previewCartItem-image">
                         {{#if type '==' 'GiftCertificate'}}
-                            <img src="{{cdn ../../theme_settings.default_image_gift_certificate}}" alt="GiftCertificate" title="GiftCertificate">
+                            <img
+                                alt="GiftCertificate"
+                                title="GiftCertificate"
+                                src="{{cdn ../theme_settings.default_image_gift_certificate}}"
+                            >
                         {{else}}
                             {{> components/common/responsive-img
                                 image=image
-                                fallback_size=../../theme_settings.productthumb_size
-                                lazyload=../../theme_settings.lazyload_mode
-                                default_image=../../theme_settings.default_image_product
+                                fallback_size=../theme_settings.productthumb_size
+                                lazyload=../theme_settings.lazyload_mode
+                                default_image=../theme_settings.default_image_product
                             }}
                         {{/if}}
                     </div>
diff --git a/templates/components/common/quick-search.html b/templates/components/common/quick-search.html
index d00aef9927..5c5e495243 100644
--- a/templates/components/common/quick-search.html
+++ b/templates/components/common/quick-search.html
@@ -2,11 +2,11 @@
     <form class="form" onsubmit="return false" data-url="{{urls.search}}" data-quick-search-form>
         <fieldset class="form-fieldset">
             <div class="form-field">
-                <label class="is-srOnly" for={{name}}>{{lang "search.quick_search.input_label"}}</label>
+                <label class="is-srOnly" for="{{name}}">{{lang "search.quick_search.input_label"}}</label>
                 <input class="form-input"
                        data-search-quick
-                       name={{name}}
-                       id={{name}}
+                       name="{{name}}"
+                       id="{{name}}"
                        data-error-message="{{lang 'search.error.empty_field'}}"
                        placeholder="{{lang 'search.quick_search.input_placeholder'}}"
                        autocomplete="off"
diff --git a/templates/components/faceted-search/facets/range.html b/templates/components/faceted-search/facets/range.html
index 7d8ea6060a..82770b898f 100644
--- a/templates/components/faceted-search/facets/range.html
+++ b/templates/components/faceted-search/facets/range.html
@@ -8,7 +8,7 @@
             {{/each}}
             <input type="hidden" name="search_query" value="{{search_query}}">
             {{#if this.sort}}
-                <input type="hidden" name="sort" value={{this.sort}}>
+                <input type="hidden" name="sort" value="{{this.sort}}">
             {{/if}}
             <fieldset class="form-fieldset">
                 <div class="form-minMaxRow">