diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 5bccab1cd..ea2701f66 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -56,7 +56,7 @@
 			                        <input type="hidden" name="{$name}" value="{$edit_language_locale}" />
 			                        {/form_field}
 
-						            {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+						            {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
 									
 									{form_field form=$form field='name'}
 						            <div class="form-group {if $error}has-error{/if}">
diff --git a/templates/default/index.html b/templates/default/index.html
index 2c0657dd9..bdf18cec8 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -39,23 +39,23 @@
                         <meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
                         <meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
 
-                        <a href="#URL" itemprop="url" tabindex="-1" class="product-image">
+                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_new" }
                                 <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{#ID}"}
-                                src="{#IMAGE_URL}"
+                            {loop name="image_product_new" type="image" limit="1" product="{$ID}"}
+                                src="{$IMAGE_URL}"
                             {/loop}
-                                alt="Product #{#LOOP_COUNT}" >
+                                alt="Product #{$LOOP_COUNT}" >
                             {/ifloop}
                             {elseloop rel="image_product_new"}
-                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{#LOOP_COUNT}">{/images}
+                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
                             {/elseloop}
                             <span class="mask"></span>
                         </a>
 
-                        <a href="{#URL}" class="product-info">
-                            <h3 class="name"><span itemprop="name">{#TITLE}</span></h3>
-                            <div class="short-description" itemprop="description">{#CHAPO}</div>
+                        <a href="{$URL}" class="product-info">
+                            <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
+                            <div class="short-description" itemprop="description">{$CHAPO}</div>
 
                             <div class="product-price">
                                 <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
@@ -68,7 +68,7 @@
                                             preorder : http://schema.org/PreOrder
                                             online_only : http://schema.org/OnlineOnly
                                     -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{#BEST_TAXED_PRICE}"}
+                                    <span class="regular-price"><span itemprop="price" class="price">{currency attr="symbol"} {format_number number="{$BEST_TAXED_PRICE}"}
 </span></span>
                                 </div>
                             </div>
@@ -97,22 +97,22 @@
                         <meta itemprop="condition" content="new"> <!-- List of condition : new, used, refurbished -->
                         <meta itemprop="identifier" content="mpn:925872"> <!-- List of identifier : asin, isbn, mpn, upc, sku -->
 
-                        <a href="{#URL}" itemprop="url" tabindex="-1" class="product-image">
+                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
                             {ifloop rel="image_product_promo" }
                             <img itemprop="image"
-                                    {loop name="image_product_promo" type="image" limit="1" product="{#ID}"}
-                                        src="{#IMAGE_URL}"
+                                    {loop name="image_product_promo" type="image" limit="1" product="{$ID}"}
+                                        src="{$IMAGE_URL}"
                                     {/loop}
-                                 alt="Product #{#LOOP_COUNT}" >
+                                 alt="Product #{$LOOP_COUNT}" >
                             {/ifloop}
                             {elseloop rel="image_product_promo"}
-                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{#LOOP_COUNT}">{/images}
+                                {images file='assets/img/218x146.png'}<img itemprop="image" src="{$asset_url}" alt="Promotion #{$LOOP_COUNT}">{/images}
                             {/elseloop}
                             <span class="mask"></span>
                         </a>
 
                         <div class="product-info">
-                            <h3 class="name"><a href="{#URL}"><span itemprop="name">{#CHAPO}</span></a></h3>
+                            <h3 class="name"><a href="{$URL}"><span itemprop="name">{$CHAPO}</span></a></h3>
                         </div>
 
                         <div class="product-price">
@@ -126,9 +126,9 @@
                                     preorder : http://schema.org/PreOrder
                                     online_only : http://schema.org/OnlineOnly
                                 -->
-                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{#ID}" limit="1"}
-                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{#TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
-                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{#TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                {loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
+                                    <span class="special-price"><span itemprop="price" class="price-label">{intl l="Special Price:"} </span><span class="price">{format_number number="{$TAXED_PROMO_PRICE}"} {currency attr="symbol"}</span></span>
+                                    <span class="old-price"><span class="price-label">{intl l="Regular Price:"} </span><span class="price">{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}</span></span>
                                 {/loop}
                             </div>
                         </div>
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index e89c7eb81..8cd5d0129 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -80,7 +80,7 @@ URL: http://www.thelia.net
                         </ul>
                     </li>
                     {loop type="category" name="category.navigation" parent="0" limit="3"}
-                        <li><a href="{#URL}">{#TITLE}</a></li>
+                        <li><a href="{$URL}">{$TITLE}</a></li>
                     {/loop}
                 </ul>
                 <ul class="nav navbar-nav navbar-cart navbar-right">
@@ -124,7 +124,7 @@ URL: http://www.thelia.net
                     <a class="current dropdown-toggle" data-toggle="dropdown" href="language.html">{lang attr="title"}</a>
                     <ul class="select dropdown-menu">
                         {loop type="lang" name="lang_available" exclude="{lang attr="id"}"}
-                            <li><a href="?lang={#CODE}">{#TITLE}</a></li>
+                            <li><a href="?lang={$CODE}">{$TITLE}</a></li>
                         {/loop}
                     </ul>
                 </div>
@@ -134,7 +134,7 @@ URL: http://www.thelia.net
                     <a class="current dropdown-toggle" data-toggle="dropdown" href="currency.html">{currency attr="code"}</a>
                     <ul class="select dropdown-menu">
                         {loop type="currency" name="currency_available" exclude="{currency attr="id"}" }
-                            <li><a href="?currency={#ISOCODE}">{#SYMBOL} - {#NAME}</a></li>
+                            <li><a href="?currency={$ISOCODE}">{$SYMBOL} - {$NAME}</a></li>
                         {/loop}
                     </ul>
                 </div>
diff --git a/templates/default/login.html b/templates/default/login.html
index 4fe25f276..c7eb03986 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -18,7 +18,7 @@
             <h1 id="main-label" class="page-header">{intl l="Login"}</h1>
             {form name="thelia.customer.login"}
             <form id="form-login" action="{url path="/customer/login"}" method="post" role="form" {form_enctype form=$form}>
-                {if #form_error}<div class="alert alert-danger">#form_error_message</div>{/if}
+                {if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
                 {form_field form=$form field='success_url'}
                     <input type="hidden" name="{$name}" value="{navigate to="return_to"}" /> {* the url the user is redirected to on login success *}
                 {/form_field}
diff --git a/templates/default_save/address.html b/templates/default_save/address.html
index afae59197..f02dc7689 100644
--- a/templates/default_save/address.html
+++ b/templates/default_save/address.html
@@ -26,7 +26,7 @@
         <label> <span>{intl l="{$label}"} : </span></label>
         <select name="{$name}">
             {loop type="title" name="title1"}
-                <option value="#ID">#LONG</option>
+                <option value="{$ID}">{$LONG}</option>
             {/loop}
 
         </select>
@@ -78,7 +78,7 @@
         <label> <span>{intl l="{$label}"} : </span></label>
         <select name="{$name}">
             {loop type="country" name="country1"}
-            <option value="#ID">#TITLE</option>
+            <option value="{$ID}">{$TITLE}</option>
             {/loop}
 
         </select>
diff --git a/templates/default_save/address_edit.html b/templates/default_save/address_edit.html
index 22e70289a..c6cf1b120 100644
--- a/templates/default_save/address_edit.html
+++ b/templates/default_save/address_edit.html
@@ -27,7 +27,7 @@
             <label> <span>{intl l="{$label}"} : </span></label>
             <select name="{$name}">
                 {loop type="title" name="title1"}
-                    <option value="#ID">#LONG</option>
+                    <option value="{$ID}">{$LONG}</option>
                 {/loop}
 
             </select>
@@ -79,7 +79,7 @@
             <label> <span>{intl l="{$label}"} : </span></label>
             <select name="{$name}">
                 {loop type="country" name="country1"}
-                    <option value="#ID">#TITLE</option>
+                    <option value="{$ID}">{$TITLE}</option>
                 {/loop}
 
             </select>
diff --git a/templates/default_save/address_list.html b/templates/default_save/address_list.html
index 88a483e23..6dc1d5378 100644
--- a/templates/default_save/address_list.html
+++ b/templates/default_save/address_list.html
@@ -4,7 +4,7 @@
 
 <ul>
 {loop type="address" name="customer_list" customer="current"}
-    <li>{#LABEL} - {#FIRSTNAME} {#LASTNAME} - <a href="{url path="/address/edit/{#ID}"}">edit</a></li>
+    <li>{$LABEL} - {$FIRSTNAME} {$LASTNAME} - <a href="{url path="/address/edit/{$ID}"}">edit</a></li>
 {/loop}
 </ul>
 
diff --git a/templates/default_save/cart.html b/templates/default_save/cart.html
index a503e3bd4..38e3e7716 100755
--- a/templates/default_save/cart.html
+++ b/templates/default_save/cart.html
@@ -3,7 +3,7 @@
 <h1>{intl l='cart'}</h1>
 <ul>
 {loop name="cart" type="cart"}
-    <li>Item {$LOOP_COUNT}/{$LOOP_TOTAL} : #ITEM_ID #TITLE - quantity : #QUANTITY</li>
+    <li>Item {$LOOP_COUNT}/{$LOOP_TOTAL} : {$ITEM_ID} {$TITLE} - quantity : {$QUANTITY}</li>
 {/loop}
 </ul>
 
@@ -16,7 +16,7 @@
         and passed back to the form plugin through the ParserContext.
         *}
 
-        {if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+        {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
         {form_hidden_fields form=$form}
 
diff --git a/templates/default_save/category.html b/templates/default_save/category.html
index a888605ff..2e216d0c0 100755
--- a/templates/default_save/category.html
+++ b/templates/default_save/category.html
@@ -12,13 +12,13 @@
 
 {loop name="category0" type="category" parent="0" order="manual"}
 <div style="border: solid 4px blue; padding: 20px; margin: 10px;">
-    <h2>CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
+    <h2>CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
 
     {ifloop rel="prod_ass_cont"}
         <h5>Associated Content</h5>
         <ul>
-            {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"}
-            <li>#TITLE</li>
+            {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"}
+            <li>{$TITLE}</li>
             {/loop}
         </ul>
     {/ifloop}
@@ -26,23 +26,23 @@
         <h5>No associated content</h5>
     {/elseloop}
 
-    {loop name="product" type="product" category="#ID"}
+    {loop name="product" type="product" category="$ID"}
     <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
-        <h3><a href="#URL">PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)</a></h3>
-        <h4>#TITLE</h4>
-        <p>#DESCRIPTION</p>
+        <h3><a href="{$URL}">PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTA}L)</a></h3>
+        <h4>{$TITLE}</h4>
+        <p>{$DESCRIPTION}</p>
 
-        <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+        <p>Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)</p>
 
         {ifloop rel="ft"}
             <h5>Features</h5>
             <ul>
-                {assign var=current_product value=#ID}
-                {loop name="ft" type="feature" order="manual" product="#ID"}
+                {assign var=current_product value=$ID}
+                {loop name="ft" type="feature" order="manual" product="$ID"}
                 <li>
-                    <strong>#TITLE</strong> :
-                    {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-                        #TITLE / #PERSONAL_VALUE
+                    <strong>{$TITLE}</strong> :
+                    {loop name="ft_v" type="feature_value" product="{$current_product}" feature="{$ID}"}
+                        {$TITLE} / {$PERSONAL_VALUE}
                     {/loop}
                 </li>
                 {/loop}
@@ -53,15 +53,15 @@
         {/elseloop}
     </div>
     {/loop}
-    {loop name="catgory1" type="category" parent="#ID"}
+    {loop name="catgory1" type="category" parent="$ID"}
     <div style="border: double 4px lightseagreen; padding: 20px; margin: 10px;">
-        <h3>SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+        <h3>SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
 
         {ifloop rel="prod_ass_cont"}
             <h5>Associated Content</h5>
             <ul>
-                {loop name="prod_ass_cont" type="associated_content" category="#ID" order="associated_content"}
-                <li>#TITLE</li>
+                {loop name="prod_ass_cont" type="associated_content" category="$ID" order="associated_content"}
+                <li>{$TITLE}</li>
                 {/loop}
             </ul>
         {/ifloop}
@@ -69,22 +69,22 @@
             <h5>No associated content</h5>
         {/elseloop}
 
-        {loop name="product" type="product" category="#ID"}
+        {loop name="product" type="product" category="$ID"}
 
             <div style="border: solid 1px green; padding: 20px; margin: 10px;">
-                <h3><a href="#URL">PRODUCT #ID : #REF (#LOOP_COUNT / #LOOP_TOTAL)</a></h3>
-                <h4>#TITLE</h4>
-                <p>#DESCRIPTION</p>
+                <h3><a href="{$URL}">PRODUCT {$ID} : {$REF} ({$LOOP_COUNT} / {$LOOP_TOTAL})</a></h3>
+                <h4>{$TITLE}</h4>
+                <p>{$DESCRIPTION}</p>
 
                 {ifloop rel="ft"}
                 <h5>Features</h5>
                 <ul>
-                    {assign var=current_product value=#ID}
-                    {loop name="ft" type="feature" order="manual" product="#ID"}
+                    {assign var=current_product value=$ID}
+                    {loop name="ft" type="feature" order="manual" product="$ID"}
                     <li>
-                        <strong>#TITLE</strong> :
-                        {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-                        #TITLE / #PERSONAL_VALUE
+                        <strong>{$TITLE}</strong> :
+                        {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"}
+                        {$TITLE} / {$PERSONAL_VALUE}
                         {/loop}
                     </li>
                     {/loop}
@@ -109,10 +109,10 @@
 <ul>
     {loop name="ft" type="feature" order="manual"}
     <li>
-        #TITLE
+        {$TITLE}
         <ul>
-            {loop name="ftav" type="feature_availability" order="manual" feature="#ID"}
-                <li>#TITLE</li>
+            {loop name="ftav" type="feature_availability" order="manual" feature="$ID"}
+                <li>{$TITLE}</li>
             {/loop}
         </ul>
     </li>
@@ -126,10 +126,10 @@
 <ul>
     {loop name="attr" type="attribute" order="manual"}
     <li>
-        #TITLE
+        {$TITLE}
         <ul>
-            {loop name="attrav" type="attribute_availability" order="manual" attribute="#ID"}
-            <li>#TITLE</li>
+            {loop name="attrav" type="attribute_availability" order="manual" attribute="$ID"}
+            <li>{$TITLE}</li>
             {/loop}
         </ul>
     </li>
@@ -143,7 +143,7 @@
 <ul>
     {loop name="cur" type="currency"}
     <li>
-        #NAME (#SYMBOL)
+        {$NAME} ({$SYMBOL})
     </li>
     {/loop}
 </ul>
diff --git a/templates/default_save/connexion.html b/templates/default_save/connexion.html
index b3867782f..3c52d1a53 100755
--- a/templates/default_save/connexion.html
+++ b/templates/default_save/connexion.html
@@ -27,7 +27,7 @@
 	and passed back to the form plugin through the ParserContext.
 	*}
 
-	{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+	{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
 
     {form_hidden_fields form=$form}
@@ -132,28 +132,28 @@
 
     {form_field form=$form field="email"}
         {form_error form=$form field="email"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="email" name="{$name}" value="{$value}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="email_confirm"}
         {form_error form=$form field="email_confirm"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="email" name="{$name}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="password"}
         {form_error form=$form field="password"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="password" name="{$name}" {$attr} ><br />
     {/form_field}
 
     {form_field form=$form field="password_confirm"}
         {form_error form=$form field="password_confirm"}
-            {#message}
+            {$message}
         {/form_error}
         <label><span>{intl l="{$label}"}</span></label><input type="password" name="{$name}" {$attr} ><br />
     {/form_field}
diff --git a/templates/default_save/customer.html b/templates/default_save/customer.html
index 02e7104f9..a4d79ca33 100755
--- a/templates/default_save/customer.html
+++ b/templates/default_save/customer.html
@@ -7,43 +7,43 @@
 <table border="1" cellspacing="0" cellpadding="5">
         <tr>
             <td>ID</td>
-            <td>#ID</td>
+            <td>{$ID}</td>
         </tr>
         <tr>
             <td>Réference</td>
-            <td>#REF</td>
+            <td>{$REF}</td>
         </tr>
         <tr>
             <td>Title</td>
             <td>
-                {loop name="title" type="title" id="#TITLE"}
-                #LONG (#SHORT)
+                {loop name="title" type="title" id="$TITLE"}
+                {$LONG} ({$SHORT})
                 {/loop}
             </td>
         </tr>
         <tr>
             <td>Firstname</td>
-            <td>#FIRSTNAME</td>
+            <td>{$FIRSTNAME}</td>
         </tr>
         <tr>
             <td>Lastname</td>
-            <td>#LASTNAME</td>
+            <td>{$LASTNAME}</td>
         </tr>
         <tr>
             <td>Email</td>
-            <td>#EMAIL</td>
+            <td>{$EMAIL}</td>
         </tr>
         <tr>
             <td>Is reseller</td>
-            <td>#RESELLER</td>
+            <td>{$RESELLER}</td>
         </tr>
         <tr>
             <td>Sponsor</td>
-            <td>#SPONSOR</td>
+            <td>{$SPONSOR}</td>
         </tr>
         <tr>
             <td>Discount</td>
-            <td>#DISCOUNT %</td>
+            <td>{$DISCOUNT} %</td>
         </tr>
 </table>
 
@@ -56,20 +56,20 @@
 <table border="1" cellspacing="0" cellpadding="5">
     <tr>
         <td>ID</td>
-        <td>#ID</td>
+        <td>{$ID}</td>
     </tr>
     <tr>
         <td>Name</td>
-        <td>#NAME</td>
+        <td>{$NAME}</td>
     </tr>
     <tr>
         <td>Title</td>
         <td>
             <ul>
-                {assign var=current_title value=#TITLE}
+                {assign var=current_title value=$TITLE}
                 {loop name="title" type="title"}
-                <li {if $current_title==#ID}style="background-color: yellow"{/if}>
-                #LONG (#SHORT)
+                <li {if $current_title==$ID}style="background-color: yellow"{/if}>
+                {$LONG} ({$SHORT})
                 </li>
                 {/loop}
             </ul>
@@ -77,36 +77,36 @@
     </tr>
     <tr>
         <td>Company</td>
-        <td>#COMPANY</td>
+        <td>{$COMPANY}</td>
     </tr>
     <tr>
         <td>Firstname</td>
-        <td>#FIRSTNAME</td>
+        <td>{$FIRSTNAME}</td>
     </tr>
     <tr>
         <td>Lastname</td>
-        <td>#LASTNAME</td>
+        <td>{$LASTNAME}</td>
     </tr>
     <tr>
         <td>Address</td>
-        <td>#ADDRESS1<br/>#ADDRESS2<br/>#ADDRESS3</td>
+        <td>{$ADDRESS1}<br/>{$ADDRESS2}<br/>{$ADDRESS3}</td>
     </tr>
     <tr>
         <td>Zipcode</td>
-        <td>#ZIPCODE</td>
+        <td>{$ZIPCODE}</td>
     </tr>
     <tr>
         <td>City</td>
-        <td>#CITY</td>
+        <td>{$CITY}</td>
     </tr>
     <tr>
         <td>Country</td>
         <td>
             <select>
-                {assign var=current_country value=#COUNTRY}
+                {assign var=current_country value=$COUNTRY}
                 {loop name="country" type="country"}
-                <option {if $current_country==#ID}selected="selected"{/if}>
-                    #TITLE (#ID - #ISOCODE - #ISOALPHA2 - #ISOALPHA3)
+                <option {if $current_country==$ID}selected="selected"{/if}>
+                    {$TITLE} ({$ID} - {$ISOCODE} - {$ISOALPHA2} - {$ISOALPHA3})
                 </option>
                 {/loop}
             </select>
@@ -114,11 +114,11 @@
     </tr>
     <tr>
         <td>Phone</td>
-        <td>#PHONE</td>
+        <td>{$PHONE}</td>
     </tr>
     <tr>
         <td>Cellphone</td>
-        <td>#CELLPHONE</td>
+        <td>{$CELLPHONE}</td>
     </tr>
 </table>
 
diff --git a/templates/default_save/delivery_list.html b/templates/default_save/delivery_list.html
index 2ea3cc166..a652af31b 100644
--- a/templates/default_save/delivery_list.html
+++ b/templates/default_save/delivery_list.html
@@ -4,9 +4,9 @@
 {loop type="delivery" name="delivery.list"}
     <li>
         <ul>
-            <li>id : {#ID}</li>
-            <li>prix : {#PRICE}</li>
-            <li>Choisir : <a href="{url path="/delivery/choose/{#ID}"}">Choisir</a></li>
+            <li>id : {$ID}</li>
+            <li>prix : {$PRICE}</li>
+            <li>Choisir : <a href="{url path="/delivery/choose/{$ID}"}">Choisir</a></li>
         </ul>
     </li>
 {/loop}
diff --git a/templates/default_save/folder.html b/templates/default_save/folder.html
index 7d12036f9..7d6abb147 100755
--- a/templates/default_save/folder.html
+++ b/templates/default_save/folder.html
@@ -1,13 +1,13 @@
 {loop name="folder0" type="folder" parent="0" order="alpha_reverse"}
     <div style="border: solid 4px blue; padding: 20px; margin: 10px;">
-    <h2>FOLDER : #TITLE</h2>
-    {loop name="folder1" type="folder" parent="#ID"}
+    <h2>FOLDER : {$TITLE}</h2>
+    {loop name="folder1" type="folder" parent="$ID"}
         <div style="border: double 4px lightseagreen; padding: 20px; margin: 10px;">
-        <h3>SUBFOLDER : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
-        {loop name="content" type="content" folder="#ID"}
+        <h3>SUBFOLDER : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
+        {loop name="content" type="content" folder="$ID"}
             <div style="border: solid 1px green; padding: 20px; margin: 10px;">
-                <h3>CONTENT : #TITLE</h3>
-                <p>#DESCRIPTION</p>
+                <h3>CONTENT : {$TITLE}</h3>
+                <p>{$DESCRIPTION}</p>
             </div>
         {/loop}
         </div>
diff --git a/templates/default_save/images.html b/templates/default_save/images.html
index c72beaecd..cd6834f9f 100755
--- a/templates/default_save/images.html
+++ b/templates/default_save/images.html
@@ -5,22 +5,22 @@
     <h2>Category Images</h2>
     <ul>
     {loop type="category" name="jsvdfk"}
-        <li><p>Category id #ID: #TITLE</p>
+        <li><p>Category id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" category="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" category="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
 
-            {loop type="image" name="image_test" category="#ID"}
-                  <p>Full size file URL: #IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" category="$ID"}
+                  <p>Full size file URL: {$IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
 
-            {loop type="image" name="image_test" source="category" source_id="#ID"}
-                  <p>source="category" source_id="x" argument style: Processed file URL: #IMAGE_URL</p>
+            {loop type="image" name="image_test" source="category" source_id="$ID"}
+                  <p>source="category" source_id="x" argument style: Processed file URL: {$IMAGE_URL}</p>
             {/loop}
             </li>
          </ul>
@@ -34,27 +34,27 @@
     <h2>Product Images</h2>
 	<ul>
 	{loop type="product" name="jsvdfk"}
-        <li><p>Product id #ID: #TITLE</p>
+        <li><p>Product id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"}
-		          <p>Processed file URL: #IMAGE_URL</p>
-		          <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
+            {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" effects="gamma:0.7" background_color="#cc8000"}
+		          <p>Processed file URL: {$IMAGE_URL}</p>
+		          <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
 		          <p>Images:</p>
 
-		          <img src="#IMAGE_URL" />
+		          <img src="{$IMAGE_URL}" />
 		    {/loop}
-		    {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="crop"}
-		    <img src="#IMAGE_URL" />
+		    {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="crop"}
+		    <img src="{$IMAGE_URL}" />
 		    {/loop}
-            {loop type="image" name="image_test" product="#ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="100" height="200" resize_mode="borders" background_color="#cc8000"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
-            {loop type="image" name="image_test" product="#ID" width="100" rotation="-20" background_color="#facabe"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="100" rotation="-20" background_color="#facabe"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
-            {loop type="image" name="image_test" product="#ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"}
-            <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" product="$ID" width="200" height="100" resize_mode="borders" background_color="#facabe" effects="negative"}
+            <img src="{$IMAGE_URL}" />
             {/loop}
 		    </p>
             </li>
@@ -67,13 +67,13 @@
     <h2>Folder Images</h2>
     <ul>
     {loop type="folder" name="jsvdfk"}
-        <li><p>Folder id #ID: #TITLE</p>
+        <li><p>Folder id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" folder="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" folder="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
             </li>
          </ul>
@@ -86,13 +86,13 @@
     <h2>Content Images</h2>
     <ul>
     {loop type="content" name="jsvdfk"}
-        <li><p>Content id #ID: #TITLE</p>
+        <li><p>Content id {$ID}: {$TITLE}</p>
         <ul>
             <li>
-            {loop type="image" name="image_test" content="#ID" width="200" height="100" resize_mode="borders"}
-                  <p>Processed file URL: #IMAGE_URL</p>
-                  <p>Original file URL: #ORIGINAL_IMAGE_URL</p>
-                  <img src="#IMAGE_URL" />
+            {loop type="image" name="image_test" content="$ID" width="200" height="100" resize_mode="borders"}
+                  <p>Processed file URL: {$IMAGE_URL}</p>
+                  <p>Original file URL: {$ORIGINAL_IMAGE_URL}</p>
+                  <img src="{$IMAGE_URL}" />
             {/loop}
             </li>
          </ul>
diff --git a/templates/default_save/included.html b/templates/default_save/included.html
index 93581ff7f..0d0df5c14 100755
--- a/templates/default_save/included.html
+++ b/templates/default_save/included.html
@@ -1,12 +1,12 @@
 {loop name="included0" type="category" parent="0"}
-    <h2>Out before - CATEGORY : #TITLE (#LOOP_COUNT / #LOOP_TOTAL)</h2>
-    {loop name="category1" type="category" parent="#ID"}
-        <h3>Inner - SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+    <h2>Out before - CATEGORY : {$TITLE} ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
+    {loop name="category1" type="category" parent="$ID"}
+        <h3>Inner - SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
     {/loop}
 
-    {loop name="category2" type="category" parent="#ID"}
-        <h3>Inner 2 - SUBCATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h3>
+    {loop name="category2" type="category" parent="$ID"}
+        <h3>Inner 2 - SUBCATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h3>
     {/loop}
-    <h2>Out after  - CATEGORY : #TITLE  (#LOOP_COUNT / #LOOP_TOTAL)</h2>
+    <h2>Out after  - CATEGORY : {$TITLE}  ({$LOOP_COUNT} / {$LOOP_TOTAL})</h2>
     <hr />
 {/loop}
\ No newline at end of file
diff --git a/templates/default_save/login.html b/templates/default_save/login.html
index 702f0a710..61232e481 100755
--- a/templates/default_save/login.html
+++ b/templates/default_save/login.html
@@ -25,12 +25,12 @@
 	and passed back to the form plugin through the ParserContext.
 	*}
 
-	{if #form_error}<div class="alert alert-error">#form_error_message</div>{/if}
+	{if $0form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
 
     {form_hidden_fields form=$form}
 
     {form_field form=$form field="email"}
-        {if #error}{#message}{/if}
+        {if $error}{$message}{/if}
         <label>{intl l="Your e-mail address"}: </label><input type="email" name="{$name}" {$attr} value="{$value}"><br />
     {/form_field}
 
diff --git a/templates/default_save/pagination.html b/templates/default_save/pagination.html
index cb06db66b..8f60b6b37 100755
--- a/templates/default_save/pagination.html
+++ b/templates/default_save/pagination.html
@@ -7,7 +7,7 @@
 <div style="border: solid 1px; padding: 20px;">
 
 {loop name="cat" type="category" page="{$category_current_page}" limit="2"}
-    <h2>#LOOP_COUNT - #TITLE</h2>
+    <h2>{$LOOP_COUNT} - {$TITLE}</h2>
         <h3>Products :</h3>
 
         <div style="border: solid 1px; padding: 20px;">
@@ -17,23 +17,23 @@
         {assign var=product_current_page value={$smarty.get.$this_product_getter|default:1}}
 
         <ul>
-        {loop name="prod" type="product" category="#ID" page="{$product_current_page}" limit="2"}
+        {loop name="prod" type="product" category="$ID" page="{$product_current_page}" limit="2"}
             <li>
-                #ID:#REF
+                {$ID}:{$REF}
             </li>
         {/loop}
         </ul>
 
         </div>
 
-        <p>#TITLE page choice</p>
+        <p>{$TITLE} page choice</p>
         {pageloop rel="prod"}
-            {if ${PAGE} != {$product_current_page}}
-                <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+            {if $PAGE != $product_current_page}
+                <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
             {else}
-                { #PAGE }
+                {$PAGE}
             {/if}
-            {if {$PAGE} != {$LAST}}
+            {if $PAGE != $LAST}
                 -
             {/if}
         {/pageloop}
@@ -44,12 +44,12 @@
 
 <p>categories page choice</p>
 {pageloop rel="cat"}
-{if ${PAGE} != {$category_current_page}}
-    <a href="index_dev.php?view=pagination&category_page=#PAGE">#PAGE</a>
+{if $PAGE != $category_current_page}
+    <a href="index_dev.php?view=pagination&category_page={$PAGE}">{$PAGE}</a>
 {else}
-    { #PAGE }
+    {$PAGE}
 {/if}
-{if {$PAGE} != {$LAST}}
+{if $PAGE != $LAST}
     -
 {/if}
 {/pageloop}
@@ -62,18 +62,18 @@ Pagination before loop
 {capture name="prod2"}
        {loop name="prod2" type="product" page="{$product_current_page}" limit="2"}
             <li>
-                #ID:#REF
+                {$ID}:{$REF}
             </li>
         {/loop}
 {/capture}
 
 {pageloop rel="prod2"}
     {if ${PAGE} != {$product_current_page}}
-        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
     {else}
-        { #PAGE }
+        {$PAGE}
     {/if}
-    {if {$PAGE} != {$LAST}}
+    {if $PAGE != $LAST}
         -
     {/if}
 {/pageloop}
@@ -82,11 +82,11 @@ Pagination before loop
 
 {pageloop rel="prod2"}
     {if ${PAGE} != {$product_current_page}}
-        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}={$PAGE}">{$PAGE}</a>
     {else}
-        { #PAGE }
+        {$PAGE}
     {/if}
-    {if {$PAGE} != {$LAST}}
+    {if $PAGE != $LAST}
         -
     {/if}
 {/pageloop}
diff --git a/templates/default_save/product.html b/templates/default_save/product.html
index 4280fc88c..f3d6a4cb6 100755
--- a/templates/default_save/product.html
+++ b/templates/default_save/product.html
@@ -9,17 +9,17 @@ Index : {navigate to="index"}<br />
 {loop type="product" name="product" current="true"}
 
 <div style="border: dashed 2px red; padding: 20px; margin: 10px;">
-    <h2>PRODUCT (#ID) : #REF</h2>
-    <h3>#TITLE</h3>
-    <p>#DESCRIPTION</p>
+    <h2>PRODUCT ({$ID}) : {$REF}</h2>
+    <h3>{$TITLE}</h3>
+    <p>{$DESCRIPTION}</p>
 
-    <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+    <p>Starting by {$BEST_PRICE} € HT (TAX : {$BEST_PRICE_TAX} ; {$BEST_TAXED_PRICE} € TTC)</p>
 
     {ifloop rel="acc"}
     <h4>Accessories</h4>
     <ul>
-        {loop name="acc" type="accessory" product="#ID" order="accessory"}
-        <li><a href="#URL">#REF</a></li>
+        {loop name="acc" type="accessory" product="$ID" order="accessory"}
+        <li><a href="{$URL}">{$REF}</a></li>
         {/loop}
     </ul>
     {/ifloop}
@@ -30,8 +30,8 @@ Index : {navigate to="index"}<br />
     {ifloop rel="prod_ass_cont"}
     <h4>Associated Content</h4>
     <ul>
-        {loop name="prod_ass_cont" type="associated_content" product="#ID" order="associated_content"}
-        <li>#TITLE</li>
+        {loop name="prod_ass_cont" type="associated_content" product="$ID" order="associated_content"}
+        <li>{$TITLE}</li>
         {/loop}
     </ul>
     {/ifloop}
@@ -42,12 +42,12 @@ Index : {navigate to="index"}<br />
     {ifloop rel="ft"}
     <h4>Features</h4>
     <ul>
-        {assign var=current_product value=#ID}
-        {loop name="ft" type="feature" order="manual" product="#ID"}
+        {assign var=current_product value=$ID}
+        {loop name="ft" type="feature" order="manual" product="$ID"}
         <li>
-            <strong>#TITLE</strong> :
-            {loop name="ft_v" type="feature_value" product="{$current_product}" feature="#ID"}
-            #TITLE / #PERSONAL_VALUE
+            <strong>{$TITLE}</strong> :
+            {loop name="ft_v" type="feature_value" product="{$current_product}" feature="$ID"}
+            {$TITLE} / {$PERSONAL_VALUE}
             {/loop}
         </li>
         {/loop}
@@ -59,18 +59,18 @@ Index : {navigate to="index"}<br />
 
     <h4>Product sale elements</h4>
 
-    {assign var=current_product value=#ID}
-    {loop name="pse" type="product_sale_elements" product="#ID"}
+    {assign var=current_product value=$ID}
+    {loop name="pse" type="product_sale_elements" product="$ID"}
     <div style="border: solid 2px darkorange; padding: 5px; margin: 5px;">
-        {loop name="combi" type="attribute_combination" product_sale_elements="#ID"}
-        #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE<br />
+        {loop name="combi" type="attribute_combination" product_sale_elements="$ID"}
+        {$ATTRIBUTE_TITLE} = {$ATTRIBUTE_AVAILABILITY_TITLE}<br />
         {/loop}
-        <br />#WEIGHT g
-        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}</strong>
+        <br />{$WEIGHT} g
+        <br /><strong>{if $IS_PROMO == 1} {$PROMO_PRICE} € HT // TAX : {$PROMO_PRICE_TAX} ; {$TAXED_PROMO_PRICE} € TTC (instead of {$PRICE HT} // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC){else} {$PRICE} € HT // TAX : {$PRICE_TAX} ; {$TAXED_PRICE} € TTC{/if}</strong>
         <br /><br />
         Add
         <select>
-            {for $will=1 to #QUANTITY}
+            {for $will=1 to $QUANTITY}
             <option>{$will}</option>
             {/for}
         </select>
diff --git a/templates/default_save/tester.html b/templates/default_save/tester.html
index b53396d3f..658339d50 100755
--- a/templates/default_save/tester.html
+++ b/templates/default_save/tester.html
@@ -2,8 +2,8 @@
 {loop name="car" type="category"}
     <li>
         <ul>
-    {loop name="product" type="product" category="#ID"}
-        <li>#REF</li>
+    {loop name="product" type="product" category="$ID"}
+        <li>{$REF}</li>
     {/loop}
         </ul>
     </li>