diff --git a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl
index 396a824b6..e37acba66 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/helpers/list/list_header.tpl
@@ -26,7 +26,7 @@
 {block name='override_header'}
 {if $submit_form_ajax}
 	<script type="text/javascript">
-		$('#voucher', window.parent.document).val('{$new_cart_rule->code|escape:htmlall}');
+		$('#voucher', window.parent.document).val('{$new_cart_rule->code|escape:'html'}');
 		parent.add_cart_rule({$new_cart_rule->id|intval});
 		parent.$.fancybox.close();
 	</script>
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 38b9eecff..50f7bb5f5 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
@@ -27,7 +27,7 @@
 {block name='override_header'}
 {if $submit_form_ajax}
 	<script type="text/javascript">
-		$('#customer', window.parent.document).val('{$new_customer->email|escape:htmlall}');
+		$('#customer', window.parent.document).val('{$new_customer->email|escape:'html'}');
 		parent.setupCustomer({$new_customer->id|intval});
 		parent.$.fancybox.close();
 	</script>
diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl
index efd10729f..243738042 100644
--- a/admin-dev/themes/default/template/controllers/modules/page.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/page.tpl
@@ -72,7 +72,7 @@
 	{l s='An upgrade is available for some of your modules!'}
 	<ul>
 	{foreach from=$upgrade_available item='module'}
-		<li> &raquo; <a href="{$currentIndex|escape:htmlall}&token={$token|escape:htmlall}&anchor=anchor{$module.anchor|escape:htmlall}"><b>{$module.name|escape:htmlall}</b></a></li>
+		<li> &raquo; <a href="{$currentIndex|escape:'html':'UTF-8'}&token={$token|escape:'html':'UTF-8'}&anchor=anchor{$module.anchor|escape:'html':'UTF-8'}"><b>{$module.name|escape:'html':'UTF-8'}</b></a></li>
 	{/foreach}
 	</ul>
 </div>
diff --git a/modules/blockbanner/blockbanner.tpl b/modules/blockbanner/blockbanner.tpl
index 9604d6c1a..da0b77b28 100644
--- a/modules/blockbanner/blockbanner.tpl
+++ b/modules/blockbanner/blockbanner.tpl
@@ -22,7 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
 <!-- Block stores module -->
 <div id="banner_block_top">
 	<div class="banner-top">
@@ -37,4 +36,4 @@
 	</div>
   </div>
 </div>
-<!-- /Block stores module -->
+<!-- /Block stores module -->
\ No newline at end of file
diff --git a/modules/blockcontact/blockcontact.php b/modules/blockcontact/blockcontact.php
index b11a3e0d6..3fddf9ce1 100644
--- a/modules/blockcontact/blockcontact.php
+++ b/modules/blockcontact/blockcontact.php
@@ -33,9 +33,9 @@ class Blockcontact extends Module
 	{
 		$this->name = 'blockcontact';
 		$this->tab = 'front_office_features';
-		$this->version = '1.0';
+		$this->version = '1.1';
 
-		$this->bootstrap = true;
+		$this->bootstrap = true;
 		parent::__construct();	
 
 		$this->displayName = $this->l('Contact Block');
@@ -47,7 +47,7 @@ class Blockcontact extends Module
 		return parent::install()
 			&& Configuration::updateValue('blockcontact_telnumber', '')
 			&& Configuration::updateValue('blockcontact_email', '')
-			&& $this->registerHook('displayRightColumn')
+			&& $this->registerHook('displayNav')
 			&& $this->registerHook('displayHeader');
 	}
 	
@@ -74,12 +74,12 @@ class Blockcontact extends Module
 		return $html;
 	}
 
-	public function hookDisplayHeader()
+	public function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS(($this->_path).'blockcontact.css', 'all');
 	}
 	
-	public function hookDisplayRightColumn()
+	public function hookDisplayRightColumn($params)
 	{
 		global $smarty;
 		if (!$this->isCached('blockcontact.tpl', $this->getCacheId()))
@@ -90,9 +90,15 @@ class Blockcontact extends Module
 		return $this->display(__FILE__, 'blockcontact.tpl', $this->getCacheId());
 	}
 	
-	public function hookDisplayLeftColumn()
+	public function hookDisplayLeftColumn($params)
 	{
-		return $this->hookDisplayRightColumn();
+		return $this->hookDisplayRightColumn($params);
+	}
+
+	public function hookDisplayNav($params)
+	{
+
+		return $this->hookDisplayRightColumn($params);
 	}
 	
 	public function renderForm()
diff --git a/modules/blockcontact/config.xml b/modules/blockcontact/config.xml
index 967c3ddaa..2bb59c1ae 100644
--- a/modules/blockcontact/config.xml
+++ b/modules/blockcontact/config.xml
@@ -2,7 +2,7 @@
         <module>
             <name>blockcontact</name>
             <displayName><![CDATA[Contact Block]]></displayName>
-            <version><![CDATA[1.0]]></version>
+            <version><![CDATA[1.1]]></version>
             <description><![CDATA[Allows you to add additional information about your store&#039;s customer service.]]></description>
             <author><![CDATA[]]></author>
             <tab><![CDATA[front_office_features]]></tab>
diff --git a/modules/blockcontact/upgrade/install-1.1.php b/modules/blockcontact/upgrade/install-1.1.php
new file mode 100644
index 000000000..33ef44c89
--- /dev/null
+++ b/modules/blockcontact/upgrade/install-1.1.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_1($object)
+{
+	return ($object->unregisterHook('displayRightColumn') && $object->registerHook('displayNav'));
+}
diff --git a/modules/blockcurrencies/blockcurrencies.php b/modules/blockcurrencies/blockcurrencies.php
index 34eda8b86..8376e8bd3 100644
--- a/modules/blockcurrencies/blockcurrencies.php
+++ b/modules/blockcurrencies/blockcurrencies.php
@@ -33,7 +33,7 @@ class BlockCurrencies extends Module
 	{
 		$this->name = 'blockcurrencies';
 		$this->tab = 'front_office_features';
-		$this->version = 0.1;
+		$this->version = 0.2;
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
@@ -45,7 +45,7 @@ class BlockCurrencies extends Module
 
 	public function install()
 	{
-		return parent::install() && $this->registerHook('top') && $this->registerHook('header');
+		return parent::install() && $this->registerHook('displayNav') && $this->registerHook('displayHeader');
 	}
 
 	private function _prepareHook($params)
@@ -67,13 +67,18 @@ class BlockCurrencies extends Module
 	* @param array $params Parameters
 	* @return string Content
 	*/
-	public function hookTop($params)
+	public function hookDisplayTop($params)
 	{
 		if ($this->_prepareHook($params))
 			return $this->display(__FILE__, 'blockcurrencies.tpl');
 	}
 
-	public function hookHeader($params)
+	public function hookDisplayNav($params)
+	{
+			return $this->hookDisplayTop($params);
+	}
+
+	public function hookDisplayHeader($params)
 	{
 		if (Configuration::get('PS_CATALOG_MODE'))
 			return;
diff --git a/modules/blockcurrencies/config.xml b/modules/blockcurrencies/config.xml
index f5ba1e9fb..2f1a202c1 100755
--- a/modules/blockcurrencies/config.xml
+++ b/modules/blockcurrencies/config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
         <module>
             <name>blockcurrencies</name>
-            <displayName><![CDATA[Currency block]]></displayName>
-            <version><![CDATA[0.1]]></version>
-            <description><![CDATA[Adds a block allowing customers to choose their preferred shopping currency.]]></description>
+            <displayName><![CDATA[Bloc devises]]></displayName>
+            <version><![CDATA[0.2]]></version>
+            <description><![CDATA[Ajoute un bloc permettant au client de choisir sa devise]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>
             <is_configurable>0</is_configurable>
diff --git a/modules/blockcurrencies/upgrade/install-0.2.php b/modules/blockcurrencies/upgrade/install-0.2.php
new file mode 100644
index 000000000..9f76b7b77
--- /dev/null
+++ b/modules/blockcurrencies/upgrade/install-0.2.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_0_2($object)
+{
+	return ($object->unregisterHook('top') && $object->registerHook('displayNav'));
+}
diff --git a/modules/blocklanguages/blocklanguages.php b/modules/blocklanguages/blocklanguages.php
index 351102cdb..e460daad3 100644
--- a/modules/blocklanguages/blocklanguages.php
+++ b/modules/blocklanguages/blocklanguages.php
@@ -33,19 +33,19 @@ class BlockLanguages extends Module
 	{
 		$this->name = 'blocklanguages';
 		$this->tab = 'front_office_features';
-		$this->version = 1.1;
+		$this->version = 1.2;
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
 		parent::__construct();
 
 		$this->displayName = $this->l('Language block');
-		$this->description = $this->l('Adds a block allowing customers to select a website language. ');
+		$this->description = $this->l('Adds a block allowing customers to select a website language.');
 	}
 
 	public function install()
 	{
-		return (parent::install() && $this->registerHook('top') && $this->registerHook('header'));
+		return (parent::install() && $this->registerHook('displayNav') && $this->registerHook('displayHeader'));
 	}
 
 	private function _prepareHook($params)
@@ -94,14 +94,20 @@ class BlockLanguages extends Module
 	* @param array $params Parameters
 	* @return string Content
 	*/
-	public function hookTop($params)
+	public function hookDisplayTop($params)
 	{
 		if (!$this->_prepareHook($params))
 			return;
 		return $this->display(__FILE__, 'blocklanguages.tpl');
 	}
 
-	public function hookHeader($params)
+	public function hookDisplayNav($params)
+	{
+
+		return $this->hookDisplayTop($params);
+	}
+
+	public function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS($this->_path.'blocklanguages.css', 'all');
 	}
diff --git a/modules/blocklanguages/config.xml b/modules/blocklanguages/config.xml
index c83d813dc..463e60398 100755
--- a/modules/blocklanguages/config.xml
+++ b/modules/blocklanguages/config.xml
@@ -2,7 +2,7 @@
         <module>
             <name>blocklanguages</name>
             <displayName><![CDATA[Language block]]></displayName>
-            <version><![CDATA[1.1]]></version>
+            <version><![CDATA[1.2]]></version>
             <description><![CDATA[Adds a block allowing customers to select a website language. ]]></description>
             <author><![CDATA[PrestaShop]]></author>
             <tab><![CDATA[front_office_features]]></tab>
diff --git a/modules/blocklanguages/upgrade/install-1.2.php b/modules/blocklanguages/upgrade/install-1.2.php
new file mode 100644
index 000000000..1fee978f9
--- /dev/null
+++ b/modules/blocklanguages/upgrade/install-1.2.php
@@ -0,0 +1,9 @@
+<?php
+
+if (!defined('_PS_VERSION_'))
+	exit;
+
+function upgrade_module_1_2($object)
+{
+	return ($object->unregisterHook('top') && $object->registerHook('displayNav'));
+}
diff --git a/themes/default-bootstrap/404.tpl b/themes/default-bootstrap/404.tpl
index d29bb86cb..0afd5b4a4 100644
--- a/themes/default-bootstrap/404.tpl
+++ b/themes/default-bootstrap/404.tpl
@@ -33,7 +33,7 @@
 	</p>
 
 	<h3>{l s='To find a product, please type its name in the field below.'}</h3>
-	<form action="{$link->getPageLink('search')|escape:'html'}" method="post" class="std">
+	<form action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" method="post" class="std">
 		<fieldset>
 			<div>
 				<label for="search_query">{l s='Search our product catalog:'}</label>
diff --git a/themes/default-bootstrap/address.tpl b/themes/default-bootstrap/address.tpl
index de0121b8f..cf839321e 100644
--- a/themes/default-bootstrap/address.tpl
+++ b/themes/default-bootstrap/address.tpl
@@ -73,7 +73,7 @@
 			{if isset($smarty.post.alias)}
 				"{$smarty.post.alias}"
 			{else}
-				{if isset($address->alias)}"{$address->alias|escape:'html'}"{/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.'}
@@ -82,11 +82,11 @@
 	{include file="$tpl_dir./errors.tpl"}
 	<p class="required"><sup>*</sup>{l s='Required field'}</p>
 	
-	<form action="{$link->getPageLink('address', true)|escape:'html'}" method="post" class="std" id="add_address">
+	<form action="{$link->getPageLink('address', true)|escape:'html':'UTF-8'}" method="post" class="std" id="add_address">
 		<!--h3 class="page-subheading">{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3-->
 		<div class="required form-group dni">
 			<label for="dni">{l s='Identification number'} <sup>*</sup></label>
-			<input type="text" class="form-control" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{else}{if isset($address->dni)}{$address->dni|escape:'html'}{/if}{/if}" />
+			<input type="text" class="form-control" 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}" />
 			<span class="form_info">{l s='DNI / NIF / NIE'}</span>
 		</div>
 		{assign var="stateExist" value="false"}
@@ -95,7 +95,7 @@
 			{if $field_name eq 'company'}
 				<div class="form-group">
 					<label for="company">{l s='Company'}</label>
-					<input class="form-control" type="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{else}{if isset($address->company)}{$address->company|escape:'html'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');}" />
+					<input class="form-control" 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}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok');}" />
 				</div>
 			{/if}
 			{if $field_name eq 'vat_number'}
@@ -103,7 +103,7 @@
 					<div id="vat_number">
 						<div class="form-group">
 							<label for="vat-number">{l s='VAT number'}</label>
-							<input type="text" class="form-control" id="vat-number" 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'}{/if}{/if}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok'); }" />
+							<input type="text" class="form-control" id="vat-number" 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}" onkeyup="if($(this).val().length) { if (validate_{$address_validation.$field_name.validate}($(this).val())) $(this).parent().removeClass('form-error').addClass('form-ok'); else $(this).parent().addClass('form-error').removeClass('form-ok'); }" />
 						</div>
 					</div>
 				</div>
@@ -111,38 +111,38 @@
 			{if $field_name eq 'firstname'}
 				<div class="required form-group">
 					<label for="firstname">{l s='First name'} <sup>*</sup></label>
-					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" name="firstname" id="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{else}{if isset($address->firstname)}{$address->firstname|escape:'html'}{/if}{/if}" />
+					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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 form-group">
 					<label for="lastname">{l s='Last name'} <sup>*</sup></label>
-					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{else}{if isset($address->lastname)}{$address->lastname|escape:'html'}{/if}{/if}" />
+					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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 form-group">
 					<label for="address1">{l s='Address'} <sup>*</sup></label>
-					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="address1" name="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{else}{if isset($address->address1)}{$address->address1|escape:'html'}{/if}{/if}" />
+					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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 form-group">
 					<label for="address2">{l s='Address (Line 2)'}</label>
-					<input class="validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="address2" name="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{else}{if isset($address->address2)}{$address->address2|escape:'html'}{/if}{/if}" />
+					<input class="validate form-control" data-validate="{$address_validation.$field_name.validate}" 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 form-group">
 					<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
-					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" />
+					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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}" />
 				</div>
 			{/if}
 			{if $field_name eq 'city'}
 				<div class="required form-group">
 					<label for="city">{l s='City'} <sup>*</sup></label>
-					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{else}{if isset($address->city)}{$address->city|escape:'html'}{/if}{/if}" maxlength="64" />
+					<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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 customer hasn't update his layout address, country has to be verified but it's deprecated *}
 			{/if}
@@ -191,7 +191,7 @@
 		{if $postCodeExist eq "false"}
 			<div class="required postcode form-group unvisible">
 				<label for="postcode">{l s='Zip / Postal Code'} <sup>*</sup></label>
-				<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" type="text" id="postcode" name="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{else}{if isset($address->postcode)}{$address->postcode|escape:'html'}{/if}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
+				<input class="is_required validate form-control" data-validate="{$address_validation.$field_name.validate}" 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"}
@@ -204,11 +204,11 @@
 		{/if}
 		<div class="form-group">
 			<label for="other">{l s='Additional information'}</label>
-			<textarea class="validate form-control" data-validate="{$address_validation.other.validate}" 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'}{/if}{/if}</textarea>
+			<textarea class="validate form-control" data-validate="{$address_validation.other.validate}" 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>
 		<div class="form-group phone-number">
 			<label for="phone">{l s='Home phone'}</label>
-			<input class="{if isset($one_phone_at_least) && $one_phone_at_least}is_required{/if} validate form-control" data-validate="{$address_validation.phone.validate}" type="tel" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone|escape:'html'}{/if}{/if}"  />
+			<input class="{if isset($one_phone_at_least) && $one_phone_at_least}is_required{/if} validate form-control" data-validate="{$address_validation.phone.validate}" type="tel" 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>
 		{if isset($one_phone_at_least) && $one_phone_at_least}
 			<p class="inline-infos required">{l s='You must register at least one phone number.'}</p>
@@ -216,11 +216,11 @@
 		<div class="clearfix"></div>
 		<div class="{if isset($one_phone_at_least) && $one_phone_at_least}required {/if}form-group">
 			<label for="phone_mobile">{l s='Mobile phone'}{if isset($one_phone_at_least) && $one_phone_at_least} <sup>*</sup>{/if}</label>
-			<input class="validate form-control" data-validate="{$address_validation.phone_mobile.validate}" type="tel" 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'}{/if}{/if}" />
+			<input class="validate form-control" data-validate="{$address_validation.phone_mobile.validate}" type="tel" 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>
 		<div class="required form-group" id="adress_alias">
 			<label for="alias">{l s='Please assign an address title for future reference.'} <sup>*</sup></label>
-			<input type="text" id="alias" class="is_required validate form-control" data-validate="{$address_validation.alias.validate}" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'html'}{elseif !$select_address}{l s='My address'}{/if}" />
+			<input type="text" id="alias" class="is_required validate form-control" data-validate="{$address_validation.alias.validate}" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'html':'UTF-8'}{elseif !$select_address}{l s='My address'}{/if}" />
 		</div>
 		<p class="submit2">
 			{if isset($id_address)}<input type="hidden" name="id_address" value="{$id_address|intval}" />{/if}
@@ -240,7 +240,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-defaul button button-small" href="{$link->getPageLink('addresses', true)|escape:'html'}">
+		<a class="btn btn-defaul button button-small" href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}">
 			<span><i class="icon-chevron-left"></i> {l s='Back to your addresses'}</span>
 		</a>
 	</li>
diff --git a/themes/default-bootstrap/addresses.tpl b/themes/default-bootstrap/addresses.tpl
index 5866c8370..c28f1cfa3 100644
--- a/themes/default-bootstrap/addresses.tpl
+++ b/themes/default-bootstrap/addresses.tpl
@@ -34,7 +34,7 @@
 //]]>
 </script>
 
-{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My addresses'}</span>{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My addresses'}</span>{/capture}
 
 <h1 class="page-heading">{l s='My addresses'}</h1>
 <p>{l s='Please configure your default billing and delivery addresses when placing an order. You may also add additional addresses, which can be useful for sending gifts or receiving an order at your office.'}</p>
@@ -60,22 +60,22 @@
                     </li>
                 {/foreach}
                 <li class="address_update">
-                <a class="btn btn-default button button-small" href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}")|escape:'html'}" title="{l s='Update'}"><span>{l s='Update'}<i class="icon-chevron-right right"></i></span></a>
-                <a class="btn btn-default button button-small" href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}&delete")|escape:'html'}" onclick="return confirm('{l s='Are you sure?' js=1}');" title="{l s='Delete'}"><span>{l s='Delete'}<i class="icon-remove right"></i></span></a></li>
+                <a class="btn btn-default button button-small" href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}")|escape:'html':'UTF-8'}" title="{l s='Update'}"><span>{l s='Update'}<i class="icon-chevron-right right"></i></span></a>
+                <a class="btn btn-default button button-small" href="{$link->getPageLink('address', true, null, "id_address={$address.object.id|intval}&delete")|escape:'html':'UTF-8'}" onclick="return confirm('{l s='Are you sure?' js=1}');" title="{l s='Delete'}"><span>{l s='Delete'}<i class="icon-remove right"></i></span></a></li>
             </ul>
         </div>
 	{/foreach}
 	</div>
 </div>
 {else}
-	<p class="alert alert-warning">{l s='No addresses are available.'}&nbsp;<a href="{$link->getPageLink('address', true)|escape:'html'}">{l s='Add a new address'}</a></p>
+	<p class="alert alert-warning">{l s='No addresses are available.'}&nbsp;<a href="{$link->getPageLink('address', true)|escape:'html':'UTF-8'}">{l s='Add a new address'}</a></p>
 {/if}
 
 <div class="clearfix main-page-indent">
-	<a href="{$link->getPageLink('address', true)|escape:'html'}" title="{l s='Add an address'}" class="btn btn-default button button-medium"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
+	<a href="{$link->getPageLink('address', true)|escape:'html':'UTF-8'}" title="{l s='Add an address'}" class="btn btn-default button button-medium"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
 </div>
 
 <ul class="footer_links clearfix">
-	<li><a class="btn btn-defaul button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i> {l s='Back to your account'}</span></a></li>
+	<li><a class="btn btn-defaul 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'}</span></a></li>
 	<li><a class="btn btn-defaul button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
 </ul>
diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl
index b595f47f3..87e579b32 100644
--- a/themes/default-bootstrap/authentication.tpl
+++ b/themes/default-bootstrap/authentication.tpl
@@ -25,7 +25,7 @@
 
 {capture name=path}
 	{if !isset($email_create)}{l s='Authentication'}{else}
-		<a href="{$link->getPageLink('authentication', true)|escape:'html'}" rel="nofollow" title="{l s='Authentication'}">{l s='Authentication'}</a>
+		<a href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Authentication'}">{l s='Authentication'}</a>
 		<span class="navigation-pipe">{$navigationPipe}</span>{l s='Create your account'}
 	{/if}
 {/capture}
@@ -149,7 +149,7 @@
 	{/if}-->
 	<div class="row">
 		<div class="col-xs-12 col-sm-6">
-			<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="create-account_form" class="box">
+			<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="create-account_form" class="box">
 				<h3 class="page-subheading">{l s='Create an account'}</h3>
 				<div class="form_content clearfix">
 					<p>{l s='Please enter your email address to create an account.'}</p>
@@ -172,7 +172,7 @@
 			</form>
 		</div>
 		<div class="col-xs-12 col-sm-6">
-			<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="login_form" class="box">
+			<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="login_form" class="box">
 				<h3 class="page-subheading">{l s='Already registered?'}</h3>
 				<div class="form_content clearfix">
 					<div class="form-group">
@@ -183,7 +183,7 @@
 						<label for="passwd">{l s='Password'}</label>
 						<span><input class="is_required validate account_input form-control" type="password" data-validate="isPasswd" id="passwd" name="passwd" value="{if isset($smarty.post.passwd)}{$smarty.post.passwd|stripslashes}{/if}" /></span>
 					</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="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html':'UTF-8'}" 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:'html':'UTF-8'}" />{/if}
 						<button type="submit" id="SubmitLogin" name="SubmitLogin" class="button btn btn-default button-medium">
@@ -198,7 +198,7 @@
 		</div>
 	</div>
 	{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
-		<form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html'}" method="post" id="new_account_form" class="std clearfix">
+		<form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="std clearfix">
 			<div class="box">
 				<div>
 				<div id="opc_account_form" style="display: block; ">
@@ -395,7 +395,7 @@
 		</ol>
 	</div>
 	{/if}-->
-	<form action="{$link->getPageLink('authentication', true)|escape:'html'}" method="post" id="account-creation_form" class="std box">
+	<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="account-creation_form" class="std box">
 		{$HOOK_CREATE_ACCOUNT_TOP}
 		<div class="account_creation">
 			<h3 class="page-subheading">{l s='Your personal information'}</h3>
diff --git a/themes/default-bootstrap/breadcrumb.tpl b/themes/default-bootstrap/breadcrumb.tpl
index 714337376..3bf16f7cb 100644
--- a/themes/default-bootstrap/breadcrumb.tpl
+++ b/themes/default-bootstrap/breadcrumb.tpl
@@ -28,7 +28,7 @@
 <div class="breadcrumb clearfix">
 	<a class="home" href="{$base_dir}" title="{l s='Return to Home'}"><i class="icon-home"></i></a>
 	{if isset($path) AND $path}
-		<span class="navigation-pipe" {if isset($category) && isset($category->id_category) && $category->id_category == 1}style="display:none;"{/if}>{$navigationPipe|escape:html:'UTF-8'}</span>
+		<span class="navigation-pipe" {if isset($category) && isset($category->id_category) && $category->id_category == 1}style="display:none;"{/if}>{$navigationPipe|escape:'html':'UTF-8'}</span>
 		{if !$path|strpos:'span'}
 			<span class="navigation_page">{$path}</span>
 		{else}
diff --git a/themes/default-bootstrap/category.tpl b/themes/default-bootstrap/category.tpl
index 76bf60936..e1332efde 100644
--- a/themes/default-bootstrap/category.tpl
+++ b/themes/default-bootstrap/category.tpl
@@ -47,7 +47,7 @@
                         </div>
                     {else}
                     <!-- Category image -->
-                    <div class="content_scene_cat_bg" {if $category->id_image}style="background:url({$link->getCatImageLink($category->link_rewrite, $category->id_image, 'category_default')|escape:'html'}) 0 bottom no-repeat; background-size:contain; min-height:{$categorySize.height}px;" {/if}>
+                    <div class="content_scene_cat_bg" {if $category->id_image}style="background:url({$link->getCatImageLink($category->link_rewrite, $category->id_image, 'category_default')|escape:'html':'UTF-8'}) 0 bottom no-repeat; background-size:contain; min-height:{$categorySize.height}px;" {/if}>
                         {if $category->description}
                             <div class="cat_desc">
                             <h1 class="category-name">
@@ -93,7 +93,7 @@
                 	<div class="subcategory-image">
 						<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}" />
+							<img class="replace-2x" src="{$link->getCatImageLink($subcategory.link_rewrite, $subcategory.id_image, 'medium_default')|escape:'html':'UTF-8'}" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{else}
 							<img class="replace-2x" src="{$img_cat_dir}default-medium_default.jpg" alt="" width="{$mediumSize.width}" height="{$mediumSize.height}" />
 						{/if}
diff --git a/themes/default-bootstrap/css/global.css b/themes/default-bootstrap/css/global.css
index 8c0eaa102..f76421f12 100644
--- a/themes/default-bootstrap/css/global.css
+++ b/themes/default-bootstrap/css/global.css
@@ -1,4 +1,3 @@
-@charset "UTF-8";
 @import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic);
 @import url(../css/font-awesome.css);
 html, body, div, span, applet, object, iframe,
@@ -48,7 +47,7 @@ a img {
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary {
   display: block; }
 
-/*!
+/*
  * Bootstrap v3.0.0
  *
  * Copyright 2013 Twitter, Inc
@@ -57,7 +56,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
  *
  * Designed and built with all the love in the world by @mdo and @fat.
  */
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/* normalize.css v2.1.0 | MIT License | git.io/normalize */
 article,
 aside,
 details,
diff --git a/themes/default-bootstrap/css/jquery/jquery.bxslider.css b/themes/default-bootstrap/css/jquery/jquery.bxslider.css
index 6dea981a0..27ab479dd 100644
--- a/themes/default-bootstrap/css/jquery/jquery.bxslider.css
+++ b/themes/default-bootstrap/css/jquery/jquery.bxslider.css
@@ -1,180 +1,76 @@
-/**
- * BxSlider v4.0 - Fully loaded, responsive content slider
- * http://bxslider.com
- *
- * Written by: Steven Wanderski, 2012
- * http://stevenwanderski.com
- * (while drinking Belgian ales and listening to jazz)
- *
- * CEO and founder of bxCreative, LTD
- * http://bxcreative.com
- */
-#crossselling_list, .accessories-block .block_content, #productscategory_list {
-  /** RESET AND LAYOUT
-  ===================================*/
-  /** THEME
-  ===================================*/
-  /* LOADER */
-  /* PAGER */
-  /* DIRECTION CONTROLS (NEXT / PREV) */
-  /* AUTO CONTROLS (START / STOP) */
-  /* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
-  /* IMAGE CAPTIONS */
-}
-#crossselling_list .bx-wrapper, .accessories-block .block_content .bx-wrapper, #productscategory_list .bx-wrapper {
-  position: relative;
-  padding: 0;
-  *zoom: 1;
-  margin: 0 !important;
-}
-#crossselling_list .bx-wrapper img, .accessories-block .block_content .bx-wrapper img, #productscategory_list .bx-wrapper img {
-  max-width: 100%;
-  display: block;
-}
-#crossselling_list .bx-wrapper .bx-pager,
-#crossselling_list .bx-wrapper .bx-controls-auto, .accessories-block .block_content .bx-wrapper .bx-pager,
-.accessories-block .block_content .bx-wrapper .bx-controls-auto, #productscategory_list .bx-wrapper .bx-pager,
-#productscategory_list .bx-wrapper .bx-controls-auto {
-  position: absolute;
-  bottom: -30px;
-  width: 100%;
-}
-#crossselling_list .bx-wrapper .bx-loading, .accessories-block .block_content .bx-wrapper .bx-loading, #productscategory_list .bx-wrapper .bx-loading {
-  min-height: 50px;
-  background: url(images/bx_loader.gif) center center no-repeat;
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2000;
-  display: none;
-}
-#crossselling_list .bx-wrapper .bx-pager, .accessories-block .block_content .bx-wrapper .bx-pager, #productscategory_list .bx-wrapper .bx-pager {
-  text-align: center;
-  font-size: .85em;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  color: #666;
-  padding-top: 20px;
-}
-#crossselling_list .bx-wrapper .bx-pager .bx-pager-item,
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-controls-auto-item, .accessories-block .block_content .bx-wrapper .bx-pager .bx-pager-item,
-.accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-controls-auto-item, #productscategory_list .bx-wrapper .bx-pager .bx-pager-item,
-#productscategory_list .bx-wrapper .bx-controls-auto .bx-controls-auto-item {
-  display: inline-block;
-  *zoom: 1;
-  *display: inline;
-}
-#crossselling_list .bx-wrapper .bx-pager.bx-default-pager a, .accessories-block .block_content .bx-wrapper .bx-pager.bx-default-pager a, #productscategory_list .bx-wrapper .bx-pager.bx-default-pager a {
-  text-indent: -9999px;
-  display: block;
-  width: 10px;
-  height: 10px;
-  margin: 0 5px;
-  background: #000;
-  outline: 0;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  -ms-border-radius: 5px;
-  -o-border-radius: 5px;
-  border-radius: 5px;
-}
-#crossselling_list .bx-wrapper .bx-pager.bx-default-pager a:hover,
-#crossselling_list .bx-wrapper .bx-pager.bx-default-pager a.active, .accessories-block .block_content .bx-wrapper .bx-pager.bx-default-pager a:hover,
-.accessories-block .block_content .bx-wrapper .bx-pager.bx-default-pager a.active, #productscategory_list .bx-wrapper .bx-pager.bx-default-pager a:hover,
-#productscategory_list .bx-wrapper .bx-pager.bx-default-pager a.active {
-  background: #000;
-}
-#crossselling_list .bx-wrapper .bx-controls-direction a, .accessories-block .block_content .bx-wrapper .bx-controls-direction a, #productscategory_list .bx-wrapper .bx-controls-direction a {
-  margin-top: 38px;
-  height: 20px;
-  width: 20px;
-  line-height: 0;
-  position: absolute;
-  top: 40%;
-  margin-top: -10px;
-  font-size: 0;
-  overflow: hidden;
-}
-#crossselling_list .bx-wrapper .bx-controls-direction a:before, .accessories-block .block_content .bx-wrapper .bx-controls-direction a:before, #productscategory_list .bx-wrapper .bx-controls-direction a:before {
-  padding-left: 2px;
-  color: #c0c0c0;
-  font-family: "FontAwesome";
-  font-size: 20px;
-  line-height: 22px;
-}
-#crossselling_list .bx-wrapper .bx-controls-direction a:hover:before, .accessories-block .block_content .bx-wrapper .bx-controls-direction a:hover:before, #productscategory_list .bx-wrapper .bx-controls-direction a:hover:before {
-  color: #333333;
-}
-#crossselling_list .bx-next, .accessories-block .block_content .bx-next, #productscategory_list .bx-next {
-  right: 10px;
-}
-#crossselling_list .bx-next:before, .accessories-block .block_content .bx-next:before, #productscategory_list .bx-next:before {
-  content: "";
-}
-#crossselling_list .bx-prev, .accessories-block .block_content .bx-prev, #productscategory_list .bx-prev {
-  left: 10px;
-}
-#crossselling_list .bx-prev:before, .accessories-block .block_content .bx-prev:before, #productscategory_list .bx-prev:before {
-  content: "";
-}
-#crossselling_list .bx-wrapper .bx-controls-direction a.disabled, .accessories-block .block_content .bx-wrapper .bx-controls-direction a.disabled, #productscategory_list .bx-wrapper .bx-controls-direction a.disabled {
-  display: none;
-}
-#crossselling_list .bx-wrapper .bx-controls-auto, .accessories-block .block_content .bx-wrapper .bx-controls-auto, #productscategory_list .bx-wrapper .bx-controls-auto {
-  text-align: center;
-}
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-start, .accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-start, #productscategory_list .bx-wrapper .bx-controls-auto .bx-start {
-  display: block;
-  text-indent: -9999px;
-  width: 10px;
-  height: 11px;
-  outline: 0;
-  background: url(images/controls.png) -86px -11px no-repeat;
-  margin: 0 3px;
-}
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-start:hover,
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-start.active, .accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-start:hover,
-.accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-start.active, #productscategory_list .bx-wrapper .bx-controls-auto .bx-start:hover,
-#productscategory_list .bx-wrapper .bx-controls-auto .bx-start.active {
-  background-position: -86px 0;
-}
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-stop, .accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-stop, #productscategory_list .bx-wrapper .bx-controls-auto .bx-stop {
-  display: block;
-  text-indent: -9999px;
-  width: 9px;
-  height: 11px;
-  outline: 0;
-  background: url(images/controls.png) -86px -44px no-repeat;
-  margin: 0 3px;
-}
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-stop:hover,
-#crossselling_list .bx-wrapper .bx-controls-auto .bx-stop.active, .accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-stop:hover,
-.accessories-block .block_content .bx-wrapper .bx-controls-auto .bx-stop.active, #productscategory_list .bx-wrapper .bx-controls-auto .bx-stop:hover,
-#productscategory_list .bx-wrapper .bx-controls-auto .bx-stop.active {
-  background-position: -86px -33px;
-}
-#crossselling_list .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager, .accessories-block .block_content .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager, #productscategory_list .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
-  text-align: left;
-  width: 80%;
-}
-#crossselling_list .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto, .accessories-block .block_content .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto, #productscategory_list .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
-  right: 0;
-  width: 35px;
-}
-#crossselling_list .bx-wrapper .bx-caption, .accessories-block .block_content .bx-wrapper .bx-caption, #productscategory_list .bx-wrapper .bx-caption {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  background: #666\9;
-  background: rgba(80, 80, 80, 0);
-  width: 100%;
-}
-#crossselling_list .bx-wrapper .bx-caption span, .accessories-block .block_content .bx-wrapper .bx-caption span, #productscategory_list .bx-wrapper .bx-caption span {
-  color: white;
-  font-family: Arial, Helvetica, sans-serif;
-  display: block;
-  font-size: .85em;
-  padding: 10px;
-}
+/*
+Syntax error: Undefined mixin 'border-radius'.
+        on line 85 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss, in `border-radius'
+        from line 85 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss
+
+Backtrace:
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss:85:in `border-radius'
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss:85
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:253:in `visit_mixin'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:128:in `visit_root'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/root_node.rb:20:in `render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:315:in `_render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:262:in `render'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:140:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:139:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/logger.rb:45:in `red'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:138:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:118:in `compile_if_required'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:103:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `each'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:100:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/update_project.rb:45:in `perform'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/base.rb:18:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/project_base.rb:19:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:43:in `perform!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:15:in `run!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:30
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44:in `call'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44
+/usr/share/koala/bin/compass:18:in `load'
+/usr/share/koala/bin/compass:18
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "Syntax error: Undefined mixin 'border-radius'.\A         on line 85 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss, in `border-radius'\A         from line 85 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/jquery/jquery.bxslider.scss"; }
diff --git a/themes/default-bootstrap/css/modules/blockcart/blockcart.css b/themes/default-bootstrap/css/modules/blockcart/blockcart.css
index 4c5da1383..1c1f4eb6f 100644
--- a/themes/default-bootstrap/css/modules/blockcart/blockcart.css
+++ b/themes/default-bootstrap/css/modules/blockcart/blockcart.css
@@ -1,467 +1,65 @@
-/* Special style for block cart*/
-/*******************************************************************
-					Cart Block Styles
-********************************************************************/
-#cart_block #cart_block_list .deleteCustomizableProduct, #cart_block #cart_block_list .remove_link {
-  position: absolute;
-  right: 10px;
-  top: 19px;
-}
-#cart_block #cart_block_list .remove_link a, #cart_block #cart_block_list .ajax_cart_block_remove_link {
-  color: #777777;
-}
-#cart_block #cart_block_list .remove_link a:before, #cart_block #cart_block_list .ajax_cart_block_remove_link:before {
-  display: inline-block;
-  content: "";
-  font-family: "FontAwesome";
-  font-size: 18px;
-  line-height: 18px;
-}
-#cart_block #cart_block_list .remove_link a:hover, #cart_block #cart_block_list .ajax_cart_block_remove_link:hover {
-  color: #515151;
-}
-#cart_block .cart-images {
-  float: left;
-  margin-right: 20px;
-}
-#cart_block .cart-info {
-  overflow: hidden;
-  position: relative;
-  padding-right: 20px;
-}
-#cart_block .cart-info .product-name {
-  padding-bottom: 15px;
-  margin-top: -4px;
-}
-#cart_block .cart-info .product-name a {
-  font-size: 13px;
-  line-height: 18px;
-  display: inline-block;
-}
-#cart_block .cart-info .quantity-formated {
-  display: inline-block;
-  color: #9c9b9b;
-  text-transform: uppercase;
-}
-#cart_block dt {
-  font-weight: normal;
-  overflow: hidden;
-  padding: 20px 10px 16px 20px;
-  position: relative;
-}
-#cart_block dd {
-  position: relative;
-}
-#cart_block dd li {
-  padding: 10px 20px;
-}
-#cart_block dd li .deleteCustomizableProduct {
-  top: 12px !important;
-  right: 15px !important;
-}
-#cart_block #cart_block_no_products {
-  margin: 0;
-  padding: 10px 20px;
-}
-#cart_block #cart-prices {
-  border-top: 1px solid #d6d4d4;
-  font-weight: bold;
-  padding: 10px 20px 22px 20px;
-}
-#cart_block #cart-prices .cart-prices-line {
-  overflow: hidden;
-  border-bottom: 1px solid #515151;
-  padding: 7px 0;
-}
-#cart_block #cart-prices .cart-prices-line.last-line {
-  border: none;
-}
-#cart_block #cart-buttons {
-  overflow: hidden;
-  padding: 20px 20px 10px 20px;
-  margin: 0;
-  background: #f6f6f6;
-}
-#cart_block #cart-buttons a {
-  float: left;
-  margin-bottom: 10px;
-  margin-right: 10px;
-}
-#cart_block #cart-buttons a#button_order_cart {
-  margin-right: 0;
-  background: #43b155;
-  border-color: #399b49 #369946 #208931 #369946;
-}
-#cart_block #cart-buttons a#button_order_cart span {
-  border-color: #73ca77;
-}
-#cart_block #cart-buttons a#button_order_cart:hover {
-  background: #359144;
-  color: white;
-}
+/*
+Syntax error: Undefined mixin 'border-radius'.
+        on line 260 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss, in `border-radius'
+        from line 260 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
 
-/*******************************************************************
-					Cart Block(Header) Styles
-********************************************************************/
-#header #cart_block {
-  z-index: 10;
-  display: none;
-  position: absolute;
-  right: 0;
-  top: 95px;
-  height: auto;
-  width: 270px;
-  background: #484848;
-  color: white;
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  #header #cart_block {
-    top: 69px;
-  }
-}
-@media (max-width: 479px) {
-  #header #cart_block {
-    top: 44px;
-    left: 50%;
-    margin-left: -135px;
-  }
-}
-#header #cart_block a {
-  color: white;
-}
-#header #cart_block a:hover {
-  color: #9c9b9b;
-}
-#header #cart_block #cart_block_list .remove_link a, #header #cart_block #cart_block_list .ajax_cart_block_remove_link {
-  color: white;
-  outline: none;
-  text-decoration: none;
-}
-#header #cart_block #cart_block_list .remove_link a:hover, #header #cart_block #cart_block_list .ajax_cart_block_remove_link:hover {
-  color: #9c9b9b;
-}
-#header #cart_block .price {
-  color: white;
-}
-#header #cart_block dt {
-  background: url(../../../img/cart-shadow.png) repeat-x;
-}
-#header #cart_block dt.first_item {
-  background: none;
-}
-#header #cart_block dd {
-  background: url(../../../img/cart-shadow.png) repeat-x;
-}
-#header #cart_block .product-atributes {
-  padding-bottom: 10px;
-  font-size: 11px;
-}
-#header #cart_block .product-atributes a {
-  color: #9c9b9b;
-}
-#header #cart_block .product-atributes a:hover {
-  color: white;
-}
-#header #cart_block #cart-prices {
-  border: none;
-  background: url(../../../img/cart-shadow.png) repeat-x #3d3d3d;
-}
-#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;
-}
-
-#cart_block #cart_block_shipping_cost,
-#cart_block #cart_block_total,
-#cart_block #cart_block_wrapping_cost {
-  float: right;
-}
-
-#cart_block table#vouchers {
-  clear: both;
-  width: 80%;
-  margin: 0 auto;
-  margin-bottom: 10px;
-}
-#cart_block table#vouchers tr td {
-  padding: 2px;
-}
-#cart_block table#vouchers tr td.quantity {
-  margin-right: 5px;
-  min-width: 18px;
-}
-#cart_block table#vouchers tr td.delete {
-  padding-left: 0;
-  padding-right: 0;
-  text-align: right;
-  width: 15px;
-}
-
-/*****************************************************************************
-					Layer Cart Css
-*****************************************************************************/
-.layer_cart_overlay {
-  background-color: #000;
-  display: none;
-  height: 100%;
-  left: 0;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 98;
-  opacity: .20;
-  -moz-opacity: .20;
-  filter: alpha(opacity=20);
-}
-
-* html .layer_cart_overlay {
-  filter: alpha(opacity=20);
-  position: absolute;
-  left: 0;
-  margin-left: -160px;
-}
-
-#layer_cart {
-  background-color: white;
-  position: absolute;
-  display: none;
-  z-index: 99;
-  width: 84%;
-  margin-right: 8%;
-  margin-left: 8%;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  -ms-border-radius: 4px;
-  -o-border-radius: 4px;
-  border-radius: 4px;
-}
-#layer_cart .layer_cart_product {
-  padding: 30px 30px 30px 30px;
-  overflow: hidden;
-  position: static;
-}
-#layer_cart .layer_cart_product h2 {
-  font: 400 23px/29px Arial, Helvetica, sans-serif;
-  color: #46a74e;
-  margin-bottom: 22px;
-  padding-right: 100px;
-}
-@media (max-width: 767px) {
-  #layer_cart .layer_cart_product h2 {
-    font-size: 18px;
-    padding-right: 0;
-    line-height: normal;
-  }
-}
-#layer_cart .layer_cart_product h2 i {
-  font-size: 30px;
-  line-height: 30px;
-  float: left;
-  padding-right: 8px;
-}
-@media (max-width: 767px) {
-  #layer_cart .layer_cart_product h2 i {
-    font-size: 22px;
-    line-height: 22px;
-  }
-}
-#layer_cart .layer_cart_product .product-image-container {
-  max-width: 178px;
-  border: 1px solid #d6d4d4;
-  padding: 5px;
-  float: left;
-  margin-right: 30px;
-}
-@media (max-width: 480px) {
-  #layer_cart .layer_cart_product .product-image-container {
-    float: none;
-    margin-right: 0;
-    margin-bottom: 10px;
-  }
-}
-#layer_cart .layer_cart_product .layer_cart_product_info {
-  padding: 38px 0 0 0;
-}
-#layer_cart .layer_cart_product .layer_cart_product_info #layer_cart_product_title {
-  display: block;
-  padding-bottom: 8px;
-}
-#layer_cart .layer_cart_product .layer_cart_product_info > div {
-  padding-bottom: 7px;
-}
-#layer_cart .layer_cart_product .layer_cart_product_info > div strong {
-  padding-right: 3px;
-}
-#layer_cart .layer_cart_cart {
-  background: #fafafa;
-  border-left: 1px solid #d6d4d4;
-  padding: 21px 30px 170px 30px;
-  -webkit-border-radius: 0px 4px 4px 0px;
-  -moz-border-radius: 0px 4px 4px 0px;
-  -ms-border-radius: 0px 4px 4px 0px;
-  -o-border-radius: 0px 4px 4px 0px;
-  border-radius: 0px 4px 4px 0px;
-  position: relative;
-}
-@media (min-width: 1200px) {
-  #layer_cart .layer_cart_cart {
-    min-height: 318px;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  #layer_cart .layer_cart_cart {
-    min-height: 360px;
-  }
-}
-@media (max-width: 991px) {
-  #layer_cart .layer_cart_cart {
-    border-left: none;
-    border-top: 1px solid #d6d4d4;
-  }
-}
-#layer_cart .layer_cart_cart h2 {
-  font: 400 23px/29px Arial, Helvetica, sans-serif;
-  color: #333333;
-  border-bottom: 1px solid #d6d4d4;
-  padding-bottom: 13px;
-  margin-bottom: 17px;
-}
-@media (max-width: 767px) {
-  #layer_cart .layer_cart_cart h2 {
-    font-size: 18px;
-  }
-}
-#layer_cart .layer_cart_cart .layer_cart_row {
-  padding: 0 0 7px 0;
-}
-#layer_cart .layer_cart_cart .button-container {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  width: 100%;
-  padding: 0px 30px 20px 30px;
-}
-#layer_cart .layer_cart_cart .button-container .btn {
-  margin-bottom: 10px;
-}
-#layer_cart .layer_cart_cart .button-container span.exclusive-medium {
-  margin-right: 5px;
-}
-#layer_cart .layer_cart_cart .button-container span.exclusive-medium i {
-  padding-right: 5px;
-  color: #777777;
-}
-#layer_cart .cross {
-  position: absolute;
-  right: 7px;
-  top: 8px;
-  width: 25px;
-  height: 25px;
-  cursor: pointer;
-  color: #333333;
-  z-index: 2;
-}
-#layer_cart .cross:before {
-  content: "";
-  display: block;
-  font-family: "FontAwesome";
-  font-size: 25px;
-  line-height: 25px;
-}
-#layer_cart .cross:hover {
-  color: #515151;
-}
-#layer_cart .continue {
-  cursor: pointer;
-}
-#layer_cart p {
-  padding: 0px;
-}
-
-/************************************************************************
-						Layer Cart Caroucel
-*************************************************************************/
-#layer_cart .crossseling .crossseling-content {
-  border-top: 1px solid #d6d4d4;
-  padding: 26px 30px 40px 30px;
-  position: relative;
-}
-#layer_cart .crossseling h2 {
-  font: 400 23px/26px Arial, Helvetica, sans-serif;
-  color: #333333;
-  margin-bottom: 25px;
-}
-#layer_cart .crossseling #blockcart_list {
-  max-width: 773px;
-  width: 84%;
-  margin: 0 auto;
-  overflow: hidden;
-}
-#layer_cart .crossseling #blockcart_list ul {
-  display: block;
-}
-#layer_cart .crossseling #blockcart_list ul li {
-  float: left;
-  width: 178px;
-  margin: 0 0px 0 0;
-}
-#layer_cart .crossseling #blockcart_list ul li .product-image-container {
-  border: 1px solid #d6d4d4;
-  text-align: center;
-  padding: 5px;
-  margin-bottom: 15px;
-}
-#layer_cart .crossseling #blockcart_list ul li .product-image-container img {
-  width: 100%;
-}
-#layer_cart .crossseling #blockcart_list ul li .product-name {
-  padding-bottom: 5px;
-}
-#layer_cart .crossseling #blockcart_list ul li .product-name a {
-  font-size: 15px;
-  line-height: 20px;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev, #layer_cart .crossseling #blockcart_list a.bx-next {
-  display: block;
-  font-family: "FontAwesome";
-  font-size: 20px;
-  line-height: 20px;
-  width: 20px;
-  height: 20px;
-  color: #333333;
-  text-indent: -5000px;
-  position: absolute;
-  top: 45%;
-  margin-top: -20px;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev:after, #layer_cart .crossseling #blockcart_list a.bx-next:after {
-  display: block;
-  text-indent: 0;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev:hover, #layer_cart .crossseling #blockcart_list a.bx-next:hover {
-  color: #c0c0c0;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev.disabled, #layer_cart .crossseling #blockcart_list a.bx-next.disabled {
-  display: none;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev {
-  left: 5%;
-}
-#layer_cart .crossseling #blockcart_list a.bx-prev:after {
-  content: "";
-}
-#layer_cart .crossseling #blockcart_list a.bx-next {
-  right: 5%;
-}
-#layer_cart .crossseling #blockcart_list a.bx-next:after {
-  content: "";
-}
-#layer_cart .crossseling #blockcart_list .bx-controls {
-  overflow: hidden;
-}
+Backtrace:
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss:260:in `border-radius'
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss:260
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:253:in `visit_mixin'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:128:in `visit_root'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/root_node.rb:20:in `render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:315:in `_render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:262:in `render'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:140:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:139:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/logger.rb:45:in `red'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:138:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:118:in `compile_if_required'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:103:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `each'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:100:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/update_project.rb:45:in `perform'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/base.rb:18:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/project_base.rb:19:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:43:in `perform!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:15:in `run!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:30
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44:in `call'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44
+/usr/share/koala/bin/compass:18:in `load'
+/usr/share/koala/bin/compass:18
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "Syntax error: Undefined mixin 'border-radius'.\A         on line 260 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss, in `border-radius'\A         from line 260 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/modules/blockcart/blockcart.scss"; }
diff --git a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
index 7ad7482d4..ca95d1268 100644
--- a/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
+++ b/themes/default-bootstrap/css/modules/blockcontact/blockcontact.css
@@ -1,26 +1,19 @@
 /* block CONTACT ******************************************************************************* */
 @media (max-width: 767px) {
   #contact_block {
-    margin-bottom: 20px;
-  }
-}
+    margin-bottom: 20px; } }
 #contact_block .label {
-  display: none;
-}
+  display: none; }
 #contact_block .block_content {
   color: #888888;
-  padding: 0 20px 20px;
-}
+  padding: 0 20px 20px; }
 #contact_block p {
-  margin-bottom: 4px;
-}
+  margin-bottom: 4px; }
 #contact_block p.tel {
   font: 400 17px/21px Arial, Helvetica, sans-serif;
   color: white;
-  margin-bottom: 6px;
-}
-#contact_block p.tel i {
-  font-size: 25px;
-  vertical-align: -2px;
-  padding-right: 10px;
-}
+  margin-bottom: 6px; }
+  #contact_block p.tel i {
+    font-size: 25px;
+    vertical-align: -2px;
+    padding-right: 10px; }
diff --git a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
index 65e0089d2..457587dd3 100644
--- a/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
+++ b/themes/default-bootstrap/css/modules/homeslider/bx_styles.css
@@ -21,19 +21,15 @@
   max-width: 779px;
   position: relative;
   z-index: 1;
-  float: left;
-}
-@media (max-width: 767px) {
-  #homepage-slider {
-    width: 100%;
-    max-width: 100%;
-    padding-top: 20px;
-  }
-}
-#homepage-slider #homeslider {
-  margin: 0 auto;
-  padding: 0;
-}
+  float: left; }
+  @media (max-width: 767px) {
+    #homepage-slider {
+      width: 100%;
+      max-width: 100%;
+      padding-top: 20px; } }
+  #homepage-slider #homeslider {
+    margin: 0 auto;
+    padding: 0; }
 
 /*****************************************************************************
 						BXSlider Styles
@@ -48,179 +44,149 @@
   /* DIRECTION CONTROLS (NEXT / PREV) */
   /* AUTO CONTROLS (START / STOP) */
   /* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */
-  /* IMAGE CAPTIONS */
-}
-#homepage-slider .bx-wrapper {
-  position: relative;
-  padding: 0;
-  *zoom: 1;
-}
-#homepage-slider .bx-wrapper a {
-  display: block;
-}
-#homepage-slider .bx-wrapper img {
-  display: block;
-  max-width: 100%;
-}
-#homepage-slider .bx-wrapper .bx-viewport {
-  width: 100%;
-}
-#homepage-slider .bx-wrapper .bx-pager,
-#homepage-slider .bx-wrapper .bx-controls-auto {
-  position: absolute;
-  bottom: -30px;
-  width: 100%;
-}
-#homepage-slider .bx-wrapper .bx-loading {
-  min-height: 50px;
-  background: url(images/bx_loader.gif) center center no-repeat white;
-  height: 100%;
-  width: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2000;
-}
-#homepage-slider .bx-wrapper .bx-pager {
-  text-align: center;
-  font-size: .85em;
-  font-family: Arial, Helvetica, sans-serif;
-  font-weight: bold;
-  color: #666;
-  padding-top: 20px;
-}
-#homepage-slider .bx-wrapper .bx-pager .bx-pager-item,
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-controls-auto-item {
-  display: inline-block;
-  *zoom: 1;
-  *display: inline;
-}
-#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a {
-  background: #666;
-  text-indent: -9999px;
-  display: block;
-  width: 10px;
-  height: 10px;
-  margin: 0 5px;
-  outline: 0;
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-}
-#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a:hover,
-#homepage-slider .bx-wrapper .bx-pager.bx-default-pager a.active {
-  background: #000;
-}
-#homepage-slider .bx-wrapper .bx-prev {
-  right: 60px;
-}
-#homepage-slider .bx-wrapper .bx-prev:after {
-  content: "";
-}
-#homepage-slider .bx-wrapper .bx-next {
-  right: 10px;
-}
-#homepage-slider .bx-wrapper .bx-next:after {
-  content: "";
-}
-#homepage-slider .bx-wrapper .bx-controls-direction a {
-  position: absolute;
-  bottom: 10px;
-  outline: 0;
-  width: 52px;
-  height: 52px;
-  text-indent: -9999px;
-  z-index: 9999;
-  border: 2px solid white;
-}
-#homepage-slider .bx-wrapper .bx-controls-direction a:before {
-  height: 48px;
-  width: 48px;
-  display: block;
-  background: white;
-  content: ".";
-  opacity: 0.14;
-  text-indent: -9999px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  z-index: 1;
-}
-#homepage-slider .bx-wrapper .bx-controls-direction a:after {
-  display: block;
-  width: 48px;
-  height: 48px;
-  color: white;
-  text-indent: 0;
-  text-align: center;
-  font-size: 21px;
-  font-family: "FontAwesome";
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 2;
-  padding: 16px 0 0 0;
-}
-#homepage-slider .bx-wrapper .bx-controls-direction a:hover:before {
-  background: #333333;
-  opacity: 0.83;
-}
-#homepage-slider .bx-wrapper .bx-controls-direction a.disabled {
-  display: none;
-}
-#homepage-slider .bx-wrapper .bx-controls-auto {
-  text-align: center;
-}
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-start {
-  display: block;
-  text-indent: -9999px;
-  width: 10px;
-  height: 11px;
-  outline: 0;
-  background: url(images/controls.png) -86px -11px no-repeat;
-  margin: 0 3px;
-}
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-start:hover,
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-start.active {
-  background-position: -86px 0;
-}
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop {
-  display: block;
-  text-indent: -9999px;
-  width: 9px;
-  height: 11px;
-  outline: 0;
-  background: url(images/controls.png) -86px -44px no-repeat;
-  margin: 0 3px;
-}
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop:hover,
-#homepage-slider .bx-wrapper .bx-controls-auto .bx-stop.active {
-  background-position: -86px -33px;
-}
-#homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
-  text-align: left;
-  width: 80%;
-}
-#homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
-  right: 0;
-  width: 35px;
-}
-#homepage-slider .bx-wrapper .bx-caption {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  background: #666\9;
-  background: rgba(80, 80, 80, 0);
-  width: 100%;
-}
-#homepage-slider .bx-wrapper .bx-caption span {
-  color: white;
-  font-family: Arial, Helvetica, sans-serif;
-  display: block;
-  font-size: .85em;
-  padding: 10px;
-}
+  /* IMAGE CAPTIONS */ }
+  #homepage-slider .bx-wrapper {
+    position: relative;
+    padding: 0;
+    *zoom: 1; }
+    #homepage-slider .bx-wrapper a {
+      display: block; }
+    #homepage-slider .bx-wrapper img {
+      display: block;
+      max-width: 100%; }
+  #homepage-slider .bx-wrapper .bx-viewport {
+    width: 100%; }
+  #homepage-slider .bx-wrapper .bx-pager,
+  #homepage-slider .bx-wrapper .bx-controls-auto {
+    position: absolute;
+    bottom: -30px;
+    width: 100%; }
+  #homepage-slider .bx-wrapper .bx-loading {
+    min-height: 50px;
+    background: url(images/bx_loader.gif) center center no-repeat white;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2000; }
+  #homepage-slider .bx-wrapper .bx-pager {
+    text-align: center;
+    font-size: .85em;
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: bold;
+    color: #666;
+    padding-top: 20px; }
+  #homepage-slider .bx-wrapper .bx-pager .bx-pager-item,
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-controls-auto-item {
+    display: inline-block;
+    *zoom: 1;
+    *display: inline; }
+  #homepage-slider .bx-wrapper .bx-pager.bx-default-pager a {
+    background: #666;
+    text-indent: -9999px;
+    display: block;
+    width: 10px;
+    height: 10px;
+    margin: 0 5px;
+    outline: 0;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    border-radius: 5px; }
+  #homepage-slider .bx-wrapper .bx-pager.bx-default-pager a:hover,
+  #homepage-slider .bx-wrapper .bx-pager.bx-default-pager a.active {
+    background: #000; }
+  #homepage-slider .bx-wrapper .bx-prev {
+    right: 60px; }
+    #homepage-slider .bx-wrapper .bx-prev:after {
+      content: ""; }
+  #homepage-slider .bx-wrapper .bx-next {
+    right: 10px; }
+    #homepage-slider .bx-wrapper .bx-next:after {
+      content: ""; }
+  #homepage-slider .bx-wrapper .bx-controls-direction a {
+    position: absolute;
+    bottom: 10px;
+    outline: 0;
+    width: 52px;
+    height: 52px;
+    text-indent: -9999px;
+    z-index: 9999;
+    border: 2px solid white; }
+    #homepage-slider .bx-wrapper .bx-controls-direction a:before {
+      height: 48px;
+      width: 48px;
+      display: block;
+      background: white;
+      content: ".";
+      opacity: 0.14;
+      text-indent: -9999px;
+      position: absolute;
+      left: 0;
+      top: 0;
+      z-index: 1; }
+    #homepage-slider .bx-wrapper .bx-controls-direction a:after {
+      display: block;
+      width: 48px;
+      height: 48px;
+      color: white;
+      text-indent: 0;
+      text-align: center;
+      font-size: 21px;
+      font-family: "FontAwesome";
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 2;
+      padding: 16px 0 0 0; }
+    #homepage-slider .bx-wrapper .bx-controls-direction a:hover:before {
+      background: #333333;
+      opacity: 0.83; }
+  #homepage-slider .bx-wrapper .bx-controls-direction a.disabled {
+    display: none; }
+  #homepage-slider .bx-wrapper .bx-controls-auto {
+    text-align: center; }
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-start {
+    display: block;
+    text-indent: -9999px;
+    width: 10px;
+    height: 11px;
+    outline: 0;
+    background: url(images/controls.png) -86px -11px no-repeat;
+    margin: 0 3px; }
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-start:hover,
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-start.active {
+    background-position: -86px 0; }
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-stop {
+    display: block;
+    text-indent: -9999px;
+    width: 9px;
+    height: 11px;
+    outline: 0;
+    background: url(images/controls.png) -86px -44px no-repeat;
+    margin: 0 3px; }
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-stop:hover,
+  #homepage-slider .bx-wrapper .bx-controls-auto .bx-stop.active {
+    background-position: -86px -33px; }
+  #homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager {
+    text-align: left;
+    width: 80%; }
+  #homepage-slider .bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto {
+    right: 0;
+    width: 35px; }
+  #homepage-slider .bx-wrapper .bx-caption {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background: #666666 \9;
+    background: rgba(80, 80, 80, 0.75);
+    width: 100%; }
+  #homepage-slider .bx-wrapper .bx-caption span {
+    color: white;
+    font-family: Arial, Helvetica, sans-serif;
+    display: block;
+    font-size: .85em;
+    padding: 10px; }
 
 .ie8 #homepage-slider .bx-wrapper .bx-controls-direction a:before {
-  background: #333333;
-}
+  background: #333333; }
diff --git a/themes/default-bootstrap/css/product_list.css b/themes/default-bootstrap/css/product_list.css
index 79ca7f720..3682aaa92 100644
--- a/themes/default-bootstrap/css/product_list.css
+++ b/themes/default-bootstrap/css/product_list.css
@@ -1,540 +1,87 @@
-/*******************************************************
-			 Product list Styles
-********************************************************/
-ul.product_list .availability span {
-  display: inline-block;
-  color: white;
-  font-weight: bold;
-  padding: 3px 8px 4px 8px;
-  margin-bottom: 20px;
-}
-ul.product_list .availability span.available-now {
-  background: #46a74e;
-  border: 1px solid #36943e;
-}
-ul.product_list .availability span.out-of-stock {
-  background: #ff7430;
-  border: 1px solid #ea5e1a;
-}
-ul.product_list .color-list-container {
-  margin-bottom: 12px;
-}
-ul.product_list .color-list-container ul li {
-  display: inline-block;
-  border: 1px solid #d6d4d4;
-}
-ul.product_list .color-list-container ul li a {
-  display: block;
-  width: 23px;
-  height: 23px;
-  margin: 1px;
-}
-ul.product_list .product-image-container {
-  text-align: center;
-}
-ul.product_list .product-image-container img {
-  margin: 0 auto;
-}
-ul.product_list .product-image-container .quick-view {
-  font: 700 13px/16px Arial, Helvetica, sans-serif;
-  color: #777676;
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  margin: -21px 0 0 -53px;
-  padding: 13px 0 0;
-  background: rgba(255, 255, 255, 0.82);
-  width: 107px;
-  height: 43px;
-  text-align: center;
-  -webkit-box-shadow: rgba(0, 0, 0, 0.16) 0 2px 8px;
-  -moz-box-shadow: rgba(0, 0, 0, 0.16) 0 2px 8px;
-  box-shadow: rgba(0, 0, 0, 0.16) 0 2px 8px;
-}
-@media (min-width: 1200px) {
-  ul.product_list .product-image-container .quick-view {
-    display: none;
-  }
-}
-@media (max-width: 767px) {
-  ul.product_list .product-image-container .quick-view {
-    display: none;
-  }
-}
-ul.product_list .comments_note {
-  text-align: left;
-  overflow: hidden;
-}
-ul.product_list .comments_note .star_content {
-  float: left;
-}
-ul.product_list .comments_note .nb-comments {
-  overflow: hidden;
-  font-style: italic;
-}
+/*
+Syntax error: Undefined mixin 'box-shadow'.
+        on line 66 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss, in `box-shadow'
+        from line 66 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss
 
-.ie8 .quick-view {
-  background: #fff;
-  border: 1px solid #d6d4d4;
-}
-
-/*******************************************************
-			 Product list(Grid) Styles 
-********************************************************/
-ul.product_list.grid > li {
-  margin-bottom: 20px;
-  text-align: center;
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  ul.product_list.grid > li {
-    width: 50%;
-    float: left;
-  }
-}
-ul.product_list.grid > li .product-container {
-  background: white;
-  padding: 0;
-  position: relative;
-}
-ul.product_list.grid > li .product-container .product-image-container {
-  border: 1px solid #d6d4d4;
-  padding: 9px;
-  margin-bottom: 13px;
-  position: relative;
-}
-@media (max-width: 767px) {
-  ul.product_list.grid > li .product-container .product-image-container {
-    max-width: 290px;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-ul.product_list.grid > li .product-container .product-image-container .content_price {
-  position: absolute;
-  left: 0;
-  bottom: -1px;
-  width: 100%;
-  background: url(../img/price-container-bg.png);
-  padding: 9px 0;
-  display: none;
-}
-ul.product_list.grid > li .product-container .product-image-container .content_price span {
-  color: white;
-}
-ul.product_list.grid > li .product-container .product-image-container .content_price span.old-price {
-  color: #b1b0b0;
-}
-ul.product_list.grid > li .product-container h5 {
-  padding: 0 15px 7px 15px;
-  min-height: 53px;
-}
-@media (min-width: 1200px) {
-  ul.product_list.grid > li .product-container .comments_note {
-    display: none;
-  }
-}
-ul.product_list.grid > li .product-container .comments_note .star_content {
-  margin-left: 59px;
-  margin-right: 3px;
-  margin-bottom: 12px;
-}
-ul.product_list.grid > li .product-container .product-desc {
-  display: none;
-}
-ul.product_list.grid > li .product-container .content_price {
-  padding-bottom: 9px;
-  line-height: 21px;
-}
-ul.product_list.grid > li .product-container .old-price, ul.product_list.grid > li .product-container .price, ul.product_list.grid > li .product-container .price-percent-reduction {
-  display: inline-block;
-}
-ul.product_list.grid > li .product-container .product-flags {
-  display: none;
-}
-ul.product_list.grid > li .product-container .old-price {
-  margin-right: 5px;
-}
-ul.product_list.grid > li .product-container .button-container {
-  margin-bottom: 14px;
-}
-@media (min-width: 1200px) {
-  ul.product_list.grid > li .product-container .button-container {
-    display: none;
-  }
-}
-ul.product_list.grid > li .product-container .button-container .ajax_add_to_cart_button, ul.product_list.grid > li .product-container .button-container span.button {
-  margin-right: 6px;
-}
-ul.product_list.grid > li .product-container .functional-buttons {
-  background: url(../img/functional-bt-shadow.png) repeat-x;
-  padding: 11px 0 5px;
-}
-@media (min-width: 1200px) {
-  ul.product_list.grid > li .product-container .functional-buttons {
-    display: none;
-  }
-}
-ul.product_list.grid > li .product-container .functional-buttons div {
-  width: 50%;
-  float: left;
-  padding: 3px 0 4px 0;
-}
-ul.product_list.grid > li .product-container .functional-buttons div a, ul.product_list.grid > li .product-container .functional-buttons div label {
-  font-weight: bold;
-  color: #777676;
-  cursor: pointer;
-}
-ul.product_list.grid > li .product-container .functional-buttons div a:hover, ul.product_list.grid > li .product-container .functional-buttons div label:hover {
-  color: #000;
-}
-ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
-  border-right: 1px solid #d6d4d4;
-}
-ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
-  display: inline-block;
-  font-family: "FontAwesome";
-  content: "";
-  margin-right: 3px;
-}
-ul.product_list.grid > li .product-container .functional-buttons div.wishlist a.checked:before {
-  content: "";
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
-    border-right: 0;
-  }
-  ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
-    display: none;
-  }
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  ul.product_list.grid > li .product-container .functional-buttons div.wishlist {
-    border-right: 0;
-  }
-  ul.product_list.grid > li .product-container .functional-buttons div.wishlist a:before {
-    display: none;
-  }
-}
-ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
-  content: "";
-  display: inline-block;
-  font-family: "FontAwesome";
-  margin-right: 3px;
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
-    display: none;
-  }
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  ul.product_list.grid > li .product-container .functional-buttons div.compare a:before {
-    display: none;
-  }
-}
-ul.product_list.grid > li .product-container .functional-buttons div.compare a.checked:before {
-  content: "";
-}
-@media (min-width: 1200px) {
-  ul.product_list.grid > li.hovered {
-    margin-bottom: -300px;
-    padding-bottom: 226px;
-  }
-  ul.product_list.grid > li.hovered .product-container {
-    -webkit-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
-    -moz-box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
-    box-shadow: rgba(0, 0, 0, 0.17) 0 0 13px;
-    position: relative;
-    z-index: 10;
-  }
-  ul.product_list.grid > li.hovered .product-container .content_price {
-    display: none;
-  }
-  ul.product_list.grid > li.hovered .product-container .product-image-container .content_price {
-    display: block;
-  }
-  ul.product_list.grid > li.hovered .product-container .product-image-container .quick-view {
-    display: block;
-  }
-  ul.product_list.grid > li.hovered .product-container .functional-buttons, ul.product_list.grid > li.hovered .product-container .button-container, ul.product_list.grid > li.hovered .product-container .comments_note {
-    display: block;
-  }
-}
-@media (min-width: 992px) {
-  ul.product_list.grid > li.first-in-line {
-    clear: left;
-  }
-}
-@media (min-width: 480px) and (max-width: 991px) {
-  ul.product_list.grid > li.first-item-of-tablet-line {
-    clear: left;
-  }
-}
-
-@media (min-width: 1200px) {
-  #blockpack ul > li.last-line {
-    border: none;
-    padding-bottom: 0;
-    margin-bottom: 0;
-  }
-  #blockpack ul > li.last-line.hovered {
-    margin-bottom: -320px;
-    padding-bottom: 250px;
-  }
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  #blockpack ul > li.first-item-of-tablet-line {
-    clear: none;
-  }
-  #blockpack ul > li.first-item-of-mobile-line {
-    clear: left;
-  }
-}
-
-/*******************************************************
-			 Product list(List) Styles 
-********************************************************/
-@media (max-width: 479px) {
-  ul.product_list.list > li .left-block {
-    width: 100%;
-  }
-}
-ul.product_list.list > li .product-container {
-  border-top: 1px solid #d6d4d4;
-  padding: 30px 0 30px;
-}
-ul.product_list.list > li .product-image-container {
-  position: relative;
-  border: 1px solid #d6d4d4;
-  padding: 9px;
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .product-image-container {
-    max-width: 290px;
-    margin: 0 auto;
-  }
-}
-ul.product_list.list > li .product-image-container .content_price {
-  display: none !important;
-}
-ul.product_list.list > li .product-flags {
-  color: #333333;
-  margin: -5px 0 10px 0;
-}
-ul.product_list.list > li .product-flags .discount {
-  color: #f13340;
-}
-ul.product_list.list > li h5 {
-  padding-bottom: 8px;
-}
-ul.product_list.list > li .product-desc {
-  margin-bottom: 15px;
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .center-block {
-    width: 100%;
-  }
-}
-ul.product_list.list > li .center-block .comments_note {
-  margin-bottom: 12px;
-}
-@media (min-width: 992px) {
-  ul.product_list.list > li .right-block .right-block-content {
-    margin: 0;
-    border-left: 1px solid #d6d4d4;
-    padding-left: 15px;
-    padding-bottom: 16px;
-  }
-}
-@media (max-width: 991px) {
-  ul.product_list.list > li .right-block .right-block-content {
-    padding-top: 20px;
-  }
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .right-block .right-block-content {
-    padding-top: 5px;
-  }
-}
-ul.product_list.list > li .right-block .right-block-content .content_price {
-  padding-bottom: 10px;
-}
-@media (max-width: 991px) {
-  ul.product_list.list > li .right-block .right-block-content .content_price {
-    padding-top: 13px;
-    padding-bottom: 0;
-  }
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .right-block .right-block-content .content_price {
-    padding-top: 0;
-    width: 100%;
-  }
-}
-ul.product_list.list > li .right-block .right-block-content .content_price span {
-  display: inline-block;
-  margin-top: -4px;
-  margin-bottom: 14px;
-}
-ul.product_list.list > li .right-block .right-block-content .content_price span.old-price {
-  margin-right: 8px;
-}
-ul.product_list.list > li .right-block .right-block-content .button-container {
-  overflow: hidden;
-  padding-bottom: 20px;
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .right-block .right-block-content .button-container {
-    width: 100%;
-  }
-}
-ul.product_list.list > li .right-block .right-block-content .button-container .btn {
-  margin-bottom: 10px;
-}
-@media (min-width: 992px) {
-  ul.product_list.list > li .right-block .right-block-content .button-container .btn {
-    float: left;
-    clear: both;
-  }
-}
-@media (min-width: 992px) {
-  ul.product_list.list > li .right-block .right-block-content .functional-buttons {
-    overflow: hidden;
-  }
-}
-@media (max-width: 991px) {
-  ul.product_list.list > li .right-block .right-block-content .functional-buttons {
-    clear: both;
-  }
-  ul.product_list.list > li .right-block .right-block-content .functional-buttons > div {
-    float: left;
-    padding-top: 0 !important;
-    padding-right: 20px;
-  }
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li .right-block .right-block-content .functional-buttons {
-    float: none;
-    display: inline-block;
-  }
-  ul.product_list.list > li .right-block .right-block-content .functional-buttons a i, ul.product_list.list > li .right-block .right-block-content .functional-buttons a:before, ul.product_list.list > li .right-block .right-block-content .functional-buttons label i, ul.product_list.list > li .right-block .right-block-content .functional-buttons label:before {
-    display: none !important;
-  }
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons a {
-  font-weight: bold;
-  color: #777676;
-  cursor: pointer;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:before {
-  content: "";
-  font-family: "FontAwesome";
-  width: 30px;
-  height: 30px;
-  font-size: 15px;
-  text-align: center;
-  display: inline-block;
-  background: #929292;
-  color: white;
-  padding: 7px 0 0 0;
-  -webkit-border-radius: 100px;
-  -moz-border-radius: 100px;
-  -ms-border-radius: 100px;
-  -o-border-radius: 100px;
-  border-radius: 100px;
-  margin-right: 3px;
-  font-weight: normal;
-  margin-right: 7px;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:hover {
-  color: #333333;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a:hover:before {
-  background: #333333;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .wishlist a.checked:before {
-  content: "";
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare {
-  padding-top: 10px;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:before {
-  content: "";
-  display: inline-block;
-  font-family: "FontAwesome";
-  width: 30px;
-  height: 30px;
-  font-size: 15px;
-  text-align: center;
-  background: #929292;
-  -webkit-border-radius: 100px;
-  -moz-border-radius: 100px;
-  -ms-border-radius: 100px;
-  -o-border-radius: 100px;
-  border-radius: 100px;
-  margin-right: 3px;
-  padding: 6px 0 0 0;
-  color: white;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:hover {
-  color: #333333;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a:hover:before {
-  background: #333333;
-}
-ul.product_list.list > li .right-block .right-block-content .functional-buttons .compare a.checked:before {
-  background: white;
-  border: 1px solid #929292;
-  color: #929292;
-  padding-top: 5px;
-}
-@media (min-width: 1200px) {
-  ul.product_list.list > li:hover .product-image-container .quick-view {
-    display: block;
-  }
-}
-@media (max-width: 479px) {
-  ul.product_list.list > li {
-    text-align: center;
-  }
-}
-
-/*******************************************************
-			 Product list(Index page) Styles 
-********************************************************/
-#index ul.product_list.tab-pane > li {
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-}
-@media (min-width: 1200px) {
-  #index ul.product_list.tab-pane > li {
-    padding-bottom: 35px;
-    margin-bottom: 50px;
-  }
-}
-@media (min-width: 1200px) {
-  #index ul.product_list.tab-pane > li.hovered {
-    margin-bottom: -300px;
-  }
-}
-#index ul.product_list.tab-pane > li .availability {
-  display: none;
-}
-@media (min-width: 1200px) {
-  #index ul.product_list.tab-pane > li.last-line {
-    border: none;
-    padding-bottom: 0;
-    margin-bottom: 0;
-  }
-  #index ul.product_list.tab-pane > li.last-line.hovered {
-    margin-bottom: -300px;
-    padding-bottom: 235px;
-  }
-}
-@media (min-width: 480px) and (max-width: 767px) {
-  #index ul.product_list.tab-pane > li.first-item-of-tablet-line {
-    clear: none;
-  }
-  #index ul.product_list.tab-pane > li.first-item-of-mobile-line {
-    clear: left;
-  }
-}
+Backtrace:
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss:66:in `box-shadow'
+/home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss:66
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:253:in `visit_mixin'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:320:in `visit_rule'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `map'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:53:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:109:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:121:in `with_environment'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:108:in `visit_children'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:128:in `visit_root'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/base.rb:37:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:100:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `send'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/visitors/perform.rb:7:in `visit'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/tree/root_node.rb:20:in `render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:315:in `_render'
+/usr/share/koala/rubygems/gems/sass-3.2.9/lib/sass/../sass/engine.rb:262:in `render'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:140:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:139:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/logger.rb:45:in `red'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:138:in `compile'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:118:in `compile_if_required'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:103:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `each'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:101:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:126:in `timed'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/compiler.rb:100:in `run'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/update_project.rb:45:in `perform'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/base.rb:18:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/commands/project_base.rb:19:in `execute'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:43:in `perform!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/lib/compass/exec/sub_command_ui.rb:15:in `run!'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:30
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44:in `call'
+/usr/share/koala/rubygems/gems/compass-0.12.2/bin/compass:44
+/usr/share/koala/bin/compass:18:in `load'
+/usr/share/koala/bin/compass:18
+*/
+body:before {
+  white-space: pre;
+  font-family: monospace;
+  content: "Syntax error: Undefined mixin 'box-shadow'.\A         on line 66 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss, in `box-shadow'\A         from line 66 of /home/groussac/Documents/www/bootstrap/themes/default-bootstrap/sass/product_list.scss"; }
diff --git a/themes/default-bootstrap/discount.tpl b/themes/default-bootstrap/discount.tpl
index 4fa757d9b..9be1b0b30 100644
--- a/themes/default-bootstrap/discount.tpl
+++ b/themes/default-bootstrap/discount.tpl
@@ -22,7 +22,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My vouchers'}</span>{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My vouchers'}</span>{/capture}
 
 <h1 class="page-heading">
 	{l s='My vouchers'}
@@ -85,7 +85,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
+		<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'}
 			</span>
diff --git a/themes/default-bootstrap/guest-tracking.tpl b/themes/default-bootstrap/guest-tracking.tpl
index 25235feb1..405206a5b 100644
--- a/themes/default-bootstrap/guest-tracking.tpl
+++ b/themes/default-bootstrap/guest-tracking.tpl
@@ -65,7 +65,7 @@
 	{include file="$tpl_dir./errors.tpl"}
 	
 	{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>
+		<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':'UTF-8'}">{l s='page.'}</a></p>
 	{else}
 		<form method="post" action="{$action|escape:'html':'UTF-8'}#guestToCustomer" class="std">
 			<fieldset class="description_box box">
@@ -98,7 +98,7 @@
 {else}
 	{include file="$tpl_dir./errors.tpl"}
 	{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>
+		<p><img src="{$img_dir}icon/userinfo.gif" alt="{l s='Information'}" class="icon" /><a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='Click here to login to your customer account.'}</a><br /><br /></p>
 	{/if}
 	<form method="post" action="{$action|escape:'html':'UTF-8'}" class="std" id="guestTracking">
 		<fieldset class="description_box box">
diff --git a/themes/default-bootstrap/header.tpl b/themes/default-bootstrap/header.tpl
index 9b5ced3b0..d647bca05 100644
--- a/themes/default-bootstrap/header.tpl
+++ b/themes/default-bootstrap/header.tpl
@@ -31,10 +31,10 @@
 	<head>
 		<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'}" />
+		  <meta name="description" content="{$meta_description|escape:'html':'UTF-8'}" />
 		{/if}
 		{if isset($meta_keywords) AND $meta_keywords}
-		  <meta name="keywords" content="{$meta_keywords|escape:html:'UTF-8'}" />
+		  <meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
 		{/if}
 		<meta charset="utf-8" />
 		<meta name="generator" content="PrestaShop" />
diff --git a/themes/default-bootstrap/history.tpl b/themes/default-bootstrap/history.tpl
index 9cda53fba..8d5420cc2 100644
--- a/themes/default-bootstrap/history.tpl
+++ b/themes/default-bootstrap/history.tpl
@@ -24,7 +24,7 @@
 *}
 
 {capture name=path}
-	<a href="{$link->getPageLink('my-account', true)|escape:'html'}">
+	<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 		{l s='My account'}
 	</a>
 	<span class="navigation-pipe">{$navigationPipe}</span>
@@ -72,7 +72,7 @@
 							{/if}
 							<a 
 							class="color-myaccount" 
-							href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">
+							href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}');">
 								{Order::getUniqReferenceOf($order.id_order)}
 							</a>
 						</td>
@@ -96,7 +96,7 @@
 							{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'}" 
+								href="{$link->getPageLink('pdf-invoice', true, NULL, "id_order={$order.id_order}")|escape:'html':'UTF-8'}" 
 								title="{l s='Invoice'}" 
 								target="_blank">
 									<i class="icon-file-text large"></i>{l s='PDF'}
@@ -108,7 +108,7 @@
 						<td class="history_detail">
 							<a 
 							class="btn btn-default button button-small" 
-							href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html'}');">
+							href="javascript:showOrder(1, {$order.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}');">
 								<span>
 									{l s='Details'}<i class="icon-chevron-right right"></i>
 								</span>
@@ -116,12 +116,12 @@
 							{if isset($opc) && $opc}
 								<a 
 								class="link-button" 
-								href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" 
+								href="{$link->getPageLink('order-opc', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html':'UTF-8'}" 
 								title="{l s='Reorder'}">
 							{else}
 								<a 
 								class="link-button" 
-								href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html'}" 
+								href="{$link->getPageLink('order', true, NULL, "submitReorder&id_order={$order.id_order}")|escape:'html':'UTF-8'}" 
 								title="{l s='Reorder'}">
 							{/if}
 		                        <i class="icon-refresh"></i>{l s='Reorder'}
@@ -154,7 +154,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
+		<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'}
 			</span>
diff --git a/themes/default-bootstrap/identity.tpl b/themes/default-bootstrap/identity.tpl
index 6828248d7..7f8eb67b4 100644
--- a/themes/default-bootstrap/identity.tpl
+++ b/themes/default-bootstrap/identity.tpl
@@ -24,7 +24,7 @@
 *}
 
 {capture name=path}
-    <a href="{$link->getPageLink('my-account', true)|escape:'html'}">
+    <a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
         {l s='My account'}
     </a>
     <span class="navigation-pipe">
@@ -53,7 +53,7 @@
         <p class="required">
             <sup>*</sup>{l s='Required field'}
         </p>
-        <form action="{$link->getPageLink('identity', true)|escape:'html'}" method="post" class="std">
+        <form action="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" method="post" class="std">
             <fieldset>
                 <div class="clearfix">
                     <label>{l s='Title'}</label>
diff --git a/themes/default-bootstrap/js/jquery/resonsive_utilites.js b/themes/default-bootstrap/js/jquery/resonsive_utilites.js
index 46b7b1b53..8d0d6de34 100644
--- a/themes/default-bootstrap/js/jquery/resonsive_utilites.js
+++ b/themes/default-bootstrap/js/jquery/resonsive_utilites.js
@@ -92,11 +92,4 @@ function responsiveResize(){
 }
 
 $(document).ready(responsiveResize);
-$(window).resize(responsiveResize);
-
-//replace top banner to top of page, before #header
-$(document).ready(function(){
-	topBanner = $('body').find('#banner_block_top');
-	topBanner.remove();
-	topBanner.insertBefore('#header');
-});
\ No newline at end of file
+$(window).resize(responsiveResize);
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/bankwire/views/templates/front/payment_execution.tpl b/themes/default-bootstrap/modules/bankwire/views/templates/front/payment_execution.tpl
index 85d91206a..98eb491aa 100644
--- a/themes/default-bootstrap/modules/bankwire/views/templates/front/payment_execution.tpl
+++ b/themes/default-bootstrap/modules/bankwire/views/templates/front/payment_execution.tpl
@@ -35,7 +35,7 @@
 {else}
 
 
-<form action="{$link->getModuleLink('bankwire', 'validation', [], true)|escape:'html'}" method="post">
+<form action="{$link->getModuleLink('bankwire', 'validation', [], true)|escape:'html':'UTF-8'}" method="post">
 <div class="box cheque-box">
     <h3 class="page-subheading">{l s='Bank-wire payment.' mod='bankwire'}</h3>
     <p class="cheque-indent"><strong class="dark">{l s='You have chosen to pay by bank wire.' mod='bankwire'} {l s='Here is a short summary of your order:' mod='bankwire'}</strong></p>
@@ -70,7 +70,7 @@
     </p>
 </div>
 <p class="cart_navigation clearfix" id="cart_navigation">
-	<a href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Other payment methods' mod='bankwire'}</a>
+	<a href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html':'UTF-8'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Other payment methods' mod='bankwire'}</a>
     <button type="submit" class="button btn btn-default button-medium"><span>{l s='I confirm my order' mod='bankwire'}<i class="icon-chevron-right right"></i></span></button>
 </p>
 </form>
diff --git a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl
index b3c1d1a80..2386cea18 100644
--- a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl
+++ b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment.tpl
@@ -25,7 +25,7 @@
 <div class="row">
 	<div class="col-xs-12 col-md-6">
         <p class="payment_module">
-            <a class="bankwire" href="{$link->getModuleLink('bankwire', 'payment')|escape:'html'}" title="{l s='Pay by bank wire' mod='bankwire'}">{l s='Pay by bank wire' mod='bankwire'} <span>({l s='order process will be longer' mod='bankwire'})</span></a>
+            <a class="bankwire" href="{$link->getModuleLink('bankwire', 'payment')|escape:'html':'UTF-8'}" title="{l s='Pay by bank wire' mod='bankwire'}">{l s='Pay by bank wire' mod='bankwire'} <span>({l s='order process will be longer' mod='bankwire'})</span></a>
         </p>
     </div>
 </div>
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment_return.tpl b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment_return.tpl
index 9e6ca3dce..436b9cdf1 100644
--- a/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment_return.tpl
+++ b/themes/default-bootstrap/modules/bankwire/views/templates/hook/payment_return.tpl
@@ -37,11 +37,11 @@
 			<br />- {l s='Do not forget to insert your order reference %s in the subject of your bank wire.' sprintf=$reference mod='bankwire'}
 		{/if}		<br />{l s='An email has been sent with this information.' mod='bankwire'}
 		<br /> <strong>{l s='Your order will be sent as soon as we receive payment.' mod='bankwire'}</strong>
-		<br />{l s='If you have questions, comments or concerns, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact', true)|escape:'html'}">{l s='expert customer support team. ' mod='bankwire'}</a>.
+		<br />{l s='If you have questions, comments or concerns, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}">{l s='expert customer support team. ' mod='bankwire'}</a>.
 	</div>
 {else}
 	<p class="alert alert-warning">
 		{l s='We noticed a problem with your order. If you think this is an error, feel free to contact our' mod='bankwire'} 
-		<a href="{$link->getPageLink('contact', true)|escape:'html'}">{l s='expert customer support team. ' mod='bankwire'}</a>.
+		<a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}">{l s='expert customer support team. ' mod='bankwire'}</a>.
 	</p>
 {/if}
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl b/themes/default-bootstrap/modules/blockcart/blockcart-json.tpl
index 267bdfee9..25d30fc43 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:'html'}",
+		"name":          "{$product.name|html_entity_decode:2:'UTF-8'|truncate:15:'...':true|escape:'html':'UTF-8'}",
 		"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},
@@ -85,7 +85,7 @@
 		"description":     "{$discount.description|addslashes|replace:'\\\'':'\''}",
 		"nameDescription": "{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|addslashes|replace:'\\\'':'\''}",
 		"code":            "{$discount.code}",
-		"link":            "{$link->getPageLink("$order_process", true, NULL, "deleteDiscount={$discount.id_discount}")|escape:'html'}",
+		"link":            "{$link->getPageLink("$order_process", true, NULL, "deleteDiscount={$discount.id_discount}")|escape:'html':'UTF-8'}",
 		"price":           "{if $priceDisplay == 1}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_tax_exc}{else}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_real}{/if}",
 		"price_float":     "{if $priceDisplay == 1}{$discount.value_tax_exc}{else}{$discount.value_real}{/if}"
 	{rdelim}
diff --git a/themes/default-bootstrap/modules/blockcart/blockcart.tpl b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
index fae2c2d06..8551dcec1 100644
--- a/themes/default-bootstrap/modules/blockcart/blockcart.tpl
+++ b/themes/default-bootstrap/modules/blockcart/blockcart.tpl
@@ -45,7 +45,7 @@ var generated_date = {$smarty.now|intval};
 <!-- MODULE Block cart -->
 <div id="cart_block" class="block exclusive">
 	<p class="title_block">
-		<a href="{$link->getPageLink("$order_process", true)|escape:'html'}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}
+		<a href="{$link->getPageLink("$order_process", true)|escape:'html':'UTF-8'}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}
 		{if $ajax_allowed}
 		<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="unvisible"{/if}>&nbsp;</span>
 		<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="unvisible"{/if}>&nbsp;</span>
@@ -76,16 +76,16 @@ var generated_date = {$smarty.now|intval};
 			{assign var='productId' value=$product.id_product}
 			{assign var='productAttributeId' value=$product.id_product_attribute}
 			<dt id="cart_block_product_{$product.id_product}_{if $product.id_product_attribute}{$product.id_product_attribute}{else}0{/if}_{if $product.id_address_delivery}{$product.id_address_delivery}{else}0{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
-            	<a class="cart-images" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:htmlall:'UTF-8'}" title="{$product.name|escape:htmlall:'UTF-8'|truncate:20}">
-                    <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'cart_default')}" alt="{$product.name|escape:htmlall:'UTF-8'}" />
+            	<a class="cart-images" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)|escape:'html':'UTF-8'}" title="{$product.name|escape:'html':'UTF-8'|truncate:20}">
+                    <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'cart_default')}" alt="{$product.name|escape:'html':'UTF-8'}" />
                 </a>
                 <div class="cart-info">
                 	<div class="product-name">
-                   		<a class="cart_block_product_name" href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html'}" title="{$product.name|escape:html:'UTF-8'}">{$product.name|truncate:40:'...'|escape:html:'UTF-8'}</a>
+                   		<a class="cart_block_product_name" href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}" title="{$product.name|escape:'html':'UTF-8'}">{$product.name|truncate:40:'...'|escape:'html':'UTF-8'}</a>
                     </div>
                     {if isset($product.attributes_small)}
                     	<div class="product-atributes">
-                        	<a href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html'}" title="{l s='Product detail' mod='blockcart'}">{$product.attributes_small}</a>
+                        	<a href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)|escape:'html':'UTF-8'}" title="{l s='Product detail' mod='blockcart'}">{$product.attributes_small}</a>
                         </div>
                     {/if}
                     <span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span>
@@ -97,7 +97,7 @@ var generated_date = {$smarty.now|intval};
                         {/if}
                     </span>
                 </div>
-                <span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId) && (!isset($product.is_gift) || !$product.is_gift)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$static_token}", true)|escape:'html'}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
+                <span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId) && (!isset($product.is_gift) || !$product.is_gift)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$static_token}", true)|escape:'html':'UTF-8'}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
 			</dt>
 			{if isset($product.attributes_small)}
 			<dd id="cart_block_combination_of_{$product.id_product}{if $product.id_product_attribute}_{$product.id_product_attribute}{/if}_{$product.id_address_delivery|intval}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
@@ -109,9 +109,9 @@ var generated_date = {$smarty.now|intval};
 				<ul class="cart_block_customizations" id="customization_{$productId}_{$productAttributeId}">
 					{foreach from=$customizedDatas.$productId.$productAttributeId[$product.id_address_delivery] key='id_customization' item='customization' name='customizations'}
 						<li name="customization">
-							<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}_{$product.id_address_delivery|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}", true)|escape:'html'}" rel="nofollow"> </a></div>
+							<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}_{$product.id_address_delivery|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}", true)|escape:'html':'UTF-8'}" rel="nofollow"> </a></div>
 							<span class="quantity-formated"><span class="quantity">{$customization.quantity}</span>x</span>{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)}
-							{$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|replace:"<br />":" "|truncate:28:'...'|escape:html:'UTF-8'}
+							{$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|replace:"<br />":" "|truncate:28:'...'|escape:'html':'UTF-8'}
 							{else}
 							{l s='Customization #%d:' sprintf=$id_customization|intval mod='blockcart'}
 							{/if}
@@ -182,7 +182,7 @@ var generated_date = {$smarty.now|intval};
 			{/if}
 		{/if}
 		<p id="cart-buttons">
-			<a href="{$link->getPageLink("$order_process", true)|escape:'html'}" id="button_order_cart" class="btn btn-default button button-small" title="{l s='Check out' mod='blockcart'}" rel="nofollow"><span>{l s='Check out' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>
+			<a href="{$link->getPageLink("$order_process", true)|escape:'html':'UTF-8'}" id="button_order_cart" class="btn btn-default button button-small" title="{l s='Check out' mod='blockcart'}" rel="nofollow"><span>{l s='Check out' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>
 		</p>
 	</div>
 	</div>
@@ -230,7 +230,7 @@ var generated_date = {$smarty.now|intval};
             </div>
             <div class="button-container">	
                 <span class="continue btn btn-default button exclusive-medium" title="{l s='Continue shopping' mod='blockcart'}"><span><i class="icon-chevron-left left"></i>{l s='Continue shopping' mod='blockcart'}</span></span>
-                <a class="btn btn-default button button-medium" href="{$link->getPageLink("$order_process", true)|escape:'html'}" title="{l s='Proceed to checkout' mod='blockcart'}" rel="nofollow"><span>{l s='Proceed to checkout' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>	
+                <a class="btn btn-default button button-medium" href="{$link->getPageLink("$order_process", true)|escape:'html':'UTF-8'}" title="{l s='Proceed to checkout' mod='blockcart'}" rel="nofollow"><span>{l s='Proceed to checkout' mod='blockcart'}<i class="icon-chevron-right right"></i></span></a>	
             </div>
         </div>
     </div>
diff --git a/themes/default-bootstrap/modules/blockcms/blockcms.tpl b/themes/default-bootstrap/modules/blockcms/blockcms.tpl
index 8be161d1a..6b69b0d60 100644
--- a/themes/default-bootstrap/modules/blockcms/blockcms.tpl
+++ b/themes/default-bootstrap/modules/blockcms/blockcms.tpl
@@ -27,18 +27,18 @@
 	<!-- Block CMS module -->
 	{foreach from=$cms_titles key=cms_key item=cms_title}
 		<section id="informations_block_left_{$cms_key}" class="block informations_block_left">
-			<p class="title_block"><a href="{$cms_title.category_link|escape:'html'}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></p>
+			<p class="title_block"><a href="{$cms_title.category_link|escape:'html':'UTF-8'}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></p>
             <div class="block_content list-block">
                 <ul>
                     {foreach from=$cms_title.categories item=cms_page}
                         {if isset($cms_page.link)}<li class="bullet">
-                        <a href="{$cms_page.link|escape:'html'}" title="{$cms_page.name|escape:html:'UTF-8'}">{$cms_page.name|escape:html:'UTF-8'}</a>
+                        <a href="{$cms_page.link|escape:'html':'UTF-8'}" title="{$cms_page.name|escape:'html':'UTF-8'}">{$cms_page.name|escape:'html':'UTF-8'}</a>
                         </li>{/if}
                     {/foreach}
                     {foreach from=$cms_title.cms item=cms_page}
-                        {if isset($cms_page.link)}<li><a href="{$cms_page.link|escape:'html'}" title="{$cms_page.meta_title|escape:html:'UTF-8'}">{$cms_page.meta_title|escape:html:'UTF-8'}</a></li>{/if}
+                        {if isset($cms_page.link)}<li><a href="{$cms_page.link|escape:'html':'UTF-8'}" title="{$cms_page.meta_title|escape:'html':'UTF-8'}">{$cms_page.meta_title|escape:'html':'UTF-8'}</a></li>{/if}
                     {/foreach}
-                    {if $cms_title.display_store}<li><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
+                    {if $cms_title.display_store}<li><a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
                 </ul>
             </div>
 		</section>
@@ -49,17 +49,17 @@
 	<section class="footer-block col-xs-12 col-sm-2" id="block_various_links_footer">
 		<h4>{l s='Information' mod='blockcms'}</h4>
 		<ul class="toggle-footer">
-			{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
-			<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')|escape:'html'}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
-			{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')|escape:'html'}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
-			{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
-			<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>
+			{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
+			<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')|escape:'html':'UTF-8'}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
+			{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')|escape:'html':'UTF-8'}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
+			{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
+			<li class="item"><a href="{$link->getPageLink($contact_url, true)|escape:'html':'UTF-8'}" 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:'html':'UTF-8'}">{$cmslink.meta_title|escape:'html':'UTF-8'}</a></li>
+					<li class="item"><a href="{$cmslink.link|addslashes|escape:'html':'UTF-8'}" 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>
+			<li><a href="{$link->getPageLink('sitemap')|escape:'html':'UTF-8'}" title="{l s='sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a></li>
 		</ul>
 	{$footer_text}
 	</section>
diff --git a/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl b/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
index 30be7cff7..06f5b8524 100644
--- a/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
+++ b/themes/default-bootstrap/modules/blockcontact/blockcontact.tpl
@@ -22,12 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-
-<div id="contact_block" class="block">
-	<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:'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>
+<div id="contact-link">
+	<a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}" title="{l s='contact'}">{l s='Contact Us'}</a>
+</div>
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/blockcurrencies/blockcurrencies.tpl b/themes/default-bootstrap/modules/blockcurrencies/blockcurrencies.tpl
new file mode 100644
index 000000000..3b9b39cbc
--- /dev/null
+++ b/themes/default-bootstrap/modules/blockcurrencies/blockcurrencies.tpl
@@ -0,0 +1,47 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<!-- Block currencies module -->
+{if count($currencies) > 1}
+	<div id="currencies-block-top">
+		<form id="setCurrency" action="{$request_uri}" method="post">
+			<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>
+				{foreach from=$currencies key=k item=f_currency}
+					{if $cookie->id_currency == $f_currency.id_currency}<strong>{$f_currency.iso_code}</strong>{/if}
+				{/foreach}
+			</div>
+			<ul id="first-currencies" class="currencies_ul toogle_content">
+				{foreach from=$currencies key=k item=f_currency}
+					<li {if $cookie->id_currency == $f_currency.id_currency}class="selected"{/if}>
+						<a href="javascript:setCurrency({$f_currency.id_currency});" rel="nofollow" title="{$f_currency.name}">{$f_currency.name}</a>
+					</li>
+				{/foreach}
+			</ul>
+		</form>
+	</div>
+{/if}
+<!-- /Block currencies module -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/blocklanguages/blocklanguages.tpl b/themes/default-bootstrap/modules/blocklanguages/blocklanguages.tpl
new file mode 100644
index 000000000..04bac3f0f
--- /dev/null
+++ b/themes/default-bootstrap/modules/blocklanguages/blocklanguages.tpl
@@ -0,0 +1,70 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- Block languages module -->
+{if count($languages) > 1}
+	<div id="languages-block-top">
+		<div id="countries">
+			{foreach from=$languages key=k item=language name="languages"}
+				{if $language.iso_code == $lang_iso}
+					<div class="current">
+						<span>{$language.name}</span>
+					</div>
+				{/if}
+			{/foreach}
+			<ul id="first-languages" class="countries_ul toogle_content">
+				{foreach from=$languages key=k item=language name="languages"}
+					<li {if $language.iso_code == $lang_iso}class="selected"{/if}>
+					{if $language.iso_code != $lang_iso}
+						{assign var=indice_lang value=$language.id_lang}
+						{if isset($lang_rewrite_urls.$indice_lang)}
+							<a href="{$lang_rewrite_urls.$indice_lang|escape:'html':'UTF-8'}" title="{$language.name}">
+						{else}
+							<a href="{$link->getLanguageLink($language.id_lang)|escape:'html':'UTF-8'}" title="{$language.name}">
+						{/if}
+					{/if}
+							<span>{$language.name}</span>
+					{if $language.iso_code != $lang_iso}
+						</a>
+					{/if}
+					</li>
+				{/foreach}
+			</ul>
+		</div>
+	</div>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			$('#countries .current span, #countries .countries_ul li span').each(function() {
+				var h = $(this).html();
+				var index = h.indexOf(' ');
+					if(index == -1) {
+						index = h.length;
+					}
+				$(this).html('<span class="firstWord">'+ h.substring(index, h.length) + '</span>' + h.substring(0, index));
+			});
+		}); 
+	</script>
+{/if}
+<!-- /Block languages module -->
diff --git a/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl b/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
index 01d77bfe2..6b4130ec8 100644
--- a/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
+++ b/themes/default-bootstrap/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -25,14 +25,14 @@
 
 <!-- Block manufacturers module -->
 <div id="manufacturers_block_left" class="block blockmanufacturer">
-	<p class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')|escape:'html'}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</p>
+	<p class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')|escape:'html':'UTF-8'}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</p>
 	<div class="block_content list-block">
 {if $manufacturers}
 	{if $text_list}
 	<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:'html':'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':'UTF-8'}" title="{l s='More about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'html':'UTF-8'}</a></li>
 		{/if}
 	{/foreach}
 	</ul>
@@ -43,7 +43,7 @@
 				<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:'html':'UTF-8'}</option>
+					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)|escape:'html':'UTF-8'}">{$manufacturer.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</div>
diff --git a/themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl b/themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
index 4af378e6b..c0e1e71c4 100644
--- a/themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
+++ b/themes/default-bootstrap/modules/blockmyaccount/blockmyaccount.tpl
@@ -25,19 +25,19 @@
 
 <!-- Block myaccount module -->
 <div class="block myaccount-column">
-	<p class="title_block"><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='My account' mod='blockmyaccount'}">{l s='My account' mod='blockmyaccount'}</a></p>
+	<p class="title_block"><a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='My account' mod='blockmyaccount'}">{l s='My account' mod='blockmyaccount'}</a></p>
 	<div class="block_content list-block">
 		<ul>
-			<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='My orders' mod='blockmyaccount'}">{l s='My orders' mod='blockmyaccount'}</a></li>
-			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html'}" title="{l s='My merchandise returns' mod='blockmyaccount'}">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
-			<li><a href="{$link->getPageLink('order-slip', true)|escape:'html'}" title="{l s='My credit slips' mod='blockmyaccount'}">{l s='My credit slips' mod='blockmyaccount'}</a></li>
-			<li><a href="{$link->getPageLink('addresses', true)|escape:'html'}" title="{l s='My addresses' mod='blockmyaccount'}">{l s='My addresses' mod='blockmyaccount'}</a></li>
-			<li><a href="{$link->getPageLink('identity', true)|escape:'html'}" title="{l s='My personal info' mod='blockmyaccount'}">{l s='My personal info' mod='blockmyaccount'}</a></li>
-			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='My vouchers' mod='blockmyaccount'}">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='My orders' mod='blockmyaccount'}">{l s='My orders' mod='blockmyaccount'}</a></li>
+			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='My merchandise returns' mod='blockmyaccount'}">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='My credit slips' mod='blockmyaccount'}">{l s='My credit slips' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" title="{l s='My addresses' mod='blockmyaccount'}">{l s='My addresses' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" title="{l s='My personal info' mod='blockmyaccount'}">{l s='My personal info' mod='blockmyaccount'}</a></li>
+			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" title="{l s='My vouchers' mod='blockmyaccount'}">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
 			{$HOOK_BLOCK_MY_ACCOUNT}
 		</ul>
 		<div class="logout">
-        	<a class="btn btn-default button button-small" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Sign out' mod='blockmyaccount'}"><span>{l s='Sign out' mod='blockmyaccount'}<i class="icon-chevron-right right"></i></span></a>
+        	<a class="btn btn-default button button-small" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html':'UTF-8'}" title="{l s='Sign out' mod='blockmyaccount'}"><span>{l s='Sign out' mod='blockmyaccount'}<i class="icon-chevron-right right"></i></span></a>
         </div>
 	</div>
 </div>
diff --git a/themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
index 5880bc498..8a2b7f457 100644
--- a/themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
+++ b/themes/default-bootstrap/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
@@ -25,15 +25,15 @@
 
 <!-- Block myaccount module -->
 <section class="footer-block col-xs-12 col-sm-4">
-	<h4><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
+	<h4><a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
 	<div class="block_content toggle-footer">
 		<ul class="bullet">
-			<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='List of my orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>
-			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html'}" title="{l s='List of my merchandise returns' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My merchandise returns' mod='blockmyaccountfooter'}</a></li>{/if}
-			<li><a href="{$link->getPageLink('order-slip', true)|escape:'html'}" title="{l s='List of my credit slips' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My credit slips' mod='blockmyaccountfooter'}</a></li>
-			<li><a href="{$link->getPageLink('addresses', true)|escape:'html'}" title="{l s='List of my addresses' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My addresses' mod='blockmyaccountfooter'}</a></li>
-			<li><a href="{$link->getPageLink('identity', true)|escape:'html'}" title="{l s='Manage my personal information' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My personal info' mod='blockmyaccountfooter'}</a></li>
-			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='List of my vouchers' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My vouchers' mod='blockmyaccountfooter'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='List of my orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>
+			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='List of my merchandise returns' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My merchandise returns' mod='blockmyaccountfooter'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='List of my credit slips' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My credit slips' mod='blockmyaccountfooter'}</a></li>
+			<li><a href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" title="{l s='List of my addresses' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My addresses' mod='blockmyaccountfooter'}</a></li>
+			<li><a href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" title="{l s='Manage my personal information' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My personal info' mod='blockmyaccountfooter'}</a></li>
+			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" title="{l s='List of my vouchers' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My vouchers' mod='blockmyaccountfooter'}</a></li>{/if}
 			{$HOOK_BLOCK_MY_ACCOUNT}
             {if $logged}<li><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">{l s='Sign out' mod='blockmyaccountfooter'}</a></li>{/if}
 		</ul>
diff --git a/themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl b/themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl
index 3a8eefa70..a22319f87 100644
--- a/themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl
+++ b/themes/default-bootstrap/modules/blocknewsletter/blocknewsletter.tpl
@@ -28,7 +28,7 @@
 <div id="newsletter_block_left" class="block">
 	<h4>{l s='Newsletter' mod='blocknewsletter'}</h4>
 	<div class="block_content">
-		<form action="{$link->getPageLink('index')|escape:'html'}" method="post">
+		<form action="{$link->getPageLink('index')|escape:'html':'UTF-8'}" method="post">
 			<div class="form-group">
 				<input class="inputNew form-control grey" id="newsletter-input" type="text" name="email" size="18" value="{if isset($value) && $value}{$value}{else}{l s='Enter your e-mail' mod='blocknewsletter'}{/if}" />
                 <button type="submit" name="submitNewsletter" class="btn btn-default button button-small"><span>{l s='Ok' mod='blocknewsletter'}</span></button>
diff --git a/themes/default-bootstrap/modules/blocksearch/blocksearch-top.tpl b/themes/default-bootstrap/modules/blocksearch/blocksearch-top.tpl
index 6bb10ce38..27cce1d54 100644
--- a/themes/default-bootstrap/modules/blocksearch/blocksearch-top.tpl
+++ b/themes/default-bootstrap/modules/blocksearch/blocksearch-top.tpl
@@ -25,7 +25,7 @@
 <!-- block seach mobile -->
 {if isset($hook_mobile)}
 <div class="input_search" data-role="fieldcontain">
-	<form method="get" action="{$link->getPageLink('search')|escape:'html'}" id="searchbox">
+	<form method="get" action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" id="searchbox">
 		<input type="hidden" name="controller" value="search" />
 		<input type="hidden" name="orderby" value="position" />
 		<input type="hidden" name="orderway" value="desc" />
@@ -35,7 +35,7 @@
 {else}
 <!-- Block search module TOP -->
 <div id="search_block_top">
-	<form method="get" action="{$link->getPageLink('search')|escape:'html'}" id="searchbox">
+	<form method="get" action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" id="searchbox">
 		<div>
 			<input type="hidden" name="controller" value="search" />
 			<input type="hidden" name="orderby" value="position" />
diff --git a/themes/default-bootstrap/modules/blocksearch/blocksearch.tpl b/themes/default-bootstrap/modules/blocksearch/blocksearch.tpl
index 940669194..5191e0fcf 100644
--- a/themes/default-bootstrap/modules/blocksearch/blocksearch.tpl
+++ b/themes/default-bootstrap/modules/blocksearch/blocksearch.tpl
@@ -26,7 +26,7 @@
 <!-- Block search module -->
 <div id="search_block_left" class="block exclusive">
 	<p class="title_block">{l s='Search' mod='blocksearch'}</p>
-	<form method="get" action="{$link->getPageLink('search', true)|escape:'html'}" id="searchbox">
+	<form method="get" action="{$link->getPageLink('search', true)|escape:'html':'UTF-8'}" id="searchbox">
 		<p class="block_content">
 			<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
 			<input type="hidden" name="orderby" value="position" />
diff --git a/themes/default-bootstrap/modules/blocksocial/blocksocial.tpl b/themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
index fe96c920f..999b5fcdd 100644
--- a/themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
+++ b/themes/default-bootstrap/modules/blocksocial/blocksocial.tpl
@@ -26,9 +26,9 @@
 
 <section id="social_block">
 	<ul>
-		{if $facebook_url != ''}<li class="facebook"><a target="_blank" href="{$facebook_url|escape:html:'UTF-8'}"><span>{l s='Facebook' mod='blocksocial'}</span></a></li>{/if}
-		{if $twitter_url != ''}<li class="twitter"><a target="_blank" href="{$twitter_url|escape:html:'UTF-8'}"><span>{l s='Twitter' mod='blocksocial'}</span></a></li>{/if}
-		{if $rss_url != ''}<li class="rss"><a target="_blank" href="{$rss_url|escape:html:'UTF-8'}"><span>{l s='RSS' mod='blocksocial'}</span></a></li>{/if}
+		{if $facebook_url != ''}<li class="facebook"><a target="_blank" href="{$facebook_url|escape:'html':'UTF-8'}"><span>{l s='Facebook' mod='blocksocial'}</span></a></li>{/if}
+		{if $twitter_url != ''}<li class="twitter"><a target="_blank" href="{$twitter_url|escape:'html':'UTF-8'}"><span>{l s='Twitter' mod='blocksocial'}</span></a></li>{/if}
+		{if $rss_url != ''}<li class="rss"><a target="_blank" href="{$rss_url|escape:'html':'UTF-8'}"><span>{l s='RSS' mod='blocksocial'}</span></a></li>{/if}
 	</ul>
     <h4>{l s='Follow us:' mod='blocksocial'}</h4>
 </section>
diff --git a/themes/default-bootstrap/modules/blockspecials/blockspecials.tpl b/themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
index 5a63f521e..9c60f1278 100644
--- a/themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
+++ b/themes/default-bootstrap/modules/blockspecials/blockspecials.tpl
@@ -25,14 +25,14 @@
 
 <!-- MODULE Block specials -->
 <div id="special_block_right" class="block">
-	<p class="title_block"><a href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
+	<p class="title_block"><a href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
 	<div class="block_content products-block">
 {if $special}
 		<ul>
         	<li class="clearfix">
-            	<a class="products-block-image" href="{$special.link|escape:'html'}"><img class="replace-2x img-responsive" src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small_default')|escape:'html'}" alt="{$special.legend|escape:html:'UTF-8'}" title="{$special.name|escape:html:'UTF-8'}" /></a>
+            	<a class="products-block-image" href="{$special.link|escape:'html':'UTF-8'}"><img class="replace-2x img-responsive" src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'small_default')|escape:'html':'UTF-8'}" alt="{$special.legend|escape:'html':'UTF-8'}" title="{$special.name|escape:'html':'UTF-8'}" /></a>
                 <div class="product-content">
-                	<h5><a class="product-name" href="{$special.link|escape:'html'}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></h5>
+                	<h5><a class="product-name" href="{$special.link|escape:'html':'UTF-8'}" title="{$special.name|escape:'html':'UTF-8'}">{$special.name|escape:'html':'UTF-8'}</a></h5>
                     {if isset($special.description_short) && $special.description_short}
                     	<p class="product-description">{$special.description_short|strip_tags:'UTF-8'|truncate:40}</p>
                     {/if}
@@ -52,7 +52,7 @@
             </li>
 		</ul>
 		<div>
-			<a class="btn btn-default button button-small" href="{$link->getPageLink('prices-drop')|escape:'html'}" title="{l s='All specials' mod='blockspecials'}"><span>{l s='All specials' mod='blockspecials'}<i class="icon-chevron-right right"></i></span></a>
+			<a class="btn btn-default button button-small" href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}" title="{l s='All specials' mod='blockspecials'}"><span>{l s='All specials' mod='blockspecials'}<i class="icon-chevron-right right"></i></span></a>
 		</div>
 {else}
 		<div>{l s='No specials at this time' mod='blockspecials'}</div>
diff --git a/themes/default-bootstrap/modules/blockstore/blockstore.tpl b/themes/default-bootstrap/modules/blockstore/blockstore.tpl
index f1f6962ed..5c56b7f05 100644
--- a/themes/default-bootstrap/modules/blockstore/blockstore.tpl
+++ b/themes/default-bootstrap/modules/blockstore/blockstore.tpl
@@ -25,12 +25,12 @@
 
 <!-- Block stores module -->
 <div id="stores_block_left" class="block">
-	<p class="title_block"><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></p>
+	<p class="title_block"><a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></p>
 	<div class="block_content blockstore">
-		<p class="store_image"><a href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockstore'}"><img class="img-responsive" src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" /></a></p>
+		<p class="store_image"><a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockstore'}"><img class="img-responsive" src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" /></a></p>
         <p class="store-description">Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magn.</p>
 		<div>
-			<a class="btn btn-default button button-small" href="{$link->getPageLink('stores')|escape:'html'}" title="{l s='Our stores' mod='blockstore'}"><span>{l s='Discover our stores' mod='blockstore'}<i class="icon-chevron-right right"></i></span></a>
+			<a class="btn btn-default button button-small" href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='Our stores' mod='blockstore'}"><span>{l s='Discover our stores' mod='blockstore'}<i class="icon-chevron-right right"></i></span></a>
 		</div>
 	</div>
 </div>
diff --git a/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl b/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
index e86944826..a0dc2ba55 100644
--- a/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
+++ b/themes/default-bootstrap/modules/blocksupplier/blocksupplier.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block suppliers module -->
 <div id="suppliers_block_left" class="block blocksupplier">
-	<p class="title_block">{if $display_link_supplier}<a href="{$link->getPageLink('supplier')|escape:'html'}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</p>
+	<p class="title_block">{if $display_link_supplier}<a href="{$link->getPageLink('supplier')|escape:'html':'UTF-8'}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</p>
 	<div class="block_content list-block">
 {if $suppliers}
 	{if $text_list}
@@ -33,7 +33,7 @@
 	{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:'html':'UTF-8'}</a>
+			<a href="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'html':'UTF-8'}</a>
 		</li>
 		{/if}
 	{/foreach}
@@ -45,7 +45,7 @@
 				<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:'html':'UTF-8'}</option>
+					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)|escape:'html':'UTF-8'}">{$supplier.name|escape:'html':'UTF-8'}</option>
 				{/foreach}
 				</select>
 			</div>
diff --git a/themes/default-bootstrap/modules/blocktags/blocktags.tpl b/themes/default-bootstrap/modules/blocktags/blocktags.tpl
index 8466c5cc3..f3fe85858 100644
--- a/themes/default-bootstrap/modules/blocktags/blocktags.tpl
+++ b/themes/default-bootstrap/modules/blocktags/blocktags.tpl
@@ -29,7 +29,7 @@
 	<div class="block_content">
 {if $tags}
 	{foreach from=$tags item=tag name=myLoop}
-		<a href="{$link->getPageLink('search', true, NULL, "tag={$tag.name|urlencode}")|escape:'html'}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
+		<a href="{$link->getPageLink('search', true, NULL, "tag={$tag.name|urlencode}")|escape:'html':'UTF-8'}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:'html':'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:'html':'UTF-8'}</a>
 	{/foreach}
 {else}
 	{l s='No tags specified yet' mod='blocktags'}
diff --git a/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl b/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
index 1a79edf02..af0c87620 100644
--- a/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
+++ b/themes/default-bootstrap/modules/blocktopmenu/blocktopmenu.tpl
@@ -7,7 +7,7 @@
 			{$MENU}
 			{if $MENU_SEARCH}
 				<li class="sf-search noBack" style="float:right">
-					<form id="searchbox" action="{$link->getPageLink('search')|escape:'html'}" method="get">
+					<form id="searchbox" action="{$link->getPageLink('search')|escape:'html':'UTF-8'}" method="get">
 						<p>
 							<input type="hidden" name="controller" value="search" />
 							<input type="hidden" value="position" name="orderby"/>
diff --git a/themes/default-bootstrap/modules/blockuserinfo/blockuserinfo.tpl b/themes/default-bootstrap/modules/blockuserinfo/blockuserinfo.tpl
index 88ae6fce8..e5f29f9dd 100644
--- a/themes/default-bootstrap/modules/blockuserinfo/blockuserinfo.tpl
+++ b/themes/default-bootstrap/modules/blockuserinfo/blockuserinfo.tpl
@@ -28,7 +28,7 @@
 	<ul id="header_nav">
 		{if !$PS_CATALOG_MODE}
 		<li id="shopping_cart">
-			<a class="clearfix" href="{$link->getPageLink($order_process, true)|escape:'html'}" title="{l s='View my shopping cart' mod='blockuserinfo'}" rel="nofollow"><b>{l s='Cart:' mod='blockuserinfo'}</b>
+			<a class="clearfix" href="{$link->getPageLink($order_process, true)|escape:'html':'UTF-8'}" title="{l s='View my shopping cart' mod='blockuserinfo'}" rel="nofollow"><b>{l s='Cart:' mod='blockuserinfo'}</b>
 			<span class="ajax_cart_quantity{if $cart_qties == 0} unvisible{/if}">{$cart_qties}</span>
 			<span class="ajax_cart_product_txt{if $cart_qties != 1} unvisible{/if}">{l s='product' mod='blockuserinfo'}</span>
 			<span class="ajax_cart_product_txt_s{if $cart_qties < 2} unvisible{/if}">{l s='products' mod='blockuserinfo'}</span>
diff --git a/themes/default-bootstrap/modules/blockuserinfo/nav.tpl b/themes/default-bootstrap/modules/blockuserinfo/nav.tpl
index 8c074d1c3..01c67a863 100644
--- a/themes/default-bootstrap/modules/blockuserinfo/nav.tpl
+++ b/themes/default-bootstrap/modules/blockuserinfo/nav.tpl
@@ -1,14 +1,14 @@
 <!-- Block user information module NAV  -->
 {if $logged}
 <div class="header_user_info">
-	<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
+	<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='View my customer account' mod='blockuserinfo'}" class="account" rel="nofollow"><span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span></a>
 </div>
 {/if}
 <div class="header_user_info">
 	{if $logged}
-		<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
+		<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
 	{else}
-		<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
+		<a class="login" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Login to your customer account'}">{l s='Sign in'}</a>
 	{/if}
 </div>
 <!-- /Block usmodule NAV -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/blockviewed/blockviewed.tpl b/themes/default-bootstrap/modules/blockviewed/blockviewed.tpl
index a5ca6da7b..34e17483d 100644
--- a/themes/default-bootstrap/modules/blockviewed/blockviewed.tpl
+++ b/themes/default-bootstrap/modules/blockviewed/blockviewed.tpl
@@ -30,11 +30,11 @@
 		<ul>
 			{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
 				<li class="clearfix{if $smarty.foreach.myLoop.last} last_item{elseif $smarty.foreach.myLoop.first} first_item{else} item{/if}">
-					<a href="{$viewedProduct->product_link|escape:'html'}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="products-block-image">
-					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'small_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" />
+					<a href="{$viewedProduct->product_link|escape:'html':'UTF-8'}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:'html':'UTF-8'}" class="products-block-image">
+					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'small_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:'html':'UTF-8'}" />
 					</a>
 					<div class="product-content">
-						<h5><a class="product-name" href="{$viewedProduct->product_link|escape:'html'}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:25:'...'|escape:html:'UTF-8'}</a></h5>
+						<h5><a class="product-name" href="{$viewedProduct->product_link|escape:'html':'UTF-8'}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:'html':'UTF-8'}">{$viewedProduct->name|truncate:25:'...'|escape:'html':'UTF-8'}</a></h5>
 						<p class="product-description">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:40}</p>
 					</div>
 				</li>
diff --git a/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl b/themes/default-bootstrap/modules/blockwishlist/blockwishlist-ajax.tpl
index f811d6899..1150e5ef3 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:'html':'UTF-8'}" >{$product.name|truncate:13:'...'|escape:'html':'UTF-8'}</a>
+			<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" 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:'html':'UTF-8'}</a>
+			<a href="{$link->getProductLink($product.id_product, $product.link_rewrite)|escape:'html':'UTF-8'}" 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 4ff77cc23..c7793e02c 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:'html':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'html':'UTF-8'}</a>
+					href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" 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:'html':'UTF-8'}</a>
+					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" title="{l s='Product detail'}">{$product.attributes_small|escape:'html':'UTF-8'}</a>
 				</dd>
 				{/if}
 			{/foreach}
diff --git a/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl b/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
index dd096e410..f34234820 100644
--- a/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/managewishlist.tpl
@@ -62,8 +62,8 @@
             	<div class="row">
                     <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:'html':'UTF-8'}" />
+                            <a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" 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':'UTF-8'}" alt="{$product.name|escape:'html':'UTF-8'}" />
                             </a>
                         </div>
                     </div>
@@ -73,7 +73,7 @@
                             <p id="s_title" class="product-name">
                                 {$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:'html':'UTF-8'}</a></small>
+                                    <small><a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" title="{l s='Product detail' mod='blockwishlist'}">{$product.attributes_small|escape:'html':'UTF-8'}</a></small>
                             {/if}
                             </p>
                             <div class="wishlist_product_detail">
@@ -137,7 +137,7 @@
 			{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:'html':'UTF-8'}" /></span>			
+						<span style="float:left;"><img src="{$link->getImageLink($product.link_rewrite, $product.cover, 'small')|escape:'html':'UTF-8'}" alt="{$product.name|escape:'html':'UTF-8'}" /></span>			
 						<span style="float:left;">
 							{$product.name|truncate:40:'...'|escape:'html':'UTF-8'}
 						{if isset($product.attributes_small)}
diff --git a/themes/default-bootstrap/modules/blockwishlist/view.tpl b/themes/default-bootstrap/modules/blockwishlist/view.tpl
index 4ceaa44c6..254a3f6f4 100644
--- a/themes/default-bootstrap/modules/blockwishlist/view.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/view.tpl
@@ -54,8 +54,8 @@
 					<div class="row">
 						<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:'html':'UTF-8'}" />
+								<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" 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':'UTF-8'}" alt="{$product.name|escape:'html':'UTF-8'}" />
 								</a>
 							</div>
 						</div>
@@ -64,7 +64,7 @@
 								<p id="s_title" class="product-name">
 									{$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:'html':'UTF-8'}</small></a>
+										<a href="{$link->getProductlink($product.id_product, $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}" title="{l s='Product detail' mod='blockwishlist'}"><small>{$product.attributes_small|escape:'html':'UTF-8'}</small></a>
 									{/if}
 								</p>
 								<div class="wishlist_product_detail">
@@ -83,7 +83,7 @@
 									<div class="btn_action">
 										{if isset($product.attribute_quantity) AND $product.attribute_quantity >= 1 OR !isset($product.attribute_quantity) AND $product.product_quantity >= 1}
 											{if !$ajax}
-												<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart')|escape:'html'}" method="post">
+												<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart')|escape:'html':'UTF-8'}" method="post">
 													<p class="hidden">
 														<input type="hidden" name="id_product" value="{$product.id_product|intval}" id="product_page_product_id" />
 														<input type="hidden" name="add" value="1" />
@@ -105,7 +105,7 @@
 										{/if}
 										<a 
 											class="button lnk_view btn btn-default"
-											href="{$link->getProductLink($product.id_product,  $product.link_rewrite, $product.category_rewrite)|escape:'html'}"
+											href="{$link->getProductLink($product.id_product,  $product.link_rewrite, $product.category_rewrite)|escape:'html':'UTF-8'}"
 											title="{l s='View' mod='blockwishlist'}"
 											rel="nofollow">
 											<span>{l s='View' mod='blockwishlist'}</span>
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 2f14adfa8..73734bdc1 100644
--- a/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl
+++ b/themes/default-bootstrap/modules/blockwishlist/views/templates/front/mywishlist.tpl
@@ -24,7 +24,7 @@
 *}
 
 <div id="mywishlist">
-	{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My wishlists' mod='blockwishlist'}</span>{/capture}
+	{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My wishlists' mod='blockwishlist'}</span>{/capture}
 
 	<h1 class="page-heading">{l s='My wishlists' mod='blockwishlist'}</h1>
 
@@ -92,7 +92,7 @@
 	{/if}
 
 	<ul class="footer_links clearfix">
-		<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}"><span><i class="icon-chevron-left"></i>{l s='Back to Your Account' mod='blockwishlist'}</span></a></li>
+		<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='blockwishlist'}</span></a></li>
 		<li><a class="btn btn-default button button-small" href="{$base_dir}"><span><i class="icon-chevron-left"></i>{l s='Home' mod='blockwishlist'}</span></a></li>
 	</ul>
 </div>
diff --git a/themes/default-bootstrap/modules/cheque/views/templates/front/payment_execution.tpl b/themes/default-bootstrap/modules/cheque/views/templates/front/payment_execution.tpl
index 962ab7408..628670a52 100644
--- a/themes/default-bootstrap/modules/cheque/views/templates/front/payment_execution.tpl
+++ b/themes/default-bootstrap/modules/cheque/views/templates/front/payment_execution.tpl
@@ -34,7 +34,7 @@
 	<p class="alert alert-warning">{l s='Your shopping cart is empty.'}</p>
 {else}
    
-    <form action="{$link->getModuleLink('cheque', 'validation', [], true)|escape:'html'}" method="post">
+    <form action="{$link->getModuleLink('cheque', 'validation', [], true)|escape:'html':'UTF-8'}" method="post">
     <div class="box cheque-box">
     	 <h3 class="page-subheading">{l s='Check payment' mod='cheque'}</h3>
         <p class="cheque-indent">
@@ -74,7 +74,7 @@
 </div>
         <p class="cart_navigation clearfix" id="cart_navigation">
             
-            <a href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Other payment methods' mod='cheque'}</a>
+            <a href="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html':'UTF-8'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Other payment methods' mod='cheque'}</a>
             <button type="submit" class="button btn btn-default button-medium"><span>{l s='I confirm my order' mod='cheque'}<i class="icon-chevron-right right"></i></span></button>
         </p>
     </form>
diff --git a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl
index 67eb7d55b..ed5695803 100644
--- a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl
+++ b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment.tpl
@@ -25,7 +25,7 @@
 <div class="row">
 	<div class="col-xs-12 col-md-6">
         <p class="payment_module">
-            <a class="cheque" href="{$link->getModuleLink('cheque', 'payment', [], true)|escape:'html'}" title="{l s='Pay by check.' mod='cheque'}">
+            <a class="cheque" href="{$link->getModuleLink('cheque', 'payment', [], true)|escape:'html':'UTF-8'}" title="{l s='Pay by check.' mod='cheque'}">
                 {l s='Pay by check' mod='cheque'} <span>({l s='order processing will take more time' mod='cheque'})</span>
             </a>
         </p>
diff --git a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment_return.tpl b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment_return.tpl
index 588caa40b..1424a5da1 100644
--- a/themes/default-bootstrap/modules/cheque/views/templates/hook/payment_return.tpl
+++ b/themes/default-bootstrap/modules/cheque/views/templates/hook/payment_return.tpl
@@ -37,11 +37,11 @@
 		{/if}
 		<br />- {l s='An email has been sent to you with this information.' mod='cheque'}
 		<br />- <strong>{l s='Your order will be sent as soon as we receive your payment.' mod='cheque'}</strong>
-		<br />- {l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact', true)|escape:'html'}">{l s='customer service department.' mod='cheque'}</a>.
+		<br />- {l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}">{l s='customer service department.' mod='cheque'}</a>.
 	</div>
 {else}
 	<p class="alert alert-warning">
 		{l s='We have noticed that there is a problem with your order. If you think this is an error, you can contact our' mod='cheque'} 
-		<a href="{$link->getPageLink('contact', true)|escape:'html'}">{l s='customer service department.' mod='cheque'}</a>.
+		<a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}">{l s='customer service department.' mod='cheque'}</a>.
 	</p>
 {/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 30d36654f..f94dd8dee 100644
--- a/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl
+++ b/themes/default-bootstrap/modules/loyalty/views/templates/front/loyalty.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage my account' mod='loyalty'}" rel="nofollow">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My loyalty points' mod='loyalty'}</span>{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Manage my account' mod='loyalty'}" rel="nofollow">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='My loyalty points' mod='loyalty'}</span>{/capture}
 
 <h1 class="page-heading">{l s='My loyalty points' mod='loyalty'}</h1>
 
@@ -123,7 +123,7 @@
 
 {if $transformation_allowed}
 <p class="text-center">
-	<a class="btn btn-default" href="{$link->getModuleLink('loyalty', 'default', ['process' => 'transformpoints'])|escape:'html'}" onclick="return confirm('{l s='Are you sure you want to transform your points into vouchers?' mod='loyalty' js=1}');">{l s='Transform my points into a voucher of' mod='loyalty'} <span class="price">{convertPrice price=$voucher}</span>.</a>
+	<a class="btn btn-default" href="{$link->getModuleLink('loyalty', 'default', ['process' => 'transformpoints'])|escape:'html':'UTF-8'}" onclick="return confirm('{l s='Are you sure you want to transform your points into vouchers?' mod='loyalty' js=1}');">{l s='Transform my points into a voucher of' mod='loyalty'} <span class="price">{convertPrice price=$voucher}</span>.</a>
 </p>
 {/if}
 
@@ -204,7 +204,7 @@ $(document).ready(function()
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Back to Your Account' mod='loyalty'}" rel="nofollow"><span><i class="icon-chevron-left"></i>{l s='Back to Your Account' mod='loyalty'}</span></a>
+		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Back to Your Account' mod='loyalty'}" rel="nofollow"><span><i class="icon-chevron-left"></i>{l s='Back to Your Account' mod='loyalty'}</span></a>
 	</li>
 	<li>
 		<a class="btn btn-default button button-small" href="{$base_dir}" title="{l s='Home' mod='loyalty'}"><span><i class="icon-chevron-left"></i>{l s='Home' mod='loyalty'}</span></a>
diff --git a/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl b/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl
index 520da34d5..aa64a2c40 100644
--- a/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl
+++ b/themes/default-bootstrap/modules/loyalty/views/templates/hook/my-account.tpl
@@ -25,6 +25,6 @@
 
 <!-- MODULE Loyalty -->
 <li class="loyalty">
-	<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'])|escape:'html'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a>
+	<a href="{$link->getModuleLink('loyalty', 'default', ['process' => 'summary'])|escape:'html':'UTF-8'}" title="{l s='My loyalty points' mod='loyalty'}" rel="nofollow"><i class="icon-flag"></i><span>{l s='My loyalty points' mod='loyalty'}</span></a>
 </li>
 <!-- END : MODULE Loyalty -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/productcomments/productcomments.tpl b/themes/default-bootstrap/modules/productcomments/productcomments.tpl
index ee9fb4df6..e0b474f54 100644
--- a/themes/default-bootstrap/modules/productcomments/productcomments.tpl
+++ b/themes/default-bootstrap/modules/productcomments/productcomments.tpl
@@ -108,7 +108,7 @@ var moderation_active = {$moderation_active};
             
 <div class="row">
           <div class="product clearfix  col-xs-12 col-sm-6">
-				<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:html:'UTF-8'}" />
+				<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')|escape:'html':'UTF-8'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product->name|escape:'html':'UTF-8'}" />
 				<div class="product_desc">
 					<p class="product_name"><strong>{$product->name}</strong></p>
 					{$product->description_short}
diff --git a/themes/default-bootstrap/modules/productscategory/productscategory.tpl b/themes/default-bootstrap/modules/productscategory/productscategory.tpl
index e61d4f532..4a0aa7f9f 100644
--- a/themes/default-bootstrap/modules/productscategory/productscategory.tpl
+++ b/themes/default-bootstrap/modules/productscategory/productscategory.tpl
@@ -29,10 +29,10 @@
 		<ul id="bxslider1" class="bxslider clearfix">
 		 {foreach from=$categoryProducts item='categoryProduct' name=categoryProduct}
 			<li class="product-box item">
-				<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>
+				<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':'UTF-8'}" 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:'html':'UTF-8'}</a>
+					<a href="{$link->getProductLink($categoryProduct.id_product, $categoryProduct.link_rewrite, $categoryProduct.category, $categoryProduct.ean13)|escape:'html':'UTF-8'}" 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 f9d84300f..1cd34ab27 100644
--- a/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl
+++ b/themes/default-bootstrap/modules/referralprogram/views/templates/front/program.tpl
@@ -31,7 +31,7 @@
 	//]]>
 </script>
 
-{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Manage my account' mod='referralprogram'}" rel="nofollow">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Referral Program' mod='referralprogram'}</span>{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Manage my account' mod='referralprogram'}" rel="nofollow">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Referral Program' mod='referralprogram'}</span>{/capture}
 
 <h1 class="page-heading">{l s='Referral program' mod='referralprogram'}</h1>
 
@@ -99,7 +99,7 @@
 				{/if},
 				{l s='he or she will receive a %1$d %2$s voucher and you will receive your own voucher worth %3$d %4$s.' sprintf=[$discount,$currencySign,$discount,$currencySign] mod='referralprogram'}
 			</p>
-			<form method="post" action="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html'}" class="std">
+			<form method="post" action="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html':'UTF-8'}" class="std">
 				<table class="table table-bordered">
 				<thead>
 					<tr>
@@ -126,12 +126,12 @@
 				<p class="checkbox">
 					<input type="checkbox" name="conditionsValided" id="conditionsValided" value="1" {if isset($smarty.post.conditionsValided) AND $smarty.post.conditionsValided eq 1}checked="checked"{/if} />
 					<label for="conditionsValided">{l s='I agree to the terms of service and adhere to them unconditionally.' mod='referralprogram'}</label>
-					<a href="{$link->getModuleLink('referralprogram', 'rules', ['height' => '500', 'width' => '400'], true)|escape:'html'}" class="thickbox" title="{l s='Conditions of the referral program' mod='referralprogram'}" rel="nofollow">{l s='Read conditions.' mod='referralprogram'}</a>
+					<a href="{$link->getModuleLink('referralprogram', 'rules', ['height' => '500', 'width' => '400'], true)|escape:'html':'UTF-8'}" class="thickbox" title="{l s='Conditions of the referral program' mod='referralprogram'}" rel="nofollow">{l s='Read conditions.' mod='referralprogram'}</a>
 				</p>
 				<p class="see_email">
 					{l s='Preview' mod='referralprogram'} 
 					{assign var="file" value="{$lang_iso}/referralprogram-invitation.html"}
-					<a href="{$link->getModuleLink('referralprogram', 'email', ['height' => '500', 'width' => '600', 'mail' => {$file}], true)|escape:'html'}" class="thickbox" title="{l s='Invitation e-mail' mod='referralprogram'}" rel="nofollow">{l s='the default e-mail' mod='referralprogram'}</a> {l s='that will be sent to your friend(s).' mod='referralprogram'}
+					<a href="{$link->getModuleLink('referralprogram', 'email', ['height' => '500', 'width' => '600', 'mail' => {$file}], true)|escape:'html':'UTF-8'}" class="thickbox" title="{l s='Invitation e-mail' mod='referralprogram'}" rel="nofollow">{l s='the default e-mail' mod='referralprogram'}</a> {l s='that will be sent to your friend(s).' mod='referralprogram'}
 				</p>
 				<p class="submit">
                     <button type="submit" id="submitSponsorFriends" name="submitSponsorFriends" class="btn btn-default button button-medium"><span>{l s='Validate' mod='referralprogram'}<i class="icon-chevron-right right"></i></span></button>
@@ -149,7 +149,7 @@
 		<p>
 			{l s='These friends have not yet placed an order on this Website since you sponsored them, but you can try again! To do so, mark the checkboxes of the friend(s) you want to remind, then click on the button "Remind my friend(s)"' mod='referralprogram'}
 		</p>
-		<form method="post" action="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html'}" class="std">
+		<form method="post" action="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html':'UTF-8'}" class="std">
 			<table class="table table-bordered">
 			<thead>
 				<tr>
@@ -222,7 +222,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='Back to Your Account' mod='referralprogram'}" rel="nofollow">
+		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" title="{l s='Back to Your Account' mod='referralprogram'}" rel="nofollow">
 		<span><i class="icon-chevron-left"></i> {l s='Back to Your Account' mod='referralprogram'}</span></a>
 	</li>
 	<li><a class="btn btn-default button button-small" href="{$base_dir}" title="{l s='Home' mod='referralprogram'}"><span><i class="icon-chevron-left"></i>{l s='Home' mod='referralprogram'}</span></a></li>
diff --git a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/my-account.tpl b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/my-account.tpl
index 2207c5bc2..ee9a2c13e 100644
--- a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/my-account.tpl
+++ b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/my-account.tpl
@@ -25,6 +25,6 @@
 
 <!-- MODULE ReferralProgram -->
 <li class="referralprogram">
-	<a href="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html'}" title="{l s='Referral program' mod='referralprogram'}" rel="nofollow"><i class="icon-cogs"></i><span>{l s='Referral program' mod='referralprogram'}</span></a>
+	<a href="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html':'UTF-8'}" title="{l s='Referral program' mod='referralprogram'}" rel="nofollow"><i class="icon-cogs"></i><span>{l s='Referral program' mod='referralprogram'}</span></a>
 </li>
 <!-- END : MODULE ReferralProgram -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/shopping-cart.tpl b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/shopping-cart.tpl
index e33eae244..768252682 100644
--- a/themes/default-bootstrap/modules/referralprogram/views/templates/hook/shopping-cart.tpl
+++ b/themes/default-bootstrap/modules/referralprogram/views/templates/hook/shopping-cart.tpl
@@ -28,7 +28,7 @@
 	<i class="icon-flag"></i>
 	{l s='You have earned a voucher worth %s thanks to your sponsor!' sprintf=$discount_display mod='referralprogram'}
 	{l s='Enter voucher name %s to receive the reduction on this order.' sprintf=$discount->name mod='referralprogram'}
-	<a href="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html'}" title="{l s='Referral program' mod='referralprogram'}" rel="nofollow">{l s='View your referral program.' mod='referralprogram'}</a>
+	<a href="{$link->getModuleLink('referralprogram', 'program', [], true)|escape:'html':'UTF-8'}" title="{l s='Referral program' mod='referralprogram'}" rel="nofollow">{l s='View your referral program.' mod='referralprogram'}</a>
 </p>
 <br />
 <!-- END : MODULE ReferralProgram -->
\ No newline at end of file
diff --git a/themes/default-bootstrap/modules/sendtoafriend/sendtoafriend-extra.tpl b/themes/default-bootstrap/modules/sendtoafriend/sendtoafriend-extra.tpl
index 7586ecf93..1a547b39b 100644
--- a/themes/default-bootstrap/modules/sendtoafriend/sendtoafriend-extra.tpl
+++ b/themes/default-bootstrap/modules/sendtoafriend/sendtoafriend-extra.tpl
@@ -67,7 +67,7 @@ $('document').ready(function(){
 			
             <div class="row">
             <div class="product clearfix col-xs-12 col-sm-6">
-				<img src="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home_default')|escape:'html'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$stf_product->name|escape:html:'UTF-8'}" />
+				<img src="{$link->getImageLink($stf_product->link_rewrite, $stf_product_cover, 'home_default')|escape:'html':'UTF-8'}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$stf_product->name|escape:'html':'UTF-8'}" />
 				<div class="product_desc">
 					<p class="product_name"><strong>{$stf_product->name}</strong></p>
 					{$stf_product->description_short}
diff --git a/themes/default-bootstrap/modules/stripejs/order-confirmation.tpl b/themes/default-bootstrap/modules/stripejs/order-confirmation.tpl
index d1a5a1829..c29f36495 100644
--- a/themes/default-bootstrap/modules/stripejs/order-confirmation.tpl
+++ b/themes/default-bootstrap/modules/stripejs/order-confirmation.tpl
@@ -1,13 +1,13 @@
 {if $stripe_order.valid == 1}
-	<div class="conf confirmation">{l s='Congratulations, your payment has been approved and your order has been saved under the reference' mod='stripejs'} <b>{$stripe_order.reference|escape:html:'UTF-8'}</b>.</div>
+	<div class="conf confirmation">{l s='Congratulations, your payment has been approved and your order has been saved under the reference' mod='stripejs'} <b>{$stripe_order.reference|escape:'html':'UTF-8'}</b>.</div>
 {else}
 	{if $order_pending}
 		<div class="error">{l s='Unfortunately we detected a problem while processing your order and it needs to be reviewed.' mod='stripejs'}<br /><br />
 		{l s='Do not try to submit your order again, as the funds have already been received.  We will review the order and provide a status shortly.' mod='stripejs'}<br /><br />
-		({l s='Your Order\'s Reference:' mod='stripejs'} <b>{$stripe_order.reference|escape:html:'UTF-8'}</b>)</div>
+		({l s='Your Order\'s Reference:' mod='stripejs'} <b>{$stripe_order.reference|escape:'html':'UTF-8'}</b>)</div>
 	{else}
 		<div class="error">{l s='Sorry, unfortunately an error occured during the transaction.' mod='stripejs'}<br /><br />
 		{l s='Please double-check your credit card details and try again or feel free to contact us to resolve this issue.' mod='stripejs'}<br /><br />
-		({l s='Your Order\'s Reference:' mod='stripejs'} <b>{$stripe_order.reference|escape:html:'UTF-8'}</b>)</div>
+		({l s='Your Order\'s Reference:' mod='stripejs'} <b>{$stripe_order.reference|escape:'html':'UTF-8'}</b>)</div>
 	{/if}
 {/if}
diff --git a/themes/default-bootstrap/modules/stripejs/payment.tpl b/themes/default-bootstrap/modules/stripejs/payment.tpl
index b0dc4ac75..291d869cb 100644
--- a/themes/default-bootstrap/modules/stripejs/payment.tpl
+++ b/themes/default-bootstrap/modules/stripejs/payment.tpl
@@ -30,7 +30,7 @@
 	{* This form will be displayed only if a previous credit card was saved *}
 	{if isset($stripe_save_tokens_ask) && $stripe_save_tokens_ask && isset($stripe_credit_card)}
 	<form action="{$module_dir}validation.php" method="POST" id="stripe-payment-form-cc">
-		<p>{l s='Pay with my saved Credit card (ending in' mod='stripejs'} {$stripe_credit_card|escape:html:'UTF-8'}{l s=')' mod='stripejs'}
+		<p>{l s='Pay with my saved Credit card (ending in' mod='stripejs'} {$stripe_credit_card|escape:'html':'UTF-8'}{l s=')' mod='stripejs'}
 		<input type="hidden" name="stripe_save_token" value="1" />
 		<input type="hidden" name="stripeToken" value="0" />
 		<button type="submit" class="stripe-submit-button-cc btn btn-default button-small"><span>{l s='Submit Payment' mod='stripejs'}<i class="icon-chevron-right right"></i></span></button></p>
@@ -40,7 +40,7 @@
 	{* Classic Credit card form *}
 	<div id="stripe-ajax-loader"><img src="{$module_dir}img/ajax-loader.gif" alt="" /> {l s='Transaction in progress, please wait.' mod='stripejs'}</div>
 	<form action="{$module_dir}validation.php" method="POST" id="stripe-payment-form"{if isset($stripe_save_tokens_ask) && $stripe_save_tokens_ask && isset($stripe_credit_card)} style="display: none;"{/if}>
-		<div class="stripe-payment-errors">{if isset($smarty.get.stripe_error)}{$smarty.get.stripe_error|base64_decode|escape:html:'UTF-8'}{/if}</div><a name="stripe_error" style="display:none"></a>
+		<div class="stripe-payment-errors">{if isset($smarty.get.stripe_error)}{$smarty.get.stripe_error|base64_decode|escape:'html':'UTF-8'}{/if}</div><a name="stripe_error" style="display:none"></a>
 		<div class="stripe-card-deleted"></div>
         <div class="form-group">
             <label>{l s='Card Number' mod='stripejs'}</label>
diff --git a/themes/default-bootstrap/my-account.tpl b/themes/default-bootstrap/my-account.tpl
index cc36284bb..0325c44a8 100644
--- a/themes/default-bootstrap/my-account.tpl
+++ b/themes/default-bootstrap/my-account.tpl
@@ -36,22 +36,22 @@
 	<div class="col-xs-12 col-sm-6 col-lg-4">
 		<ul class="myaccount-link-list">
             {if $has_customer_an_address}
-            <li><a href="{$link->getPageLink('address', true)|escape:'html'}" title="{l s='Add my first address'}"><i class="icon-building"></i><span>{l s='Add my first address'}</span></a></li>
+            <li><a href="{$link->getPageLink('address', true)|escape:'html':'UTF-8'}" title="{l s='Add my first address'}"><i class="icon-building"></i><span>{l s='Add my first address'}</span></a></li>
             {/if}
-            <li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='Orders'}"><i class="icon-list-ol"></i><span>{l s='Order history and details '}</span></a></li>
+            <li><a href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='Orders'}"><i class="icon-list-ol"></i><span>{l s='Order history and details '}</span></a></li>
             {if $returnAllowed}
-                <li><a href="{$link->getPageLink('order-follow', true)|escape:'html'}" title="{l s='Merchandise returns'}"><i class="icon-refresh"></i><span>{l s='My merchandise returns'}</span></a></li>
+                <li><a href="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" title="{l s='Merchandise returns'}"><i class="icon-refresh"></i><span>{l s='My merchandise returns'}</span></a></li>
             {/if}
-            <li><a href="{$link->getPageLink('order-slip', true)|escape:'html'}" title="{l s='Credit slips'}"><i class="icon-ban-circle"></i><span>{l s='My credit slips'}</span></a></li>
-            <li><a href="{$link->getPageLink('addresses', true)|escape:'html'}" title="{l s='Addresses'}"><i class="icon-building"></i><span>{l s='My addresses'}</span></a></li>
-            <li><a href="{$link->getPageLink('identity', true)|escape:'html'}" title="{l s='Information'}"><i class="icon-user"></i><span>{l s='My personal information'}</span></a></li>
+            <li><a href="{$link->getPageLink('order-slip', true)|escape:'html':'UTF-8'}" title="{l s='Credit slips'}"><i class="icon-ban-circle"></i><span>{l s='My credit slips'}</span></a></li>
+            <li><a href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" title="{l s='Addresses'}"><i class="icon-building"></i><span>{l s='My addresses'}</span></a></li>
+            <li><a href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" title="{l s='Information'}"><i class="icon-user"></i><span>{l s='My personal information'}</span></a></li>
         </ul>
 	</div>
 {if $voucherAllowed || isset($HOOK_CUSTOMER_ACCOUNT) && $HOOK_CUSTOMER_ACCOUNT !=''}
 	<div class="col-xs-12 col-sm-6 col-lg-4">
         <ul class="myaccount-link-list">
             {if $voucherAllowed}
-                <li><a href="{$link->getPageLink('discount', true)|escape:'html'}" title="{l s='Vouchers'}"><i class="icon-barcode"></i><span>{l s='My vouchers'}</span></a></li>
+                <li><a href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" title="{l s='Vouchers'}"><i class="icon-barcode"></i><span>{l s='My vouchers'}</span></a></li>
             {/if}
             {$HOOK_CUSTOMER_ACCOUNT}
         </ul>
diff --git a/themes/default-bootstrap/nbr-product-page.tpl b/themes/default-bootstrap/nbr-product-page.tpl
index 524669846..2d1fabda8 100644
--- a/themes/default-bootstrap/nbr-product-page.tpl
+++ b/themes/default-bootstrap/nbr-product-page.tpl
@@ -39,7 +39,7 @@
 	{/if}
 	<!-- nbr product/page -->
 	{if $nb_products > $products_per_page}
-		<form action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" method="get" class="nbrItemPage">
+		<form action="{if !is_array($requestNb)}{$requestNb|escape:'html':'UTF-8'}{else}{$requestNb.requestUrl|escape:'html':'UTF-8'}{/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:'html':'UTF-8'}" />
diff --git a/themes/default-bootstrap/order-address-multishipping.tpl b/themes/default-bootstrap/order-address-multishipping.tpl
index 0d30fd7dd..759d6fd8e 100644
--- a/themes/default-bootstrap/order-address-multishipping.tpl
+++ b/themes/default-bootstrap/order-address-multishipping.tpl
@@ -132,7 +132,7 @@
 
 {include file="$tpl_dir./order-address-multishipping-products.tpl"}
 
-<form action="{$link->getPageLink('order', true, NULL, 'multi-shipping=1')|escape:'html'}" method="post">
+<form action="{$link->getPageLink('order', true, NULL, 'multi-shipping=1')|escape:'html':'UTF-8'}" method="post">
 {else}
 <div id="opc_account" class="opc-main-block">
 	<div id="opc_account-overlay" class="opc-overlay" style="display: none;"></div>
@@ -151,7 +151,7 @@
 			</select>
         </div>
 		{else}
-			<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back}{/if}")|escape:'html'}" title="{l s='Add'}" class="button button-small btn btn-default"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
+			<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Add'}" class="button button-small btn btn-default"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
 		{/if}
 		</p>
 		<div class="row">
@@ -161,7 +161,7 @@
             </div>
 		</div>
 		<p class="address_add submit">
-			<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")|escape:'html'}" title="{l s='Add'}" class="button button-small btn btn-default"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
+			<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{'&multi-shipping=1'|urlencode}{if $back}&mod={$back|urlencode}{/if}")|escape:'html':'UTF-8'}" title="{l s='Add'}" class="button button-small btn btn-default"><span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span></a>
 		</p>
 		{if !$opc}
 		<div id="ordermsg" class="form-group">
@@ -175,9 +175,9 @@
 		<input type="hidden" class="hidden" name="step" value="2" />
 		<input type="hidden" name="back" value="{$back}" />
 		{if $back}
-			<a href="{$link->getPageLink('order', true, NULL, "step=0&amp;back={$back}")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Continue Shopping'}</a>
+			<a href="{$link->getPageLink('order', true, NULL, "step=0&amp;back={$back}")|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Continue Shopping'}</a>
 		{else}
-			<a href="{$link->getPageLink('order', true, NULL, "step=0")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Continue Shopping'}</a>
+			<a href="{$link->getPageLink('order', true, NULL, "step=0")|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-exclusive btn btn-default"><i class="icon-chevron-left"></i>{l s='Continue Shopping'}</a>
 		{/if}
         <button type="submit" name="processAddress" class="button btn btn-default button-medium"><span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span></button>
 	</p>
diff --git a/themes/default-bootstrap/order-address-product-line.tpl b/themes/default-bootstrap/order-address-product-line.tpl
index 4103f2a81..43db6159e 100644
--- a/themes/default-bootstrap/order-address-product-line.tpl
+++ b/themes/default-bootstrap/order-address-product-line.tpl
@@ -25,7 +25,7 @@
 *}
 <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:'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>
+		<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':'UTF-8'}" 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:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a></p>
@@ -42,17 +42,17 @@
 			<input size="2" type="text" class="cart_quantity_input form-control grey" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}"  name="quantity_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" />
 			<div class="cart_quantity_button">
 			{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
-			<a rel="nofollow" class="cart_quantity_down btn btn-default button-minus" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html'}" title="{l s='Subtract'}"><span><i class="icon-minus"></i></span></a>
+			<a rel="nofollow" class="cart_quantity_down btn btn-default button-minus" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}"><span><i class="icon-minus"></i></span></a>
 			{else}
 			<a class="cart_quantity_down btn btn-default button-minus disabled" href="#" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}"><span><i class="icon-minus"></i></span></a>
 			{/if}
-            <a rel="nofollow" class="cart_quantity_up btn btn-default button-plus" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
+            <a rel="nofollow" class="cart_quantity_up btn btn-default button-plus" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_0_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
 			</div>
 		{/if}
 	{/if}
 	</td>
 	<td>
-		<form method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")|escape:'html'}">
+		<form method="post" action="{$link->getPageLink('cart', true, NULL, "token={$token_cart}")|escape:'html':'UTF-8'}">
         	<div class="selector2">
                 <input type="hidden" name="id_product" value="{$product.id_product}" />
                 <input type="hidden" name="id_product_attribute" value="{$product.id_product_attribute}" />
diff --git a/themes/default-bootstrap/order-address.tpl b/themes/default-bootstrap/order-address.tpl
index 0f2f3dc3a..91acef329 100644
--- a/themes/default-bootstrap/order-address.tpl
+++ b/themes/default-bootstrap/order-address.tpl
@@ -123,13 +123,13 @@
 		<div class="button_multishipping_mode box" id="multishipping_mode_box">
 			<div class="title">{l s='Multi-shipping'}</div>
 			<div class="description">
-				<a class="btn btn-default button exclusive-medium" href="{$link->getPageLink('order', true, NULL, 'step=1&multi-shipping=1')|escape:'html'}"/>
+				<a class="btn btn-default button exclusive-medium" href="{$link->getPageLink('order', true, NULL, 'step=1&multi-shipping=1')|escape:'html':'UTF-8'}"/>
 					<span>{l s='Specify a delivery address for each product ordered.'}</span>
 				</a>
 			</div>
 		</div>
 	{/if}
-	<form action="{$link->getPageLink($back_order_page, true)|escape:'html'}" method="post">
+	<form action="{$link->getPageLink($back_order_page, true)|escape:'html':'UTF-8'}" method="post">
 {else}
 	{if {Configuration::get('PS_ALLOW_MULTISHIPPING')} && !$cart->isVirtualCart()}
 		<div class="address-form-multishipping">
@@ -142,7 +142,7 @@
 					</label>
 				</div>
 				<div class="description_off">
-					<a class="btn btn-default button exclusive-medium" href="{$link->getPageLink('order-opc', true, NULL, 'ajax=1&multi-shipping=1&method=multishipping')|escape:'html'}" id="link_multishipping_form" title="{l s='Choose the delivery address(es)'}">
+					<a class="btn btn-default button exclusive-medium" href="{$link->getPageLink('order-opc', true, NULL, 'ajax=1&multi-shipping=1&method=multishipping')|escape:'html':'UTF-8'}" id="link_multishipping_form" title="{l s='Choose the delivery address(es)'}">
 						<span>{l s='Specify a delivery address for each product.'}</span>
 					</a>
 				</div>
@@ -191,7 +191,7 @@
 					{/section}
 					</select>
 				{else}
-					<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1&select_address=1{if $back}&mod={$back}{/if}")|escape:'html'}" title="{l s='Add'}" class="button button-small btn btn-default">
+					<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1&select_address=1{if $back}&mod={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Add'}" class="button button-small btn btn-default">
 						<span>
 							{l s='Add a new address'}
 							<i class="icon-chevron-right right"></i>
@@ -212,7 +212,7 @@
 		</div>
 	</div> <!-- end row -->
 	<p class="address_add submit">
-		<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")|escape:'html'}" title="{l s='Add'}" class="button button-small btn btn-default">
+		<a href="{$link->getPageLink('address', true, NULL, "back={$back_order_page}?step=1{if $back}&mod={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Add'}" class="button button-small btn btn-default">
 			<span>{l s='Add a new address'}<i class="icon-chevron-right right"></i></span>
 		</a>
 	</p>
@@ -228,7 +228,7 @@
 		<p class="cart_navigation clearfix">
 			<input type="hidden" class="hidden" name="step" value="2" />
 			<input type="hidden" name="back" value="{$back}" />
-			<a href="{$link->getPageLink($back_order_page, true, NULL, "step=0{if $back}&back={$back}{/if}")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default">
+			<a href="{$link->getPageLink($back_order_page, true, NULL, "step=0{if $back}&back={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-exclusive btn btn-default">
 				<i class="icon-chevron-left"></i>
 				{l s='Continue Shopping'}
 			</a>
diff --git a/themes/default-bootstrap/order-carrier.tpl b/themes/default-bootstrap/order-carrier.tpl
index 528e76353..0c0688fad 100644
--- a/themes/default-bootstrap/order-carrier.tpl
+++ b/themes/default-bootstrap/order-carrier.tpl
@@ -87,7 +87,7 @@
 		{assign var='current_step' value='shipping'}
 		{include file="$tpl_dir./order-steps.tpl"}
 		{include file="$tpl_dir./errors.tpl"}
-		<form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html'}" method="post" onsubmit="return acceptCGV();">
+		<form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}" method="post" onsubmit="return acceptCGV();">
 	{else}
 		<div id="opc_delivery_methods" class="opc-main-block">
 			<div id="opc_delivery_methods-overlay" class="opc-overlay" style="display: none;"></div>
@@ -325,7 +325,7 @@
 								{if !$is_guest}
 									{if $back}
 										<a 
-											href="{$link->getPageLink('order', true, NULL, "step=1&back={$back}&multi-shipping={$multi_shipping}")|escape:'html'}"
+											href="{$link->getPageLink('order', true, NULL, "step=1&back={$back}&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
 											title="{l s='Previous'}"
 											class="button-exclusive btn btn-default">
 											<i class="icon-chevron-left"></i>
@@ -333,7 +333,7 @@
 										</a>
 									{else}
 										<a
-											href="{$link->getPageLink('order', true, NULL, "step=1&multi-shipping={$multi_shipping}")|escape:'html'}"
+											href="{$link->getPageLink('order', true, NULL, "step=1&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
 											title="{l s='Previous'}"
 											class="button-exclusive btn btn-default">
 											<i class="icon-chevron-left"></i>
@@ -342,7 +342,7 @@
 									{/if}
 								{else}
 									<a
-										href="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html'}"
+										href="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
 										title="{l s='Previous'}"
 										class="button-exclusive btn btn-default">
 										<i class="icon-chevron-left"></i>
diff --git a/themes/default-bootstrap/order-confirmation.tpl b/themes/default-bootstrap/order-confirmation.tpl
index 9638af0db..1bad9e3f7 100644
--- a/themes/default-bootstrap/order-confirmation.tpl
+++ b/themes/default-bootstrap/order-confirmation.tpl
@@ -37,10 +37,10 @@
 {if $is_guest}
 	<p>{l s='Your order ID is:'} <span class="bold">{$id_order_formatted}</span> . {l s='Your order ID has been sent via email.'}</p>
     <p class="cart_navigation exclusive">
-	<a class="button-exclusive btn btn-default" href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$reference_order}&email={$email}")|escape:'html'}" title="{l s='Follow my order'}"><i class="icon-chevron-left"></i>{l s='Follow my order'}</a>
+	<a class="button-exclusive btn btn-default" href="{$link->getPageLink('guest-tracking', true, NULL, "id_order={$reference_order}&email={$email}")|escape:'html':'UTF-8'}" title="{l s='Follow my order'}"><i class="icon-chevron-left"></i>{l s='Follow my order'}</a>
     </p>
 {else}
 <p class="cart_navigation exclusive">
-	<a class="button-exclusive btn btn-default" href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='Back to orders'}"><i class="icon-chevron-left"></i>{l s='Back to orders'}</a>
+	<a class="button-exclusive btn btn-default" href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" title="{l s='Back to orders'}"><i class="icon-chevron-left"></i>{l s='Back to orders'}</a>
 </p>
 {/if}
diff --git a/themes/default-bootstrap/order-detail.tpl b/themes/default-bootstrap/order-detail.tpl
index c931c5835..edfe785f1 100644
--- a/themes/default-bootstrap/order-detail.tpl
+++ b/themes/default-bootstrap/order-detail.tpl
@@ -112,7 +112,7 @@
     </div>
 </div>
 {$HOOK_ORDERDETAILDISPLAYED}
-{if !$is_guest}<form action="{$link->getPageLink('order-follow', true)|escape:'html'}" method="post">{/if}
+{if !$is_guest}<form action="{$link->getPageLink('order-follow', true)|escape:'html':'UTF-8'}" method="post">{/if}
 <div id="order-detail-content" class="table_block table-responsive">
 	<table class="table table-bordered">
 		<thead>
@@ -285,16 +285,16 @@
 							<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:'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'}">
+									<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':'UTF-8'}" title="{l s='Download this product'}">
 									{else}
-										<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'}">
+										<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html':'UTF-8'}" 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:'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>
+										<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':'UTF-8'}" 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:'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>
+									<a href="{$link->getPageLink('get-file', true, NULL, "key={$product.filename|escape:'html':'UTF-8'}-{$product.download_hash|escape:'html':'UTF-8'}")|escape:'html':'UTF-8'}" title="{l s='Download this product'}"> {$product.product_name|escape:'html':'UTF-8'} 	</a>
 									{/if}
 								{else}
 									{$product.product_name|escape:'html':'UTF-8'}
@@ -439,7 +439,7 @@
 		{l s='Message successfully sent'}
 	</p>
 	{/if}
-	<form action="{$link->getPageLink('order-detail', true)|escape:'html'}" method="post" class="std" id="sendOrderMessage">
+	<form action="{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}" method="post" class="std" id="sendOrderMessage">
 		<h3 class="page-heading bottom-indent">{l s='Add a message'}</h3>
 		<p>{l s='If you would like to add a comment about your order, please write it in the field below.'}</p>
 		<p class="form-group">
diff --git a/themes/default-bootstrap/order-follow.tpl b/themes/default-bootstrap/order-follow.tpl
index 90e0b4eb0..b41c1d2a8 100644
--- a/themes/default-bootstrap/order-follow.tpl
+++ b/themes/default-bootstrap/order-follow.tpl
@@ -24,7 +24,7 @@
 *}
 
 {capture name=path}
-	<a href="{$link->getPageLink('my-account', true)|escape:'html'}">
+	<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 		{l s='My account'}
 	</a>
 	<span class="navigation-pipe">
@@ -107,14 +107,14 @@
 					<td class="bold">
 						<a 
 						class="color-myaccount" 
-						href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html'}');">
+						href="javascript:showOrder(0, {$return.id_order_return|intval}, '{$link->getPageLink('order-return', true)|escape:'html':'UTF-8'}');">
 							{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'}');">
+						href="javascript:showOrder(1, {$return.id_order|intval}, '{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}');">
 							{l s='#'}{$return.id_order|string_format:"%06d"}
 						</a>
 					</td>
@@ -130,7 +130,7 @@
 						{if $return.state == 2}
 							<a 
 								class="link-button" 
-								href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$return.id_order_return|intval}")|escape:'html'}" 
+								href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$return.id_order_return|intval}")|escape:'html':'UTF-8'}" 
 								title="{l s='Order return'} {l s='#'}{$return.id_order_return|string_format:"%06d"}">
 								<i class="icon-file-text"></i> {l s='Print out'}
 							</a>
@@ -150,7 +150,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
+		<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'}
 			</span>
diff --git a/themes/default-bootstrap/order-opc-new-account.tpl b/themes/default-bootstrap/order-opc-new-account.tpl
index 20be9587c..2918b7c3b 100644
--- a/themes/default-bootstrap/order-opc-new-account.tpl
+++ b/themes/default-bootstrap/order-opc-new-account.tpl
@@ -1,7 +1,7 @@
 <div id="opc_new_account" class="opc-main-block">
 	<div id="opc_new_account-overlay" class="opc-overlay" style="display: none;"></div>
 	<h1 class="page-heading step-num"><span>1</span> {l s='Account'}</h1>
-	<form action="{$link->getPageLink('authentication', true, NULL, "back=order-opc")|escape:'html'}" method="post" id="login_form" class="box">
+	<form action="{$link->getPageLink('authentication', true, NULL, "back=order-opc")|escape:'html':'UTF-8'}" method="post" id="login_form" class="box">
 		<fieldset>
 			<h3 class="page-subheading">{l s='Already registered?'}</h3>
 			<p><a href="#" id="openLoginFormBlock">&raquo; {l s='Click here'}</a></p>
@@ -17,7 +17,7 @@
 					<label for="login_passwd">{l s='Password'}</label>
 					<input class="form-control" type="password" id="login_passwd" name="login_passwd" />
 				</p>
-                <a href="{$link->getPageLink('password', true)|escape:'html'}" class="lost_password">{l s='Forgot your password?'}</a>
+                <a href="{$link->getPageLink('password', true)|escape:'html':'UTF-8'}" 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:'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>
diff --git a/themes/default-bootstrap/order-payment.tpl b/themes/default-bootstrap/order-payment.tpl
index f65eff64d..b6c489621 100644
--- a/themes/default-bootstrap/order-payment.tpl
+++ b/themes/default-bootstrap/order-payment.tpl
@@ -265,7 +265,7 @@
 																<a
 																	id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
 																	class="cart_quantity_delete"
-																	href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
+																	href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 																	rel="nofollow">
 																	<img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" title="{l s='Delete this customization'}" width="11" height="13" class="icon" />
 																</a>
@@ -274,7 +274,7 @@
 																<a 
 																	id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
 																	class="cart_quantity_up"
-																	href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
+																	href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 																	rel="nofollow"
 																	title="{l s='Add'}">
 																	<img src="{$img_dir}icon/quantity_up.gif" alt="{l s='Add'}" width="14" height="9" />
@@ -284,7 +284,7 @@
 																	<a
 																		id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}"
 																		class="cart_quantity_down"
-																		href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}"
+																		href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 																		rel="nofollow"
 																		title="{l s='Subtract'}">
 																		<img src="{$img_dir}icon/quantity_down.gif" alt="{l s='Subtract'}" width="14" height="9" />
@@ -354,7 +354,7 @@
 				{/if}
 				{if !$opc}
 					<p class="cart_navigation clearfix">
-						<a href="{$link->getPageLink('order', true, NULL, "step=2")|escape:'html'}" title="{l s='Previous'}" class="button-exclusive btn btn-default">
+						<a href="{$link->getPageLink('order', true, NULL, "step=2")|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-exclusive btn btn-default">
 							<i class="icon-chevron-left"></i>
 							{l s='Continue shopping'}
 						</a>
diff --git a/themes/default-bootstrap/order-return.tpl b/themes/default-bootstrap/order-return.tpl
index 71172c8ac..bb82d1cb6 100644
--- a/themes/default-bootstrap/order-return.tpl
+++ b/themes/default-bootstrap/order-return.tpl
@@ -94,11 +94,11 @@
 	<div class="box">
     	<h3 class="page-subheading">{l s='Reminder:'}</h3>
 		- {l s='All merchandise must be returned in its original packaging and in its original state.'}
-		<br />- {l s='Please print out the'} <a href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$orderRet->id|intval}")|escape:'html'}">{l s='PDF return slip'}</a> {l s='and include it with your package.'}
-		<br />- {l s='Please see the PDF return slip'} (<a href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$orderRet->id|intval}")|escape:'html'}">{l s='for the correct address'}</a>)
+		<br />- {l s='Please print out the'} <a href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$orderRet->id|intval}")|escape:'html':'UTF-8'}">{l s='PDF return slip'}</a> {l s='and include it with your package.'}
+		<br />- {l s='Please see the PDF return slip'} (<a href="{$link->getPageLink('pdf-order-return', true, NULL, "id_order_return={$orderRet->id|intval}")|escape:'html':'UTF-8'}">{l s='for the correct address'}</a>)
 		<br /><br />
 		{l s='When we receive your package, we will notify you by email. We will then begin processing order reimbursement.'}
-		<br /><br /><a href="{$link->getPageLink('contact', true)|escape:'html'}">{l s='Please let us know if you have any questions.'}</a>
+		<br /><br /><a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}">{l s='Please let us know if you have any questions.'}</a>
 		<br />
 		<p class="bold">{l s='If the conditions of return listed above are not respected, we reserve the right to refuse your package and/or reimbursement.'}</p>
 	</div>
diff --git a/themes/default-bootstrap/order-slip.tpl b/themes/default-bootstrap/order-slip.tpl
index b1dc5316d..b08cc7451 100644
--- a/themes/default-bootstrap/order-slip.tpl
+++ b/themes/default-bootstrap/order-slip.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Credit slips'}</span>{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Credit slips'}</span>{/capture}
 
 <h1 class="page-heading bottom-indent">
 	{l s='Credit slips'}
@@ -51,7 +51,7 @@
 							</span>
 						</td>
 						<td class="history_method">
-							<a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')|escape:'html'}');">
+							<a class="color-myaccount" href="javascript:showOrder(1, {$slip.id_order|intval}, '{$link->getPageLink('order-detail')|escape:'html':'UTF-8'}');">
 								{l s='#%s' sprintf=$slip.id_order|string_format:"%06d"}
 							</a>
 						</td>
@@ -59,7 +59,7 @@
 							{dateFormat date=$slip.date_add full=0}
 						</td>
 						<td class="history_invoice">
-							<a class="link-button" href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")|escape:'html'}" title="{l s='Credit slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}">
+							<a class="link-button" href="{$link->getPageLink('pdf-order-slip', true, NULL, "id_order_slip={$slip.id_order_slip|intval}")|escape:'html':'UTF-8'}" title="{l s='Credit slip'} {l s='#%s' sprintf=$slip.id_order_slip|string_format:"%06d"}">
 								<i class="icon-file-text large"></i>{l s='PDF'}
 							</a>
 						</td>
@@ -75,7 +75,7 @@
 
 <ul class="footer_links clearfix">
 	<li>
-		<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html'}">
+		<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'}
 			</span>
diff --git a/themes/default-bootstrap/order-steps.tpl b/themes/default-bootstrap/order-steps.tpl
index bc269585e..350e336d5 100644
--- a/themes/default-bootstrap/order-steps.tpl
+++ b/themes/default-bootstrap/order-steps.tpl
@@ -46,7 +46,7 @@
 	</li>
 	<li class="{if $current_step=='login'}step_current{elseif $current_step=='address'}step_done step_done_last{else}{if $current_step=='payment' || $current_step=='shipping' || $current_step=='address'}step_done{else}step_todo{/if}{/if} second">
 		{if $current_step=='payment' || $current_step=='shipping' || $current_step=='address'}
-		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=1&multi-shipping={$multi_shipping}")|escape:'html'}">
+		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=1&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}">
 			<em>02.</em> {l s='Login'}
 		</a>
 		{else}
@@ -55,7 +55,7 @@
 	</li>
 	<li class="{if $current_step=='address'}step_current{elseif $current_step=='shipping'}step_done step_done_last{else}{if $current_step=='payment' || $current_step=='shipping'}step_done{else}step_todo{/if}{/if} third">
 		{if $current_step=='payment' || $current_step=='shipping'}
-		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=1&multi-shipping={$multi_shipping}")|escape:'html'}">
+		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=1&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}">
 			<em>03.</em> {l s='Address'}
 		</a>
 		{else}
@@ -64,7 +64,7 @@
 	</li>
 	<li class="{if $current_step=='shipping'}step_current{else}{if $current_step=='payment'}step_done step_done_last{else}step_todo{/if}{/if} four">
 		{if $current_step=='payment'}
-		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=2&multi-shipping={$multi_shipping}")|escape:'html'}">
+		<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=2&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}">
 			<em>04.</em> {l s='Shipping'}
 		</a>
 		{else}
diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl
index 7e7e31ea0..33437310e 100644
--- a/themes/default-bootstrap/pagination.tpl
+++ b/themes/default-bootstrap/pagination.tpl
@@ -52,7 +52,7 @@
 	    {if $nb_products > $products_per_page && $start!=$stop}
 			<form
 			class="showall" 
-			action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" 
+			action="{if !is_array($requestNb)}{$requestNb|escape:'html':'UTF-8'}{else}{$requestNb.requestUrl|escape:'html':'UTF-8'}{/if}" 
 			method="get">
 				<div>
 					{if isset($search_query) AND $search_query}
diff --git a/themes/default-bootstrap/password.tpl b/themes/default-bootstrap/password.tpl
index 1668ee364..03cd68a13 100644
--- a/themes/default-bootstrap/password.tpl
+++ b/themes/default-bootstrap/password.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{capture name=path}<a href="{$link->getPageLink('authentication', true)|escape:'html'}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Forgot your password'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" title="{l s='Authentication'}" rel="nofollow">{l s='Authentication'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Forgot your password'}{/capture}
 <div class="box">
 <h1 class="page-subheading">{l s='Forgot your password?'}</h1>
 
@@ -49,5 +49,5 @@
 {/if}
 </div>
 <ul class="clearfix footer_links">
-	<li><a class="btn btn-default button button-small" href="{$link->getPageLink('authentication')|escape:'html'}" title="{l s='Back to Login'}" rel="nofollow"><span><i class="icon-chevron-left"></i>{l s='Back to Login'}</span></a></li>
+	<li><a class="btn btn-default button button-small" href="{$link->getPageLink('authentication')|escape:'html':'UTF-8'}" title="{l s='Back to Login'}" rel="nofollow"><span><i class="icon-chevron-left"></i>{l s='Back to Login'}</span></a></li>
 </ul>
diff --git a/themes/default-bootstrap/product-compare.tpl b/themes/default-bootstrap/product-compare.tpl
index c5868bc51..c452e73ba 100644
--- a/themes/default-bootstrap/product-compare.tpl
+++ b/themes/default-bootstrap/product-compare.tpl
@@ -35,7 +35,7 @@
 //]]>
 </script>
 {/if}
-	<form method="post" action="{$link->getPageLink('products-comparison')|escape:htmlall:'UTF-8'}" onsubmit="true" class="compare-form">
+	<form method="post" action="{$link->getPageLink('products-comparison')|escape:'html':'UTF-8'}" onsubmit="true" class="compare-form">
 		<div>
         <button type="submit" class="btn btn-default button button-medium bt_compare{if isset($paginationId)}_{$paginationId}{/if}"><span>{l s='Compare'} (<strong class="total-compare-val">{count($compared_products)}</strong>)<i class="icon-chevron-right right"></i></span></button>
          <input type="hidden" name="compare_product_count" class="compare_product_count" value="{count($compared_products)}" />
diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl
index 526681721..30c05c5e4 100644
--- a/themes/default-bootstrap/product-list.tpl
+++ b/themes/default-bootstrap/product-list.tpl
@@ -39,7 +39,7 @@
 	{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
 	{math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet}
 	<!-- Products list -->
-	<ul{if isset($id) && $id} id="{$id}" {/if} class="product_list grid row{if isset($class) && $class} {$class}{/if}">
+	<ul{if isset($id) && $id} id="{$id}"{/if} class="product_list grid row{if isset($class) && $class} {$class}{/if}">
 	{foreach from=$products item=product name=products}
 		{math equation="(total%perLine)" total=$smarty.foreach.products.total perLine=$nbItemsPerLine assign=totModulo}
 		{math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}
@@ -58,7 +58,7 @@
 							itemprop="url">
 							<img 
 								class="replace-2x img-responsive" 
-								src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html'}" 
+								src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')|escape:'html':'UTF-8'}" 
 								alt="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
 								title="{if !empty($product.legend)}{$product.legend|escape:'html':'UTF-8'}{else}{$product.name|escape:'html':'UTF-8'}{/if}" 
 								{if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if}
@@ -144,7 +144,7 @@
 								{if isset($static_token)}
 									<a
 										class="button ajax_add_to_cart_button btn btn-default" 
-										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html'}"
+										href="{$link->getPageLink('cart',false, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;token={$static_token}", false)|escape:'html':'UTF-8'}"
 										rel="nofollow"
 										title="{l s='Add to cart'}"
 										data-id-product="{$product.id_product|intval}">
@@ -153,7 +153,7 @@
 								{else}
 									<a
 										class="button ajax_add_to_cart_button btn btn-default"
-										href="{$link->getPageLink('cart',false, NULL, 'add=1&amp;id_product={$product.id_product|intval}', false)|escape:'html'}"
+										href="{$link->getPageLink('cart',false, NULL, 'add=1&amp;id_product={$product.id_product|intval}', false)|escape:'html':'UTF-8'}"
 										rel="nofollow"
 										title="{l s='Add to cart'}"
 										data-id-product="{$product.id_product|intval}">
diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl
index fb144625f..98691c855 100644
--- a/themes/default-bootstrap/product.tpl
+++ b/themes/default-bootstrap/product.tpl
@@ -195,23 +195,23 @@
 						{if $jqZoomEnabled && $have_image && !$content_only}
 							<a
 								class="jqzoom"
-								title="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}"
+								title="{if !empty($cover.legend)}{$cover.legend|escape:'html':'UTF-8'}{else}{$product->name|escape:'html':'UTF-8'}{/if}"
 								rel="gal1"
-								href="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')|escape:'html'}"
+								href="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox_default')|escape:'html':'UTF-8'}"
 								itemprop="url">
 								<img
 									itemprop="image"
-									src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"
-									title="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}"
-									alt="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}"/>
+									src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html':'UTF-8'}"
+									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}"/>
 							</a>
 						{else}
 							<img
 								id="bigpic"
 								itemprop="image"
-								src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html'}"
-								title="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}"
-								alt="{if !empty($cover.legend)}{$cover.legend|escape:'html'}{else}{$product->name|escape:'html'}{/if}"
+								src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large_default')|escape:'html':'UTF-8'}"
+								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}"
 								width="{$largeSize.width}"
 								height="{$largeSize.height}"/>
 							{if !$content_only}
@@ -254,17 +254,17 @@
 							{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:'html'}
+									{assign var=imageTitlte value=$image.legend|escape:'html':'UTF-8'}
 								{else}
-									{assign var=imageTitlte value=$product->name|escape:'html'}
+									{assign var=imageTitlte value=$product->name|escape:'html':'UTF-8'}
 								{/if}
 								<li id="thumbnail_{$image.id_image}"{if $smarty.foreach.thumbnails.last} class="last"{/if}>
 									<a 
 										{if $jqZoomEnabled && $have_image && !$content_only}
 											href="javascript:void(0);"
-											rel="{literal}{{/literal}gallery: 'gal1', smallimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html'}',largeimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}'{literal}}{/literal}"
+											rel="{literal}{{/literal}gallery: 'gal1', smallimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'large_default')|escape:'html':'UTF-8'}',largeimage: '{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html':'UTF-8'}'{literal}}{/literal}"
 										{else}
-											href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html'}"
+											href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox_default')|escape:'html':'UTF-8'}"
 											data-fancybox-group="other-views"
 											class="thickbox{if $smarty.foreach.thumbnails.first} shown{/if}"
 										{/if}
@@ -272,7 +272,7 @@
 										<img
 											class="img-responsive"
 											id="thumb_{$image.id_image}"
-											src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html'}"
+											src="{$link->getImageLink($product->link_rewrite, $imageIds, 'medium_default')|escape:'html':'UTF-8'}"
 											alt="{$imageTitlte}"
 											title="{$imageTitlte}"
 											height="{$mediumSize.height}"
@@ -296,7 +296,7 @@
 			{if isset($images) && count($images) > 1}
 				<p class="resetimg clear">
 					<span id="wrapResetImages" style="display: none;">
-						<a id="resetImages" href="{$link->getProductLink($product)|escape:'html'}" onclick="$('span#wrapResetImages').hide('slow');return (false);">
+						<a id="resetImages" href="{$link->getProductLink($product)|escape:'html':'UTF-8'}" onclick="$('span#wrapResetImages').hide('slow');return (false);">
 							<i class="icon-repeat"></i>
 							{l s='Display all pictures'}
 						</a>
@@ -336,7 +336,7 @@
 							{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:'html':'UTF-8'}</a>
+								{$packItem.pack_quantity} x <a href="{$link->getProductLink($packItem.id_product, $packItem.link_rewrite, $packItem.category)|escape:'html':'UTF-8'}">{$packItem.name|escape:'html':'UTF-8'}</a>
 								<p>{$packItem.description_short}</p>
 							</div>
 							{/foreach}
@@ -374,7 +374,7 @@
 		
 			{if ($product->show_price AND !isset($restricted_country_mode)) OR isset($groups) OR $product->reference OR (isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS)}
 				<!-- add to cart form-->
-				<form id="buy_block" {if $PS_CATALOG_MODE AND !isset($groups) AND $product->quantity > 0}class="hidden"{/if} action="{$link->getPageLink('cart')|escape:'html'}" method="post">
+				<form id="buy_block" {if $PS_CATALOG_MODE AND !isset($groups) AND $product->quantity > 0}class="hidden"{/if} action="{$link->getPageLink('cart')|escape:'html':'UTF-8'}" method="post">
 					<!-- hidden datas -->
 					<p class="hidden">
 						<input type="hidden" name="token" value="{$static_token}" />
@@ -621,7 +621,7 @@
 												class="product-image product_image">
 												<img
 													class="lazyOwl"
-													src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'home_default')|escape:'html'}"
+													src="{$link->getImageLink($accessory.link_rewrite, $accessory.id_image, 'home_default')|escape:'html':'UTF-8'}"
 													alt="{$accessory.legend|escape:'html':'UTF-8'}"
 													width="{$homeSize.width}"
 													height="{$homeSize.height}"
@@ -654,7 +654,7 @@
 														<div>
 															<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'}"
+																href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$accessory.id_product|intval}&amp;token={$static_token}&amp;add")|escape:'html':'UTF-8'}"
 																data-id-product="{$accessory.id_product|intval}"
 																title="{l s='Add to cart'}">
 																<span>{l s='Add to cart'}</span>
@@ -728,7 +728,7 @@
 			<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'}">
+					<a href="{$link->getPageLink('attachment', true, NULL, "id_attachment={$attachment.id_attachment}")|escape:'html':'UTF-8'}">
 						<span>{$attachment.name|escape:'html':'UTF-8'}</span>
 					</a>
 					<br />
@@ -761,7 +761,7 @@
 											{if isset($pictures.$key)}
 												<div class="customizationUploadBrowse">
 													<img src="{$pic_dir}{$pictures.$key}_small" alt="" />
-														<a href="{$link->getProductDeletePictureLink($product, $field.id_customization_field)|escape:'html'}" title="{l s='Delete'}" >
+														<a href="{$link->getProductDeletePictureLink($product, $field.id_customization_field)|escape:'html':'UTF-8'}" title="{l s='Delete'}" >
 															<img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" class="customization_delete_icon" width="11" height="13" />
 														</a>
 												</div>
diff --git a/themes/default-bootstrap/products-comparison.tpl b/themes/default-bootstrap/products-comparison.tpl
index 4cf18d000..ae1b4abe5 100644
--- a/themes/default-bootstrap/products-comparison.tpl
+++ b/themes/default-bootstrap/products-comparison.tpl
@@ -51,7 +51,7 @@
 						<div class="remove">
 							<a 
 							class="cmp_remove" 
-							href="{$link->getPageLink('products-comparison', true)|escape:'html'}" 
+							href="{$link->getPageLink('products-comparison', true)|escape:'html':'UTF-8'}" 
 							title="{l s='Remove'}" 
 							data-id-product="{$product->id}">
 								<i class="icon-trash"></i>
@@ -60,12 +60,12 @@
 						<div class="product-image-block">
 							<a
 							class="product_image" 
-							href="{$product->getLink()|escape:html:'UTF-8'}" 
-							title="{$product->name|escape:html:'UTF-8'}">
+							href="{$product->getLink()|escape:'html':'UTF-8'}" 
+							title="{$product->name|escape:'html':'UTF-8'}">
 								<img 
 								class="img-responsive" 
-								src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html'}" 
-								alt="{$product->name|escape:html:'UTF-8'}" />
+								src="{$link->getImageLink($product->link_rewrite, $product->id_image, 'home_default')|escape:'html':'UTF-8'}" 
+								alt="{$product->name|escape:'html':'UTF-8'}" />
 							</a>
 							{if isset($product->show_price) && $product->show_price && !isset($restricted_country_mode) && !$PS_CATALOG_MODE}
 								{if $product->on_sale}
@@ -78,7 +78,7 @@
 						<h5>
 							<a 
 							class="product-name" 
-							href="{$product->getLink()|escape:html:'UTF-8'}" 
+							href="{$product->getLink()|escape:'html':'UTF-8'}" 
 							title="{$product->name|truncate:32:'...'|escape:'html':'UTF-8'}">
 								{$product->name|truncate:45:'...'|escape:'html':'UTF-8'}
 							</a>
@@ -147,7 +147,7 @@
 											<a
 												class="button ajax_add_to_cart_button btn btn-default"
 												data-id-product="{$product->id}"
-												href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$product->id}&amp;token={$static_token}&amp;add")|escape:'html'}"
+												href="{$link->getPageLink('cart', true, NULL, "qty=1&amp;id_product={$product->id}&amp;token={$static_token}&amp;add")|escape:'html':'UTF-8'}"
 												title="{l s='Add to cart'}">
 												<span>{l s='Add to cart'}</span>
 											</a>
@@ -159,7 +159,7 @@
 									{/if}
 									<a 
 									class="button lnk_view btn btn-default" 
-									href="{$product->getLink()|escape:html:'UTF-8'}" 
+									href="{$product->getLink()|escape:'html':'UTF-8'}" 
 									title="{l s='View'}">
 										<span>{l s='View'}</span>
 									</a>
diff --git a/themes/default-bootstrap/scenes.tpl b/themes/default-bootstrap/scenes.tpl
index 92de835d0..4154d152f 100644
--- a/themes/default-bootstrap/scenes.tpl
+++ b/themes/default-bootstrap/scenes.tpl
@@ -57,7 +57,7 @@ $(function () {ldelim}
 				</script>
 				<div id="scene_products_cluetip_{$scene_key}_{$product_key}_{$product.id_product}" style="display:none;">
                 	<div class="product-image-container">
-						<img class="img-responsive replace-2x" src="{$link->getImageLink($product.id_product, $imageIds, 'home_default')|escape:'html'}" alt="" />
+						<img class="img-responsive replace-2x" src="{$link->getImageLink($product.id_product, $imageIds, 'home_default')|escape:'html':'UTF-8'}" alt="" />
                     </div>
 					<p class="product-name"><span class="product_name">{$product.details->name}</span></p>
 					<div class="description">{$product.details->description_short|strip_tags|truncate:170:'...'}</div>
diff --git a/themes/default-bootstrap/shopping-cart-product-line.tpl b/themes/default-bootstrap/shopping-cart-product-line.tpl
index 15da9bf83..5430ee9fc 100644
--- a/themes/default-bootstrap/shopping-cart-product-line.tpl
+++ b/themes/default-bootstrap/shopping-cart-product-line.tpl
@@ -24,7 +24,7 @@
 *}
 <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:'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>
+		<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':'UTF-8'}" 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:'html':'UTF-8'}">{$product.name|escape:'html':'UTF-8'}</a></p>
@@ -71,7 +71,7 @@
 				<input size="2" type="text" autocomplete="off" class="cart_quantity_input form-control grey" value="{if $quantityDisplayed == 0 AND isset($customizedDatas.$productId.$productAttributeId)}{$customizedDatas.$productId.$productAttributeId|@count}{else}{$product.cart_quantity-$quantityDisplayed}{/if}"  name="quantity_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" />
 				<div class="cart_quantity_button clearfix">
 				{if $product.minimal_quantity < ($product.cart_quantity-$quantityDisplayed) OR $product.minimal_quantity <= 1}
-					<a rel="nofollow" class="cart_quantity_down btn btn-default button-minus" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html'}" title="{l s='Subtract'}">
+					<a rel="nofollow" class="cart_quantity_down btn btn-default button-minus" id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}">
 				<span><i class="icon-minus"></i></span>
 				</a>
 				{else}
@@ -79,7 +79,7 @@
 					<span><i class="icon-minus"></i></span>
 				</a>
 				{/if}
-                	<a rel="nofollow" class="cart_quantity_up btn btn-default button-plus" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
+                	<a rel="nofollow" class="cart_quantity_up btn btn-default button-plus" id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
 				</div>
 			{/if}
 		{/if}
@@ -102,7 +102,7 @@
 		<td class="cart_delete text-center" data-title="Delete">
 		{if (!isset($customizedDatas.$productId.$productAttributeId) OR $quantityDisplayed > 0) && empty($product.gift)}
 			<div>
-				<a rel="nofollow" title="{l s='Delete'}" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html'}"><i class="icon-trash"></i></a>
+				<a rel="nofollow" title="{l s='Delete'}" class="cart_quantity_delete" id="{$product.id_product}_{$product.id_product_attribute}_{if $quantityDisplayed > 0}nocustom{else}0{/if}_{$product.id_address_delivery|intval}" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}"><i class="icon-trash"></i></a>
 			</div>
 		{/if}
 		</td>
diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl
index 036f23d12..b96fa083e 100644
--- a/themes/default-bootstrap/shopping-cart.tpl
+++ b/themes/default-bootstrap/shopping-cart.tpl
@@ -66,7 +66,7 @@
 				<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:'html':'UTF-8'}">
-				<img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}"/>
+				<img src="{$link->getImageLink($lastProductAdded.link_rewrite, $lastProductAdded.id_image, 'small_default')|escape:'html':'UTF-8'}" alt="{$lastProductAdded.name|escape:'html':'UTF-8'}"/>
 			</a>
 			<div class="cart_last_product_content">
 				<p class="product-name">
@@ -357,7 +357,7 @@
 												<a
 													id="cart_quantity_down_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
 													class="cart_quantity_down btn btn-default button-minus"
-													href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html'}"
+													href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 													rel="nofollow"
 													title="{l s='Subtract'}">
 													<span><i class="icon-minus"></i></span>
@@ -374,7 +374,7 @@
 											<a
 												id="cart_quantity_up_{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
 												class="cart_quantity_up btn btn-default button-plus"
-												href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html'}"
+												href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery}&amp;id_customization={$id_customization}&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 												rel="nofollow"
 												title="{l s='Add'}">
 												<span><i class="icon-plus"></i></span>
@@ -389,7 +389,7 @@
 											<a
 												id="{$product.id_product}_{$product.id_product_attribute}_{$id_customization}_{$product.id_address_delivery|intval}"
 												class="cart_quantity_delete"
-												href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")|escape:'html'}"
+												href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;id_address_delivery={$product.id_address_delivery}&amp;token={$token_cart}")|escape:'html':'UTF-8'}"
 												rel="nofollow"
 												title="{l s='Delete'}">
 												<i class=" icon-trash"></i>
@@ -551,14 +551,14 @@
 	<p class="cart_navigation clearfix">
 		{if !$opc}
 			<a
-				href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}"
+				href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:'html':'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:'html':'UTF-8'}{/if}"
 				class="button btn btn-default standard-checkout button-medium"
 				title="{l s='Proceed to checkout'}">
 				<span>{l s='Proceed to checkout'}<i class="icon-chevron-right right"></i></span>
 			</a>
 			{if Configuration::get('PS_ALLOW_MULTISHIPPING')}
 				<a
-					href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:html:'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:html:'UTF-8'}{/if}&amp;multi-shipping=1"
+					href="{if $back}{$link->getPageLink('order', true, NULL, 'step=1&amp;back={$back}')|escape:'html':'UTF-8'}{else}{$link->getPageLink('order', true, NULL, 'step=1')|escape:'html':'UTF-8'}{/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>
diff --git a/themes/default-bootstrap/sitemap.tpl b/themes/default-bootstrap/sitemap.tpl
index 453d1b88d..1e1a1f01c 100644
--- a/themes/default-bootstrap/sitemap.tpl
+++ b/themes/default-bootstrap/sitemap.tpl
@@ -35,7 +35,7 @@
     		<ul>
     			<li>
                     <a 
-                    href="{$link->getPageLink('new-products')|escape:'html'}" 
+                    href="{$link->getPageLink('new-products')|escape:'html':'UTF-8'}" 
                     title="{l s='View a new product'}">
                         {l s='New products'}
                     </a>
@@ -43,14 +43,14 @@
     			{if !$PS_CATALOG_MODE}
         			<li>
                         <a 
-                        href="{$link->getPageLink('best-sales')|escape:'html'}" 
+                        href="{$link->getPageLink('best-sales')|escape:'html':'UTF-8'}" 
                         title="{l s='View top-selling products'}">
                             {l s='Best sellers'}
                         </a>
                     </li>
         			<li>
                         <a 
-                        href="{$link->getPageLink('prices-drop')|escape:'html'}" 
+                        href="{$link->getPageLink('prices-drop')|escape:'html':'UTF-8'}" 
                         title="{l s='View products with a price drop'}">
                             {l s='Price drop'}
                         </a>
@@ -59,7 +59,7 @@
     			{if $display_manufacturer_link OR $PS_DISPLAY_SUPPLIERS}
                     <li>
                         <a 
-                        href="{$link->getPageLink('manufacturer')|escape:'html'}" 
+                        href="{$link->getPageLink('manufacturer')|escape:'html':'UTF-8'}" 
                         title="{l s='View a list of manufacturers'}">
                             {l s='Manufacturers:'}
                         </a>
@@ -68,7 +68,7 @@
     			{if $display_supplier_link OR $PS_DISPLAY_SUPPLIERS}
                     <li>
                         <a 
-                        href="{$link->getPageLink('supplier')|escape:'html'}" 
+                        href="{$link->getPageLink('supplier')|escape:'html':'UTF-8'}" 
                         title="{l s='View a list of suppliers'}">
                             {l s='Suppliers:'}
                         </a>
@@ -86,7 +86,7 @@
         		{if $logged}
         			<li>
                         <a 
-                        href="{$link->getPageLink('my-account', true)|escape:'html'}" 
+                        href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}" 
                         rel="nofollow" 
                         title="{l s='Manage your customer account'}">
                             {l s='Your Account'}
@@ -94,7 +94,7 @@
                     </li>
         			<li>
                         <a 
-                        href="{$link->getPageLink('identity', true)|escape:'html'}" 
+                        href="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" 
                         rel="nofollow" 
                         title="{l s='Manage your personal information'}">
                             {l s='Personal information'}
@@ -102,7 +102,7 @@
                     </li>
         			<li>
                         <a 
-                        href="{$link->getPageLink('addresses', true)|escape:'html'}" 
+                        href="{$link->getPageLink('addresses', true)|escape:'html':'UTF-8'}" 
                         rel="nofollow" 
                         title="{l s='View a list of my addresses'}">
                             {l s='Addresses'}
@@ -111,7 +111,7 @@
         			{if $voucherAllowed}
                         <li>
                             <a 
-                            href="{$link->getPageLink('discount', true)|escape:'html'}" 
+                            href="{$link->getPageLink('discount', true)|escape:'html':'UTF-8'}" 
                             rel="nofollow" 
                             title="{l s='View a list of my discounts'}">
                                 {l s='Discounts'}
@@ -120,7 +120,7 @@
                         {/if}
         			<li>
                         <a 
-                        href="{$link->getPageLink('history', true)|escape:'html'}" 
+                        href="{$link->getPageLink('history', true)|escape:'html':'UTF-8'}" 
                         rel="nofollow"
                         title="{l s='View a list of my orders'}" >
                             {l s='Order history'}
@@ -129,7 +129,7 @@
         		{else}
         			<li>
                         <a 
-                        href="{$link->getPageLink('authentication', true)|escape:'html'}" 
+                        href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" 
                         rel="nofollow"
                         title="{l s='Authentication'}" >
                             {l s='Authentication'}
@@ -137,7 +137,7 @@
                     </li>
         			<li>
                         <a 
-                        href="{$link->getPageLink('authentication', true)|escape:'html'}"
+                        href="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}"
                         rel="nofollow" 
                         title="{l s='Create new account'}" >
                             {l s='Create new account'}
@@ -202,13 +202,13 @@
                     </li>
                 {/foreach}
                 <li>
-                    <a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='Contact'}">
+                    <a href="{$link->getPageLink('contact', true)|escape:'html':'UTF-8'}" 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'}">
+                        <a href="{$link->getPageLink('stores')|escape:'html':'UTF-8'}" title="{l s='List of our stores'}">
                             {l s='Our stores'}
                         </a>
                     </li>