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 @@
{{#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 @@
{{lang 'account.orders.details.ship_to_mu