diff --git a/themes/default-bootstrap/nbr-product-page.tpl b/themes/default-bootstrap/nbr-product-page.tpl
index 03612bd4a..524669846 100644
--- a/themes/default-bootstrap/nbr-product-page.tpl
+++ b/themes/default-bootstrap/nbr-product-page.tpl
@@ -39,11 +39,17 @@
 	{/if}
 	<!-- nbr product/page -->
 	{if $nb_products > $products_per_page}
-		<form action="{if !is_array($requestNb)}{$requestNb}{else}{$requestNb.requestUrl}{/if}" method="get" class="nbrItemPage">
+		<form action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'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'}" />{/if}
-				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
-				<label for="nb_item{if isset($paginationId)}_{$paginationId}{/if}">{l s='Show'}</label>
+				{if isset($search_query) AND $search_query}
+					<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />
+				{/if}
+				{if isset($tag) AND $tag AND !is_array($tag)}
+					<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />
+				{/if}
+				<label for="nb_item{if isset($paginationId)}_{$paginationId}{/if}">
+					{l s='Show'}
+				</label>
 				{if is_array($requestNb)}
 					{foreach from=$requestNb item=requestValue key=requestKey}
 						{if $requestKey != 'requestUrl'}
@@ -52,17 +58,17 @@
 					{/foreach}
 				{/if}
 				<select name="n" id="nb_item{if isset($paginationId)}_{$paginationId}{/if}" class="js-nb_item form-control" onchange="this.form.submit();">
-				{assign var="lastnValue" value="0"}
-				{foreach from=$nArray item=nValue}
-					{if $lastnValue <= $nb_products}
-						<option value="{$nValue|escape:'html':'UTF-8'}" {if $n == $nValue}selected="selected"{/if}>{$nValue|escape:'html':'UTF-8'}</option>
-					{/if}
-					{assign var="lastnValue" value=$nValue}
-				{/foreach}
+					{assign var="lastnValue" value="0"}
+					{foreach from=$nArray item=nValue}
+						{if $lastnValue <= $nb_products}
+							<option value="{$nValue|escape:'html':'UTF-8'}" {if $n == $nValue}selected="selected"{/if}>{$nValue|escape:'html':'UTF-8'}</option>
+						{/if}
+						{assign var="lastnValue" value=$nValue}
+					{/foreach}
 				</select>
 				<span>{l s='per page'}</span>
 			</div>
 		</form>
 	{/if}
 	<!-- /nbr product/page -->
-{/if}
+{/if}
\ No newline at end of file
diff --git a/themes/default-bootstrap/pagination.tpl b/themes/default-bootstrap/pagination.tpl
index dd03c6d21..8ab492c5e 100644
--- a/themes/default-bootstrap/pagination.tpl
+++ b/themes/default-bootstrap/pagination.tpl
@@ -50,7 +50,7 @@
 	<!-- Pagination -->
 	<div id="pagination{if isset($paginationId)}_{$paginationId}{/if}" class="pagination clearfix">
     {if $nb_products > $products_per_page && $start!=$stop}
-		<form action="{if !is_array($requestNb)}{$requestNb}{else}{$requestNb.requestUrl}{/if}" method="get" class="showall">
+		<form action="{if !is_array($requestNb)}{$requestNb|escape:htmlall:'UTF-8'}{else}{$requestNb.requestUrl|escape:htmlall:'UTF-8'}{/if}" method="get" class="showall">
 			<div>
 				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'html':'UTF-8'}" />{/if}
 				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'html':'UTF-8'}" />{/if}
diff --git a/themes/default-bootstrap/product-compare.tpl b/themes/default-bootstrap/product-compare.tpl
index 0009165d2..664e63270 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:'html'}" onsubmit="true" class="compare-form">
+	<form method="post" action="{$link->getPageLink('products-comparison')|escape:htmlall:'UTF-8'}" onsubmit="true" class="compare-form">
 		<div>
         <button type="submit" id="bt_compare{if isset($paginationId)}_{$paginationId}{/if}" class="btn btn-default button button-medium bt_compare"><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-colors.tpl b/themes/default-bootstrap/product-list-colors.tpl
index fa34696a1..3b8bffe1a 100644
--- a/themes/default-bootstrap/product-list-colors.tpl
+++ b/themes/default-bootstrap/product-list-colors.tpl
@@ -23,8 +23,15 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<ul id="color_to_pick_list" class="clearfix">
+<ul class="color_to_pick_list clearfix">
 	{foreach from=$colors_list item='color'}
-		<li><a href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'html':'UTF-8'}" id="color_{$color.id_product_attribute|intval}" class="color_pick" style="background: {$color.color};"></a></li>
+		<li>
+			<a
+			href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'html':'UTF-8'}"
+			id="color_{$color.id_product_attribute|intval}"
+			class="color_pick"
+			style="background: {$color.color};">
+			</a>
+		</li>
 	{/foreach}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl
index fc118839d..1c8324b7c 100644
--- a/themes/default-bootstrap/product.tpl
+++ b/themes/default-bootstrap/product.tpl
@@ -344,7 +344,6 @@
 				</div> <!-- end short_description_block -->
 			{/if}
 
-			
 			{if ($display_qties == 1 && !$PS_CATALOG_MODE && $product->available_for_order)}
 				<!-- number of item in stock -->
 				<p id="pQuantityAvailable"{if $product->quantity <= 0} style="display: none;"{/if}>
@@ -371,31 +370,6 @@
 			<div id="oosHook"{if $product->quantity > 0} style="display: none;"{/if}>
 				{$HOOK_PRODUCT_OOS}
 			</div>
-
-			{* {if isset($colors) && $colors}
-				<!-- colors -->
-				<div id="color_picker">
-					<p>{l s='Pick a color:' js=1}</p>
-					<div class="clear"></div>
-					<ul id="color_to_pick_list" class="clearfix">
-					{foreach from=$colors key='id_attribute' item='color'}
-					<li>
-						<a
-							id="color_{$id_attribute|intval}"
-							class="color_pick"
-							style="background: {$color.value};"
-							onclick="updateColorSelect({$id_attribute|intval});$('#wrapResetImages').show('slow');"
-							title="{$color.name}">
-								{if file_exists($col_img_dir|cat:$id_attribute|cat:'.jpg')}
-								<img src="{$img_col_dir}{$id_attribute}.jpg" alt="{$color.name}" width="20" height="20" />
-								{/if}
-						</a>
-					</li>
-					{/foreach}
-					</ul>
-					<div class="clear"></div>
-				</div>
-			{/if} *}
 		
 			{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-->
@@ -424,7 +398,6 @@
 					{if $have_image && !$jqZoomEnabled}{/if}
 				</ul>
 			{/if}
-
 		</div>
 		<!-- end left infos-->
 		
@@ -675,19 +648,19 @@
 										</div>
 										<div class="clearfix" style="margin-top:5px">
 											{if !$PS_CATALOG_MODE && ($accessory.allow_oosp || $accessory.quantity > 0)}
-											<div>
 												<div>
 													<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'}"
-															data-id-product="{$accessory.id_product|intval}"
-															title="{l s='Add to cart'}">
-															<span>{l s='Add to cart'}</span>
-														</a>
+														<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'}"
+																data-id-product="{$accessory.id_product|intval}"
+																title="{l s='Add to cart'}">
+																<span>{l s='Add to cart'}</span>
+															</a>
+														</div>
 													</div>
 												</div>
-											</div>
 											{/if}
 										</div>
 									</li>
@@ -699,12 +672,11 @@
 			</section>
 			<!--end Accessories -->
 		{/if}
-		
 
 		{if (isset($quantity_discounts) && count($quantity_discounts) > 0)}
 			<!-- quantity discount -->
 			<section class="page-product-box">
-			<h3 class="page-product-heading">{l s='Volume discounts'}</h3>
+				<h3 class="page-product-heading">{l s='Volume discounts'}</h3>
 				<div id="quantityDiscount">
 					<table class="std table-produst-discounts">
 						<thead>