diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
index 94d5e8d1a..68748024c 100644
--- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -86,7 +86,7 @@
 			</script>
 
 			<div class="col-lg-4">
-				<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}"/>
+				<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'html':'UTF-8'}"/>
 			</div>
 		{/if}
 	{else}
diff --git a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
index e488dfcca..4c2905a64 100644
--- a/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+++ b/admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
@@ -78,9 +78,9 @@
 					<select multiple name="attributes[]" id="attribute_group" style="height: 500px">
 						{foreach $attribute_groups as $k => $attribute_group}
 							{if isset($attribute_js[$attribute_group['id_attribute_group']])}
-								<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
+								<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'html':'UTF-8'}">
 									{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
-										<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
+										<option name="{$k}" id="attr_{$k}" value="{$v|escape:'html':'UTF-8'}" title="{$v|escape:'html':'UTF-8'}">{$v|escape:'html':'UTF-8'}</option>
 									{/foreach}
 								</optgroup>
 							{/if}
@@ -95,7 +95,7 @@
 			<div class="col-lg-8 col-lg-offset-1">
 				<div class="alert alert-info">{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}</div>
 
-				<div class="alert alert-info">{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></div>
+				<div class="alert alert-info">{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'html':'UTF-8'}</b></div>
 
 				<div class="alert alert-info"><strong>{l s='Step 1: On the left side, select the attributes you want to use (Hold down the "Ctrl" key on your keyboard and validate by clicking on "Add")'}</strong></div>
 
@@ -105,7 +105,7 @@
 						<table class="table" style="display: none;">
 							<thead>
 								<tr>
-									<th id="tab_h1" class="fixed-width-md"><span class="title_box">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</span></th>
+									<th id="tab_h1" class="fixed-width-md"><span class="title_box">{$attribute_group['name']|escape:'html':'UTF-8'}</span></th>
 									<th id="tab_h2" colspan="2"><span class="title_box">{l s='Impact on the product price'} ({$currency_sign})</span></th>
 									<th><span class="title_box">{l s='Impact on the product weight'} ({$weight_unit})</span></th>
 								</tr>
@@ -134,7 +134,7 @@
 						</tr>
 						<tr>
 							<td>{l s='Default Reference:'}</td>
-							<td><input type="text" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
+							<td><input type="text" name="reference" value="{$product_reference|escape:'html':'UTF-8'}" /></td>
 						</tr>
 					</tbody>
 				</table>
diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
index 69cee664f..d695a61a8 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
@@ -89,7 +89,7 @@
 				{$tr.$key}
 			{* If type is 'editable', an input is created *}
 			{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'htmlall':'UTF-8'}" class="{$key}" />
+				<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'html':'UTF-8'}" class="{$key}" />
 			{elseif isset($params.callback)}
 				{$tr.$key}
 			{elseif isset($tr.$key) && $key == 'color'}
@@ -99,7 +99,7 @@
 					<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
 				{/if}
 			{elseif isset($tr.$key)}
-				{$tr.$key|escape:'htmlall':'UTF-8'}
+				{$tr.$key|escape:'html':'UTF-8'}
 			{else}
 				--
 			{/if}
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
index 06286080f..d10943c4a 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
@@ -105,7 +105,7 @@
 <div id="apply_discount_to_product_div" class="form-group">
 	<label class="control-label col-lg-3">{l s='Product'}</label>
 	<div class="input-group col-lg-5">
-		<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'htmlall':'UTF-8'}" />
+		<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'html':'UTF-8'}" />
 		<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
 		<span class="input-group-addon"><i class="icon-search"></i></span>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index 799ca96dd..c6589b36a 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -8,7 +8,7 @@
 	<div class="input-group col-lg-9">
 		<span class="input-group-addon"><i class="icon-user"></i></i></span>
 		<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
-		<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" />
+		<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'html':'UTF-8'}" />
 		<span class="input-group-addon"><i class="icon-search"></i></span>
 	</div>
 </div>
diff --git a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
index 9b52eee3d..59253a268 100755
--- a/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
@@ -52,7 +52,7 @@
 					{else}
 					<i class="icon-question"></i> 
 					{/if}
-					<a href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></h2>
+					<a href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></h2>
 				<div class="form-horizontal">
 					<div class="form-group">
 						<label class="col-lg-3 control-label">{l s='Account registration date:'}</label>
@@ -76,12 +76,12 @@
 		<div class="panel">
 			<h3><i class="icon-shopping-cart"></i> {l s='Order information'}</h3>
 			{if $order->id}
-				<h2><a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></h2>
+				<h2><a href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></h2>
 				{l s='Made on:'} {dateFormat date=$order->date_add}
 			{else}
 				<h2>{l s='No order was created from this cart.'}</h2>
 				{if $customer->id}
-					<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
+					<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&id_cart={$cart->id}&addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
 				{/if}
 			{/if}
 		</div>
@@ -105,7 +105,7 @@
 				{if isset($customized_datas[$product.id_product][$product.id_product_attribute][$product.id_address_delivery])}
 					<tr>
 						<td>{$product.image}</td>
-						<td><a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
+						<td><a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}&id_product={$product.id_product}&updateproduct">
 									<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
 								{if $product.reference}{l s='Ref:'} {$product.reference}{/if}
 								{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -150,7 +150,7 @@
 					<tr>
 						<td>{$product.image}</td>
 						<td>
-							<a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
+							<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}&id_product={$product.id_product}&updateproduct">
 							<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
 							{if $product.reference}{l s='Ref:'} {$product.reference}{/if}
 							{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -200,7 +200,7 @@
 		</tr>
 		{foreach from=$discounts item='discount'}
 			<tr>
-				<td><a href="{$link->getAdminLink('AdminDiscounts')|escape:'htmlall':'UTF-8'}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td>
+				<td><a href="{$link->getAdminLink('AdminDiscounts')|escape:'html':'UTF-8'}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td>
 				<td align="center">- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}</td>
 			</tr>
 		{/foreach}
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
index d5226f96a..ad3092b9b 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
@@ -86,10 +86,10 @@
 				{if $key != 'deleteMode'}
 					{if is_array($value)}
 						{foreach $value as $val}
-							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$key|escape:'html':'UTF-8'}[]" value="{$val|escape:'html':'UTF-8'}" />
 						{/foreach}
 					{else}
-						<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
+						<input type="hidden" name="{$key|escape:'html':'UTF-8'}" value="{$value|escape:'html':'UTF-8'}" />
 					{/if}
 				{/if}
 			{/foreach}
diff --git a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
index 26d3a4930..407c44862 100644
--- a/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
+++ b/admin-dev/themes/default/template/controllers/customer_threads/message.tpl
@@ -156,7 +156,7 @@
 			</dl>
 			<dl class="dl-horizontal">
 				<dt>{l s='Message:'}</dt>
-				<dd>{$message.message|escape:'htmlall':'UTF-8'|nl2br}</dd>
+				<dd>{$message.message|escape:'html':'UTF-8'|nl2br}</dd>
 			</dl>
 		</div>
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
index fd2f8ecde..38b9eecff 100644
--- a/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
@@ -35,7 +35,7 @@
 {/block}
 {block name=leadin}
 	{if isset($delete_customer) && $delete_customer}
-		<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
+		<form action="{$REQUEST_URI|escape:'html':'UTF-8'}" method="post">
 			<div class="alert alert-warning">
 				<h2>{l s='How do you want to delete these customer(s)?'}</h2>
 				<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
@@ -52,10 +52,10 @@
 				{foreach $POST as $key => $value}
 					{if is_array($value)}
 						{foreach $value as $val}
-							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$key|escape:'html':'UTF-8'}[]" value="{$val|escape:'html':'UTF-8'}" />
 						{/foreach}
 					{else}
-						<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
+						<input type="hidden" name="{$key|escape:'html':'UTF-8'}" value="{$value|escape:'html':'UTF-8'}" />
 					{/if}
 				{/foreach}
 				<br /><input type="submit" class="button" value="{l s='Delete'}" />
diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index ffe85bf5c..90ab4b49f 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -26,9 +26,9 @@
 <script>
 	var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
 	var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}';
-	var no_results_translation = '{l s='No result' js='1'}';
+	var no_results_translation = '{l s='No result' js=1}';
 	var dashboard_use_push = '{$dashboard_use_push|intval}';
-	var read_more = '{l s='Read more' js='1'}';
+	var read_more = '{l s='Read more' js=1}';
 </script>
 
 <div id="dashboard">
diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
index 5bbfa2662..df9b7590d 100644
--- a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
@@ -37,19 +37,19 @@
 					{else}
 						{if $fields_value[$input.name] == $option}selected="selected"{/if}
 					{/if}
-				>{$option|escape:'htmlall':'UTF-8'}</option>
+				>{$option|escape:'html':'UTF-8'}</option>
 			{/foreach}
 		</select>
 	{elseif $input.type == 'default_tab'}
 	<select name="{$input.name}" id="{$input.name}">
 		{foreach $input.options AS $option}
 			{if isset($option.children) && $option.children|@count}
-				<optgroup label="{$option.name|escape:'htmlall':'UTF-8'}"></optgroup>
+				<optgroup label="{$option.name|escape:'html':'UTF-8'}"></optgroup>
 				{foreach $option.children AS $children}
-					<option value="{$children.id_tab}" {if $fields_value[$input.name] == $children.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$children.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$children.id_tab}" {if $fields_value[$input.name] == $children.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$children.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 			{else}
-				<option value="{$option.id_tab}" {if $fields_value[$input.name] == $option.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$option.name|escape:'htmlall':'UTF-8'}</option>
+				<option value="{$option.id_tab}" {if $fields_value[$input.name] == $option.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$option.name|escape:'html':'UTF-8'}</option>
 			{/if}
 		{/foreach}
 	</select>
diff --git a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
index 355edbce5..e991ad620 100644
--- a/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
@@ -39,7 +39,7 @@
 					{foreach $field['list'] as $country}
 						<tr>
 							<td><input type="checkbox" name="countries[]" value="{$country[$field['identifier']]}" {if in_array(strtoupper($country['iso_code']), $allowed_countries)}checked="checked"{/if} /></td>
-							<td>{$country['name']|escape:'htmlall':'UTF-8'}</td>
+							<td>{$country['name']|escape:'html':'UTF-8'}</td>
 						</tr>
 					{/foreach}
 				</tbody>
@@ -53,7 +53,7 @@
 {block name="input"}
 	{if $field['type'] == 'textarea_newlines'}
 		<div class="col-lg-9">
-			<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
+			<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'html':'UTF-8'}</textarea>
 		</div>
 	{else}
 		{$smarty.block.parent}
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index 846e132a1..f060b857c 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -89,7 +89,7 @@
 				{if count($files_to_import)}
 					<select name="csv">
 						{foreach $files_to_import AS $filename}
-							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				<div class="clearfix">&nbsp;</div>
@@ -183,14 +183,14 @@
 			<label class="control-label col-lg-3">{l s='Field separator'} </label>
 			<div class="col-lg-6 input-group">
 				<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
-				<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
+				<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'html':'UTF-8'}{else};{/if}" name="separator"/>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="control-label col-lg-3">{l s='Multiple value separator'} </label>
 			<div class="col-lg-6 input-group">
 				<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
-				<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
+				<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'html':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
index 9f25e6e44..50059e620 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/view/view.tpl
@@ -25,7 +25,7 @@
 {extends file="helpers/view/view.tpl"}
 {block name="override_tpl"}
 	<script type="text/javascript">
-		var errorEmpty = '{l s='Please name your matching configuration to save.' js=1}';
+		var errorEmpty = '{l s='Please name your mapping configuration in order to save it.' js=1}';
 		var token = '{$token}';
 		var current = 0;
 		function showTable(nb)
@@ -64,18 +64,12 @@
 	</script>
 	<div id="container-customer" class="panel">
 	<h3><i class="icon-list-alt"></i> {l s='View your data'}</h3>
+	<div class="alert alert-info">
+		<p>{l s='Please map each column of your source CSV file to one of the destination columns.'}</p>
+	</div>
 	<div class="form-horizontal">
-		<div class="form-group">
-			<label class="control-label col-lg-3">{l s='Save and load your configuration for importing files'} : </label>
-			<div class="col-lg-7">
-				<input type="text" name="newImportMatchs" id="newImportMatchs" />		
-			</div>
-			<div class="col-lg-2">
-				<a id="saveImportMatchs" class="btn btn-default" href="#"><i class="icon-save"></i> {l s='Save'}</a>
-			</div>
-		</div>
 		<div class="form-group" {if !$import_matchs}style="display:none"{/if}>
-			<label class="control-label col-lg-3">{l s='Matches'} : </label>
+			<label class="control-label col-lg-3">{l s='Load a mapping configuration'}</label>
 			<div id="selectDivImportMatchs" class="col-lg-7">
 				<select id="valueImportMatchs">
 					{foreach $import_matchs as $match}
@@ -88,9 +82,15 @@
 				<a id="deleteImportMatchs" href="#" class="btn btn-default"><i class="icon-remove"></i> {l s='Delete'}</a>
 			</div>
 		</div>
-	</div>
-	<div class="row">
-		<p>{l s='Please set the value type of each column'}</p>
+		<div class="form-group">
+			<label class="control-label col-lg-3">{l s='Save your mapping configuration'}</label>
+			<div class="col-lg-7">
+				<input type="text" name="newImportMatchs" id="newImportMatchs" />		
+			</div>
+			<div class="col-lg-2">
+				<a id="saveImportMatchs" class="btn btn-default" href="#"><i class="icon-save"></i> {l s='Save'}</a>
+			</div>
+		</div>
 	</div>
 	<div id="error_duplicate_type" class="alert alert-warning" style="display:none;">
 		{l s='Columns cannot have the same value type'}
@@ -117,8 +117,9 @@
 		<input type="hidden" name="multiple_value_separator" value="{$fields_value.multiple_value_separator}" />
 		<div class="form-group">
 			<label class="control-label col-lg-3">{l s='Lines to skip'}</label>
-			<div class="col-lg-9">
+			<div class="col-lg-7">
 				<input type="text" size="2" name="skip" value="1" />
+				<p class="help-block">{l s='This number indicates how many of the first lines of your CSV file should be skipped when importing the data. For instance set it to 1 if the first row of your file contains headers.'}</p>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
index fb7d343c9..29edf7346 100644
--- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
@@ -87,20 +87,20 @@
 			</h3>	
 			{if count($uname)}
 			<p>
-				<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Server information'}:</strong> {$uname|escape:'html':'UTF-8'}
 			</p>
 			{/if}
 			<p>
-				<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Server software version'}:</strong> {$version.server|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
+				<strong>{l s='PHP version'}:</strong> {$version.php|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'html':'UTF-8'}
 			</p>
 			{if $apache_instaweb}
 				<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
@@ -113,13 +113,13 @@
 				{l s='Database information'}
 			</h3>
 			<p>
-				<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
+				<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
+				<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'html':'UTF-8'}
 			</p>
 		</div>
 	</div>
@@ -131,13 +131,13 @@
 				{l s='Store information'}
 			</h3>
 			<p>
-				<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
+				<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'html':'UTF-8'}
 			</p>
 		</div>
 
@@ -154,7 +154,7 @@
 		{else}
 			{l s='You are using your own SMTP parameters.'}</p>
 			<p>
-				<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
+				<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'html':'UTF-8'}
 			</p>
 			<p>
 				<strong>{l s='SMTP user'}:</strong>
@@ -173,10 +173,10 @@
 				{/if}
 			</p>
 			<p>
-				<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'html':'UTF-8'}
 			</p>
 			<p>
-				<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Port'}:</strong> {$smtp.port|escape:'html':'UTF-8'}
 			</p>
 		{/if}
 		</div>
@@ -187,7 +187,7 @@
 				{l s='Your information'}
 			</h3>
 			<p>
-				<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
+				<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'html':'UTF-8'}
 			</p>
 		</div>
 
diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl
index 8bcb2a867..4e895d432 100755
--- a/admin-dev/themes/default/template/controllers/login/content.tpl
+++ b/admin-dev/themes/default/template/controllers/login/content.tpl
@@ -71,7 +71,7 @@
 									type="text"
 									id="email"
 									class="form-control"
-									value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}"
+									value="{if isset($email)}{$email|escape:'html':'UTF-8'}{/if}"
 									autofocus="autofocus"
 									tabindex="1"
 									placeholder="test@example.com" />
@@ -167,7 +167,7 @@
 					{/if}
 				</ul>
 				<p>
-					<a href="{$adminUrl|escape:'htmlall':'UTF-8'}">
+					<a href="{$adminUrl|escape:'html':'UTF-8'}">
 						{l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}
 					</a>
 				</p>
diff --git a/admin-dev/themes/default/template/controllers/login/header.tpl b/admin-dev/themes/default/template/controllers/login/header.tpl
index 25e2205ad..47feb610a 100644
--- a/admin-dev/themes/default/template/controllers/login/header.tpl
+++ b/admin-dev/themes/default/template/controllers/login/header.tpl
@@ -34,7 +34,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="robots" content="NOFOLLOW, NOINDEX">
 	<title>
-		{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)
+		{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)
 	</title>
 	{foreach from=$css_files key=css_uri item=media}
 		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
index 2eea8aedd..d5e5341d0 100644
--- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
@@ -30,7 +30,7 @@
 		<div class="col-lg-9 ">
 			<div class="row">
 				<div class="col-lg-8">
-					<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+					<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'html':'UTF-8'}" />
 				</div>
 				<div class="col-lg-1">
 					{$field['link_remove_ip']}
diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
index b94175a87..e1da258bc 100755
--- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl
@@ -84,7 +84,7 @@
 											{foreach from=$t.sub_tabs item=t2}
 												{if $t2.active}
 													{assign var="id_tab" value=$t.id_tab}
-													<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
+													<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'html':'UTF-8'}{/if}</option>
 												{/if}
 											{/foreach}
 										{/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_documents.tpl b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
index ecf0486ea..c3cf61211 100644
--- a/admin-dev/themes/default/template/controllers/orders/_documents.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_documents.tpl
@@ -69,13 +69,13 @@
 						{if get_class($document) eq 'OrderInvoice'}
 
 							{if isset($document->is_delivery)}
-							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
+							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
 						   	{else}
-							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
+							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
 						   {/if}
 
 						{elseif get_class($document) eq 'OrderSlip'}
-							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
+							<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
 						{/if}
 
 						{if get_class($document) eq 'OrderInvoice'}
@@ -142,11 +142,11 @@
 				{if !isset($document->is_delivery)}
 				<tr id="invoiceNote{$document->id}" style="display:none">
 					<td colspan="5">
-						<form action="{$current_index}&viewOrder&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}" method="post">
+						<form action="{$current_index}&viewOrder&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'html':'UTF-8'}{/if}" method="post">
 							<p>
 								<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
 								<input type="hidden" name="id_order_invoice" value="{$document->id}" />
-								<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
+								<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'html':'UTF-8'}</textarea>
 							</p>
 							<p>
 								<button type="submit" name="submitEditNote" class="btn btn-default"> 
@@ -168,7 +168,7 @@
 				<td colspan="5" class="text-center">
 					<i class="icon-warning-sign"></i> {l s='No documents are available'}
 					{if isset($invoice_management_active) && $invoice_management_active}
-						<a class="btn btn-link" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}">
+						<a class="btn btn-link" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'html':'UTF-8'}{/if}">
 							<i class="icon-repeat"></i>
 							{l s='Generate invoice'}
 						</a>
diff --git a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
index 3860f2533..b3f1fe363 100644
--- a/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
@@ -26,7 +26,7 @@
 {* Generate HTML code for printing Invoice Icon with link *}
 <span>
 {if ($order_state->invoice || $order->invoice_number)}
-	<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
+	<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
 		<i class="icon-file-text"></i>
 	</a>
 {/if}
@@ -35,7 +35,7 @@
 {* Generate HTML code for printing Delivery Icon with link *}
 <span>
 {if ($order_state->delivery || $order->delivery_number)}
-	<a class="btn btn-default"  target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
+	<a class="btn btn-default"  target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
 		<i class="icon-truck"></i>
 	</a>
 {/if}
diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
index 345abb808..2b1f8e9f3 100755
--- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -64,7 +64,7 @@
 		</span>
 		{/if}
 	</td>
-	{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
+	{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'html':'UTF-8'}</td>{/if}
 	{if ($order->hasBeenPaid())}
 		<td class="productQuantity">
 			{$product['product_quantity_refunded']}
diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
index 442cc499f..00cae2116 100644
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -62,7 +62,7 @@
 			<td class="right">
 				<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
 				{if $line.can_edit}
-					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
+					<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id|escape:'html':'UTF-8'}">
 						<span class="shipping_number_edit" style="display:none;">
 							<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
 							<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index f3af6c574..b7f3f1759 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -1075,7 +1075,7 @@
 					</div>
 					<div class="col-lg-6">
 						<span class="form-control-static">{l s='Or'}&nbsp;</span>
-						<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
+						<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
 							<i class="icon-plus-sign-alt"></i>
 							{l s='Add new customer'}
 						</a>
@@ -1144,7 +1144,7 @@
 	</div>
 
 
-<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
+<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
 	<div class="panel" id="products_part" style="display:none;">
 		<h3>
 			<i class="icon-shopping-cart"></i>
@@ -1287,7 +1287,7 @@
 					</div>
 					<div class="col-lg-6">
 						<span class="form-control-static">{l s='Or'}&nbsp;</span>
-						<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
+						<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
 							<i class="icon-plus-sign-alt"></i>
 							{l s='Add new voucher'}
 						</a>
@@ -1347,7 +1347,7 @@
 		</div>
 		<div class="row">
 			<div class="col-lg-12">
-				<a class="fancybox btn btn-default" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'htmlall':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#">
+				<a class="fancybox btn btn-default" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'html':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#">
 					<i class="icon-plus-sign-alt"></i>
 					{l s='Add a new address'}
 				</a>
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index ca7a843dd..5c42be205 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -39,7 +39,7 @@
 	var currency_blank = "{$currency->blank}";
 	var priceDisplayPrecision = 2;
 	var use_taxes = {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}true{else}false{/if};
-	var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}";
+	var token = "{$smarty.get.token|escape:'html':'UTF-8'}";
 	var stock_management = {$stock_management|intval};
 	var txt_add_product_stock_issue = "{l s='Are you sure you want to add this quantity?' js=1}";
 	var txt_add_product_new_invoice = "{l s='Are you sure you want to create a new invoice?' js=1}";
@@ -71,7 +71,7 @@
 			<div class="col-lg-3 box-stats color2" >
 				<i class="icon-comments"></i>
 				<span class="title">{l s='Messages'}<br /><small>&nbsp;</small></span>
-				<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
+				<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'html':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
 			</div>
 			<div class="col-lg-3 box-stats color1" >
 				<i class="icon-ok"></i>
@@ -92,12 +92,12 @@
 		<div class="col-lg-6">
 			<div class="panel">
 				<h3 class="text-center">
-					<a class="btn btn-default pull-left" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}" {if !$previousOrder}disabled{/if}>
+					<a class="btn btn-default pull-left" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$previousOrder}" {if !$previousOrder}disabled{/if}>
 						<i class="icon-chevron-left"></i>
 						{l s='Prev'}
 						</a>
 					{l s='Order'} : <strong>#{$order->id} - {$order->reference}</strong>
-					<a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}" {if !$nextOrder}disabled{/if}>
+					<a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$nextOrder}" {if !$nextOrder}disabled{/if}>
 						{l s='Next'}
 						<i class="icon-chevron-right"></i>
 					</a> 
@@ -106,7 +106,7 @@
 				<div class="well">
 					<div class="row row-margin-bottom">
 						{if (count($invoices_collection))}
-						<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
+						<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
 							<i class="icon-file"></i>
 							{l s='View invoice'}
 						</a>
@@ -118,7 +118,7 @@
 							{l s='No invoice'}
 						{/if}
 						{if (($currentState && $currentState->delivery) || $order->delivery_number)}
-						<a class="btn btn-default"  href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
+						<a class="btn btn-default"  href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
 							<i class="icon-truck"></i>
 							{l s='View delivery slip'}
 						</a>
@@ -325,7 +325,7 @@
 										<td>
 											<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
 											{if $line.can_edit}
-											<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
+											<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'html':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'html':'UTF-8'}{else}0{/if}">
 												<span class="shipping_number_edit" style="display:none;">
 													<button type="button" name="tracking_number">
 														{$line.tracking_number|htmlentities}
@@ -376,7 +376,7 @@
 					<i class="icon-user"></i>
 					{l s='Customer'} :
 					<a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}">
-						{$gender->name|escape:'htmlall':'UTF-8'}
+						{$gender->name|escape:'html':'UTF-8'}
 						{$customer->firstname}
 						{$customer->lastname}
 					</a>
@@ -432,7 +432,7 @@
 						{if !$order->isVirtual()}
 						<!-- Shipping address -->
 							{if $can_edit}
-							<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+							<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}">
 								<div class="form-group">
 									<div class="col-lg-9">
 										<select name="id_address">
@@ -475,7 +475,7 @@
 					<div class="tab-pane" id="addressInvoice">
 						<!-- Invoice address -->						
 						{if $can_edit}
-						<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
+						<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}">
 							<div class="form-group">
 								<div class="col-lg-9">
 									<select name="id_address">
@@ -534,7 +534,7 @@
 								<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
 									<option value="0" selected="selected">-</option>
 									{foreach from=$orderMessages item=orderMessage}
-									<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
+									<option value="{$orderMessage['message']|escape:'html':'UTF-8'}">{$orderMessage['name']}</option>
 									{/foreach}
 								</select>
 							</div>
@@ -566,7 +566,7 @@
 						<div class="form-group">
 							<label class="control-label col-lg-3">{l s='Message'}</label>
 							<div class="col-lg-9">
-								<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
+								<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'html':'UTF-8'}</textarea>
 								<p id="nbchars"></p>
 							</div>
 						</div>
@@ -591,7 +591,7 @@
 							<i class="icon-envelope"></i>
 							{l s='New message'}
 						</button>
-						<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
+						<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'html':'UTF-8'}">
 							<b>{l s='Click here'}</b> {l s='to see all messages.'}
 							<i class="icon-external-link"></i>
 						</a>
@@ -624,14 +624,14 @@
 								<br />{l s='This warning also concerns the next orders:'}
 							{/if}
 						{/if}
-						<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+						<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
 							#{'%06d'|sprintf:$brother_order->id}
 						</a>
 					{/foreach}
 				</p>
 				{/if}
 
-				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
 					<table class="table">
 						<thead>
 							<tr>
@@ -756,7 +756,7 @@
 					</table>
 				</form>
 				{if (!$order->valid && sizeof($currencies) > 1)}
-				<form class="form-horizontal well" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+				<form class="form-horizontal well" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
 					<div class="row">
 						<label class="control-label col-lg-3">{l s='Change currency'}</label>
 						<div class="col-lg-6">
@@ -827,7 +827,7 @@
 						{foreach $order->getBrother() as $brother_order}
 						<tr>
 							<td>
-								<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
+								<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
 							</td>
 							<td>
 								{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
@@ -836,7 +836,7 @@
 								{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
 							</td>
 							<td>
-								<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+								<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
 									<i class="icon-eye-open"></i>
 									{l s='See the order'}
 								</a>
@@ -988,7 +988,7 @@
 									</td>
 									{if $can_edit}
 									<td>
-										<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+										<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
 											<i class="icon-minus-sign"></i>
 											{l s='Delete voucher'}
 										</a>
@@ -1122,11 +1122,11 @@
 				</a>
 			{/if}
 			{l s='At'} <i>{dateFormat date=$message['date_add']}</i> 
-			{l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
+			{l s='from'} <b>{if ($message['elastname']|escape:'html':'UTF-8')}{$message['efirstname']|escape:'html':'UTF-8'} {$message['elastname']|escape:'html':'UTF-8'}{else}{$message['cfirstname']|escape:'html':'UTF-8'} {$message['clastname']|escape:'html':'UTF-8'}{/if}</b>
 			{if ($message['private'] == 1)}
 				<span style="color:red; font-weight:bold;">{l s='Private'}</span>
 			{/if}
-			<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
+			<p>{$message['message']|escape:'html':'UTF-8'|nl2br}</p>
 			</div>
 		{/foreach}
 	</div>
diff --git a/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl
index 988be47c3..b54d33588 100644
--- a/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl
@@ -25,5 +25,5 @@
 
 {* Generate HTML code for printing Invoice Icon with link *}
 <span style="width:20px; margin-right:5px;">
-	<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
+	<a href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
 </span>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index 2b042eb0b..ec975a6b1 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -38,7 +38,7 @@
 			<div id="category_block">
 				{$category_tree}
 			</div>
-			<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
+			<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'html':'UTF-8'}&addcategory">
 				<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
 			</a>
 		</div>
@@ -68,7 +68,7 @@
 		</label>
 		<div class="col-lg-5">
 			<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
-			<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
+			<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'html':'UTF-8'}¤{/foreach}" />
 			<div id="ajax_choose_product">
 				<div class="input-group">
 					<input type="text" value="" id="product_autocomplete_input" />
@@ -82,7 +82,7 @@
 				<button type="button" class="btn btn-default delAccessory" name="{$accessory.id_product}">
 					<i class="icon-remove text-danger"></i>
 				</button>
-				{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
+				{$accessory.name|escape:'html':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
 			</div>
 			{/foreach}
 			</div>
@@ -100,7 +100,7 @@
 			</select>
 		</div>
 		<div class="col-lg-4">
-			<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
+			<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'html':'UTF-8'}&addmanufacturer">
 				<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
 			</a>
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl
index f0e083657..de2d6586d 100644
--- a/admin-dev/themes/default/template/controllers/products/combinations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl
@@ -73,7 +73,7 @@
 				<select name="attribute_group" id="attribute_group" onchange="populate_attrs();">
 				{if isset($attributes_groups)}
 					{foreach from=$attributes_groups key=k item=attribute_group}
-					<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+					<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 					{/foreach}
 				{/if}
 				</select>
@@ -318,7 +318,7 @@
 					<li>
 						<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
 						<label for="id_image_attr_{$image.id_image}">
-							<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
+							<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'html':'UTF-8'}" title="{$image.legend|escape:'html':'UTF-8'}" />
 						</label>
 					</li>
 					{/foreach}
diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index 18a396189..02ff6dd0d 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -61,7 +61,7 @@
 				{else}
 					<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
 					<span>{l s='N/A'} - 
-						<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
+						<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
 					 	class="confirm_leave btn btn-link"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
 					</span>
 				{/if}
@@ -77,7 +77,7 @@
 								name="custom_{$available_feature.id_feature}_{$language.id_lang}"
 								cols="40"
 								rows="1"
-								onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'htmlall':'UTF-8'|default:""}</textarea>
+								onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'html':'UTF-8'|default:""}</textarea>
 					{if $languages|count > 1}
 						</div>
 						<div class="col-lg-3">
@@ -107,7 +107,7 @@
 		</tbody>
 	</table>
 
-	<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
+	<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
 		<i class="icon-plus-sign"></i> {l s='Add a new feature'} <i class="icon-external-link-sign"></i>
 	</a>
 </div>
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index cf90a01c7..a24da7585 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -62,7 +62,7 @@
 					id="legend_{$language.id_lang}"
 					{if isset($input_class)}class="{$input_class}"{/if}
 					name="legend_{$language.id_lang}"
-					value="{$product->name[$language.id_lang]|escape:'htmlall':'UTF-8'}"
+					value="{$product->name[$language.id_lang]|escape:'html':'UTF-8'}"
 					{if !$product->id}disabled="disabled"{/if} />
 			{if $languages|count > 1}
 				</div>
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index 8b7e163e3..223965576 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -173,7 +173,7 @@ $(document).ready(function () {
 					</select>
 				</div>
 				<div class="col-lg-2">
-					<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminTaxRulesGroup')|escape:'htmlall':'UTF-8'}&addtax_rules_group&id_product={$product->id}" {if $tax_exclude_taxe_option}disabled="disabled"{/if}>
+					<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminTaxRulesGroup')|escape:'html':'UTF-8'}&addtax_rules_group&id_product={$product->id}" {if $tax_exclude_taxe_option}disabled="disabled"{/if}>
 						<i class="icon-plus-sign"></i>  {l s='Create new tax'} <i class="icon-external-link-sign"></i>
 					</a>
 				</div>
@@ -186,7 +186,7 @@ $(document).ready(function () {
 		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert">
 				{l s='Taxes are currently disabled'} :
-				<a href="{$link->getAdminLink('AdminTaxes')|escape:'htmlall':'UTF-8'}">{l s='Tax options'}</a>
+				<a href="{$link->getAdminLink('AdminTaxes')|escape:'html':'UTF-8'}">{l s='Tax options'}</a>
 				<input type="hidden" value="{$product->getIdTaxRulesGroup()}" name="id_tax_rules_group" />
 			</div>
 		</div>
@@ -309,7 +309,7 @@ $(document).ready(function () {
 		{/foreach}
 	</script>
 
-	<div id="add_specific_price" class="well" style="display: none;">
+	<div id="add_specific_price" class="well clearfix" style="display: none;">
 		<div class="col-lg-12">
 			<div class="form-group">
 				<label class="control-label col-lg-2" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For'}</label>
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index ffe9496ec..8b2c346b0 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -104,7 +104,7 @@
 			{foreach from=$languages item=language}
 			<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
 				<i class="icon-link"></i> {l s='The product link will look like this:'}<br/>
-				<strong>{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}id_product{/if}-<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$default_language]}</span>.html</strong>
+				<strong>{$curent_shop_url|escape:'html':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}id_product{/if}-<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$default_language]}</span>.html</strong>
 			</div>
 			{/foreach}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/products/specific_prices_shop_update.tpl b/admin-dev/themes/default/template/controllers/products/specific_prices_shop_update.tpl
index 3d06de19a..8149b66e0 100644
--- a/admin-dev/themes/default/template/controllers/products/specific_prices_shop_update.tpl
+++ b/admin-dev/themes/default/template/controllers/products/specific_prices_shop_update.tpl
@@ -23,5 +23,5 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 {foreach from=$option_list item='row'}
-	<option value="{$row[$key_id]|intval}">{$row[$key_value]|escape:'htmlall':'UTF-8'}</option>
+	<option value="{$row[$key_id]|intval}">{$row[$key_value]|escape:'html':'UTF-8'}</option>
 {/foreach}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/suppliers.tpl b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
index 2f7f394a9..289d05687 100644
--- a/admin-dev/themes/default/template/controllers/products/suppliers.tpl
+++ b/admin-dev/themes/default/template/controllers/products/suppliers.tpl
@@ -53,7 +53,7 @@
 		{/foreach}
 		</tbody>
 	</table>
-	<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
+	<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'html':'UTF-8'}&addsupplier">
 		<i class="icon-plus"></i> {l s='Create a new supplier'} <i class="icon-external-link-sign"></i>
 	</a>
 </div>
@@ -103,7 +103,7 @@
 							<tr {if $index is odd}class="alt_row"{/if}>
 								<td>{$product_designation[$attribute['id_product_attribute']]}</td>
 								<td>
-									<input type="text" value="{$reference|escape:'htmlall':'UTF-8'}" name="supplier_reference_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
+									<input type="text" value="{$reference|escape:'html':'UTF-8'}" name="supplier_reference_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
 								</td>
 								<td>
 									<input type="text" value="{$price_te|htmlentities}" name="product_price_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
index fbf0f9414..0ffbb2fc2 100644
--- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
@@ -188,7 +188,7 @@
 							<label for="virtual_product_name" class="t">{l s='Filename'}</label>
 						</td>
 						<td class="col-right">
-							<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'htmlall':'UTF-8'}" />
+							<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'html':'UTF-8'}" />
 							<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
 						</td>
 					</tr>
diff --git a/admin-dev/themes/default/template/controllers/products/warehouses.tpl b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
index 725279882..7c54c27e9 100644
--- a/admin-dev/themes/default/template/controllers/products/warehouses.tpl
+++ b/admin-dev/themes/default/template/controllers/products/warehouses.tpl
@@ -36,7 +36,7 @@
 		<p>{l s='Please choose the warehouses associated with this product. You must also select a default warehouse. '}</p>
 	</div>	
 	<div class="row">
-		<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'htmlall':'UTF-8'}&addwarehouse">{l s='Create a new warehouse'} <i class="icon-external-link-sign"></i></a>
+		<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'html':'UTF-8'}&addwarehouse">{l s='Create a new warehouse'} <i class="icon-external-link-sign"></i></a>
 	</div>
 	<div class="row">
 		<div class="panel-group" id="warehouse-accordion">
@@ -76,7 +76,7 @@
 										<td>{$product_designation[$attribute['id_product_attribute']]}</td>
 										<td><input type="text"
 											name="location_warehouse_{$warehouse['id_warehouse']}_{$attribute['id_product']}_{$attribute['id_product_attribute']}"
-											value="{$location|escape:'htmlall':'UTF-8'}"
+											value="{$location|escape:'html':'UTF-8'}"
 											size="20" />
 										</td>
 									</tr>
diff --git a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
index e113b2fd3..7d3b8c7c2 100644
--- a/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
@@ -77,8 +77,8 @@ $(function() {
 			<tbody>
 			{foreach $modules key=key item=module}
 				<tr>
-					<td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}"><strong>{$module->displayName}</strong></a></td>
-					<td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->description}</a></td>
+					<td><a href="{$module->linkto|escape:'html':'UTF-8'}"><strong>{$module->displayName}</strong></a></td>
+					<td><a href="{$module->linkto|escape:'html':'UTF-8'}">{$module->description}</a></td>
 				</tr>
 			{/foreach}
 		</tbody>
@@ -157,8 +157,8 @@ $(function() {
 			<tbody>
 			{foreach $addons key=key item=addon}
 				<tr>
-					<td><a href="{$addon.href|escape:'htmlall':'UTF-8'}" target="_blank"><strong><i class="icon-external-link-sign"></i> {$addon.title|escape:'htmlall':'UTF-8'}</strong></a></td>
-					<td><a href="{$addon.href|escape:'htmlall':'UTF-8'}" target="_blank">{$addon.description|truncate:256:'...'|escape:'htmlall':'UTF-8'}</a></td>
+					<td><a href="{$addon.href|escape:'html':'UTF-8'}" target="_blank"><strong><i class="icon-external-link-sign"></i> {$addon.title|escape:'html':'UTF-8'}</strong></a></td>
+					<td><a href="{$addon.href|escape:'html':'UTF-8'}" target="_blank">{$addon.description|truncate:256:'...'|escape:'html':'UTF-8'}</a></td>
 				</tr>
 			{/foreach}
 		</tbody>
diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
index 36b3908a0..e09121995 100644
--- a/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
@@ -30,7 +30,7 @@
 		{if isset($tr.$key)}
 			<a href="{$tr.$key}" onmouseover="$(this).css('text-decoration', 'underline')" onmouseout="$(this).css('text-decoration', 'none')" target="_blank">{$tr.$key}</a>
 		{else}
-			<a href="{$link->getAdminLink('AdminShopUrl')|escape:'htmlall':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set a URL for this shop.'}</a>
+			<a href="{$link->getAdminLink('AdminShopUrl')|escape:'html':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set a URL for this shop.'}</a>
 		{/if}
 	{else}
 		{$smarty.block.parent}
diff --git a/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl b/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl
index 90efe9e88..cd98a8794 100755
--- a/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl
+++ b/admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl
@@ -25,7 +25,7 @@
 
 {* Generate HTML code for printing OrderSlip Icon with link *}
 
-<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$order_slip->id}">
+<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$order_slip->id}">
 	<i class="icon-file-text"></i>
 	{l s='Download credit slip'}
 </a>
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
index 36f21d8be..95ce6f204 100644
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
@@ -53,7 +53,7 @@
 								{else}
 									{if isset($fields_value[$input.name][$language.id_lang]) && ($fields_value[$input.name][$language.id_lang] == $option[$input.options.id])}selected="selected"{/if}
 								{/if}
-							>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
+							>{$option[$input.options.name]|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>					
 				</div>
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
index fa2a824c4..aef916a95 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
@@ -41,7 +41,7 @@
 				{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
 				name="latitude"
 				id="latitude"
-				value="{$fields_value[$input.name]|escape:'htmlall'}" />
+				value="{$fields_value[$input.name]|escape:'html'}" />
 		</div>
 		<div class="col-lg-1">
 			<div class="form-control-static text-center"> / </div>
@@ -52,7 +52,7 @@
 				{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
 				name="longitude"
 				id="longitude"
-				value="{$fields_value['longitude']|escape:'htmlall'}" />
+				value="{$fields_value['longitude']|escape:'html'}" />
 		</div>
 	</div>
 	{else}
@@ -69,7 +69,7 @@
 			{foreach $fields_value.days as $k => $value}
 			<div class="form-group">
 				<label class="control-label col-lg-3">{$value}</label>
-				<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /></div>
+				<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'html'}{/if}" /></div>
 			</div>
 			{/foreach}
 	{/if}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
index 369408d77..69e2a4864 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
@@ -65,7 +65,7 @@ $(document).ready(function() {
 {if isset($supply_order_state) && $supply_order_state->editable == false && isset($supply_order)}
 <div class="panel">
 	<h3><i class="icon-download-alt"></i> {l s='Print the supply order form'}</h3>
-	<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" onclick="return !window.open(this.href);" title="Export as PDF" class="btn btn-default"><i class="icon-download-alt"></i> {l s='Click here to download the supply order form.'}.</a>
+	<a href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" onclick="return !window.open(this.href);" title="Export as PDF" class="btn btn-default"><i class="icon-download-alt"></i> {l s='Click here to download the supply order form.'}.</a>
 </div>
 {/if}
 
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
index 22dfa8434..9b0396754 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
@@ -101,10 +101,10 @@
 						{if $tr.$key == '0 - 0'}
 							--
 						{else}
-							{$tr.$key|escape:'htmlall':'UTF-8'}
+							{$tr.$key|escape:'html':'UTF-8'}
 						{/if}
 					{else}
-						{$tr.$key|escape:'htmlall':'UTF-8'}
+						{$tr.$key|escape:'html':'UTF-8'}
 					{/if}
 				{else}
 					--
diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
index cdb7fce5c..85c9b6cdd 100644
--- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
@@ -70,7 +70,7 @@
 							{/if}
 						</th>
 					{/if}
-					{if $has_actions}
+					{if $has_actions && $filters_has_value}
 						<th class="actions text-right"><button type="submit" name="submitReset{$list_id}" class="btn btn-warning">
 								<i class="icon-eraser"></i> {l s='Reset'}
 							</button>
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 99c7603f6..20ed49a6f 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -33,7 +33,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="robots" content="NOFOLLOW, NOINDEX">
-	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
+	<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
 	{if $display_header}
 	<script type="text/javascript">
 
@@ -113,7 +113,7 @@
 				<i class="icon-reorder"></i>
 			</button>
 
-			<a id="header_shopname" href="{$default_tab_link|escape:'htmlall':'UTF-8'}">
+			<a id="header_shopname" href="{$default_tab_link|escape:'html':'UTF-8'}">
 				<img src="{$img_dir}prestashop-avatar.png" height="15" width="15" />
 				{$shop_name}
 			</a>
@@ -298,7 +298,7 @@
 					<a href="#" id="quick_select" class="dropdown-toggle" data-toggle="dropdown">{l s='Quick Access'} <b class="caret"></b></a>
 					<ul class="dropdown-menu">
 					{foreach $quick_access as $quick}
-						<li><a href="{$quick.link|escape:'htmlall':'UTF-8'}" {if $quick.new_window} target="_blank"{/if}><i class="icon-chevron-right"></i> {$quick.name}</a></li>
+						<li><a href="{$quick.link|escape:'html':'UTF-8'}" {if $quick.new_window} target="_blank"{/if}><i class="icon-chevron-right"></i> {$quick.name}</a></li>
 					{/foreach}
 					</ul>
 				</li>
@@ -322,7 +322,7 @@
 					<ul id="employee_links" class="dropdown-menu">
 						<li><span class="employee_avatar">{$employee_avatar}</span></li>
 						<li class="divider"></li>
-						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
+						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'html':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
 						<li class="divider"></li>
 						<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='Log out'}</a></li>
 					</ul>
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index ee66ef07c..b895372da 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 {if isset($fields.title)}<h3>{$fields.title}</h3>{/if}
 
 {block name="defaultForm"}
-<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{if $table == null}configuration_form{else}{$table}_form{/if}{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
+<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'html':'UTF-8'}{else}{if $table == null}configuration_form{else}{$table}_form{/if}{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
 	{if $form_id}
 		<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
 	{/if}
@@ -35,7 +35,7 @@
 			{foreach $fieldset.form as $key => $field}
 				{if $key == 'legend'}
 					<h3>
-						{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'htmlall':'UTF-8'}" />{/if}
+						{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'html':'UTF-8'}" />{/if}
 						{if isset($field.icon)}<i class="{$field.icon}"></i>{/if}
 						{$field.title}
 					</h3>
@@ -46,7 +46,7 @@
 						{block name="input_row"}
 						<div class="form-group {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
 						{if $input.type == 'hidden'}
-							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
 						{else}
 							{block name="label"}
 								{if isset($input.label)}
@@ -117,7 +117,7 @@
 													id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
 													name="{$input.name}_{$language.id_lang}"
 													class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
-													value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+													value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
 													onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
 													{if isset($input.size)} size="{$input.size}"{/if}
 													{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -199,7 +199,7 @@
 										<input type="text"
 											name="{$input.name}"
 											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
-											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
 											class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
 											{if isset($input.size)} size="{$input.size}"{/if}
 											{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -247,7 +247,7 @@
 										<input type="text"
 											name="{$input.name}"
 											id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
-											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
+											value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
 											class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
 											{if isset($input.size)} size="{$input.size}"{/if}
 											{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -359,7 +359,7 @@
 									{foreach $input.values as $value}
 										<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
 											<label>
-											<input type="radio"	name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+											<input type="radio"	name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'html':'UTF-8'}"
 												{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 												{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
 												{$value.label}
@@ -414,7 +414,7 @@
 
 										<div class="col-lg-9">
 									{/if}
-											<textarea name="{$input.name}_{$language.id_lang}" class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}" >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
+											<textarea name="{$input.name}_{$language.id_lang}" class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}" >{$fields_value[$input.name][$language.id_lang]|escape:'html':'UTF-8'}</textarea>
 									{if $languages|count > 1}	
 										</div>
 										<div class="col-lg-2">
@@ -435,7 +435,7 @@
 									{/foreach}
 
 									{else}
-										<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" {if isset($input.cols)}cols="{$input.cols}"{/if} {if isset($input.rows)}rows="{$input.rows}"{/if} class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}">{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
+										<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" {if isset($input.cols)}cols="{$input.cols}"{/if} {if isset($input.rows)}rows="{$input.rows}"{/if} class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}">{$fields_value[$input.name]|escape:'html':'UTF-8'}</textarea>
 									{/if}
 
 								{elseif $input.type == 'checkbox'}
@@ -447,7 +447,7 @@
 													name="{$id_checkbox}"
 													id="{$id_checkbox}"
 													class="{if isset($input.class)}{$input.class}{/if}"
-													{if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if}
+													{if isset($value.val)}value="{$value.val|escape:'html':'UTF-8'}"{/if}
 													{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
 												{$value[$input.values.name]}
 											</label>
@@ -516,7 +516,7 @@
 											{if isset($input.class)}class="{$input.class}"
 											{else}class="color mColorPickerInput"{/if}
 											name="{$input.name}"
-											value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+											value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
 										</div>
 									</div>
 								</div>
@@ -530,13 +530,28 @@
 												{if isset($input.class)}class="{$input.class}"
 												{else}class="datepicker"{/if}
 												name="{$input.name}"
-												value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
+												value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
+											<span class="input-group-addon">
+												<i class="icon-calendar-empty"></i>
+											</span>
+										</div>
+									</div>
+								{elseif $input.type == 'datetime'}
+									<div class="row">
+										<div class="input-group col-lg-4">
+											<input
+												id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
+												type="text"
+												data-hex="true"
+												{if isset($input.class)}class="{$input.class}"
+												{else}class="datetimepicker"{/if}
+												name="{$input.name}"
+												value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
 											<span class="input-group-addon">
 												<i class="icon-calendar-empty"></i>
 											</span>
 										</div>
 									</div>
-
 								{elseif $input.type == 'free'}
 									{$fields_value[$input.name]}
 								{/if}
@@ -680,6 +695,25 @@
 					nextText: '',
 					dateFormat: 'yy-mm-dd'
 				});
+
+			if ($(".datetimepicker").length > 0)
+			$('.datetimepicker').datetimepicker({
+				prevText: '',
+				nextText: '',
+				dateFormat: 'yy-mm-dd',
+				// Define a custom regional settings in order to use PrestaShop translation tools
+				currentText: '{l s='Now'}',
+				closeText: '{l s='Done'}',
+				ampm: false,
+				amNames: ['AM', 'A'],
+				pmNames: ['PM', 'P'],
+				timeFormat: 'hh:mm:ss tt',
+				timeSuffix: '',
+				timeOnlyTitle: '{l s='Choose Time'}',
+				timeText: '{l s='Time'}',
+				hourText: '{l s='Hour'}',
+				minuteText: '{l s='Minute'}',
+			});
 			{if isset($use_textarea_autosize)}
 			$(".textarea-autosize").autosize();
 			{/if}
diff --git a/admin-dev/themes/default/template/helpers/help_access/button.tpl b/admin-dev/themes/default/template/helpers/help_access/button.tpl
index d9a7d18d6..821d06d1f 100644
--- a/admin-dev/themes/default/template/helpers/help_access/button.tpl
+++ b/admin-dev/themes/default/template/helpers/help_access/button.tpl
@@ -1,15 +1,15 @@
-<li class="help-context-{$label|escape:'htmlall':'UTF-8'}">
-    <a id="desc-{$label|escape:'htmlall':'UTF-8'}-help"
+<li class="help-context-{$label|escape:'html':'UTF-8'}">
+    <a id="desc-{$label|escape:'html':'UTF-8'}-help"
        class="toolbar_btn"
        href="#"
-       onclick="showHelp('{$help_base_url|escape:'htmlall':'UTF-8'}',
-                         '{$label|escape:'htmlall':'UTF-8'}',
-                         '{$iso_lang|escape:'htmlall':'UTF-8'}',
-                         '{$version|escape:'htmlall':'UTF-8'}',
-                         '{$doc_version|escape:'htmlall':'UTF-8'}',
-                         '{$country|escape:'htmlall':'UTF-8'}');"
-        title="{$tooltip|escape:'htmlall':'UTF-8'}">
-        <span class="{$button_class|escape:'htmlall':'UTF-8'}"></span>
+       onclick="showHelp('{$help_base_url|escape:'html':'UTF-8'}',
+                         '{$label|escape:'html':'UTF-8'}',
+                         '{$iso_lang|escape:'html':'UTF-8'}',
+                         '{$version|escape:'html':'UTF-8'}',
+                         '{$doc_version|escape:'html':'UTF-8'}',
+                         '{$country|escape:'html':'UTF-8'}');"
+        title="{$tooltip|escape:'html':'UTF-8'}">
+        <span class="{$button_class|escape:'html':'UTF-8'}"></span>
         <div>{l s='Help'}</div>
     </a>
 </li>
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 37ebf6462..cb4b3a3de 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -110,15 +110,15 @@
 						{$tr.$key} {l s='%'}
 					{* If type is 'editable', an input is created *}
 					{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
-						<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'htmlall':'UTF-8'}" class="{$key}" />
+						<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'html':'UTF-8'}" class="{$key}" />
 					{elseif isset($params.callback)}
 						{$tr.$key}
 					{elseif $key == 'color'}
 						<div style="background-color: {$tr.$key};" class="attributes-color-container"></div>
 					{elseif isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
-						<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
+						<span title="{$tr.$key|escape:'html':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'html':'UTF-8'}</span>
 					{else}
-						{$tr.$key|escape:'htmlall':'UTF-8'}
+						{$tr.$key|escape:'html':'UTF-8'}
 					{/if}
 				{else}
 					{block name="default_field"}--{/block}
diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 2f1237d15..aef3be406 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -288,7 +288,7 @@
 									</select>
 								{/if}
 							{else}
-								<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
+								<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'html':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
 							{/if}
 						{/if}
 					</th>
diff --git a/admin-dev/themes/default/template/helpers/options/options.tpl b/admin-dev/themes/default/template/helpers/options/options.tpl
index ded4c15bb..f5fead589 100644
--- a/admin-dev/themes/default/template/helpers/options/options.tpl
+++ b/admin-dev/themes/default/template/helpers/options/options.tpl
@@ -179,7 +179,7 @@
 										</div>
 									{elseif $field['type'] == 'text'}
 										<div class="col-lg-9 {if isset($field['suffix'])}input-group{/if}">
-											<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
+											<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'html':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
 											{if isset($field['suffix'])}
 											<span class="input-group-addon">
 												{$field['suffix']|strval}
@@ -197,7 +197,7 @@
 										</div>
 									{elseif $field['type'] == 'textarea'}
 										<div class="col-lg-9">
-											<textarea class="textarea-autosize" name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'htmlall':'UTF-8'}</textarea>
+											<textarea class="textarea-autosize" name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'html':'UTF-8'}</textarea>
 										</div>
 									{elseif $field['type'] == 'file'}
 										<div class="col-lg-9">{$field['file']}</div>
@@ -205,14 +205,14 @@
 										<div class="col-lg-2">
 											<div class="row">
 												<div class="input-group">
-									              <input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+									              <input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'html':'UTF-8'}" />
 									            </div>
 									        </div>
 							            </div>
 									{elseif $field['type'] == 'price'}
 										<div class="input-group col-lg-9">
 											<span class="input-group-addon">{$currency_left_sign}{$currency_right_sign} {l s='(tax excl.)'}</span>
-											<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+											<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'html':'UTF-8'}" />
 										</div>
 									{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
 
@@ -228,7 +228,7 @@
 													{/if}
 															<input type="text"
 																name="{$key}_{$id_lang}"
-																value="{$value|escape:'htmlall':'UTF-8'}"
+																value="{$value|escape:'html':'UTF-8'}"
 																{if isset($input.class)}class="{$input.class}"{/if}
 															/>
 													{if $field['languages']|count > 1}
diff --git a/admin-dev/themes/default/template/nav.tpl b/admin-dev/themes/default/template/nav.tpl
index 644a4c669..cd8ff45c2 100644
--- a/admin-dev/themes/default/template/nav.tpl
+++ b/admin-dev/themes/default/template/nav.tpl
@@ -20,8 +20,8 @@
 					{foreach from=$t.sub_tabs item=t2}
 						{if $t2.active}
 						<li {if $t2.current} class="active"{/if}>
-							<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
-								{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
+							<a href="{$t2.href|escape:'html':'UTF-8'}">
+								{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'html':'UTF-8'}{/if}
 							</a>
 						</li>
 						{/if}
diff --git a/classes/CartRule.php b/classes/CartRule.php
index 0461d53e7..e11bc36c8 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -983,18 +983,17 @@ class CartRuleCore extends ObjectModel
 				OR '.(int)$this->id.' = id_cart_rule_2
 			)
 		)');
+
 		$array['unselected'] = Db::getInstance()->executeS('
 		SELECT cr.*, crl.*, 1 as selected
 		FROM '._DB_PREFIX_.'cart_rule cr
-		LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
+		INNER JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)Context::getContext()->language->id.')
+		LEFT JOIN '._DB_PREFIX_.'cart_rule_combination crc1 ON (cr.id_cart_rule = crc1.id_cart_rule_1 AND crc1.id_cart_rule_2 = '.(int)$this->id.')
+		LEFT JOIN '._DB_PREFIX_.'cart_rule_combination crc2 ON (cr.id_cart_rule = crc2.id_cart_rule_2 AND crc2.id_cart_rule_1 = '.(int)$this->id.')
 		WHERE cr.cart_rule_restriction = 1
 		AND cr.id_cart_rule != '.(int)$this->id.'
-		AND cr.id_cart_rule NOT IN (
-			SELECT IF(id_cart_rule_1 = '.(int)$this->id.', id_cart_rule_2, id_cart_rule_1)
-			FROM '._DB_PREFIX_.'cart_rule_combination
-			WHERE '.(int)$this->id.' = id_cart_rule_1
-			OR '.(int)$this->id.' = id_cart_rule_2
-		)');
+		AND crc1.id_cart_rule_1 IS NULL
+		AND crc2.id_cart_rule_1 IS NULL');
 		return $array;
 	}
 
@@ -1195,14 +1194,14 @@ class CartRuleCore extends ObjectModel
 	 * @param $id_lang
 	 * @return array
 	 */
-	public static function getCartsRuleByCode($name, $id_lang)
+	public static function getCartsRuleByCode($name, $id_lang, $extended = false)
 	{
 		return Db::getInstance()->executeS('
 			SELECT cr.*, crl.*
 			FROM '._DB_PREFIX_.'cart_rule cr
 			LEFT JOIN '._DB_PREFIX_.'cart_rule_lang crl ON (cr.id_cart_rule = crl.id_cart_rule AND crl.id_lang = '.(int)$id_lang.')
-			WHERE code LIKE \'%'.pSQL($name).'%\' OR name LIKE \'%'.pSQL($name).'%\'
-		');
+			WHERE code LIKE \'%'.pSQL($name).'%\''
+			.($extended ? ' OR name LIKE \'%'.pSQL($name).'%\'' : ''));
 	}
 }
 
diff --git a/classes/Media.php b/classes/Media.php
index fc042320d..f3ac52813 100755
--- a/classes/Media.php
+++ b/classes/Media.php
@@ -157,7 +157,7 @@ class MediaCore
 		{
 			$limit  = Media::getBackTrackLimit();
 			$css_content = preg_replace('#/\*.*?\*/#s', '', $css_content, $limit);
-			$css_content = preg_replace_callback('#(url\((?!data:)(?:\'|")?)([^\)\'"]*(?:\'|")?\))#s', array('Tools', 'replaceByAbsoluteURL'), $css_content, $limit); 
+			$css_content = preg_replace_callback('#(url\((?!data:)(?!http://)(?!https://)(?:\'|")?)([^\)\'"]*(?:\'|")?\))#s', array('Tools', 'replaceByAbsoluteURL'), $css_content, $limit); 
 			$css_content = preg_replace('#\s+#', ' ', $css_content, $limit);		
 			$css_content = str_replace(array("\t", "\n", "\r"), '', $css_content);
 			$css_content = str_replace(array('; ', ': '), array(';', ':'), $css_content);
diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 2fbd5e8f3..9a3b8db6f 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1966,12 +1966,18 @@ class AdminControllerCore extends Controller
 		$this->addJquery();
 		$this->addjQueryPlugin(array('cluetip', 'hoverIntent', 'scrollTo', 'alerts', 'chosen'));
 
+		$this->addJqueryUI(array(
+			'ui.slider',
+			'ui.datepicker'
+		));
+
 		$this->addJS(array(
 			_PS_JS_DIR_.'admin.js',
 			_PS_JS_DIR_.'toggle.js',
 			_PS_JS_DIR_.'tools.js',
 			_PS_JS_DIR_.'ajax.js',
 			_PS_JS_DIR_.'toolbar.js',
+			_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js',
 		));
 
 		//loads specific javascripts for the admin theme, bootstrap.js should be moved into /js root directory
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index 6689f023f..1372e1379 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -595,7 +595,7 @@ class AdminCartRulesControllerCore extends AdminController
 	public function displayAjaxSearchCartRuleVouchers()
 	{
 		$found = false;
-		if ($vouchers = CartRule::getCartsRuleByCode(Tools::getValue('q'), (int)$this->context->language->id))
+		if ($vouchers = CartRule::getCartsRuleByCode(Tools::getValue('q'), (int)$this->context->language->id, true))
 			$found = true;
 		echo Tools::jsonEncode(array('found' => $found, 'vouchers' => $vouchers));
 	}
diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php
index f8f64cbc5..f250b0798 100644
--- a/controllers/admin/AdminPPreferencesController.php
+++ b/controllers/admin/AdminPPreferencesController.php
@@ -187,7 +187,7 @@ class AdminPPreferencesControllerCore extends AdminController
 							array('id' => ',', 'name' => ','),
 						),
 						'identifier' => 'id'
-					)
+					),
 					'PS_DISPLAY_DISCOUNT_PRICE' => array(
 						'title' => $this->l('Display discounted price'),
 						'desc' => $this->l('Instead of showing the discount (-5%) it will instead show the new price with the discount applied'),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 8ef5b8806..69aebd564 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1294,8 +1294,6 @@ class AdminProductsControllerCore extends AdminController
 				'ui.core',
 				'ui.widget',
 				'ui.accordion',
-				'ui.slider',
-				'ui.datepicker'
 			));
 
 			$this->addjQueryPlugin(array(
@@ -1321,7 +1319,6 @@ class AdminProductsControllerCore extends AdminController
 				_PS_JS_DIR_.'jquery/plugins/treeview-categories/jquery.treeview-categories.edit.js',
 				_PS_JS_DIR_.'admin-categories-tree.js',
 				_PS_JS_DIR_.'jquery/ui/jquery.ui.progressbar.min.js',
-				_PS_JS_DIR_.'jquery/plugins/timepicker/jquery-ui-timepicker-addon.js',
 				_PS_JS_DIR_.'vendor/spin.js',
 				_PS_JS_DIR_.'vendor/ladda.js'
 			));
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index 7b7bea3c0..c86611f0c 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -199,13 +199,9 @@ class AdminSearchControllerCore extends AdminController
 
 		if (!is_numeric(trim($this->query)) && !Validate::isEmail($this->query))
 		{
-			$vars = http_build_query(array(
-				'version' => _PS_VERSION_,
-				'iso_lang' => Tools::strtolower(Context::getContext()->language->iso_code),
-				'iso_code' => Tools::strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT'))),
-				'search_query' => $this->query
-			));
-			if (($json_content = Tools::file_get_contents('https://api.addons.prestashop.com/search.php?'.$vars)) != false)
+			$iso_lang = Tools::strtolower(Context::getContext()->language->iso_code);
+			$iso_country = Tools::strtolower(Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT')));
+			if (($json_content = Tools::file_get_contents('https://api.addons.prestashop.com/'._PS_VERSION_.'/search/'.urlencode($this->query).'/'.$iso_country.'/'.$iso_lang.'/')) != false)
 				$this->_list['addons'] = Tools::jsonDecode($json_content, true);
 		}
 	}
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index 61a98384e..d1f3feec4 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -237,12 +237,12 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 					)
 				),
 				array(
-					'type' => 'date',
+					'type' => 'datetime',
 					'label' => $this->l('From'),
 					'name' => 'from'
 				),
 				array(
-					'type' => 'date',
+					'type' => 'datetime',
 					'label' => $this->l('To'),
 					'name' => 'to'
 				),
diff --git a/controllers/admin/AdminStatsController.php b/controllers/admin/AdminStatsController.php
index 6c971dcda..f99cd5eb9 100644
--- a/controllers/admin/AdminStatsController.php
+++ b/controllers/admin/AdminStatsController.php
@@ -639,20 +639,20 @@ class AdminStatsControllerCore extends AdminStatsTabController
 				$value = AdminStatsController::getCustomerMainGender();
 				
 				if ($value === false)
-					$value = $this->l('No customers');
+					$value = $this->l('No customers', null, null, false);
 				elseif ($value['type'] == 'male')
-					$value = sprintf($this->l('%d%% Men Customers'), $value['value']);
+					$value = sprintf($this->l('%d%% Men Customers', null, null, false), $value['value']);
 				elseif ($value['type'] == 'female')
-					$value = sprintf($this->l('%d%% Women Customers'), $value['value']);
+					$value = sprintf($this->l('%d%% Women Customers', null, null, false), $value['value']);
 				else
-					$value = sprintf($this->l('%d%% Neutral Customers'), $value['value']);
+					$value = sprintf($this->l('%d%% Neutral Customers', null, null, false), $value['value']);
 				
 				ConfigurationKPI::updateValue('CUSTOMER_MAIN_GENDER', $value);
 				ConfigurationKPI::updateValue('CUSTOMER_MAIN_GENDER_EXPIRE', strtotime('+1 day'));
 				break;
 
 			case 'avg_customer_age':
-				$value = sprintf($this->l('%d years'), AdminStatsController::getAverageCustomerAge(), 1);
+				$value = sprintf($this->l('%d years', null, null, false), AdminStatsController::getAverageCustomerAge(), 1);
 				ConfigurationKPI::updateValue('AVG_CUSTOMER_AGE', $value);
 				ConfigurationKPI::updateValue('AVG_CUSTOMER_AGE_EXPIRE', strtotime('+1 day'));
 				break;
@@ -664,7 +664,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
 				break;
 
 			case 'avg_msg_response_time':
-				$value = sprintf($this->l('%.1f hours'), AdminStatsController::getAverageMessageResponseTime(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day'))));
+				$value = sprintf($this->l('%.1f hours', null, null, false), AdminStatsController::getAverageMessageResponseTime(date('Y-m-d', strtotime('-31 day')), date('Y-m-d', strtotime('-1 day'))));
 				ConfigurationKPI::updateValue('AVG_MSG_RESPONSE_TIME', $value);
 				ConfigurationKPI::updateValue('AVG_MSG_RESPONSE_TIME_EXPIRE', strtotime('+4 hour'));
 				break;
@@ -721,11 +721,11 @@ class AdminStatsControllerCore extends AdminStatsTabController
 
 			case 'main_country':
 				if (!($row = AdminStatsController::getMainCountry(date('Y-m-d', strtotime('-30 day')), date('Y-m-d'))))
-					$value = $this->l('No orders');
+					$value = $this->l('No orders', null, null, false);
 				else
 				{
 					$country = new Country($row['id_country'], $this->context->language->id);
-					$value = sprintf($this->l('%d%% %s'), $row['orders'], $country->name);
+					$value = sprintf($this->l('%d%% %s', null, null, false), $row['orders'], $country->name);
 				}
 
 				ConfigurationKPI::updateValue('MAIN_COUNTRY', array($this->context->language->id => $value));				
@@ -795,7 +795,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
 					
 				case 'top_category':
 					if (!($id_category = AdminStatsController::getBestCategory(date('Y-m-d', strtotime('-1 month')), date('Y-m-d'))))
-						$value = $this->l('No category');
+						$value = $this->l('No category', null, null, false);
 					else
 					{
 						$category = new Category($id_category, $this->context->language->id);
diff --git a/js/jquery/plugins/autocomplete/jquery.autocomplete.js b/js/jquery/plugins/autocomplete/jquery.autocomplete.js
index a8d6d6a3c..b0a40113a 100755
--- a/js/jquery/plugins/autocomplete/jquery.autocomplete.js
+++ b/js/jquery/plugins/autocomplete/jquery.autocomplete.js
@@ -699,7 +699,7 @@ $.Autocompleter.Select = function (options, input, select, config) {
 		show: function() {
 			var offset = $(input).offset();
 			element.css({
-				width: typeof options.width == "string" || options.width > 0 ? options.width : $(input).width(),
+				width: typeof options.width == "string" || options.width > 0 ? options.width : ($(input).width() + parseInt($(input).css('padding-left')) + parseInt($(input).css('padding-right')) + parseInt($(input).css('margin-left')) + parseInt($(input).css('margin-right'))),
 				top: offset.top + input.offsetHeight,
 				left: offset.left
 			}).show();
diff --git a/modules/addsharethis/addsharethis.php b/modules/addsharethis/addsharethis.php
index 2c7ea9f08..67faf1d6e 100644
--- a/modules/addsharethis/addsharethis.php
+++ b/modules/addsharethis/addsharethis.php
@@ -96,7 +96,7 @@ class AddShareThis extends Module
 				</div>
 				<div class="form-group">
 					<div class="col-lg-9 col-lg-push-3">
-						<p class="help-block">'.$this->l('Key in your account statistic http://sharethis.com').'</p>
+						<p class="help-block">'.$this->l('You will find this key in your account settings on http://sharethis.com.').'</p>
 					</div>
 				</div>
 				<div class="form-group">
diff --git a/modules/bankwire/views/templates/hook/infos.tpl b/modules/bankwire/views/templates/hook/infos.tpl
index 401f70b79..d34804bf3 100644
--- a/modules/bankwire/views/templates/hook/infos.tpl
+++ b/modules/bankwire/views/templates/hook/infos.tpl
@@ -25,7 +25,7 @@
 
 <div class="alert alert-info">
 <img src="../modules/bankwire/bankwire.jpg" style="float:left; margin-right:15px;" width="86" height="49">
-<p><strong>{l s="This module allows you to accept secure payments by bank wire."}</strong></p>
-<p>{l s="If the client chooses to pay by bank wire, the order\'s status will change to 'Waiting for Payment.'"}</p>
-<p>{l s="That said, you must manually confirm the order upon receiving the bank wire."}</p>
-</div>
\ No newline at end of file
+<p><strong>{l s="This module allows you to accept secure payments by bank wire." mod='bankwire'}</strong></p>
+<p>{l s="If the client chooses to pay by bank wire, the order\'s status will change to 'Waiting for Payment.'" mod='bankwire'}</p>
+<p>{l s="That said, you must manually confirm the order upon receiving the bank wire." mod='bankwire'}</p>
+</div>
diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl
index 08d1c6818..a58d57773 100644
--- a/modules/blockbestsellers/blockbestsellers-home.tpl
+++ b/modules/blockbestsellers/blockbestsellers-home.tpl
@@ -36,7 +36,7 @@
 			<ul style="height:{$ulHeight}px;">
 			{foreach from=$best_sellers item=product name=myLoop}
 				<li style="border-bottom:0" class="ajax_block_product {if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 1}clear{/if} {if $smarty.foreach.myLoop.iteration > ($smarty.foreach.myLoop.total - ($smarty.foreach.myLoop.total % $nbItemsPerLine))}last_line{/if}">
-					<h5 class="s_title_block"><a href="{$product.link|escape:'html'}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></h5>
+					<h5 class="s_title_block"><a href="{$product.link|escape:'html'}" title="{$product.name|truncate:32:'...'|escape:'html':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'html':'UTF-8'}</a></h5>
 					<div class="product_desc"><a href="{$product.link|escape:'html'}" title="{l s='More' mod='blockbestsellers'}">{$product.description_short|strip_tags|truncate:130:'...'}</a></div>
 					<a href="{$product.link|escape:'html'}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" /></a>
 					<div>
diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl
index 21f1b2176..843f1657c 100644
--- a/modules/blockbestsellers/blockbestsellers.tpl
+++ b/modules/blockbestsellers/blockbestsellers.tpl
@@ -32,13 +32,13 @@
 		<ul class="product_images">
 			{foreach from=$best_sellers item=product name=myLoop}
 			<li class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} clearfix">
-				<a href="{$product.link|escape:'html'}" title="{$product.legend|escape:'htmlall':'UTF-8'}" class="content_img clearfix">
+				<a href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}" class="content_img clearfix">
 					<span class="number">{$smarty.foreach.myLoop.iteration}</span>
-					<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" height="{$smallSize.height}" width="{$smallSize.width}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" />
+					<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" height="{$smallSize.height}" width="{$smallSize.width}" alt="{$product.legend|escape:'html':'UTF-8'}" />
 				
 				</a>
-				<p><a href="{$product.link|escape:'html'}" title="{$product.legend|escape:'htmlall':'UTF-8'}">
-					{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}<br />
+				<p><a href="{$product.link|escape:'html'}" title="{$product.legend|escape:'html':'UTF-8'}">
+					{$product.name|strip_tags:'UTF-8'|escape:'html':'UTF-8'}<br />
 					<span class="price">{$product.price}</span>
 				</a></p>
 			</li>
diff --git a/modules/blockcart/blockcart-json.tpl b/modules/blockcart/blockcart-json.tpl
index eef27b7ae..1ba1b1dc6 100644
--- a/modules/blockcart/blockcart-json.tpl
+++ b/modules/blockcart/blockcart-json.tpl
@@ -34,7 +34,7 @@
 		"quantity":      {$product.cart_quantity|intval},
 		"priceByLine":   "{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total}{else}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total_wt}{/if}",
 		"image":         "{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|addslashes|replace:'\\\'':'\''}",		
-		"name":          "{$product.name|html_entity_decode:2:'UTF-8'|truncate:15:'...':true|escape:'htmlall'}",
+		"name":          "{$product.name|html_entity_decode:2:'UTF-8'|truncate:15:'...':true|escape:'html'}",
 		"price":         "{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total}{else}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total_wt}{/if}",
 		"price_float":   "{$product.total}",
 		"idCombination": {if isset($product.attributes_small)}{$productAttributeId}{else}0{/if},
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index ce6c317a2..b88141a9e 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -123,7 +123,7 @@ var generated_date = {$smarty.now|intval};
 				{if $discount.value_real > 0}
 				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
 					<td class="quantity">1x</td>
-					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
+					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'html':'UTF-8'}</td>
 					<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
 					<td class="delete">
 						{if strlen($discount.code)}
diff --git a/modules/blockcart/crossselling.tpl b/modules/blockcart/crossselling.tpl
index 930899a8f..15b0cb8bf 100644
--- a/modules/blockcart/crossselling.tpl
+++ b/modules/blockcart/crossselling.tpl
@@ -30,7 +30,7 @@
 			{foreach from=$orderProducts item='orderProduct' name=orderProduct}
 			<li>
 				<a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}" class="lnk_img"><img src="{$orderProduct.image}" alt="{$orderProduct.name|htmlspecialchars}" /></a>
-				<p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'htmlall':'UTF-8'}</a></p>
+				<p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'html':'UTF-8'}</a></p>
 				{if $orderProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
 					<span class="price_display">
 						<span class="price">{convertPrice price=$orderProduct.displayed_price}</span>
diff --git a/modules/blockcategories/category-tree-branch.tpl b/modules/blockcategories/category-tree-branch.tpl
index 265bd1876..f0d945c23 100644
--- a/modules/blockcategories/category-tree-branch.tpl
+++ b/modules/blockcategories/category-tree-branch.tpl
@@ -24,8 +24,8 @@
 *}
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
-	<a href="{$node.link|escape:'htmlall':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a>
+	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
+		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/modules/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl
index fe80491a5..48df47b1c 100755
--- a/modules/blockcms/blockcms.tpl
+++ b/modules/blockcms/blockcms.tpl
@@ -54,7 +54,7 @@
 			<li class="item"><a href="{$link->getPageLink($contact_url, true)|escape:'html'}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
 			{foreach from=$cmslinks item=cmslink}
 				{if $cmslink.meta_title != ''}
-					<li class="item"><a href="{$cmslink.link|addslashes|escape:'html'}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+					<li class="item"><a href="{$cmslink.link|addslashes|escape:'html'}" title="{$cmslink.meta_title|escape:'html':'UTF-8'}">{$cmslink.meta_title|escape:'html':'UTF-8'}</a></li>
 				{/if}
 			{/foreach}
 			<li><a href="{$link->getPageLink('sitemap')|escape:'html'}" title="{l s='Sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a></li>
diff --git a/modules/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl
index 026ffcf75..ac4c2e42c 100644
--- a/modules/blockcontact/blockcontact.tpl
+++ b/modules/blockcontact/blockcontact.tpl
@@ -27,7 +27,7 @@
 	<h4 class="title_block">{l s='Contact us' mod='blockcontact'}</h4>
 	<div class="block_content clearfix">
 			<p>{l s='Our support hotline is available 24/7.' mod='blockcontact'}</p>
-			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'htmlall':'UTF-8'}</p>{/if}
-			{if $email != ''}<a href="mailto:{$email|escape:'htmlall':'UTF-8'}">{l s='Contact our expert support team!' mod='blockcontact'}</a>{/if}
+			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'html':'UTF-8'}</p>{/if}
+			{if $email != ''}<a href="mailto:{$email|escape:'html':'UTF-8'}">{l s='Contact our expert support team!' mod='blockcontact'}</a>{/if}
 	</div>
 </div>
diff --git a/modules/blockcontactinfos/blockcontactinfos.tpl b/modules/blockcontactinfos/blockcontactinfos.tpl
index edb310d58..3d44b2d47 100644
--- a/modules/blockcontactinfos/blockcontactinfos.tpl
+++ b/modules/blockcontactinfos/blockcontactinfos.tpl
@@ -28,10 +28,10 @@
 <div id="block_contact_infos">
 	<h4 class="title_block">{l s='Contact us' mod='blockcontactinfos'}</h4>
 	<ul>
-		{if $blockcontactinfos_company != ''}<li><strong>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}</strong></li>{/if}
-		{if $blockcontactinfos_address != ''}<li><pre>{$blockcontactinfos_address|escape:'htmlall':'UTF-8'}</pre></li>{/if}
-		{if $blockcontactinfos_phone != ''}<li>{l s='Tel' mod='blockcontactinfos'} {$blockcontactinfos_phone|escape:'htmlall':'UTF-8'}</li>{/if}
-		{if $blockcontactinfos_email != ''}<li>{l s='Email' mod='blockcontactinfos'} {mailto address=$blockcontactinfos_email|escape:'htmlall':'UTF-8' encode="hex"}</li>{/if}
+		{if $blockcontactinfos_company != ''}<li><strong>{$blockcontactinfos_company|escape:'html':'UTF-8'}</strong></li>{/if}
+		{if $blockcontactinfos_address != ''}<li><pre>{$blockcontactinfos_address|escape:'html':'UTF-8'}</pre></li>{/if}
+		{if $blockcontactinfos_phone != ''}<li>{l s='Tel' mod='blockcontactinfos'} {$blockcontactinfos_phone|escape:'html':'UTF-8'}</li>{/if}
+		{if $blockcontactinfos_email != ''}<li>{l s='Email' mod='blockcontactinfos'} {mailto address=$blockcontactinfos_email|escape:'html':'UTF-8' encode="hex"}</li>{/if}
 	</ul>
 </div>
 <!-- /MODULE Block contact infos -->
diff --git a/modules/blockfacebook/blockfacebook.tpl b/modules/blockfacebook/blockfacebook.tpl
index 4e15962c0..17cb392ea 100644
--- a/modules/blockfacebook/blockfacebook.tpl
+++ b/modules/blockfacebook/blockfacebook.tpl
@@ -2,7 +2,7 @@
 	<div id="facebook_block" class="col-xs-4">
 		<h4 >{l s='Follow us on facebook' mod='blockfacebook'}</h4>
             <div class="facebook-fanbox">
-           		 <iframe src="//www.facebook.com/plugins/likebox.php?href=https%3A%2F%2Fwww.facebook.com%2F{$facebookurl|escape:'htmlall':'UTF-8'}&amp;width=235&amp;height=290&amp;colorscheme=light&amp;show_faces=true&amp;header=false&amp;stream=false&amp;show_border=false" scrolling="no" frameborder="0" style="border:none;  width:100%; height:200px;" allowTransparency="true"></iframe>
+           		 <iframe src="//www.facebook.com/plugins/likebox.php?href=https%3A%2F%2Fwww.facebook.com%2F{$facebookurl|escape:'html':'UTF-8'}&amp;width=235&amp;height=290&amp;colorscheme=light&amp;show_faces=true&amp;header=false&amp;stream=false&amp;show_border=false" scrolling="no" frameborder="0" style="border:none;  width:100%; height:200px;" allowTransparency="true"></iframe>
             </div>
 	</div>
 {/if}
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 8b0fa7bd7..87cc36a68 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -38,7 +38,7 @@ class BlockLayered extends Module
 	{
 		$this->name = 'blocklayered';
 		$this->tab = 'front_office_features';
-		$this->version = '1.8.9';
+		$this->version = '1.9.0';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 		$this->bootstrap = true;
@@ -1347,9 +1347,7 @@ class BlockLayered extends Module
 
 
 		$this->context->controller->addJS(($this->_path).'blocklayered.js');
-		$this->context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
-		$this->context->controller->addJQueryUI('ui.slider');
-		$this->context->controller->addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css"');		
+		$this->context->controller->addJQueryUI('ui.slider');		
 		$this->context->controller->addCSS(($this->_path).'blocklayered-15.css', 'all');
 		$this->context->controller->addJQueryPlugin('scrollTo');
 
diff --git a/modules/blockmanufacturer/blockmanufacturer.tpl b/modules/blockmanufacturer/blockmanufacturer.tpl
index eb5f81e6e..e5ce5e2ed 100644
--- a/modules/blockmanufacturer/blockmanufacturer.tpl
+++ b/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -32,18 +32,18 @@
 	<ul class="bullet">
 	{foreach from=$manufacturers item=manufacturer name=manufacturer_list}
 		{if $smarty.foreach.manufacturer_list.iteration <= $text_list_nb}
-		<li class="{if $smarty.foreach.manufacturer_list.last}last_item{elseif $smarty.foreach.manufacturer_list.first}first_item{else}item{/if}"><a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}" title="{l s='Learn more about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</a></li>
+		<li class="{if $smarty.foreach.manufacturer_list.last}last_item{elseif $smarty.foreach.manufacturer_list.first}first_item{else}item{/if}"><a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}" title="{l s='Learn more about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'html':'UTF-8'}</a></li>
 		{/if}
 	{/foreach}
 	</ul>
 	{/if}
 	{if $form_list}
-		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" method="get">
 			<p>
 				<select id="manufacturer_list" onchange="autoUrl('manufacturer_list', '');">
 					<option value="0">{l s='All manufacturers' mod='blockmanufacturer'}</option>
 				{foreach from=$manufacturers item=manufacturer}
-					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}">{$manufacturer.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</p>
diff --git a/modules/blocksearch/blocksearch-top.tpl b/modules/blocksearch/blocksearch-top.tpl
index 078d2631b..d8bfda862 100644
--- a/modules/blocksearch/blocksearch-top.tpl
+++ b/modules/blocksearch/blocksearch-top.tpl
@@ -29,7 +29,7 @@
 		<input type="hidden" name="controller" value="search" />
 		<input type="hidden" name="orderby" value="position" />
 		<input type="hidden" name="orderway" value="desc" />
-		<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{$search_query|escape:'htmlall':'UTF-8'|stripslashes}" />
+		<input class="search_query" type="search" id="search_query_top" name="search_query" placeholder="{l s='Search' mod='blocksearch'}" value="{$search_query|escape:'html':'UTF-8'|stripslashes}" />
 	</form>
 </div>
 {else}
@@ -41,7 +41,7 @@
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_top" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'|stripslashes}" />
+			<input class="search_query" type="text" id="search_query_top" name="search_query" value="{$search_query|escape:'html':'UTF-8'|stripslashes}" />
 			<input type="submit" name="submit_search" value="{l s='Search' mod='blocksearch'}" class="button" />
 		</p>
 	</form>
diff --git a/modules/blocksearch/blocksearch.tpl b/modules/blocksearch/blocksearch.tpl
index 4d89e8a99..f24a80702 100644
--- a/modules/blocksearch/blocksearch.tpl
+++ b/modules/blocksearch/blocksearch.tpl
@@ -32,7 +32,7 @@
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'|stripslashes}" />
+			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{$search_query|escape:'html':'UTF-8'|stripslashes}" />
 			<input type="submit" id="search_button" class="button_mini" value="{l s='Go!' mod='blocksearch'}" />
 		</p>
 	</form>
diff --git a/modules/blocksupplier/blocksupplier.tpl b/modules/blocksupplier/blocksupplier.tpl
index 5e4f49546..38222ddcb 100644
--- a/modules/blocksupplier/blocksupplier.tpl
+++ b/modules/blocksupplier/blocksupplier.tpl
@@ -33,19 +33,19 @@
 	{foreach from=$suppliers item=supplier name=supplier_list}
 		{if $smarty.foreach.supplier_list.iteration <= $text_list_nb}
 		<li class="{if $smarty.foreach.supplier_list.last}last_item{elseif $smarty.foreach.supplier_list.first}first_item{else}item{/if}">
-			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'htmlall':'UTF-8'}</a>
+			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'html':'UTF-8'}</a>
 		</li>
 		{/if}
 	{/foreach}
 	</ul>
 	{/if}
 	{if $form_list}
-		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" method="get">
 			<p>
 				<select id="supplier_list" onchange="autoUrl('supplier_list', '');">
 					<option value="0">{l s='All suppliers' mod='blocksupplier'}</option>
 				{foreach from=$suppliers item=supplier}
-					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}">{$supplier.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}">{$supplier.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</p>
diff --git a/modules/blocktopmenu/blocktopmenu.tpl b/modules/blocktopmenu/blocktopmenu.tpl
index 2df21e5ca..cf8d86fba 100644
--- a/modules/blocktopmenu/blocktopmenu.tpl
+++ b/modules/blocktopmenu/blocktopmenu.tpl
@@ -11,7 +11,7 @@
 							<input type="hidden" name="controller" value="search" />
 							<input type="hidden" value="position" name="orderby"/>
 							<input type="hidden" value="desc" name="orderway"/>
-							<input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'htmlall':'UTF-8'}{/if}" />
+							<input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'html':'UTF-8'}{/if}" />
 						</p>
 					</form>
 				</li>
diff --git a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl
index 4b3dd7749..7b3a12567 100644
--- a/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl
+++ b/modules/blocktopmenu/views/templates/admin/_configure/helpers/list/list_content.tpl
@@ -27,7 +27,7 @@
 
 {block name="td_content"}
 	{if isset($params.type) && $params.type == 'link'}
-		<a href="{$tr.$key|escape:'htmlall':'UTF-8'}" target="_blank">{$tr.$key|escape:'htmlall':'UTF-8'}</a>
+		<a href="{$tr.$key|escape:'html':'UTF-8'}" target="_blank">{$tr.$key|escape:'html':'UTF-8'}</a>
 	{else}
 		{$smarty.block.parent}
 	{/if}
diff --git a/modules/blockwishlist/blockwishlist-ajax.tpl b/modules/blockwishlist/blockwishlist-ajax.tpl
index 055c05ff3..a3f2d5f3a 100644
--- a/modules/blockwishlist/blockwishlist-ajax.tpl
+++ b/modules/blockwishlist/blockwishlist-ajax.tpl
@@ -28,12 +28,12 @@
 	{foreach from=$products item=product name=i}
 		<dt class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
 			<span class="quantity-formated"><span class="quantity">{$product.quantity|intval}</span>x</span>
-			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'htmlall':'UTF-8'}" style="font-weight:bold;">{$product.name|truncate:13:'...'|escape:'htmlall':'UTF-8'}</a>
+			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'html':'UTF-8'}" style="font-weight:bold;">{$product.name|truncate:13:'...'|escape:'html':'UTF-8'}</a>
 			<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" width="12" height="12" alt="{l s='Delete'}" class="icon" /></a>
 		</dt>
 		{if isset($product.attributes_small)}
 		<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}" style="font-style:italic;margin:0 0 0 10px;">
-			<a href="{$link->getProductLink($product.id_product, $product.link_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+			<a href="{$link->getProductLink($product.id_product, $product.link_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 		</dd>
 		{/if}
 	{/foreach}
diff --git a/modules/blockwishlist/blockwishlist.tpl b/modules/blockwishlist/blockwishlist.tpl
index 46714934c..dd68e8412 100644
--- a/modules/blockwishlist/blockwishlist.tpl
+++ b/modules/blockwishlist/blockwishlist.tpl
@@ -35,12 +35,12 @@
 				<dt class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
 					<span class="quantity-formated"><span class="quantity">{$product.quantity|intval}</span>x</span>
 					<a class="cart_block_product_name"
-					href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</a>
+					href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'html':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}</a>
 					<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0', '{if isset($token)}{$token}{/if}');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" width="12" height="12" alt="{l s='Delete'}" class="icon" /></a>
 				</dt>
 				{if isset($product.attributes_small)}
 				<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
-					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 				</dd>
 				{/if}
 			{/foreach}
@@ -55,7 +55,7 @@
 		{if $wishlists}
 			<select name="wishlists" id="wishlists" onchange="WishlistChangeDefault('wishlist_block_list', $('#wishlists').val());">
 			{foreach from=$wishlists item=wishlist name=i}
-				<option value="{$wishlist.id_wishlist}"{if $id_wishlist eq $wishlist.id_wishlist or ($id_wishlist == false and $smarty.foreach.i.first)} selected="selected"{/if}>{$wishlist.name|truncate:22:'...'|escape:'htmlall':'UTF-8'}</option>
+				<option value="{$wishlist.id_wishlist}"{if $id_wishlist eq $wishlist.id_wishlist or ($id_wishlist == false and $smarty.foreach.i.first)} selected="selected"{/if}>{$wishlist.name|truncate:22:'...'|escape:'html':'UTF-8'}</option>
 			{/foreach}
 			</select>
 		{/if}
diff --git a/modules/blockwishlist/managewishlist.tpl b/modules/blockwishlist/managewishlist.tpl
index bde773922..171cbae10 100644
--- a/modules/blockwishlist/managewishlist.tpl
+++ b/modules/blockwishlist/managewishlist.tpl
@@ -39,7 +39,7 @@
 			</li>
 			{/if}
 		</ul>
-		<p class="wishlisturl">{l s='Permalink' mod='blockwishlist'}: <input type="text" value="{$base_dir_ssl}modules/blockwishlist/view.php?token={$token_wish|escape:'htmlall':'UTF-8'}" style="width:540px;" readonly="readonly" /></p>
+		<p class="wishlisturl">{l s='Permalink' mod='blockwishlist'}: <input type="text" value="{$base_dir_ssl}modules/blockwishlist/view.php?token={$token_wish|escape:'html':'UTF-8'}" style="width:540px;" readonly="readonly" /></p>
 		<p class="submit">
 			<a href="#" id="showSendWishlist" class="button_account exclusive" onclick="WishlistVisibility('wl_send', 'SendWishlist'); return false;" title="{l s='Send this wishlist' mod='blockwishlist'}">{l s='Send this wishlist' mod='blockwishlist'}</a>
 		</p>
@@ -52,14 +52,14 @@
 				<div class="clearfix">
 					<div class="product_image">
 						<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">
-							<img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'medium_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" />
+							<img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'medium_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" />
 						</a>
 					</div>
 					<div class="product_infos">
-						<p id="s_title" class="product_name">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</p>
+						<p id="s_title" class="product_name">{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}</p>
 						<span class="wishlist_product_detail">
 						{if isset($product.attributes_small)}
-							<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+							<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 						{/if}
 							<br />{l s='Quantity' mod='blockwishlist'}:<input type="text" id="quantity_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity|intval}" size="3"  />
 							<br /><br />
@@ -116,11 +116,11 @@
 			{if $bought.quantity > 0}
 				<tr>
 					<td class="first_item">
-						<span style="float:left;"><img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" /></span>			
+						<span style="float:left;"><img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" /></span>			
 						<span style="float:left;">
-							{$product.name|truncate:40:'...'|escape:'htmlall':'UTF-8'}
+							{$product.name|truncate:40:'...'|escape:'html':'UTF-8'}
 						{if isset($product.attributes_small)}
-							<br /><i>{$product.attributes_small|escape:'htmlall':'UTF-8'}</i>
+							<br /><i>{$product.attributes_small|escape:'html':'UTF-8'}</i>
 						{/if}
 						</span>
 					</td>
diff --git a/modules/blockwishlist/view.tpl b/modules/blockwishlist/view.tpl
index cbd37a0fa..24f1b5971 100644
--- a/modules/blockwishlist/view.tpl
+++ b/modules/blockwishlist/view.tpl
@@ -46,14 +46,14 @@
                 <div class="clearfix">
                     <div class="product_image">
                         <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">
-                            <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'medium_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" />
+                            <img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'medium_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" />
                         </a>
                     </div>
                     <div class="product_infos">
-                        <p id="s_title" class="product_name">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</p>
+                        <p id="s_title" class="product_name">{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}</p>
                     <span class="wishlist_product_detail">
                     {if isset($product.attributes_small)}
-                        <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+                        <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
                     {/if}
                         <br />{l s='Quantity' mod='blockwishlist'}:<input type="text" id="quantity_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity|intval}" size="3"  />
                         <br /><br />
@@ -79,7 +79,7 @@
                                 </p>
                             </form>
                         {/if}
-                        <a href="javascript:;" class="exclusive" onclick="WishlistBuyProduct('{$token|escape:'htmlall':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});" title="{l s='Add to cart' mod='homefeatured'}" rel="nofollow">{l s='Add to cart' mod='blockwishlist'}</a>
+                        <a href="javascript:;" class="exclusive" onclick="WishlistBuyProduct('{$token|escape:'html':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});" title="{l s='Add to cart' mod='homefeatured'}" rel="nofollow">{l s='Add to cart' mod='blockwishlist'}</a>
                     {else}
                         <span class="exclusive">{l s='Add to cart' mod='blockwishlist'}</span>
                     {/if}
diff --git a/modules/blockwishlist/views/templates/front/mywishlist.tpl b/modules/blockwishlist/views/templates/front/mywishlist.tpl
index 0d5d716e5..d1ee85356 100644
--- a/modules/blockwishlist/views/templates/front/mywishlist.tpl
+++ b/modules/blockwishlist/views/templates/front/mywishlist.tpl
@@ -36,9 +36,9 @@
 			<fieldset>
 				<h3>{l s='New wishlist' mod='blockwishlist'}</h3>
 				<p class="text">
-					<input type="hidden" name="token" value="{$token|escape:'htmlall':'UTF-8'}" />
+					<input type="hidden" name="token" value="{$token|escape:'html':'UTF-8'}" />
 					<label class="align_right" for="name">{l s='Name' mod='blockwishlist'}</label>
-					<input type="text" id="name" name="name" class="inputTxt" value="{if isset($smarty.post.name) and $errors|@count > 0}{$smarty.post.name|escape:'htmlall':'UTF-8'}{/if}" />
+					<input type="text" id="name" name="name" class="inputTxt" value="{if isset($smarty.post.name) and $errors|@count > 0}{$smarty.post.name|escape:'html':'UTF-8'}{/if}" />
 				</p>
 				<p class="submit">
 					<input type="submit" name="submitWishlist" id="submitWishlist" value="{l s='Save' mod='blockwishlist'}" class="exclusive" />
@@ -62,7 +62,7 @@
 				{section name=i loop=$wishlists}
 					<tr id="wishlist_{$wishlists[i].id_wishlist|intval}">
 						<td style="width:200px;">
-							<a href="javascript:;" onclick="javascript:WishlistManage('block-order-detail', '{$wishlists[i].id_wishlist|intval}');">{$wishlists[i].name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</a>
+							<a href="javascript:;" onclick="javascript:WishlistManage('block-order-detail', '{$wishlists[i].id_wishlist|intval}');">{$wishlists[i].name|truncate:30:'...'|escape:'html':'UTF-8'}</a>
 						</td>
 						<td class="bold align_center">
 							{assign var=n value=0}
diff --git a/modules/carriercompare/template/carriercompare.tpl b/modules/carriercompare/template/carriercompare.tpl
index ceb265ea2..8896bbcbc 100755
--- a/modules/carriercompare/template/carriercompare.tpl
+++ b/modules/carriercompare/template/carriercompare.tpl
@@ -49,7 +49,7 @@ PS_SE_HandleEvent();
 			<label for="id_country">{l s='Country' mod='carriercompare'}</label>
 			<select name="id_country" id="id_country">
 				{foreach from=$countries item=country}
-					<option value="{$country.id_country}" {if $id_country == $country.id_country}selected="selected"{/if}>{$country.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$country.id_country}" {if $id_country == $country.id_country}selected="selected"{/if}>{$country.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 			</select>
 		</p>
@@ -61,7 +61,7 @@ PS_SE_HandleEvent();
 		</p>
 		<p>
 			<label for="zipcode">{l s='Zip Code' mod='carriercompare'}</label>
-			<input type="text" name="zipcode" id="zipcode" value="{$zipcode|escape:'htmlall':'UTF-8'}"/> ({l s='Needed for certain carriers.' mod='carriercompare'})
+			<input type="text" name="zipcode" id="zipcode" value="{$zipcode|escape:'html':'UTF-8'}"/> ({l s='Needed for certain carriers.' mod='carriercompare'})
 		</p>
 		<div id="carriercompare_errors" style="display: none;">
 			<ul id="carriercompare_errors_list"></ul><br />
diff --git a/modules/carriercompare/template/configuration.tpl b/modules/carriercompare/template/configuration.tpl
index f9735f408..f698d2846 100644
--- a/modules/carriercompare/template/configuration.tpl
+++ b/modules/carriercompare/template/configuration.tpl
@@ -6,7 +6,7 @@
 	{/if}
 {/if}
 
-<form method="post" action="{$smarty.server.REQUEST_URI|escape:'htmlall':'UTF-8'}">
+<form method="post" action="{$smarty.server.REQUEST_URI|escape:'html':'UTF-8'}">
 	<fieldset>
 		<div class="warn">{l s='This module is only available during the standard five-step checkout process. The carrier list has already been defined for one-page checkout. ' mod='carriercompare'}.</div>
 		<legend>{l s='Global Configuration' mod='carriercompare'}</legend>
diff --git a/modules/cheque/views/templates/hook/infos.tpl b/modules/cheque/views/templates/hook/infos.tpl
index 88d2bdb6f..977cab658 100644
--- a/modules/cheque/views/templates/hook/infos.tpl
+++ b/modules/cheque/views/templates/hook/infos.tpl
@@ -25,7 +25,7 @@
 
 <div class="alert alert-info">
 <img src="../modules/cheque/cheque.jpg" style="float:left; margin-right:15px;" width="86" height="49">
-<p><strong>{l s="This module allows you to accept payments by check."}</strong></p>
-<p>{l s="If the client chooses this payment method, the order status will change to 'Waiting for payment.'"}</p>
-<p>{l s="You will need to manually confirm the order as soon as you receive a check."}</p>
-</div>
\ No newline at end of file
+<p><strong>{l s="This module allows you to accept payments by check." mod='cheque'}</strong></p>
+<p>{l s="If the client chooses this payment method, the order status will change to 'Waiting for payment.'" mod='cheque'}</p>
+<p>{l s="You will need to manually confirm the order as soon as you receive a check." mod='cheque'}</p>
+</div>
diff --git a/modules/crossselling/crossselling.tpl b/modules/crossselling/crossselling.tpl
index c537cb2a8..320fab452 100755
--- a/modules/crossselling/crossselling.tpl
+++ b/modules/crossselling/crossselling.tpl
@@ -34,7 +34,7 @@
 				{foreach from=$orderProducts item='orderProduct' name=orderProduct}
 				<li>
 					<a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}" class="lnk_img"><img src="{$orderProduct.image}" alt="{$orderProduct.name|htmlspecialchars}" /></a>
-					<p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'htmlall':'UTF-8'}</a></p>
+					<p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'html':'UTF-8'}</a></p>
 					{if $crossDisplayPrice AND $orderProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
 						<span class="price_display">
 							<span class="price">{convertPrice price=$orderProduct.displayed_price}</span>
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index a2eb1beb4..053c26033 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -354,7 +354,7 @@ class Dashactivity extends Module
 		);
 			
 		$fields_form['form']['input'][] = array(
-			'label' => $this->l('Cart as active'),
+			'label' => $this->l('Cart active'),
 			'desc' => $this->l('Default time range to consider a Shopping cart as active (default 30, max 120)'),
 			'name' => 'DASHACTIVITY_CART_ACTIVE',
 			'type' => 'select',
diff --git a/modules/editorial/editorial.tpl b/modules/editorial/editorial.tpl
index 7393327ab..d9331774f 100644
--- a/modules/editorial/editorial.tpl
+++ b/modules/editorial/editorial.tpl
@@ -25,8 +25,8 @@
 
 <!-- Module Editorial -->
 <div id="editorial_block_center" class="editorial_block">
-	{if $editorial->body_home_logo_link}<a href="{$editorial->body_home_logo_link|escape:'htmlall':'UTF-8'}" title="{$editorial->body_title|escape:'htmlall':'UTF-8'|stripslashes}">{/if}
-	{if $homepage_logo}<img src="{$link->getMediaLink($image_path)|escape:'html'}" alt="{$editorial->body_title|escape:'htmlall':'UTF-8'|stripslashes}" {if $image_width}width="{$image_width}"{/if} {if $image_height}height="{$image_height}" {/if}/>{/if}
+	{if $editorial->body_home_logo_link}<a href="{$editorial->body_home_logo_link|escape:'html':'UTF-8'}" title="{$editorial->body_title|escape:'html':'UTF-8'|stripslashes}">{/if}
+	{if $homepage_logo}<img src="{$link->getMediaLink($image_path)|escape:'html'}" alt="{$editorial->body_title|escape:'html':'UTF-8'|stripslashes}" {if $image_width}width="{$image_width}"{/if} {if $image_height}height="{$image_height}" {/if}/>{/if}
 	{if $editorial->body_home_logo_link}</a>{/if}
 	{if $editorial->body_logo_subheading}<p id="editorial_image_legend">{$editorial->body_logo_subheading|stripslashes}</p>{/if}
 	{if $editorial->body_title}<h1>{$editorial->body_title|stripslashes}</h1>{/if}
diff --git a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
index 7490a414d..a5ebf872f 100644
--- a/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+++ b/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
@@ -54,7 +54,7 @@ $('document').ready(function()
 </script>
 
 {capture name=path}
-	<a href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}">
+	<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 		{l s='My account' mod='favoriteproducts'}</a>
 		<span class="navigation-pipe">{$navigationPipe}</span>{l s='My favorite products.' mod='favoriteproducts'}
 {/capture}
@@ -66,10 +66,10 @@ $('document').ready(function()
 		<div>
 			{foreach from=$favoriteProducts item=favoriteProduct}
 			<div class="favoriteproduct clearfix">
-				<a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}" class="product_img_link">
-					<img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium_default')|escape:'htmlall':'UTF-8'}" alt=""/></a>
-				<h3><a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}">{$favoriteProduct.name|escape:'htmlall':'UTF-8'}</a></h3>
-				<div class="product_desc">{$favoriteProduct.description_short|strip_tags|escape:'htmlall':'UTF-8'}</div>
+				<a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'html':'UTF-8'}" class="product_img_link">
+					<img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium_default')|escape:'html':'UTF-8'}" alt=""/></a>
+				<h3><a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'html':'UTF-8'}">{$favoriteProduct.name|escape:'html':'UTF-8'}</a></h3>
+				<div class="product_desc">{$favoriteProduct.description_short|strip_tags|escape:'html':'UTF-8'}</div>
 
 				<div class="remove">
 					<img rel="ajax_id_favoriteproduct_{$favoriteProduct.id_product}" src="{$img_dir}icon/delete.gif" alt="" class="icon" />
@@ -83,7 +83,7 @@ $('document').ready(function()
 
 	<ul class="footer_links">
 		<li class="fleft">
-			<a href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a>
-			<a href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}">{l s='Back to your account.' mod='favoriteproducts'}</a></li>
+			<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a>
+			<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='Back to your account.' mod='favoriteproducts'}</a></li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/modules/favoriteproducts/views/templates/hook/my-account.tpl b/modules/favoriteproducts/views/templates/hook/my-account.tpl
index a8884fa02..b2cd80e49 100644
--- a/modules/favoriteproducts/views/templates/hook/my-account.tpl
+++ b/modules/favoriteproducts/views/templates/hook/my-account.tpl
@@ -24,7 +24,7 @@
 *}
 
 <li class="favoriteproducts">
-	<a href="{$link->getModuleLink('favoriteproducts', 'account')|escape:'htmlall':'UTF-8'}" title="{l s='My favorite products.' mod='favoriteproducts'}">
+	<a href="{$link->getModuleLink('favoriteproducts', 'account')|escape:'html':'UTF-8'}" title="{l s='My favorite products.' mod='favoriteproducts'}">
 		{if !$in_footer}<img {if isset($mobile_hook)}src="{$module_template_dir}img/favorites.png" class="ui-li-icon ui-li-thumb"{else}src="{$module_template_dir}img/favorites.png" class="icon"{/if} alt="{l s='My favorite products.' mod='favoriteproducts'}"/>{/if}
 		{l s='My favorite products.' mod='favoriteproducts'}
 	</a>
diff --git a/modules/homefeatured/homefeatured.tpl b/modules/homefeatured/homefeatured.tpl
index d668877a2..ed35887c0 100644
--- a/modules/homefeatured/homefeatured.tpl
+++ b/modules/homefeatured/homefeatured.tpl
@@ -39,7 +39,7 @@
 				{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
 				<li class="ajax_block_product {if $smarty.foreach.homeFeaturedProducts.first}first_item{elseif $smarty.foreach.homeFeaturedProducts.last}last_item{else}item{/if} {if $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 1} {/if} {if $smarty.foreach.homeFeaturedProducts.iteration > ($smarty.foreach.homeFeaturedProducts.total - $totModulo)}last_line{/if}">
 					<a href="{$product.link|escape:'html'}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" />{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='homefeatured'}</span>{/if}</a>
-					<h5 class="s_title_block"><a href="{$product.link|escape:'html'}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h5>
+					<h5 class="s_title_block"><a href="{$product.link|escape:'html'}" title="{$product.name|truncate:50:'...'|escape:'html':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'html':'UTF-8'}</a></h5>
 					<div class="product_desc"><a href="{$product.link|escape:'html'}" title="{l s='More' mod='homefeatured'}">{$product.description_short|strip_tags|truncate:65:'...'}</a></div>
 					<div>
 						<a class="lnk_more" href="{$product.link|escape:'html'}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>
diff --git a/modules/homeslider/homeslider.tpl b/modules/homeslider/homeslider.tpl
index fba02d589..f14a77273 100644
--- a/modules/homeslider/homeslider.tpl
+++ b/modules/homeslider/homeslider.tpl
@@ -45,8 +45,8 @@ var homeslider_pause = {$homeslider.pause};
 {foreach from=$homeslider_slides item=slide}
 	{if $slide.active}
 		<li>
-			<a href="{$slide.url|escape:'htmlall':'UTF-8'}" title="{$slide.description|escape:'htmlall':'UTF-8'}">
-			<img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'htmlall':'UTF-8'}" alt="{$slide.legend|escape:'htmlall':'UTF-8'}" height="{$homeslider.height|intval}" width="{$homeslider.width|intval}" />
+			<a href="{$slide.url|escape:'html':'UTF-8'}" title="{$slide.description|escape:'html':'UTF-8'}">
+			<img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'html':'UTF-8'}" alt="{$slide.legend|escape:'html':'UTF-8'}" height="{$homeslider.height|intval}" width="{$homeslider.width|intval}" />
 			</a>
 		</li>
 	{/if}
diff --git a/modules/loyalty/views/templates/front/loyalty.tpl b/modules/loyalty/views/templates/front/loyalty.tpl
index f7c2862d5..3d13b0952 100644
--- a/modules/loyalty/views/templates/front/loyalty.tpl
+++ b/modules/loyalty/views/templates/front/loyalty.tpl
@@ -54,7 +54,7 @@
 				<td class="history_link bold">{l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}</td>
 				<td class="history_date">{dateFormat date=$order.date full=1}</td>
 				<td class="history_method">{$order.points|intval}</td>
-				<td class="history_method">{$order.state|escape:'htmlall':'UTF-8'}</td>
+				<td class="history_method">{$order.state|escape:'html':'UTF-8'}</td>
 			</tr>
 		{/foreach}
 		</tbody>
@@ -83,9 +83,9 @@
 		{/if}
 		{section name=pagination start=$page-1 loop=$page+2 step=1}
 			{if $page == $smarty.section.pagination.index}
-				<li class="current"><span>{$page|escape:'htmlall':'UTF-8'}</span></li>
+				<li class="current"><span>{$page|escape:'html':'UTF-8'}</span></li>
 			{elseif $smarty.section.pagination.index > 0 && $orders|@count+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)}
-				<li><a href="{summarypaginationlink p=$smarty.section.pagination.index n=$nbpagination}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
+				<li><a href="{summarypaginationlink p=$smarty.section.pagination.index n=$nbpagination}">{$smarty.section.pagination.index|escape:'html':'UTF-8'}</a></li>
 			{/if}
 		{/section}
 		{if $max_page-$page > 1}
@@ -110,7 +110,7 @@
 				<select name="n" id="nb_item">
 				{foreach from=$nArray item=nValue}
 					{if $nValue <= $orders|@count}
-						<option value="{$nValue|escape:'htmlall':'UTF-8'}" {if $nbpagination == $nValue}selected="selected"{/if}>{$nValue|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$nValue|escape:'html':'UTF-8'}" {if $nbpagination == $nValue}selected="selected"{/if}>{$nValue|escape:'html':'UTF-8'}</option>
 					{/if}
 				{/foreach}
 				</select>
@@ -165,7 +165,7 @@
 				<td class="history_date">{dateFormat date=$discount->date_to}</td>
 				<td class="history_method bold">{if $discount->quantity > 0}{l s='To use' mod='loyalty'}{else}{l s='Used' mod='loyalty'}{/if}</td>
 				<td class="history_method">
-					<a href="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" onclick="return false" class="tips" title="
+					<a href="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" onclick="return false" class="tips" title="
 					{l s='Generated by these following orders' mod='loyalty'}|{foreach from=$discount->orders item=myorder name=myLoop}
 					{$myorder.id_order|string_format:{l s='Order #%d' mod='loyalty'}}
 					({displayPrice price=$myorder.total_paid currency=$myorder.id_currency}) :
diff --git a/modules/mailalerts/views/templates/admin/_configure/helpers/form/form.tpl b/modules/mailalerts/views/templates/admin/_configure/helpers/form/form.tpl
index 917522561..ae83bc00e 100644
--- a/modules/mailalerts/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/modules/mailalerts/views/templates/admin/_configure/helpers/form/form.tpl
@@ -28,7 +28,7 @@
 {block name="input"}
     {if $input.type == 'switch'}
 		{foreach $input.values as $value}
-			<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
+			<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'html':'UTF-8'}"
 					{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 					{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
 			<label class="t" for="{$value.id}">
diff --git a/modules/mailalerts/views/templates/front/mailalerts-account.tpl b/modules/mailalerts/views/templates/front/mailalerts-account.tpl
index d0f565a9f..a56466789 100644
--- a/modules/mailalerts/views/templates/front/mailalerts-account.tpl
+++ b/modules/mailalerts/views/templates/front/mailalerts-account.tpl
@@ -65,9 +65,9 @@ $('document').ready(function()
 		<div>
 			{foreach from=$mailAlerts item=mailAlert}
 			<div class="mailalert clearfix">
-				<a href="{$link->getProductLink($mailAlert.id_product, null, null, null, null, $mailAlert.id_shop)}" title="{$mailAlert.name|escape:'htmlall':'UTF-8'}" class="product_img_link"><img src="{$link->getImageLink($mailAlert.link_rewrite, $mailAlert.cover, 'small_default')|escape:'html'}" alt=""/></a>
-				<h3><a href="{$link->getProductLink($mailAlert.id_product, null, null, null, null, $mailAlert.id_shop)|escape:'html'}" title="{$mailAlert.name|escape:'htmlall':'UTF-8'}">{$mailAlert.name|escape:'htmlall':'UTF-8'}</a></h3>
-				<div class="product_desc">{$mailAlert.attributes_small|escape:'htmlall':'UTF-8'}</div>
+				<a href="{$link->getProductLink($mailAlert.id_product, null, null, null, null, $mailAlert.id_shop)}" title="{$mailAlert.name|escape:'html':'UTF-8'}" class="product_img_link"><img src="{$link->getImageLink($mailAlert.link_rewrite, $mailAlert.cover, 'small_default')|escape:'html'}" alt=""/></a>
+				<h3><a href="{$link->getProductLink($mailAlert.id_product, null, null, null, null, $mailAlert.id_shop)|escape:'html'}" title="{$mailAlert.name|escape:'html':'UTF-8'}">{$mailAlert.name|escape:'html':'UTF-8'}</a></h3>
+				<div class="product_desc">{$mailAlert.attributes_small|escape:'html':'UTF-8'}</div>
 
 				<div class="remove">
 					<img rel="ajax_id_mailalert_{$mailAlert.id_product}_{$mailAlert.id_product_attribute}" src="{$img_dir}icon/delete.gif" alt="{l s='Remove' mod='mailalerts'}" class="icon" />
diff --git a/modules/productscategory/productscategory.tpl b/modules/productscategory/productscategory.tpl
index 409c21e30..ec11cd048 100644
--- a/modules/productscategory/productscategory.tpl
+++ b/modules/productscategory/productscategory.tpl
@@ -34,7 +34,7 @@
 			<li {if count($categoryProducts) < 6}style="width:60px"{/if}>
 				<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)}" class="lnk_img" title="{$categoryProduct.name|htmlspecialchars}"><img src="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'medium_default')|escape:'html'}" alt="{$categoryProduct.name|htmlspecialchars}" /></a>
 				<p class="product_name">
-					<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)|escape:'html'}" title="{$categoryProduct.name|htmlspecialchars}">{$categoryProduct.name|truncate:14:'...'|escape:'htmlall':'UTF-8'}</a>
+					<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)|escape:'html'}" title="{$categoryProduct.name|htmlspecialchars}">{$categoryProduct.name|truncate:14:'...'|escape:'html':'UTF-8'}</a>
 				</p>
 				{if $ProdDisplayPrice AND $categoryProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
 				<p class="price_display">
diff --git a/modules/referralprogram/views/templates/front/program.tpl b/modules/referralprogram/views/templates/front/program.tpl
index 425deb9c1..aee1f9ac8 100644
--- a/modules/referralprogram/views/templates/front/program.tpl
+++ b/modules/referralprogram/views/templates/front/program.tpl
@@ -109,9 +109,9 @@
 					{section name=friends start=0 loop=$nbFriends step=1}
 					<tr class="{if $smarty.section.friends.index % 2}item{else}alternate_item{/if}">
 						<td class="align_right">{$smarty.section.friends.iteration}</td>
-						<td><input type="text" class="text" name="friendsLastName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsLastName[$smarty.section.friends.index])}{$smarty.post.friendsLastName[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
-						<td><input type="text" class="text" name="friendsFirstName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsFirstName[$smarty.section.friends.index])}{$smarty.post.friendsFirstName[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
-						<td><input type="text" class="text" name="friendsEmail[{$smarty.section.friends.index}]" size="20" value="{if isset($smarty.post.friendsEmail[$smarty.section.friends.index])}{$smarty.post.friendsEmail[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="text" name="friendsLastName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsLastName[$smarty.section.friends.index])}{$smarty.post.friendsLastName[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="text" name="friendsFirstName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsFirstName[$smarty.section.friends.index])}{$smarty.post.friendsFirstName[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="text" name="friendsEmail[{$smarty.section.friends.index}]" size="20" value="{if isset($smarty.post.friendsEmail[$smarty.section.friends.index])}{$smarty.post.friendsEmail[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
 					</tr>
 					{/section}
 				</tbody>
diff --git a/modules/referralprogram/views/templates/hook/authentication.tpl b/modules/referralprogram/views/templates/hook/authentication.tpl
index 52a613cc9..9774a9981 100755
--- a/modules/referralprogram/views/templates/hook/authentication.tpl
+++ b/modules/referralprogram/views/templates/hook/authentication.tpl
@@ -28,7 +28,7 @@
 	<h3>{l s='Referral program' mod='referralprogram'}</h3>
 	<p class="text">
 		<label for="referralprogram">{l s='E-mail address of your sponsor' mod='referralprogram'}</label>
-		<input type="text" size="52" maxlength="128" id="referralprogram" name="referralprogram" value="{if isset($smarty.post.referralprogram)}{$smarty.post.referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
+		<input type="text" size="52" maxlength="128" id="referralprogram" name="referralprogram" value="{if isset($smarty.post.referralprogram)}{$smarty.post.referralprogram|escape:'html':'UTF-8'}{/if}" />
 	</p>
 </fieldset>
 <!-- END : MODULE ReferralProgram -->
\ No newline at end of file
diff --git a/modules/sendtoafriend/sendtoafriend.tpl b/modules/sendtoafriend/sendtoafriend.tpl
index 7e511204d..4b45a73df 100644
--- a/modules/sendtoafriend/sendtoafriend.tpl
+++ b/modules/sendtoafriend/sendtoafriend.tpl
@@ -45,11 +45,11 @@
 					<div id="send_friend_form_content">
 						<p class="text">
 							<label for="friend-name">{l s='Friend\'s name' mod='sendtoafriend'}</label>
-							<input type="text" id="friend-name" name="name" value="{if isset($smarty.post.name)}{$smarty.post.name|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
+							<input type="text" id="friend-name" name="name" value="{if isset($smarty.post.name)}{$smarty.post.name|escape:'html':'UTF-8'|stripslashes}{/if}" />
 						</p>
 						<p class="text">
 							<label for="friend-address">{l s='Friend\'s email' mod='sendtoafriend'}</label>
-							<input type="text" id="friend-address" name="email" value="{if isset($smarty.post.name)}{$smarty.post.email|escape:'htmlall'|stripslashes}{/if}" />
+							<input type="text" id="friend-address" name="email" value="{if isset($smarty.post.name)}{$smarty.post.email|escape:'html'|stripslashes}{/if}" />
 						</p>
 
 						<p class="submit">
diff --git a/modules/trackingfront/account.tpl b/modules/trackingfront/account.tpl
index febfc170e..f4389e47d 100644
--- a/modules/trackingfront/account.tpl
+++ b/modules/trackingfront/account.tpl
@@ -25,11 +25,11 @@
 
 		<div style="width: 800px; height: 75px; background-color: #8AB50E; margin: 0 auto; color: white; font-family: arial; border-bottom: 5px solid #567500;">
 			<div style="float: left; font-size: 36px;  margin-left: 20px; font-weight: bold; height: 75px; line-height: 75px; vertical-align: middle;">{l s='Affiliation space' mod='trackingfront'}</div>
-			<div style="float: right; font-size: 18px; margin-right: 20px; font-weight: bold; height: 75px; line-height: 75px; vertical-align: middle;"><a href="{$smarty.server.PHP_SELF|escape:'htmlall':'UTF-8'}?logout_tracking">{l s='Logout' mod='trackingfront'}</a></div>
+			<div style="float: right; font-size: 18px; margin-right: 20px; font-weight: bold; height: 75px; line-height: 75px; vertical-align: middle;"><a href="{$smarty.server.PHP_SELF|escape:'html':'UTF-8'}?logout_tracking">{l s='Logout' mod='trackingfront'}</a></div>
 		</div>
 		<div style="width: 800px; height: 250px; background-color: #EEEEEE; margin: 0 auto; font-family: arial;">
 			<div style="float:left; margin: 25px 0 0 50px;">
-				<form action="{$smarty.server.REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
+				<form action="{$smarty.server.REQUEST_URI|escape:'html':'UTF-8'}" method="post">
 					<input type="submit" name="submitDateToday" class="button" value="{l s='Today' mod='trackingfront'}">
 					<input type="submit" name="submitDateMonth" class="button" value="{l s='Month' mod='trackingfront'}">
 					<input type="submit" name="submitDateYear" class="button" value="{l s='Year' mod='trackingfront'}">
diff --git a/modules/trackingfront/login.tpl b/modules/trackingfront/login.tpl
index bd902304f..bada7b00a 100644
--- a/modules/trackingfront/login.tpl
+++ b/modules/trackingfront/login.tpl
@@ -35,9 +35,9 @@
 			<div style="width: 400px; height: 65px; background-color: #567500; margin: 0 auto; color: white; font-family: arial; text-align: center">
 				<div style="font-size: 36px;  margin: 5px auto; font-weight: bold; height: 65x; line-height: 65px; vertical-align: middle;">{l s='Affiliation space' mod='trackingfront'}</div>
 			</div>
-			<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" style="margin: 20px 50px; text-align: left; font-weight: bold;">
+			<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" style="margin: 20px 50px; text-align: left; font-weight: bold;">
 				<label>{l s='Login' mod='trackingfront'}</label><br />
-				<input type="text" id="email" name="login" value="{if isset($smarty.post.login)}{$smarty.post.login|escape:'htmlall'|stripslashes}{/if}" class="input" />
+				<input type="text" id="email" name="login" value="{if isset($smarty.post.login)}{$smarty.post.login|escape:'html'|stripslashes}{/if}" class="input" />
 				<div style="margin: 2.0em 0 0 0;">
 					<label>{l s='Password' mod='trackingfront'}</label><br />
 					<input type="password" name="passwd" class="input" />
diff --git a/pdf/footer.tpl b/pdf/footer.tpl
index 098131f44..d7d6c81c3 100755
--- a/pdf/footer.tpl
+++ b/pdf/footer.tpl
@@ -29,26 +29,26 @@
                 {l s='An electronic version of this invoice is available in your account. To access it, log in to our website using your e-mail address and password (which you created when placing your first order).' pdf='true'}             
     			<br />
             {/if}
-			{$shop_address|escape:'htmlall':'UTF-8'}<br />
+			{$shop_address|escape:'html':'UTF-8'}<br />
 
 			{if !empty($shop_phone) OR !empty($shop_fax)}
 				{l s='For more assistance, contact Support:' pdf='true'}<br />
 				{if !empty($shop_phone)}
-					Tel: {$shop_phone|escape:'htmlall':'UTF-8'}
+					Tel: {$shop_phone|escape:'html':'UTF-8'}
 				{/if}
 
 				{if !empty($shop_fax)}
-					Fax: {$shop_fax|escape:'htmlall':'UTF-8'}
+					Fax: {$shop_fax|escape:'html':'UTF-8'}
 				{/if}
 				<br />
 			{/if}
             
             {if isset($shop_details)}
-                {$shop_details|escape:'htmlall':'UTF-8'}<br />
+                {$shop_details|escape:'html':'UTF-8'}<br />
             {/if}
 
             {if isset($free_text)}
-    			{$free_text|escape:'htmlall':'UTF-8'}<br />
+    			{$free_text|escape:'html':'UTF-8'}<br />
             {/if}
 		</td>
 	</tr>
diff --git a/pdf/header.tpl b/pdf/header.tpl
index 99bab23da..ee8a8e213 100755
--- a/pdf/header.tpl
+++ b/pdf/header.tpl
@@ -32,13 +32,13 @@
 	<td style="width: 50%; text-align: right;">
 		<table style="width: 100%">
 			<tr>
-				<td style="font-weight: bold; font-size: 14pt; color: #444; width: 100%">{$shop_name|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-weight: bold; font-size: 14pt; color: #444; width: 100%">{$shop_name|escape:'html':'UTF-8'}</td>
 			</tr>
 			<tr>
-				<td style="font-size: 14pt; color: #9E9F9E">{$date|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-size: 14pt; color: #9E9F9E">{$date|escape:'html':'UTF-8'}</td>
 			</tr>
 			<tr>
-				<td style="font-size: 14pt; color: #9E9F9E">{$title|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-size: 14pt; color: #9E9F9E">{$title|escape:'html':'UTF-8'}</td>
 			</tr>
 		</table>
 	</td>
diff --git a/pdf/supply-order-footer.tpl b/pdf/supply-order-footer.tpl
index da8fdd21c..0b7deb2bc 100755
--- a/pdf/supply-order-footer.tpl
+++ b/pdf/supply-order-footer.tpl
@@ -26,27 +26,27 @@
 <table>
 	<tr>
 		<td style="text-align: left; font-size: 6pt; color: #444">
-			{$shop_address|escape:'htmlall':'UTF-8'}<br />
+			{$shop_address|escape:'html':'UTF-8'}<br />
 
 			{if !empty($shop_phone) OR !empty($shop_fax)}
 				{l s='For more assistance, contact Support:' pdf='true'}<br />
 				{if !empty($shop_phone)}
-					Tel: {$shop_phone|escape:'htmlall':'UTF-8'}
+					Tel: {$shop_phone|escape:'html':'UTF-8'}
 				{/if}
 
 				{if !empty($shop_fax)}
-					Fax: {$shop_fax|escape:'htmlall':'UTF-8'}
+					Fax: {$shop_fax|escape:'html':'UTF-8'}
 				{/if}
 				<br />
 			{/if}
             
             {if isset($shop_details)}
-                {$shop_details|escape:'htmlall':'UTF-8'}<br />
+                {$shop_details|escape:'html':'UTF-8'}<br />
             {/if}
 
             {if isset($free_text)}
             	{foreach $free_text as $text}
-    				{$text|escape:'htmlall':'UTF-8'}<br />
+    				{$text|escape:'html':'UTF-8'}<br />
     			{/foreach}
             {/if}
 		</td>
diff --git a/pdf/supply-order-header.tpl b/pdf/supply-order-header.tpl
index bad33733a..bfec2e160 100644
--- a/pdf/supply-order-header.tpl
+++ b/pdf/supply-order-header.tpl
@@ -37,16 +37,16 @@
 	<td style="width: 50%; text-align: right;">
 		<table style="width: 100%">
 			<tr>
-				<td style="font-weight: bold; font-size: 14pt; color: #444; width: 100%">{$shop_name|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-weight: bold; font-size: 14pt; color: #444; width: 100%">{$shop_name|escape:'html':'UTF-8'}</td>
 			</tr>
 			<tr>
-				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$date|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$date|escape:'html':'UTF-8'}</td>
 			</tr>
 			<tr>
-				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$title|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$title|escape:'html':'UTF-8'}</td>
 			</tr>
 			<tr>
-				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$reference|escape:'htmlall':'UTF-8'}</td>
+				<td style="font-size: 14pt; color: #444; font-weight: bold;">{$reference|escape:'html':'UTF-8'}</td>
 			</tr>
 		</table>
 	</td>
diff --git a/themes/default-bootstrap/addresses.tpl b/themes/default-bootstrap/addresses.tpl
index c74781316..8779feea7 100644
--- a/themes/default-bootstrap/addresses.tpl
+++ b/themes/default-bootstrap/addresses.tpl
@@ -106,7 +106,7 @@
                     <li>
                     {foreach from=$addressKey item=key name="word_loop"}
                         <span {if isset($addresses_style[$key])} class="{$addresses_style[$key]}"{/if}>
-                            {$address.formated[$key|replace:',':'']|escape:'htmlall':'UTF-8'}
+                            {$address.formated[$key|replace:',':'']|escape:'html':'UTF-8'}
                         </span>
                     {/foreach}
                     </li>
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl
index e3f90b856..56d75a82c 100644
--- a/themes/default-bootstrap/authentication.tpl
+++ b/themes/default-bootstrap/authentication.tpl
@@ -170,7 +170,7 @@ $(document).ready(function() {
                                 <input type="text" class="is_required validate account_input form-control" data-validate="isEmail" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" />
                             </div>
                             <div class="submit">
-                                {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+                                {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
                                 <button class="btn btn-default button button-medium exclusive" type="submit" id="SubmitCreate" name="SubmitCreate"><span><i class="icon-user left"></i>{l s='Create an account'}</span></button>
                                 <input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" />
                             </div>
@@ -193,7 +193,7 @@ $(document).ready(function() {
                         </div>
                         <p class="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p>
                         <p class="submit">
-                            {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+                            {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
                             <button type="submit" id="SubmitLogin" name="SubmitLogin" class="button btn btn-default button-medium"><span><i class="icon-lock left"></i>{l s='Sign in'}</span></button>
                         </p>
                     </div>
@@ -624,7 +624,7 @@ $(document).ready(function() {
         <div class="submit clearfix">
             <input type="hidden" name="email_create" value="1" />
             <input type="hidden" name="is_new_customer" value="1" />
-            {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+            {if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
             <button type="submit" name="submitAccount" id="submitAccount" class="btn btn-default button button-medium"><span>{l s='Register'}<i class="icon-chevron-right right"></i></span></button>
             <p class="pull-right required"><span><sup>*</sup>{l s='Required field'}</span></p>
         </div>
diff --git a/themes/default-bootstrap/category-cms-tree-branch.tpl b/themes/default-bootstrap/category-cms-tree-branch.tpl
index 86325965a..94f8ffeaf 100644
--- a/themes/default-bootstrap/category-cms-tree-branch.tpl
+++ b/themes/default-bootstrap/category-cms-tree-branch.tpl
@@ -24,7 +24,7 @@
 *}
 
 <li {if isset($last) && $last == 'true'}class="last"{/if}>
-	<strong><a href="{$node.link|escape:'htmlall':'UTF-8'}" title="{$node.name|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a></strong>
+	<strong><a href="{$node.link|escape:'html':'UTF-8'}" title="{$node.name|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a></strong>
 	{if isset($node.children) && $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryCmsTreeBranch}
@@ -38,14 +38,14 @@
 		{/foreach}
 		{if isset($node.cms) && $node.cms|@count > 0}
 			{foreach from=$node.cms item=cms name=cmsTreeBranch}
-				<li {if $smarty.foreach.cmsTreeBranch.last}class="last"{/if} ><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+				<li {if $smarty.foreach.cmsTreeBranch.last}class="last"{/if} ><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
 			{/foreach}
 		{/if}
 		</ul>
 	{elseif isset($node.cms) && $node.cms|@count > 0}
 		<ul>
 		{foreach from=$node.cms item=cms name=cmsTreeBranch}
-			<li {if $smarty.foreach.cmsTreeBranch.last}class="last"{/if} ><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+			<li {if $smarty.foreach.cmsTreeBranch.last}class="last"{/if} ><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
 		{/foreach}
 		</ul>
 	{/if}
diff --git a/themes/default-bootstrap/category-tree-branch.tpl b/themes/default-bootstrap/category-tree-branch.tpl
index 60d14a1fd..ddf7266b2 100644
--- a/themes/default-bootstrap/category-tree-branch.tpl
+++ b/themes/default-bootstrap/category-tree-branch.tpl
@@ -24,7 +24,7 @@
 *}
 
 <li {if isset($last) && $last == 'true'}class="last"{/if}>
-	<a href="{$node.link|escape:'htmlall':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if} title="{$node.desc|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a>
+	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if} title="{$node.desc|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/themes/default-bootstrap/category.tpl b/themes/default-bootstrap/category.tpl
index 0dd54c3c9..76bf60936 100644
--- a/themes/default-bootstrap/category.tpl
+++ b/themes/default-bootstrap/category.tpl
@@ -52,9 +52,9 @@
                             <div class="cat_desc">
                             <h1 class="category-name">
                                 {strip}
-                                    {$category->name|escape:'htmlall':'UTF-8'}
+                                    {$category->name|escape:'html':'UTF-8'}
                                     {if isset($categoryNameComplement)}
-                                        {$categoryNameComplement|escape:'htmlall':'UTF-8'}
+                                        {$categoryNameComplement|escape:'html':'UTF-8'}
                                     {/if}
                                 {/strip}
                             </h1>
@@ -72,11 +72,11 @@
                   {/if}
             </div>
 		{/if}
-		<h1 class="page-heading{if (isset($subcategories) && !$products) || (isset($subcategories) && $products)} product-listing{/if}">
+		<h1 class="page-heading{if (isset($subcategories) && !$products) || (isset($subcategories) && $products) || !isset($subcategories) && $products} product-listing{/if}">
 			{strip}
-				{$category->name|escape:'htmlall':'UTF-8'}
+				{$category->name|escape:'html':'UTF-8'}
 				{if isset($categoryNameComplement)}
-					{$categoryNameComplement|escape:'htmlall':'UTF-8'}
+					{$categoryNameComplement|escape:'html':'UTF-8'}
 				{/if}
 			{/strip}
             <span class="heading-counter">{include file="$tpl_dir./category-count.tpl"}</span>
@@ -91,7 +91,7 @@
 			{foreach from=$subcategories item=subcategory}
 				<li>
                 	<div class="subcategory-image">
-						<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$subcategory.name|escape:'htmlall':'UTF-8'}" class="img">
+						<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}" title="{$subcategory.name|escape:'html':'UTF-8'}" class="img">
 						{if $subcategory.id_image}
 							<img class="replace-2x" src="{$link->getCatImageLink($subcategory.link_rewrite, $subcategory.id_image, 'medium_default')|escape:'html'}" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{else}
@@ -99,7 +99,7 @@
 						{/if}
 					</a>
                    	</div>
-					<h5><a class="subcategory-name" href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}">{$subcategory.name|truncate:25:'...'|escape:'htmlall':'UTF-8'|truncate:350}</a></h5>
+					<h5><a class="subcategory-name" href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}">{$subcategory.name|truncate:25:'...'|escape:'html':'UTF-8'|truncate:350}</a></h5>
 					{if $subcategory.description}
 						<div class="cat_desc">{$subcategory.description}</div>
 					{/if}
diff --git a/themes/default-bootstrap/cms.tpl b/themes/default-bootstrap/cms.tpl
index 863ce4792..001ae170c 100644
--- a/themes/default-bootstrap/cms.tpl
+++ b/themes/default-bootstrap/cms.tpl
@@ -28,8 +28,8 @@
 		<div id="admin-action-cms">
 			<p>{l s='This CMS page is not visible to your customers.'}
 			<input type="hidden" id="admin-action-cms-id" value="{$cms->id}" />
-			<input type="submit" value="{l s='Publish'}" class="exclusive btn btn-default" onclick="submitPublishCMS('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
-			<input type="submit" value="{l s='Back'}" class="exclusive btn btn-default" onclick="submitPublishCMS('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
+			<input type="submit" value="{l s='Publish'}" class="exclusive btn btn-default" onclick="submitPublishCMS('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
+			<input type="submit" value="{l s='Back'}" class="exclusive btn btn-default" onclick="submitPublishCMS('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
 			</p>
 			<div class="clear" ></div>
 			<p id="admin-action-result"></p>
@@ -41,13 +41,13 @@
 	</div>
 {elseif isset($cms_category)}
 	<div class="block-cms">
-		<h1><a href="{if $cms_category->id eq 1}{$base_dir}{else}{$link->getCMSCategoryLink($cms_category->id, $cms_category->link_rewrite)}{/if}">{$cms_category->name|escape:'htmlall':'UTF-8'}</a></h1>
+		<h1><a href="{if $cms_category->id eq 1}{$base_dir}{else}{$link->getCMSCategoryLink($cms_category->id, $cms_category->link_rewrite)}{/if}">{$cms_category->name|escape:'html':'UTF-8'}</a></h1>
 		{if isset($sub_category) && !empty($sub_category)}	
 			<p class="title_block">{l s='List of sub categories in %s:' sprintf=$cms_category->name}</p>
 			<ul class="bullet">
 				{foreach from=$sub_category item=subcategory}
 					<li>
-						<a href="{$link->getCMSCategoryLink($subcategory.id_cms_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}">{$subcategory.name|escape:'htmlall':'UTF-8'}</a>
+						<a href="{$link->getCMSCategoryLink($subcategory.id_cms_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}">{$subcategory.name|escape:'html':'UTF-8'}</a>
 					</li>
 				{/foreach}
 			</ul>
@@ -57,7 +57,7 @@
 			<ul class="bullet">
 				{foreach from=$cms_pages item=cmspages}
 					<li>
-						<a href="{$link->getCMSLink($cmspages.id_cms, $cmspages.link_rewrite)|escape:'htmlall':'UTF-8'}">{$cmspages.meta_title|escape:'htmlall':'UTF-8'}</a>
+						<a href="{$link->getCMSLink($cmspages.id_cms, $cmspages.link_rewrite)|escape:'html':'UTF-8'}">{$cmspages.meta_title|escape:'html':'UTF-8'}</a>
 					</li>
 				{/foreach}
 			</ul>
diff --git a/themes/default-bootstrap/contact-form.tpl b/themes/default-bootstrap/contact-form.tpl
index 4ae010cbf..ec050193b 100644
--- a/themes/default-bootstrap/contact-form.tpl
+++ b/themes/default-bootstrap/contact-form.tpl
@@ -40,7 +40,7 @@
 {else}
 	<p class="contact-title"><i class="icon-comment-alt"></i>{l s='For questions about an order or for more information about our products'}.</p>
 	{include file="$tpl_dir./errors.tpl"}
-	<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="contact-form-box" enctype="multipart/form-data">
+	<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="contact-form-box" enctype="multipart/form-data">
 		<fieldset>
         <h3 class="page-subheading">{l s='send a message'}</h3>
         <div class="clearfix">
@@ -51,7 +51,7 @@
                 {if isset($customerThread.id_contact)}
                     {foreach from=$contacts item=contact}
                         {if $contact.id_contact == $customerThread.id_contact}
-                            <input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'htmlall':'UTF-8'}" readonly="readonly" />
+                            <input type="text" class="form-control" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
                             <input type="hidden" name="id_contact" value="{$contact.id_contact}" />
                         {/if}
                     {/foreach}
@@ -60,23 +60,23 @@
                     <select id="id_contact" class="form-control" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
                         <option value="0">{l s='-- Choose --'}</option>
                     {foreach from=$contacts item=contact}
-                        <option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
+                        <option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}</option>
                     {/foreach}
                     </select>
                 </div>
                 <p id="desc_contact0" class="desc_contact">&nbsp;</p>
                     {foreach from=$contacts item=contact}
                         <p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
-                            {$contact.description|escape:'htmlall':'UTF-8'}
+                            {$contact.description|escape:'html':'UTF-8'}
                         </p>
                     {/foreach}
                 {/if}
                 <p class="form-group">
                     <label for="email">{l s='Email address'}</label>
                     {if isset($customerThread.email)}
-                        <input class="form-control grey" type="text" id="email" name="from" value="{$customerThread.email|escape:'htmlall':'UTF-8'}" readonly="readonly" />
+                        <input class="form-control grey" type="text" id="email" name="from" value="{$customerThread.email|escape:'html':'UTF-8'}" readonly="readonly" />
                     {else}
-                        <input class="form-control grey" type="text" id="email" name="from" value="{$email|escape:'htmlall':'UTF-8'}" />
+                        <input class="form-control grey" type="text" id="email" name="from" value="{$email|escape:'html':'UTF-8'}" />
                     {/if}
                 </p>
             {if !$PS_CATALOG_MODE}
@@ -87,7 +87,7 @@
                         <select name="id_order" class="form-control">
                             <option value="0">{l s='-- Choose --'}</option>
                             {foreach from=$orderList item=order}
-                                <option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
+                                <option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'html':'UTF-8'}</option>
                             {/foreach}
                         </select>
                     {elseif !isset($customerThread.id_order) && !isset($isLogged)}
@@ -105,7 +105,7 @@
                         <select name="id_product" id="{$id_order}_order_products" class="product_select form-control" style="{if !$smarty.foreach.products.first} display:none; {/if}" {if !$smarty.foreach.products.first}disabled="disabled" {/if}>
                             <option value="0">{l s='-- Choose --'}</option>
                             {foreach from=$products item=product}
-                                <option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
+                                <option value="{$product.value|intval}">{$product.label|escape:'html':'UTF-8'}</option>
                             {/foreach}
                         </select>
                     {/foreach}
@@ -126,7 +126,7 @@
             <div class="col-xs-12 col-md-9">
                 <div class="form-group">
                     <label for="message">{l s='Message'}</label>
-                    <textarea class="form-control" id="message" name="message">{if isset($message)}{$message|escape:'htmlall':'UTF-8'|stripslashes}{/if}</textarea>
+                    <textarea class="form-control" id="message" name="message">{if isset($message)}{$message|escape:'html':'UTF-8'|stripslashes}{/if}</textarea>
                 </div>
             </div>
         </div>
diff --git a/themes/default-bootstrap/css/addresses.css b/themes/default-bootstrap/css/addresses.css
index 5a475d875..2a23b3be1 100644
--- a/themes/default-bootstrap/css/addresses.css
+++ b/themes/default-bootstrap/css/addresses.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /*******************************************************
 				Addresses Styles
 ********************************************************/
diff --git a/themes/default-bootstrap/css/authentication.css b/themes/default-bootstrap/css/authentication.css
index bba38d7fa..aebc35000 100644
--- a/themes/default-bootstrap/css/authentication.css
+++ b/themes/default-bootstrap/css/authentication.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /**********************************************************
 				Authentication Styles
 **********************************************************/
diff --git a/themes/default-bootstrap/css/category.css b/themes/default-bootstrap/css/category.css
index de1985f10..8e3d4b7a1 100644
--- a/themes/default-bootstrap/css/category.css
+++ b/themes/default-bootstrap/css/category.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* ************************************************************************************************
       							Categories Page Styles
 ************************************************************************************************ */
diff --git a/themes/default-bootstrap/css/cms.css b/themes/default-bootstrap/css/cms.css
index 5f39f39b5..474f4a9a1 100644
--- a/themes/default-bootstrap/css/cms.css
+++ b/themes/default-bootstrap/css/cms.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /**************************************************************
 					CMS Pages Styles
 ***************************************************************/
diff --git a/themes/default-bootstrap/css/comparator.css b/themes/default-bootstrap/css/comparator.css
index f87343699..8c5666779 100644
--- a/themes/default-bootstrap/css/comparator.css
+++ b/themes/default-bootstrap/css/comparator.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /********************************************************************
 					Compare Page Styles
 ********************************************************************/
@@ -83,6 +82,10 @@ table#product_comparison .comparison_unit_price {
   font-style: italic;
 }
 
+.ie8 table#product_comparison .product-image-block .product_image img {
+  width: auto;
+}
+
 .footer_link {
   margin-bottom: 20px;
 }
diff --git a/themes/default-bootstrap/css/contact-form.css b/themes/default-bootstrap/css/contact-form.css
index 70dc69983..27b823ea6 100644
--- a/themes/default-bootstrap/css/contact-form.css
+++ b/themes/default-bootstrap/css/contact-form.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /**************************************************************************
 					Contact Page Styles
 **************************************************************************/
diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css
index ef7453301..6030df04c 100644
--- a/themes/default-bootstrap/css/global.css
+++ b/themes/default-bootstrap/css/global.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* ##################################################################################################
 	PRESTASHOP SCSS
 ################################################################################################## */
@@ -797,6 +796,39 @@ table.table_block td {
   transform: rotate(136deg);
 }
 
+.ie8 .new {
+  left: 0px;
+  top: 0px;
+  width: auto;
+  padding: 5px 15px;
+}
+.ie8 .new:after {
+  display: none;
+}
+.ie8 .new:before {
+  display: none;
+}
+.ie8 .sale {
+  right: 0px;
+  top: 0px;
+  width: auto;
+  padding: 5px 15px;
+}
+.ie8 .sale:after {
+  display: none;
+}
+.ie8 .sale:before {
+  display: none;
+}
+.ie8 .new-box {
+  top: -1px;
+  left: -1px;
+}
+.ie8 .sale-box {
+  right: -1px;
+  top: -1px;
+}
+
 /************************************* BOXES *****************************************************/
 .box {
   background: #fbfbfb;
@@ -1127,7 +1159,6 @@ table.table_block td {
   right: 0;
   top: 0;
   cursor: pointer;
-  text-align: center;
   font-family: "FontAwesome";
   font-size: 14px;
 }
@@ -1139,6 +1170,7 @@ table.table_block td {
   height: 30px;
   color: #333333;
   line-height: 30px;
+  text-align: center;
 }
 #categories_block_left li span.grower.CLOSE:before {
   content: "";
@@ -1245,7 +1277,6 @@ ul.footer_links li + li {
 .content_sortPagiBar .sortPagiBar #productsSortForm select {
   max-width: 192px;
   float: left;
-  /* max 991px */
 }
 @media (max-width: 991px) {
   .content_sortPagiBar .sortPagiBar #productsSortForm select {
@@ -1592,9 +1623,7 @@ ul.step li.step_current span {
 ul.step li.step_current_end {
   font-weight: bold;
 }
-ul.step li.step_todo span {
-  display: block;
-  color: #333333;
+ul.step li.step_todo {
   background: #f7f7f7;
   background: -moz-linear-gradient(top, #f7f7f7 0%, #ededed 100%);
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f7f7f7), color-stop(100%, #ededed));
@@ -1603,8 +1632,12 @@ ul.step li.step_todo span {
   background: -ms-linear-gradient(top, #f7f7f7 0%, #ededed 100%);
   background: linear-gradient(to bottom, #f7f7f7 0%, #ededed 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
+}
+ul.step li.step_todo span {
+  display: block;
   border: 1px solid;
   border-color: white;
+  color: #333333;
   position: relative;
 }
 @media (min-width: 992px) {
@@ -1617,12 +1650,6 @@ ul.step li.step_todo span {
 }
 ul.step li.step_done {
   border-color: #666666 #5f5f5f #292929 #5f5f5f;
-}
-ul.step li.step_done a {
-  color: white;
-  text-shadow: 1px 1px rgba(0, 0, 0, 0.3);
-  border: 1px solid;
-  border-color: #8b8a8a;
   background: #727171;
   background: -moz-linear-gradient(top, #727171 0%, #666666 100%);
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #727171), color-stop(100%, #666666));
@@ -1632,6 +1659,12 @@ ul.step li.step_done a {
   background: linear-gradient(to bottom, #727171 0%, #666666 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#727171', endColorstr='#666666',GradientType=0 );
 }
+ul.step li.step_done a {
+  color: white;
+  text-shadow: 1px 1px rgba(0, 0, 0, 0.3);
+  border: 1px solid;
+  border-color: #8b8a8a;
+}
 @media (min-width: 992px) {
   ul.step li.step_done a {
     padding-left: 38px;
@@ -1942,6 +1975,10 @@ div.star_hover a, div.star a:hover {
   background: #2b2b2b;
 }
 
+.ie8 #header #header_logo {
+  width: 350px;
+}
+
 /* ************************************************************************************************
 		BREADCRUMB
 ************************************************************************************************ */
@@ -2022,6 +2059,16 @@ div.star_hover a, div.star a:hover {
   color: #777;
 }
 
+.ie8 .breadcrumb {
+  min-height: 1px;
+}
+.ie8 .breadcrumb a:after {
+  display: none;
+}
+.ie8 .breadcrumb .navigation-pipe {
+  width: 20px;
+}
+
 /* ************************************************************************************************
 		FOOTER
 ************************************************************************************************ */
@@ -3395,3 +3442,7 @@ div.star.star_hover:after {
     padding-bottom: 0;
   }
 }
+
+.ie8 #facebook_block, .ie8 #cmsinfo_block {
+  height: 344px;
+}
diff --git a/themes/default-bootstrap/css/history.css b/themes/default-bootstrap/css/history.css
index ba1745ea4..6d23cf9e2 100644
--- a/themes/default-bootstrap/css/history.css
+++ b/themes/default-bootstrap/css/history.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /************************************************************
 				History Page Styles
 ************************************************************/
diff --git a/themes/default-bootstrap/css/jquery/footable.core.css b/themes/default-bootstrap/css/jquery/footable.core.css
index 13d0471d2..c6494cb59 100644
--- a/themes/default-bootstrap/css/jquery/footable.core.css
+++ b/themes/default-bootstrap/css/jquery/footable.core.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 .footable {
   width: 100%;
 }
diff --git a/themes/default-bootstrap/css/jquery/jquery.bxslider.css b/themes/default-bootstrap/css/jquery/jquery.bxslider.css
index 830fa4a05..6dea981a0 100644
--- a/themes/default-bootstrap/css/jquery/jquery.bxslider.css
+++ b/themes/default-bootstrap/css/jquery/jquery.bxslider.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /**
  * BxSlider v4.0 - Fully loaded, responsive content slider
  * http://bxslider.com
diff --git a/themes/default-bootstrap/css/maintenance.css b/themes/default-bootstrap/css/maintenance.css
index dbfac44f6..2f0118c79 100644
--- a/themes/default-bootstrap/css/maintenance.css
+++ b/themes/default-bootstrap/css/maintenance.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /*********************************************************************
 					Maintenance Page Styles
 **********************************************************************/
diff --git a/themes/default-bootstrap/css/modules/blockcart/blockcart.css b/themes/default-bootstrap/css/modules/blockcart/blockcart.css
index af6fd2692..4c5da1383 100644
--- a/themes/default-bootstrap/css/modules/blockcart/blockcart.css
+++ b/themes/default-bootstrap/css/modules/blockcart/blockcart.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* Special style for block cart*/
 /*******************************************************************
 					Cart Block Styles
@@ -170,6 +169,9 @@
 #header #cart_block #cart-buttons {
   background: url(../../../img/cart-shadow.png) repeat-x #333333;
 }
+#header .block_content {
+  margin-bottom: 0;
+}
 
 #cart_block #cart_block_summary, #cart_block .title_block span, #header #cart_block h4, #header #cart_block .title_block, #header #cart_block h4 {
   display: none;
diff --git a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
index e71eb208d..7ad7482d4 100644
--- a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
+++ b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* block CONTACT ******************************************************************************* */
 @media (max-width: 767px) {
   #contact_block {
diff --git a/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css b/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css
index c898ef199..0dc8f482f 100644
--- a/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css
+++ b/themes/default-bootstrap/css/modules/blocklayered/blocklayered-15.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #enabled_filters {
   background: #484848;
   padding: 16px 20px;
@@ -245,3 +244,14 @@
 .hide-action:hover {
   font-weight: bold;
 }
+
+#ul_layered_price_0 .col-xs-6, #ul_layered_weight_0 .col-xs-6 {
+  padding-top: 10px;
+}
+@media (min-width: 1200px) {
+  #ul_layered_price_0 .col-xs-6, #ul_layered_weight_0 .col-xs-6 {
+    padding-top: 0;
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
diff --git a/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css b/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css
index f6d8e5155..b5e49dc4d 100644
--- a/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css
+++ b/themes/default-bootstrap/css/modules/blocklayered/blocklayered.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #layered_block_left ul.layered_filter_ul {
   border-top: 1px solid #d6d4d4;
 }
diff --git a/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css b/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
index 0844edea4..04eda0079 100644
--- a/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
+++ b/themes/default-bootstrap/css/modules/blocknewsletter/blocknewsletter.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* Block newsletter */
 #columns #newsletter_block_left .form-group {
   margin-bottom: 0;
@@ -60,6 +59,7 @@
 }
 #footer #newsletter_block_left .form-group .form-control {
   height: 45px;
+  line-height: 30px;
   max-width: 267px;
   background: #3c3c3c;
   border-color: #515151;
@@ -74,7 +74,7 @@
   box-shadow: black 0px 0px 0px;
 }
 #footer #newsletter_block_left .form-group .button-small {
-  margin-left: -42px;
+  margin-left: -43px;
   border: none;
   background: none;
   text-align: center;
diff --git a/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css b/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css
index fd048bf56..6483bd13a 100644
--- a/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css
+++ b/themes/default-bootstrap/css/modules/blocksearch/blocksearch.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* block top search */
 #search_block_top {
   position: absolute;
@@ -46,6 +45,8 @@
   display: block;
   font-family: "FontAwesome";
   font-size: 17px;
+  width: 100%;
+  text-align: center;
 }
 #search_block_top .btn.button-search:hover {
   color: #6f6f6f;
@@ -53,6 +54,7 @@
 #search_block_top #search_query_top {
   padding: 0 13px;
   height: 45px;
+  line-height: 45px;
   width: 271px;
   background: #fbfbfb;
   float: left;
diff --git a/themes/default-bootstrap/css/modules/blocktags/blocktags.css b/themes/default-bootstrap/css/modules/blocktags/blocktags.css
index ecfa79e24..e9a1bd886 100644
--- a/themes/default-bootstrap/css/modules/blocktags/blocktags.css
+++ b/themes/default-bootstrap/css/modules/blocktags/blocktags.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 .tags_block .block_content {
   overflow: hidden;
 }
diff --git a/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css b/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css
index da2ff11b8..19153c100 100644
--- a/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css
+++ b/themes/default-bootstrap/css/modules/blocktopmenu/css/superfish-modified.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /*** ESSENTIAL STYLES ***/
 .sf-contener {
   clear: both;
@@ -198,36 +197,38 @@ ul.sf-menu li li li.sfHover ul {
   color: #515151;
 }
 
-.sf-menu > li > ul > li:not(#category-thumbnail) {
+.sf-menu > li > ul > li {
   float: left;
   width: 20%;
   padding-right: 15px;
 }
 @media (max-width: 767px) {
-  .sf-menu > li > ul > li:not(#category-thumbnail) {
+  .sf-menu > li > ul > li {
     width: 50%;
   }
 }
 @media (max-width: 479px) {
-  .sf-menu > li > ul > li:not(#category-thumbnail) {
+  .sf-menu > li > ul > li {
     width: 100%;
   }
 }
 @media (min-width: 768px) {
-  .sf-menu > li > ul > li:not(#category-thumbnail).first-in-line-lg {
+  .sf-menu > li > ul > li.first-in-line-lg {
     clear: left;
   }
 }
 @media (min-width: 480px) and (max-width: 767px) {
-  .sf-menu > li > ul > li:not(#category-thumbnail).first-in-line-xs {
+  .sf-menu > li > ul > li.first-in-line-xs {
     clear: left;
   }
 }
 
 .sf-menu > li > ul > li#category-thumbnail {
-  width: 100%;
+  width: 100% !important;
+  float: none;
   clear: both;
   overflow: hidden;
+  padding-right: 0;
 }
 .sf-menu > li > ul > li#category-thumbnail > div {
   float: left;
diff --git a/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css b/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
index 2aef77d5a..af97ffdfd 100644
--- a/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
+++ b/themes/default-bootstrap/css/modules/blockuserinfo/blockuserinfo.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* block top user information */
 #header_right #header_user {
   clear: both;
@@ -22,7 +21,7 @@
 #header_right #header_user #shopping_cart a {
   padding: 7px 10px 14px 16px;
   background: #333333;
-  min-width: 270px;
+  width: 270px;
   display: block;
   font-weight: bold;
   color: #777777;
@@ -31,7 +30,7 @@
 }
 @media (min-width: 768px) and (max-width: 991px) {
   #header_right #header_user #shopping_cart a {
-    min-width: 190px;
+    width: 190px;
   }
 }
 @media (min-width: 768px) and (max-width: 991px) {
diff --git a/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css b/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css
index 26ec29c50..7dafc35d6 100644
--- a/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css
+++ b/themes/default-bootstrap/css/modules/blockwishlist/blockwishlist.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* module blockwishlist */
 /* lnk on detail product page */
 #primary_block #wishlist_button {
diff --git a/themes/default-bootstrap/css/modules/carriercompare/style.css b/themes/default-bootstrap/css/modules/carriercompare/style.css
index bbd6e53c8..5d5f7f832 100644
--- a/themes/default-bootstrap/css/modules/carriercompare/style.css
+++ b/themes/default-bootstrap/css/modules/carriercompare/style.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #compare_shipping .form-group {
   line-height: normal;
   margin-bottom: 10px;
diff --git a/themes/default-bootstrap/css/modules/crossselling/crossselling.css b/themes/default-bootstrap/css/modules/crossselling/crossselling.css
index de6746ee6..e69de29bb 100644
--- a/themes/default-bootstrap/css/modules/crossselling/crossselling.css
+++ b/themes/default-bootstrap/css/modules/crossselling/crossselling.css
@@ -1 +0,0 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
diff --git a/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css b/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css
index c30582e09..52f1bd3e9 100644
--- a/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css
+++ b/themes/default-bootstrap/css/modules/favoriteproducts/favoriteproducts.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #favoriteproducts_block_account .favoriteproduct {
   position: relative;
   margin-bottom: 14px;
diff --git a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
index cc8d96652..65e0089d2 100644
--- a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
+++ b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /**
  * BxSlider v4.0 - Fully loaded, responsive content slider
  * http://bxslider.com
@@ -221,3 +220,7 @@
   font-size: .85em;
   padding: 10px;
 }
+
+.ie8 #homepage-slider .bx-wrapper .bx-controls-direction a:before {
+  background: #333333;
+}
diff --git a/themes/default-bootstrap/css/modules/productcomments/productcomments.css b/themes/default-bootstrap/css/modules/productcomments/productcomments.css
index 722424fb0..bd7922fb3 100644
--- a/themes/default-bootstrap/css/modules/productcomments/productcomments.css
+++ b/themes/default-bootstrap/css/modules/productcomments/productcomments.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #product_comments_block_extra {
   padding: 8px 10px 10px;
   font-weight: bold;
diff --git a/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css b/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css
index fa8a0cb60..91da7cc99 100644
--- a/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css
+++ b/themes/default-bootstrap/css/modules/stripejs/stripe-prestashop.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #stripe-payment-form {
   line-height: 20px;
   padding-bottom: 7px;
diff --git a/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css
index 164fdf309..eef234ead 100644
--- a/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css
+++ b/themes/default-bootstrap/css/modules/themeconfigurator/views/css/hooks.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* Home hook CSS */
 #htmlcontent_home ul {
   margin: 0 -5px;
diff --git a/themes/default-bootstrap/css/my-account.css b/themes/default-bootstrap/css/my-account.css
index b4cc6573d..c52681160 100644
--- a/themes/default-bootstrap/css/my-account.css
+++ b/themes/default-bootstrap/css/my-account.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 #my-account .addresses-lists {
   margin-bottom: 30px;
 }
diff --git a/themes/default-bootstrap/css/order-opc.css b/themes/default-bootstrap/css/order-opc.css
index d3a8512f7..75dc1301d 100644
--- a/themes/default-bootstrap/css/order-opc.css
+++ b/themes/default-bootstrap/css/order-opc.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /********************************************************
 			One-Page Checkout Styles
 ********************************************************/
diff --git a/themes/default-bootstrap/css/product.css b/themes/default-bootstrap/css/product.css
index 699e0bd87..ca2fb2372 100644
--- a/themes/default-bootstrap/css/product.css
+++ b/themes/default-bootstrap/css/product.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /* product desc */
 /* primary_block ***************************************************************************** */
 #primary_block {
@@ -98,6 +97,11 @@ img {
   color: #333333;
 }
 
+.ie8 #pb-right-column #image-block #view_full_size .span_link {
+  background: #fff;
+  border: 1px solid #d6d4d4;
+}
+
 /* miniatures */
 #pb-right-column #views_block {
   margin-top: 10px;
@@ -237,6 +241,9 @@ span.view_scroll_spacer {
   content: "";
 }
 
+#view_scroll_left {
+  margin-top: 0;
+}
 #view_scroll_left:before {
   content: "";
   padding-right: 2px;
@@ -249,6 +256,15 @@ span.view_scroll_spacer {
   margin-right: 6px;
 }
 
+.view_scroll_spacer {
+  margin-top: 38px;
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .view_scroll_spacer {
+    margin-top: 28px;
+  }
+}
+
 /* link list */
 #usefull_link_block {
   list-style-type: none;
@@ -520,6 +536,12 @@ span.view_scroll_spacer {
   border-radius: 5px;
   position: relative;
   display: block;
+  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #009ad0), color-stop(100%, #007ab7));
+  background-image: -webkit-linear-gradient(#009ad0, #007ab7);
+  background-image: -moz-linear-gradient(#009ad0, #007ab7);
+  background-image: -o-linear-gradient(#009ad0, #007ab7);
+  background-image: linear-gradient(#009ad0, #007ab7);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
 }
 .box-info-product .exclusive:before {
   font-family: "FontAwesome";
@@ -564,12 +586,6 @@ span.view_scroll_spacer {
 }
 
 .box-info-product .exclusive span {
-  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #009ad0), color-stop(100%, #007ab7));
-  background-image: -webkit-linear-gradient(#009ad0, #007ab7);
-  background-image: -moz-linear-gradient(#009ad0, #007ab7);
-  background-image: -o-linear-gradient(#009ad0, #007ab7);
-  background-image: linear-gradient(#009ad0, #007ab7);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
   -webkit-border-radius: 5px;
   -moz-border-radius: 5px;
   -ms-border-radius: 5px;
@@ -604,7 +620,7 @@ span.view_scroll_spacer {
   }
 }
 
-.box-info-product .exclusive:hover span {
+.box-info-product .exclusive:hover {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #007ab7), color-stop(100%, #009ad0));
   background-image: -webkit-linear-gradient(#007ab7, #009ad0);
   background-image: -moz-linear-gradient(#007ab7, #009ad0);
@@ -704,6 +720,7 @@ table.table-produst-discounts tr th {
   padding: 0 6px;
   float: left;
   border: 1px solid #d6d4d4;
+  line-height: 27px;
 }
 #quantity_wanted_p .btn {
   float: left;
@@ -777,6 +794,10 @@ table.table-produst-discounts tr th {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff', endColorstr='#fbfbfb',GradientType=0 );
 }
 
+.ie8 .box-security {
+  filter: none;
+}
+
 /* prices */
 .content_prices {
   padding: 13px 19px;
diff --git a/themes/default-bootstrap/css/product_list.css b/themes/default-bootstrap/css/product_list.css
index d22fb2c79..79ca7f720 100644
--- a/themes/default-bootstrap/css/product_list.css
+++ b/themes/default-bootstrap/css/product_list.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /*******************************************************
 			 Product list Styles
 ********************************************************/
@@ -74,6 +73,11 @@ ul.product_list .comments_note .nb-comments {
   font-style: italic;
 }
 
+.ie8 .quick-view {
+  background: #fff;
+  border: 1px solid #d6d4d4;
+}
+
 /*******************************************************
 			 Product list(Grid) Styles 
 ********************************************************/
diff --git a/themes/default-bootstrap/css/scenes.css b/themes/default-bootstrap/css/scenes.css
index 0c0e86671..84ef84c77 100644
--- a/themes/default-bootstrap/css/scenes.css
+++ b/themes/default-bootstrap/css/scenes.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /*TMP*/
 #scenes .cluetip span {
   background: transparent url(../img/icon/cible.gif) no-repeat scroll center center;
diff --git a/themes/default-bootstrap/css/sitemap.css b/themes/default-bootstrap/css/sitemap.css
index 51c146ba7..5621cfd78 100644
--- a/themes/default-bootstrap/css/sitemap.css
+++ b/themes/default-bootstrap/css/sitemap.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /******************************************************************
 					Sitemap Page Styles
 *******************************************************************/
diff --git a/themes/default-bootstrap/css/stores.css b/themes/default-bootstrap/css/stores.css
index 4432d1a3b..4ac385f54 100644
--- a/themes/default-bootstrap/css/stores.css
+++ b/themes/default-bootstrap/css/stores.css
@@ -1,4 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 /***********************************************************
 					Stores Page Styles
 ************************************************************/
diff --git a/themes/default-bootstrap/discount.tpl b/themes/default-bootstrap/discount.tpl
index 69ec11003..26a363bb3 100644
--- a/themes/default-bootstrap/discount.tpl
+++ b/themes/default-bootstrap/discount.tpl
@@ -47,7 +47,7 @@
 			<td date-value="{$discountDetail.quantity_for_user}" class="discount_quantity">{$discountDetail.quantity_for_user}</td>
 			<td class="discount_value">
 				{if $discountDetail.id_discount_type == 1}
-					{$discountDetail.value|escape:'htmlall':'UTF-8'}%
+					{$discountDetail.value|escape:'html':'UTF-8'}%
 				{elseif $discountDetail.id_discount_type == 2}
 					{convertPrice price=$discountDetail.value} ({if $discountDetail.reduction_tax == 1}{l s='Tax included'}{else}{l s='Tax excluded'}{/if})
 				{elseif $discountDetail.id_discount_type == 3}
diff --git a/themes/default-bootstrap/errors.tpl b/themes/default-bootstrap/errors.tpl
index 94f52f479..8d0abf911 100644
--- a/themes/default-bootstrap/errors.tpl
+++ b/themes/default-bootstrap/errors.tpl
@@ -32,7 +32,7 @@
 		{/foreach}
 		</ol>
 		{if isset($smarty.server.HTTP_REFERER) && !strstr($request_uri, 'authentication') && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
-			<p class="lnk"><a href="{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}" title="{l s='Back'}">&laquo; {l s='Back'}</a></p>
+			<p class="lnk"><a href="{$smarty.server.HTTP_REFERER|escape:'html':'UTF-8'|secureReferrer}" title="{l s='Back'}">&laquo; {l s='Back'}</a></p>
 		{/if}
 	</div>
 {/if}
\ No newline at end of file
diff --git a/themes/default-bootstrap/guest-tracking.tpl b/themes/default-bootstrap/guest-tracking.tpl
index f436f5e2a..25235feb1 100644
--- a/themes/default-bootstrap/guest-tracking.tpl
+++ b/themes/default-bootstrap/guest-tracking.tpl
@@ -67,7 +67,7 @@
 	{if isset($transformSuccess)}
 		<p class="alert alert-success">{l s='Your guest account has been successfully transformed into a customer account. You can now login as a registered shopper. '} <a href="{$link->getPageLink('authentication', true)|escape:'html'}">{l s='page.'}</a></p>
 	{else}
-		<form method="post" action="{$action|escape:'htmlall':'UTF-8'}#guestToCustomer" class="std">
+		<form method="post" action="{$action|escape:'html':'UTF-8'}#guestToCustomer" class="std">
 			<fieldset class="description_box box">
             	
                 <p><strong class="dark">{l s='Transform your guest account into a customer account and enjoy:'}</strong></p>
@@ -85,9 +85,9 @@
                     </div>
                 </div>
 				
-				<input type="hidden" name="id_order" value="{if isset($order->id)}{$order->id}{else}{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}{/if}" />
-				<input type="hidden" name="order_reference" value="{if isset($smarty.get.order_reference)}{$smarty.get.order_reference|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.order_reference)}{$smarty.post.order_reference|escape:'htmlall':'UTF-8'}{/if}{/if}" />
-				<input type="hidden" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+				<input type="hidden" name="id_order" value="{if isset($order->id)}{$order->id}{else}{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'html':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'html':'UTF-8'}{/if}{/if}{/if}" />
+				<input type="hidden" name="order_reference" value="{if isset($smarty.get.order_reference)}{$smarty.get.order_reference|escape:'html':'UTF-8'}{else}{if isset($smarty.post.order_reference)}{$smarty.post.order_reference|escape:'html':'UTF-8'}{/if}{/if}" />
+				<input type="hidden" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'html':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'}{/if}{/if}" />
 				
 				<p>
                     <button type="submit" name="submitTransformGuestToCustomer" class="button button-medium btn btn-default"><span>{l s='Send'}<i class="icon-chevron-right right"></i></span></button>
@@ -100,17 +100,17 @@
 	{if isset($show_login_link) && $show_login_link}
 		<p><img src="{$img_dir}icon/userinfo.gif" alt="{l s='Information'}" class="icon" /><a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='Click here to login to your customer account.'}</a><br /><br /></p>
 	{/if}
-	<form method="post" action="{$action|escape:'htmlall':'UTF-8'}" class="std" id="guestTracking">
+	<form method="post" action="{$action|escape:'html':'UTF-8'}" class="std" id="guestTracking">
 		<fieldset class="description_box box">
 			<h2 class="page-subheading">{l s='To track your order, please enter the following information:'}</h2>
                     <div class="text form-group">
                         <label>{l s='Order Reference:'} </label>
-                        <input class="form-control" type="text" name="order_reference" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'htmlall':'UTF-8'}{/if}{/if}" size="8" />
+                        <input class="form-control" type="text" name="order_reference" value="{if isset($smarty.get.id_order)}{$smarty.get.id_order|escape:'html':'UTF-8'}{else}{if isset($smarty.post.id_order)}{$smarty.post.id_order|escape:'html':'UTF-8'}{/if}{/if}" size="8" />
                         <i>{l s='For example: QIIXJXNUI or QIIXJXNUI#1'}</i>
                     </div>
                     <div class="text form-group">
                         <label>{l s='Email:'}</label>
-                        <input class="form-control" type="text" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'htmlall':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+                        <input class="form-control" type="text" name="email" value="{if isset($smarty.get.email)}{$smarty.get.email|escape:'html':'UTF-8'}{else}{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'}{/if}{/if}" />
                     </div>
 			<p>
                 <button type="submit" name="submitGuestTracking" class="button btn btn-default button-medium"><span>{l s='Send'}<i class="icon-chevron-right right"></i></span></button>
diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index 7017fce5a..bbc681892 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -67,7 +67,8 @@
         <link href="{$css_dir}/jquery/uniform.default.css" rel="stylesheet" type="text/css" media="all" />
         <link href="{$css_dir}/highdpi.css" rel="stylesheet" media="only screen and (-webkit-min-device-pixel-ratio: 2)" />
         <link href="{$css_dir}/jquery/footable.core.css" rel="stylesheet" type="text/css" media="all" />
-        <link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" /> 
+        <link href="{$css_dir}jquery/jquery.bxslider.css" rel="stylesheet" type="text/css" media="all" />
+        <link href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic' rel='stylesheet' type='text/css' />
 {if isset($css_files)}
 	{foreach from=$css_files key=css_uri item=media}
 	<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
@@ -79,7 +80,7 @@
 	{/foreach}
 {/if}
 <script src="{$js_dir}/tools/bootstrap.min.js"></script>
-<!--[if IE 7]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
+<!--[if IE 8]><html class="no-js lt-ie9 ie8" lang="{$lang_iso}">
 	 <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
 <![endif]-->
@@ -93,7 +94,7 @@
 		{$HOOK_HEADER}
 	</head>
 	
-	<body {if isset($page_name)}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{if $hide_left_column}hide-left-column {/if} {if $hide_right_column}hide-right-column {/if} {if $content_only} content_only {/if}lang_{$lang_iso}">
+	<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if $hide_left_column}hide-left-column {/if} {if $hide_right_column}hide-right-column {/if} {if $content_only} content_only {/if}lang_{$lang_iso}">
 	{if !$content_only}
 		{if isset($restricted_country_mode) && $restricted_country_mode}
 		<div id="restricted-country">
@@ -109,9 +110,9 @@
                         	 <!-- User info -->
                         	<div id="header_user_info">
                                 {if $logged}
-                                    <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out' mod='blockuserinfo'}" class="logout" rel="nofollow">{l s='Sign out' mod='blockuserinfo'}</a>
+                                    <a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out'}" class="logout" rel="nofollow">{l s='Sign out'}</a>
                                 {else}
-                                    <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account' mod='blockuserinfo'}" class="login" rel="nofollow">{l s='Sign in' mod='blockuserinfo'}</a>
+                                    <a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Login to your customer account'}" class="login" rel="nofollow">{l s='Sign in'}</a>
                                 {/if}
                             </div>
                             <!-- /User info -->
@@ -168,7 +169,7 @@
                                         <div class="current">
                                             <input type="hidden" name="id_currency" id="id_currency" value=""/>
                                             <input type="hidden" name="SubmitCurrency" value="" />
-                                            <span class="cur-label">{l s='Currency' mod='blockcurrencies'} :</span>
+                                            <span class="cur-label">{l s='Currency'} :</span>
                                             {foreach from=$currencies key=k item=f_currency}
                                                 {if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
                                             {/foreach}
@@ -186,14 +187,14 @@
 							<!-- /Currencies -->
                             <!--Contact link-->
                             <div id="contact-link">
-                                <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='Contact Us' mod='blockpermanentlinks'}</a>
+                                <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
                             </div>
                             <span class="shop-phone"><i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}(800) 2345-6789</strong></span>
                         </div>
                     </div>
                 	<div class="container header-row-2">
-                        <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
-                            <img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
+                        <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
+                            <img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
                         </a>
                         <div id="header_right">
                             {$HOOK_TOP}
diff --git a/themes/default-bootstrap/history.tpl b/themes/default-bootstrap/history.tpl
index c293cd4b0..0fccacc58 100644
--- a/themes/default-bootstrap/history.tpl
+++ b/themes/default-bootstrap/history.tpl
@@ -54,8 +54,8 @@
 				</td>
 				<td data-value="{$order.date_add|regex_replace:"/[\-\:\ ]/":""}" class="history_date bold">{dateFormat date=$order.date_add full=0}</td>
 				<td class="history_price" data-value="{$order.total_paid}"><span class="price">{displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</span></td>
-				<td class="history_method">{$order.payment|escape:'htmlall':'UTF-8'}</td>
-				<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'htmlall':'UTF-8'}</span>{/if}</td>
+				<td class="history_method">{$order.payment|escape:'html':'UTF-8'}</td>
+				<td data-value="{$order.id_order_state}" class="history_state">{if isset($order.order_state)}<span class="label{if $order.id_order_state == 1 || $order.id_order_state == 10 || $order.id_order_state == 11} label-info{elseif $order.id_order_state == 5 || $order.id_order_state == 2 || $order.id_order_state == 12} label-success{elseif $order.id_order_state == 6 || $order.id_order_state == 7 || $order.id_order_state == 8} label-danger{elseif $order.id_order_state == 3 || $order.id_order_state == 9 || $order.id_order_state == 4} label-warning{/if}">{$order.order_state|escape:'html':'UTF-8'}</span>{/if}</td>
 				<td class="history_invoice">
 				{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
 					<a class="link-button" href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html'}" title="{l s='Invoice'}" class="_blank"><i class="icon-file-text large"></i>{l s='PDF'}</a>
diff --git a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
index 230f1731d..dfbceb697 100644
--- a/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
+++ b/themes/default-bootstrap/js/modules/blockcart/ajax-cart.js
@@ -598,7 +598,7 @@ var ajaxCart = {
 		$('.layer_cart_overlay').css('height','100%');
 		$('.layer_cart_overlay').show();
 		$('#layer_cart').css({'top': n}).fadeIn('fast');
-		//$.scrollTo('#layer_cart', 400);
+		$.scrollTo('#layer_cart', 400);
 		crossselling_serialScroll();
 	},
 
diff --git a/themes/default-bootstrap/js/stores.js b/themes/default-bootstrap/js/stores.js
index dd1ff1467..4686c19b5 100644
--- a/themes/default-bootstrap/js/stores.js
+++ b/themes/default-bootstrap/js/stores.js
@@ -114,7 +114,7 @@ function searchLocationsNear(center)
 			createOption(name, distance, i);
 			createMarker(latlng, name, address, other, id_store, has_store_picture);
 			bounds.extend(latlng);
-			$('table#stores-table').find('tbody').append('<tr ><td class="num">'+parseInt(i + 1)+'</td><td class="name">'+(has_store_picture == 1 ? '<img src="'+img_store_dir+parseInt(id_store)+'-stores_default.jpg" alt="" />' : '')+'<span>'+name+'</span></td><td class="address">'+address+(phone !== '' ? ''+translation_4+' '+phone : '')+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
+			$('table#stores-table').find('tbody').append('<tr ><td class="num">'+parseInt(i + 1)+'</td><td class="name">'+(has_store_picture == 1 ? '<img src="'+img_store_dir+parseInt(id_store)+'.jpg" alt="" />' : '')+'<span>'+name+'</span></td><td class="address">'+address+(phone !== '' ? ''+translation_4+' '+phone : '')+'</td><td class="distance">'+distance+' '+distance_unit+'</td></tr>');
 			$('#stores-table').show();
 		}
 
@@ -137,7 +137,7 @@ function searchLocationsNear(center)
 
 function createMarker(latlng, name, address, other, id_store, has_store_picture)
 {
-	var html = '<b>'+name+'</b><br/>'+address+(has_store_picture === 1 ? '<br /><br /><img src="'+img_store_dir+parseInt(id_store)+'-medium_default.jpg" alt="" />' : '')+other+'<br /><a href="http://maps.google.com/maps?saddr=&daddr='+latlng+'" target="_blank">'+translation_5+'<\/a>';
+	var html = '<b>'+name+'</b><br/>'+address+(has_store_picture === 1 ? '<br /><br /><img src="'+img_store_dir+parseInt(id_store)+'.jpg" alt="" />' : '')+other+'<br /><a href="http://maps.google.com/maps?saddr=&daddr='+latlng+'" target="_blank">'+translation_5+'<\/a>';
 	var image = new google.maps.MarkerImage(img_ps_dir+logo_store);
 	var marker = '';
 
diff --git a/themes/default-bootstrap/lang/en.php b/themes/default-bootstrap/lang/en.php
index 10279038d..11136241c 100644
--- a/themes/default-bootstrap/lang/en.php
+++ b/themes/default-bootstrap/lang/en.php
@@ -95,7 +95,7 @@ $_LANG['history_bd0e34e5be6447844e6f262d51f1a9dc'] = 'Price Rules';
 $_LANG['history_ec53a8c4f07baed5d8825072c89799be'] = 'Status';
 $_LANG['history_466eadd40b3c10580e3ab4e8061161ce'] = 'Invoice';
 $_LANG['history_bcd1b68617759b1dfcff0403a6b5a8d1'] = 'PDF';
-$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account.';
+$_LANG['history_0b3db27bc15f682e92ff250ebb167d4b'] = 'Back to your account';
 $_LANG['history_8cf04a9734132302f96da8e113e80ce5'] = 'Home';
 $_LANG['history_01abfc750a0c942167651c40d088531d'] = '#';
 $_LANG['identity_19f823c6453c2b1ffd09cb715214813d'] = 'Required field';
diff --git a/themes/default-bootstrap/maintenance.tpl b/themes/default-bootstrap/maintenance.tpl
index 5b5939345..8a8e0fc41 100644
--- a/themes/default-bootstrap/maintenance.tpl
+++ b/themes/default-bootstrap/maintenance.tpl
@@ -26,13 +26,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}" lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>	
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>	
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 {if isset($meta_description)}
-		<meta name="description" content="{$meta_description|escape:'htmlall':'UTF-8'}" />
+		<meta name="description" content="{$meta_description|escape:'html':'UTF-8'}" />
 {/if}
 {if isset($meta_keywords)}
-		<meta name="keywords" content="{$meta_keywords|escape:'htmlall':'UTF-8'}" />
+		<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 {/if}
 		<meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
 		<link rel="shortcut icon" href="{$favicon_url}" />
diff --git a/themes/default-bootstrap/manufacturer-list.tpl b/themes/default-bootstrap/manufacturer-list.tpl
index 5b669e8a9..240940682 100644
--- a/themes/default-bootstrap/manufacturer-list.tpl
+++ b/themes/default-bootstrap/manufacturer-list.tpl
@@ -73,16 +73,16 @@
             	<div class="left-side">
 					<!-- logo -->
 					<div class="logo">
-						{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$manufacturer.name|escape:'htmlall':'UTF-8'}" class="lnk_img">{/if}
-						<img src="{$img_manu_dir}{$manufacturer.image|escape:'htmlall':'UTF-8'}-medium_default.jpg" alt="" />
+						{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}" title="{$manufacturer.name|escape:'html':'UTF-8'}" class="lnk_img">{/if}
+						<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" />
 						{if $manufacturer.nb_products > 0}</a>{/if}
 					</div>
 				</div>
 				<div class="middle-side">
                 	<!-- name -->
 					<h3>
-						{if $manufacturer.nb_products > 0}<a class="product-name" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}">{/if}
-							{$manufacturer.name|truncate:60:'...'|escape:'htmlall':'UTF-8'}
+						{if $manufacturer.nb_products > 0}<a class="product-name" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
+							{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}
 						{if $manufacturer.nb_products > 0}</a>{/if}
 					</h3>
 					<div class="description rte">
@@ -92,12 +92,12 @@
 				<div class="right-side">
                 	<div class="right-side-content">
                         <p class="product-counter">
-                            {if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}">{/if}
+                            {if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{/if}
                             {if $manufacturer.nb_products == 1}{l s='%d product' sprintf=$manufacturer.nb_products|intval}{else}{l s='%d products' sprintf=$manufacturer.nb_products|intval}{/if}
                             {if $manufacturer.nb_products > 0}</a>{/if}
                         </p>
                     {if $manufacturer.nb_products > 0}
-                        <a class="btn btn-default button exclusive-medium" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}"><span>{l s='view products'} <i class="icon-chevron-right right"></i></span></a>
+                        <a class="btn btn-default button exclusive-medium" href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='view products'} <i class="icon-chevron-right right"></i></span></a>
                     {/if}
                     </div>
                 </div>
diff --git a/themes/default-bootstrap/manufacturer.tpl b/themes/default-bootstrap/manufacturer.tpl
index 49db1edcf..eaa213c74 100644
--- a/themes/default-bootstrap/manufacturer.tpl
+++ b/themes/default-bootstrap/manufacturer.tpl
@@ -27,7 +27,7 @@
 {include file="$tpl_dir./errors.tpl"}
 
 {if !isset($errors) OR !sizeof($errors)}
-	<h1 class="page-heading product-listing">{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'htmlall':'UTF-8'}</h1>
+	<h1 class="page-heading product-listing">{l s='List of products by manufacturer'}&nbsp;{$manufacturer->name|escape:'html':'UTF-8'}</h1>
 	{if !empty($manufacturer->description) || !empty($manufacturer->short_description)}
 		<div class="description_box">
 			{if !empty($manufacturer->short_description)}
diff --git a/themes/default-bootstrap/mobile/address.tpl b/themes/default-bootstrap/mobile/address.tpl
index 2fa091719..cc658b9c2 100644
--- a/themes/default-bootstrap/mobile/address.tpl
+++ b/themes/default-bootstrap/mobile/address.tpl
@@ -38,7 +38,7 @@ countriesNeedZipCode = new Array();
 	{if isset($country.states) && $country.contains_states}
 		countries[{$country.id_country|intval}] = new Array();
 		{foreach from=$country.states item='state' name='states'}
-			countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'htmlall':'UTF-8'}'{rdelim});
+			countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'html':'UTF-8'}'{rdelim});
 		{/foreach}
 	{/if}
 	{if $country.need_identification_number}
@@ -49,7 +49,7 @@ countriesNeedZipCode = new Array();
 	{/if}
 {/foreach}
 $(function(){ldelim}
-	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address->id_state)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
+	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address->id_state)}{$address->id_state|escape:'html':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
 {rdelim});
 {literal}
 $(document).ready(function() {
@@ -77,7 +77,7 @@ $(document).ready(function() {
 			{if isset($smarty.post.alias)}
 				"{$smarty.post.alias}"
 			{else}
-				{if isset($address->alias)}"{$address->alias|escape:'htmlall':'UTF-8'}"{/if}
+				{if isset($address->alias)}"{$address->alias|escape:'html':'UTF-8'}"{/if}
 			{/if}
 		{else}
 			{l s='To add a new address, please fill out the form below.'}
@@ -88,7 +88,7 @@ $(document).ready(function() {
 			<legend><h3>{if isset($id_address) && $id_address != 0}{l s='Your address'}{else}{l s='New address'}{/if}</h3></legend>
 			<div class="required text dni">
 				<label for="dni">{l s='Identification number'}</label>
-				<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+				<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'html':'UTF-8'}{/if}{/if}" />
 				<p>{l s='DNI / NIF / NIE'} <sup>*</sup></p>
 			</div>
 			{if $vat_display == 2}
@@ -101,7 +101,7 @@ $(document).ready(function() {
 				<div id="vat_number">
 					<p class="text">
 						<label for="vat_number">{l s='VAT number'}</label>
-						<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{else}{if isset($address->vat_number)}{$address->vat_number|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+						<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{else}{if isset($address->vat_number)}{$address->vat_number|escape:'html':'UTF-8'}{/if}{/if}" />
 					</p>
 				</div>
 			</div>
@@ -112,44 +112,44 @@ $(document).ready(function() {
 				<div class="text">
 					<input type="hidden" name="token" value="{$token}" />
 					<label for="company">{l s='Company'}</label>
-					<input type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+					<input type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'html':'UTF-8'}{/if}{/if}" />
 				</div>
 				{/if}
 				{if $field_name eq 'firstname'}
 				<div class="required text">
 					<label for="firstname">{l s='First name'} <sup>*</sup></label>
-					<input type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+					<input type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|escape:'html':'UTF-8'}{/if}{/if}" />
 				</div>
 				{/if}
 				{if $field_name eq 'lastname'}
 				<div class="required text">
 					<label for="lastname">{l s='Last name'} <sup>*</sup></label>
-					<input type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+					<input type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|escape:'html':'UTF-8'}{/if}{/if}" />
 				</div>
 				{/if}
 				{if $field_name eq 'address1'}
 				<div class="required text">
 					<label for="address1">{l s='Address'} <sup>*</sup></label>
-					<input type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+					<input type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|escape:'html':'UTF-8'}{/if}{/if}" />
 				</div>
 				{/if}
 				{if $field_name eq 'address2'}
 				<div class="required text">
 					<label for="address2">{l s='Address (Line 2)'}</label>
-					<input type="text" id="address2" name="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{else}{if isset($address->address2)}{$address->address2|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+					<input type="text" id="address2" name="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{else}{if isset($address->address2)}{$address->address2|escape:'html':'UTF-8'}{/if}{/if}" />
 				</div>
 				{/if}
 				{if $field_name eq 'postcode'}
 				{assign var="postCodeExist" value="true"}				
 				<div class="required postcode text">
 					<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
-					<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'htmlall':'UTF-8'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+					<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html':'UTF-8'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
 				</div>
 				{/if}
 				{if $field_name eq 'city'}
 				<div class="required text">
 					<label for="city">{l s='City'} <sup>*</sup></label>
-					<input type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'htmlall':'UTF-8'}{/if}{/if}" maxlength="64" />
+					<input type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'html':'UTF-8'}{/if}{/if}" maxlength="64" />
 				</div>
 				{/if}
 				{if $field_name eq 'Country:name' || $field_name eq 'country'}
@@ -197,7 +197,7 @@ $(document).ready(function() {
 			{if $postCodeExist eq "false"}
 			<div class="required postcode text hidden">
 				<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
-				<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'htmlall':'UTF-8'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+				<input type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html':'UTF-8'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
 			</div>
 			{/if}
 			{if $stateExist eq "false"}
@@ -210,21 +210,21 @@ $(document).ready(function() {
 			{/if}			
 			<div class="textarea">
 				<label for="other">{l s='Additional information'}</label>
-				<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other|escape:'htmlall':'UTF-8'}{/if}{/if}</textarea>
+				<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other|escape:'html':'UTF-8'}{/if}{/if}</textarea>
 			</div>
 			
 			<p>{l s='You must register at least one phone number.'} <sup class="required">*</sup></p>
 			<div class="text">
 				<label for="phone">{l s='Home phone'}</label>
-				<input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+				<input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'html':'UTF-8'}{/if}{/if}" />
 			</div>
 			<div class="text">
 				<label for="phone_mobile">{l s='Mobile phone'}</label>
-				<input type="text" id="phone_mobile" name="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{else}{if isset($address->phone_mobile)}{$address->phone_mobile|escape:'htmlall':'UTF-8'}{/if}{/if}" />
+				<input type="text" id="phone_mobile" name="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{else}{if isset($address->phone_mobile)}{$address->phone_mobile|escape:'html':'UTF-8'}{/if}{/if}" />
 			</div>
 			<p class="required text" id="adress_alias">
 				<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
-				<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'htmlall':'UTF-8'}{else if isset($select_address)}{l s='My address'}{/if}" />
+				<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'html':'UTF-8'}{else if isset($select_address)}{l s='My address'}{/if}" />
 			</p>
 			<div>
 				{if isset($id_address)}<input type="hidden" name="id_address" value="{$id_address|intval}" />{/if}
diff --git a/themes/default-bootstrap/mobile/addresses.tpl b/themes/default-bootstrap/mobile/addresses.tpl
index c40082ad1..8d385d71a 100644
--- a/themes/default-bootstrap/mobile/addresses.tpl
+++ b/themes/default-bootstrap/mobile/addresses.tpl
@@ -43,7 +43,7 @@
 						{foreach from=$address.ordered name=adr_loop item=pattern}
 							{assign var=addressKey value=" "|explode:$pattern}
 							{foreach from=$addressKey item=key name="word_loop"}
-								{$address.formated[$key|replace:',':'']|escape:'htmlall':'UTF-8'}
+								{$address.formated[$key|replace:',':'']|escape:'html':'UTF-8'}
 							{/foreach}
 							<br />
 						{/foreach}
diff --git a/themes/default-bootstrap/mobile/authentication-choice.tpl b/themes/default-bootstrap/mobile/authentication-choice.tpl
index 2c01fbfd7..2f667c4c4 100644
--- a/themes/default-bootstrap/mobile/authentication-choice.tpl
+++ b/themes/default-bootstrap/mobile/authentication-choice.tpl
@@ -5,9 +5,9 @@
 		<div class="form_content clearfix">
 			<p class="title_block">{l s='Enter your email address to create an account'}.</p>
 			<fieldset>
-				<span><input type="email" id="email_create" placeholder="{l s='Email address'}" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
+				<span><input type="email" id="email_create" placeholder="{l s='Email address'}" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|escape:'html':'UTF-8'|stripslashes}{/if}" class="account_input" /></span>
 			</fieldset>
-			{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+			{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 			<button type="submit" id="SubmitCreate" name="SubmitCreate" class="ui-btn-hidden submit_button" aria-disabled="false" data-theme="a">{l s='Create an account'}</button>
 			<input type="hidden" class="hidden" name="SubmitCreate" value="{l s='Create an account'}" />
 		</div>
@@ -18,11 +18,11 @@
 	<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" class="login_form">
 		<h2>{l s='Already registered?'}</h2>
 		<fieldset>
-			<input type="email" id="email" name="email" placeholder="{l s='Email address'}" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" />
+			<input type="email" id="email" name="email" placeholder="{l s='Email address'}" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'|stripslashes}{/if}" class="account_input" />
 		</fieldset>
 		
 		<fieldset>
-			<input type="password" id="passwd" name="passwd" placeholder="{l s='Password'}" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|escape:'htmlall':'UTF-8'|stripslashes}{/if}" class="account_input" />
+			<input type="password" id="passwd" name="passwd" placeholder="{l s='Password'}" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|escape:'html':'UTF-8'|stripslashes}{/if}" class="account_input" />
 			<p class="forget_pwd"><a href="{$link->getPageLink('password')|escape:'html'}" data-ajax="false">{l s='Forgot your password?'}</a></p>
 		</fieldset>
 		<button type="submit" class="ui-btn-hidden submit_button" id="SubmitLogin" name="SubmitLogin" aria-disabled="false" data-theme="a">{l s='Login'}</button>
diff --git a/themes/default-bootstrap/mobile/authentication-create-account.tpl b/themes/default-bootstrap/mobile/authentication-create-account.tpl
index ade6331bc..baf67b973 100644
--- a/themes/default-bootstrap/mobile/authentication-create-account.tpl
+++ b/themes/default-bootstrap/mobile/authentication-create-account.tpl
@@ -31,7 +31,7 @@
 			<select id="days" name="days">
 				<option value="">-</option>
 				{foreach from=$days item=day}
-					<option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+					<option value="{$day|escape:'html':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 				{/foreach}
 			</select>
 			{*
@@ -51,13 +51,13 @@
 			<select id="months" name="months">
 				<option value="">-</option>
 				{foreach from=$months key=k item=month}
-					<option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
+					<option value="{$k|escape:'html':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
 				{/foreach}
 			</select>
 			<select id="years" name="years">
 				<option value="">-</option>
 				{foreach from=$years item=year}
-					<option value="{$year|escape:'htmlall':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+					<option value="{$year|escape:'html':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 				{/foreach}
 			</select>
 		</p>
@@ -152,7 +152,7 @@
 					<select name="id_country" id="id_country">
 						<option value="">-</option>
 						{foreach from=$countries item=v}
-						<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				</p>
@@ -211,7 +211,7 @@
 	<p class="cart_navigation required submit">
 		<input type="hidden" name="email_create" value="1" />
 		<input type="hidden" name="is_new_customer" value="1" />
-		{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+		{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 		<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive btn btn-default" />
 		<span><sup>*</sup>{l s='Required field'}</span>
 	</p>
diff --git a/themes/default-bootstrap/mobile/authentication.tpl b/themes/default-bootstrap/mobile/authentication.tpl
index aa89099ae..f63baec15 100644
--- a/themes/default-bootstrap/mobile/authentication.tpl
+++ b/themes/default-bootstrap/mobile/authentication.tpl
@@ -38,7 +38,7 @@ countriesNeedZipCode = new Array();
 		{if isset($country.states) && $country.contains_states}
 			countries[{$country.id_country|intval}] = new Array();
 			{foreach from=$country.states item='state' name='states'}
-				countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'htmlall':'UTF-8'}'{rdelim});
+				countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'html':'UTF-8'}'{rdelim});
 			{/foreach}
 		{/if}
 		{if $country.need_identification_number}
@@ -50,7 +50,7 @@ countriesNeedZipCode = new Array();
 	{/foreach}
 {/if}
 $(function(){ldelim}
-	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|escape:'htmlall':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
+	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|escape:'html':'UTF-8'}{/if}{/if}]').attr('selected', 'selected');
 {rdelim});
 //]]>
 {literal}
diff --git a/themes/default-bootstrap/mobile/category-cms-tree-branch.tpl b/themes/default-bootstrap/mobile/category-cms-tree-branch.tpl
index f7f27809a..46a308d48 100644
--- a/themes/default-bootstrap/mobile/category-cms-tree-branch.tpl
+++ b/themes/default-bootstrap/mobile/category-cms-tree-branch.tpl
@@ -25,7 +25,7 @@
 
 
 <li {if isset($node.children) && $node.children|@count > 0 || isset($node.cms) && $node.cms|@count > 0}data-icon="more"{/if}>
-	<a href="{$node.link|escape:'htmlall':'UTF-8'}" title="{$node.name|escape:'htmlall':'UTF-8'}" data-ajax="false">{$node.name|escape:'htmlall':'UTF-8'}</a>
+	<a href="{$node.link|escape:'html':'UTF-8'}" title="{$node.name|escape:'html':'UTF-8'}" data-ajax="false">{$node.name|escape:'html':'UTF-8'}</a>
 	{if isset($node.children) && $node.children|@count > 0}
 		<ul data-inset="true">
 		{foreach from=$node.children item=child name=categoryCmsTreeBranch}
@@ -35,14 +35,14 @@
 		{/foreach}
 		{if isset($node.cms) && $node.cms|@count > 0}
 			{foreach from=$node.cms item=cms name=cmsTreeBranch}
-				<li><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}" data-ajax="false">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+				<li><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}" data-ajax="false">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
 			{/foreach}
 		{/if}
 		</ul>
 	{elseif isset($node.cms) && $node.cms|@count > 0}
 		<ul data-inset="true">
 		{foreach from=$node.cms item=cms name=cmsTreeBranch}
-			<li><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}" data-ajax="false">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+			<li><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}" data-ajax="false">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
 		{/foreach}
 		</ul>
 	{/if}
diff --git a/themes/default-bootstrap/mobile/category-product-list.tpl b/themes/default-bootstrap/mobile/category-product-list.tpl
index 8eff694b1..23d349e67 100644
--- a/themes/default-bootstrap/mobile/category-product-list.tpl
+++ b/themes/default-bootstrap/mobile/category-product-list.tpl
@@ -27,9 +27,9 @@
 	<ul data-role="listview" id="category-list" class="ui-listview ui-grid-a">
 	{foreach from=$products item=product name=products}
 		<li class="ui-block-{if $smarty.foreach.products.index % 2}b{else}a{/if} product-list-row">
-			<a href="{$product.link|escape:'htmlall':'UTF-8'}" data-ajax="false">
-				<div class="product_img_wrapper"><img class="ui-li-thumb" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" /></div>
-				<h3 class="ui-li-heading">{$product.name|escape:'htmlall':'UTF-8'}</h3>
+			<a href="{$product.link|escape:'html':'UTF-8'}" data-ajax="false">
+				<div class="product_img_wrapper"><img class="ui-li-thumb" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'html':'UTF-8'}" /></div>
+				<h3 class="ui-li-heading">{$product.name|escape:'html':'UTF-8'}</h3>
 				{if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
 					<p class="ui-li-price">
 					{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
diff --git a/themes/default-bootstrap/mobile/category-product-sort.tpl b/themes/default-bootstrap/mobile/category-product-sort.tpl
index c352cd688..0b94a2f8e 100644
--- a/themes/default-bootstrap/mobile/category-product-sort.tpl
+++ b/themes/default-bootstrap/mobile/category-product-sort.tpl
@@ -52,9 +52,9 @@
 	{/if}
 
 	<div class="{$container_class}">
-		<form id="productsSortForm" action="{$request|escape:'htmlall':'UTF-8'}">
+		<form id="productsSortForm" action="{$request|escape:'html':'UTF-8'}">
 			<select class="selectPrductSort">
-				<option value="{$orderbydefault|escape:'htmlall':'UTF-8'}:{$orderwaydefault|escape:'htmlall':'UTF-8'}" {if $orderby eq $orderbydefault}selected="selected"{/if}>{l s='Sort by'}</option>
+				<option value="{$orderbydefault|escape:'html':'UTF-8'}:{$orderwaydefault|escape:'html':'UTF-8'}" {if $orderby eq $orderbydefault}selected="selected"{/if}>{l s='Sort by'}</option>
 				{if !$PS_CATALOG_MODE}
 					<option value="price:asc" {if $orderby eq 'price' AND $orderway eq 'asc'}selected="selected"{/if}>{l s='Price: Lowest first'}</option>
 					<option value="price:desc" {if $orderby eq 'price' AND $orderway eq 'desc'}selected="selected"{/if}>{l s='Price: Highest first'}</option>
diff --git a/themes/default-bootstrap/mobile/category-tree-branch.tpl b/themes/default-bootstrap/mobile/category-tree-branch.tpl
index 0c7faddfb..6daebffb8 100644
--- a/themes/default-bootstrap/mobile/category-tree-branch.tpl
+++ b/themes/default-bootstrap/mobile/category-tree-branch.tpl
@@ -25,10 +25,10 @@
 
 <li {if $node.children|@count > 0}data-icon="more"{/if}>
 	{if $node.children|@count > 0}
-		{$node.name|escape:'htmlall':'UTF-8'}
+		{$node.name|escape:'html':'UTF-8'}
 		<ul data-inset="true">
 			<li>
-				<a href="{$node.link|escape:'htmlall':'UTF-8'}" title="{$node.desc|escape:'htmlall':'UTF-8'}" data-ajax="false">
+				<a href="{$node.link|escape:'html':'UTF-8'}" title="{$node.desc|escape:'html':'UTF-8'}" data-ajax="false">
 					{l s='See products'}
 				</a>
 			</li>
@@ -37,8 +37,8 @@
 		{/foreach}
 		</ul>
 	{else}
-		<a href="{$node.link|escape:'htmlall':'UTF-8'}" title="{$node.desc|escape:'htmlall':'UTF-8'}" data-ajax="false">
-			{$node.name|escape:'htmlall':'UTF-8'}
+		<a href="{$node.link|escape:'html':'UTF-8'}" title="{$node.desc|escape:'html':'UTF-8'}" data-ajax="false">
+			{$node.name|escape:'html':'UTF-8'}
 		</a>
 	{/if}
 </li>
diff --git a/themes/default-bootstrap/mobile/category.tpl b/themes/default-bootstrap/mobile/category.tpl
index 90dc09310..a3dbb8a3e 100644
--- a/themes/default-bootstrap/mobile/category.tpl
+++ b/themes/default-bootstrap/mobile/category.tpl
@@ -27,9 +27,9 @@
 	{if $category->id AND $category->active}
 {capture assign='page_title'}
 	{strip}
-		{$category->name|escape:'htmlall':'UTF-8'}
+		{$category->name|escape:'html':'UTF-8'}
 		{if isset($categoryNameComplement)}
-			{$categoryNameComplement|escape:'htmlall':'UTF-8'}
+			{$categoryNameComplement|escape:'html':'UTF-8'}
 		{/if}
 	{/strip}
 {/capture}
diff --git a/themes/default-bootstrap/mobile/cms.tpl b/themes/default-bootstrap/mobile/cms.tpl
index 13e25fc2e..75981afb7 100644
--- a/themes/default-bootstrap/mobile/cms.tpl
+++ b/themes/default-bootstrap/mobile/cms.tpl
@@ -27,7 +27,7 @@
 	{if isset($cms) && !isset($category)}
 		{$cms->meta_title}
 	{elseif isset($category)}
-		{$category->name|escape:'htmlall':'UTF-8'}
+		{$category->name|escape:'html':'UTF-8'}
 	{/if}
 {/capture}
 {include file='./page-title.tpl'}
@@ -43,7 +43,7 @@
 			<ul data-role="listview" data-inset="true">
 				{foreach from=$sub_category item=subcategory}
 					<li>
-						<a href="{$link->getCMSCategoryLink($subcategory.id_cms_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}" data-ajax="false">{$subcategory.name|escape:'htmlall':'UTF-8'}</a>
+						<a href="{$link->getCMSCategoryLink($subcategory.id_cms_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}" data-ajax="false">{$subcategory.name|escape:'html':'UTF-8'}</a>
 					</li>
 				{/foreach}
 			</ul>
@@ -53,7 +53,7 @@
 			<ul data-role="listview" data-inset="true">
 				{foreach from=$cms_pages item=cmspages}
 					<li>
-						<a href="{$link->getCMSLink($cmspages.id_cms, $cmspages.link_rewrite)|escape:'htmlall':'UTF-8'}" data-ajax="false">{$cmspages.meta_title|escape:'htmlall':'UTF-8'}</a>
+						<a href="{$link->getCMSLink($cmspages.id_cms, $cmspages.link_rewrite)|escape:'html':'UTF-8'}" data-ajax="false">{$cmspages.meta_title|escape:'html':'UTF-8'}</a>
 					</li>
 				{/foreach}
 			</ul>
diff --git a/themes/default-bootstrap/mobile/contact-form.tpl b/themes/default-bootstrap/mobile/contact-form.tpl
index 6c435356a..f1ec3ec15 100644
--- a/themes/default-bootstrap/mobile/contact-form.tpl
+++ b/themes/default-bootstrap/mobile/contact-form.tpl
@@ -29,11 +29,11 @@
 	<div data-role="content" id="content">
 		<p class="bold">{l s='For questions about an order or for more information about our products'}.</p>
 		{include file="./errors.tpl"}
-		<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="std" enctype="multipart/form-data">
+		<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" enctype="multipart/form-data">
 			{if isset($customerThread.id_contact)}
 				{foreach from=$contacts item=contact}
 					{if $contact.id_contact == $customerThread.id_contact}
-						<input type="text" id="contact_name" name="contact_name" value="{$contact.name|escape:'htmlall':'UTF-8'}" readonly="readonly" />
+						<input type="text" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
 						<input type="hidden" name="id_contact" value="{$contact.id_contact}" />
 					{/if}
 				{/foreach}
@@ -41,14 +41,14 @@
 				<select id="id_contact" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
 					<option value="0">-- {l s='Subject Heading'} --</option>
 				{foreach from=$contacts item=contact}
-					<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$contact.id_contact|intval}" {if isset($smarty.post.id_contact) && $smarty.post.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 
 			<p id="desc_contact0" class="desc_contact">&nbsp;</p>
 				{foreach from=$contacts item=contact}
 					<p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
-						<label>&nbsp;</label>{$contact.description|escape:'htmlall':'UTF-8'}
+						<label>&nbsp;</label>{$contact.description|escape:'html':'UTF-8'}
 					</p>
 				{/foreach}
 			{/if}
@@ -67,7 +67,7 @@
 					{if !isset($customerThread.id_order) && isset($isLogged) && $isLogged == 1}
 						<select name="id_order" ><option value="0">-- {l s='Order ID'} --</option>
 						{foreach from=$orderList item=order}
-							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'html':'UTF-8'}</option>
 						{/foreach}
 						</select>
 					{elseif !isset($customerThread.id_order) && !isset($isLogged)}
@@ -84,7 +84,7 @@
 						{foreach from=$orderedProductList key=id_order item=products name=products}
 							<select name="id_product"><option value="0">-- {l s='Product'} --</option>
 								{foreach from=$products item=product}
-									<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
+									<option value="{$product.value|intval}">{$product.label|escape:'html':'UTF-8'}</option>
 								{/foreach}
 							</select>
 						{/foreach}
@@ -96,7 +96,7 @@
 			{/if}
 			
 			<fieldset>
-				<textarea id="message" name="message" placeholder="{l s='Your message'}" rows="15" cols="10">{if isset($message) && $message != ''}{$message|escape:'htmlall':'UTF-8'|stripslashes}{/if}</textarea>
+				<textarea id="message" name="message" placeholder="{l s='Your message'}" rows="15" cols="10">{if isset($message) && $message != ''}{$message|escape:'html':'UTF-8'|stripslashes}{/if}</textarea>
 			</fieldset>
 			
 			<fieldset>
diff --git a/themes/default-bootstrap/mobile/discount.tpl b/themes/default-bootstrap/mobile/discount.tpl
index af0d47ea8..f528d718a 100644
--- a/themes/default-bootstrap/mobile/discount.tpl
+++ b/themes/default-bootstrap/mobile/discount.tpl
@@ -50,7 +50,7 @@
 				<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
 				<td class="discount_value">
 					{if $discountDetail.id_discount_type == 1}
-						{$discountDetail.value|escape:'htmlall':'UTF-8'}%
+						{$discountDetail.value|escape:'html':'UTF-8'}%
 					{elseif $discountDetail.id_discount_type == 2}
 						{convertPrice price=$discountDetail.value}
 					{else}
diff --git a/themes/default-bootstrap/mobile/header.tpl b/themes/default-bootstrap/mobile/header.tpl
index ae6fb32d5..19e12e67c 100644
--- a/themes/default-bootstrap/mobile/header.tpl
+++ b/themes/default-bootstrap/mobile/header.tpl
@@ -25,7 +25,7 @@
 <!DOCTYPE html>
 <html lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>
 		{*<meta name="viewport" content="width=device-width, initial-scale=1">*}
 		<meta content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" name="viewport">
 {if isset($meta_description) AND $meta_description}
@@ -59,12 +59,12 @@
 {/if}
 	{$HOOK_MOBILE_HEADER}
 	</head>
-	<body {if isset($page_name)}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if}>
+	<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if}>
 	<div data-role="page" {if isset($wrapper_id)}id="{$wrapper_id}"{/if} class="type-interior prestashop-page">
 		<div data-role="header" id="header" class="ui-body-c">
 			<div class="ui-grid-a">
 				<div class="ui-block-a">
-					<a href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}" data-ajax="false"><img src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} /></a>
+					<a href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}" data-ajax="false"><img src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if} /></a>
 				</div>
 				<div class="ui-block-b">
 					<div id="block_cart" class="clearfix">
diff --git a/themes/default-bootstrap/mobile/history.tpl b/themes/default-bootstrap/mobile/history.tpl
index c562b65cc..3aed9623b 100644
--- a/themes/default-bootstrap/mobile/history.tpl
+++ b/themes/default-bootstrap/mobile/history.tpl
@@ -43,8 +43,8 @@
 					{if isset($order.invoice) && $order.invoice && isset($order.virtual) && $order.virtual}<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Products to download'}" title="{l s='Products to download'}" />{/if}
 					<h3>{l s='#'}{$order.id_order|string_format:"%06d"}</h3>
 					<p><strong>{l s='Total price'}</strong> {displayPrice price=$order.total_paid currency=$order.id_currency no_utf8=false convert=false}</p>
-					<p><strong>{l s='Payment: '}</strong> {$order.payment|escape:'htmlall':'UTF-8'}</p>
-					<p><strong>{l s='Status'}</strong> {if isset($order.order_state)}{$order.order_state|escape:'htmlall':'UTF-8'}{/if}</p>
+					<p><strong>{l s='Payment: '}</strong> {$order.payment|escape:'html':'UTF-8'}</p>
+					<p><strong>{l s='Status'}</strong> {if isset($order.order_state)}{$order.order_state|escape:'html':'UTF-8'}{/if}</p>
 					<span class="ui-li-aside">{dateFormat date=$order.date_add full=0}</span>
 				</a>
 				{if (isset($order.invoice) && $order.invoice && isset($order.invoice_number) && $order.invoice_number) && isset($invoiceAllowed) && $invoiceAllowed == true}
diff --git a/themes/default-bootstrap/mobile/identity.tpl b/themes/default-bootstrap/mobile/identity.tpl
index 246db4c25..fd6bd91a4 100644
--- a/themes/default-bootstrap/mobile/identity.tpl
+++ b/themes/default-bootstrap/mobile/identity.tpl
@@ -34,7 +34,7 @@
 {if isset($confirmation) && $confirmation}
 	<p class="success">
 		{l s='Your personal information has been successfully updated.'}
-		{if isset($pwd_changed)}<br />{l s='Your password has been sent to your email:'} {$email|escape:'htmlall':'UTF-8'}{/if}
+		{if isset($pwd_changed)}<br />{l s='Your password has been sent to your email:'} {$email|escape:'html':'UTF-8'}{/if}
 	</p>
 {else}
 	<h3>{l s='Please be sure to update your personal information if it has changed.'}</h3>
@@ -76,19 +76,19 @@
 			<select name="days" id="days">
 				<option value="">-</option>
 				{foreach from=$days item=v}
-					<option value="{$v|escape:'htmlall':'UTF-8'}" {if ($sl_day == $v)}selected="selected"{/if}>{$v|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+					<option value="{$v|escape:'html':'UTF-8'}" {if ($sl_day == $v)}selected="selected"{/if}>{$v|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 				{/foreach}
 			</select>
 			<select id="months" name="months">
 				<option value="">-</option>
 				{foreach from=$months key=k item=v}
-					<option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)}selected="selected"{/if}>{l s=$v}&nbsp;</option>
+					<option value="{$k|escape:'html':'UTF-8'}" {if ($sl_month == $k)}selected="selected"{/if}>{l s=$v}&nbsp;</option>
 				{/foreach}
 			</select>
 			<select id="years" name="years">
 				<option value="">-</option>
 				{foreach from=$years item=v}
-					<option value="{$v|escape:'htmlall':'UTF-8'}" {if ($sl_year == $v)}selected="selected"{/if}>{$v|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+					<option value="{$v|escape:'html':'UTF-8'}" {if ($sl_year == $v)}selected="selected"{/if}>{$v|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 				{/foreach}
 			</select>
 		</fieldset>
diff --git a/themes/default-bootstrap/mobile/maintenance.tpl b/themes/default-bootstrap/mobile/maintenance.tpl
index d3913a602..ac5e29f1c 100644
--- a/themes/default-bootstrap/mobile/maintenance.tpl
+++ b/themes/default-bootstrap/mobile/maintenance.tpl
@@ -26,15 +26,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}" lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>	
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>	
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		
 		{if isset($meta_description)}
-		<meta name="description" content="{$meta_description|escape:'htmlall':'UTF-8'}" />
+		<meta name="description" content="{$meta_description|escape:'html':'UTF-8'}" />
 		{/if}
 		
 		{if isset($meta_keywords)}
-		<meta name="keywords" content="{$meta_keywords|escape:'htmlall':'UTF-8'}" />
+		<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 		{/if}
 		
 		<meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
diff --git a/themes/default-bootstrap/mobile/manufacturer-list.tpl b/themes/default-bootstrap/mobile/manufacturer-list.tpl
index e03e32aab..1e5482a7c 100644
--- a/themes/default-bootstrap/mobile/manufacturer-list.tpl
+++ b/themes/default-bootstrap/mobile/manufacturer-list.tpl
@@ -48,9 +48,9 @@
 	<ul id="manufacturers_list" data-role="listview">
 	{foreach from=$manufacturers item=manufacturer name=manufacturers}
 		<li data-corners="false" data-shadow="false" data-iconshadow="true" data-inline="false" data-wrapperels="div" data-icon="arrow-r" data-iconpos="right" data-theme="c" class="clearfix {if $smarty.foreach.manufacturers.first}first_item{elseif $smarty.foreach.manufacturers.last}last_item{else}item{/if}"> 
-		{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$manufacturer.name|escape:'htmlall':'UTF-8'}" class="lnk_img" data-ajax="false">{/if}
-			<img src="{$img_manu_dir}{$manufacturer.image|escape:'htmlall':'UTF-8'}-medium_default.jpg" alt="" width="80" />
-			<h3>{$manufacturer.name|truncate:60:'...'|escape:'htmlall':'UTF-8'}</h3>
+		{if $manufacturer.nb_products > 0}<a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}" title="{$manufacturer.name|escape:'html':'UTF-8'}" class="lnk_img" data-ajax="false">{/if}
+			<img src="{$img_manu_dir}{$manufacturer.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="80" />
+			<h3>{$manufacturer.name|truncate:60:'...'|escape:'html':'UTF-8'}</h3>
 			<p>
 				{if $manufacturer.nb_products == 1}
 					{l s='%d product' sprintf=$manufacturer.nb_products|intval}
diff --git a/themes/default-bootstrap/mobile/manufacturer.tpl b/themes/default-bootstrap/mobile/manufacturer.tpl
index 35ea21f70..aac96a605 100644
--- a/themes/default-bootstrap/mobile/manufacturer.tpl
+++ b/themes/default-bootstrap/mobile/manufacturer.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture assign='page_title'}{$manufacturer->name|escape:'htmlall':'UTF-8'}{/capture}
+{capture assign='page_title'}{$manufacturer->name|escape:'html':'UTF-8'}{/capture}
 {include file='./page-title.tpl'}
 
 {include file="$tpl_dir./errors.tpl"}
diff --git a/themes/default-bootstrap/mobile/order-address.tpl b/themes/default-bootstrap/mobile/order-address.tpl
index 5e8a60fe8..77b2e8a96 100644
--- a/themes/default-bootstrap/mobile/order-address.tpl
+++ b/themes/default-bootstrap/mobile/order-address.tpl
@@ -158,7 +158,7 @@
 					<select name="id_address_delivery" id="id_address_delivery" class="address_select" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
 		
 					{foreach from=$addresses key=k item=address}
-						<option value="{$address.id_address|intval}" {if $address.id_address == $cart->id_address_delivery}selected="selected"{/if}>{$address.alias|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$address.id_address|intval}" {if $address.id_address == $cart->id_address_delivery}selected="selected"{/if}>{$address.alias|escape:'html':'UTF-8'}</option>
 					{/foreach}
 					
 					</select>
@@ -174,7 +174,7 @@
 					<label for="id_address_invoice" class="strong">{l s='Choose a billing address:'}</label>
 					<select name="id_address_invoice" id="id_address_invoice" class="address_select" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
 					{section loop=$addresses step=-1 name=address}
-						<option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'html':'UTF-8'}</option>
 					{/section}
 					</select>
 					{else}
diff --git a/themes/default-bootstrap/mobile/order-carrier.tpl b/themes/default-bootstrap/mobile/order-carrier.tpl
index 83bc460e9..a3faf39cf 100644
--- a/themes/default-bootstrap/mobile/order-carrier.tpl
+++ b/themes/default-bootstrap/mobile/order-carrier.tpl
@@ -216,7 +216,7 @@
 				</p>
 				<p id="gift_div" class="textarea">
 					<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
-					<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
+					<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'html':'UTF-8'}</textarea>
 				</p>
 				{/if}
 			{/if}
diff --git a/themes/default-bootstrap/mobile/order-detail-product-li.tpl b/themes/default-bootstrap/mobile/order-detail-product-li.tpl
index 6f35fd8f9..f7cbdef0b 100644
--- a/themes/default-bootstrap/mobile/order-detail-product-li.tpl
+++ b/themes/default-bootstrap/mobile/order-detail-product-li.tpl
@@ -27,8 +27,8 @@
 {*if isset($product.customizedDatas)}
 	<li class="item">
 		{if $return_allowed}<span class="order_cb"></span>{/if}
-		<h3>{$product.product_name|escape:'htmlall':'UTF-8'}</h3>
-		<p><strong>{l s='Reference'}</strong> {if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</p>
+		<h3>{$product.product_name|escape:'html':'UTF-8'}</h3>
+		<p><strong>{l s='Reference'}</strong> {if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</p>
 		<p><strong>{l s='Quantity'}</strong></p>
 		<fieldset><input class="order_qte_input"  name="order_qte_input[{$smarty.foreach.products.index}]" type="text" size="2" value="{$product.customizationQuantityTotal|intval}" /><span class="order_qte_span editable">{$product.customizationQuantityTotal|intval}</span></fieldset>
 		<p><strong>{l s='Unit price'}</strong> 
@@ -89,18 +89,18 @@
 		<h3>
 			{if $product.download_hash && $invoice && $product.display_filename != ''}
 				{if isset($is_guest) && $is_guest}
-				<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}" data-ajax="false">
+				<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}" data-ajax="false">
 				{else}
-					<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}" data-ajax="false">
+					<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}" data-ajax="false">
 				{/if}
 					<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Download product'}" />
-					{$product.product_name|escape:'htmlall':'UTF-8'}
+					{$product.product_name|escape:'html':'UTF-8'}
 				</a>
 			{else}
-				{$product.product_name|escape:'htmlall':'UTF-8'}
+				{$product.product_name|escape:'html':'UTF-8'}
 			{/if}
 		</h3>
-		<p><strong>{l s='Reference'}</strong> {if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</p>
+		<p><strong>{l s='Reference'}</strong> {if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</p>
 		<p><strong>{l s='Quantity'}</strong></p>
 		<fieldset><input class="order_qte_input" data-mini="true" name="order_qte_input[{$product.id_order_detail|intval}]" type="text" size="2" value="{$productQuantity|intval}" /><span class="order_qte_span editable">{$productQuantity|intval}</span></fieldset>
 		<p><strong>{l s='Unit price'}</strong> 
diff --git a/themes/default-bootstrap/mobile/order-detail.tpl b/themes/default-bootstrap/mobile/order-detail.tpl
index feaf3fee9..7f0046048 100644
--- a/themes/default-bootstrap/mobile/order-detail.tpl
+++ b/themes/default-bootstrap/mobile/order-detail.tpl
@@ -46,8 +46,8 @@
 
 
 <ul class="info-order" data-role="listview">
-	{if $carrier->id}<li><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
-	<li><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></li>
+	{if $carrier->id}<li><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'html':'UTF-8'}{else}{$carrier->name|escape:'html':'UTF-8'}{/if}</li>{/if}
+	<li><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'html':'UTF-8'}</span></li>
 	{if $invoice AND $invoiceAllowed}
 	<li>
 		<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
@@ -68,7 +68,7 @@
 <ul data-role="listview" >
 	{foreach from=$order_history item=state name="orderStates"}
 	<li>
-		{$state.ostate_name|escape:'htmlall':'UTF-8'}
+		{$state.ostate_name|escape:'html':'UTF-8'}
 		<span class="ui-li-aside">{dateFormat date=$state.date_add full=1}</span>
 	</li>
 	{/foreach}
@@ -79,7 +79,7 @@
 {* > TO CHECK ==========================*}
 {if isset($followup)}
 <p class="bold">{l s='Click the following link to track the delivery of your order'}</p>
-<a href="{$followup|escape:'htmlall':'UTF-8'}" data-ajax="false">{$followup|escape:'htmlall':'UTF-8'}</a>
+<a href="{$followup|escape:'html':'UTF-8'}" data-ajax="false">{$followup|escape:'html':'UTF-8'}</a>
 {/if}
 {* / TO CHECK ==========================*}
 
@@ -112,12 +112,12 @@
 	<li data-role="list-divider">{l s='Invoice'}</li>
 	<li>
 	{foreach from=$inv_adr_fields name=inv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_invoice->company)}<p class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "address2" && $address_invoice->address2}<p class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</p>
+		{if $field_item eq "company" && isset($address_invoice->company)}<p class="address_company">{$address_invoice->company|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "address2" && $address_invoice->address2}<p class="address_address2">{$address_invoice->address2|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'html':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item}
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -125,12 +125,12 @@
 	<li data-role="list-divider" >{l s='Delivery'}</li>
 	<li>
 	{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_delivery->company)}<p class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "address2" && $address_delivery->address2}<p class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</p>
+		{if $field_item eq "company" && isset($address_delivery->company)}<p class="address_company">{$address_delivery->company|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "address2" && $address_delivery->address2}<p class="address_address2">{$address_delivery->address2|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'html':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item} 
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -160,8 +160,8 @@
 {* > TO CHECK ==========================*}
 {foreach from=$discounts item=discount}
 	<li class="item">
-		<h3>{$discount.name|escape:'htmlall':'UTF-8'}</h3>
-		<p>{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'}</p>
+		<h3>{$discount.name|escape:'html':'UTF-8'}</h3>
+		<p>{l s='Voucher'} {$discount.name|escape:'html':'UTF-8'}</p>
 		<p><span class="order_qte_span editable">1</span></p>
 		<p>&nbsp;</p>
 		<p>{if $discount.value != 0.00}{l s='-'}{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</p>
@@ -246,11 +246,11 @@
 				<tr class="{if $smarty.foreach.messageList.first}first_item{elseif $smarty.foreach.messageList.last}last_item{/if} {if $smarty.foreach.messageList.index % 2}alternate_item{else}item{/if}">
 					<td>
 						{if isset($message.ename) && $message.ename}
-							{$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'}
+							{$message.efirstname|escape:'html':'UTF-8'} {$message.elastname|escape:'html':'UTF-8'}
 						{elseif $message.clastname}
-							{$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'}
+							{$message.cfirstname|escape:'html':'UTF-8'} {$message.clastname|escape:'html':'UTF-8'}
 						{else}
-							<b>{$shop_name|escape:'htmlall':'UTF-8'}</b>
+							<b>{$shop_name|escape:'html':'UTF-8'}</b>
 						{/if}
 						<br />
 						{dateFormat date=$message.date_add full=1}
diff --git a/themes/default-bootstrap/mobile/order-follow.tpl b/themes/default-bootstrap/mobile/order-follow.tpl
index 1db27abbd..c369b99b6 100644
--- a/themes/default-bootstrap/mobile/order-follow.tpl
+++ b/themes/default-bootstrap/mobile/order-follow.tpl
@@ -53,7 +53,7 @@
 				<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 					<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return')|escape:'html'}');" data-ajax="false">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
 					<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail')|escape:'html'}');" data-ajax="false">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
-					<td class="history_method"><span class="bold">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
+					<td class="history_method"><span class="bold">{$return.state_name|escape:'html':'UTF-8'}</span></td>
 					<td class="bold">{dateFormat date=$return.date_add full=0}</td>
 					<td class="history_invoice">
 					{if $return.state == 2}
diff --git a/themes/default-bootstrap/mobile/order-opc-address.tpl b/themes/default-bootstrap/mobile/order-opc-address.tpl
index 64b28cdd0..cb1649c65 100644
--- a/themes/default-bootstrap/mobile/order-opc-address.tpl
+++ b/themes/default-bootstrap/mobile/order-opc-address.tpl
@@ -32,16 +32,16 @@
 			<h3 class="bg">{l s='Delivery address'}</h3>
 			{if isset($delivery)}
 				<ul class="adress">
-					<li class="address_name">{$delivery->firstname|escape:'htmlall':'UTF-8'} {$delivery->lastname|escape:'htmlall':'UTF-8'}</li>
+					<li class="address_name">{$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}</li>
 					{if $delivery->company}
-						<li class="address_company">{$delivery->company|escape:'htmlall':'UTF-8'}</li>
+						<li class="address_company">{$delivery->company|escape:'html':'UTF-8'}</li>
 					{/if}
-					<li class="address_address1">{$delivery->address1|escape:'htmlall':'UTF-8'}</li>
+					<li class="address_address1">{$delivery->address1|escape:'html':'UTF-8'}</li>
 					{if $delivery->address2}
-						<li class="address_address2">{$delivery->address2|escape:'htmlall':'UTF-8'}</li>
+						<li class="address_address2">{$delivery->address2|escape:'html':'UTF-8'}</li>
 					{/if}
-					<li class="address_city">{$delivery->postcode|escape:'htmlall':'UTF-8'} {$delivery->city|escape:'htmlall':'UTF-8'}</li>
-					<li class="address_country">{$delivery->country|escape:'htmlall':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'htmlall':'UTF-8'}){/if}</li>
+					<li class="address_city">{$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}</li>
+					<li class="address_country">{$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}</li>
 				</ul>
 			{/if}
 			<label for="delivery-address-choice" class="select">{l s='Change address:'}</label>
@@ -61,16 +61,16 @@
 			<h3 class="bg">{l s='Invoice address'}</h3>
 			{if isset($invoice)}
 				<ul class="adress">
-					<li class="address_name">{$invoice->firstname|escape:'htmlall':'UTF-8'} {$invoice->lastname|escape:'htmlall':'UTF-8'}</li>
+					<li class="address_name">{$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}</li>
 					{if $invoice->company}
-						<li class="address_company">{$invoice->company|escape:'htmlall':'UTF-8'}</li>
+						<li class="address_company">{$invoice->company|escape:'html':'UTF-8'}</li>
 					{/if}
-					<li class="address_address1">{$invoice->address1|escape:'htmlall':'UTF-8'}</li>
+					<li class="address_address1">{$invoice->address1|escape:'html':'UTF-8'}</li>
 					{if $invoice->address2}
-						<li class="address_address2">{$invoice->address2|escape:'htmlall':'UTF-8'}</li>
+						<li class="address_address2">{$invoice->address2|escape:'html':'UTF-8'}</li>
 					{/if}
-					<li class="address_city">{$invoice->postcode|escape:'htmlall':'UTF-8'} {$invoice->city|escape:'htmlall':'UTF-8'}</li>
-					<li class="address_country">{$invoice->country|escape:'htmlall':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'htmlall':'UTF-8'}){/if}</li>
+					<li class="address_city">{$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}</li>
+					<li class="address_country">{$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}</li>
 				</ul>
 			{else}
 				<p class="warning">{l s='You must specify your delivery and invoice address'}</p>
diff --git a/themes/default-bootstrap/mobile/order-opc-carrier.tpl b/themes/default-bootstrap/mobile/order-opc-carrier.tpl
index a2d2073d0..007dac0cc 100644
--- a/themes/default-bootstrap/mobile/order-opc-carrier.tpl
+++ b/themes/default-bootstrap/mobile/order-opc-carrier.tpl
@@ -158,7 +158,7 @@
 		</p>
 		<p id="gift_div" class="textarea">
 			<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
-			<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
+			<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'html':'UTF-8'}</textarea>
 		</p>
 	{/if}
 	
diff --git a/themes/default-bootstrap/mobile/order-payment.tpl b/themes/default-bootstrap/mobile/order-payment.tpl
index 8e4e02c15..20da5b826 100644
--- a/themes/default-bootstrap/mobile/order-payment.tpl
+++ b/themes/default-bootstrap/mobile/order-payment.tpl
@@ -156,7 +156,7 @@
 								{if isset($errors_discount) && $errors_discount}
 									<ul class="error">
 									{foreach from=$errors_discount key=k item=error}
-										<li>{$error|escape:'htmlall':'UTF-8'}</li>
+										<li>{$error|escape:'html':'UTF-8'}</li>
 									{/foreach}
 									</ul>
 								{/if}
@@ -175,7 +175,7 @@
 								{if isset($errors_discount) && $errors_discount}
 									<ul class="error">
 									{foreach from=$errors_discount key=k item=error}
-										<li>{$error|escape:'htmlall':'UTF-8'}</li>
+										<li>{$error|escape:'html':'UTF-8'}</li>
 									{/foreach}
 									</ul>
 								{/if}
diff --git a/themes/default-bootstrap/mobile/page-title.tpl b/themes/default-bootstrap/mobile/page-title.tpl
index d336258b4..02f5ac9ef 100644
--- a/themes/default-bootstrap/mobile/page-title.tpl
+++ b/themes/default-bootstrap/mobile/page-title.tpl
@@ -1,5 +1,5 @@
 {if !isset($page_title) && isset($meta_title) && $meta_title != $shop_name}
-	{assign var='page_title' value=$meta_title|escape:'htmlall':'UTF-8'}
+	{assign var='page_title' value=$meta_title|escape:'html':'UTF-8'}
 {/if}
 {if isset($page_title)}
 	<div data-role="header" class="clearfix navbartop" data-position="inline">
diff --git a/themes/default-bootstrap/mobile/pagination.tpl b/themes/default-bootstrap/mobile/pagination.tpl
index 0d78062de..8b28eb412 100644
--- a/themes/default-bootstrap/mobile/pagination.tpl
+++ b/themes/default-bootstrap/mobile/pagination.tpl
@@ -64,9 +64,9 @@
 		{/if}
 		{section name=pagination start=$start loop=$stop+1 step=1}
 			{if $p == $smarty.section.pagination.index}
-				<li class="current"><a href="#" data-role="button" class="ui-btn-active" data-ajax="false">{$p|escape:'htmlall':'UTF-8'}</a></li>
+				<li class="current"><a href="#" data-role="button" class="ui-btn-active" data-ajax="false">{$p|escape:'html':'UTF-8'}</a></li>
 			{else}
-				<li><a data-role="button" {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)|escape:'html'}" data-ajax="false">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
+				<li><a data-role="button" {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)|escape:'html'}" data-ajax="false">{$smarty.section.pagination.index|escape:'html':'UTF-8'}</a></li>
 			{/if}
 		{/section}
 		{if $pages_nb>$stop+2}
diff --git a/themes/default-bootstrap/mobile/password.tpl b/themes/default-bootstrap/mobile/password.tpl
index 11c1ce944..1fa5682a3 100644
--- a/themes/default-bootstrap/mobile/password.tpl
+++ b/themes/default-bootstrap/mobile/password.tpl
@@ -28,15 +28,15 @@
 {include file="$tpl_dir./errors.tpl"}
 <div data-role="content" id="content">
 	{if isset($confirmation) && $confirmation == 1}
-	<p class="success">{l s='Your password has been successfully reset and a confirmation has been sent to your email address:'} {$email|escape:'htmlall':'UTF-8'}</p>
+	<p class="success">{l s='Your password has been successfully reset and a confirmation has been sent to your email address:'} {$email|escape:'html':'UTF-8'}</p>
 	{elseif isset($confirmation) && $confirmation == 2}
-	<p class="success">{l s='A confirmation email has been sent to your address:'} {$email|escape:'htmlall':'UTF-8'}</p>
+	<p class="success">{l s='A confirmation email has been sent to your address:'} {$email|escape:'html':'UTF-8'}</p>
 	{else}
 	<p>{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
-	<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
+	<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
 		<fieldset>
 			<label for="email">{l s='Email'}</label>
-			<input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
+			<input type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'|stripslashes}{/if}" />
 			<input type="submit" class="button" data-theme="a" value="{l s='Retrieve Password'}" />
 		</fieldset>
 	</form>
diff --git a/themes/default-bootstrap/mobile/product-attributes.tpl b/themes/default-bootstrap/mobile/product-attributes.tpl
index ec6672b0c..102dfde78 100644
--- a/themes/default-bootstrap/mobile/product-attributes.tpl
+++ b/themes/default-bootstrap/mobile/product-attributes.tpl
@@ -30,18 +30,18 @@
 	{if $group.attributes|@count}
 	<div class="attributes_group">
 		{capture assign='groupName'}group_{$id_attribute_group|intval}{/capture}
-		<label class="attribute_label" for="{$groupName}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
+		<label class="attribute_label" for="{$groupName}">{$group.name|escape:'html':'UTF-8'} :</label>
 		{if ($group.group_type == 'select' || $group.group_type == 'color')}
 			<select name="{$groupName}" id="{$groupName}" class="attribute_select{if ($group.group_type == 'color')} select_color{/if}">
 				{foreach from=$group.attributes key=id_attribute item=group_attribute}
-					<option value="{$id_attribute|intval}" title="{$group_attribute|escape:'htmlall':'UTF-8'}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if}>{$group_attribute|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$id_attribute|intval}" title="{$group_attribute|escape:'html':'UTF-8'}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if}>{$group_attribute|escape:'html':'UTF-8'}</option>
 				{/foreach}
 			</select>
 		{elseif ($group.group_type == 'radio')}
 			<fieldset data-role="controlgroup">
 			{foreach from=$group.attributes key=id_attribute item=group_attribute}
 				<input type="radio" class="attribute_radio" name="{$groupName}" id="{$groupName}_{$id_attribute}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if}>
-				<label for="{$groupName}_{$id_attribute}">{$group_attribute|escape:'htmlall':'UTF-8'}</label>
+				<label for="{$groupName}_{$id_attribute}">{$group_attribute|escape:'html':'UTF-8'}</label>
 			{/foreach}
 			</fieldset>
 		{/if}
diff --git a/themes/default-bootstrap/mobile/product-desc-features.tpl b/themes/default-bootstrap/mobile/product-desc-features.tpl
index 122350629..deca914b6 100644
--- a/themes/default-bootstrap/mobile/product-desc-features.tpl
+++ b/themes/default-bootstrap/mobile/product-desc-features.tpl
@@ -16,7 +16,7 @@
 			<ul>
 				{foreach from=$features item=feature}
 				{if isset($feature.value)}
-					<li><span>{$feature.name|escape:'htmlall':'UTF-8'}</span> {$feature.value|escape:'htmlall':'UTF-8'}</li>
+					<li><span>{$feature.name|escape:'html':'UTF-8'}</span> {$feature.value|escape:'html':'UTF-8'}</li>
 				{/if}
 			{/foreach}
 			</ul>
@@ -29,7 +29,7 @@
 			<h3>{l s='Download'}</h3>
 			<ul>
 				{foreach from=$attachments item=attachment}
-					<li><a href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}" data-ajax="false">{$attachment.name|escape:'htmlall':'UTF-8'}</a><br />{$attachment.description|escape:'htmlall':'UTF-8'}</li>
+					<li><a href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}" data-ajax="false">{$attachment.name|escape:'html':'UTF-8'}</a><br />{$attachment.description|escape:'html':'UTF-8'}</li>
 				{/foreach}
 			</ul>
 		</div>
@@ -43,14 +43,14 @@
 				{foreach from=$accessories item=accessory name=accessories_list}
 					{assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)}
 					<li class="ajax_block_product {if $smarty.foreach.accessories_list.last}last_item{else}item{/if} product_accessories_description clearfix">
-						<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}" data-ajax="false">
+						<a href="{$accessoryLink|escape:'html':'UTF-8'}" data-ajax="false">
 							<div class="clearfix" >
 								<div class="col-left" style="width:{$mediumSize.width+10}px;">
-									<img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'medium_default')|escape:'html'}" alt="{$accessory.legend|escape:'htmlall':'UTF-8'}" width="{$mediumSize.width}" height="{$mediumSize.height}" />
+									<img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'medium_default')|escape:'html'}" alt="{$accessory.legend|escape:'html':'UTF-8'}" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 								</div><!-- .col-left -->
 								<div class="col-right">
 									<div class="inner">
-										<p class="s_title_block">{$accessory.name|escape:'htmlall':'UTF-8'}</p>
+										<p class="s_title_block">{$accessory.name|escape:'html':'UTF-8'}</p>
 										<p>{$accessory.description_short|strip_tags|truncate:70:'...'}</p>
 									</div>
 								</div>
@@ -62,7 +62,7 @@
 							</div>
 						{/if}
 						<div class="btn-row">
-							<a class="" data-theme="a" data-role="button" data-mini="true" data-inline="true" data-icon="arrow-r" href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{l s='View'}" data-ajax="false">{l s='View'}</a>
+							<a class="" data-theme="a" data-role="button" data-mini="true" data-inline="true" data-icon="arrow-r" href="{$accessoryLink|escape:'html':'UTF-8'}" title="{l s='View'}" data-ajax="false">{l s='View'}</a>
 							{assign var="btn_more" value=""}
 							{assign var="btn_href" value=""}
 							{assign var="btn_class" value=""}
diff --git a/themes/default-bootstrap/mobile/product-images.tpl b/themes/default-bootstrap/mobile/product-images.tpl
index 037bf7283..447c7f8a5 100644
--- a/themes/default-bootstrap/mobile/product-images.tpl
+++ b/themes/default-bootstrap/mobile/product-images.tpl
@@ -29,7 +29,7 @@
 	<div data-role="header" class="ui-bar-a list_view">
 		{assign var=image_cover value=$product->getCover($product->id)}
 		{assign var=imageIds value="`$product->id`-`$image_cover.id_image`"}
-		<img id="bigpic" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" />
+		<img id="bigpic" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html'}" alt="{$product->name|escape:'html':'UTF-8'}" />
 		<div class="thumbs_list">
 			<ul id="gallery" class="thumbs_list_frame clearfix">
 			{foreach from=$images item=image name=thumbnails}
diff --git a/themes/default-bootstrap/mobile/product-js.tpl b/themes/default-bootstrap/mobile/product-js.tpl
index 54e5681bf..9d44e7042 100644
--- a/themes/default-bootstrap/mobile/product-js.tpl
+++ b/themes/default-bootstrap/mobile/product-js.tpl
@@ -66,7 +66,7 @@ function initProductPage()
 	ProductFn.maxQuantityToAllowDisplayOfLastQuantityMessage = {$last_qties};
 	{if $no_tax == 1}ProductFn.noTaxForThisProduct = true;{/if}
 	ProductFn.displayPrice = {$priceDisplay};
-	ProductFn.productReference = '{$product->reference|escape:'htmlall':'UTF-8'}';
+	ProductFn.productReference = '{$product->reference|escape:'html':'UTF-8'}';
 	ProductFn.productAvailableForOrder = {if (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}'0'{else}'{$product->available_for_order}'{/if};
 	{if !$PS_CATALOG_MODE}ProductFn.productShowPrice = '{$product->show_price}';{/if}
 	ProductFn.productUnitPriceRatio = '{$product->unit_price_ratio}';
diff --git a/themes/default-bootstrap/mobile/product-prices.tpl b/themes/default-bootstrap/mobile/product-prices.tpl
index d72738deb..117ee7558 100644
--- a/themes/default-bootstrap/mobile/product-prices.tpl
+++ b/themes/default-bootstrap/mobile/product-prices.tpl
@@ -81,7 +81,7 @@
 	
 	{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
 		 {math equation="pprice / punit_price"  pprice=$productPrice  punit_price=$product->unit_price_ratio assign=unit_price}
-		<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
+		<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'html':'UTF-8'}</p>
 	{/if}
 	</div><!-- .price -->
 </div><!-- .content_prices -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/mobile/product.tpl b/themes/default-bootstrap/mobile/product.tpl
index 8e6644239..345be59ce 100644
--- a/themes/default-bootstrap/mobile/product.tpl
+++ b/themes/default-bootstrap/mobile/product.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture assign='page_title'}{$product->name|escape:'htmlall':'UTF-8'}{/capture}
+{capture assign='page_title'}{$product->name|escape:'html':'UTF-8'}{/capture}
 {include file='./page-title.tpl'}
 
 {include file='./product-js.tpl'}
@@ -49,7 +49,7 @@
 			<h3>{l s='Pack content'}</h3>
 			{foreach from=$packItems item=packItem}
 			<div class="pack_content">
-				{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}" data-ajax="false">{$packItem.name|escape:'htmlall':'UTF-8'}</a>
+				{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}" data-ajax="false">{$packItem.name|escape:'html':'UTF-8'}</a>
 				<p>{$packItem.description_short}</p>
 			</div>
 			{/foreach}
@@ -73,7 +73,7 @@
 			<div id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
 				<br />
 				<label>{l s='Reference:'} </label>
-				<span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span>
+				<span class="editable">{$product->reference|escape:'html':'UTF-8'}</span>
 				<br />
 			</div>
 			
diff --git a/themes/default-bootstrap/mobile/search.tpl b/themes/default-bootstrap/mobile/search.tpl
index f46bffa03..61a7665bb 100644
--- a/themes/default-bootstrap/mobile/search.tpl
+++ b/themes/default-bootstrap/mobile/search.tpl
@@ -26,7 +26,7 @@
 {capture assign='page_title'}
 	{l s='Search'}
 	{if $nbProducts > 0}
-		"{if isset($search_query) && $search_query}{$search_query|escape:'htmlall':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'htmlall':'UTF-8'}{elseif $ref}{$ref|escape:'htmlall':'UTF-8'}{/if}"
+		"{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"
 	{/if}
 {/capture}
 {include file='./page-title.tpl'}
@@ -57,9 +57,9 @@
 {else}
 	<p class="warning">
 		{if isset($search_query) && $search_query}
-			{l s='No results were found for your search'}&nbsp;"{if isset($search_query)}{$search_query|escape:'htmlall':'UTF-8'}{/if}"
+			{l s='No results were found for your search'}&nbsp;"{if isset($search_query)}{$search_query|escape:'html':'UTF-8'}{/if}"
 		{elseif isset($search_tag) && $search_tag}
-			{l s='No results were found for your search'}&nbsp;"{$search_tag|escape:'htmlall':'UTF-8'}"
+			{l s='No results were found for your search'}&nbsp;"{$search_tag|escape:'html':'UTF-8'}"
 		{else}
 			{l s='Please enter a search keyword'}
 		{/if}
diff --git a/themes/default-bootstrap/mobile/shopping-cart-product-line.tpl b/themes/default-bootstrap/mobile/shopping-cart-product-line.tpl
index 0ffcf3a53..cd15af837 100644
--- a/themes/default-bootstrap/mobile/shopping-cart-product-line.tpl
+++ b/themes/default-bootstrap/mobile/shopping-cart-product-line.tpl
@@ -25,13 +25,13 @@
 
 <tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}" class="{if isset($productLast) && $productLast && (!isset($ignoreProductLast) || !$ignoreProductLast)}last_item{elseif isset($productFirst) && $productFirst}first_item{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}alternate_item{/if} cart_item address_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if}">
 	<td class="cart_product">
-		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
+		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
 	</td>
 	<td class="cart_description">
-		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a>
-		{if isset($product.attributes) && $product.attributes}<p style="font-size:.9em"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a></p>{/if}
+		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a>
+		{if isset($product.attributes) && $product.attributes}<p style="font-size:.9em"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.attributes|escape:'html':'UTF-8'}</a></p>{/if}
 	</td>
-	<td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
+	<td class="cart_ref">{if $product.reference}{$product.reference|escape:'html':'UTF-8'}{else}--{/if}</td>
 	<td class="cart_unit">
 		<span class="price" id="product_price_{$product.id_product}_{$product.id_product_attribute}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}">
 			{if !empty($product.gift)}
diff --git a/themes/default-bootstrap/mobile/sitemap.tpl b/themes/default-bootstrap/mobile/sitemap.tpl
index ba82ea339..d7b0707e2 100644
--- a/themes/default-bootstrap/mobile/sitemap.tpl
+++ b/themes/default-bootstrap/mobile/sitemap.tpl
@@ -36,8 +36,8 @@
 						{include file="./category-tree-branch.tpl" node=$categoriesTree.children.$i}
 				{else}
 				<li data-icon="arrow-d">
-					<a href="{$categoriesTree.children.$i.link|escape:'htmlall':'UTF-8'}" title="{$categoriesTree.children.$i.desc|escape:'htmlall':'UTF-8'}">
-						{$categoriesTree.children.$i.name|escape:'htmlall':'UTF-8'}
+					<a href="{$categoriesTree.children.$i.link|escape:'html':'UTF-8'}" title="{$categoriesTree.children.$i.desc|escape:'html':'UTF-8'}">
+						{$categoriesTree.children.$i.name|escape:'html':'UTF-8'}
 					</a>
 				</li>
 				{/if}
@@ -88,7 +88,7 @@
 				{/foreach}
 			{/if}
 			{foreach from=$categoriescmsTree.cms item=cms name=cmsTree}
-				<li><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+				<li><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
 			{/foreach}
 			<li><a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact'}">{l s='Contact'}</a></li>
 			{if $display_store}<li><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores'}">{l s='Our stores'}</a></li>{/if}
diff --git a/themes/default-bootstrap/mobile/supplier-list.tpl b/themes/default-bootstrap/mobile/supplier-list.tpl
index 74e28d5bb..3fa0e52c5 100644
--- a/themes/default-bootstrap/mobile/supplier-list.tpl
+++ b/themes/default-bootstrap/mobile/supplier-list.tpl
@@ -50,12 +50,12 @@
 	{foreach $suppliers_list as $supplier}
 		<li data-corners="false" data-shadow="false" data-iconshadow="true" data-inline="false" data-wrapperels="div" data-icon="arrow-r" data-iconpos="right" data-theme="c" class="clearfix {if $supplier@first}first_item{elseif $supplier@last}last_item{else}item{/if}">
 			{if $supplier.nb_products > 0}
-			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$supplier.name|escape:'htmlall':'UTF-8'}" data-ajax="false">
+			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}" data-ajax="false">
 			{/if}
 			<!-- logo -->
-			<img src="{$img_sup_dir}{$supplier.image|escape:'htmlall':'UTF-8'}-medium_default.jpg" alt="" width="80" />
+			<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="80" />
 			<!-- name -->
-			<h3>{$supplier.name|truncate:60:'...'|escape:'htmlall':'UTF-8'}</h3>
+			<h3>{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}</h3>
 			<p>
 			{if $supplier.nb_products == 1}
 				{l s='%d product' sprintf=$supplier.nb_products|intval}
diff --git a/themes/default-bootstrap/mobile/supplier.tpl b/themes/default-bootstrap/mobile/supplier.tpl
index a05b755bc..d13ab4687 100644
--- a/themes/default-bootstrap/mobile/supplier.tpl
+++ b/themes/default-bootstrap/mobile/supplier.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture assign='page_title'}{$supplier->name|escape:'htmlall':'UTF-8'}{/capture}
+{capture assign='page_title'}{$supplier->name|escape:'html':'UTF-8'}{/capture}
 {include file='./page-title.tpl'}
 
 {include file="$tpl_dir./errors.tpl"}
diff --git a/themes/default-bootstrap/modules/bankwire/views/templates/hook/infos.tpl b/themes/default-bootstrap/modules/bankwire/views/templates/hook/infos.tpl
index 401f70b79..d34804bf3 100644
--- a/themes/default-bootstrap/modules/bankwire/views/templates/hook/infos.tpl
+++ b/themes/default-bootstrap/modules/bankwire/views/templates/hook/infos.tpl
@@ -25,7 +25,7 @@
 
 <div class="alert alert-info">
 <img src="../modules/bankwire/bankwire.jpg" style="float:left; margin-right:15px;" width="86" height="49">
-<p><strong>{l s="This module allows you to accept secure payments by bank wire."}</strong></p>
-<p>{l s="If the client chooses to pay by bank wire, the order\'s status will change to 'Waiting for Payment.'"}</p>
-<p>{l s="That said, you must manually confirm the order upon receiving the bank wire."}</p>
-</div>
\ No newline at end of file
+<p><strong>{l s="This module allows you to accept secure payments by bank wire." mod='bankwire'}</strong></p>
+<p>{l s="If the client chooses to pay by bank wire, the order\'s status will change to 'Waiting for Payment.'" mod='bankwire'}</p>
+<p>{l s="That said, you must manually confirm the order upon receiving the bank wire." mod='bankwire'}</p>
+</div>
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl b/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl
index 1dddcd510..267bdfee9 100644
--- a/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl
+++ b/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl
@@ -35,7 +35,7 @@
 		"image":         "{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|addslashes|replace:'\\\'':'\''}",
         "image_cart":    "{$link->getImageLink($product.link_rewrite, $product.id_image, 'cart_default')|addslashes|replace:'\\\'':'\''}",
 		"priceByLine":   "{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total}{else}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total_wt}{/if}",
-		"name":          "{$product.name|html_entity_decode:2:'UTF-8'|truncate:15:'...':true|escape:'htmlall'}",
+		"name":          "{$product.name|html_entity_decode:2:'UTF-8'|truncate:15:'...':true|escape:'html'}",
 		"price":         "{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total}{else}{displayWtPrice|html_entity_decode:2:'UTF-8' p=$product.total_wt}{/if}",
 		"price_float":   "{$product.total}",
 		"idCombination": {if isset($product.attributes_small)}{$productAttributeId}{else}0{/if},
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart.tpl b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
index 6cd7f5ec8..af543f92f 100644
--- a/themes/default-bootstrap/modules/blockcart/blockcart.tpl
+++ b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
@@ -133,7 +133,7 @@ var generated_date = {$smarty.now|intval};
 				{if $discount.value_real > 0}
 				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
 					<td class="quantity">1x</td>
-					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
+					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'html':'UTF-8'}</td>
 					<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
 					<td class="delete">
 						{if strlen($discount.code)}
diff --git a/themes/default-bootstrap/modules/blockcart/crossselling.tpl b/themes/default-bootstrap/modules/blockcart/crossselling.tpl
index 94d1c97fd..4253aa65f 100644
--- a/themes/default-bootstrap/modules/blockcart/crossselling.tpl
+++ b/themes/default-bootstrap/modules/blockcart/crossselling.tpl
@@ -36,7 +36,7 @@
                             <img class="img-responsive" src="{$orderProduct.image}" alt="{$orderProduct.name|htmlspecialchars}" />
                         </a>
                     </div>
-                    <p class="product-name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'htmlall':'UTF-8'}</a></p>
+                    <p class="product-name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'html':'UTF-8'}</a></p>
                     {if $orderProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
                         <span class="price_display">
                             <span class="price">{convertPrice price=$orderProduct.displayed_price}</span>
diff --git a/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl b/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
index 21d3e976e..ce97048b6 100644
--- a/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
+++ b/themes/default-bootstrap/modules/blockcategories/category-tree-branch-top.tpl
@@ -24,8 +24,8 @@
 *}
 
 <li class="category_{$node.id}{if isset($last) && $last == 'true'} last{/if}">
-	<h4><a href="{$node.link|escape:'htmlall':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-			title="{$node.desc|strip_tags|trim|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a></h4>
+	<h4><a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
+			title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a></h4>
 		
 	{if $node.children|@count > 0}
 		<ul class="main-level-submenus">
diff --git a/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl b/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
index 63bbcb73e..5718b22d0 100644
--- a/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
+++ b/themes/default-bootstrap/modules/blockcategories/category-tree-branch.tpl
@@ -24,8 +24,8 @@
 *}
 
 <li {if isset($last) && $last == 'true'}class="last"{/if}>
-	<a href="{$node.link|escape:'htmlall':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
-		title="{$node.desc|strip_tags|trim|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a>
+	<a href="{$node.link|escape:'html':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if}
+		title="{$node.desc|strip_tags|trim|escape:'html':'UTF-8'}">{$node.name|escape:'html':'UTF-8'}</a>
 	{if $node.children|@count > 0}
 		<ul>
 		{foreach from=$node.children item=child name=categoryTreeBranch}
diff --git a/themes/default-bootstrap/modules/blockcms/blockcms.tpl b/themes/default-bootstrap/modules/blockcms/blockcms.tpl
index cbd79dbbc..8be161d1a 100644
--- a/themes/default-bootstrap/modules/blockcms/blockcms.tpl
+++ b/themes/default-bootstrap/modules/blockcms/blockcms.tpl
@@ -56,7 +56,7 @@
 			<li class="item"><a href="{$link->getPageLink($contact_url, true)|escape:'html'}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
 			{foreach from=$cmslinks item=cmslink}
 				{if $cmslink.meta_title != ''}
-					<li class="item"><a href="{$cmslink.link|addslashes|escape:'html'}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+					<li class="item"><a href="{$cmslink.link|addslashes|escape:'html'}" title="{$cmslink.meta_title|escape:'html':'UTF-8'}">{$cmslink.meta_title|escape:'html':'UTF-8'}</a></li>
 				{/if}
 			{/foreach}
 			<li><a href="{$link->getPageLink('sitemap')|escape:'html'}" title="{l s='sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a></li>
diff --git a/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl b/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
index c8efbaaf9..30be7cff7 100644
--- a/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
+++ b/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
@@ -27,7 +27,7 @@
 	<p class="title_block">{l s='Contact us' mod='blockcontact'}</p>
 	<div class="block_content clearfix">
 			<p><strong>{l s='Our support hotline is available 24/7' mod='blockcontact'}</strong></p>
-			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span><i class="icon-phone"></i>{$telnumber|escape:'htmlall':'UTF-8'}</p>{/if}
-			{if $email != ''}<a class="btn btn-default button button-small" href="mailto:{$email|escape:'htmlall':'UTF-8'}"><span>{l s='Contact our expert support team!' mod='blockcontact'}</span></a>{/if}
+			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span><i class="icon-phone"></i>{$telnumber|escape:'html':'UTF-8'}</p>{/if}
+			{if $email != ''}<a class="btn btn-default button button-small" href="mailto:{$email|escape:'html':'UTF-8'}"><span>{l s='Contact our expert support team!' mod='blockcontact'}</span></a>{/if}
 	</div>
 </div>
diff --git a/themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl b/themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
index 695536c39..bb133d599 100644
--- a/themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
+++ b/themes/default-bootstrap/modules/blockcontactinfos/blockcontactinfos.tpl
@@ -29,9 +29,9 @@
 	<div>
         <h4>{l s='Store Information' mod='blockcontactinfos'}</h4>
         <ul class="toggle-footer">
-            {if $blockcontactinfos_company != ''}<li><i class="icon-map-marker"></i>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}{if $blockcontactinfos_address != ''}, {$blockcontactinfos_address|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
-            {if $blockcontactinfos_phone != ''}<li><i class="icon-phone"></i>{l s='Call us now toll free:' mod='blockcontactinfos'} <span>{$blockcontactinfos_phone|escape:'htmlall':'UTF-8'}</span></li>{/if}
-            {if $blockcontactinfos_email != ''}<li><i class="icon-envelope-alt"></i>{l s='Email:' mod='blockcontactinfos'} <span>{mailto address=$blockcontactinfos_email|escape:'htmlall':'UTF-8' encode="hex"}</span></li>{/if}
+            {if $blockcontactinfos_company != ''}<li><i class="icon-map-marker"></i>{$blockcontactinfos_company|escape:'html':'UTF-8'}{if $blockcontactinfos_address != ''}, {$blockcontactinfos_address|escape:'html':'UTF-8'}{/if}</li>{/if}
+            {if $blockcontactinfos_phone != ''}<li><i class="icon-phone"></i>{l s='Call us now toll free:' mod='blockcontactinfos'} <span>{$blockcontactinfos_phone|escape:'html':'UTF-8'}</span></li>{/if}
+            {if $blockcontactinfos_email != ''}<li><i class="icon-envelope-alt"></i>{l s='Email:' mod='blockcontactinfos'} <span>{mailto address=$blockcontactinfos_email|escape:'html':'UTF-8' encode="hex"}</span></li>{/if}
             <!--li><i class="icon-skype"></i>{l s='Skype:' mod='blockcontactinfos'} <span></span></li-->
         </ul>
     </div>
diff --git a/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl b/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
index 3f3bf826d..4097c239a 100644
--- a/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
+++ b/themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
@@ -187,11 +187,11 @@ param_product_url = '';
 								</script>
 							{else}
 								{if $filter.filter_type == 1}
-								<li class="nomargin">
-									{l s='From' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_min layered_input_range form-control grey" id="layered_{$filter.type}_range_min" type="text" value="{$filter.values[0]}"/>
-									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
-									{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range form-control grey" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
-									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
+								<li class="nomargin row">
+                                        <div class="col-xs-6 col-sm-12 col-lg-6 first-item">{l s='From' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_min layered_input_range form-control grey" id="layered_{$filter.type}_range_min" type="text" value="{$filter.values[0]}"/>
+                                        <span class="layered_{$filter.type}_range_unit">{$filter.unit}</span></div>
+                                        <div class="col-xs-6 col-sm-12 col-lg-6">{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range form-control grey" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
+                                        <span class="layered_{$filter.type}_range_unit">{$filter.unit}</span></div>
 									<span class="layered_{$filter.type}_format" style="display:none;">{$filter.format}</span>
 									<script type="text/javascript">
 									{literal}
diff --git a/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl b/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
index 0c9c70df4..01d77bfe2 100644
--- a/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
+++ b/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -32,18 +32,18 @@
 	<ul>
 	{foreach from=$manufacturers item=manufacturer name=manufacturer_list}
 		{if $smarty.foreach.manufacturer_list.iteration <= $text_list_nb}
-		<li class="{if $smarty.foreach.manufacturer_list.last}last_item{elseif $smarty.foreach.manufacturer_list.first}first_item{else}item{/if}"><a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</a></li>
+		<li class="{if $smarty.foreach.manufacturer_list.last}last_item{elseif $smarty.foreach.manufacturer_list.first}first_item{else}item{/if}"><a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'html':'UTF-8'}</a></li>
 		{/if}
 	{/foreach}
 	</ul>
 	{/if}
 	{if $form_list}
-		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" method="get">
 			<div class="form-group selector1">
 				<select id="manufacturer_list" class="form-control" onchange="autoUrl('manufacturer_list', '');">
 					<option value="0">{l s='All manufacturers' mod='blockmanufacturer'}</option>
 				{foreach from=$manufacturers item=manufacturer}
-					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html'}">{$manufacturer.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</div>
diff --git a/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl b/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
index 7207cdf9a..e86944826 100644
--- a/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
+++ b/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
@@ -33,19 +33,19 @@
 	{foreach from=$suppliers item=supplier name=supplier_list}
 		{if $smarty.foreach.supplier_list.iteration <= $text_list_nb}
 		<li class="{if $smarty.foreach.supplier_list.last}last_item{elseif $smarty.foreach.supplier_list.first}first_item{else}item{/if}">
-			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'htmlall':'UTF-8'}</a>
+			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'html':'UTF-8'}</a>
 		</li>
 		{/if}
 	{/foreach}
 	</ul>
 	{/if}
 	{if $form_list}
-		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" method="get">
 			<div class="form-group selector1">
 				<select id="supplier_list" class="form-control" onchange="autoUrl('supplier_list', '');">
 					<option value="0">{l s='All suppliers' mod='blocksupplier'}</option>
 				{foreach from=$suppliers item=supplier}
-					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}">{$supplier.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html'}">{$supplier.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</div>
diff --git a/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl b/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
index 2257fe616..1a79edf02 100644
--- a/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
+++ b/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
@@ -12,7 +12,7 @@
 							<input type="hidden" name="controller" value="search" />
 							<input type="hidden" value="position" name="orderby"/>
 							<input type="hidden" value="desc" name="orderway"/>
-							<input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'htmlall':'UTF-8'}{/if}" />
+							<input type="text" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|escape:'html':'UTF-8'}{/if}" />
 						</p>
 					</form>
 				</li>
diff --git a/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl b/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl
index daef7882f..f811d6899 100644
--- a/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl
@@ -27,12 +27,12 @@
 	{foreach from=$products item=product name=i}
 		<dt class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
 			<span class="quantity-formated"><span class="quantity">{$product.quantity|intval}</span>x</span>
-			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'htmlall':'UTF-8'}" >{$product.name|truncate:13:'...'|escape:'htmlall':'UTF-8'}</a>
+			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'html':'UTF-8'}" >{$product.name|truncate:13:'...'|escape:'html':'UTF-8'}</a>
 			<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}" rel="nofollow"><i class="icon-remove-sign"></i></a>
 		</dt>
 		{if isset($product.attributes_small)}
 		<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
-			<a href="{$link->getProductLink($product.id_product, $product.link_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+			<a href="{$link->getProductLink($product.id_product, $product.link_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 		</dd>
 		{/if}
 	{/foreach}
diff --git a/themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl b/themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl
index 855aaf987..4ff77cc23 100644
--- a/themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/blockwishlist.tpl
@@ -34,12 +34,12 @@
 				<dt class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
 					<span class="quantity-formated"><span class="quantity">{$product.quantity|intval}</span>x</span>
 					<a class="cart_block_product_name"
-					href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</a>
+					href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{$product.name|escape:'html':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}</a>
 					<a class="ajax_cart_block_remove_link" href="javascript:;" onclick="javascript:WishlistCart('wishlist_block_list', 'delete', '{$product.id_product}', {$product.id_product_attribute}, '0', '{if isset($token)}{$token}{/if}');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}" rel="nofollow"><i class="icon-remove-sign "></i></a>
 				</dt>
 				{if isset($product.attributes_small)}
 				<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
-					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 				</dd>
 				{/if}
 			{/foreach}
@@ -55,7 +55,7 @@
         	<div class="form-group selector1">
                 <select name="wishlists" id="wishlists" class="form-control" onchange="WishlistChangeDefault('wishlist_block_list', $('#wishlists').val());">
                 {foreach from=$wishlists item=wishlist name=i}
-                    <option value="{$wishlist.id_wishlist}"{if $id_wishlist eq $wishlist.id_wishlist or ($id_wishlist == false and $smarty.foreach.i.first)} selected="selected"{/if}>{$wishlist.name|truncate:22:'...'|escape:'htmlall':'UTF-8'}</option>
+                    <option value="{$wishlist.id_wishlist}"{if $id_wishlist eq $wishlist.id_wishlist or ($id_wishlist == false and $smarty.foreach.i.first)} selected="selected"{/if}>{$wishlist.name|truncate:22:'...'|escape:'html':'UTF-8'}</option>
                 {/foreach}
                 </select>
             </div>
diff --git a/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl b/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
index 29bed3d59..dd096e410 100644
--- a/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
@@ -41,7 +41,7 @@
 		</ul>
 		<p class="wishlisturl form-group">
         <label>{l s='Permalink' mod='blockwishlist'}:</label>
-        <input type="text" class="form-control" value="{$base_dir_ssl}modules/blockwishlist/view.php?token={$token_wish|escape:'htmlall':'UTF-8'}" readonly="readonly" /></p>
+        <input type="text" class="form-control" value="{$base_dir_ssl}modules/blockwishlist/view.php?token={$token_wish|escape:'html':'UTF-8'}" readonly="readonly" /></p>
 		<p class="submit">
 			<a href="#" id="showSendWishlist" class="btn btn-default button button-small" onclick="WishlistVisibility('wl_send', 'SendWishlist'); return false;" title="{l s='Send this wishlist' mod='blockwishlist'}"><span>{l s='Send this wishlist' mod='blockwishlist'}</span></a>
 		</p>
@@ -63,7 +63,7 @@
                     <div class="col-xs-6 col-sm-12">
                         <div class="product_image">
                             <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">
-                                <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" />
+                                <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" />
                             </a>
                         </div>
                     </div>
@@ -71,9 +71,9 @@
                         <div class="product_infos">
                             <a href="javascript:;" class="lnkdel" onclick="WishlistProductManage('wlp_bought', 'delete', '{$id_wishlist}', '{$product.id_product}', '{$product.id_product_attribute}', $('#quantity_{$product.id_product}_{$product.id_product_attribute}').val(), $('#priority_{$product.id_product}_{$product.id_product_attribute}').val());" title="{l s='Delete' mod='blockwishlist'}"><i class="icon-remove-sign"></i></a>
                             <p id="s_title" class="product-name">
-                                {$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}
+                                {$product.name|truncate:30:'...'|escape:'html':'UTF-8'}
                                 {if isset($product.attributes_small)}
-                                    <small><a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a></small>
+                                    <small><a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'html':'UTF-8'}</a></small>
                             {/if}
                             </p>
                             <div class="wishlist_product_detail">
@@ -137,11 +137,11 @@
 			{if $bought.quantity > 0}
 				<tr>
 					<td class="first_item">
-						<span style="float:left;"><img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" /></span>			
+						<span style="float:left;"><img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" /></span>			
 						<span style="float:left;">
-							{$product.name|truncate:40:'...'|escape:'htmlall':'UTF-8'}
+							{$product.name|truncate:40:'...'|escape:'html':'UTF-8'}
 						{if isset($product.attributes_small)}
-							<br /><i>{$product.attributes_small|escape:'htmlall':'UTF-8'}</i>
+							<br /><i>{$product.attributes_small|escape:'html':'UTF-8'}</i>
 						{/if}
 						</span>
 					</td>
diff --git a/themes/default-bootstrap/modules/blockwishlist/view.tpl b/themes/default-bootstrap/modules/blockwishlist/view.tpl
index 942ec9387..f66fcf265 100644
--- a/themes/default-bootstrap/modules/blockwishlist/view.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/view.tpl
@@ -55,16 +55,16 @@
                 	<div class="col-xs-6 col-sm-12">
                        <div class="product_image">
                             <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}">
-                                <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" />
+                                <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.cover, 'home_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" />
                             </a>
                         </div>
                     </div>
                     <div class="col-xs-6 col-sm-12">
                    		<div class="product_infos">
                             <p id="s_title" class="product-name">
-                            	{$product.name|truncate:30:'...'|escape:'htmlall':'UTF-8'}
+                            	{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}
                             	{if isset($product.attributes_small)}
-                                	<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}"><small>{$product.attributes_small|escape:'htmlall':'UTF-8'}</small></a>
+                                	<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html'}" title="{l s='Product detail' mod='blockwishlist'}"><small>{$product.attributes_small|escape:'html':'UTF-8'}</small></a>
                             {/if}
                             </p>
                         <div class="wishlist_product_detail">
@@ -92,7 +92,7 @@
                                         </p>
                                     </form>
                                 {/if}
-                                <a href="javascript:;" class="button ajax_add_to_cart_button btn btn-default" onclick="WishlistBuyProduct('{$token|escape:'htmlall':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});" title="{l s='Add to cart' mod='homefeatured'}" rel="nofollow"><span>{l s='Add to cart' mod='blockwishlist'}</span></a>
+                                <a href="javascript:;" class="button ajax_add_to_cart_button btn btn-default" onclick="WishlistBuyProduct('{$token|escape:'html':'UTF-8'}', '{$product.id_product}', '{$product.id_product_attribute}', '{$product.id_product}_{$product.id_product_attribute}', this, {$ajax});" title="{l s='Add to cart' mod='homefeatured'}" rel="nofollow"><span>{l s='Add to cart' mod='blockwishlist'}</span></a>
                             {else}
                                 <span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart' mod='blockwishlist'}</span></span>
                             {/if}
diff --git a/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl b/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl
index 6923604d9..2f14adfa8 100644
--- a/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl
@@ -35,9 +35,9 @@
 			<fieldset>
 				<h3 class="page-subheading">{l s='New wishlist' mod='blockwishlist'}</h3>
 				<div class="form-group">
-					<input type="hidden" name="token" value="{$token|escape:'htmlall':'UTF-8'}" />
+					<input type="hidden" name="token" value="{$token|escape:'html':'UTF-8'}" />
 					<label class="align_right" for="name">{l s='Name' mod='blockwishlist'}</label>
-					<input type="text" id="name" name="name" class="inputTxt form-control" value="{if isset($smarty.post.name) and $errors|@count > 0}{$smarty.post.name|escape:'htmlall':'UTF-8'}{/if}" />
+					<input type="text" id="name" name="name" class="inputTxt form-control" value="{if isset($smarty.post.name) and $errors|@count > 0}{$smarty.post.name|escape:'html':'UTF-8'}{/if}" />
 				</div>
 				<p class="submit">
                     <button type="submit" name="submitWishlist" id="submitWishlist" class="btn btn-default button button-medium"><span>{l s='Save' mod='blockwishlist'}<i class="icon-chevron-right right"></i></span></button>
@@ -61,7 +61,7 @@
 				{section name=i loop=$wishlists}
 					<tr id="wishlist_{$wishlists[i].id_wishlist|intval}">
 						<td style="width:200px;">
-							<a href="javascript:;" onclick="javascript:WishlistManage('block-order-detail', '{$wishlists[i].id_wishlist|intval}');">{$wishlists[i].name|truncate:30:'...'|escape:'htmlall':'UTF-8'}</a>
+							<a href="javascript:;" onclick="javascript:WishlistManage('block-order-detail', '{$wishlists[i].id_wishlist|intval}');">{$wishlists[i].name|truncate:30:'...'|escape:'html':'UTF-8'}</a>
 						</td>
 						<td class="bold align_center">
 							{assign var=n value=0}
diff --git a/themes/default-bootstrap/modules/carriercompare/template/carriercompare.tpl b/themes/default-bootstrap/modules/carriercompare/template/carriercompare.tpl
index ec91ac3bd..a0a4cbac4 100644
--- a/themes/default-bootstrap/modules/carriercompare/template/carriercompare.tpl
+++ b/themes/default-bootstrap/modules/carriercompare/template/carriercompare.tpl
@@ -49,7 +49,7 @@ PS_SE_HandleEvent();
 			<label for="id_country">{l s='Country' mod='carriercompare'}</label>
 			<select name="id_country" id="id_country" class="form-control">
 				{foreach from=$countries item=country}
-					<option value="{$country.id_country}" {if $id_country == $country.id_country}selected="selected"{/if}>{$country.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$country.id_country}" {if $id_country == $country.id_country}selected="selected"{/if}>{$country.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 			</select>
 		</div>
@@ -61,7 +61,7 @@ PS_SE_HandleEvent();
 		</div>
 		<div class="form-group last">
 			<label for="zipcode">{l s='Zip Code' mod='carriercompare'}</label>
-			<input class="form-control" type="text" name="zipcode" id="zipcode" value="{$zipcode|escape:'htmlall':'UTF-8'}"/> ({l s='Needed for certain carriers.' mod='carriercompare'})
+			<input class="form-control" type="text" name="zipcode" id="zipcode" value="{$zipcode|escape:'html':'UTF-8'}"/> ({l s='Needed for certain carriers.' mod='carriercompare'})
 		</div>
 		<div id="carriercompare_errors" style="display: none;">
 			<ul id="carriercompare_errors_list"></ul><br />
diff --git a/themes/default-bootstrap/modules/carriercompare/template/configuration.tpl b/themes/default-bootstrap/modules/carriercompare/template/configuration.tpl
index f9735f408..f698d2846 100644
--- a/themes/default-bootstrap/modules/carriercompare/template/configuration.tpl
+++ b/themes/default-bootstrap/modules/carriercompare/template/configuration.tpl
@@ -6,7 +6,7 @@
 	{/if}
 {/if}
 
-<form method="post" action="{$smarty.server.REQUEST_URI|escape:'htmlall':'UTF-8'}">
+<form method="post" action="{$smarty.server.REQUEST_URI|escape:'html':'UTF-8'}">
 	<fieldset>
 		<div class="warn">{l s='This module is only available during the standard five-step checkout process. The carrier list has already been defined for one-page checkout. ' mod='carriercompare'}.</div>
 		<legend>{l s='Global Configuration' mod='carriercompare'}</legend>
diff --git a/themes/default-bootstrap/modules/cheque/views/templates/hook/infos.tpl b/themes/default-bootstrap/modules/cheque/views/templates/hook/infos.tpl
index 88d2bdb6f..977cab658 100644
--- a/themes/default-bootstrap/modules/cheque/views/templates/hook/infos.tpl
+++ b/themes/default-bootstrap/modules/cheque/views/templates/hook/infos.tpl
@@ -25,7 +25,7 @@
 
 <div class="alert alert-info">
 <img src="../modules/cheque/cheque.jpg" style="float:left; margin-right:15px;" width="86" height="49">
-<p><strong>{l s="This module allows you to accept payments by check."}</strong></p>
-<p>{l s="If the client chooses this payment method, the order status will change to 'Waiting for payment.'"}</p>
-<p>{l s="You will need to manually confirm the order as soon as you receive a check."}</p>
-</div>
\ No newline at end of file
+<p><strong>{l s="This module allows you to accept payments by check." mod='cheque'}</strong></p>
+<p>{l s="If the client chooses this payment method, the order status will change to 'Waiting for payment.'" mod='cheque'}</p>
+<p>{l s="You will need to manually confirm the order as soon as you receive a check." mod='cheque'}</p>
+</div>
diff --git a/themes/default-bootstrap/modules/crossselling/crossselling.tpl b/themes/default-bootstrap/modules/crossselling/crossselling.tpl
index 5879c9e43..a3e567406 100644
--- a/themes/default-bootstrap/modules/crossselling/crossselling.tpl
+++ b/themes/default-bootstrap/modules/crossselling/crossselling.tpl
@@ -30,7 +30,7 @@
             {foreach from=$orderProducts item='orderProduct' name=orderProduct}
                 <li class="product-box item">
                     <a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}" class="lnk_img product-image"><img src="{$orderProduct.image}" alt="{$orderProduct.name|htmlspecialchars}" /></a>
-                    <p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'htmlall':'UTF-8'}</a></p>
+                    <p class="product_name"><a href="{$orderProduct.link}" title="{$orderProduct.name|htmlspecialchars}">{$orderProduct.name|truncate:15:'...'|escape:'html':'UTF-8'}</a></p>
                     {if $crossDisplayPrice AND $orderProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
                         <p class="price_display">
                             <span class="price">{convertPrice price=$orderProduct.displayed_price}</span>
diff --git a/themes/default-bootstrap/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl b/themes/default-bootstrap/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
index cec9cacf7..ea05cedf0 100644
--- a/themes/default-bootstrap/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
+++ b/themes/default-bootstrap/modules/favoriteproducts/views/templates/front/favoriteproducts-account.tpl
@@ -54,7 +54,7 @@ $('document').ready(function()
 </script>
 
 {capture name=path}
-	<a href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}">
+	<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 		{l s='My account' mod='favoriteproducts'}</a>
 		<span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My favorite products' mod='favoriteproducts'}</span>
 {/capture}
@@ -66,10 +66,10 @@ $('document').ready(function()
 			{foreach from=$favoriteProducts item=favoriteProduct}
 			<li class="col-xs-12">
             	<div class="favoriteproduct clearfix inner-content">
-                    <a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}" class="product_img_link">
-                        <img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium_default')|escape:'htmlall':'UTF-8'}" alt=""/></a>
-                    <p class="s_title_block"><a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'htmlall':'UTF-8'}">{$favoriteProduct.name|escape:'htmlall':'UTF-8'}</a></p>
-                    <div class="product_desc">{$favoriteProduct.description_short|strip_tags|escape:'htmlall':'UTF-8'}</div>
+                    <a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'html':'UTF-8'}" class="product_img_link">
+                        <img src="{$link->getImageLink($favoriteProduct.link_rewrite, $favoriteProduct.image, 'medium_default')|escape:'html':'UTF-8'}" alt=""/></a>
+                    <p class="s_title_block"><a href="{$link->getProductLink($favoriteProduct.id_product, null, null, null, null, $favoriteProduct.id_shop)|escape:'html':'UTF-8'}">{$favoriteProduct.name|escape:'html':'UTF-8'}</a></p>
+                    <div class="product_desc">{$favoriteProduct.description_short|strip_tags|escape:'html':'UTF-8'}</div>
                     <div class="remove">
                     	<a href="#" onclick="return false" rel="ajax_id_favoriteproduct_{$favoriteProduct.id_product}"><i class="icon-remove"></i></a>
                     </div>
@@ -83,6 +83,6 @@ $('document').ready(function()
 
 	<ul class="footer_links clearfix">
 		<li>
-			<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'htmlall':'UTF-8'}"><span><i class="icon-chevron-left"></i>{l s='Back to your account' mod='favoriteproducts'}</span></a></li>
+			<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}"><span><i class="icon-chevron-left"></i>{l s='Back to your account' mod='favoriteproducts'}</span></a></li>
 	</ul>
 </div>
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/favoriteproducts/views/templates/hook/my-account.tpl b/themes/default-bootstrap/modules/favoriteproducts/views/templates/hook/my-account.tpl
index f34592ade..4ae47ca94 100644
--- a/themes/default-bootstrap/modules/favoriteproducts/views/templates/hook/my-account.tpl
+++ b/themes/default-bootstrap/modules/favoriteproducts/views/templates/hook/my-account.tpl
@@ -24,5 +24,5 @@
 *}
 
 <li class="favoriteproducts">
-	<a href="{$link->getModuleLink('favoriteproducts', 'account')|escape:'htmlall':'UTF-8'}" title="{l s='My favorite products.' mod='favoriteproducts'}">{if !$in_footer}<i class="icon-heart-empty"></i><span>{l s='My favorite products' mod='favoriteproducts'}</span>{else}{l s='My favorite products' mod='favoriteproducts'}{/if}</a>
+	<a href="{$link->getModuleLink('favoriteproducts', 'account')|escape:'html':'UTF-8'}" title="{l s='My favorite products.' mod='favoriteproducts'}">{if !$in_footer}<i class="icon-heart-empty"></i><span>{l s='My favorite products' mod='favoriteproducts'}</span>{else}{l s='My favorite products' mod='favoriteproducts'}{/if}</a>
 </li>
diff --git a/themes/default-bootstrap/modules/homeslider/homeslider.tpl b/themes/default-bootstrap/modules/homeslider/homeslider.tpl
index 4d50be4dd..ae45844f4 100644
--- a/themes/default-bootstrap/modules/homeslider/homeslider.tpl
+++ b/themes/default-bootstrap/modules/homeslider/homeslider.tpl
@@ -46,8 +46,8 @@ var homeslider_pause = {$homeslider.pause};
     {foreach from=$homeslider_slides item=slide}
         {if $slide.active}
             <li>
-                <a href="{$slide.url|escape:'htmlall':'UTF-8'}" title="{$slide.description|escape:'htmlall':'UTF-8'}">
-                <img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'htmlall':'UTF-8'}" alt="{$slide.legend|escape:'htmlall':'UTF-8'}"  />
+                <a href="{$slide.url|escape:'html':'UTF-8'}" title="{$slide.description|escape:'html':'UTF-8'}">
+                <img src="{$smarty.const._MODULE_DIR_}homeslider/images/{$slide.image|escape:'html':'UTF-8'}" alt="{$slide.legend|escape:'html':'UTF-8'}"  />
                 </a>
             </li>
         {/if}
diff --git a/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl b/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl
index 84b4e8a2e..30d36654f 100644
--- a/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl
+++ b/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl
@@ -52,7 +52,7 @@
 				<td class="history_link bold">{l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}</td>
 				<td class="history_date">{dateFormat date=$order.date full=1}</td>
 				<td class="history_method">{$order.points|intval}</td>
-				<td class="history_method">{$order.state|escape:'htmlall':'UTF-8'}</td>
+				<td class="history_method">{$order.state|escape:'html':'UTF-8'}</td>
 			</tr>
 		{/foreach}
 		</tbody>
@@ -81,9 +81,9 @@
 		{/if}
 		{section name=pagination start=$page-1 loop=$page+2 step=1}
 			{if $page == $smarty.section.pagination.index}
-				<li class="current"><span>{$page|escape:'htmlall':'UTF-8'}</span></li>
+				<li class="current"><span>{$page|escape:'html':'UTF-8'}</span></li>
 			{elseif $smarty.section.pagination.index > 0 && $orders|@count+$nbpagination > ($smarty.section.pagination.index)*($nbpagination)}
-				<li><a href="{summarypaginationlink p=$smarty.section.pagination.index n=$nbpagination}">{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</a></li>
+				<li><a href="{summarypaginationlink p=$smarty.section.pagination.index n=$nbpagination}">{$smarty.section.pagination.index|escape:'html':'UTF-8'}</a></li>
 			{/if}
 		{/section}
 		{if $max_page-$page > 1}
@@ -108,7 +108,7 @@
 				<select name="n" id="nb_item">
 				{foreach from=$nArray item=nValue}
 					{if $nValue <= $orders|@count}
-						<option value="{$nValue|escape:'htmlall':'UTF-8'}" {if $nbpagination == $nValue}selected="selected"{/if}>{$nValue|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$nValue|escape:'html':'UTF-8'}" {if $nbpagination == $nValue}selected="selected"{/if}>{$nValue|escape:'html':'UTF-8'}</option>
 					{/if}
 				{/foreach}
 				</select>
@@ -170,7 +170,7 @@
                     </li>
                    {/foreach}
                    </ul>
-                   " data-original-title="{l s='Generated by these following orders' mod='loyalty'}" title="" data-toggle="popover" href="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" data-original-title="">{l s='more...' mod='loyalty'}</a>
+                   " data-original-title="{l s='Generated by these following orders' mod='loyalty'}" title="" data-toggle="popover" href="{$smarty.server.SCRIPT_NAME|escape:'html':'UTF-8'}" data-original-title="">{l s='more...' mod='loyalty'}</a>
                     
                     </td>
 			</tr>
diff --git a/themes/default-bootstrap/modules/productscategory/productscategory.tpl b/themes/default-bootstrap/modules/productscategory/productscategory.tpl
index 34bac3165..e61d4f532 100644
--- a/themes/default-bootstrap/modules/productscategory/productscategory.tpl
+++ b/themes/default-bootstrap/modules/productscategory/productscategory.tpl
@@ -32,7 +32,7 @@
 				<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)}" class="lnk_img product-image" title="{$categoryProduct.name|htmlspecialchars}"><img src="{$link->getImageLink($categoryProduct.link_rewrite, $categoryProduct.id_image, 'home_default')|escape:'html'}" alt="{$categoryProduct.name|htmlspecialchars}" /></a>
                 
 				<h5 class="product-name">
-					<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)|escape:'html'}" title="{$categoryProduct.name|htmlspecialchars}">{$categoryProduct.name|truncate:14:'...'|escape:'htmlall':'UTF-8'}</a>
+					<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)|escape:'html'}" title="{$categoryProduct.name|htmlspecialchars}">{$categoryProduct.name|truncate:14:'...'|escape:'html':'UTF-8'}</a>
 				</h5>
 				{if $ProdDisplayPrice AND $categoryProduct.show_price == 1 AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
 				<p class="price_display">
diff --git a/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl b/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl
index 2587b1575..f9d84300f 100644
--- a/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl
+++ b/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl
@@ -113,9 +113,9 @@
 					{section name=friends start=0 loop=$nbFriends step=1}
 					<tr class="{if $smarty.section.friends.index % 2}item{else}alternate_item{/if}">
 						<td class="align_right">{$smarty.section.friends.iteration}</td>
-						<td><input type="text" class="form-control" name="friendsLastName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsLastName[$smarty.section.friends.index])}{$smarty.post.friendsLastName[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
-						<td><input type="text" class="form-control" name="friendsFirstName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsFirstName[$smarty.section.friends.index])}{$smarty.post.friendsFirstName[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
-						<td><input type="text" class="form-control" name="friendsEmail[{$smarty.section.friends.index}]" size="20" value="{if isset($smarty.post.friendsEmail[$smarty.section.friends.index])}{$smarty.post.friendsEmail[$smarty.section.friends.index]|escape:'htmlall':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="form-control" name="friendsLastName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsLastName[$smarty.section.friends.index])}{$smarty.post.friendsLastName[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="form-control" name="friendsFirstName[{$smarty.section.friends.index}]" size="14" value="{if isset($smarty.post.friendsFirstName[$smarty.section.friends.index])}{$smarty.post.friendsFirstName[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
+						<td><input type="text" class="form-control" name="friendsEmail[{$smarty.section.friends.index}]" size="20" value="{if isset($smarty.post.friendsEmail[$smarty.section.friends.index])}{$smarty.post.friendsEmail[$smarty.section.friends.index]|escape:'html':'UTF-8'}{/if}" /></td>
 					</tr>
 					{/section}
 				</tbody>
diff --git a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/authentication.tpl b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/authentication.tpl
index 71f4523e6..92ca414aa 100644
--- a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/authentication.tpl
+++ b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/authentication.tpl
@@ -28,7 +28,7 @@
 	<h3 class="page-subheading">{l s='Referral program' mod='referralprogram'}</h3>
 	<p class="form-group">
 		<label for="referralprogram">{l s='E-mail address of your sponsor' mod='referralprogram'}</label>
-		<input class="form-control" type="text" size="52" maxlength="128" id="referralprogram" name="referralprogram" value="{if isset($smarty.post.referralprogram)}{$smarty.post.referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
+		<input class="form-control" type="text" size="52" maxlength="128" id="referralprogram" name="referralprogram" value="{if isset($smarty.post.referralprogram)}{$smarty.post.referralprogram|escape:'html':'UTF-8'}{/if}" />
 	</p>
 </fieldset>
 <!-- END : MODULE ReferralProgram -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/nbr-product-page.tpl b/themes/default-bootstrap/nbr-product-page.tpl
index 9ffd69aef..03612bd4a 100644
--- a/themes/default-bootstrap/nbr-product-page.tpl
+++ b/themes/default-bootstrap/nbr-product-page.tpl
@@ -41,13 +41,13 @@
 	{if $nb_products > $products_per_page}
 		<form action="{if !is_array($requestNb)}{$requestNb}{else}{$requestNb.requestUrl}{/if}" method="get" class="nbrItemPage">
 			<div class="clearfix selector1">
-				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
-				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if}
+				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />{/if}
+				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
 				<label for="nb_item{if isset($paginationId)}_{$paginationId}{/if}">{l s='Show'}</label>
 				{if is_array($requestNb)}
 					{foreach from=$requestNb item=requestValue key=requestKey}
 						{if $requestKey != 'requestUrl'}
-							<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
 						{/if}
 					{/foreach}
 				{/if}
@@ -55,7 +55,7 @@
 				{assign var="lastnValue" value="0"}
 				{foreach from=$nArray item=nValue}
 					{if $lastnValue <= $nb_products}
-						<option value="{$nValue|escape:'htmlall':'UTF-8'}" {if $n == $nValue}selected="selected"{/if}>{$nValue|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$nValue|escape:'html':'UTF-8'}" {if $n == $nValue}selected="selected"{/if}>{$nValue|escape:'html':'UTF-8'}</option>
 					{/if}
 					{assign var="lastnValue" value=$nValue}
 				{/foreach}
diff --git a/themes/default-bootstrap/order-address-multishipping.tpl b/themes/default-bootstrap/order-address-multishipping.tpl
index fbb67a9a0..d917cf1db 100644
--- a/themes/default-bootstrap/order-address-multishipping.tpl
+++ b/themes/default-bootstrap/order-address-multishipping.tpl
@@ -175,7 +175,7 @@
 			<label for="id_address_invoice" class="strong">{l s='Choose a billing address:'}</label>
 			<select name="id_address_invoice" id="id_address_invoice" class="address_select form-control" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
 			{section loop=$addresses step=-1 name=address}
-				<option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'htmlall':'UTF-8'}</option>
+				<option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'html':'UTF-8'}</option>
 			{/section}
 			</select>
         </div>
diff --git a/themes/default-bootstrap/order-address-product-line.tpl b/themes/default-bootstrap/order-address-product-line.tpl
index 85080cf82..4103f2a81 100644
--- a/themes/default-bootstrap/order-address-product-line.tpl
+++ b/themes/default-bootstrap/order-address-product-line.tpl
@@ -25,13 +25,13 @@
 *}
 <tr id="product_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" class="{if $productLast}last_item{elseif $productFirst}first_item{/if} {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0}alternate_item{/if} cart_item {if $odd}odd{else}even{/if}">
 	<td class="cart_product">
-		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
+		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
 	</td>
 	<td class="cart_description">
-		<p class="product-name"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a></p>
-		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a></small>{/if}
+		<p class="product-name"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a></p>
+		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}">{$product.attributes|escape:'html':'UTF-8'}</a></small>{/if}
 	</td>
-	<td class="cart_ref">{if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
+	<td class="cart_ref">{if $product.reference}{$product.reference|escape:'html':'UTF-8'}{else}--{/if}</td>
     <td class="cart_avail">{if $product.stock_quantity > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
 	<td class="cart_quantity {if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} text-center {/if}">
 	{if isset($cannotModify) AND $cannotModify == 1}
diff --git a/themes/default-bootstrap/order-address.tpl b/themes/default-bootstrap/order-address.tpl
index d8b26f660..aafc8908d 100644
--- a/themes/default-bootstrap/order-address.tpl
+++ b/themes/default-bootstrap/order-address.tpl
@@ -213,7 +213,7 @@
                 <select name="id_address_delivery" id="id_address_delivery" class="address_select form-control" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
     
                 {foreach from=$addresses key=k item=address}
-                    <option value="{$address.id_address|intval}" {if $address.id_address == $cart->id_address_delivery}selected="selected"{/if}>{$address.alias|escape:'htmlall':'UTF-8'}</option>
+                    <option value="{$address.id_address|intval}" {if $address.id_address == $cart->id_address_delivery}selected="selected"{/if}>{$address.alias|escape:'html':'UTF-8'}</option>
                 {/foreach}
                 
                 </select>
@@ -230,7 +230,7 @@
                         <label for="id_address_invoice" class="strong">{l s='Choose a billing address:'}</label>
                         <select name="id_address_invoice" id="id_address_invoice" class="address_select form-control" onchange="updateAddressesDisplay();{if $opc}updateAddressSelection();{/if}">
                         {section loop=$addresses step=-1 name=address}
-                            <option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'htmlall':'UTF-8'}</option>
+                            <option value="{$addresses[address].id_address|intval}" {if $addresses[address].id_address == $cart->id_address_invoice && $cart->id_address_delivery != $cart->id_address_invoice}selected="selected"{/if}>{$addresses[address].alias|escape:'html':'UTF-8'}</option>
                         {/section}
                         </select>
                     {else}
diff --git a/themes/default-bootstrap/order-carrier.tpl b/themes/default-bootstrap/order-carrier.tpl
index d82eea6ac..9c9025326 100644
--- a/themes/default-bootstrap/order-carrier.tpl
+++ b/themes/default-bootstrap/order-carrier.tpl
@@ -256,7 +256,7 @@
 		</p>
 		<p id="gift_div" class="form-group">
 			<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
-			<textarea rows="5" cols="35" id="gift_message" class="form-control" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
+			<textarea rows="5" cols="35" id="gift_message" class="form-control" name="gift_message">{$cart->gift_message|escape:'html':'UTF-8'}</textarea>
 		</p>
 		{/if}
 	{/if}
@@ -285,7 +285,7 @@
         <p><strong class="dark">{l s='Leave a message'}</strong></p>
         <div class="form-group">
             <p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
-            <textarea class="form-control" cols="120" rows="2" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'htmlall':'UTF-8'}{/if}</textarea>
+            <textarea class="form-control" cols="120" rows="2" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'html':'UTF-8'}{/if}</textarea>
         </div>
     </div>
 	<p class="cart_navigation clearfix">
@@ -309,7 +309,7 @@
 	<p><strong class="dark">{l s='Leave a message'}</strong></p>
 	<div>
 		<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
-		<textarea class="form-control" cols="120" rows="2" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'htmlall':'UTF-8'}{/if}</textarea>
+		<textarea class="form-control" cols="120" rows="2" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'html':'UTF-8'}{/if}</textarea>
 	</div>
 </div>
 {/if}
diff --git a/themes/default-bootstrap/order-detail.tpl b/themes/default-bootstrap/order-detail.tpl
index 2e5bcebd4..2c60f3680 100644
--- a/themes/default-bootstrap/order-detail.tpl
+++ b/themes/default-bootstrap/order-detail.tpl
@@ -34,8 +34,8 @@
 </form>
 </div>
 <div class="info-order box">
-    {if $carrier->id}<p><strong class="dark">{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</p>{/if}
-    <p><strong class="dark">{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></p>
+    {if $carrier->id}<p><strong class="dark">{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'html':'UTF-8'}{else}{$carrier->name|escape:'html':'UTF-8'}{/if}</p>{/if}
+    <p><strong class="dark">{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'html':'UTF-8'}</span></p>
     {if $invoice AND $invoiceAllowed}
     <p>
         <i class="icon-file-text"></i>
@@ -65,7 +65,7 @@
 		{foreach from=$order_history item=state name="orderStates"}
 			<tr class="{if $smarty.foreach.orderStates.first}first_item{elseif $smarty.foreach.orderStates.last}last_item{/if} {if $smarty.foreach.orderStates.index % 2}alternate_item{else}item{/if}">
 				<td class="step-by-step-date">{dateFormat date=$state.date_add full=0}</td>
-				<td><span class="label{if $state.id_order_state == 1 || $state.id_order_state == 10 || $state.id_order_state == 11} label-info{elseif $state.id_order_state == 5 || $state.id_order_state == 2 || $state.id_order_state == 12} label-success{elseif $state.id_order_state == 6 || $state.id_order_state == 7 || $state.id_order_state == 8} label-danger{elseif $state.id_order_state == 3 || $state.id_order_state == 9 || $state.id_order_state == 4} label-warning{/if}">{$state.ostate_name|escape:'htmlall':'UTF-8'}</span></td>
+				<td><span class="label{if $state.id_order_state == 1 || $state.id_order_state == 10 || $state.id_order_state == 11} label-info{elseif $state.id_order_state == 5 || $state.id_order_state == 2 || $state.id_order_state == 12} label-success{elseif $state.id_order_state == 6 || $state.id_order_state == 7 || $state.id_order_state == 8} label-danger{elseif $state.id_order_state == 3 || $state.id_order_state == 9 || $state.id_order_state == 4} label-warning{/if}">{$state.ostate_name|escape:'html':'UTF-8'}</span></td>
 			</tr>
 		{/foreach}
 		</tbody>
@@ -75,7 +75,7 @@
 
 {if isset($followup)}
 <p class="bold">{l s='Click the following link to track the delivery of your order'}</p>
-<a href="{$followup|escape:'htmlall':'UTF-8'}">{$followup|escape:'htmlall':'UTF-8'}</a>
+<a href="{$followup|escape:'html':'UTF-8'}">{$followup|escape:'html':'UTF-8'}</a>
 {/if}
 
 <div class="adresses_bloc">
@@ -84,12 +84,12 @@
         	<ul class="address alternate_item box" {if $order->isVirtual()}style="display:none;"{/if}>
             <li><h3 class="page-subheading">{l s='Delivery address'} ({$address_delivery->alias})</h3></li>
             {foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
-                {if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>
-                {elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>
-                {elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>
+                {if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'html':'UTF-8'}</li>
+                {elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'html':'UTF-8'}</li>
+                {elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'html':'UTF-8'}</li>
                 {else}
                         {assign var=address_words value=" "|explode:$field_item} 
-                        <li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
+                        <li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</li>
                 {/if}
             {/foreach}
         </ul>
@@ -98,12 +98,12 @@
         	<ul class="address item {if $order->isVirtual()}full_width{/if} box">
             <li><h3 class="page-subheading">{l s='Invoice address'} ({$address_invoice->alias})</h3></li>
             {foreach from=$inv_adr_fields name=inv_loop item=field_item}
-                {if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
-                {elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>
-                {elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</li>
+                {if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'html':'UTF-8'}</li>
+                {elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'html':'UTF-8'}</li>
+                {elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'html':'UTF-8'}</li>
                 {else}
                         {assign var=address_words value=" "|explode:$field_item}
-                        <li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
+                        <li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</li>
                 {/if}
         
             {/foreach}
@@ -198,9 +198,9 @@
 				{if isset($product.customizedDatas)}
 					<tr class="item">
 						{if $return_allowed}<td class="order_cb"></td>{/if}
-						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</label></td>
+						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</label></td>
 						<td class="bold">
-							<label for="cb_{$product.id_order_detail|intval}">{$product.product_name|escape:'htmlall':'UTF-8'}</label>
+							<label for="cb_{$product.id_order_detail|intval}">{$product.product_name|escape:'html':'UTF-8'}</label>
 						</td>
 						<td>
                         <input class="order_qte_input form-control grey"  name="order_qte_input[{$smarty.foreach.products.index}]" type="text" size="2" value="{$product.customizationQuantityTotal|intval}" />
@@ -280,24 +280,24 @@
 				{if $product.product_quantity > $product.customizationQuantityTotal}
 					<tr class="item">
 						{if $return_allowed}<td class="order_cb"><input type="checkbox" id="cb_{$product.id_order_detail|intval}" name="ids_order_detail[{$product.id_order_detail|intval}]" value="{$product.id_order_detail|intval}" /></td>{/if}
-						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</label></td>
+						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</label></td>
 						<td class="bold">
 							<label for="cb_{$product.id_order_detail|intval}">
 								{if $product.download_hash && $invoice && $product.display_filename != '' && $product.product_quantity_refunded == 0 && $product.product_quantity_return == 0}
 									{if isset($is_guest) && $is_guest}
-									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}">
+									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}">
 									{else}
-										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}">
+										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}">
 									{/if}
 										<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Download product'}" />
 									</a>
 									{if isset($is_guest) && $is_guest}
-										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}&id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'htmlall':'UTF-8'} 	</a>
+										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}&id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'html':'UTF-8'} 	</a>
 									{else}
-									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'htmlall':'UTF-8'} 	</a>
+									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'html':'UTF-8'} 	</a>
 									{/if}
 								{else}
-									{$product.product_name|escape:'htmlall':'UTF-8'}
+									{$product.product_name|escape:'html':'UTF-8'}
 								{/if}
 							</label>
 						</td>
@@ -337,8 +337,8 @@
 		{/foreach}
 		{foreach from=$discounts item=discount}
 			<tr class="item">
-				<td>{$discount.name|escape:'htmlall':'UTF-8'}</td>
-				<td>{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'}</td>
+				<td>{$discount.name|escape:'html':'UTF-8'}</td>
+				<td>{l s='Voucher'} {$discount.name|escape:'html':'UTF-8'}</td>
 				<td><span class="order_qte_span editable">1</span></td>
 				<td>&nbsp;</td>
 				<td>{if $discount.value != 0.00}-{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</td>
@@ -407,17 +407,17 @@
 					<td>
                         <strong class="dark">
                             {if isset($message.elastname) && $message.elastname}
-                                {$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'}
+                                {$message.efirstname|escape:'html':'UTF-8'} {$message.elastname|escape:'html':'UTF-8'}
                             {elseif $message.clastname}
-                                {$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'}
+                                {$message.cfirstname|escape:'html':'UTF-8'} {$message.clastname|escape:'html':'UTF-8'}
                             {else}
-                                {$shop_name|escape:'htmlall':'UTF-8'}
+                                {$shop_name|escape:'html':'UTF-8'}
                             {/if}
                         </strong>
 						<br />
 						{dateFormat date=$message.date_add full=1}
 					</td>
-					<td>{$message.message|escape:'htmlall':'UTF-8'|nl2br}</td>
+					<td>{$message.message|escape:'html':'UTF-8'|nl2br}</td>
 				</tr>
 			{/foreach}
 			</tbody>
diff --git a/themes/default-bootstrap/order-follow.tpl b/themes/default-bootstrap/order-follow.tpl
index c2dc59d5b..1be49bae3 100644
--- a/themes/default-bootstrap/order-follow.tpl
+++ b/themes/default-bootstrap/order-follow.tpl
@@ -71,7 +71,7 @@
 			<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
 				<td class="bold"><a class="color-myaccount" href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">{l s='#'}{$return.id_order_return|string_format:"%06d"}</a></td>
 				<td class="history_method"><a class="color-myaccount" href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">{l s='#'}{$return.id_order|string_format:"%06d"}</a></td>
-				<td class="history_method" data-value="{$return.state}"><span class="label label-info">{$return.state_name|escape:'htmlall':'UTF-8'}</span></td>
+				<td class="history_method" data-value="{$return.state}"><span class="label label-info">{$return.state_name|escape:'html':'UTF-8'}</span></td>
 				<td class="bold" data-value="{$return.date_add|regex_replace:"/[\-\:\ ]/":""}">{dateFormat date=$return.date_add full=0}</td>
 				<td class="history_invoice">
 				{if $return.state == 2}
diff --git a/themes/default-bootstrap/order-opc-new-account.tpl b/themes/default-bootstrap/order-opc-new-account.tpl
index dceb6fa88..20be9587c 100644
--- a/themes/default-bootstrap/order-opc-new-account.tpl
+++ b/themes/default-bootstrap/order-opc-new-account.tpl
@@ -19,7 +19,7 @@
 				</p>
                 <a href="{$link->getPageLink('password', true)|escape:'html'}" class="lost_password">{l s='Forgot your password?'}</a>
 				<p class="submit">
-					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
                     <button type="submit" id="SubmitLogin" name="SubmitLogin" class="button btn btn-default button-medium"><span><i class="icon-lock left"></i>{l s='Login'}</span></button>
 				</p>
 			</div>
@@ -59,7 +59,7 @@
 						{if isset($country.states) && $country.contains_states}
 							countries[{$country.id_country|intval}] = new Array();
 							{foreach from=$country.states item='state' name='states'}
-								countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'htmlall':'UTF-8'}'{rdelim});
+								countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'html':'UTF-8'}'{rdelim});
 							{/foreach}
 						{/if}
 						{if $country.need_identification_number}
@@ -140,7 +140,7 @@
                             	<select id="days" name="days" class="form-control">
                                 <option value="">-</option>
                                 {foreach from=$days item=day}
-                                    <option value="{$day|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+                                    <option value="{$day|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_day == $day)} selected="selected"{/if}>{$day|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
                                 {/foreach}
                             </select>
                             {*
@@ -162,7 +162,7 @@
                         	<select id="months" name="months" class="form-control">
                             <option value="">-</option>
                             {foreach from=$months key=k item=month}
-                                <option value="{$k|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
+                                <option value="{$k|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
                             {/foreach}
                         </select>
                         </div>
@@ -170,7 +170,7 @@
                             <select id="years" name="years" class="form-control">
                                 <option value="">-</option>
                                 {foreach from=$years item=year}
-                                    <option value="{$year|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+                                    <option value="{$year|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_year == $year)} selected="selected"{/if}>{$year|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
                                 {/foreach}
                             </select>
                         </div>
@@ -233,7 +233,7 @@
 					<label for="id_country">{l s='Country'} <sup>*</sup></label>
 					<select name="id_country" id="id_country" class="form-control">
 						{foreach from=$countries item=v}
-						<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				</div>
@@ -355,7 +355,7 @@
 						<select name="id_country_invoice" id="id_country_invoice" class="form-control">
 							<option value="">-</option>
 							{foreach from=$countries item=v}
-							<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country_invoice == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country_invoice == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 							{/foreach}
 						</select>
 					</div>
diff --git a/themes/default-bootstrap/order-payment.tpl b/themes/default-bootstrap/order-payment.tpl
index 328a254a5..75a8c1bd2 100644
--- a/themes/default-bootstrap/order-payment.tpl
+++ b/themes/default-bootstrap/order-payment.tpl
@@ -181,7 +181,7 @@
 					{if isset($errors_discount) && $errors_discount}
 						<ul class="alert alert-danger">
 						{foreach from=$errors_discount key=k item=error}
-							<li>{$error|escape:'htmlall':'UTF-8'}</li>
+							<li>{$error|escape:'html':'UTF-8'}</li>
 						{/foreach}
 						</ul>
 					{/if}
diff --git a/themes/default-bootstrap/order-return.tpl b/themes/default-bootstrap/order-return.tpl
index 6c883cac8..71172c8ac 100644
--- a/themes/default-bootstrap/order-return.tpl
+++ b/themes/default-bootstrap/order-return.tpl
@@ -28,7 +28,7 @@
 		<h2 class="page-subheading">{l s='RE#'}{$orderRet->id|string_format:"%06d"} {l s='on'} {dateFormat date=$order->date_add full=0}</h2>
 		<p class="bold">{l s='We have logged your return request.'}</p>
 		<p>{l s='Your package must be returned to us within'} {$nbdaysreturn} {l s='days of receiving your order.'}</p>
-		<p>{l s='The current status of your merchandise return is:'} <span class="bold">{$state_name|escape:'htmlall':'UTF-8'}</span></p>
+		<p>{l s='The current status of your merchandise return is:'} <span class="bold">{$state_name|escape:'html':'UTF-8'}</span></p>
 		<p>{l s='List of items to be returned:'}</p>
 	</div>
 	<div id="order-detail-content" class="table_block">
@@ -47,8 +47,8 @@
 				{foreach from=$returnedCustomizations item='customization' name=products}
 					{if $customization.product_id == $product.product_id}
 						<tr class="{if $smarty.foreach.products.first}first_item{/if} {if $smarty.foreach.products.index % 2}alternate_item{else}item{/if}">
-							<td>{if $customization.reference}{$customization.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
-							<td class="bold">{$customization.name|escape:'htmlall':'UTF-8'}</td>
+							<td>{if $customization.reference}{$customization.reference|escape:'html':'UTF-8'}{else}--{/if}</td>
+							<td class="bold">{$customization.name|escape:'html':'UTF-8'}</td>
 							<td><span class="order_qte_span editable">{$customization.product_quantity|intval}</span></td>
 						</tr>
 						{assign var='productId' value=$customization.product_id}
@@ -80,8 +80,8 @@
 
 				{if $product.product_quantity > $quantityDisplayed}
 					<tr class="{if $smarty.foreach.products.first}first_item{/if} {if $smarty.foreach.products.index % 2}alternate_item{else}item{/if}">
-						<td>{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</td>
-						<td class="bold">{$product.product_name|escape:'htmlall':'UTF-8'}</td>
+						<td>{if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</td>
+						<td class="bold">{$product.product_name|escape:'html':'UTF-8'}</td>
 						<td><span class="order_qte_span editable">{$product.product_quantity|intval}</span></td>
 					</tr>
 				{/if}
diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl
index 0bc77e213..dd03c6d21 100644
--- a/themes/default-bootstrap/pagination.tpl
+++ b/themes/default-bootstrap/pagination.tpl
@@ -52,13 +52,13 @@
     {if $nb_products > $products_per_page && $start!=$stop}
 		<form action="{if !is_array($requestNb)}{$requestNb}{else}{$requestNb.requestUrl}{/if}" method="get" class="showall">
 			<div>
-				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
-				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if}
+				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />{/if}
+				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
                 <button type="submit" class="btn btn-default button exclusive-medium"><span>{l s='Show all'}</span></button>
 				{if is_array($requestNb)}
 					{foreach from=$requestNb item=requestValue key=requestKey}
 						{if $requestKey != 'requestUrl'}
-							<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
+							<input type="hidden" name="{$requestKey|escape:'html':'UTF-8'}" value="{$requestValue|escape:'html':'UTF-8'}" />
 						{/if}
 					{/foreach}
 				{/if}
@@ -87,9 +87,9 @@
 		{/if}
 		{section name=pagination start=$start loop=$stop+1 step=1}
 			{if $p == $smarty.section.pagination.index}
-				<li class="active current"><span><span>{$p|escape:'htmlall':'UTF-8'}</span></span></li>
+				<li class="active current"><span><span>{$p|escape:'html':'UTF-8'}</span></span></li>
 			{else}
-				<li><a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)}"><span>{$smarty.section.pagination.index|escape:'htmlall':'UTF-8'}</span></a></li>
+				<li><a {$no_follow_text} href="{$link->goPage($requestPage, $smarty.section.pagination.index)}"><span>{$smarty.section.pagination.index|escape:'html':'UTF-8'}</span></a></li>
 			{/if}
 		{/section}
 		{if $pages_nb>$stop+2}
diff --git a/themes/default-bootstrap/password.tpl b/themes/default-bootstrap/password.tpl
index 9d66882cc..1668ee364 100644
--- a/themes/default-bootstrap/password.tpl
+++ b/themes/default-bootstrap/password.tpl
@@ -30,16 +30,16 @@
 {include file="$tpl_dir./errors.tpl"}
 
 {if isset($confirmation) && $confirmation == 1}
-<p class="alert alert-success">{l s='Your password has been successfully reset and a confirmation has been sent to your email address:'} {if isset($customer_email)}{$customer_email|escape:'htmlall':'UTF-8'|stripslashes}{/if}</p>
+<p class="alert alert-success">{l s='Your password has been successfully reset and a confirmation has been sent to your email address:'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}</p>
 {elseif isset($confirmation) && $confirmation == 2}
-<p class="alert alert-success">{l s='A confirmation email has been sent to your address:'} {if isset($customer_email)}{$customer_email|escape:'htmlall':'UTF-8'|stripslashes}{/if}</p>
+<p class="alert alert-success">{l s='A confirmation email has been sent to your address:'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}</p>
 {else}
 <p>{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
-<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
+<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
 	<fieldset>
 		<div class="form-group">
 			<label for="email">{l s='Email address'}</label>
-			<input class="form-control" type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'htmlall':'UTF-8'|stripslashes}{/if}" />
+			<input class="form-control" type="text" id="email" name="email" value="{if isset($smarty.post.email)}{$smarty.post.email|escape:'html':'UTF-8'|stripslashes}{/if}" />
 		</div>
 		<p class="submit">
             <button type="submit" class="btn btn-default button button-medium"><span>{l s='Retrieve Password'}<i class="icon-chevron-right right"></i></span></button>
diff --git a/themes/default-bootstrap/product-list-colors.tpl b/themes/default-bootstrap/product-list-colors.tpl
index a4d4f2205..fa34696a1 100644
--- a/themes/default-bootstrap/product-list-colors.tpl
+++ b/themes/default-bootstrap/product-list-colors.tpl
@@ -25,6 +25,6 @@
 
 <ul id="color_to_pick_list" class="clearfix">
 	{foreach from=$colors_list item='color'}
-		<li><a href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'htmlall':'UTF-8'}" id="color_{$color.id_product_attribute|intval}" class="color_pick" style="background: {$color.color};"></a></li>
+		<li><a href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'html':'UTF-8'}" id="color_{$color.id_product_attribute|intval}" class="color_pick" style="background: {$color.color};"></a></li>
 	{/foreach}
 </ul>
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl
index bd5228feb..dbad52a54 100644
--- a/themes/default-bootstrap/product-list.tpl
+++ b/themes/default-bootstrap/product-list.tpl
@@ -50,10 +50,10 @@
         	<div class="product-container">
                 <div class="left-block">
                 	<div class="product-image-container">
-                    	<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}">
-                            <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
+                    	<a href="{$product.link|escape:'html':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'html':'UTF-8'}">
+                            <img class="replace-2x img-responsive" src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" alt="{$product.legend|escape:'html':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
                         </a>
-                        {if isset($quick_view) && $quick_view}<a href="#" rel="{$product.link|escape:'htmlall':'UTF-8'}" class="quick-view"><span>Quick view</span></a>{/if}
+                        {if isset($quick_view) && $quick_view}<a href="#" rel="{$product.link|escape:'html':'UTF-8'}" class="quick-view"><span>Quick view</span></a>{/if}
                         {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
                         	<div class="content_price">
                             	{if isset($product.show_price) && $product.show_price && !isset($restricted_country_mode)}
@@ -70,7 +70,7 @@
                    	</div>
                 </div>
                 <div class="right-block">
-                	<h5>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a class="product-name" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:45:'...'|escape:'htmlall':'UTF-8'}</a></h5>
+                	<h5>{if isset($product.pack_quantity) && $product.pack_quantity}{$product.pack_quantity|intval|cat:' x '}{/if}<a class="product-name" href="{$product.link|escape:'html':'UTF-8'}" title="{$product.name|escape:'html':'UTF-8'}">{$product.name|truncate:45:'...'|escape:'html':'UTF-8'}</a></h5>
                     {hook h='displayProductListReviews' product=$product}
                     <p class="product-desc">{$product.description_short|strip_tags:'UTF-8'|truncate:360:'...'}</p>
                     {if (!$PS_CATALOG_MODE AND ((isset($product.show_price) && $product.show_price) || (isset($product.available_for_order) && $product.available_for_order)))}
@@ -96,7 +96,7 @@
                                 <span class="button ajax_add_to_cart_button btn btn-default disabled"><span>{l s='Add to cart'}</span></span>
                             {/if}
                         {/if}
-                        <a class="button lnk_view btn btn-default" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{l s='View'}"><span>{l s='More'}</span></a>
+                        <a class="button lnk_view btn btn-default" href="{$product.link|escape:'html':'UTF-8'}" title="{l s='View'}"><span>{l s='More'}</span></a>
                     </div>
                     
                     {if isset($product.color_list)}<div class="color-list-container">{$product.color_list} </div>{/if}
diff --git a/themes/default-bootstrap/product-sort.tpl b/themes/default-bootstrap/product-sort.tpl
index bcfc7d493..18a75b361 100644
--- a/themes/default-bootstrap/product-sort.tpl
+++ b/themes/default-bootstrap/product-sort.tpl
@@ -58,11 +58,11 @@ $(document).ready(function(){
 //]]>
 </script>
 {/if}
-<form id="productsSortForm{if isset($paginationId)}_{$paginationId}{/if}" action="{$request|escape:'htmlall':'UTF-8'}" class="productsSortForm">
+<form id="productsSortForm{if isset($paginationId)}_{$paginationId}{/if}" action="{$request|escape:'html':'UTF-8'}" class="productsSortForm">
 	<div class="select selector1">
 		<label for="selectPrductSort{if isset($paginationId)}_{$paginationId}{/if}">{l s='Sort by'}</label>
 		<select id="selectPrductSort{if isset($paginationId)}_{$paginationId}{/if}" class="selectProductSort form-control">
-			<option value="{$orderbydefault|escape:'htmlall':'UTF-8'}:{$orderwaydefault|escape:'htmlall':'UTF-8'}" {if $orderby eq $orderbydefault}selected="selected"{/if}>{l s='--'}</option>
+			<option value="{$orderbydefault|escape:'html':'UTF-8'}:{$orderwaydefault|escape:'html':'UTF-8'}" {if $orderby eq $orderbydefault}selected="selected"{/if}>{l s='--'}</option>
 			{if !$PS_CATALOG_MODE}
 				<option value="price:asc" {if $orderby eq 'price' AND $orderway eq 'asc'}selected="selected"{/if}>{l s='Price: Lowest first'}</option>
 				<option value="price:desc" {if $orderby eq 'price' AND $orderway eq 'desc'}selected="selected"{/if}>{l s='Price: Highest first'}</option>
diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl
index 0ae187a64..f3794f99e 100644
--- a/themes/default-bootstrap/product.tpl
+++ b/themes/default-bootstrap/product.tpl
@@ -66,7 +66,7 @@ var currentDate = '{$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}';
 var maxQuantityToAllowDisplayOfLastQuantityMessage = {$last_qties};
 var noTaxForThisProduct = {if $no_tax == 1}true{else}false{/if};
 var displayPrice = {$priceDisplay};
-var productReference = '{$product->reference|escape:'htmlall':'UTF-8'}';
+var productReference = '{$product->reference|escape:'html':'UTF-8'}';
 var productAvailableForOrder = {if (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}'0'{else}'{$product->available_for_order}'{/if};
 var productShowPrice = '{if !$PS_CATALOG_MODE}{$product->show_price}{else}0{/if}';
 var productUnitPriceRatio = '{$product->unit_price_ratio}';
@@ -167,8 +167,8 @@ var contentOnly = {if $content_only}true{else}false{/if}
 	<div id="admin-action">
 		<p>{l s='This product is not visible to your customers.'}
 		<input type="hidden" id="admin-action-product-id" value="{$product->id}" />
-		<input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
-		<input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
+		<input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
+		<input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
 		</p>
 		<p id="admin-action-result"></p>
 		</p>
@@ -197,12 +197,12 @@ var contentOnly = {if $content_only}true{else}false{/if}
         
 		{if $have_image}
 			<span id="view_full_size">
-				<img itemprop="image" src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
+				<img itemprop="image" src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{$product->name|escape:'html':'UTF-8'}" alt="{$product->name|escape:'html':'UTF-8'}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
 				{if !$content_only}<span class="span_link">{l s='View larger'}</span>{/if}
 			</span>
 		{else}
 			<span id="view_full_size">
-				<img itemprop="image" src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
+				<img itemprop="image" src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'html':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
 				{if !$content_only}<span class="span_link">{l s='View larger'}</span>{/if}
 			</span>
 		{/if}
@@ -241,10 +241,10 @@ var contentOnly = {if $content_only}true{else}false{/if}
 			<p class="online_only">{l s='Online only'}</p>
 			{/if}
     
-		<h1 itemprop="name">{$product->name|escape:'htmlall':'UTF-8'}</h1>
+		<h1 itemprop="name">{$product->name|escape:'html':'UTF-8'}</h1>
 			<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
 				<label>{l s='Model'} </label>
-				<span class="editable" itemprop="sku">{$product->reference|escape:'htmlall':'UTF-8'}</span>
+				<span class="editable" itemprop="sku">{$product->reference|escape:'html':'UTF-8'}</span>
 			</p>
 		{if $product->description_short OR $packItems|@count > 0}
 		<div id="short_description_block">
@@ -261,7 +261,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 				{foreach from=$packItems item=packItem}
                 
 				<div class="pack_content">
-					{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}">{$packItem.name|escape:'htmlall':'UTF-8'}</a>
+					{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}">{$packItem.name|escape:'html':'UTF-8'}</a>
 					<p>{$packItem.description_short}</p>
 				</div>
 				{/foreach}
@@ -397,7 +397,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 			{/if}
 			{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
 				 {math equation="pprice / punit_price"  pprice=$productPrice  punit_price=$product->unit_price_ratio assign=unit_price}
-				<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
+				<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'html':'UTF-8'}</p>
 			{/if}
 			{*close if for show price*}
 			{/if}  
@@ -437,13 +437,13 @@ var contentOnly = {if $content_only}true{else}false{/if}
 				{foreach from=$groups key=id_attribute_group item=group}
 					{if $group.attributes|@count}
 						<fieldset class="attribute_fieldset">
-							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :&nbsp;</label>
+							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'html':'UTF-8'} :&nbsp;</label>
 							{assign var="groupName" value="group_$id_attribute_group"}
 							<div class="attribute_list">
 							{if ($group.group_type == 'select')}
 								<select name="{$groupName}" id="group_{$id_attribute_group|intval}" class="form-control attribute_select" onchange="findCombination();getProductAttribute();">
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
-										<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
+										<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'html':'UTF-8'}">{$group_attribute|escape:'html':'UTF-8'}</option>
 									{/foreach}
 								</select>
 							{elseif ($group.group_type == 'color')}
@@ -468,7 +468,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
 										<li>
 											<input type="radio" class="attribute_radio" name="{$groupName}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if} onclick="findCombination();getProductAttribute();" />
-											<span>{$group_attribute|escape:'htmlall':'UTF-8'}</span>
+											<span>{$group_attribute|escape:'html':'UTF-8'}</span>
 										</li>
 									{/foreach}
 								</ul>
@@ -523,7 +523,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
 		{foreach from=$features item=feature}
         <tr class="{cycle values="odd,even"}">
             {if isset($feature.value)}			    
-                <td>{$feature.name|escape:'htmlall':'UTF-8'}</td><td> {$feature.value|escape:'htmlall':'UTF-8'}</td>
+                <td>{$feature.name|escape:'html':'UTF-8'}</td><td> {$feature.value|escape:'html':'UTF-8'}</td>
             {/if}
 		</tr>
         {/foreach}
@@ -555,15 +555,15 @@ var contentOnly = {if $content_only}true{else}false{/if}
 							<li class="item product-box ajax_block_product{if $smarty.foreach.accessories_list.first} first_item{elseif $smarty.foreach.accessories_list.last} last_item{else} item{/if} product_accessories_description">
 						
 								<div class="product_desc">
-								<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{$accessory.legend|escape:'htmlall':'UTF-8'}" class="product-image product_image"><img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'home_default')|escape:'html'}" alt="{$accessory.legend|escape:'htmlall':'UTF-8'}" width="{$homeSize.width}" height="{$homeSize.height}" class="lazyOwl" /></a>
+								<a href="{$accessoryLink|escape:'html':'UTF-8'}" title="{$accessory.legend|escape:'html':'UTF-8'}" class="product-image product_image"><img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'home_default')|escape:'html'}" alt="{$accessory.legend|escape:'html':'UTF-8'}" width="{$homeSize.width}" height="{$homeSize.height}" class="lazyOwl" /></a>
                                 
                                 		<div class="block_description">                                    
-										<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{l s='More'}" class="product_description">{$accessory.description_short|strip_tags|truncate:25:'...'}</a>
+										<a href="{$accessoryLink|escape:'html':'UTF-8'}" title="{l s='More'}" class="product_description">{$accessory.description_short|strip_tags|truncate:25:'...'}</a>
 									</div>								
 								</div>
 								
                              		<div class="s_title_block">
-									<h5 class="product-name"><a href="{$accessoryLink|escape:'htmlall':'UTF-8'}">      {$accessory.name|truncate:20:'...':true|escape:'htmlall':'UTF-8'}</a></h5>
+									<h5 class="product-name"><a href="{$accessoryLink|escape:'html':'UTF-8'}">      {$accessory.name|truncate:20:'...':true|escape:'html':'UTF-8'}</a></h5>
                                     
 									{if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
                                     <span class="price">{if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}</span>{/if}
@@ -647,7 +647,7 @@ var contentOnly = {if $content_only}true{else}false{/if}
     <section class="page-product-box">
     	<h3 class="page-product-heading">{l s='Download'}</h3>
 		{foreach from=$attachments item=attachment}
-		<a  href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}"><span>{$attachment.name|escape:'htmlall':'UTF-8'}</span></a><br />{$attachment.description|escape:'htmlall':'UTF-8'}
+		<a  href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}"><span>{$attachment.name|escape:'html':'UTF-8'}</span></a><br />{$attachment.description|escape:'html':'UTF-8'}
 		{/foreach}	
         
 </section>    
diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl
index c54818429..3c3bff1ed 100644
--- a/themes/default-bootstrap/products-comparison.tpl
+++ b/themes/default-bootstrap/products-comparison.tpl
@@ -61,7 +61,7 @@
                         {/if}
                     {/if}
                 </div>
-				<h5><a class="product-name" href="{$product->getLink()}" title="{$product->name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product->name|truncate:45:'...'|escape:'htmlall':'UTF-8'}</a></h5>
+				<h5><a class="product-name" href="{$product->getLink()}" title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}</a></h5>
                 <div class="prices-container">
 					{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
 						<span class="price product-price">{convertPrice price=$product->getPrice($taxes_behavior)}</span>
@@ -83,7 +83,7 @@
 
 						{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
 							{math equation="pprice / punit_price"  pprice=$product->getPrice($taxes_behavior)  punit_price=$product->unit_price_ratio assign=unit_price}
-							<span class="comparison_unit_price">&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'htmlall':'UTF-8'}</span>
+							<span class="comparison_unit_price">&nbsp;{convertPrice price=$unit_price} {l s='per %s' sprintf=$product->unity|escape:'html':'UTF-8'}</span>
 						{else}
 						{/if}
 					{/if}
@@ -98,12 +98,12 @@
 						<span id="availability_value"{if $product->quantity <= 0} class="warning-inline"{/if}>
 							{if $product->quantity <= 0}
 								{if $allow_oosp}
-									{$product->available_later|escape:'htmlall':'UTF-8'}
+									{$product->available_later|escape:'html':'UTF-8'}
 								{else}
 									{l s='This product is no longer in stock.'}
 								{/if}
 							{else}
-								{$product->available_now|escape:'htmlall':'UTF-8'}
+								{$product->available_now|escape:'html':'UTF-8'}
 							{/if}
 						</span>
 					{/if}
@@ -132,7 +132,7 @@
 		<tr>
 			{cycle values='comparison_feature_odd,comparison_feature_even' assign='classname'}
 			<td class="{$classname} feature-name" >
-				<strong>{$feature.name|escape:'htmlall':'UTF-8'}</strong>
+				<strong>{$feature.name|escape:'html':'UTF-8'}</strong>
 			</td>
 
 			{foreach from=$products item=product name=for_products}
@@ -140,7 +140,7 @@
 				{assign var='feature_id' value=$feature.id_feature}
 				{if isset($product_features[$product_id])}
 					{assign var='tab' value=$product_features[$product_id]}
-					<td  width="{$width}%" class="{$classname} comparison_infos">{if (isset($tab[$feature_id]))}{$tab[$feature_id]|escape:'htmlall':'UTF-8'}{/if}</td>
+					<td  width="{$width}%" class="{$classname} comparison_infos">{if (isset($tab[$feature_id]))}{$tab[$feature_id]|escape:'html':'UTF-8'}{/if}</td>
 				{else}
 					<td  width="{$width}%" class="{$classname} comparison_infos"></td>
 				{/if}
diff --git a/themes/default-bootstrap/restricted-country.tpl b/themes/default-bootstrap/restricted-country.tpl
index 80a395ca0..2df1c715c 100644
--- a/themes/default-bootstrap/restricted-country.tpl
+++ b/themes/default-bootstrap/restricted-country.tpl
@@ -26,13 +26,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}" lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>	
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>	
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 {if isset($meta_description)}
-		<meta name="description" content="{$meta_description|escape:'htmlall':'UTF-8'}" />
+		<meta name="description" content="{$meta_description|escape:'html':'UTF-8'}" />
 {/if}
 {if isset($meta_keywords)}
-		<meta name="keywords" content="{$meta_keywords|escape:'htmlall':'UTF-8'}" />
+		<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 {/if}
 		<meta name="robots" content="{if isset($nobots)}no{/if}index,follow" />
 		<link rel="shortcut icon" href="{$favicon_url}" />
diff --git a/themes/default-bootstrap/sass/_theme_variables.scss b/themes/default-bootstrap/sass/_theme_variables.scss
index 250da7e89..f10a7c72d 100644
--- a/themes/default-bootstrap/sass/_theme_variables.scss
+++ b/themes/default-bootstrap/sass/_theme_variables.scss
@@ -1,6 +1,5 @@
 @import 'compass';
 @import 'bootstrap_lib/_variables';
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic);
 
 //------- FONTS
 
diff --git a/themes/default-bootstrap/sass/comparator.scss b/themes/default-bootstrap/sass/comparator.scss
index 78737341e..271ca4139 100644
--- a/themes/default-bootstrap/sass/comparator.scss
+++ b/themes/default-bootstrap/sass/comparator.scss
@@ -101,4 +101,7 @@ table#product_comparison {
 		font-style:italic;	
 	}
 }
+.ie8 table#product_comparison .product-image-block .product_image img {
+	width:auto;
+}
 .footer_link { margin-bottom:20px;}
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/global.scss b/themes/default-bootstrap/sass/global.scss
index af069bc7d..ea050d835 100644
--- a/themes/default-bootstrap/sass/global.scss
+++ b/themes/default-bootstrap/sass/global.scss
@@ -617,6 +617,7 @@ table.table_block  td {
 	left:-33px;
 	top:6px;
 	z-index:1;
+	
 	&:before{
 		position:absolute;
 		bottom:-3px;
@@ -630,6 +631,7 @@ table.table_block  td {
 		text-indent:-5000px;
 		@include rotate(225deg);
 	}
+	
 	&:after{
 		position:absolute;
 		bottom:-3px;
@@ -686,6 +688,42 @@ table.table_block  td {
 		@include rotate(136deg);
 	}
 }
+.ie8 {
+	.new {
+		left:0px;
+		top:0px;
+		width:auto;
+		padding:5px 15px;
+		
+		&:after {
+			display:none;	
+		}
+		&:before {
+			display:none;	
+		}
+	}
+	.sale {
+		right:0px;
+		top:0px;
+		width:auto;
+		padding:5px 15px;
+		
+		&:after {
+			display:none;	
+		}
+		&:before {
+			display:none;	
+		}
+	}
+	.new-box {
+		top:-1px;
+		left:-1px;
+	}
+	.sale-box {
+		right:-1px;
+		top:-1px;
+	}
+}
 /************************************* BOXES *****************************************************/
 .box {
 	background:$base-box-bg;
@@ -1004,7 +1042,6 @@ table.table_block  td {
 			right:0;
 			top:0;
 			cursor:pointer;
-			text-align:center;
 			font-family:$font-icon;
 			font-size:14px;
 			
@@ -1018,6 +1055,7 @@ table.table_block  td {
 					height:30px;
 					color:$base-text-color;
 					line-height:30px;
+					text-align:center;
 				}
 			}
 			
@@ -1118,7 +1156,6 @@ ul.footer_links {
 				max-width:192px;
 				float:left;
 				
-				/* max 991px */
 				@media (max-width: $screen-sm-max) {
 					max-width:160px;
 				}
@@ -1441,20 +1478,20 @@ ul.step {
 			font-weight:bold;
 		}
 		&.step_todo {
-			
+			background: rgb(247,247,247);
+			background: -moz-linear-gradient(top,  rgba(247,247,247,1) 0%, rgba(237,237,237,1) 100%);
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(100%,rgba(237,237,237,1)));
+			background: -webkit-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
+			background: -o-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
+			background: -ms-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
+			background: linear-gradient(to bottom,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
+			filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
+				
 			span {
 				display:block;
-				color:$base-text-color;
-				background: rgb(247,247,247);
-				background: -moz-linear-gradient(top,  rgba(247,247,247,1) 0%, rgba(237,237,237,1) 100%);
-				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(247,247,247,1)), color-stop(100%,rgba(237,237,237,1)));
-				background: -webkit-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
-				background: -o-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
-				background: -ms-linear-gradient(top,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
-				background: linear-gradient(to bottom,  rgba(247,247,247,1) 0%,rgba(237,237,237,1) 100%);
-				filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f7f7f7', endColorstr='#ededed',GradientType=0 );
 				border:1px solid;
 				border-color:$light-border-color;
+				color:$base-text-color;
 				position:relative;
 																							@media (min-width: $screen-md) { 	// min 991px
 																								padding-left:38px;
@@ -1467,20 +1504,20 @@ ul.step {
 		}
 		&.step_done {
 			border-color:#666666 #5f5f5f #292929 #5f5f5f;
+			background: rgb(114,113,113);
+			background: -moz-linear-gradient(top,  rgba(114,113,113,1) 0%, rgba(102,102,102,1) 100%);
+			background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(114,113,113,1)), color-stop(100%,rgba(102,102,102,1)));
+			background: -webkit-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
+			background: -o-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
+			background: -ms-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
+			background: linear-gradient(to bottom,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
+			filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#727171', endColorstr='#666666',GradientType=0 );
 			
 			a {
 				color:$light-text-color;
 				text-shadow:1px 1px rgba(0,0,0,0.3);
 				border:1px solid;
 				border-color:#8b8a8a;
-				background: rgb(114,113,113);
-				background: -moz-linear-gradient(top,  rgba(114,113,113,1) 0%, rgba(102,102,102,1) 100%);
-				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(114,113,113,1)), color-stop(100%,rgba(102,102,102,1)));
-				background: -webkit-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
-				background: -o-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
-				background: -ms-linear-gradient(top,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
-				background: linear-gradient(to bottom,  rgba(114,113,113,1) 0%,rgba(102,102,102,1) 100%);
-				filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#727171', endColorstr='#666666',GradientType=0 );
 
 																							@media (min-width: $screen-md) { // min 991px */
 																								padding-left:38px;
@@ -1763,6 +1800,9 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
 		}
 	}
 }
+.ie8 #header #header_logo {
+	width:350px;	
+}
 /* ************************************************************************************************
 		BREADCRUMB
 ************************************************************************************************ */
@@ -1835,7 +1875,19 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
 	}
 
 }
-
+.ie8 {
+	
+	.breadcrumb {
+		min-height:1px;
+		
+		a:after {
+			display:none;	
+		}
+		.navigation-pipe {
+			width:20px;	
+		}
+	}
+}
 /* ************************************************************************************************
 		FOOTER
 ************************************************************************************************ */
@@ -3137,4 +3189,9 @@ div.star.star_hover {
 																			}
 		}
 	}
+}
+.ie8 {
+	#facebook_block, #cmsinfo_block {
+		height:344px;
+	}
 }
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss b/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
index 011b8b88b..85e39d594 100644
--- a/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+++ b/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
@@ -194,6 +194,9 @@
 			background:url(../../../img/cart-shadow.png) repeat-x $dark-background;
 		}
 	}
+	.block_content {
+		margin-bottom:0;	
+	}
 }
 #cart_block #cart_block_summary, #cart_block .title_block  span, #header  #cart_block h4, #header  #cart_block .title_block, #header  #cart_block h4 {display:none}
 #cart_block #cart_block_shipping_cost,
diff --git a/themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss b/themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
index 842153e40..efe6c92dc 100644
--- a/themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
+++ b/themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
@@ -244,3 +244,13 @@
 .hide-action:hover {
 	font-weight: bold;
 }
+#ul_layered_price_0, #ul_layered_weight_0 {
+	.col-xs-6 {
+		padding-top:10px;
+																		@media (min-width: $screen-lg) { // min 1200px
+																				padding-top:0;
+																				padding-left:0;
+																				padding-right:0;
+																			}
+	}
+}
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss b/themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
index a6257c622..b7629253d 100644
--- a/themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+++ b/themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
@@ -64,6 +64,7 @@
 			
 			.form-control {
 				height:45px;
+				line-height:30px;
 				max-width:267px;
 				background:#3c3c3c;
 				border-color:#515151;
@@ -78,7 +79,7 @@
 			}
 			
 			.button-small {
-				margin-left:-42px;
+				margin-left:-43px;
 				border:none;
 				background:none;
 				text-align:center;
diff --git a/themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss b/themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
index c7b9eb0d8..adc317aae 100644
--- a/themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
+++ b/themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
@@ -37,6 +37,8 @@
 			display:block;
 			font-family:$font-icon;
 			font-size:17px;
+			width:100%;
+			text-align:center;
 		}
 		
 		&:hover {color:#6f6f6f}
@@ -45,6 +47,7 @@
 	#search_query_top {
 		padding:0 13px;
 		height:45px;
+		line-height:45px;
 		width:271px;
 		background:$base-box-bg;
 		float: left;
diff --git a/themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss b/themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
index c38417b6a..314550e8c 100644
--- a/themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
+++ b/themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
@@ -174,7 +174,7 @@ ul.sf-menu li li li.sfHover ul {
 		}	
 	}
 }
-.sf-menu > li > ul > li:not(#category-thumbnail) {
+.sf-menu > li > ul > li {
 	float:left;
 	width:20%;
 	padding-right:15px;
@@ -192,9 +192,11 @@ ul.sf-menu li li li.sfHover ul {
 																	}
 }
 .sf-menu > li > ul > li#category-thumbnail {
-	width:100%;
+	width:100% !important;
+	float:none;
 	clear:both;
 	overflow:hidden;
+	padding-right:0;
 	
 	> div {
 		float:left;
@@ -225,8 +227,8 @@ ul.sf-menu li li li.sfHover ul {
 																		display:			block;
 																		padding:			17px 20px;
 																		border-bottom:		3px solid #e9e9e9;
-																		background:		#f6f6f6;
-																		position:relative;
+																		background:		    #f6f6f6;
+																		position:           relative;
 																		
 																		&:hover {
 																			background:				$dark-background;
diff --git a/themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss b/themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
index db2c28ae5..8b2e104c3 100644
--- a/themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+++ b/themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
@@ -23,14 +23,14 @@
 			a {
 				padding:7px 10px 14px 16px;
 				background:$dark-background;
-				min-width: 270px;
+				width: 270px;
 				display:block;
 				font-weight:bold;
 				color:#777777;
 				text-shadow:1px 1px rgba(0,0,0,0.2);
 				overflow:hidden;
 																		@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
-																			min-width:190px;
+																			width:190px;
 																		}
 				span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
 																		@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
diff --git a/themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss b/themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
index fa4921f6e..50f80fb9b 100644
--- a/themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
+++ b/themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
@@ -187,7 +187,6 @@
 		}
 	}
 }
-
 .bx-wrapper .bx-controls-direction a.disabled {
 	display: none;
 }
@@ -258,4 +257,14 @@
 	font-size: .85em;
 	padding: 10px;
 }
+}
+.ie8 {
+	#homepage-slider{
+		
+		.bx-wrapper .bx-controls-direction a {
+			&:before {
+				background:$dark-background;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/themes/default-bootstrap/sass/product.scss b/themes/default-bootstrap/sass/product.scss
index d2c9537c4..b3992c19d 100644
--- a/themes/default-bootstrap/sass/product.scss
+++ b/themes/default-bootstrap/sass/product.scss
@@ -64,30 +64,31 @@ img{
 		#view_full_size {
 			display:block;
 			cursor:pointer;
-			.span_link {
-			position:absolute;
-			bottom:20px;
-			left:50%;
-			margin-left:-68px;
-			display:block;
-			padding:10px 0;	
-			text-align:center;
-			line-height:22px;
-			color:#777676;
-			width:136px;	
-			text-align:center;
-			font-weight:bold;
-			background:rgba(255,255,255,0.5);
-			@include box-shadow(0 2px 8px rgba(0,0,0,0.16));
 			
-			&:after{
-				font-family:$font-icon;
-				color:#c0c0c0;
-				font-size:20px;
+			.span_link {
+				position:absolute;
+				bottom:20px;
+				left:50%;
+				margin-left:-68px;
+				display:block;
+				padding:10px 0;	
+				text-align:center;
 				line-height:22px;
-				content:"";
-				font-weight:normal;
-				margin:0 0 0 4px
+				color:#777676;
+				width:136px;	
+				text-align:center;
+				font-weight:bold;
+				background:rgba(255,255,255,0.5);
+				@include box-shadow(0 2px 8px rgba(0,0,0,0.16));
+				
+				&:after{
+					font-family:$font-icon;
+					color:#c0c0c0;
+					font-size:20px;
+					line-height:22px;
+					content:"";
+					font-weight:normal;
+					margin:0 0 0 4px
 				}
 				
 			&:hover:after{color:$base-text-color}
@@ -95,7 +96,19 @@ img{
 	}
 }
 }
-
+.ie8 #pb-right-column {
+	
+	#image-block {
+		
+		#view_full_size {
+			
+			.span_link {
+				background:#fff;
+				border:1px solid $base-border-color;	
+			}
+		}
+	}	
+}
 /* miniatures */
 #pb-right-column #views_block {	
 	margin-top:10px
@@ -224,6 +237,7 @@ span.view_scroll_spacer {
 	}
 
 	#view_scroll_left {
+		margin-top:0;
 		&:before{
 			content:"";
 			padding-right:2px;
@@ -240,7 +254,12 @@ span.view_scroll_spacer {
 	}
 
 
-
+.view_scroll_spacer {
+	margin-top:38px;
+																		@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { //min 768px max 991px
+																			margin-top:28px;
+																		}
+}
 /* link list */
 #usefull_link_block {
 	list-style-type:none;
@@ -511,31 +530,33 @@ padding:18px 19px 12px;
     border-bottom:1px solid #012740; 
     @include border-radius(5px);
 	position:relative;
-	display:block;	
+	display:block;
+	@include background-image(linear-gradient(#009ad0, #007ab7)); 
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
 
-	  &:before{
-		  font-family:$font-icon;
-		  position:absolute;
-		  top:0;
-		  left:0;
-		  bottom:0;	  
-		  color:$light-text-color;
-		  font-size:25px;
-		  line-height:47px;
-		  text-shadow:0 1px #015883;
-		  content:"";
-		  z-index:2;
-		  width:51px;
-		  text-align:center;
-		  border:1px solid #06b2e6;
-		  @include border-radius(5px 0 0 5px);	 
+	&:before{
+		font-family:$font-icon;
+		position:absolute;
+		top:0;
+		left:0;
+		bottom:0;	  
+		color:$light-text-color;
+		font-size:25px;
+		line-height:47px;
+		text-shadow:0 1px #015883;
+		content:"";
+		z-index:2;
+		width:51px;
+		text-align:center;
+		border:1px solid #06b2e6;
+		@include border-radius(5px 0 0 5px);	 
 																		@media (max-width: $screen-sm-max) { //max 991px
 																			display:none	
 																		} 	
 	 
-     }
+    }
 	 
-    &:after{
+	&:after{
 		background:url(../img/border-1.gif) repeat-y 0 0;
 		position:absolute;
 		top:0;
@@ -544,16 +565,14 @@ padding:18px 19px 12px;
 		content:"";
 		width:1px;
 		z-index:2;
-
+		
 																		@media (max-width: $screen-sm-max) { // max 991px
 																			display:none	
 																		} 
 	
+	}
 }
-}
-.box-info-product .exclusive span{	
-	@include background-image(linear-gradient(#009ad0, #007ab7)); 
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#009ad0', endColorstr='#007ab7',GradientType=0 );
+.box-info-product .exclusive span{
 	@include border-radius(5px);
 	font-weight:bold;
 	font-size:20px; 
@@ -578,7 +597,7 @@ padding:18px 19px 12px;
 															
       
 }
-.box-info-product .exclusive:hover span{
+.box-info-product .exclusive:hover{
 	@include background-image(linear-gradient(#007ab7, #009ad0)); 
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#007ab7', endColorstr='#009ad0',GradientType=0 );
 	background-position:0 0
@@ -686,6 +705,7 @@ table.table-produst-discounts{
 		padding:0 6px;
 		float:left;
 		border:$main_border;
+		line-height:27px;
 	}
 	
 	.btn{
@@ -756,6 +776,11 @@ table.table-produst-discounts{
     @include background-image(linear-gradient(#fff, #fbfbfb)); 
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fff', endColorstr='#fbfbfb',GradientType=0 );
 }
+.ie8 {
+	.box-security {
+		filter:none;
+	}	
+}
 /* prices */
 .content_prices {
     padding:13px 19px;
diff --git a/themes/default-bootstrap/sass/product_list.scss b/themes/default-bootstrap/sass/product_list.scss
index 670849670..041e61a93 100644
--- a/themes/default-bootstrap/sass/product_list.scss
+++ b/themes/default-bootstrap/sass/product_list.scss
@@ -83,7 +83,12 @@ ul.product_list {
 		.nb-comments {overflow:hidden; font-style:italic;}
 	}
 }
-
+.ie8 {
+	.quick-view	 {
+		background:#fff;
+		border:1px solid $base-border-color;	
+	}
+}
 /*******************************************************
 			 Product list(Grid) Styles 
 ********************************************************/
diff --git a/themes/default-bootstrap/scenes.tpl b/themes/default-bootstrap/scenes.tpl
index 22a583c86..4a2e06945 100644
--- a/themes/default-bootstrap/scenes.tpl
+++ b/themes/default-bootstrap/scenes.tpl
@@ -40,7 +40,7 @@ $(function () {ldelim}
 		<div class="screen_scene" id="screen_scene_{$scene->id}" style="background:transparent url({$base_dir}img/scenes/{$scene->id}-scene_default.jpg); height:{$largeSceneImageType.height}px; width:{$largeSceneImageType.width}px; {if !$scene@first} display:none;{/if}">
 			{foreach $scene->products as $product_key=>$product}
 			{assign var=imageIds value="`$product.id_product`-`$product.id_image`"}
-				<a href="{$product.link|escape:'htmlall':'UTF-8'}" accesskey="#scene_products_cluetip_{$scene_key}_{$product_key}_{$product.id_product}" class="cluetip" style="width:{$product.zone_width}px; height:{$product.zone_height}px; margin-left:{$product.x_axis}px ;margin-top:{$product.y_axis}px;">
+				<a href="{$product.link|escape:'html':'UTF-8'}" accesskey="#scene_products_cluetip_{$scene_key}_{$product_key}_{$product.id_product}" class="cluetip" style="width:{$product.zone_width}px; height:{$product.zone_height}px; margin-left:{$product.x_axis}px ;margin-top:{$product.y_axis}px;">
 					<span style="margin-top:{math equation='a/2 -10' a=$product.zone_height}px; margin-left:{math equation='a/2 -10' a=$product.zone_width}px;">&nbsp;</span>
 				</a>
 				<div id="scene_products_cluetip_{$scene_key}_{$product_key}_{$product.id_product}" style="display:none;">
@@ -72,8 +72,8 @@ $(function () {ldelim}
 			<ul style="width:{math equation='(a*b + (a-1)*10)' a=$scenes|@count b=$thumbSceneImageType.width}px; height:{$thumbSceneImageType.height}px;">
 			{foreach $scenes as $scene}
 				<li id="scene_thumb_{$scene->id}" style="{if !$scene@last} padding-right:10px;{/if}">
-					<a style="width:{$thumbSceneImageType.width}px; height:{$thumbSceneImageType.height}px" title="{$scene->name|escape:'htmlall':'UTF-8'}" href="#" rel="{$scene->id}" onclick="{ldelim}loadScene({$scene->id});return false;{rdelim}">
-						<img alt="{$scene->name|escape:'htmlall':'UTF-8'}" src="{$content_dir}img/scenes/thumbs/{$scene->id}-m_scene_default.jpg" width="{$thumbSceneSize.width}" height="{$thumbSceneSize.height}" />
+					<a style="width:{$thumbSceneImageType.width}px; height:{$thumbSceneImageType.height}px" title="{$scene->name|escape:'html':'UTF-8'}" href="#" rel="{$scene->id}" onclick="{ldelim}loadScene({$scene->id});return false;{rdelim}">
+						<img alt="{$scene->name|escape:'html':'UTF-8'}" src="{$content_dir}img/scenes/thumbs/{$scene->id}-m_scene_default.jpg" width="{$thumbSceneSize.width}" height="{$thumbSceneSize.height}" />
 					</a>
 				</li>
 		 	{/foreach}
diff --git a/themes/default-bootstrap/search.tpl b/themes/default-bootstrap/search.tpl
index df83f5750..0b81c30a4 100644
--- a/themes/default-bootstrap/search.tpl
+++ b/themes/default-bootstrap/search.tpl
@@ -26,7 +26,7 @@
 {capture name=path}{l s='Search'}{/capture}
 
 <h1 {if isset($instant_search) && $instant_search}id="instant_search_results"{/if} class="page-heading {if !isset($instant_search) || (isset($instant_search) && !$instant_search)} product-listing{/if}">
-{l s='Search'}&nbsp;{if $nbProducts > 0}<span class="lighter">"{if isset($search_query) && $search_query}{$search_query|escape:'htmlall':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'htmlall':'UTF-8'}{elseif $ref}{$ref|escape:'htmlall':'UTF-8'}{/if}"</span>{/if}
+{l s='Search'}&nbsp;{if $nbProducts > 0}<span class="lighter">"{if isset($search_query) && $search_query}{$search_query|escape:'html':'UTF-8'}{elseif $search_tag}{$search_tag|escape:'html':'UTF-8'}{elseif $ref}{$ref|escape:'html':'UTF-8'}{/if}"</span>{/if}
 {if isset($instant_search) && $instant_search}<a href="#" class="close">{l s='Return to the previous page'}</a>{else}<span class="heading-counter">{if $nbProducts == 1}{l s='%d result has been found.' sprintf=$nbProducts|intval}{else}{l s='%d results have been found.' sprintf=$nbProducts|intval}{/if}</span>{/if}
 </h1>
 
@@ -34,9 +34,9 @@
 {if !$nbProducts}
 	<p class="alert alert-warning">
 		{if isset($search_query) && $search_query}
-			{l s='No results were found for your search'}&nbsp;"{if isset($search_query)}{$search_query|escape:'htmlall':'UTF-8'}{/if}"
+			{l s='No results were found for your search'}&nbsp;"{if isset($search_query)}{$search_query|escape:'html':'UTF-8'}{/if}"
 		{elseif isset($search_tag) && $search_tag}
-			{l s='No results were found for your search'}&nbsp;"{$search_tag|escape:'htmlall':'UTF-8'}"
+			{l s='No results were found for your search'}&nbsp;"{$search_tag|escape:'html':'UTF-8'}"
 		{else}
 			{l s='Please enter a search keyword'}
 		{/if}
diff --git a/themes/default-bootstrap/shopping-cart-product-line.tpl b/themes/default-bootstrap/shopping-cart-product-line.tpl
index 1e47361d1..f082731bc 100644
--- a/themes/default-bootstrap/shopping-cart-product-line.tpl
+++ b/themes/default-bootstrap/shopping-cart-product-line.tpl
@@ -24,12 +24,12 @@
 *}
 <tr id="product_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}{if !empty($product.gift)}_gift{/if}" class="cart_item{if isset($productLast) && $productLast && (!isset($ignoreProductLast) || !$ignoreProductLast)} last_item{/if}{if isset($productFirst) && $productFirst} first_item{/if}{if isset($customizedDatas.$productId.$productAttributeId) AND $quantityDisplayed == 0} alternate_item{/if} address_{$product.id_address_delivery|intval} {if $odd}odd{else}even{/if}">
 	<td class="cart_product">
-		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'htmlall':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
+		<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')|escape:'html'}" alt="{$product.name|escape:'html':'UTF-8'}" {if isset($smallSize)}width="{$smallSize.width}" height="{$smallSize.height}" {/if} /></a>
 	</td>
 	<td class="cart_description">
-		<p class="product-name"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.name|escape:'htmlall':'UTF-8'}</a></p>
-        <small class="cart_ref">{l s='SKU'} : {if $product.reference}{$product.reference|escape:'htmlall':'UTF-8'}{else}--{/if}</small>
-		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$product.attributes|escape:'htmlall':'UTF-8'}</a></small>{/if}
+		<p class="product-name"><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a></p>
+        <small class="cart_ref">{l s='SKU'} : {if $product.reference}{$product.reference|escape:'html':'UTF-8'}{else}--{/if}</small>
+		{if isset($product.attributes) && $product.attributes}<small><a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}">{$product.attributes|escape:'html':'UTF-8'}</a></small>{/if}
 	</td>
 	<td class="cart_avail">{if $product.quantity_available > 0}<span class="label label-success">{l s='In Stock'}</span>{else}<span class="label label-warning">{l s='Out of Stock'}</span>{/if}</td>
 	<td class="cart_unit">
diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl
index 9f0cf4e3c..99b5e5e37 100644
--- a/themes/default-bootstrap/shopping-cart.tpl
+++ b/themes/default-bootstrap/shopping-cart.tpl
@@ -60,10 +60,10 @@
 		<div class="cart_last_product_header">
 			<div class="left">{l s='Last product added'}</div>
 		</div>
-		<a  class="cart_last_product_img" href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, $lastProductAdded.id_shop)|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html'}" alt="{$lastProductAdded.name|escape:'htmlall':'UTF-8'}"/></a>
+		<a  class="cart_last_product_img" href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, $lastProductAdded.id_shop)|escape:'html':'UTF-8'}"><img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}"/></a>
 		<div class="cart_last_product_content">
-			<p class="product-name"><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$lastProductAdded.name|escape:'htmlall':'UTF-8'}</a></p>
-			{if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}<small><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'htmlall':'UTF-8'}">{$lastProductAdded.attributes|escape:'htmlall':'UTF-8'}</a></small>{/if}
+			<p class="product-name"><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">{$lastProductAdded.name|escape:'html':'UTF-8'}</a></p>
+			{if isset($lastProductAdded.attributes) && $lastProductAdded.attributes}<small><a href="{$link->getProductLink($lastProductAdded.id_product, $lastProductAdded.link_rewrite, $lastProductAdded.category, null, null, null, $lastProductAdded.id_product_attribute)|escape:'html':'UTF-8'}">{$lastProductAdded.attributes|escape:'html':'UTF-8'}</a></small>{/if}
 		</div>
 	</div>
 {/if}
@@ -92,7 +92,7 @@
                                 {if isset($errors_discount) && $errors_discount}
                                     <ul class="alert alert-danger">
                                     {foreach $errors_discount as $k=>$error}
-                                        <li>{$error|escape:'htmlall':'UTF-8'}</li>
+                                        <li>{$error|escape:'html':'UTF-8'}</li>
                                     {/foreach}
                                     </ul>
                                 {/if}
@@ -124,7 +124,7 @@
                                 {if isset($errors_discount) && $errors_discount}
                                     <ul class="alert alert-danger">
                                     {foreach $errors_discount as $k=>$error}
-                                        <li>{$error|escape:'htmlall':'UTF-8'}</li>
+                                        <li>{$error|escape:'html':'UTF-8'}</li>
                                     {/foreach}
                                     </ul>
                                 {/if}
@@ -157,7 +157,7 @@
                             {if isset($errors_discount) && $errors_discount}
                                 <ul class="alert alert-danger">
                                 {foreach $errors_discount as $k=>$error}
-                                    <li>{$error|escape:'htmlall':'UTF-8'}</li>
+                                    <li>{$error|escape:'html':'UTF-8'}</li>
                                 {/foreach}
                                 </ul>
                             {/if}
@@ -422,12 +422,12 @@
         <div class="col-xs-12 col-sm-6">
 			<ul id="delivery_address" class="address item box">
 			<li><h3 class="page-subheading">{l s='Delivery address'}&nbsp;<span class="address_alias">({$delivery->alias})</span></h3></li>
-			{if $delivery->company}<li class="address_company">{$delivery->company|escape:'htmlall':'UTF-8'}</li>{/if}
-			<li class="address_name">{$delivery->firstname|escape:'htmlall':'UTF-8'} {$delivery->lastname|escape:'htmlall':'UTF-8'}</li>
-			<li class="address_address1">{$delivery->address1|escape:'htmlall':'UTF-8'}</li>
-			{if $delivery->address2}<li class="address_address2">{$delivery->address2|escape:'htmlall':'UTF-8'}</li>{/if}
-			<li class="address_city">{$delivery->postcode|escape:'htmlall':'UTF-8'} {$delivery->city|escape:'htmlall':'UTF-8'}</li>
-			<li class="address_country">{$delivery->country|escape:'htmlall':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'htmlall':'UTF-8'}){/if}</li>
+			{if $delivery->company}<li class="address_company">{$delivery->company|escape:'html':'UTF-8'}</li>{/if}
+			<li class="address_name">{$delivery->firstname|escape:'html':'UTF-8'} {$delivery->lastname|escape:'html':'UTF-8'}</li>
+			<li class="address_address1">{$delivery->address1|escape:'html':'UTF-8'}</li>
+			{if $delivery->address2}<li class="address_address2">{$delivery->address2|escape:'html':'UTF-8'}</li>{/if}
+			<li class="address_city">{$delivery->postcode|escape:'html':'UTF-8'} {$delivery->city|escape:'html':'UTF-8'}</li>
+			<li class="address_country">{$delivery->country|escape:'html':'UTF-8'} {if $delivery_state}({$delivery_state|escape:'html':'UTF-8'}){/if}</li>
 		</ul>
         </div>
 		{/if}
@@ -435,12 +435,12 @@
         <div class="col-xs-12 col-sm-6">
 			<ul id="invoice_address" class="address alternate_item box">
 			<li><h3 class="page-subheading">{l s='Invoice address'}&nbsp;<span class="address_alias">({$invoice->alias})</span></h3></li>
-			{if $invoice->company}<li class="address_company">{$invoice->company|escape:'htmlall':'UTF-8'}</li>{/if}
-			<li class="address_name">{$invoice->firstname|escape:'htmlall':'UTF-8'} {$invoice->lastname|escape:'htmlall':'UTF-8'}</li>
-			<li class="address_address1">{$invoice->address1|escape:'htmlall':'UTF-8'}</li>
-			{if $invoice->address2}<li class="address_address2">{$invoice->address2|escape:'htmlall':'UTF-8'}</li>{/if}
-			<li class="address_city">{$invoice->postcode|escape:'htmlall':'UTF-8'} {$invoice->city|escape:'htmlall':'UTF-8'}</li>
-			<li class="address_country">{$invoice->country|escape:'htmlall':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'htmlall':'UTF-8'}){/if}</li>
+			{if $invoice->company}<li class="address_company">{$invoice->company|escape:'html':'UTF-8'}</li>{/if}
+			<li class="address_name">{$invoice->firstname|escape:'html':'UTF-8'} {$invoice->lastname|escape:'html':'UTF-8'}</li>
+			<li class="address_address1">{$invoice->address1|escape:'html':'UTF-8'}</li>
+			{if $invoice->address2}<li class="address_address2">{$invoice->address2|escape:'html':'UTF-8'}</li>{/if}
+			<li class="address_city">{$invoice->postcode|escape:'html':'UTF-8'} {$invoice->city|escape:'html':'UTF-8'}</li>
+			<li class="address_country">{$invoice->country|escape:'html':'UTF-8'} {if $invoice_state}({$invoice_state|escape:'html':'UTF-8'}){/if}</li>
 		</ul>
         </div>
 		{/if}
@@ -455,7 +455,7 @@
 					{foreach $addressKey as $key}
 						<span class="{if isset($addresses_style[$key])}{$addresses_style[$key]}{/if}">
 							{if isset($address.formated[$key])}
-								{$address.formated[$key]|escape:'htmlall':'UTF-8'}
+								{$address.formated[$key]|escape:'html':'UTF-8'}
 							{/if}
 						</span>
 					{/foreach}
@@ -475,7 +475,7 @@
 			<a href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')}{else}{$link->getPageLink('order', true, NULL, 'step=1')}{/if}&amp;multi-shipping=1" class="multishipping-button multishipping-checkout button btn btn-default button-medium" title="{l s='Proceed to checkout'}"><span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span></a>
 		{/if}
 	{/if}
-	<a href="{if (isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order.php')) || isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order-opc') || !isset($smarty.server.HTTP_REFERER)}{$link->getPageLink('index')}{else}{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}{/if}" class="button-exclusive btn btn-default" title="{l s='Continue shopping'}"><i class="icon-chevron-left"></i>{l s='Continue shopping'}</a>
+	<a href="{if (isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order.php')) || isset($smarty.server.HTTP_REFERER) && strstr($smarty.server.HTTP_REFERER, 'order-opc') || !isset($smarty.server.HTTP_REFERER)}{$link->getPageLink('index')}{else}{$smarty.server.HTTP_REFERER|escape:'html':'UTF-8'|secureReferrer}{/if}" class="button-exclusive btn btn-default" title="{l s='Continue shopping'}"><i class="icon-chevron-left"></i>{l s='Continue shopping'}</a>
 </p>
 	{if !empty($HOOK_SHOPPING_CART_EXTRA)}
 		<div class="clear"></div>
diff --git a/themes/default-bootstrap/sitemap.tpl b/themes/default-bootstrap/sitemap.tpl
index 34ba30ea4..eed753a60 100644
--- a/themes/default-bootstrap/sitemap.tpl
+++ b/themes/default-bootstrap/sitemap.tpl
@@ -66,7 +66,7 @@
 	<div class="col-xs-12 col-sm-6">
 		<div class="categTree box">
             <h3 class="page-subheading">{l s='Categories'}</h3>
-            <div class="tree_top"><a href="{$base_dir_ssl}" title="{$categoriesTree.name|escape:'htmlall':'UTF-8'}"></a></div>
+            <div class="tree_top"><a href="{$base_dir_ssl}" title="{$categoriesTree.name|escape:'html':'UTF-8'}"></a></div>
             <ul class="tree">
             {if isset($categoriesTree.children)}
                 {foreach $categoriesTree.children as $child}
@@ -84,7 +84,7 @@
 		<div class="sitemap_block box">
             <h3 class="page-subheading">{l s='Pages'}</h3>
             <ul>
-            	<li><a href="{$categoriescmsTree.link}" title="{$categoriescmsTree.name|escape:'htmlall':'UTF-8'}">{$categoriescmsTree.name|escape:'htmlall':'UTF-8'}</a></li>
+            	<li><a href="{$categoriescmsTree.link}" title="{$categoriescmsTree.name|escape:'html':'UTF-8'}">{$categoriescmsTree.name|escape:'html':'UTF-8'}</a></li>
                 {if isset($categoriescmsTree.children)}
                     {foreach $categoriescmsTree.children as $child}
                         {if (isset($child.children) && $child.children|@count > 0) || $child.cms|@count > 0}
@@ -93,7 +93,7 @@
                     {/foreach}
                 {/if}
                 {foreach from=$categoriescmsTree.cms item=cms name=cmsTree}
-                    <li><a href="{$cms.link|escape:'htmlall':'UTF-8'}" title="{$cms.meta_title|escape:'htmlall':'UTF-8'}">{$cms.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+                    <li><a href="{$cms.link|escape:'html':'UTF-8'}" title="{$cms.meta_title|escape:'html':'UTF-8'}">{$cms.meta_title|escape:'html':'UTF-8'}</a></li>
                 {/foreach}
                 <li><a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact'}">{l s='Contact'}</a></li>
                 {if $display_store}<li class="last"><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='List of our stores'}">{l s='Our stores'}</a></li>{/if}
diff --git a/themes/default-bootstrap/stores.tpl b/themes/default-bootstrap/stores.tpl
index 1ed306a43..3ee726f6d 100644
--- a/themes/default-bootstrap/stores.tpl
+++ b/themes/default-bootstrap/stores.tpl
@@ -42,13 +42,13 @@
 	{foreach $stores as $store}
 		<tr class="store-small">
         	
-			<td class="logo">{if $store.has_picture}<div class="store-image"><img src="{$img_store_dir}{$store.id_store}-stores_default.jpg" alt="" /></div>{/if}</td>
-			<td class="name">{$store.name|escape:'htmlall':'UTF-8'}</td>
+			<td class="logo">{if $store.has_picture}<div class="store-image"><img src="{$img_store_dir}{$store.id_store}.jpg" alt="" /></div>{/if}</td>
+			<td class="name">{$store.name|escape:'html':'UTF-8'}</td>
             <td class="address">
-				{$store.address1|escape:'htmlall':'UTF-8'}
-				{if $store.address2}{$store.address2|escape:'htmlall':'UTF-8'}{/if}
-				{$store.postcode} {$store.city|escape:'htmlall':'UTF-8'}{if $store.state}, {$store.state}{/if}
-				{$store.country|escape:'htmlall':'UTF-8'}
+				{$store.address1|escape:'html':'UTF-8'}
+				{if $store.address2}{$store.address2|escape:'html':'UTF-8'}{/if}
+				{$store.postcode} {$store.city|escape:'html':'UTF-8'}{if $store.state}, {$store.state}{/if}
+				{$store.country|escape:'html':'UTF-8'}
 				{if $store.phone}{l s='Phone:' js=0} {$store.phone}{/if}
 			</td>
             <td class="store-hours">
diff --git a/themes/default-bootstrap/supplier-list.tpl b/themes/default-bootstrap/supplier-list.tpl
index fe0796a73..2b384c397 100644
--- a/themes/default-bootstrap/supplier-list.tpl
+++ b/themes/default-bootstrap/supplier-list.tpl
@@ -73,9 +73,9 @@
 				<!-- logo -->
 				<div class="logo">
 					{if $supplier.nb_products > 0}
-						<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$supplier.name|escape:'htmlall':'UTF-8'}">
+						<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{$supplier.name|escape:'html':'UTF-8'}">
 					{/if}
-					<img src="{$img_sup_dir}{$supplier.image|escape:'htmlall':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
+					<img src="{$img_sup_dir}{$supplier.image|escape:'html':'UTF-8'}-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 					{if $supplier.nb_products > 0}
 						</a>
 					{/if}
@@ -85,9 +85,9 @@
 				<!-- name -->
 				<h3>
 					{if $supplier.nb_products > 0}
-						<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'htmlall':'UTF-8'}">
+						<a class="product-name" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
 					{/if}
-					{$supplier.name|truncate:60:'...'|escape:'htmlall':'UTF-8'}
+					{$supplier.name|truncate:60:'...'|escape:'html':'UTF-8'}
 					{if $supplier.nb_products > 0}
 						</a>
 					{/if}
@@ -100,7 +100,7 @@
             	<div class="right-side-content">
                     <p class="product-counter">
                         {if $supplier.nb_products > 0}
-                            <a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'htmlall':'UTF-8'}">
+                            <a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">
                         {/if}
                         {if $supplier.nb_products == 1}{l s='%d product' sprintf=$supplier.nb_products|intval}{else}{l s='%d products' sprintf=$supplier.nb_products|intval}{/if}
                     	{if $supplier.nb_products > 0}
@@ -108,7 +108,7 @@
                     	{/if}
                     </p>
                     {if $supplier.nb_products > 0}
-                        <a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'htmlall':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
+                        <a class="btn btn-default button exclusive-medium" href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}"><span>{l s='View products'} <i class="icon-chevron-right right"></i></span></a>
                     {/if}
                 </div>
 			</div>
diff --git a/themes/default-bootstrap/supplier.tpl b/themes/default-bootstrap/supplier.tpl
index d00554826..b8e97353e 100644
--- a/themes/default-bootstrap/supplier.tpl
+++ b/themes/default-bootstrap/supplier.tpl
@@ -26,7 +26,7 @@
 {include file="$tpl_dir./errors.tpl"}
 
 {if !isset($errors) OR !sizeof($errors)}
-	<h1 class="page-heading product-listing">{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'htmlall':'UTF-8'}</h1>
+	<h1 class="page-heading product-listing">{l s='List of products by supplier:'}&nbsp;{$supplier->name|escape:'html':'UTF-8'}</h1>
 	{if !empty($supplier->description)}
 		<div class="description_box">
 			<p>{$supplier->description}</p>
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index 545000879..27d2d40a5 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -223,7 +223,7 @@ $(document).ready(function() {
 				</p>
 				<p class="lost_password"><a href="{$link->getPageLink('password')|escape:'html'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p>
 				<p class="submit">
-					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 					<input type="submit" id="SubmitLogin" name="SubmitLogin" class="button" value="{l s='Authentication'}" />
 				</p>
 			</div>
@@ -450,7 +450,7 @@ $(document).ready(function() {
 						<select name="id_country_invoice" id="id_country_invoice">
 							<option value="">-</option>
 							{foreach from=$countries item=v}
-							<option value="{$v.id_country}"{if (isset($smarty.post.id_country_invoice) && $smarty.post.id_country_invoice == $v.id_country) OR (!isset($smarty.post.id_country_invoice) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$v.id_country}"{if (isset($smarty.post.id_country_invoice) && $smarty.post.id_country_invoice == $v.id_country) OR (!isset($smarty.post.id_country_invoice) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 							{/foreach}
 						</select>
 					</p>
@@ -733,7 +733,7 @@ $(document).ready(function() {
 	<p class="cart_navigation required submit">
 		<input type="hidden" name="email_create" value="1" />
 		<input type="hidden" name="is_new_customer" value="1" />
-		{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+		{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 		<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive" />
 		<span><sup>*</sup>{l s='Required field'}</span>
 	</p>
diff --git a/themes/default/category.tpl b/themes/default/category.tpl
index 415e79f64..a08e78b6a 100644
--- a/themes/default/category.tpl
+++ b/themes/default/category.tpl
@@ -30,9 +30,9 @@
 	{if $category->id AND $category->active}
 		<h1>
 			{strip}
-				{$category->name|escape:'htmlall':'UTF-8'}
+				{$category->name|escape:'html':'UTF-8'}
 				{if isset($categoryNameComplement)}
-					{$categoryNameComplement|escape:'htmlall':'UTF-8'}
+					{$categoryNameComplement|escape:'html':'UTF-8'}
 				{/if}
 			{/strip}
 		</h1>
@@ -50,7 +50,7 @@
 				<!-- Category image -->
 				{if $category->id_image}
 				<div class="align_center">
-					<img src="{$link->getCatImageLink($category->link_rewrite, $category->id_image, 'category_default')|escape:'html'}" alt="{$category->name|escape:'htmlall':'UTF-8'}" title="{$category->name|escape:'htmlall':'UTF-8'}" id="categoryImage" width="{$categorySize.width}" height="{$categorySize.height}" />
+					<img src="{$link->getCatImageLink($category->link_rewrite, $category->id_image, 'category_default')|escape:'html'}" alt="{$category->name|escape:'html':'UTF-8'}" title="{$category->name|escape:'html':'UTF-8'}" id="categoryImage" width="{$categorySize.width}" height="{$categorySize.height}" />
 				</div>
 				{/if}
 			{/if}
@@ -75,14 +75,14 @@
 			<ul class="inline_list">
 			{foreach from=$subcategories item=subcategory}
 				<li class="clearfix">
-					<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}" title="{$subcategory.name|escape:'htmlall':'UTF-8'}" class="img">
+					<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}" title="{$subcategory.name|escape:'html':'UTF-8'}" class="img">
 						{if $subcategory.id_image}
 							<img src="{$link->getCatImageLink($subcategory.link_rewrite, $subcategory.id_image, 'medium_default')|escape:'html'}" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{else}
 							<img src="{$img_cat_dir}default-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{/if}
 					</a>
-					<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'htmlall':'UTF-8'}" class="cat_name">{$subcategory.name|escape:'htmlall':'UTF-8'}</a>
+					<a href="{$link->getCategoryLink($subcategory.id_category, $subcategory.link_rewrite)|escape:'html':'UTF-8'}" class="cat_name">{$subcategory.name|escape:'html':'UTF-8'}</a>
 					{if $subcategory.description}
 						<p class="cat_desc">{$subcategory.description}</p>
 					{/if}
diff --git a/themes/default/contact-form.tpl b/themes/default/contact-form.tpl
index 6fb91cf25..3173269c3 100644
--- a/themes/default/contact-form.tpl
+++ b/themes/default/contact-form.tpl
@@ -41,7 +41,7 @@
 {else}
 	<p class="bold">{l s='For questions about an order or for more information about our products'}.</p>
 	{include file="$tpl_dir./errors.tpl"}
-	<form action="{$request_uri|escape:'htmlall':'UTF-8'}" method="post" class="std" enctype="multipart/form-data">
+	<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" enctype="multipart/form-data">
 		<fieldset>
 			<h3>{l s='send a message'}</h3>
 			<p class="select">
@@ -49,7 +49,7 @@
 			{if isset($customerThread.id_contact)}
 				{foreach from=$contacts item=contact}
 					{if $contact.id_contact == $customerThread.id_contact}
-						<input type="text" id="contact_name" name="contact_name" value="{$contact.name|escape:'htmlall':'UTF-8'}" readonly="readonly" />
+						<input type="text" id="contact_name" name="contact_name" value="{$contact.name|escape:'html':'UTF-8'}" readonly="readonly" />
 						<input type="hidden" name="id_contact" value="{$contact.id_contact}" />
 					{/if}
 				{/foreach}
@@ -58,23 +58,23 @@
 				<select id="id_contact" name="id_contact" onchange="showElemFromSelect('id_contact', 'desc_contact')">
 					<option value="0">{l s='-- Choose --'}</option>
 				{foreach from=$contacts item=contact}
-					<option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'htmlall':'UTF-8'}</option>
+					<option value="{$contact.id_contact|intval}" {if isset($smarty.request.id_contact) && $smarty.request.id_contact == $contact.id_contact}selected="selected"{/if}>{$contact.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</p>
 			<p id="desc_contact0" class="desc_contact">&nbsp;</p>
 				{foreach from=$contacts item=contact}
 					<p id="desc_contact{$contact.id_contact|intval}" class="desc_contact" style="display:none;">
-						{$contact.description|escape:'htmlall':'UTF-8'}
+						{$contact.description|escape:'html':'UTF-8'}
 					</p>
 				{/foreach}
 			{/if}
 			<p class="text">
 				<label for="email">{l s='Email address'}</label>
 				{if isset($customerThread.email)}
-					<input type="text" id="email" name="from" value="{$customerThread.email|escape:'htmlall':'UTF-8'}" readonly="readonly" />
+					<input type="text" id="email" name="from" value="{$customerThread.email|escape:'html':'UTF-8'}" readonly="readonly" />
 				{else}
-					<input type="text" id="email" name="from" value="{$email|escape:'htmlall':'UTF-8'}" />
+					<input type="text" id="email" name="from" value="{$email|escape:'html':'UTF-8'}" />
 				{/if}
 			</p>
 		{if !$PS_CATALOG_MODE}
@@ -85,7 +85,7 @@
 					<select name="id_order" >
 						<option value="0">{l s='-- Choose --'}</option>
 						{foreach from=$orderList item=order}
-							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$order.value|intval}" {if $order.selected|intval}selected="selected"{/if}>{$order.label|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{elseif !isset($customerThread.id_order) && empty($isLogged)}
@@ -103,7 +103,7 @@
 					<select name="id_product" id="{$id_order}_order_products" class="product_select" style="width:300px;{if !$smarty.foreach.products.first} display:none; {/if}" {if !$smarty.foreach.products.first}disabled="disabled" {/if}>
 						<option value="0">{l s='-- Choose --'}</option>
 						{foreach from=$products item=product}
-							<option value="{$product.value|intval}">{$product.label|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$product.value|intval}">{$product.label|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				{/foreach}
@@ -122,7 +122,7 @@
 		{/if}
 		<p class="textarea">
 			<label for="message">{l s='Message'}</label>
-			 <textarea id="message" name="message" rows="15" cols="10">{if isset($message)}{$message|escape:'htmlall':'UTF-8'|stripslashes}{/if}</textarea>
+			 <textarea id="message" name="message" rows="15" cols="10">{if isset($message)}{$message|escape:'html':'UTF-8'|stripslashes}{/if}</textarea>
 		</p>
 		<p class="submit">
 			<input type="submit" name="submitMessage" id="submitMessage" value="{l s='Send'}" class="button_large" />
diff --git a/themes/default/header.tpl b/themes/default/header.tpl
index 19c6a248c..db8b2c8eb 100644
--- a/themes/default/header.tpl
+++ b/themes/default/header.tpl
@@ -29,7 +29,7 @@
 <!--[if gt IE 8]> <html class="no-js ie9" lang="{$lang_iso}"> <![endif]-->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang_iso}">
 	<head>
-		<title>{$meta_title|escape:'htmlall':'UTF-8'}</title>
+		<title>{$meta_title|escape:'html':'UTF-8'}</title>
 {if isset($meta_description) AND $meta_description}
 		<meta name="description" content="{$meta_description|escape:html:'UTF-8'}" />
 {/if}
@@ -64,7 +64,7 @@
 		{$HOOK_HEADER}
 	</head>
 	
-	<body {if isset($page_name)}id="{$page_name|escape:'htmlall':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'htmlall':'UTF-8'}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if}">
+	<body {if isset($page_name)}id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if $hide_left_column} hide-left-column{/if}{if $hide_right_column} hide-right-column{/if}{if $content_only} content_only{/if}">
 	{if !$content_only}
 		{if isset($restricted_country_mode) && $restricted_country_mode}
 		<div id="restricted-country">
@@ -75,8 +75,8 @@
 
 			<!-- Header -->
 			<div id="header" class="grid_9 alpha omega">
-				<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'htmlall':'UTF-8'}">
-					<img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'htmlall':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
+				<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
+					<img class="logo" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}" {if $logo_image_width}width="{$logo_image_width}"{/if} {if $logo_image_height}height="{$logo_image_height}" {/if}/>
 				</a>
 				<div id="header_right" class="grid_9 omega">
 					{$HOOK_TOP}
diff --git a/themes/default/mobile/order-detail.tpl b/themes/default/mobile/order-detail.tpl
index e6234555d..c50677c4b 100644
--- a/themes/default/mobile/order-detail.tpl
+++ b/themes/default/mobile/order-detail.tpl
@@ -46,8 +46,8 @@
 
 
 <ul class="info-order" data-role="listview">
-	{if $carrier->id}<li><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</li>{/if}
-	<li><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></li>
+	{if $carrier->id}<li><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'html':'UTF-8'}{else}{$carrier->name|escape:'html':'UTF-8'}{/if}</li>{/if}
+	<li><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'html':'UTF-8'}</span></li>
 	{if $invoice AND $invoiceAllowed}
 	<li>
 		<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
@@ -68,7 +68,7 @@
 <ul data-role="listview" >
 	{foreach from=$order_history item=state name="orderStates"}
 	<li>
-		{$state.ostate_name|escape:'htmlall':'UTF-8'}
+		{$state.ostate_name|escape:'html':'UTF-8'}
 		<span class="ui-li-aside">{dateFormat date=$state.date_add full=1}</span>
 	</li>
 	{/foreach}
@@ -79,7 +79,7 @@
 {* > TO CHECK ==========================*}
 {if isset($followup)}
 <p class="bold">{l s='Click the following link to track the delivery of your order'}</p>
-<a href="{$followup|escape:'htmlall':'UTF-8'}" data-ajax="false">{$followup|escape:'htmlall':'UTF-8'}</a>
+<a href="{$followup|escape:'html':'UTF-8'}" data-ajax="false">{$followup|escape:'html':'UTF-8'}</a>
 {/if}
 {* / TO CHECK ==========================*}
 
@@ -112,12 +112,12 @@
 	<li data-role="list-divider">{l s='Invoice'}</li>
 	<li>
 	{foreach from=$inv_adr_fields name=inv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_invoice->company)}<p class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "address2" && $address_invoice->address2}<p class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</p>
+		{if $field_item eq "company" && isset($address_invoice->company)}<p class="address_company">{$address_invoice->company|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "address2" && $address_invoice->address2}<p class="address_address2">{$address_invoice->address2|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<p class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'html':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item}
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -125,12 +125,12 @@
 	<li data-role="list-divider" >{l s='Delivery'}</li>
 	<li>
 	{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_delivery->company)}<p class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "address2" && $address_delivery->address2}<p class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</p>
-		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</p>
+		{if $field_item eq "company" && isset($address_delivery->company)}<p class="address_company">{$address_delivery->company|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "address2" && $address_delivery->address2}<p class="address_address2">{$address_delivery->address2|escape:'html':'UTF-8'}</p>
+		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<p class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'html':'UTF-8'}</p>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item} 
-				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</p>
+				<p>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</p>
 		{/if}
 	{/foreach}
 	</li>
@@ -160,8 +160,8 @@
 {* > TO CHECK ==========================*}
 {foreach from=$discounts item=discount}
 	<li class="item">
-		<h3>{$discount.name|escape:'htmlall':'UTF-8'}</h3>
-		<p>{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'}</p>
+		<h3>{$discount.name|escape:'html':'UTF-8'}</h3>
+		<p>{l s='Voucher'} {$discount.name|escape:'html':'UTF-8'}</p>
 		<p><span class="order_qte_span editable">1</span></p>
 		<p>&nbsp;</p>
 		<p>{if $discount.value != 0.00}{l s='-'}{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</p>
@@ -246,11 +246,11 @@
 				<tr class="{if $smarty.foreach.messageList.first}first_item{elseif $smarty.foreach.messageList.last}last_item{/if} {if $smarty.foreach.messageList.index % 2}alternate_item{else}item{/if}">
 					<td>
 						{if isset($message.ename) && $message.ename}
-							{$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'}
+							{$message.efirstname|escape:'html':'UTF-8'} {$message.elastname|escape:'html':'UTF-8'}
 						{elseif $message.clastname}
-							{$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'}
+							{$message.cfirstname|escape:'html':'UTF-8'} {$message.clastname|escape:'html':'UTF-8'}
 						{else}
-							<b>{$shop_name|escape:'htmlall':'UTF-8'}</b>
+							<b>{$shop_name|escape:'html':'UTF-8'}</b>
 						{/if}
 						<br />
 						{dateFormat date=$message.date_add full=1}
diff --git a/themes/default/modules/blocksearch/blocksearch.tpl b/themes/default/modules/blocksearch/blocksearch.tpl
index e4d2cc745..32f9fd2aa 100644
--- a/themes/default/modules/blocksearch/blocksearch.tpl
+++ b/themes/default/modules/blocksearch/blocksearch.tpl
@@ -32,7 +32,7 @@
 			<input type="hidden" name="orderby" value="position" />
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderway" value="desc" />
-			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'|stripslashes}" />
+			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{$search_query|escape:'html':'UTF-8'|stripslashes}" />
 			<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
 		</p>
 	</form>
diff --git a/themes/default/order-carrier.tpl b/themes/default/order-carrier.tpl
index af59cfe69..7a69ff825 100644
--- a/themes/default/order-carrier.tpl
+++ b/themes/default/order-carrier.tpl
@@ -212,7 +212,7 @@
 										{/if}
 										{* This foreach is on one line, to avoid tabulation in the title attribute of the acronym *}
 										{foreach $carrier.product_list as $product}
-										{if $product@index == 4}<acronym title="{/if}{if $product@index >= 4}{$product.name}{if isset($product.attributes) && $product.attributes} {$product.attributes|escape:'htmlall':'UTF-8'}{/if}{if !$product@last}, {else}">...</acronym>){/if}{else}{$product.name}{if isset($product.attributes) && $product.attributes} {$product.attributes|escape:'htmlall':'UTF-8'}{/if}{if !$product@last}, {else}){/if}{/if}{/foreach}
+										{if $product@index == 4}<acronym title="{/if}{if $product@index >= 4}{$product.name}{if isset($product.attributes) && $product.attributes} {$product.attributes|escape:'html':'UTF-8'}{/if}{if !$product@last}, {else}">...</acronym>){/if}{else}{$product.name}{if isset($product.attributes) && $product.attributes} {$product.attributes|escape:'html':'UTF-8'}{/if}{if !$product@last}, {else}){/if}{/if}{/foreach}
 									{/if}
 								</td>
 							</tr>
@@ -261,7 +261,7 @@
 		</p>
 		<p id="gift_div" class="textarea">
 			<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
-			<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
+			<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'html':'UTF-8'}</textarea>
 		</p>
 		{/if}
 	{/if}
@@ -307,7 +307,7 @@
 	<h3>{l s='Leave a message'}</h3>
 	<div>
 		<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
-		<p><textarea cols="120" rows="3" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'htmlall':'UTF-8'}{/if}</textarea></p>
+		<p><textarea cols="120" rows="3" name="message" id="message">{if isset($oldMessage)}{$oldMessage|escape:'html':'UTF-8'}{/if}</textarea></p>
 	</div>
 </div>
 {/if}
diff --git a/themes/default/order-detail.tpl b/themes/default/order-detail.tpl
index 67c002556..4cb99d28c 100644
--- a/themes/default/order-detail.tpl
+++ b/themes/default/order-detail.tpl
@@ -34,8 +34,8 @@
 </form>
 
 <div class="info-order">
-{if $carrier->id}<p><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'htmlall':'UTF-8'}{else}{$carrier->name|escape:'htmlall':'UTF-8'}{/if}</p>{/if}
-<p><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'htmlall':'UTF-8'}</span></p>
+{if $carrier->id}<p><strong>{l s='Carrier'}</strong> {if $carrier->name == "0"}{$shop_name|escape:'html':'UTF-8'}{else}{$carrier->name|escape:'html':'UTF-8'}{/if}</p>{/if}
+<p><strong>{l s='Payment method'}</strong> <span class="color-myaccount">{$order->payment|escape:'html':'UTF-8'}</span></p>
 {if $invoice AND $invoiceAllowed}
 <p>
 	<img src="{$img_dir}icon/pdf.gif" alt="" class="icon" />
@@ -65,7 +65,7 @@
 		{foreach from=$order_history item=state name="orderStates"}
 			<tr class="{if $smarty.foreach.orderStates.first}first_item{elseif $smarty.foreach.orderStates.last}last_item{/if} {if $smarty.foreach.orderStates.index % 2}alternate_item{else}item{/if}">
 				<td>{dateFormat date=$state.date_add full=1}</td>
-				<td>{$state.ostate_name|escape:'htmlall':'UTF-8'}</td>
+				<td>{$state.ostate_name|escape:'html':'UTF-8'}</td>
 			</tr>
 		{/foreach}
 		</tbody>
@@ -75,7 +75,7 @@
 
 {if isset($followup)}
 <p class="bold">{l s='Click the following link to track the delivery of your order'}</p>
-<a href="{$followup|escape:'htmlall':'UTF-8'}">{$followup|escape:'htmlall':'UTF-8'}</a>
+<a href="{$followup|escape:'html':'UTF-8'}">{$followup|escape:'html':'UTF-8'}</a>
 {/if}
 
 <div class="adresses_bloc clearfix">
@@ -83,12 +83,12 @@
 <ul class="address item {if $order->isVirtual()}full_width{/if}">
 	<li class="address_title">{l s='Billing'}</li>
 	{foreach from=$inv_adr_fields name=inv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'htmlall':'UTF-8'}</li>
-		{elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'htmlall':'UTF-8'}</li>
-		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'htmlall':'UTF-8'}</li>
+		{if $field_item eq "company" && isset($address_invoice->company)}<li class="address_company">{$address_invoice->company|escape:'html':'UTF-8'}</li>
+		{elseif $field_item eq "address2" && $address_invoice->address2}<li class="address_address2">{$address_invoice->address2|escape:'html':'UTF-8'}</li>
+		{elseif $field_item eq "phone_mobile" && $address_invoice->phone_mobile}<li class="address_phone_mobile">{$address_invoice->phone_mobile|escape:'html':'UTF-8'}</li>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item}
-				<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
+				<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$invoiceAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</li>
 		{/if}
 
 	{/foreach}
@@ -96,12 +96,12 @@
 <ul class="address alternate_item" {if $order->isVirtual()}style="display:none;"{/if}>
 	<li class="address_title">{l s='Delivery'}</li>
 	{foreach from=$dlv_adr_fields name=dlv_loop item=field_item}
-		{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'htmlall':'UTF-8'}</li>
-		{elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'htmlall':'UTF-8'}</li>
-		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'htmlall':'UTF-8'}</li>
+		{if $field_item eq "company" && isset($address_delivery->company)}<li class="address_company">{$address_delivery->company|escape:'html':'UTF-8'}</li>
+		{elseif $field_item eq "address2" && $address_delivery->address2}<li class="address_address2">{$address_delivery->address2|escape:'html':'UTF-8'}</li>
+		{elseif $field_item eq "phone_mobile" && $address_delivery->phone_mobile}<li class="address_phone_mobile">{$address_delivery->phone_mobile|escape:'html':'UTF-8'}</li>
 		{else}
 				{assign var=address_words value=" "|explode:$field_item} 
-				<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'htmlall':'UTF-8'}</span>{/foreach}</li>
+				<li>{foreach from=$address_words item=word_item name="word_loop"}{if !$smarty.foreach.word_loop.first} {/if}<span class="address_{$word_item|replace:',':''}">{$deliveryAddressFormatedValues[$word_item|replace:',':'']|escape:'html':'UTF-8'}</span>{/foreach}</li>
 		{/if}
 	{/foreach}
 </ul>
@@ -175,9 +175,9 @@
 				{if isset($product.customizedDatas)}
 					<tr class="item">
 						{if $return_allowed}<td class="order_cb"></td>{/if}
-						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</label></td>
+						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</label></td>
 						<td class="bold">
-							<label for="cb_{$product.id_order_detail|intval}">{$product.product_name|escape:'htmlall':'UTF-8'}</label>
+							<label for="cb_{$product.id_order_detail|intval}">{$product.product_name|escape:'html':'UTF-8'}</label>
 						</td>
 						<td><input class="order_qte_input"  name="order_qte_input[{$smarty.foreach.products.index}]" type="text" size="2" value="{$product.customizationQuantityTotal|intval}" /><label for="cb_{$product.id_order_detail|intval}"><span class="order_qte_span editable">{$product.customizationQuantityTotal|intval}</span></label></td>
 						{if $order->hasProductReturned()}
@@ -246,24 +246,24 @@
 				{if $product.product_quantity > $product.customizationQuantityTotal}
 					<tr class="item">
 						{if $return_allowed}<td class="order_cb"><input type="checkbox" id="cb_{$product.id_order_detail|intval}" name="ids_order_detail[{$product.id_order_detail|intval}]" value="{$product.id_order_detail|intval}" /></td>{/if}
-						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'htmlall':'UTF-8'}{else}--{/if}</label></td>
+						<td><label for="cb_{$product.id_order_detail|intval}">{if $product.product_reference}{$product.product_reference|escape:'html':'UTF-8'}{else}--{/if}</label></td>
 						<td class="bold">
 							<label for="cb_{$product.id_order_detail|intval}">
 								{if $product.download_hash && $invoice && $product.display_filename != '' && $product.product_quantity_refunded == 0 && $product.product_quantity_return == 0}
 									{if isset($is_guest) && $is_guest}
-									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}">
+									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}&amp;id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}">
 									{else}
-										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}">
+										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}">
 									{/if}
 										<img src="{$img_dir}icon/download_product.gif" class="icon" alt="{l s='Download product'}" />
 									</a>
 									{if isset($is_guest) && $is_guest}
-										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}&id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'htmlall':'UTF-8'} 	</a>
+										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}&id_order={$order->id}&secure_key={$order->secure_key}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'html':'UTF-8'} 	</a>
 									{else}
-									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'htmlall':'UTF-8'}-{$product.download_hash|escape:'htmlall':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'htmlall':'UTF-8'} 	</a>
+									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html'}" title="{l s='Download this product'}"> {$product.product_name|escape:'html':'UTF-8'} 	</a>
 									{/if}
 								{else}
-									{$product.product_name|escape:'htmlall':'UTF-8'}
+									{$product.product_name|escape:'html':'UTF-8'}
 								{/if}
 							</label>
 						</td>
@@ -297,8 +297,8 @@
 		{/foreach}
 		{foreach from=$discounts item=discount}
 			<tr class="item">
-				<td>{$discount.name|escape:'htmlall':'UTF-8'}</td>
-				<td>{l s='Voucher'} {$discount.name|escape:'htmlall':'UTF-8'}</td>
+				<td>{$discount.name|escape:'html':'UTF-8'}</td>
+				<td>{l s='Voucher'} {$discount.name|escape:'html':'UTF-8'}</td>
 				<td><span class="order_qte_span editable">1</span></td>
 				<td>&nbsp;</td>
 				<td>{if $discount.value != 0.00}-{/if}{convertPriceWithCurrency price=$discount.value currency=$currency}</td>
@@ -370,16 +370,16 @@
 				<tr class="{if $smarty.foreach.messageList.first}first_item{elseif $smarty.foreach.messageList.last}last_item{/if} {if $smarty.foreach.messageList.index % 2}alternate_item{else}item{/if}">
 					<td>
 						{if isset($message.elastname) && $message.elastname}
-							{$message.efirstname|escape:'htmlall':'UTF-8'} {$message.elastname|escape:'htmlall':'UTF-8'}
+							{$message.efirstname|escape:'html':'UTF-8'} {$message.elastname|escape:'html':'UTF-8'}
 						{elseif $message.clastname}
-							{$message.cfirstname|escape:'htmlall':'UTF-8'} {$message.clastname|escape:'htmlall':'UTF-8'}
+							{$message.cfirstname|escape:'html':'UTF-8'} {$message.clastname|escape:'html':'UTF-8'}
 						{else}
-							<b>{$shop_name|escape:'htmlall':'UTF-8'}</b>
+							<b>{$shop_name|escape:'html':'UTF-8'}</b>
 						{/if}
 						<br />
 						{dateFormat date=$message.date_add full=1}
 					</td>
-					<td>{$message.message|escape:'htmlall':'UTF-8'|nl2br}</td>
+					<td>{$message.message|escape:'html':'UTF-8'|nl2br}</td>
 				</tr>
 			{/foreach}
 			</tbody>
diff --git a/themes/default/order-opc-new-account.tpl b/themes/default/order-opc-new-account.tpl
index 7d452cb38..2d754633d 100644
--- a/themes/default/order-opc-new-account.tpl
+++ b/themes/default/order-opc-new-account.tpl
@@ -19,7 +19,7 @@
 					<a href="{$link->getPageLink('password', true)|escape:'html'}" class="lost_password">{l s='Forgot your password?'}</a>
 				</div>
 				<p class="submit">
-					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
+					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 					<input type="submit" id="SubmitLogin" name="SubmitLogin" class="button" value="{l s='Login'}" />
 				</p>
 			</div>
@@ -59,7 +59,7 @@
 						{if isset($country.states) && $country.contains_states}
 							countries[{$country.id_country|intval}] = new Array();
 							{foreach from=$country.states item='state' name='states'}
-								countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'htmlall':'UTF-8'}'{rdelim});
+								countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|escape:'html':'UTF-8'}'{rdelim});
 							{/foreach}
 						{/if}
 						{if $country.need_identification_number}
@@ -139,7 +139,7 @@
 					<select id="days" name="days">
 						<option value="">-</option>
 						{foreach from=$days item=day}
-							<option value="{$day|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+							<option value="{$day|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_day == $day)} selected="selected"{/if}>{$day|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 						{/foreach}
 					</select>
 					{*
@@ -159,13 +159,13 @@
 					<select id="months" name="months">
 						<option value="">-</option>
 						{foreach from=$months key=k item=month}
-							<option value="{$k|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
+							<option value="{$k|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_month == $k)} selected="selected"{/if}>{l s=$month}&nbsp;</option>
 						{/foreach}
 					</select>
 					<select id="years" name="years">
 						<option value="">-</option>
 						{foreach from=$years item=year}
-							<option value="{$year|escape:'htmlall':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
+							<option value="{$year|escape:'html':'UTF-8'}" {if isset($guestInformations) && ($guestInformations.sl_year == $year)} selected="selected"{/if}>{$year|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
 						{/foreach}
 					</select>
 				</p>
@@ -239,7 +239,7 @@
 					<label for="id_country">{l s='Country'} <sup>*</sup></label>
 					<select name="id_country" id="id_country">
 						{foreach from=$countries item=v}
-						<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+						<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 						{/foreach}
 					</select>
 				</p>
@@ -358,7 +358,7 @@
 						<select name="id_country_invoice" id="id_country_invoice">
 							<option value="">-</option>
 							{foreach from=$countries item=v}
-							<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country_invoice == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
+							<option value="{$v.id_country}"{if (isset($guestInformations) AND $guestInformations.id_country_invoice == $v.id_country) OR (!isset($guestInformations) && $sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'html':'UTF-8'}</option>
 							{/foreach}
 						</select>
 					</p>
diff --git a/themes/default/product.tpl b/themes/default/product.tpl
index 9c3c0e6da..41cd394ba 100644
--- a/themes/default/product.tpl
+++ b/themes/default/product.tpl
@@ -65,7 +65,7 @@ var currentDate = '{$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}';
 var maxQuantityToAllowDisplayOfLastQuantityMessage = {$last_qties};
 var noTaxForThisProduct = {if $no_tax == 1}true{else}false{/if};
 var displayPrice = {$priceDisplay};
-var productReference = '{$product->reference|escape:'htmlall':'UTF-8'}';
+var productReference = '{$product->reference|escape:'html':'UTF-8'}';
 var productAvailableForOrder = {if (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE}'0'{else}'{$product->available_for_order}'{/if};
 var productShowPrice = '{if !$PS_CATALOG_MODE}{$product->show_price}{else}0{/if}';
 var productUnitPriceRatio = '{$product->unit_price_ratio}';
@@ -163,8 +163,8 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 	<div id="admin-action">
 		<p>{l s='This product is not visible to your customers.'}
 		<input type="hidden" id="admin-action-product-id" value="{$product->id}" />
-		<input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
-		<input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'htmlall':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'htmlall':'UTF-8'}')"/>
+		<input type="submit" value="{l s='Publish'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 0, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
+		<input type="submit" value="{l s='Back'}" class="exclusive" onclick="submitPublishProduct('{$base_dir}{$smarty.get.ad|escape:'html':'UTF-8'}', 1, '{$smarty.get.adtoken|escape:'html':'UTF-8'}')"/>
 		</p>
 		<p id="admin-action-result"></p>
 		</p>
@@ -183,12 +183,12 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		<div id="image-block">
 		{if $have_image}
 			<span id="view_full_size">
-				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" alt="{if !empty($cover.legend)}{$cover.legend|escape:'htmlall':'UTF-8'}{else}{$product->name|escape:'htmlall':'UTF-8'}{/if}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
+				<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"{if $jqZoomEnabled && $have_image} class="jqzoom"{/if} title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}" alt="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}" id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}"/>
 				<span class="span_link">{l s='Maximize'}</span>
 			</span>
 		{else}
 			<span id="view_full_size">
-				<img src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
+				<img src="{$img_prod_dir}{$lang_iso}-default-large_default.jpg" id="bigpic" alt="" title="{$product->name|escape:'html':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
 				<span class="span_link">{l s='Maximize'}</span>
 			</span>
 		{/if}
@@ -203,9 +203,9 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				{foreach from=$images item=image name=thumbnails}
 					{assign var=imageIds value="`$product->id`-`$image.id_image`"}
 					{if !empty($image.legend)}
-						{assign var=imageTitlte value=$image.legend|escape:'htmlall':'UTF-8'}
+						{assign var=imageTitlte value=$image.legend|escape:'html':'UTF-8'}
 					{else}
-						{assign var=imageTitlte value=$product->name|escape:'htmlall':'UTF-8'}
+						{assign var=imageTitlte value=$product->name|escape:'html':'UTF-8'}
 					{/if}
 					<li id="thumbnail_{$image.id_image}">
 						<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}" rel="other-views" class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}" title="{$imageTitlte}">
@@ -231,7 +231,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 
 	<!-- left infos-->
 	<div id="pb-left-column">
-		<h1>{$product->name|escape:'htmlall':'UTF-8'}</h1>
+		<h1>{$product->name|escape:'html':'UTF-8'}</h1>
 
 		{if $product->description_short OR $packItems|@count > 0}
 		<div id="short_description_block">
@@ -246,7 +246,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				<h3>{l s='Pack content'}</h3>
 				{foreach from=$packItems item=packItem}
 				<div class="pack_content">
-					{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}">{$packItem.name|escape:'htmlall':'UTF-8'}</a>
+					{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html'}">{$packItem.name|escape:'html':'UTF-8'}</a>
 					<p>{$packItem.description_short}</p>
 				</div>
 				{/foreach}
@@ -289,13 +289,13 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 				{foreach from=$groups key=id_attribute_group item=group}
 					{if $group.attributes|@count}
 						<fieldset class="attribute_fieldset">
-							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :&nbsp;</label>
+							<label class="attribute_label" for="group_{$id_attribute_group|intval}">{$group.name|escape:'html':'UTF-8'} :&nbsp;</label>
 							{assign var="groupName" value="group_$id_attribute_group"}
 							<div class="attribute_list">
 							{if ($group.group_type == 'select')}
 								<select name="{$groupName}" id="group_{$id_attribute_group|intval}" class="attribute_select" onchange="findCombination();getProductAttribute();">
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
-										<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
+										<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'html':'UTF-8'}">{$group_attribute|escape:'html':'UTF-8'}</option>
 									{/foreach}
 								</select>
 							{elseif ($group.group_type == 'color')}
@@ -320,7 +320,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 									{foreach from=$group.attributes key=id_attribute item=group_attribute}
 										<li>
 											<input type="radio" class="attribute_radio" name="{$groupName}" value="{$id_attribute}" {if ($group.default == $id_attribute)} checked="checked"{/if} onclick="findCombination();getProductAttribute();" />
-											<span>{$group_attribute|escape:'htmlall':'UTF-8'}</span>
+											<span>{$group_attribute|escape:'html':'UTF-8'}</span>
 										</li>
 									{/foreach}
 								</ul>
@@ -333,7 +333,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 			{/if}
 			<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}>
 				<label>{l s='Reference:'} </label>
-				<span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span>
+				<span class="editable">{$product->reference|escape:'html':'UTF-8'}</span>
 			</p>
 
 			<!-- quantity wanted -->
@@ -434,7 +434,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 			{/if}
 			{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
 				 {math equation="pprice / punit_price"  pprice=$productPrice  punit_price=$product->unit_price_ratio assign=unit_price}
-				<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
+				<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'html':'UTF-8'}</p>
 			{/if}
 			{*close if for show price*}
 			{/if}
@@ -521,7 +521,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 		<ul id="idTab2" class="bullet">
 		{foreach from=$features item=feature}
             {if isset($feature.value)}
-			    <li><span>{$feature.name|escape:'htmlall':'UTF-8'}</span> {$feature.value|escape:'htmlall':'UTF-8'}</li>
+			    <li><span>{$feature.name|escape:'html':'UTF-8'}</span> {$feature.value|escape:'html':'UTF-8'}</li>
             {/if}
 		{/foreach}
 		</ul>
@@ -529,7 +529,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 	{if isset($attachments) && $attachments}
 		<ul id="idTab9" class="bullet">
 		{foreach from=$attachments item=attachment}
-			<li><a href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}">{$attachment.name|escape:'htmlall':'UTF-8'}</a><br />{$attachment.description|escape:'htmlall':'UTF-8'}</li>
+			<li><a href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html'}">{$attachment.name|escape:'html':'UTF-8'}</a><br />{$attachment.description|escape:'html':'UTF-8'}</li>
 		{/foreach}
 		</ul>
 	{/if}
@@ -544,19 +544,19 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
 							{assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)}
 							<li class="ajax_block_product{if $smarty.foreach.accessories_list.first} first_item{elseif $smarty.foreach.accessories_list.last} last_item{else} item{/if} product_accessories_description">
 								<p class="s_title_block">
-									<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}">{$accessory.name|escape:'htmlall':'UTF-8'}</a>
+									<a href="{$accessoryLink|escape:'html':'UTF-8'}">{$accessory.name|escape:'html':'UTF-8'}</a>
 									{if $accessory.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE} - <span class="price">{if $priceDisplay != 1}{displayWtPrice p=$accessory.price}{else}{displayWtPrice p=$accessory.price_tax_exc}{/if}</span>{/if}
 								</p>
 								<div class="product_desc">
-									<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{$accessory.legend|escape:'htmlall':'UTF-8'}" class="product_image"><img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'medium_default')|escape:'html'}" alt="{$accessory.legend|escape:'htmlall':'UTF-8'}" width="{$mediumSize.width}" height="{$mediumSize.height}" /></a>
+									<a href="{$accessoryLink|escape:'html':'UTF-8'}" title="{$accessory.legend|escape:'html':'UTF-8'}" class="product_image"><img src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'medium_default')|escape:'html'}" alt="{$accessory.legend|escape:'html':'UTF-8'}" width="{$mediumSize.width}" height="{$mediumSize.height}" /></a>
 									<div class="block_description">
-										<a href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{l s='More'}" class="product_description">{$accessory.description_short|strip_tags|truncate:400:'...'}</a>
+										<a href="{$accessoryLink|escape:'html':'UTF-8'}" title="{l s='More'}" class="product_description">{$accessory.description_short|strip_tags|truncate:400:'...'}</a>
 									</div>
 									<div class="clear_product_desc">&nbsp;</div>
 								</div>
 								
 								<p class="clearfix" style="margin-top:5px">
-									<a class="button" href="{$accessoryLink|escape:'htmlall':'UTF-8'}" title="{l s='View'}">{l s='View'}</a>
+									<a class="button" href="{$accessoryLink|escape:'html':'UTF-8'}" title="{l s='View'}">{l s='View'}</a>
 									{if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)}
 									<a class="exclusive button ajax_add_to_cart_button" href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")|escape:'html'}" rel="ajax_id_product_{$accessory.id_product|intval}" title="{l s='Add to cart'}">{l s='Add to cart'}</a>
 									{/if}
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index db7585645..56fa8508f 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -42,7 +42,7 @@
 <form id="liveEdit-action-form" action="./{$ad}/index.php" method="post">
 	<input type="hidden" name="ajax" value="1" />
 	<input type="hidden" name="id_shop" value="{$id_shop}" />
-	<input type="hidden" name="token" value="{$smarty.get.liveToken|escape:'htmlall':'UTF-8'}" />
+	<input type="hidden" name="token" value="{$smarty.get.liveToken|escape:'html':'UTF-8'}" />
 	<input type="hidden" name="tab" value="AdminModulesPositions" />
 	<input type="hidden" name="action" value="saveHook" />
 	{foreach from=$hook_list key=hook_id item=hook_name}