From 37f9d31c0a487ecef1b6cb42b1bbb4ac6dc675de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 31 Dec 2012 12:06:28 +0100
Subject: [PATCH] [-] FO: Fix retrocompatibility for modules and old themes

---
 .../blockbestsellers-home.tpl                 |   4 +-
 modules/blockbestsellers/blockbestsellers.tpl |   5 +-
 modules/blockcart/blockcart.css               |   4 +-
 modules/blockcart/blockcart.tpl               |   4 +-
 modules/blockcategories/blockcategories.tpl   |   2 +-
 .../blockcategories_footer.tpl                |   2 +-
 modules/blockcms/blockcms.tpl                 |   4 +-
 modules/blockcontact/blockcontact.css         |   2 +-
 modules/blockcontact/blockcontact.tpl         |   2 +-
 .../blockcontactinfos/blockcontactinfos.tpl   |   2 +-
 modules/blocklayered/blocklayered.tpl         |   2 +-
 modules/blocklink/blocklink.tpl               |   4 +-
 .../blockmanufacturer/blockmanufacturer.tpl   |   2 +-
 modules/blockmyaccount/blockmyaccount.tpl     |   2 +-
 .../blockmyaccountfooter/blockmyaccount.css   |   6 +-
 .../blockmyaccountfooter.tpl                  |   2 +-
 modules/blocknewproducts/blocknewproducts.css |   2 +-
 modules/blocknewproducts/blocknewproducts.tpl |   4 +-
 modules/blocknewsletter/blocknewsletter.css   |   2 +-
 .../views/templates/hook/blocknewsletter.tpl  |   2 +-
 modules/blockrss/blockrss.tpl                 |   2 +-
 modules/blocksearch/blocksearch.tpl           |   2 +-
 modules/blocksocial/blocksocial.tpl           |   2 +-
 modules/blockspecials/blockspecials.css       |   4 +-
 modules/blockspecials/blockspecials.tpl       |   4 +-
 modules/blockstore/blockstore.tpl             |   2 +-
 modules/blocksupplier/blocksupplier.tpl       |   2 +-
 modules/blocktags/blocktags.tpl               |   2 +-
 modules/blockviewed/blockviewed.css           |   4 +-
 modules/blockviewed/blockviewed.tpl           |   4 +-
 modules/blockwishlist/blockwishlist.tpl       |   4 +-
 modules/homefeatured/homefeatured.css         |   2 +-
 modules/homefeatured/homefeatured.tpl         |   4 +-
 modules/productcomments/productcomments.css   |   2 +-
 modules/productcomments/productcomments.tpl   |   4 +-
 themes/default/css/global.css                 |  65 ++---
 .../blockbestsellers-home.tpl                 |  56 ++++
 .../blockbestsellers/blockbestsellers.tpl     |  52 ++++
 .../default/modules/blockcart/blockcart.tpl   | 178 ++++++++++++
 .../blockcategories/blockcategories.tpl       |  48 ++++
 .../blockcategories_footer.tpl                |  55 ++++
 .../blockcategories/category-tree-branch.tpl  |  39 +++
 themes/default/modules/blockcms/blockcms.tpl  |  66 +++++
 .../modules/blockcontact/blockcontact.tpl     |  33 +++
 .../blockcontactinfos/blockcontactinfos.tpl   |  37 +++
 .../modules/blocklayered/blocklayered.tpl     | 257 ++++++++++++++++++
 .../default/modules/blocklink/blocklink.tpl   |  43 +++
 .../blockmanufacturer/blockmanufacturer.tpl   |  57 ++++
 .../modules/blockmyaccount/blockmyaccount.tpl |  42 +++
 .../blockmyaccountfooter.tpl                  |  42 +++
 .../blocknewproducts/blocknewproducts.tpl     |  50 ++++
 .../blocknewsletter/blocknewsletter.tpl       |  51 ++++
 themes/default/modules/blockrss/blockrss.tpl  |  41 +++
 .../modules/blocksearch/blocksearch.tpl       |  41 +++
 .../modules/blocksocial/blocksocial.tpl       |  34 +++
 .../modules/blocksocial/blockspecials.tpl     |  61 +++++
 .../modules/blockspecials/blockspecials.tpl   |  61 +++++
 .../default/modules/blockstore/blockstore.tpl |  36 +++
 .../modules/blocksupplier/blocksupplier.tpl   |  59 ++++
 .../default/modules/blocktags/blocktags.tpl   |  39 +++
 .../modules/blockviewed/blockviewed.tpl       |  44 +++
 .../modules/blockwishlist/blockwishlist.tpl   |  65 +++++
 .../modules/homefeatured/homefeatured.tpl     |  66 +++++
 .../productcomments/productcomments.tpl       | 148 ++++++++++
 64 files changed, 1873 insertions(+), 96 deletions(-)
 create mode 100644 themes/default/modules/blockbestsellers/blockbestsellers-home.tpl
 create mode 100644 themes/default/modules/blockbestsellers/blockbestsellers.tpl
 create mode 100644 themes/default/modules/blockcart/blockcart.tpl
 create mode 100644 themes/default/modules/blockcategories/blockcategories.tpl
 create mode 100644 themes/default/modules/blockcategories/blockcategories_footer.tpl
 create mode 100644 themes/default/modules/blockcategories/category-tree-branch.tpl
 create mode 100644 themes/default/modules/blockcms/blockcms.tpl
 create mode 100644 themes/default/modules/blockcontact/blockcontact.tpl
 create mode 100644 themes/default/modules/blockcontactinfos/blockcontactinfos.tpl
 create mode 100644 themes/default/modules/blocklayered/blocklayered.tpl
 create mode 100644 themes/default/modules/blocklink/blocklink.tpl
 create mode 100644 themes/default/modules/blockmanufacturer/blockmanufacturer.tpl
 create mode 100644 themes/default/modules/blockmyaccount/blockmyaccount.tpl
 create mode 100644 themes/default/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
 create mode 100644 themes/default/modules/blocknewproducts/blocknewproducts.tpl
 create mode 100644 themes/default/modules/blocknewsletter/blocknewsletter.tpl
 create mode 100644 themes/default/modules/blockrss/blockrss.tpl
 create mode 100644 themes/default/modules/blocksearch/blocksearch.tpl
 create mode 100644 themes/default/modules/blocksocial/blocksocial.tpl
 create mode 100644 themes/default/modules/blocksocial/blockspecials.tpl
 create mode 100644 themes/default/modules/blockspecials/blockspecials.tpl
 create mode 100644 themes/default/modules/blockstore/blockstore.tpl
 create mode 100644 themes/default/modules/blocksupplier/blocksupplier.tpl
 create mode 100644 themes/default/modules/blocktags/blocktags.tpl
 create mode 100644 themes/default/modules/blockviewed/blockviewed.tpl
 create mode 100644 themes/default/modules/blockwishlist/blockwishlist.tpl
 create mode 100644 themes/default/modules/homefeatured/homefeatured.tpl
 create mode 100644 themes/default/modules/productcomments/productcomments.tpl

diff --git a/modules/blockbestsellers/blockbestsellers-home.tpl b/modules/blockbestsellers/blockbestsellers-home.tpl
index 993016294..2cc6e31ce 100644
--- a/modules/blockbestsellers/blockbestsellers-home.tpl
+++ b/modules/blockbestsellers/blockbestsellers-home.tpl
@@ -25,7 +25,7 @@
 
 <!-- MODULE Home Block best sellers -->
 <div id="best-sellers_block_center" class="block products_block">
-	<p class="title_block">{l s='Top sellers' mod='blockbestsellers'}</p>
+	<h4 class="title_block">{l s='Top sellers' mod='blockbestsellers'}</h4>
 	{if isset($best_sellers) AND $best_sellers}
 		<div class="block_content">
 			{assign var='liHeight' value=320}
@@ -36,7 +36,7 @@
 			<ul style="height:{$ulHeight}px;">
 			{foreach from=$best_sellers item=product name=myLoop}
 				<li style="border-bottom:0" class="ajax_block_product {if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 1}clear{/if} {if $smarty.foreach.myLoop.iteration > ($smarty.foreach.myLoop.total - ($smarty.foreach.myLoop.total % $nbItemsPerLine))}last_line{/if}">
-					<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></p>
+					<h5 class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></h5>
 					<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='blockbestsellers'}">{$product.description_short|strip_tags|truncate:130:'...'}</a></div>
 					<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" /></a>
 					<div>
diff --git a/modules/blockbestsellers/blockbestsellers.tpl b/modules/blockbestsellers/blockbestsellers.tpl
index 4446cc7a3..aa1bbee20 100644
--- a/modules/blockbestsellers/blockbestsellers.tpl
+++ b/modules/blockbestsellers/blockbestsellers.tpl
@@ -18,14 +18,15 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
 *  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2012 PrestaShop SA

+*  @copyright  2007-2012 PrestaShop SA
+
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
 <!-- MODULE Block best sellers -->
 <div id="best-sellers_block_right" class="block products_block">
-	<p class="title_block"><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
 	<div class="block_content">
 	{if $best_sellers|@count > 0}
 		<ul class="product_images">
diff --git a/modules/blockcart/blockcart.css b/modules/blockcart/blockcart.css
index 7938aabe9..04cf5f4d0 100644
--- a/modules/blockcart/blockcart.css
+++ b/modules/blockcart/blockcart.css
@@ -1,7 +1,7 @@
 /* Special style for block cart*/
 #left_column #cart_block, #right_column #cart_block {
 }
-#header  #cart_block .title_block {
+#header  #cart_block .title_block, #header  #cart_block h4 {
 	display: none;
 }
 #header #cart_block {
@@ -22,7 +22,7 @@
 	background:#eee
 }
 #cart_block.cart_block_hover {display:block}
-#cart_block .title_block  span {
+#cart_block .title_block  span, #header  #cart_block h4 {
 	float: right;
 	padding-left: 10px;
 	text-transform: none;
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 77b047bce..90ed3814e 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -43,13 +43,13 @@ var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
 
 <!-- MODULE Block cart -->
 <div id="cart_block" class="block exclusive">
-	<p class="title_block">
+	<h4 class="title_block">
 		<a href="{$link->getPageLink("$order_process", true)}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}</a>
 		{if $ajax_allowed}
 		<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="hidden"{/if}>&nbsp;</span>
 		<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="hidden"{/if}>&nbsp;</span>
 		{/if}
-	</p>
+	</h4>
 	<div class="block_content">
 	<!-- block summary -->
 	<div id="cart_block_summary" class="{if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !$ajax_allowed || !isset($colapseExpandStatus)}collapsed{else}expanded{/if}">
diff --git a/modules/blockcategories/blockcategories.tpl b/modules/blockcategories/blockcategories.tpl
index 2ea4775ee..8369f6824 100644
--- a/modules/blockcategories/blockcategories.tpl
+++ b/modules/blockcategories/blockcategories.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block categories module -->
 <div id="categories_block_left" class="block">
-	<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
+	<h4 class="title_block">{l s='Categories' mod='blockcategories'}</h4>
 	<div class="block_content">
 		<ul class="tree {if $isDhtml}dhtml{/if}">
 		{foreach from=$blockCategTree.children item=child name=blockCategTree}
diff --git a/modules/blockcategories/blockcategories_footer.tpl b/modules/blockcategories/blockcategories_footer.tpl
index 681f87130..a67db7bfc 100644
--- a/modules/blockcategories/blockcategories_footer.tpl
+++ b/modules/blockcategories/blockcategories_footer.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block categories module -->
 <div class="blockcategories_footer">
-	<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
+	<h4 class="title_block">{l s='Categories' mod='blockcategories'}</h4>
 <div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
 	<div style="float:left" class="list">
 		<ul class="tree {if $isDhtml}dhtml{/if}">
diff --git a/modules/blockcms/blockcms.tpl b/modules/blockcms/blockcms.tpl
index 09d0654c7..407cbc9f5 100755
--- a/modules/blockcms/blockcms.tpl
+++ b/modules/blockcms/blockcms.tpl
@@ -27,7 +27,7 @@
 	<!-- Block CMS module -->
 	{foreach from=$cms_titles key=cms_key item=cms_title}
 		<div id="informations_block_left_{$cms_key}" class="block informations_block_left">
-			<p class="title_block"><a href="{$cms_title.category_link}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></p>
+			<h4 class="title_block"><a href="{$cms_title.category_link}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></h4>
 			<ul class="block_content">
 				{foreach from=$cms_title.categories item=cms_page}
 					{if isset($cms_page.link)}<li class="bullet"><b style="margin-left:2em;">
@@ -45,7 +45,7 @@
 {else}
 	<!-- MODULE Block footer -->
 	<div class="block_various_links" id="block_various_links_footer">
-		<p class="title_block">{l s='Information' mod='blockcms'}</p>
+		<h4 class="title_block">{l s='Information' mod='blockcms'}</h4>
 		<ul>
 			{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" 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')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
diff --git a/modules/blockcontact/blockcontact.css b/modules/blockcontact/blockcontact.css
index 00a558f7f..92260328b 100644
--- a/modules/blockcontact/blockcontact.css
+++ b/modules/blockcontact/blockcontact.css
@@ -10,7 +10,7 @@
 	line-height: 18px
 }
 
-#contact_block p.title_block  {
+#contact_block .title_block,   #contact_block h4 {
 	padding:6px 11px;
 	font-size: 12px;
 	line-height: auto
diff --git a/modules/blockcontact/blockcontact.tpl b/modules/blockcontact/blockcontact.tpl
index f3a658697..f8534cdd6 100644
--- a/modules/blockcontact/blockcontact.tpl
+++ b/modules/blockcontact/blockcontact.tpl
@@ -24,7 +24,7 @@
 *}
 
 <div id="contact_block" class="block">
-	<p class="title_block">{l s='Contact us' mod='blockcontact'}</p>
+	<h4 class="title_block">{l s='Contact us' mod='blockcontact'}</h4>
 	<div class="block_content clearfix">
 			<p>{l s='Our hotline is available 24/7' mod='blockcontact'}</p>
 			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'htmlall':'UTF-8'}</p>{/if}
diff --git a/modules/blockcontactinfos/blockcontactinfos.tpl b/modules/blockcontactinfos/blockcontactinfos.tpl
index 20b5f2f21..aa122b29d 100644
--- a/modules/blockcontactinfos/blockcontactinfos.tpl
+++ b/modules/blockcontactinfos/blockcontactinfos.tpl
@@ -26,7 +26,7 @@
 
 <!-- MODULE Block contact infos -->
 <div id="block_contact_infos">
-	<p class="title_block">{l s='Contact us' mod='blockcontactinfos'}</p>
+	<h4 class="title_block">{l s='Contact us' mod='blockcontactinfos'}</h4>
 	<ul>
 		{if $blockcontactinfos_company != ''}<li><strong>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}</strong></li>{/if}
 		{if $blockcontactinfos_address != ''}<li><pre>{$blockcontactinfos_address|escape:'htmlall':'UTF-8'}</pre></li>{/if}
diff --git a/modules/blocklayered/blocklayered.tpl b/modules/blocklayered/blocklayered.tpl
index 88591c846..084650997 100644
--- a/modules/blocklayered/blocklayered.tpl
+++ b/modules/blocklayered/blocklayered.tpl
@@ -34,7 +34,7 @@ param_product_url = '';
 {/if}
 </script>
 <div id="layered_block_left" class="block">
-	<p class="title_block">{l s='Catalog' mod='blocklayered'}</p>
+	<h4 class="title_block">{l s='Catalog' mod='blocklayered'}</h4>
 	<div class="block_content">
 		<form action="#" id="layered_form">
 			<div>
diff --git a/modules/blocklink/blocklink.tpl b/modules/blocklink/blocklink.tpl
index 498ab27e9..4ce14bf9f 100644
--- a/modules/blocklink/blocklink.tpl
+++ b/modules/blocklink/blocklink.tpl
@@ -25,13 +25,13 @@
 
 <!-- Block links module -->
 <div id="links_block_left" class="block">
-	<p class="title_block">
+	<h4 class="title_block">
 	{if $url}
 		<a href="{$url|escape}">{$title|escape}</a>
 	{else}
 		{$title|escape}
 	{/if}
-	</p>
+	</h4>
 	<ul class="block_content bullet">
 	{foreach from=$blocklink_links item=blocklink_link}
 		{if isset($blocklink_link.$lang)} 
diff --git a/modules/blockmanufacturer/blockmanufacturer.tpl b/modules/blockmanufacturer/blockmanufacturer.tpl
index bcca3c24e..609517c6a 100644
--- a/modules/blockmanufacturer/blockmanufacturer.tpl
+++ b/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block manufacturers module -->
 <div id="manufacturers_block_left" class="block blockmanufacturer">
-	<p class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</p>
+	<h4 class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
 	<div class="block_content">
 {if $manufacturers}
 	{if $text_list}
diff --git a/modules/blockmyaccount/blockmyaccount.tpl b/modules/blockmyaccount/blockmyaccount.tpl
index e10a98132..e34837a7d 100644
--- a/modules/blockmyaccount/blockmyaccount.tpl
+++ b/modules/blockmyaccount/blockmyaccount.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block myaccount module -->
 <div class="block myaccount">
-	<p class="title_block"><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
 	<div class="block_content">
 		<ul class="bullet">
 			<li><a href="{$link->getPageLink('history', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
diff --git a/modules/blockmyaccountfooter/blockmyaccount.css b/modules/blockmyaccountfooter/blockmyaccount.css
index f9020b6fb..0d416fbcf 100644
--- a/modules/blockmyaccountfooter/blockmyaccount.css
+++ b/modules/blockmyaccountfooter/blockmyaccount.css
@@ -15,9 +15,9 @@
 
 
 /* block myaccount in footer */
-#footer .myaccount .title_block  {background: none;}
+#footer .myaccount .title_block, #footer .myaccount h4  {background: none;}
 #footer .myaccount .logout {display:none;}
-#footer .myaccount .title_block  {
+#footer .myaccount .title_block, #footer .myaccount h4  {
 	padding:0 0 10px 0;
 	background:none
 }
@@ -30,4 +30,4 @@
    background: none
 }
 #footer .myaccount li.lnk_wishlist img {display:none
-}
\ No newline at end of file
+}
diff --git a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
index 47329e797..ded55feba 100644
--- a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
+++ b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block myaccount module -->
 <div class="block myaccount">
-	<p class="title_block"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></h4>
 	<div class="block_content">
 		<ul class="bullet">
 			<li><a href="{$link->getPageLink('history', true)}" title="{l s='List of my orders' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My orders' mod='blockmyaccountfooter'}</a></li>
diff --git a/modules/blocknewproducts/blocknewproducts.css b/modules/blocknewproducts/blocknewproducts.css
index 7856f9cd9..1229699ca 100644
--- a/modules/blocknewproducts/blocknewproducts.css
+++ b/modules/blocknewproducts/blocknewproducts.css
@@ -38,7 +38,7 @@
 	text-align:right;
 }
 
-#new-products_block_right p.title_block  {
+#new-products_block_right p.title_block, #new-products_block_right h4  {
 	padding:6px 11px;
 	text-align:left;
 }
diff --git a/modules/blocknewproducts/blocknewproducts.tpl b/modules/blocknewproducts/blocknewproducts.tpl
index ec2d03f9d..69e1a22b2 100644
--- a/modules/blocknewproducts/blocknewproducts.tpl
+++ b/modules/blocknewproducts/blocknewproducts.tpl
@@ -25,7 +25,7 @@
 
 <!-- MODULE Block new products -->
 <div id="new-products_block_right" class="block products_block">
-	<p class="title_block"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
 	<div class="block_content">
 	{if $new_products !== false}
 		<ul class="product_images clearfix">
@@ -47,4 +47,4 @@
 	{/if}
 	</div>
 </div>
-<!-- /MODULE Block new products -->
\ No newline at end of file
+<!-- /MODULE Block new products -->
diff --git a/modules/blocknewsletter/blocknewsletter.css b/modules/blocknewsletter/blocknewsletter.css
index c2bd1279d..99baad51b 100644
--- a/modules/blocknewsletter/blocknewsletter.css
+++ b/modules/blocknewsletter/blocknewsletter.css
@@ -4,7 +4,7 @@
 	border:1px solid #ccc;
 	background:#eee;
 }
-#newsletter_block_left .title_block   {
+#newsletter_block_left .title_block, #newsletter_block_left h4  {
 	padding:0 0 12px 28px;
 	color:#666;
 	text-shadow:0 1px 0 #fff;
diff --git a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
index dae50de6b..58c267e95 100644
--- a/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
+++ b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl
@@ -26,7 +26,7 @@
 <!-- Block Newsletter module-->
 
 <div id="newsletter_block_left" class="block">
-	<p class="title_block">{l s='Newsletter' mod='blocknewsletter'}</p>
+	<h4 class="title_block">{l s='Newsletter' mod='blocknewsletter'}</h4>
 	<div class="block_content">
 	{if isset($msg) && $msg}
 		<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
diff --git a/modules/blockrss/blockrss.tpl b/modules/blockrss/blockrss.tpl
index 21b7a25d0..6fed50497 100644
--- a/modules/blockrss/blockrss.tpl
+++ b/modules/blockrss/blockrss.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block RSS module-->
 <div id="rss_block_left" class="block">
-	<p class="title_block">{$title}</p>
+	<h4 class="title_block">{$title}</h4>
 	<div class="block_content">
 		{if $rss_links}
 			<ul>
diff --git a/modules/blocksearch/blocksearch.tpl b/modules/blocksearch/blocksearch.tpl
index 6682885da..1a9407784 100644
--- a/modules/blocksearch/blocksearch.tpl
+++ b/modules/blocksearch/blocksearch.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block search module -->
 <div id="search_block_left" class="block exclusive">
-	<p class="title_block">{l s='Search' mod='blocksearch'}</p>
+	<h4 class="title_block">{l s='Search' mod='blocksearch'}</h4>
 	<form method="get" action="{$link->getPageLink('search', true)}" id="searchbox">
 		<p class="block_content">
 			<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
diff --git a/modules/blocksocial/blocksocial.tpl b/modules/blocksocial/blocksocial.tpl
index 05b5d6d2e..a10baf789 100644
--- a/modules/blocksocial/blocksocial.tpl
+++ b/modules/blocksocial/blocksocial.tpl
@@ -25,7 +25,7 @@
 *}
 
 <div id="social_block">
-	<p class="title_block">{l s='Follow us' mod='blocksocial'}</p>
+	<h4 class="title_block">{l s='Follow us' mod='blocksocial'}</h4>
 	<ul>
 		{if $facebook_url != ''}<li class="facebook"><a href="{$facebook_url|escape:html:'UTF-8'}">{l s='Facebook' mod='blocksocial'}</a></li>{/if}
 		{if $twitter_url != ''}<li class="twitter"><a href="{$twitter_url|escape:html:'UTF-8'}">{l s='Twitter' mod='blocksocial'}</a></li>{/if}
diff --git a/modules/blockspecials/blockspecials.css b/modules/blockspecials/blockspecials.css
index e12216f0e..30dfb46ee 100644
--- a/modules/blockspecials/blockspecials.css
+++ b/modules/blockspecials/blockspecials.css
@@ -5,7 +5,7 @@
 	text-align:right
 }
 
-#special_block_right p.title_block  {
+#special_block_right p.title_block, #special_block_right h4  {
 	padding:6px 11px;
 	text-align:left
 }
@@ -14,7 +14,7 @@
 	width: 130px;
 	border:none;
 }
-#special_block_right li .s_title_block {
+#special_block_right li .s_title_block, #special_block_right li h5 {
 	padding:0 0 3px 0;
 	font-size:12px;
 	text-align:left;
diff --git a/modules/blockspecials/blockspecials.tpl b/modules/blockspecials/blockspecials.tpl
index 83b5a98f8..2da985848 100644
--- a/modules/blockspecials/blockspecials.tpl
+++ b/modules/blockspecials/blockspecials.tpl
@@ -25,7 +25,7 @@
 
 <!-- MODULE Block specials -->
 <div id="special_block_right" class="block products_block exclusive blockspecials">
-	<p class="title_block"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
 	<div class="block_content">
 
 {if $special}
@@ -43,7 +43,7 @@
 					{/if}
 				{/if}
 
-					<p class="s_title_block"><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></p>
+					<h5 class="s_title_block"><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></h5>
 				{if !$PS_CATALOG_MODE}
 					<span class="price-discount">{if !$priceDisplay}{displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if}</span>
 					<span class="price">{if !$priceDisplay}{displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}{/if}</span>
diff --git a/modules/blockstore/blockstore.tpl b/modules/blockstore/blockstore.tpl
index d9be298fe..beb20ff64 100644
--- a/modules/blockstore/blockstore.tpl
+++ b/modules/blockstore/blockstore.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block stores module -->
 <div id="stores_block_left" class="block">
-	<p class="title_block"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></p>
+	<h4 class="title_block"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
 	<div class="block_content blockstore">
 		<p class="store_image"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a></p>
 		<p>
diff --git a/modules/blocksupplier/blocksupplier.tpl b/modules/blocksupplier/blocksupplier.tpl
index 6288781e7..366af61af 100644
--- a/modules/blocksupplier/blocksupplier.tpl
+++ b/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')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</p>
+	<h4 class="title_block">{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
 	<div class="block_content">
 {if $suppliers}
 	{if $text_list}
diff --git a/modules/blocktags/blocktags.tpl b/modules/blocktags/blocktags.tpl
index e98e951b0..8ed55750c 100644
--- a/modules/blocktags/blocktags.tpl
+++ b/modules/blocktags/blocktags.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block tags module -->
 <div id="tags_block_left" class="block tags_block">
-	<p class="title_block">{l s='Tags' mod='blocktags'}</p>
+	<h4 class="title_block">{l s='Tags' mod='blocktags'}</h4>
 	<p class="block_content">
 {if $tags}
 	{foreach from=$tags item=tag name=myLoop}
diff --git a/modules/blockviewed/blockviewed.css b/modules/blockviewed/blockviewed.css
index 1b91acb94..dad9cf128 100644
--- a/modules/blockviewed/blockviewed.css
+++ b/modules/blockviewed/blockviewed.css
@@ -16,14 +16,14 @@
 	margin-left: 10px;
    width: 130px;
 }
-#viewed-products_block_left li .text_desc .s_title_block {
+#viewed-products_block_left li .text_desc .s_title_block, #viewed-products_block_left li .text_desc h5 {
 	padding:0 0 5px 0;
 	font-size:12px;
 	color:#333;
 	font-weight: bold;
 }
 
-#viewed-products_block_left li .text_desc .s_title_block a{
+#viewed-products_block_left li .text_desc .s_title_block a, #viewed-products_block_left li .text_desc h5 a {
 	color:#333;
 }
 #viewed-products_block_left li .text_desc p,
diff --git a/modules/blockviewed/blockviewed.tpl b/modules/blockviewed/blockviewed.tpl
index 6dec116ef..07066a23b 100644
--- a/modules/blockviewed/blockviewed.tpl
+++ b/modules/blockviewed/blockviewed.tpl
@@ -25,7 +25,7 @@
 
 <!-- Block Viewed products -->
 <div id="viewed-products_block_left" class="block products_block">
-	<p class="title_block">{l s='Viewed products' mod='blockviewed'}</p>
+	<h4 class="title_block">{l s='Viewed products' mod='blockviewed'}</h4>
 	<div class="block_content">
 		<ul class="products clearfix">
 			{foreach from=$productsViewedObj item=viewedProduct name=myLoop}
@@ -34,7 +34,7 @@
 					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" />
 					</a>
 					<div class="text_desc">
-						<p class="s_title_block"><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></p>
+						<h5 class="s_title_block"><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></h5>
 						<p><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
 					</div>
 				</li>
diff --git a/modules/blockwishlist/blockwishlist.tpl b/modules/blockwishlist/blockwishlist.tpl
index ec734beb9..18c589f17 100644
--- a/modules/blockwishlist/blockwishlist.tpl
+++ b/modules/blockwishlist/blockwishlist.tpl
@@ -24,9 +24,9 @@
 *}
 
 <div id="wishlist_block" class="block account">
-	<p class="title_block">
+	<h4 class="title_block">
 		<a href="{$wishlist_link}">{l s='Wishlist' mod='blockwishlist'}</a>
-	</p>
+	</h4>
 	<div class="block_content">
 		<div id="wishlist_block_list" class="expanded">
 		{if $wishlist_products}
diff --git a/modules/homefeatured/homefeatured.css b/modules/homefeatured/homefeatured.css
index fc320ffaa..d0fc2aef4 100644
--- a/modules/homefeatured/homefeatured.css
+++ b/modules/homefeatured/homefeatured.css
@@ -5,7 +5,7 @@
 	height:240px
 }
 #featured-products_block_center li.last_item_of_line  {margin-right:0;}
-#featured-products_block_center .s_title_block {
+#featured-products_block_center .s_title_block,  #featured-products_block_center h5 {
 	padding-top:5px;
 	height:30px;
 	font-size:12px;
diff --git a/modules/homefeatured/homefeatured.tpl b/modules/homefeatured/homefeatured.tpl
index ae6be501d..82a6105be 100644
--- a/modules/homefeatured/homefeatured.tpl
+++ b/modules/homefeatured/homefeatured.tpl
@@ -25,7 +25,7 @@
 
 <!-- MODULE Home Featured Products -->
 <div id="featured-products_block_center" class="block products_block clearfix">
-	<p class="title_block">{l s='Featured products' mod='homefeatured'}</p>
+	<h4 class="title_block">{l s='Featured products' mod='homefeatured'}</h4>
 	{if isset($products) AND $products}
 		<div class="block_content">
 			{assign var='liHeight' value=250}
@@ -39,7 +39,7 @@
 				{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
 				<li class="ajax_block_product {if $smarty.foreach.homeFeaturedProducts.first}first_item{elseif $smarty.foreach.homeFeaturedProducts.last}last_item{else}item{/if} {if $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 1} {/if} {if $smarty.foreach.homeFeaturedProducts.iteration > ($smarty.foreach.homeFeaturedProducts.total - $totModulo)}last_line{/if}">
 					<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" />{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='homefeatured'}</span>{/if}</a>
-					<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></p>
+					<h5 class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h5>
 					<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='homefeatured'}">{$product.description_short|strip_tags|truncate:65:'...'}</a></div>
 					<div>
 						<a class="lnk_more" href="{$product.link}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>
diff --git a/modules/productcomments/productcomments.css b/modules/productcomments/productcomments.css
index 14d7461e3..51dca697b 100644
--- a/modules/productcomments/productcomments.css
+++ b/modules/productcomments/productcomments.css
@@ -185,7 +185,7 @@
 	overflow:hidden;
 	width: 360px
 }
-#product_comments_block_tab div.comment_details .title_block  {padding-bottom:10px}
+#product_comments_block_tab div.comment_details .title_block, #product_comments_block_tab div.comment_details h4  {padding-bottom:10px}
 #product_comments_block_tab div.comment_details p {padding-bottom:10px}
 #product_comments_block_tab div.comment_details ul {
 	list-style-type:none;
diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl
index d2dd81006..4acf32922 100644
--- a/modules/productcomments/productcomments.tpl
+++ b/modules/productcomments/productcomments.tpl
@@ -52,8 +52,8 @@ var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
 					</div>
 				</div>
 				<div class="comment_details">
-					<p class="title_block">{$comment.title}</p>
-					<p>{$comment.content|escape:'html':'UTF-8'|nl2br}</p>
+					<h4 class="title_block">{$comment.title}</h4>
+					<h4>{$comment.content|escape:'html':'UTF-8'|nl2br}</h4>
 					<ul>
 						{if $comment.total_advice > 0}
 							<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful,$comment.total_advice] mod='productcomments'}</li>
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 858e97d36..c06fd77c9 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -55,9 +55,6 @@ body{
 	color:#222;
 	background:#fff
 }
-body.content_only {
-	background: #FFF;
-}
 
 /* positionnement ****************************************************************************** */
 .hidden {display:none}
@@ -79,7 +76,7 @@ h3 {
 	padding-bottom:20px;
 	font-size:16px
 }
-.title_block {
+h4 {
 	padding-bottom:20px;
 	font-size:14px
 }
@@ -129,17 +126,6 @@ a, a:active, a:visited {
 }
 	a:hover {text-decoration:underline}
 
-	
-/* HACK IOS ipad, iphone */
-input[type="text"], input[type="email"], input[type="search"], input[type="password"], input[type="submit"], input[type="image"] {
-	-webkit-appearance:none;
-	-moz-appearance:none;
-	appearance:none;
-	-webkit-border-radius:0px !important;
-	-moz-border-radius:0px !important;
-	border-radius:0px !important;
-}
-	
 /*buttons ************************************************************************************** */
 input.button_mini, input.button_small, input.button, input.button_large,
 input.button_mini_disabled, input.button_small_disabled, input.button_disabled, input.button_large_disabled,
@@ -153,9 +139,9 @@ span.exclusive_mini, span.exclusive_small, span.exclusive, span.exclusive_large,
 	display:inline-block;
 	padding:5px 7px;
 	border:1px solid #cc9900;
-	-moz-border-radius: 3px !important;
-	-webkit-border-radius: 3px !important;
-	border-radius: 3px !important;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 	font-weight:bold;
 	color:#000;
 	background:url(../img/bg_bt.gif) repeat-x 0 0 #f4b61b;
@@ -234,7 +220,7 @@ input.button_small, input.button_small_disabled, input.exclusive_small, input.ex
 input.button_disabled, input.exclusive_disabled, span.exclusive {
 	border:1px solid #ccc;
 	color:#999;
-	background:url(../img/bg_bt_2.gif) repeat-x 0 0 #CCCCCC;
+	background:url(../img/bg_bt_2.gif) repeat-x 0 0 #f4b61b;
 	cursor:default;
 }
 input.button_large, input.button_large_disabled, input.exclusive_large, input.exclusive_large_disabled, a.button_large, a.exclusive_large, span.button_large, span.exclusive_large, span.exclusive_large_disabled {
@@ -287,17 +273,15 @@ table.table_block  td {
 /* BLOCK .block ******************************************************************************** */
 .block {margin-bottom:20px}
 #footer .block {margin-bottom:0}
-	.block .title_block  {
+	.block .title_block, .block h4 {
 		padding:6px 11px;
 		font-size:12px;
 		color:#fff;
 		text-shadow:0 1px 0 #000;
 		text-transform:uppercase;
-		background:#383838;
-		text-align:left;
-		font-weight: bold;
+		background:#383838
 	}
-		.block .title_block  a {color:#fff}
+	.block .title_block a, .block h4 a {color:#fff}
 	.block ul {list-style-type:none}
 		.block li.last {	border:none}
 			.block li a {
@@ -579,12 +563,12 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
 		width:175px
 	}
 	.blockcategories_footer {margin-left:0}
-#footer .title_block  {
+#footer h4 {
 	padding-bottom: 10px;
 	text-transform:uppercase
 }
-#footer .title_block ,
-#footer .title_block  a {
+#footer h4,
+#footer h4 a {
 	font-weight:normal;
 	font-size:14px;
 	color:#fff
@@ -596,7 +580,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
 #footer li a {color:#fff}
 
 #footer .myaccount {padding: 15px 10px}
-#footer .myaccount .title_block  {
+#footer .myaccount h4 {
 	padding:0 0 10px 0;
 	background:none;
 	text-shadow:none
@@ -803,9 +787,9 @@ table#cart_summary #total_price_container {
 	border-bottom:1px solid #999;
 }
 
-.cart_voucher .title_block ,
+.cart_voucher h4,
 .cart_voucher p {float:left;}
-.cart_voucher .title_block  {
+.cart_voucher h4 {
 	margin-right:12px;
 	padding:5px 0;
 	font-size:13px
@@ -813,20 +797,13 @@ table#cart_summary #total_price_container {
 .cart_voucher p {padding-bottom:0;}
 .cart_voucher #display_cart_vouchers {
 	clear:both;
-	line-height: 20px;
+	line-height: 16px;
 	color:#666;
-	padding-top:2px;
 	font-weight:normal;
 	border-top:1px dotted #ccc
 }
-.cart_voucher .title_offers {
-	margin-top:15px;
-	margin-bottom:5px
-}
-.cart_voucher #display_cart_vouchers span {
-	font-weight:bold;
-	cursor:pointer;
-}
+.cart_voucher #display_cart_vouchers .title_offers {margin-top:10px}
+.cart_voucher #display_cart_vouchers span {font-weight:bold}
 .cart_voucher input.discount_name {
 	padding:0 5px;
 	height:22px;
@@ -883,7 +860,7 @@ table#cart_summary .cart_total_price .total_price_container {
 	border:1px solid #999;
 	background:#fff
 }
-#order_carrier .title_block  {
+#order_carrier h4 {
 	padding:0 15px;
 	height: 29px;
 	font-weight: bold;
@@ -942,7 +919,7 @@ table#cart_summary .gift-icon {
 	text-transform:uppercase;
 	background:url(../img/bg_form_h3.png) repeat-x 0 0 #989898
 }
-#create-account_form .title_block  {
+#create-account_form h4 {
 	padding-bottom:22px;
 	font-size:11px;
 	color:#333
@@ -1768,7 +1745,7 @@ ul#suppliers_list li .right_side {float:right;}
 /* ************************************************************************************************
 		addon customer privacy
 ************************************************************************************************ */
-#account-creation_form fieldset.customerprivacy label, fieldset.customerprivacy label{
+#account-creation_form fieldset.customerprivacy label{
 	padding-bottom:0;
 	font-size:14px;
 	text-align:left;
@@ -2086,5 +2063,3 @@ tr.subitem > td:first-child + td {
 	padding:0;
 	text-align:center
 }
-
-.ie7 #featured-products_block_center .product_image span.new {top:-20px;right:-19px}
diff --git a/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl b/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl
new file mode 100644
index 000000000..993016294
--- /dev/null
+++ b/themes/default/modules/blockbestsellers/blockbestsellers-home.tpl
@@ -0,0 +1,56 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Home Block best sellers -->
+<div id="best-sellers_block_center" class="block products_block">
+	<p class="title_block">{l s='Top sellers' mod='blockbestsellers'}</p>
+	{if isset($best_sellers) AND $best_sellers}
+		<div class="block_content">
+			{assign var='liHeight' value=320}
+			{assign var='nbItemsPerLine' value=4}
+			{assign var='nbLi' value=$best_sellers|@count}
+			{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
+			{math equation="nbLines*liHeight" nbLines=$nbLines|ceil liHeight=$liHeight assign=ulHeight}
+			<ul style="height:{$ulHeight}px;">
+			{foreach from=$best_sellers item=product name=myLoop}
+				<li style="border-bottom:0" class="ajax_block_product {if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.myLoop.iteration%$nbItemsPerLine == 1}clear{/if} {if $smarty.foreach.myLoop.iteration > ($smarty.foreach.myLoop.total - ($smarty.foreach.myLoop.total % $nbItemsPerLine))}last_line{/if}">
+					<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:32:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:27:'...'|escape:'htmlall':'UTF-8'}</a></p>
+					<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='blockbestsellers'}">{$product.description_short|strip_tags|truncate:130:'...'}</a></div>
+					<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" /></a>
+					<div>
+						{if !$PS_CATALOG_MODE}<p class="price_container"><span class="price">{$product.price}</span></p>{else}<div style="height:21px;"></div>{/if}			
+						<a class="button" href="{$product.link}" title="{l s='View' mod='blockbestsellers'}">{l s='View' mod='blockbestsellers'}</a>
+					</div>
+				</li>
+			{/foreach}
+			</ul>
+			<p class="clearfix" style="padding: 5px;"><a style="float:right;" href="{$link->getPageLink('best-sales')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
+		</div>
+	{else}
+		<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
+	{/if}
+	<br class="clear"/>
+</div>
+<!-- /MODULE Home Block best sellers -->
diff --git a/themes/default/modules/blockbestsellers/blockbestsellers.tpl b/themes/default/modules/blockbestsellers/blockbestsellers.tpl
new file mode 100644
index 000000000..4446cc7a3
--- /dev/null
+++ b/themes/default/modules/blockbestsellers/blockbestsellers.tpl
@@ -0,0 +1,52 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA

+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Block best sellers -->
+<div id="best-sellers_block_right" class="block products_block">
+	<p class="title_block"><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></p>
+	<div class="block_content">
+	{if $best_sellers|@count > 0}
+		<ul class="product_images">
+			{foreach from=$best_sellers item=product name=myLoop}
+			<li class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} clearfix">
+				<a href="{$product.link}" title="{$product.legend|escape:'htmlall':'UTF-8'}" class="content_img clearfix">
+					<span class="number">{$smarty.foreach.myLoop.iteration}</span>
+					<img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'small_default')}" height="{$smallSize.height}" width="{$smallSize.width}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" />
+				
+				</a>
+				<p><a href="{$product.link}" title="{$product.legend|escape:'htmlall':'UTF-8'}">
+					{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}<br />
+					<span class="price">{$product.price}</span>
+				</a></p>
+			</li>
+		{/foreach}
+		</ul>
+		<p class="lnk"><a href="{$link->getPageLink('best-sales')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">&raquo; {l s='All best sellers' mod='blockbestsellers'}</a></p>
+	{else}
+		<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
+	{/if}
+	</div>
+</div>
+<!-- /MODULE Block best sellers -->
diff --git a/themes/default/modules/blockcart/blockcart.tpl b/themes/default/modules/blockcart/blockcart.tpl
new file mode 100644
index 000000000..77b047bce
--- /dev/null
+++ b/themes/default/modules/blockcart/blockcart.tpl
@@ -0,0 +1,178 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{*************************************************************************************************************************************}
+{* IMPORTANT : If you change some data here, you have to report these changes in the ./blockcart-json.js (to let ajaxCart available) *}
+{*************************************************************************************************************************************}
+{if $ajax_allowed}
+<script type="text/javascript">
+var CUSTOMIZE_TEXTFIELD = {$CUSTOMIZE_TEXTFIELD};
+var img_dir = '{$img_dir}';
+</script>
+{/if}
+<script type="text/javascript">
+var customizationIdMessage = '{l s='Customization #' mod='blockcart' js=1}';
+var removingLinkText = '{l s='remove this product from my cart' mod='blockcart' js=1}';
+var freeShippingTranslation = '{l s='Free shipping!' mod='blockcart' js=1}';
+var freeProductTranslation = '{l s='Free!' mod='blockcart' js=1}';
+var delete_txt = '{l s='Delete' mod='blockcart' js=1}';
+</script>
+
+
+<!-- MODULE Block cart -->
+<div id="cart_block" class="block exclusive">
+	<p class="title_block">
+		<a href="{$link->getPageLink("$order_process", true)}" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}</a>
+		{if $ajax_allowed}
+		<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="hidden"{/if}>&nbsp;</span>
+		<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="hidden"{/if}>&nbsp;</span>
+		{/if}
+	</p>
+	<div class="block_content">
+	<!-- block summary -->
+	<div id="cart_block_summary" class="{if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !$ajax_allowed || !isset($colapseExpandStatus)}collapsed{else}expanded{/if}">
+		<span class="ajax_cart_quantity" {if $cart_qties <= 0}style="display:none;"{/if}>{$cart_qties}</span>
+		<span class="ajax_cart_product_txt_s" {if $cart_qties <= 1}style="display:none"{/if}>{l s='products' mod='blockcart'}</span>
+		<span class="ajax_cart_product_txt" {if $cart_qties > 1}style="display:none"{/if}>{l s='product' mod='blockcart'}</span>
+		<span class="ajax_cart_total" {if $cart_qties == 0}style="display:none"{/if}>
+			{if $cart_qties > 0}
+				{if $priceDisplay == 1}
+					{convertPrice price=$cart->getOrderTotal(false)}
+				{else}
+					{convertPrice price=$cart->getOrderTotal(true)}
+				{/if}
+			{/if}
+		</span>
+		<span class="ajax_cart_no_product" {if $cart_qties != 0}style="display:none"{/if}>{l s='(empty)' mod='blockcart'}</span>
+	</div>
+	<!-- block list of products -->
+	<div id="cart_block_list" class="{if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !$ajax_allowed || !isset($colapseExpandStatus)}expanded{else}collapsed{/if}">
+	{if $products}
+		<dl class="products">
+		{foreach from=$products item='product' name='myLoop'}
+			{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}">
+				<span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span>
+				<a class="cart_block_product_name" href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)}" title="{$product.name|escape:html:'UTF-8'}">
+				{$product.name|truncate:13:'...'|escape:html:'UTF-8'}</a>
+				<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId) && ($product.total > 0)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart', true, NULL, "delete&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)}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
+				<span class="price">
+					{if $product.total > 0}
+						{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}
+					{else}
+						<b>{l s='Free!' mod='blockcart'}</b>
+					{/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}">
+				<a href="{$link->getProductLink($product, $product.link_rewrite, $product.category, null, null, $product.id_shop, $product.id_product_attribute)}" title="{l s='Product detail' mod='blockcart'}">{$product.attributes_small}</a>
+			{/if}
+
+			<!-- Customizable datas -->
+			{if isset($customizedDatas.$productId.$productAttributeId[$product.id_address_delivery])}
+				{if !isset($product.attributes_small)}<dd id="cart_block_combination_of_{$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}">{/if}
+				<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&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}", true)}" 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|escape:html:'UTF-8'|replace:"<br />":" "|truncate:28}
+							{else}
+							{l s='Customization #%d:' sprintf=$id_customization|intval mod='blockcart'}
+							{/if}
+						</li>
+					{/foreach}
+				</ul>
+				{if !isset($product.attributes_small)}</dd>{/if}
+			{/if}
+
+			{if isset($product.attributes_small)}</dd>{/if}
+
+		{/foreach}
+		</dl>
+	{/if}
+		<p {if $products}class="hidden"{/if} id="cart_block_no_products">{l s='No products' mod='blockcart'}</p>
+	{if $discounts|@count > 0}
+		<table id="vouchers">
+			<tbody>
+					{foreach from=$discounts item=discount}
+						{if $discount.value_real > 0}
+						<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
+							<td class="quantity">1x</td>
+							<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
+							<td class="price">-{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}</td>
+							<td class="delete">
+								{if strlen($discount.code)}
+									<a class="delete_voucher" href="{$link->getPageLink('$order_process', true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete' mod='blockcart'}" rel="nofollow"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete' mod='blockcart'}" class="icon" /></a>
+								{/if}
+							</td>
+						</tr>
+						{/if}
+					{/foreach}
+			</tbody>
+		</table>
+		{/if}
+		
+		<p id="cart-prices">
+			<span id="cart_block_shipping_cost" class="price ajax_cart_shipping_cost">{$shipping_cost}</span>
+			<span>{l s='Shipping' mod='blockcart'}</span>
+			<br/>
+			{if $show_wrapping}
+				{assign var='cart_flag' value='Cart::ONLY_WRAPPING'|constant}
+				<span id="cart_block_wrapping_cost" class="price cart_block_wrapping_cost">{if $priceDisplay == 1}{convertPrice price=$cart->getOrderTotal(false, $cart_flag)}{else}{convertPrice price=$cart->getOrderTotal(true, $cart_flag)}{/if}</span>
+				<span>{l s='Wrapping' mod='blockcart'}</span>
+				<br/>
+			{/if}
+			{if $show_tax && isset($tax_cost)}
+				<span id="cart_block_tax_cost" class="price ajax_cart_tax_cost">{$tax_cost}</span>
+				<span>{l s='Tax' mod='blockcart'}</span>
+				<br/>
+			{/if}
+			<span id="cart_block_total" class="price ajax_block_cart_total">{$total}</span>
+			<span>{l s='Total' mod='blockcart'}</span>
+		</p>
+		{if $use_taxes && $display_tax_label == 1 && $show_tax}
+			{if $priceDisplay == 0}
+				<p id="cart-price-precisions">
+					{l s='Prices are tax included' mod='blockcart'}
+				</p>
+			{/if}
+			{if $priceDisplay == 1}
+				<p id="cart-price-precisions">
+					{l s='Prices are tax excluded' mod='blockcart'}
+				</p>
+			{/if}
+		{/if}
+		<p id="cart-buttons">
+			{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process", true)}" class="button_small" title="{l s='View my shopping cart' mod='blockcart'}" rel="nofollow">{l s='Cart' mod='blockcart'}</a>{/if}
+			<a href="{$link->getPageLink("$order_process", true)}" id="button_order_cart" class="exclusive{if $order_process == 'order-opc'}_large{/if}" title="{l s='Check out' mod='blockcart'}" rel="nofollow"><span></span>{l s='Check out' mod='blockcart'}</a>
+		</p>
+	</div>
+	</div>
+</div>
+<!-- /MODULE Block cart -->
+
diff --git a/themes/default/modules/blockcategories/blockcategories.tpl b/themes/default/modules/blockcategories/blockcategories.tpl
new file mode 100644
index 000000000..2ea4775ee
--- /dev/null
+++ b/themes/default/modules/blockcategories/blockcategories.tpl
@@ -0,0 +1,48 @@
+{*
+* 2007-2012 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-2012 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 categories module -->
+<div id="categories_block_left" class="block">
+	<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
+	<div class="block_content">
+		<ul class="tree {if $isDhtml}dhtml{/if}">
+		{foreach from=$blockCategTree.children item=child name=blockCategTree}
+			{if $smarty.foreach.blockCategTree.last}
+				{include file="$branche_tpl_path" node=$child last='true'}
+			{else}
+				{include file="$branche_tpl_path" node=$child}
+			{/if}
+		{/foreach}
+		</ul>
+		{* Javascript moved here to fix bug #PSCFI-151 *}
+		<script type="text/javascript">
+		// <![CDATA[
+			// we hide the tree only if JavaScript is activated
+			$('div#categories_block_left ul.dhtml').hide();
+		// ]]>
+		</script>
+	</div>
+</div>
+<!-- /Block categories module -->
diff --git a/themes/default/modules/blockcategories/blockcategories_footer.tpl b/themes/default/modules/blockcategories/blockcategories_footer.tpl
new file mode 100644
index 000000000..681f87130
--- /dev/null
+++ b/themes/default/modules/blockcategories/blockcategories_footer.tpl
@@ -0,0 +1,55 @@
+{*
+* 2007-2012 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-2012 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 categories module -->
+<div class="blockcategories_footer">
+	<p class="title_block">{l s='Categories' mod='blockcategories'}</p>
+<div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
+	<div style="float:left" class="list">
+		<ul class="tree {if $isDhtml}dhtml{/if}">
+	
+		{foreach from=$blockCategTree.children item=child name=blockCategTree}
+			{if $smarty.foreach.blockCategTree.last}
+				{include file="$branche_tpl_path" node=$child last='true'}
+			{else}
+				{include file="$branche_tpl_path" node=$child}
+			{/if}
+		
+			{if ($smarty.foreach.blockCategTree.iteration mod $numberColumn) == 0 AND !$smarty.foreach.blockCategTree.last}
+		</ul>
+	</div>
+</div>
+
+<div class="category_footer" style="float:left;clear:none;width:{$widthColumn}%">
+		<div style="float:left" class="list">
+		<ul class="tree {if $isDhtml}dhtml{/if}">
+			{/if}
+			{/foreach}
+		</ul>
+	</div>
+</div>
+<br class="clear"/>
+</div>
+<!-- /Block categories module -->
diff --git a/themes/default/modules/blockcategories/category-tree-branch.tpl b/themes/default/modules/blockcategories/category-tree-branch.tpl
new file mode 100644
index 000000000..1f5790a5d
--- /dev/null
+++ b/themes/default/modules/blockcategories/category-tree-branch.tpl
@@ -0,0 +1,39 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<li {if isset($last) && $last == 'true'}class="last"{/if}>
+	<a href="{$node.link|escape:'htmlall':'UTF-8'}" {if isset($currentCategoryId) && $node.id == $currentCategoryId}class="selected"{/if} title="{$node.desc|escape:'htmlall':'UTF-8'}">{$node.name|escape:'htmlall':'UTF-8'}</a>
+	{if $node.children|@count > 0}
+		<ul>
+		{foreach from=$node.children item=child name=categoryTreeBranch}
+			{if $smarty.foreach.categoryTreeBranch.last}
+				{include file="$branche_tpl_path" node=$child last='true'}
+			{else}
+				{include file="$branche_tpl_path" node=$child last='false'}
+			{/if}
+		{/foreach}
+		</ul>
+	{/if}
+</li>
diff --git a/themes/default/modules/blockcms/blockcms.tpl b/themes/default/modules/blockcms/blockcms.tpl
new file mode 100644
index 000000000..09d0654c7
--- /dev/null
+++ b/themes/default/modules/blockcms/blockcms.tpl
@@ -0,0 +1,66 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{if $block == 1}
+	<!-- Block CMS module -->
+	{foreach from=$cms_titles key=cms_key item=cms_title}
+		<div id="informations_block_left_{$cms_key}" class="block informations_block_left">
+			<p class="title_block"><a href="{$cms_title.category_link}">{if !empty($cms_title.name)}{$cms_title.name}{else}{$cms_title.category_name}{/if}</a></p>
+			<ul class="block_content">
+				{foreach from=$cms_title.categories item=cms_page}
+					{if isset($cms_page.link)}<li class="bullet"><b style="margin-left:2em;">
+					<a href="{$cms_page.link}" title="{$cms_page.name|escape:html:'UTF-8'}">{$cms_page.name|escape:html:'UTF-8'}</a>
+					</b></li>{/if}
+				{/foreach}
+				{foreach from=$cms_title.cms item=cms_page}
+					{if isset($cms_page.link)}<li><a href="{$cms_page.link}" 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')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
+			</ul>
+		</div>
+	{/foreach}
+	<!-- /Block CMS module -->
+{else}
+	<!-- MODULE Block footer -->
+	<div class="block_various_links" id="block_various_links_footer">
+		<p class="title_block">{l s='Information' mod='blockcms'}</p>
+		<ul>
+			{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" 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')}" 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')}" 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')}" 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)}" 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}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
+				{/if}
+			{/foreach}
+			<li><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockcms'}">{l s='Sitemap' mod='blockcms'}</a></li>
+			{if $display_poweredby}<li class="last_item">{l s='Powered by' mod='blockcms'} <a target="_blank" href="http://www.prestashop.com">PrestaShop</a>&trade;</li>{/if}
+		</ul>
+	{$footer_text}
+	</div>
+	<!-- /MODULE Block footer -->
+{/if}
diff --git a/themes/default/modules/blockcontact/blockcontact.tpl b/themes/default/modules/blockcontact/blockcontact.tpl
new file mode 100644
index 000000000..f3a658697
--- /dev/null
+++ b/themes/default/modules/blockcontact/blockcontact.tpl
@@ -0,0 +1,33 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @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>{l s='Our hotline is available 24/7' mod='blockcontact'}</p>
+			{if $telnumber != ''}<p class="tel"><span class="label">{l s='Phone:' mod='blockcontact'}</span>{$telnumber|escape:'htmlall':'UTF-8'}</p>{/if}
+			{if $email != ''}<a href="mailto:{$email|escape:'htmlall':'UTF-8'}">{l s='Contact our hotline' mod='blockcontact'}</a>{/if}
+	</div>
+</div>
diff --git a/themes/default/modules/blockcontactinfos/blockcontactinfos.tpl b/themes/default/modules/blockcontactinfos/blockcontactinfos.tpl
new file mode 100644
index 000000000..20b5f2f21
--- /dev/null
+++ b/themes/default/modules/blockcontactinfos/blockcontactinfos.tpl
@@ -0,0 +1,37 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Block contact infos -->
+<div id="block_contact_infos">
+	<p class="title_block">{l s='Contact us' mod='blockcontactinfos'}</p>
+	<ul>
+		{if $blockcontactinfos_company != ''}<li><strong>{$blockcontactinfos_company|escape:'htmlall':'UTF-8'}</strong></li>{/if}
+		{if $blockcontactinfos_address != ''}<li><pre>{$blockcontactinfos_address|escape:'htmlall':'UTF-8'}</pre></li>{/if}
+		{if $blockcontactinfos_phone != ''}<li>{l s='Tel:' mod='blockcontactinfos'} {$blockcontactinfos_phone|escape:'htmlall':'UTF-8'}</li>{/if}
+		{if $blockcontactinfos_email != ''}<li>{l s='Email:' mod='blockcontactinfos'} {mailto address=$blockcontactinfos_email|escape:'htmlall':'UTF-8' encode="hex"}</li>{/if}
+	</ul>
+</div>
+<!-- /MODULE Block contact infos -->
diff --git a/themes/default/modules/blocklayered/blocklayered.tpl b/themes/default/modules/blocklayered/blocklayered.tpl
new file mode 100644
index 000000000..88591c846
--- /dev/null
+++ b/themes/default/modules/blocklayered/blocklayered.tpl
@@ -0,0 +1,257 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registred Trademark & Property of PrestaShop SA
+*}
+
+<!-- Block layered navigation module -->
+{if $nbr_filterBlocks != 0}
+<script type="text/javascript">
+current_friendly_url = '#{$current_friendly_url}';
+{if version_compare($smarty.const._PS_VERSION_,'1.5','>')}
+param_product_url = '#{$param_product_url}';
+{else}
+param_product_url = '';
+{/if}
+</script>
+<div id="layered_block_left" class="block">
+	<p class="title_block">{l s='Catalog' mod='blocklayered'}</p>
+	<div class="block_content">
+		<form action="#" id="layered_form">
+			<div>
+				{if isset($selected_filters) && $n_filters > 0}
+				<div id="enabled_filters">
+					<span class="layered_subtitle" style="float: none;">{l s='Enabled filters:' mod='blocklayered'}</span>
+					<ul>
+					{foreach from=$selected_filters key=filter_type item=filter_values}
+						{foreach from=$filter_values key=filter_key item=filter_value name=f_values}
+							{foreach from=$filters item=filter}
+								{if $filter.type == $filter_type && isset($filter.values)}
+									{if isset($filter.slider)}
+										{if $smarty.foreach.f_values.first}
+											<li>
+												<a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}">x</a>
+												{$filter.name|escape:html:'UTF-8'}{l s=':' mod='blocklayered'}
+												{if $filter.format}
+													{displayPrice price=$filter.values[0]} - 
+													{displayPrice price=$filter.values[1]}
+												{else}
+													{$filter.values[0]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'} - 
+													{$filter.values[1]|escape:html:'UTF-8'}{$filter.unit|escape:html:'UTF-8'}
+												{/if}
+											</li>
+										{/if}
+									{else}
+										{foreach from=$filter.values key=id_value item=value}
+											{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group' && $filter.type neq 'id_feature'}
+												<li>
+													<a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}">x</a>
+													{$filter.name|escape:html:'UTF-8'}{l s=':' mod='blocklayered'} {$value.name|escape:html:'UTF-8'}
+												</li>
+											{/if}
+										{/foreach}
+									{/if}
+								{/if}
+							{/foreach}
+						{/foreach}
+					{/foreach}
+					</ul>
+				</div>
+				{/if}
+				{foreach from=$filters item=filter}
+					{if isset($filter.values)}
+						{if isset($filter.slider)}
+						<div class="layered_{$filter.type}" style="display: none;">
+						{else}
+						<div>
+						{/if}
+						<span class="layered_subtitle">{$filter.name|escape:html:'UTF-8'}</span>
+						<span class="layered_close"><a href="#" rel="ul_layered_{$filter.type}_{$filter.id_key}">v</a></span>
+						<div class="clear"></div>
+						<ul id="ul_layered_{$filter.type}_{$filter.id_key}">
+						{if !isset($filter.slider)}
+							{if $filter.filter_type == 0}
+								{foreach from=$filter.values key=id_value item=value name=fe}
+									{if $value.nbr || !$hide_0_values}
+									<li class="nomargin {if $smarty.foreach.fe.index >= $filter.filter_show_limit}hiddable{/if}">
+										{if isset($filter.is_color_group) && $filter.is_color_group}
+											<input class="color-option {if isset($value.checked) && $value.checked}on{/if} {if !$value.nbr}disable{/if}" type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_id_attribute_group_{$id_value}" {if !$value.nbr}disabled="disabled"{/if} style="background: {if isset($value.color)}{if file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/co/$id_value.jpg")}url(img/co/{$id_value}.jpg){else}{$value.color}{/if}{else}#CCC{/if};" />
+											{if isset($value.checked) && $value.checked}<input type="hidden" name="layered_{$filter.type_lite}_{$id_value}" value="{$id_value}" />{/if}
+										{else}
+											<input type="checkbox" class="checkbox" name="layered_{$filter.type_lite}_{$id_value}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}{if $filter.id_key}_{$filter.id_key}{/if}"{if isset($value.checked)} checked="checked"{/if}{if !$value.nbr} disabled="disabled"{/if} /> 
+										{/if}
+										<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
+											{if !$value.nbr}
+											{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}
+											{else}
+											<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
+											{/if}
+										</label>
+									</li>
+									{/if}
+								{/foreach}
+							{else}
+								{if $filter.filter_type == 1}
+								{foreach from=$filter.values key=id_value item=value name=fe}
+									{if $value.nbr || !$hide_0_values}
+									<li class="nomargin {if $smarty.foreach.fe.index >= $filter.filter_show_limit}hiddable{/if}">
+										{if isset($filter.is_color_group) && $filter.is_color_group}
+											<input class="radio color-option {if isset($value.checked) && $value.checked}on{/if} {if !$value.nbr}disable{/if}" type="button" name="layered_{$filter.type_lite}_{$id_value}" rel="{$id_value}_{$filter.id_key}" id="layered_id_attribute_group_{$id_value}" {if !$value.nbr}disabled="disabled"{/if} style="background: {if isset($value.color)}{if file_exists($smarty.const._PS_ROOT_DIR_|cat:"/img/co/$id_value.jpg")}url(img/co/{$id_value}.jpg){else}{$value.color}{/if}{else}#CCC{/if};"/>
+											{if isset($value.checked) && $value.checked}<input type="hidden" name="layered_{$filter.type_lite}_{$id_value}" value="{$id_value}" />{/if}
+										{else}
+											<input type="radio" class="radio layered_{$filter.type_lite}_{$id_value}" name="layered_{$filter.type_lite}{if $filter.id_key}_{$filter.id_key}{else}_1{/if}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{if $filter.id_key}_{$filter.id_key}{/if}{/if}" value="{$id_value}{if $filter.id_key}_{$filter.id_key}{/if}"{if isset($value.checked)} checked="checked"{/if}{if !$value.nbr} disabled="disabled"{/if} /> 
+										{/if}
+										<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
+											{if !$value.nbr}
+												{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
+											{else}
+												<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
+											{/if}
+										</label>
+									</li>
+									{/if}
+								{/foreach}
+								{else}
+									<select class="select" {if $filter.filter_show_limit > 1}multiple="multiple" size="{$filter.filter_show_limit}"{/if}>
+										<option value="">{l s='No filters' mod='blocklayered'}</option>
+										{foreach from=$filter.values key=id_value item=value}
+										{if $value.nbr || !$hide_0_values}
+											<option style="color: {if isset($value.color)}{$value.color}{/if}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}_{$filter.id_key}" {if isset($value.checked) && $value.checked}selected="selected"{/if} {if !$value.nbr}disabled="disabled"{/if}>
+												{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
+											</option>
+										{/if}
+										{/foreach}
+									</select>
+								{/if}
+							{/if}
+						{else}
+							{if $filter.filter_type == 0}
+								<label for="{$filter.type}">{l s='Range:' mod='blocklayered'}</label> <span id="layered_{$filter.type}_range"></span>
+								<div class="layered_slider_container">
+									<div class="layered_slider" id="layered_{$filter.type}_slider"></div>
+								</div>
+								<script type="text/javascript">
+								{literal}
+									var filterRange = {/literal}{$filter.max}-{$filter.min}{literal};
+									var step = filterRange / 100;
+									if (step > 1)
+										step = parseInt(step);
+									addSlider('{/literal}{$filter.type}{literal}',{
+										range: true,
+										step: step,
+										min: {/literal}{$filter.min}{literal},
+										max: {/literal}{$filter.max}{literal},
+										values: [ {/literal}{$filter.values[0]}{literal}, {/literal}{$filter.values[1]}{literal}],
+										slide: function( event, ui ) {
+											stopAjaxQuery();
+											{/literal}
+											{if $filter.format < 5}
+											{literal}
+												from = blocklayeredFormatCurrency(ui.values[0], {/literal}{$filter.format}{literal}, '{/literal}{$filter.unit}{literal}');
+												to = blocklayeredFormatCurrency(ui.values[1], {/literal}{$filter.format}{literal}, '{/literal}{$filter.unit}{literal}');
+											{/literal}
+											{else}
+											{literal}
+												from = ui.values[0]+'{/literal}{$filter.unit}{literal}';
+												to = ui.values[1]+'{/literal}{$filter.unit}{literal}';
+											{/literal}
+											{/if}
+											{literal}
+											$('#layered_{/literal}{$filter.type}{literal}_range').html(from+' - '+to);
+										},
+										stop: function () {
+											reloadContent();
+										}
+									}, '{/literal}{$filter.unit}{literal}', {/literal}{$filter.format}{literal});
+								{/literal}
+								</script>
+							{else}
+								{if $filter.filter_type == 1}
+								<li class="nomargin">
+									{l s='From' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_min layered_input_range" id="layered_{$filter.type}_range_min" type="text" value="{$filter.values[0]}"/>
+									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
+									{l s='to' mod='blocklayered'} <input class="layered_{$filter.type}_range layered_input_range_max layered_input_range" id="layered_{$filter.type}_range_max" type="text" value="{$filter.values[1]}"/>
+									<span class="layered_{$filter.type}_range_unit">{$filter.unit}</span>
+									<span class="layered_{$filter.type}_format" style="display:none;">{$filter.format}</span>
+									<script type="text/javascript">
+									{literal}
+										$('#layered_{/literal}{$filter.type}{literal}_range_min').attr('limitValue', {/literal}{$filter.min}{literal});
+										$('#layered_{/literal}{$filter.type}{literal}_range_max').attr('limitValue', {/literal}{$filter.max}{literal});
+									{/literal}
+									</script>
+								</li>
+								{else}
+								{foreach from=$filter.list_of_values  item=values}
+									<li class="nomargin {if $filter.values[1] == $values[1] && $filter.values[0] == $values[0]}layered_list_selected{/if} layered_list" onclick="$('#layered_{$filter.type}_range_min').val({$values[0]});$('#layered_{$filter.type}_range_max').val({$values[1]});reloadContent();">
+										- {l s='From' mod='blocklayered'} {$values[0]} {$filter.unit} {l s='to' mod='blocklayered'} {$values[1]} {$filter.unit}
+									</li>
+								{/foreach}
+								<li style="display: none;">
+									<input class="layered_{$filter.type}_range" id="layered_{$filter.type}_range_min" type="hidden" value="{$filter.values[0]}"/>
+									<input class="layered_{$filter.type}_range" id="layered_{$filter.type}_range_max" type="hidden" value="{$filter.values[1]}"/>
+								</li>
+								{/if}
+							{/if}
+						{/if}
+						{if count($filter.values) > $filter.filter_show_limit && $filter.filter_show_limit > 0 && $filter.filter_type != 2}
+							<span class="hide-action more">{l s='Show more' mod='blocklayered'}</span>
+							<span class="hide-action less">{l s='Show less' mod='blocklayered'}</span>
+						{/if}
+						</ul>
+					</div>
+					<script type="text/javascript">
+					{literal}
+						$('.layered_{/literal}{$filter.type}{literal}').show();
+					{/literal}
+					</script>
+					{/if}
+				{/foreach}
+			</div>
+			<input type="hidden" name="id_category_layered" value="{$id_category_layered}" />
+			{foreach from=$filters item=filter}
+				{if $filter.type_lite == 'id_attribute_group' && isset($filter.is_color_group) && $filter.is_color_group && $filter.filter_type != 2}
+					{foreach from=$filter.values key=id_value item=value}
+						{if isset($value.checked)}
+							<input type="hidden" name="layered_id_attribute_group_{$id_value}" value="{$id_value}_{$filter.id_key}" />
+						{/if}
+					{/foreach}
+				{/if}
+			{/foreach}
+		</form>
+	</div>
+	<div id="layered_ajax_loader" style="display: none;">
+		<p><img src="{$img_ps_dir}loader.gif" alt="" /><br />{l s='Loading...' mod='blocklayered'}</p>
+	</div>
+</div>
+{else}
+<div id="layered_block_left" class="block">
+	<div class="block_content">
+		<form action="#" id="layered_form">
+			<input type="hidden" name="id_category_layered" value="{$id_category_layered}" />
+		</form>
+	</div>
+	<div style="display: none;">
+		<p style=""><img src="{$img_ps_dir}loader.gif" alt="" /><br />{l s='Loading...' mod='blocklayered'}</p>
+	</div>
+</div>
+{/if}
+<!-- /Block layered navigation module -->
diff --git a/themes/default/modules/blocklink/blocklink.tpl b/themes/default/modules/blocklink/blocklink.tpl
new file mode 100644
index 000000000..498ab27e9
--- /dev/null
+++ b/themes/default/modules/blocklink/blocklink.tpl
@@ -0,0 +1,43 @@
+{*
+* 2007-2012 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-2012 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 links module -->
+<div id="links_block_left" class="block">
+	<p class="title_block">
+	{if $url}
+		<a href="{$url|escape}">{$title|escape}</a>
+	{else}
+		{$title|escape}
+	{/if}
+	</p>
+	<ul class="block_content bullet">
+	{foreach from=$blocklink_links item=blocklink_link}
+		{if isset($blocklink_link.$lang)} 
+			<li><a href="{$blocklink_link.url|escape}"{if $blocklink_link.newWindow} onclick="window.open(this.href);return false;"{/if}>{$blocklink_link.$lang|escape}</a></li>
+		{/if}
+	{/foreach}
+	</ul>
+</div>
+<!-- /Block links module -->
diff --git a/themes/default/modules/blockmanufacturer/blockmanufacturer.tpl b/themes/default/modules/blockmanufacturer/blockmanufacturer.tpl
new file mode 100644
index 000000000..bcca3c24e
--- /dev/null
+++ b/themes/default/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -0,0 +1,57 @@
+{*
+* 2007-2012 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-2012 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 manufacturers module -->
+<div id="manufacturers_block_left" class="block blockmanufacturer">
+	<p class="title_block">{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</p>
+	<div class="block_content">
+{if $manufacturers}
+	{if $text_list}
+	<ul class="bullet">
+	{foreach from=$manufacturers item=manufacturer name=manufacturer_list}
+		{if $smarty.foreach.manufacturer_list.iteration <= $text_list_nb}
+		<li class="{if $smarty.foreach.manufacturer_list.last}last_item{elseif $smarty.foreach.manufacturer_list.first}first_item{else}item{/if}"><a href="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)}" title="{l s='More about' mod='blockmanufacturer'} {$manufacturer.name}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</a></li>
+		{/if}
+	{/foreach}
+	</ul>
+	{/if}
+	{if $form_list}
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+			<p>
+				<select id="manufacturer_list" onchange="autoUrl('manufacturer_list', '');">
+					<option value="0">{l s='All manufacturers' mod='blockmanufacturer'}</option>
+				{foreach from=$manufacturers item=manufacturer}
+					<option value="{$link->getmanufacturerLink($manufacturer.id_manufacturer, $manufacturer.link_rewrite)}">{$manufacturer.name|escape:'htmlall':'UTF-8'}</option>
+				{/foreach}
+				</select>
+			</p>
+		</form>
+	{/if}
+{else}
+	<p>{l s='No manufacturer' mod='blockmanufacturer'}</p>
+{/if}
+	</div>
+</div>
+<!-- /Block manufacturers module -->
diff --git a/themes/default/modules/blockmyaccount/blockmyaccount.tpl b/themes/default/modules/blockmyaccount/blockmyaccount.tpl
new file mode 100644
index 000000000..e10a98132
--- /dev/null
+++ b/themes/default/modules/blockmyaccount/blockmyaccount.tpl
@@ -0,0 +1,42 @@
+{*
+* 2007-2012 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-2012 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 myaccount module -->
+<div class="block myaccount">
+	<p class="title_block"><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></p>
+	<div class="block_content">
+		<ul class="bullet">
+			<li><a href="{$link->getPageLink('history', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
+			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)}" title="">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('order-slip', true)}" title="">{l s='My credit slips' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('addresses', true)}" title="">{l s='My addresses' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('identity', true)}" title="">{l s='My personal info' mod='blockmyaccount'}</a></li>
+			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)}" title="">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
+			{$HOOK_BLOCK_MY_ACCOUNT}
+		</ul>
+		<p class="logout"><a href="{$link->getPageLink('index', true, NULL, "mylogout")}" title="{l s='Sign out' mod='blockmyaccount'}">{l s='Sign out' mod='blockmyaccount'}</a></p>
+	</div>
+</div>
+<!-- /Block myaccount module -->
diff --git a/themes/default/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/themes/default/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
new file mode 100644
index 000000000..47329e797
--- /dev/null
+++ b/themes/default/modules/blockmyaccountfooter/blockmyaccountfooter.tpl
@@ -0,0 +1,42 @@
+{*
+* 2007-2012 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-2012 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 myaccount module -->
+<div class="block myaccount">
+	<p class="title_block"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Manage my customer account' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My account' mod='blockmyaccountfooter'}</a></p>
+	<div class="block_content">
+		<ul class="bullet">
+			<li><a href="{$link->getPageLink('history', true)}" 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)}" 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)}" 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)}" 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)}" 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)}" title="{l s='List of my vouchers' mod='blockmyaccountfooter'}" rel="nofollow">{l s='My vouchers' mod='blockmyaccountfooter'}</a></li>{/if}
+			{$HOOK_BLOCK_MY_ACCOUNT}
+		</ul>
+		<p class="logout"><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccountfooter'}" rel="nofollow">{l s='Sign out' mod='blockmyaccount'}</a></p>
+	</div>
+</div>
+<!-- /Block myaccount module -->
diff --git a/themes/default/modules/blocknewproducts/blocknewproducts.tpl b/themes/default/modules/blocknewproducts/blocknewproducts.tpl
new file mode 100644
index 000000000..ec2d03f9d
--- /dev/null
+++ b/themes/default/modules/blocknewproducts/blocknewproducts.tpl
@@ -0,0 +1,50 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Block new products -->
+<div id="new-products_block_right" class="block products_block">
+	<p class="title_block"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></p>
+	<div class="block_content">
+	{if $new_products !== false}
+		<ul class="product_images clearfix">
+		{foreach from=$new_products item='product' name='newProducts'}
+			{if $smarty.foreach.newProducts.index < 2}
+				<li{if $smarty.foreach.newProducts.first} class="first"{/if}><a href="{$product.link}" title="{$product.legend|escape:html:'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'medium_default')}" height="{$mediumSize.height}" width="{$mediumSize.width}" alt="{$product.legend|escape:html:'UTF-8'}" /></a></li>
+			{/if}
+		{/foreach}
+		</ul>
+		<dl class="products">
+		{foreach from=$new_products item=newproduct name=myLoop}
+			<dt class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$newproduct.link}" title="{$newproduct.name|escape:html:'UTF-8'}">{$newproduct.name|strip_tags|escape:html:'UTF-8'}</a></dt>
+			{if $newproduct.description_short}<dd class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$newproduct.link}">{$newproduct.description_short|strip_tags:'UTF-8'|truncate:75:'...'}</a><br /><a href="{$newproduct.link}" class="lnk_more">{l s='Read more' mod='blocknewproducts'}</a></dd>{/if}
+		{/foreach}
+		</dl>
+		<p><a href="{$link->getPageLink('new-products')}" title="{l s='All new products' mod='blocknewproducts'}" class="button_large">&raquo; {l s='All new products' mod='blocknewproducts'}</a></p>
+	{else}
+		<p>&raquo; {l s='No new products at this time' mod='blocknewproducts'}</p>
+	{/if}
+	</div>
+</div>
+<!-- /MODULE Block new products -->
\ No newline at end of file
diff --git a/themes/default/modules/blocknewsletter/blocknewsletter.tpl b/themes/default/modules/blocknewsletter/blocknewsletter.tpl
new file mode 100644
index 000000000..51954c6c1
--- /dev/null
+++ b/themes/default/modules/blocknewsletter/blocknewsletter.tpl
@@ -0,0 +1,51 @@
+{*
+* 2007-2012 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-2012 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 Newsletter module-->
+<div id="newsletter_block_left" class="block">
+	<p class="title_block">{l s='Newsletter' mod='blocknewsletter'}</p>
+	<div class="block_content">
+	{if isset($msg) && $msg}
+		<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
+	{/if}
+		<form action="{$link->getPageLink('index')}" method="post">
+			<p>
+				{* @todo use jquery (focusin, focusout) instead of onblur and onfocus *}
+				<input type="text" name="email" size="18" 
+					value="{if isset($value) && $value}{$value}{else}{l s='your e-mail' mod='blocknewsletter'}{/if}" 
+					onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter' js=1}')this.value='';" 
+					onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter' js=1}';" 
+					class="inputNew" />
+				<!--<select name="action">
+					<option value="0"{if isset($action) && $action == 0} selected="selected"{/if}>{l s='Subscribe' mod='blocknewsletter'}</option>
+					<option value="1"{if isset($action) && $action == 1} selected="selected"{/if}>{l s='Unsubscribe' mod='blocknewsletter'}</option>
+				</select>-->
+					<input type="submit" value="ok" class="button_mini" name="submitNewsletter" />
+				<input type="hidden" name="action" value="0" />
+			</p>
+		</form>
+	</div>
+</div>
+<!-- /Block Newsletter module-->
diff --git a/themes/default/modules/blockrss/blockrss.tpl b/themes/default/modules/blockrss/blockrss.tpl
new file mode 100644
index 000000000..21b7a25d0
--- /dev/null
+++ b/themes/default/modules/blockrss/blockrss.tpl
@@ -0,0 +1,41 @@
+{*
+* 2007-2012 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-2012 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 RSS module-->
+<div id="rss_block_left" class="block">
+	<p class="title_block">{$title}</p>
+	<div class="block_content">
+		{if $rss_links}
+			<ul>
+				{foreach from=$rss_links item='rss_link'}
+					<li><a href="{$rss_link.url}">{$rss_link.title}</a></li>
+				{/foreach}
+			</ul>
+		{else}
+			<p>{l s='No RSS feed added' mod='blockrss'}</p>
+		{/if}
+	</div>
+</div>
+<!-- /Block RSS module-->
diff --git a/themes/default/modules/blocksearch/blocksearch.tpl b/themes/default/modules/blocksearch/blocksearch.tpl
new file mode 100644
index 000000000..6682885da
--- /dev/null
+++ b/themes/default/modules/blocksearch/blocksearch.tpl
@@ -0,0 +1,41 @@
+{*
+* 2007-2012 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-2012 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 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)}" 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" />
+			<input type="hidden" name="controller" value="search" />
+			<input type="hidden" name="orderway" value="desc" />
+			<input class="search_query" type="text" id="search_query_block" name="search_query" value="{if isset($smarty.get.search_query)}{$smarty.get.search_query|htmlentities:$ENT_QUOTES:'utf-8'|stripslashes}{/if}" />
+			<input type="submit" id="search_button" class="button_mini" value="{l s='go' mod='blocksearch'}" />
+		</p>
+	</form>
+</div>
+{include file="$self/blocksearch-instantsearch.tpl"}
+<!-- /Block search module -->
diff --git a/themes/default/modules/blocksocial/blocksocial.tpl b/themes/default/modules/blocksocial/blocksocial.tpl
new file mode 100644
index 000000000..05b5d6d2e
--- /dev/null
+++ b/themes/default/modules/blocksocial/blocksocial.tpl
@@ -0,0 +1,34 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<div id="social_block">
+	<p class="title_block">{l s='Follow us' mod='blocksocial'}</p>
+	<ul>
+		{if $facebook_url != ''}<li class="facebook"><a href="{$facebook_url|escape:html:'UTF-8'}">{l s='Facebook' mod='blocksocial'}</a></li>{/if}
+		{if $twitter_url != ''}<li class="twitter"><a href="{$twitter_url|escape:html:'UTF-8'}">{l s='Twitter' mod='blocksocial'}</a></li>{/if}
+		{if $rss_url != ''}<li class="rss"><a href="{$rss_url|escape:html:'UTF-8'}">{l s='RSS' mod='blocksocial'}</a></li>{/if}
+	</ul>
+</div>
diff --git a/themes/default/modules/blocksocial/blockspecials.tpl b/themes/default/modules/blocksocial/blockspecials.tpl
new file mode 100644
index 000000000..83b5a98f8
--- /dev/null
+++ b/themes/default/modules/blocksocial/blockspecials.tpl
@@ -0,0 +1,61 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Block specials -->
+<div id="special_block_right" class="block products_block exclusive blockspecials">
+	<p class="title_block"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
+	<div class="block_content">
+
+{if $special}
+		<ul class="products clearfix">
+			<li class="product_image">
+				<a href="{$special.link}"><img src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'medium_default')}" alt="{$special.legend|escape:html:'UTF-8'}" height="{$mediumSize.height}" width="{$mediumSize.width}" title="{$special.name|escape:html:'UTF-8'}" /></a>
+			</li>
+			<li>
+				{if !$PS_CATALOG_MODE}
+					{if $special.specific_prices}
+						{assign var='specific_prices' value=$special.specific_prices}
+						{if $specific_prices.reduction_type == 'percentage' && ($specific_prices.from == $specific_prices.to OR ($smarty.now|date_format:'%Y-%m-%d %H:%M:%S' <= $specific_prices.to && $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' >= $specific_prices.from))}
+							<span class="reduction"><span>-{$specific_prices.reduction*100|floatval}%</span></span>
+						{/if}
+					{/if}
+				{/if}
+
+					<p class="s_title_block"><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></p>
+				{if !$PS_CATALOG_MODE}
+					<span class="price-discount">{if !$priceDisplay}{displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if}</span>
+					<span class="price">{if !$priceDisplay}{displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}{/if}</span>
+				{/if}
+			</li>
+		</ul>
+		<p>
+			<a href="{$link->getPageLink('prices-drop')}" title="{l s='All specials' mod='blockspecials'}">&raquo; {l s='All specials' mod='blockspecials'}</a>
+		</p>
+{else}
+		<p>{l s='No specials at this time' mod='blockspecials'}</p>
+{/if}
+	</div>
+</div>
+<!-- /MODULE Block specials -->
\ No newline at end of file
diff --git a/themes/default/modules/blockspecials/blockspecials.tpl b/themes/default/modules/blockspecials/blockspecials.tpl
new file mode 100644
index 000000000..83b5a98f8
--- /dev/null
+++ b/themes/default/modules/blockspecials/blockspecials.tpl
@@ -0,0 +1,61 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Block specials -->
+<div id="special_block_right" class="block products_block exclusive blockspecials">
+	<p class="title_block"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></p>
+	<div class="block_content">
+
+{if $special}
+		<ul class="products clearfix">
+			<li class="product_image">
+				<a href="{$special.link}"><img src="{$link->getImageLink($special.link_rewrite, $special.id_image, 'medium_default')}" alt="{$special.legend|escape:html:'UTF-8'}" height="{$mediumSize.height}" width="{$mediumSize.width}" title="{$special.name|escape:html:'UTF-8'}" /></a>
+			</li>
+			<li>
+				{if !$PS_CATALOG_MODE}
+					{if $special.specific_prices}
+						{assign var='specific_prices' value=$special.specific_prices}
+						{if $specific_prices.reduction_type == 'percentage' && ($specific_prices.from == $specific_prices.to OR ($smarty.now|date_format:'%Y-%m-%d %H:%M:%S' <= $specific_prices.to && $smarty.now|date_format:'%Y-%m-%d %H:%M:%S' >= $specific_prices.from))}
+							<span class="reduction"><span>-{$specific_prices.reduction*100|floatval}%</span></span>
+						{/if}
+					{/if}
+				{/if}
+
+					<p class="s_title_block"><a href="{$special.link}" title="{$special.name|escape:html:'UTF-8'}">{$special.name|escape:html:'UTF-8'}</a></p>
+				{if !$PS_CATALOG_MODE}
+					<span class="price-discount">{if !$priceDisplay}{displayWtPrice p=$special.price_without_reduction}{else}{displayWtPrice p=$priceWithoutReduction_tax_excl}{/if}</span>
+					<span class="price">{if !$priceDisplay}{displayWtPrice p=$special.price}{else}{displayWtPrice p=$special.price_tax_exc}{/if}</span>
+				{/if}
+			</li>
+		</ul>
+		<p>
+			<a href="{$link->getPageLink('prices-drop')}" title="{l s='All specials' mod='blockspecials'}">&raquo; {l s='All specials' mod='blockspecials'}</a>
+		</p>
+{else}
+		<p>{l s='No specials at this time' mod='blockspecials'}</p>
+{/if}
+	</div>
+</div>
+<!-- /MODULE Block specials -->
\ No newline at end of file
diff --git a/themes/default/modules/blockstore/blockstore.tpl b/themes/default/modules/blockstore/blockstore.tpl
new file mode 100644
index 000000000..d9be298fe
--- /dev/null
+++ b/themes/default/modules/blockstore/blockstore.tpl
@@ -0,0 +1,36 @@
+{*
+* 2007-2012 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-2012 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 stores module -->
+<div id="stores_block_left" class="block">
+	<p class="title_block"><a href="{$link->getPageLink('stores')}" 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')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a></p>
+		<p>
+			<a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">&raquo; {l s='Discover our stores' mod='blockstore'}</a>
+		</p>
+	</div>
+</div>
+<!-- /Block stores module -->
diff --git a/themes/default/modules/blocksupplier/blocksupplier.tpl b/themes/default/modules/blocksupplier/blocksupplier.tpl
new file mode 100644
index 000000000..6288781e7
--- /dev/null
+++ b/themes/default/modules/blocksupplier/blocksupplier.tpl
@@ -0,0 +1,59 @@
+{*
+* 2007-2012 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-2012 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 suppliers module -->
+<div id="suppliers_block_left" class="block blocksupplier">
+	<p class="title_block">{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</p>
+	<div class="block_content">
+{if $suppliers}
+	{if $text_list}
+	<ul class="bullet">
+	{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)}" title="{l s='More about' mod='blocksupplier'} {$supplier.name}">{$supplier.name|escape:'htmlall':'UTF-8'}</a>
+		</li>
+		{/if}
+	{/foreach}
+	</ul>
+	{/if}
+	{if $form_list}
+		<form action="{$smarty.server.SCRIPT_NAME|escape:'htmlall':'UTF-8'}" method="get">
+			<p>
+				<select id="supplier_list" onchange="autoUrl('supplier_list', '');">
+					<option value="0">{l s='All suppliers' mod='blocksupplier'}</option>
+				{foreach from=$suppliers item=supplier}
+					<option value="{$link->getsupplierLink($supplier.id_supplier, $supplier.link_rewrite)}">{$supplier.name|escape:'htmlall':'UTF-8'}</option>
+				{/foreach}
+				</select>
+			</p>
+		</form>
+	{/if}
+{else}
+	<p>{l s='No supplier' mod='blocksupplier'}</p>
+{/if}
+	</div>
+</div>
+<!-- /Block suppliers module -->
diff --git a/themes/default/modules/blocktags/blocktags.tpl b/themes/default/modules/blocktags/blocktags.tpl
new file mode 100644
index 000000000..e98e951b0
--- /dev/null
+++ b/themes/default/modules/blocktags/blocktags.tpl
@@ -0,0 +1,39 @@
+{*
+* 2007-2012 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-2012 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 tags module -->
+<div id="tags_block_left" class="block tags_block">
+	<p class="title_block">{l s='Tags' mod='blocktags'}</p>
+	<p class="block_content">
+{if $tags}
+	{foreach from=$tags item=tag name=myLoop}
+		<a href="{$link->getPageLink('search', true, NULL, "tag={$tag.name|urlencode}")}" 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'}
+{/if}
+	</p>
+</div>
+<!-- /Block tags module -->
diff --git a/themes/default/modules/blockviewed/blockviewed.tpl b/themes/default/modules/blockviewed/blockviewed.tpl
new file mode 100644
index 000000000..6dec116ef
--- /dev/null
+++ b/themes/default/modules/blockviewed/blockviewed.tpl
@@ -0,0 +1,44 @@
+{*
+* 2007-2012 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-2012 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 Viewed products -->
+<div id="viewed-products_block_left" class="block products_block">
+	<p class="title_block">{l s='Viewed products' mod='blockviewed'}</p>
+	<div class="block_content">
+		<ul class="products clearfix">
+			{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}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}" class="content_img">
+					<img src="{if isset($viewedProduct->id_image) && $viewedProduct->id_image}{$link->getImageLink($viewedProduct->link_rewrite, $viewedProduct->cover, 'medium_default')}{else}{$img_prod_dir}{$lang_iso}-default-medium_default.jpg{/if}" alt="{$viewedProduct->legend|escape:html:'UTF-8'}" />
+					</a>
+					<div class="text_desc">
+						<p class="s_title_block"><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->name|truncate:14:'...'|escape:html:'UTF-8'}</a></p>
+						<p><a href="{$viewedProduct->product_link}" title="{l s='More about' mod='blockviewed'} {$viewedProduct->name|escape:html:'UTF-8'}">{$viewedProduct->description_short|strip_tags:'UTF-8'|truncate:44}</a></p>
+					</div>
+				</li>
+			{/foreach}
+		</ul>
+	</div>
+</div>
diff --git a/themes/default/modules/blockwishlist/blockwishlist.tpl b/themes/default/modules/blockwishlist/blockwishlist.tpl
new file mode 100644
index 000000000..ec734beb9
--- /dev/null
+++ b/themes/default/modules/blockwishlist/blockwishlist.tpl
@@ -0,0 +1,65 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<div id="wishlist_block" class="block account">
+	<p class="title_block">
+		<a href="{$wishlist_link}">{l s='Wishlist' mod='blockwishlist'}</a>
+	</p>
+	<div class="block_content">
+		<div id="wishlist_block_list" class="expanded">
+		{if $wishlist_products}
+			<dl class="products">
+			{foreach from=$wishlist_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)}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:30:'...'|escape:'htmlall':'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', '{$token}');" title="{l s='remove this product from my wishlist' mod='blockwishlist'}"><img src="{$img_dir}icon/delete.gif" width="12" height="12" alt="{l s='Delete'}" class="icon" /></a>
+				</dt>
+				{if isset($product.attributes_small)}
+				<dd class="{if $smarty.foreach.i.first}first_item{elseif $smarty.foreach.i.last}last_item{else}item{/if}">
+					<a href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category_rewrite)}" title="{l s='Product detail'}">{$product.attributes_small|escape:'htmlall':'UTF-8'}</a>
+				</dd>
+				{/if}
+			{/foreach}
+			</dl>
+		{else}
+			<dl class="products">
+				<dt>{l s='No products' mod='blockwishlist'}</dt>
+			</dl>
+		{/if}
+		</div>
+		<p class="lnk">
+		{if $wishlists}
+			<select name="wishlists" id="wishlists" onchange="WishlistChangeDefault('wishlist_block_list', $('#wishlists').val());">
+			{foreach from=$wishlists item=wishlist name=i}
+				<option value="{$wishlist.id_wishlist}"{if $id_wishlist eq $wishlist.id_wishlist or ($id_wishlist == false and $smarty.foreach.i.first)} selected="selected"{/if}>{$wishlist.name|truncate:22:'...'|escape:'htmlall':'UTF-8'}</option>
+			{/foreach}
+			</select>
+		{/if}
+			<a href="{$wishlist_link}" title="{l s='My wishlists' mod='blockwishlist'}">&raquo; {l s='My wishlists' mod='blockwishlist'}</a>
+		</p>
+	</div>
+</div>
diff --git a/themes/default/modules/homefeatured/homefeatured.tpl b/themes/default/modules/homefeatured/homefeatured.tpl
new file mode 100644
index 000000000..ae6be501d
--- /dev/null
+++ b/themes/default/modules/homefeatured/homefeatured.tpl
@@ -0,0 +1,66 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<!-- MODULE Home Featured Products -->
+<div id="featured-products_block_center" class="block products_block clearfix">
+	<p class="title_block">{l s='Featured products' mod='homefeatured'}</p>
+	{if isset($products) AND $products}
+		<div class="block_content">
+			{assign var='liHeight' value=250}
+			{assign var='nbItemsPerLine' value=4}
+			{assign var='nbLi' value=$products|@count}
+			{math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines}
+			{math equation="nbLines*liHeight" nbLines=$nbLines|ceil liHeight=$liHeight assign=ulHeight}
+			<ul style="height:{$ulHeight}px;">
+			{foreach from=$products item=product name=homeFeaturedProducts}
+				{math equation="(total%perLine)" total=$smarty.foreach.homeFeaturedProducts.total perLine=$nbItemsPerLine assign=totModulo}
+				{if $totModulo == 0}{assign var='totModulo' value=$nbItemsPerLine}{/if}
+				<li class="ajax_block_product {if $smarty.foreach.homeFeaturedProducts.first}first_item{elseif $smarty.foreach.homeFeaturedProducts.last}last_item{else}item{/if} {if $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 0}last_item_of_line{elseif $smarty.foreach.homeFeaturedProducts.iteration%$nbItemsPerLine == 1} {/if} {if $smarty.foreach.homeFeaturedProducts.iteration > ($smarty.foreach.homeFeaturedProducts.total - $totModulo)}last_line{/if}">
+					<a href="{$product.link}" title="{$product.name|escape:html:'UTF-8'}" class="product_image"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home_default')}" height="{$homeSize.height}" width="{$homeSize.width}" alt="{$product.name|escape:html:'UTF-8'}" />{if isset($product.new) && $product.new == 1}<span class="new">{l s='New' mod='homefeatured'}</span>{/if}</a>
+					<p class="s_title_block"><a href="{$product.link}" title="{$product.name|truncate:50:'...'|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></p>
+					<div class="product_desc"><a href="{$product.link}" title="{l s='More' mod='homefeatured'}">{$product.description_short|strip_tags|truncate:65:'...'}</a></div>
+					<div>
+						<a class="lnk_more" href="{$product.link}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>
+						{if $product.show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}<p class="price_container"><span class="price">{if !$priceDisplay}{convertPrice price=$product.price}{else}{convertPrice price=$product.price_tax_exc}{/if}</span></p>{else}<div style="height:21px;"></div>{/if}
+						
+						{if ($product.id_product_attribute == 0 OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product.available_for_order AND !isset($restricted_country_mode) AND $product.minimal_quantity == 1 AND $product.customizable != 2 AND !$PS_CATALOG_MODE}
+							{if ($product.quantity > 0 OR $product.allow_oosp)}
+							<a class="exclusive ajax_add_to_cart_button" rel="ajax_id_product_{$product.id_product}" href="{$link->getPageLink('cart')}?qty=1&amp;id_product={$product.id_product}&amp;token={$static_token}&amp;add" title="{l s='Add to cart' mod='homefeatured'}">{l s='Add to cart' mod='homefeatured'}</a>
+							{else}
+							<span class="exclusive">{l s='Add to cart' mod='homefeatured'}</span>
+							{/if}
+						{else}
+							<div style="height:23px;"></div>
+						{/if}
+					</div>
+				</li>
+			{/foreach}
+			</ul>
+		</div>
+	{else}
+		<p>{l s='No featured products' mod='homefeatured'}</p>
+	{/if}
+</div>
+<!-- /MODULE Home Featured Products -->
diff --git a/themes/default/modules/productcomments/productcomments.tpl b/themes/default/modules/productcomments/productcomments.tpl
new file mode 100644
index 000000000..d2dd81006
--- /dev/null
+++ b/themes/default/modules/productcomments/productcomments.tpl
@@ -0,0 +1,148 @@
+{*
+* 2007-2012 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-2012 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<script type="text/javascript">
+var productcomments_controller_url = '{$productcomments_controller_url}';
+var confirm_report_message = "{l s='Are you sure you want report this comment?' mod='productcomments'}";
+var secure_key = "{$secure_key}";
+var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
+</script>
+
+<div id="idTab5">
+	<div id="product_comments_block_tab">
+	{if $comments}
+		{foreach from=$comments item=comment}
+			{if $comment.content}
+			<div class="comment clearfix">
+				<div class="comment_author">
+					<span>{l s='Grade' mod='productcomments'}&nbsp</span>
+					<div class="star_content clearfix">
+					{section name="i" start=0 loop=5 step=1}
+						{if $comment.grade le $smarty.section.i.index}
+							<div class="star"></div>
+						{else}
+							<div class="star star_on"></div>
+						{/if}
+					{/section}
+					</div>
+					<div class="comment_author_infos">
+						<strong>{$comment.customer_name|escape:'html':'UTF-8'}</strong><br/>
+						<em>{dateFormat date=$comment.date_add|escape:'html':'UTF-8' full=0}</em>
+					</div>
+				</div>
+				<div class="comment_details">
+					<p class="title_block">{$comment.title}</p>
+					<p>{$comment.content|escape:'html':'UTF-8'|nl2br}</p>
+					<ul>
+						{if $comment.total_advice > 0}
+							<li>{l s='%1$d out of %2$d people found this review useful.' sprintf=[$comment.total_useful,$comment.total_advice] mod='productcomments'}</li>
+						{/if}
+						{if $logged == 1}
+							{if !$comment.customer_advice}
+							<li>{l s='Was this comment useful to you?' mod='productcomments'}<button class="usefulness_btn" data-is-usefull="1" data-id-product-comment="{$comment.id_product_comment}">{l s='yes' mod='productcomments'}</button><button class="usefulness_btn" data-is-usefull="0" data-id-product-comment="{$comment.id_product_comment}">{l s='no' mod='productcomments'}</button></li>
+							{/if}
+							{if !$comment.customer_report}
+							<li><span class="report_btn" data-id-product-comment="{$comment.id_product_comment}">{l s='Report abuse' mod='productcomments'}</span></li>
+							{/if}
+						{/if}
+					</ul>
+				</div>
+			</div>
+			{/if}
+		{/foreach}
+	{else}
+		{if ($too_early == false AND ($logged OR $allow_guests))}
+		<p class="align_center">
+			<a id="new_comment_tab_btn" class="open-comment-form" href="#new_comment_form">{l s='Be the first to write your review' mod='productcomments'} !</a>
+		</p>
+		{else}
+		<p class="align_center">{l s='No customer comments for the moment.' mod='productcomments'}</p>
+		{/if}
+	{/if}	
+	</div>
+</div>
+
+<!-- Fancybox -->
+<div style="display: none;">
+	<div id="new_comment_form">
+		<form action="#">
+			<h2 class="title">{l s='Write your review' mod='productcomments'}</h2>
+			<div class="product clearfix">
+				<img src="{$link->getImageLink($product->link_rewrite, $productcomment_cover, 'home_default')}" 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}
+				</div>
+			</div>
+
+			<div class="new_comment_form_content">
+				<h2>{l s='Write your review' mod='productcomments'}</h2>
+
+				<div id="new_comment_form_error" class="error" style="display: none;">
+					<ul></ul>
+				</div>
+
+				{if $criterions|@count > 0}
+					<ul id="criterions_list">
+					{foreach from=$criterions item='criterion'}
+						<li>
+							<label>{$criterion.name|escape:'html':'UTF-8'}:</label>
+							<div class="star_content">
+								<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="1" />
+								<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="2" />
+								<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="3" checked="checked" />
+								<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="4" />
+								<input class="star" type="radio" name="criterion[{$criterion.id_product_comment_criterion|round}]" value="5" />
+							</div>
+							<div class="clearfix"></div>
+						</li>
+					{/foreach}
+					</ul>
+				{/if}
+
+				<label for="comment_title">{l s='Title' mod='productcomments'}: <sup class="required">*</sup></label>
+				<input id="comment_title" name="title" type="text" value=""/>
+
+				<label for="content">{l s='Comment' mod='productcomments'}: <sup class="required">*</sup></label>
+				<textarea id="content" name="content"></textarea>
+
+				{if $allow_guests == true && $logged == 0}
+				<label>{l s='Your name' mod='productcomments'}: <sup class="required">*</sup></label>
+				<input id="commentCustomerName" name="customer_name" type="text" value=""/>
+				{/if}
+
+				<div id="new_comment_form_footer">
+					<input id="id_product_comment_send" name="id_product" type="hidden" value='{$id_product_comment_form}'></input>
+					<p class="fl required"><sup>*</sup> {l s='Required fields' mod='productcomments'}</p>
+					<p class="fr">
+						<button id="submitNewMessage" name="submitMessage" type="submit">{l s='Send' mod='productcomments'}</button>&nbsp;
+						{l s='or' mod='productcomments'}&nbsp;<a href="#" onclick="$.fancybox.close();">{l s='Cancel' mod='productcomments'}</a>
+					</p>
+					<div class="clearfix"></div>
+				</div>
+			</div>
+		</form><!-- /end new_comment_form_content -->
+	</div>
+</div>
+<!-- End fancybox -->