diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
index eca9665b6..fe0fdfc82 100644
--- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
@@ -92,7 +92,7 @@
 			<div>
 				{l s='This customer is registered as'} <b>{l s='guest'}</b>
 				{if !$customer_exists}
-					<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
+					<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
 						<input type="hidden" name="id_lang" value="{$id_lang}" />
 						<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform to customer account'}" /></p>
 						{l s='This feature generates a random password and sends an e-mail to the customer'}
@@ -161,9 +161,9 @@
 	{if $groups AND count($groups)}
 		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 			<colgroup>
-				<col width="10px"></col>
-				<col width=""></col>
-				<col width="70px"></col>
+				<col width="10px">
+				<col width="">
+				<col width="70px">
 			</colgroup>
 			<tr>
 				<th height="39px" class="right">{l s='ID'}</th>
@@ -192,13 +192,13 @@
 				</h3>
 				<table cellspacing="0" cellpadding="0" class="table" style="width:100%; text-align:left;">
 					<colgroup>
-						<col width="10px"></col>
-						<col width="100px"></col>
-						<col width="100px"></col>
-						<col width=""></col>
-						<col width="50px"></col>
-						<col width="80px"></col>
-						<col width="70px"></col>
+						<col width="10px">
+						<col width="100px">
+						<col width="100px">
+						<col width="">
+						<col width="50px">
+						<col width="80px">
+						<col width="70px">
 					</colgroup>
 					<tr>
 						<th height="39px" class="center">{l s='ID'}</th>
@@ -229,13 +229,13 @@
 				<h3 style="color:red;font-weight:normal;">{l s='Invalid orders:'} {$count_ko}</h3>
 				<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 					<colgroup>
-						<col width="10px"></col>
-						<col width="100px"></col>
-						<col width=""></col>
-						<col width=""></col>
-						<col width="100px"></col>
-						<col width="100px"></col>
-						<col width="52px"></col>
+						<col width="10px">
+						<col width="100px">
+						<col width="">
+						<col width="">
+						<col width="100px">
+						<col width="100px">
+						<col width="52px">
 					</colgroup>
 					<tr>
 						<th height="39px" class="center">{l s='ID'}</th>
@@ -270,10 +270,10 @@
 		<h2>{l s='Products'} ({count($products)})</h2>
 		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 					<colgroup>
-						<col width="50px"></col>
-						<col width=""></col>
-						<col width="60px"></col>
-						<col width="70px"></col>
+						<col width="50px">
+						<col width="">
+						<col width="60px">
+						<col width="70px">
 					</colgroup>
 			<tr>
 				<th height="39px" class="center">{l s='Date'}</th>
@@ -297,12 +297,12 @@
 	{if count($addresses)}
 		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 					<colgroup>
-						<col width="120px"></col>
-						<col width="120px"></col>	
-						<col width=""></col>
-						<col width="100px"></col>
-						<col width="170px"></col>
-						<col width="70px"></col>
+						<col width="120px">
+						<col width="120px">
+						<col width="">
+						<col width="100px">
+						<col width="170px">
+						<col width="70px">
 					</colgroup>
 			<tr>
 				<th height="39px">{l s='Company'}</th>
@@ -371,11 +371,11 @@
 		{if $carts AND count($carts)}
 			<table cellspacing="0" cellpadding="0" class="table" style="width:100%">
 				<colgroup>
-					<col width="50px"></col>
-					<col width="150px"></col>
-					<col width=""></col>
-					<col width="70px"></col>
-					<col width="50px"></col>
+					<col width="50px">
+					<col width="150px">
+					<col width="">
+					<col width="70px">
+					<col width="50px">
 				</colgroup>
 				<tr>
 					<th height="39px" class="center">{l s='ID'}</th>
@@ -404,9 +404,9 @@
 		<h2>{l s='Products'} ({count($interested)})</h2>
 			<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 				<colgroup>
-					<col width="10px"></col>
-					<col width=""></col>
-					<col width="50px"></col>
+					<col width="10px">
+					<col width="">
+					<col width="50px">
 				</colgroup>
 				{foreach $interested as $key => $p}
 					<tr {if $key %2}class="alt_row"{/if} style="cursor: pointer" onclick="document.location = '{$p['url']}'">
@@ -426,11 +426,11 @@
 		<h2>{l s='Last connections'}</h2>
 		<table cellspacing="0" cellpadding="0" class="table" style="width:100%;">
 				<colgroup>
-					<col width="150px"></col>
-					<col width="100px"></col>
-					<col width="100px"></col>
-					<col width=""></col>
-					<col width="150px"></col>
+					<col width="150px">
+					<col width="100px">
+					<col width="100px">
+					<col width="">
+					<col width="150px">
 				</colgroup>
 			<tr>
 				<th height="39px;">{l s='Date'}</th>
diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
index e4f4dcc76..0c6c67c28 100644
--- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -69,7 +69,7 @@
 <div style="display: none">
 	<div id="upload_file_import" style="padding-left: 10px; background-color: #EBEDF4; border: 1px solid #CCCED7">
 		<div class="clear">&nbsp;</div>
-		<form action="{$current}&token={$token}" method="POST" enctype="multipart/form-data">	
+		<form action="{$current}&token={$token}" method="post" enctype="multipart/form-data">
 			<label class="clear" style="width:160px; text-align: left;">{l s='Select your CSV file'} </label>	
 			<div class="margin-form" style="padding-left:190px;">
 				<input name="file" type="file" />
diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
index 21ee20537..02ae0e1f5 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
@@ -72,11 +72,11 @@
 	<a name="{$hook['name']}"/>
 	<table cellpadding="0" cellspacing="0" class="table widthfull space {if $hook['module_count'] >= 2} tableDnD{/if}" id="{$hook['id_hook']}">
 		<colgroup>
-			<col width="10"></col>
-			<col width="30"></col>
-			<col width="40"></col>
-			<col width=""></col>
-			<col width="50"></col>
+			<col width="10">
+			<col width="30">
+			<col width="40">
+			<col width="">
+			<col width="50">
 		</colgroup>
 	<tr class="nodrag nodrop"><th colspan="5">	{if $hook['module_count'] && $can_move}
 		<input type="checkbox" id="Ghook{$hook['id_hook']}" style="margin-right: 2px;" onclick="hookCheckboxes({$hook['id_hook']}, 0, this)"/>
diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
index 8b5f386e0..fc378e76a 100644
--- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl
@@ -23,7 +23,7 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<form method="POST" action="{$current_index}&viewOrder&id_order={$order->id|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
+<form method="post" action="{$current_index}&viewOrder&id_order={$order->id|escape:'htmlall':'UTF-8'}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 	<label>{l s='Name'}</label>
 	<div class="margin-form">
 		<input type="text" name="discount_name" value="" />
diff --git a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
index 910450511..7f42d307f 100755
--- a/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_product_line.tpl
@@ -93,7 +93,7 @@
 	<td align="center" class="total_product">
 		{displayPrice price=(Tools::ps_round($product_price, 2) * ($product['product_quantity'] - $product['customizationQuantityTotal'])) currency=$currency->id}
 	</td>
-	<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</th>
+	<td colspan="2" style="display: none;" class="add_product_fields">&nbsp;</td>
 	<td align="center" class="cancelCheck standard_refund_fields current-edit" style="display:none">
 		<input type="hidden" name="totalQtyReturn" id="totalQtyReturn" value="{$product['product_quantity_return']}" />
 		<input type="hidden" name="totalQty" id="totalQty" value="{$product['product_quantity']}" />
diff --git a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
index 14e405a0d..dcbfb358c 100644
--- a/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/_shipping.tpl
@@ -25,11 +25,11 @@
 *}
 <table class="table" width="100%" cellspacing="0" cellpadding="0" id="shipping_table">
 <colgroup>
-	<col width="15%"></col>
-	<col width="15%"></col>
-	<col width=""></col>
-	<col width="10%"></col>
-	<col width="20%"></col>
+	<col width="15%">
+	<col width="15%">
+	<col width="">
+	<col width="10%">
+	<col width="20%">
 </colgroup>
 	<thead>
 	<tr>
@@ -58,7 +58,7 @@
 		<td>
 			<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
 			{if $line.can_edit}
-				<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
+				<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
 					<span class="shipping_number_edit" style="display:none;">
 						<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
 						<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl
index 5b09245f4..873b463cc 100755
--- a/admin-dev/themes/default/template/controllers/orders/form.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/form.tpl
@@ -991,12 +991,12 @@
 	<div>
 		<table cellspacing="0" cellpadding="0" class="table width5" id="customer_cart">
 				<colgroup>
-					<col width="50px"></col>
-					<col width=""></col>
-					<col width="90px"></col>
-					<col width="100px"></col>
-					<col width="50px"></col>
-					<col width="50px"></col>
+					<col width="50px">
+					<col width="">
+					<col width="90px">
+					<col width="100px">
+					<col width="50px">
+					<col width="50px">
 				</colgroup>
 			<thead>
 				<tr>
@@ -1043,10 +1043,10 @@
 				<h3>{l s='Carts:'}</h3>
 				<table cellspacing="0" cellpadding="0" class="table  width5">
 					<colgroup>
-						<col width="10px"></col>
-						<col width=""></col>
-						<col width="70px"></col>
-						<col width="50px"></col>
+						<col width="10px">
+						<col width="">
+						<col width="70px">
+						<col width="50px">
 					</colgroup>
 				<thead>
 					<tr>
@@ -1064,13 +1064,13 @@
 				<h3>{l s='Orders:'}</h3>
 				<table cellspacing="0" cellpadding="0" class="table  width5">
 					<colgroup>
-						<col width="10px"></col>
-						<col width="50px"></col>
-						<col width=""></col>
-						<col width="90px"></col>
-						<col width="100px"></col>
-						<col width="250px"></col>
-						<col width="50px"></col>
+						<col width="10px">
+						<col width="50px">
+						<col width="">
+						<col width="90px">
+						<col width="100px">
+						<col width="250px">
+						<col width="50px">
 					</colgroup>
 					<thead>
 						<tr>
diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
index 1ebf0a2d7..13ddf7b23 100755
--- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -121,10 +121,10 @@
 			<!-- History of status -->
 			<table cellspacing="0" cellpadding="0" class="table history-status" style="width: 100%;">
 				<colgroup>
-					<col width="1%"></col>
-					<col width=""></col>
-					<col width="20%"></col>
-					<col width="20%"></col>
+					<col width="1%">
+					<col width="">
+					<col width="20%">
+					<col width="20%">
 				</colgroup>
 			{foreach from=$history item=row key=key}
 				{if ($key == 0)}
@@ -155,7 +155,7 @@
 				{if ($customer->isGuest())}
 					{l s='This order has been placed by a guest.'}
 					{if (!Customer::customerExists($customer->email))}
-					<form method="POST" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
+					<form method="post" action="index.php?tab=AdminCustomers&id_customer={$customer->id}&token={getAdminToken tab='AdminCustomers'}">
 						<input type="hidden" name="id_lang" value="{$order->id_lang}" />
 						<p class="center"><input class="button" type="submit" name="submitGuestToCustomer" value="{l s='Transform guest into customer'}" /></p>
 						{l s='This feature will generate a random password and send an e-mail to the customer'}
@@ -296,12 +296,12 @@
 				<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
 					<table class="table" width="100%" cellspacing="0" cellpadding="0">
 						<colgroup>
-							<col width="15%"></col>
-							<col width=""></col>
-							<col width="20%"></col>
-							<col width="10%"></col>
-							<col width="10%"></col>
-							<col width="1%"></col>
+							<col width="15%">
+							<col width="">
+							<col width="20%">
+							<col width="10%">
+							<col width="10%">
+							<col width="1%">
 						</colgroup>
 						<thead>
 							<tr>
@@ -471,9 +471,9 @@
 								<td>{$line.type}</td>
 								<td>{$line.state_name}</td>
 								<td>
-									<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else if isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
+									<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
 									{if $line.can_edit}
-									<form style="display: inline;" method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
+									<form style="display: inline;" method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
 										<span class="shipping_number_edit" style="display:none;">
 											<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
 											<input type="submit" class="button" name="submitShippingNumber" value="{l s='Update'}" />
@@ -504,13 +504,13 @@
 	<div class="container-command container-command-top-spacing">
 		<!-- Addresses -->
 		{if !$order->isVirtual()}
-			<div style="width: 49%; float:left;"></contact>
+			<div style="width: 49%; float:left;">
 				<!-- Shipping address -->
 				<fieldset>
 					<legend><img src="../img/admin/delivery.gif" alt="{l s='Shipping address'}" />{l s='Shipping address'}</legend>
 
 					{if $can_edit}
-					<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
+					<form method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
 						<div style="margin-bottom:5px;">
 							<p>
 								<select name="id_address">
@@ -534,13 +534,13 @@
 				</fieldset>
 			</div>
 		{/if}
-		<div style="width: 49%; float:right;"></contact>
+		<div style="width: 49%; float:right;">
 			<!-- Invoice address -->
 			<fieldset>
 				<legend><img src="../img/admin/invoice.gif" alt="{l s='Invoice address'}" />{l s='Invoice address'}</legend>
 
 				{if $can_edit}
-				<form method="POST" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
+				<form method="post" action="{$link->getAdminLink('AdminOrders')}&vieworder&id_order={$order->id}">
 					<div style="margin-bottom:5px;">
 						<p>
 							<select name="id_address">
@@ -714,21 +714,21 @@
 
 			<div style="clear:both; height:15px;">&nbsp;</div>
 			<div style="float: right; width: 160px; display: none;" class="standard_refund_fields">
-			{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
-				<input type="checkbox" id="reinjectQuantities" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
-			{/if}
-			{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-				<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit slip'}</label><br />
-				<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
-				<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
-			{/if}
-			{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
-				<div style="text-align:center; margin-top:5px;">
-					<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="button" style="margin-top:8px;" />
-				</div>
-			{/if}
+				{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
+					<input type="checkbox" id="reinjectQuantities" name="reinjectQuantities" class="button" />&nbsp;<label for="reinjectQuantities" style="float:none; font-weight:normal;">{l s='Re-stock products'}</label><br />
+				{/if}
+				{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+					<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateCreditSlip" style="float:none; font-weight:normal;">{l s='Generate a credit slip'}</label><br />
+					<input type="checkbox" id="generateDiscount" name="generateDiscount" class="button" onclick="toggleShippingCost(this)" />&nbsp;<label for="generateDiscount" style="float:none; font-weight:normal;">{l s='Generate a voucher'}</label><br />
+					<span id="spanShippingBack" style="display:none;"><input type="checkbox" id="shippingBack" name="shippingBack" class="button" />&nbsp;<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label><br /></span>
+				{/if}
+				{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
+					<div style="text-align:center; margin-top:5px;">
+						<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="button" style="margin-top:8px;" />
+					</div>
+				{/if}
 			</div>
-			<div style="float: right; width: 160px; display: none;" class="partial_refund_fields">
+			<div style="float: right; width: 160px; display:none;" class="partial_refund_fields">
 				<div style="text-align:center; margin-top:5px;">
 					<input type="submit" name="partialRefund" value="{l s='Partial refund'}" class="button" style="margin-top:8px;" />
 				</div>
diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index fad51c6cf..0aa9b4c1a 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -38,22 +38,22 @@
 	<br />
 	<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 		<colgroup>
-			<col width="300"></col>
-			<col width=""></col>
-			<col width="300"></col>
+			<col width="300">
+			<col width="">
+			<col width="300">
 		</colgroup>
 		<tr>
-			<th height="39px">{l s='Feature'}</td>
-			<th>{l s='Pre-defined value'}</td>
-			<th><u>{l s='or'}</u> {l s='Customized value'}</td>
+			<th height="39px">{l s='Feature'}</th>
+			<th>{l s='Pre-defined value'}</th>
+			<th><u>{l s='or'}</u> {l s='Customized value'}</th>
 		</tr>
 	</table>
 	{foreach from=$available_features item=available_feature}
 	<table cellpadding="5" style="background-color:#fff; width: 100%;border:1px solid #ccc; border-top:none;  padding:4px 6px;">
 			<colgroup>
-			<col width="300"></col>
-			<col width=""></col>
-			<col width="300"></col>
+			<col width="300">
+			<col width="">
+			<col width="300">
 		</colgroup>
 	<tr>
 		<td>{$available_feature.name}</td>
diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl
index b78ea6af5..15fe52a37 100644
--- a/admin-dev/themes/default/template/controllers/products/quantities.tpl
+++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl
@@ -117,8 +117,8 @@
 					<td valign="top" style="text-align:left;vertical-align:top;">
 						<table class="table" cellpadding="0" cellspacing="0" style="width:100%;">
 								<colgroup>
-									<col width="50"></col>
-									<col></col>
+									<col width="50">
+									<col>
 								</colgroup>
 							<thead>
 								<tr>
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl
index 834e51184..3c9e1db8e 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/list/list_header.tpl
@@ -27,7 +27,7 @@
 {extends file="helpers/list/list_header.tpl"}
 
 {block name="override_header"}
-	<script language="javascript">
+	<script language="javascript" type="text/javascript">
 		$(function() {
 			var btn_save_calendar = $('span[class~="process-icon-save-calendar"]').parent();
 			var btn_submit_calendar = $('#submitDatePicker');
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
index 86c345869..34578552e 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
@@ -27,7 +27,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-	<script language="javascript">
+	<script language="javascript" type="text/javascript">
 		$(function() {
 			var btn_save_calendar = $('span[class~="process-icon-save-calendar"]').parent();
 			var btn_submit_calendar = $('#submitDatePicker');
diff --git a/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl
index 51cd83fe8..99cfe2bd0 100644
--- a/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/stats/helpers/view/view.tpl
@@ -27,7 +27,7 @@
 {extends file="helpers/view/view.tpl"}
 
 {block name="override_tpl"}
-	<script language="javascript">
+	<script language="javascript" type="text/javascript">
 		$(function() {
 			var btn_save_calendar = $('span[class~="process-icon-save-calendar"]').parent();
 			var btn_submit_calendar = $('#submitDatePicker');
diff --git a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
index 4fbf8fc22..dc8647370 100644
--- a/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/suppliers/helpers/view/view.tpl
@@ -49,13 +49,13 @@
 		<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
 		<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 			<colgroup>
-				<col></col>
-				<col width="190"></col>
-				<col width="190"></col>
-				<col width="80"></col>
-				<col width="80"></col>
-				<col width="80"></col>
-				<col width="80"></col>
+				<col>
+				<col width="190">
+				<col width="190">
+				<col width="80">
+				<col width="80">
+				<col width="80">
+				<col width="80">
 			</colgroup>
 			<tr>
 				<th style="height:40px;">{l s='Attribute name'}</th>
diff --git a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl
index 4c467c53a..4d0d0cf1a 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders_receipt_history/helpers/list/list_header.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
-<script language="javascript">
+<script language="javascript" type="text/javascript">
 $(document).ready(function() {
 	$('input.quantity_received_today').live('click', function() {
 		/* checks checkbox when the input is clicked */
diff --git a/admin-dev/themes/default/template/toolbar.tpl b/admin-dev/themes/default/template/toolbar.tpl
index 86acd1989..171917fe5 100644
--- a/admin-dev/themes/default/template/toolbar.tpl
+++ b/admin-dev/themes/default/template/toolbar.tpl
@@ -38,7 +38,7 @@
 				{/foreach}
 			</ul>
 
-			<script language="javascript">
+			<script language="javascript" type="text/javascript">
 				$(function() {
 					//get reference on save link
 					btn_save = $('span[class~="process-icon-save"]').parent();
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index 0dea5b502..90db031f4 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -242,8 +242,8 @@ class AdminHomeControllerCore extends AdminController
 				<h5><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.$this->l('View more').'</a> '.$this->l('Customer service').'</h5>
 				<table class="table_info_details" style="width:100%;">
 					<colgroup>
-						<col width=""></col>
-						<col width="80px"></col>
+						<col width="">
+						<col width="80px">
 					</colgroup>
 					<tr class="tr_odd">
 						<td class="td_align_left">
@@ -318,8 +318,8 @@ class AdminHomeControllerCore extends AdminController
 			<h5><a href="index.php?tab=AdminStats&token='.Tools::getAdminTokenLite('AdminStats').'">'.$this->l('View more').'</a> '.$this->l('This month\'s activity').' </h5>
 			<table class="table_info_details" style="width:100%;">
 					<colgroup>
-						<col width=""></col>
-						<col width="80px"></col>
+						<col width="">
+						<col width="80px">
 					</colgroup>
 				<tr class="tr_odd">
 					<td class="td_align_left">
diff --git a/modules/blockcustomerprivacy/blockcustomerprivacy.php b/modules/blockcustomerprivacy/blockcustomerprivacy.php
index f44bad208..02c33c798 100644
--- a/modules/blockcustomerprivacy/blockcustomerprivacy.php
+++ b/modules/blockcustomerprivacy/blockcustomerprivacy.php
@@ -82,7 +82,7 @@ class Blockcustomerprivacy extends Module
 			</script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
-			<script language="javascript">id_language = Number('.$defaultLanguage.');</script>';
+			<script language="javascript" type="text/javascript">id_language = Number('.$defaultLanguage.');</script>';
 		else
 		{
 			$content .= '
diff --git a/modules/carriercompare/carriercompare.tpl b/modules/carriercompare/carriercompare.tpl
index bf2311604..0c6adb2b2 100644
--- a/modules/carriercompare/carriercompare.tpl
+++ b/modules/carriercompare/carriercompare.tpl
@@ -39,7 +39,7 @@
 	var txtFree = "{l s='Free!' mod='carriercompare'}";
 	//]]>
 </script>
-<form class="std" id="compare_shipping_form" method="POST" action="#" >
+<form class="std" id="compare_shipping_form" method="post" action="#" >
 	<fieldset id="compare_shipping">
 		<h3>{l s='Estimate your shipping & taxes' mod='carriercompare'}</h3>
 		
diff --git a/modules/carriercompare/template/carriercompare.tpl b/modules/carriercompare/template/carriercompare.tpl
index 844c23a8b..70ecab6d9 100755
--- a/modules/carriercompare/template/carriercompare.tpl
+++ b/modules/carriercompare/template/carriercompare.tpl
@@ -46,7 +46,7 @@
 	//]]>
 </script>
 
-<form class="std" id="compare_shipping_form" method="POST" action="#" >
+<form class="std" id="compare_shipping_form" method="post" action="#" >
 	<fieldset id="compare_shipping">
 		<h3>{l s='Estimate your shipping & taxes' mod='carriercompare'}</h3>
 		
diff --git a/modules/dateofdelivery/dateofdelivery.php b/modules/dateofdelivery/dateofdelivery.php
index 39a86a708..1db0935a2 100644
--- a/modules/dateofdelivery/dateofdelivery.php
+++ b/modules/dateofdelivery/dateofdelivery.php
@@ -341,7 +341,7 @@ class DateOfDelivery extends Module
 		$this->_html .= '
 		</fieldset>
 		<br />
-		<form method="POST" action="'.AdminController::$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'">
+		<form method="post" action="'.AdminController::$currentIndex.'&configure='.$this->name.'&token='.Tools::getAdminTokenLite('AdminModules').'">
 			<fieldset style="width:500px;">
 				<legend><img src="'._PS_BASE_URL_.__PS_BASE_URI__.'modules/'.$this->name.'/img/time.png" alt="" /> '.$this->l('More options').'</legend>
 				
@@ -380,7 +380,7 @@ class DateOfDelivery extends Module
 			$carrier_rule = $this->_getCarrierRule(Tools::getValue('id_carrier_rule'));
 		
 		$this->_html .= '
-		<form method="POST" action="'.$_SERVER['REQUEST_URI'].'">
+		<form method="post" action="'.$_SERVER['REQUEST_URI'].'">
 		';
 		
 		if (isset($carrier_rule) AND $carrier_rule['id_carrier_rule'])
diff --git a/modules/graphxmlswfcharts/graphxmlswfcharts.php b/modules/graphxmlswfcharts/graphxmlswfcharts.php
index 7c43c45a1..8b0bd2072 100644
--- a/modules/graphxmlswfcharts/graphxmlswfcharts.php
+++ b/modules/graphxmlswfcharts/graphxmlswfcharts.php
@@ -75,8 +75,8 @@ class GraphXmlSwfCharts extends ModuleGraphEngine
 	
 	public static function hookGraphEngine($params, $drawer)
 	{
-		return '<script language="javascript">AC_FL_RunContent = 0;</script>
-			<script language="javascript"> DetectFlashVer = 0; </script>
+		return '<script language="javascript" type="text/javascript">AC_FL_RunContent = 0;</script>
+			<script language="javascript" type="text/javascript"> DetectFlashVer = 0; </script>
 			<script src="../modules/graphxmlswfcharts/xml_swf_charts/AC_RunActiveContent.js" language="javascript"></script>
 			<script language="JavaScript" type="text/javascript">
 			<!--
diff --git a/modules/homeslider/homeslider.php b/modules/homeslider/homeslider.php
index c552bf537..b744bbf25 100644
--- a/modules/homeslider/homeslider.php
+++ b/modules/homeslider/homeslider.php
@@ -315,7 +315,7 @@ class HomeSlider extends Module
 		$this->_html .= '<script type="text/javascript">id_language = Number('.$defaultLanguage.');</script>';
 
 		/* Form */
-		$this->_html .= '<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="POST" enctype="multipart/form-data">';
+		$this->_html .= '<form action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" method="post" enctype="multipart/form-data">';
 
 		/* Fieldset Upload */
 		$this->_html .= '
diff --git a/modules/referralprogram/referralprogram.php b/modules/referralprogram/referralprogram.php
index ab7aca878..5f7fb65e2 100644
--- a/modules/referralprogram/referralprogram.php
+++ b/modules/referralprogram/referralprogram.php
@@ -331,7 +331,7 @@ class ReferralProgram extends Module
 			</script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tiny_mce/tiny_mce.js"></script>
 			<script type="text/javascript" src="'.__PS_BASE_URI__.'js/tinymce.inc.js"></script>
-			<script language="javascript">id_language = Number('.$defaultLanguage.');</script>
+			<script language="javascript" type="text/javascript">id_language = Number('.$defaultLanguage.');</script>
 		<form method="post" action="'.Tools::safeOutput($_SERVER['REQUEST_URI']).'" enctype="multipart/form-data">
 			<fieldset>
 				<legend><img src="'.$this->_path.'logo.gif" alt="" title="" /> '.$this->l('Conditions of the referral program').'</legend>';