diff --git a/templates/default/I18n/en_US.php b/templates/default/I18n/en_US.php
index 07b7e6411..bd8695b60 100755
--- a/templates/default/I18n/en_US.php
+++ b/templates/default/I18n/en_US.php
@@ -1,218 +1,229 @@
 <?php
 
 return array (
-  '+ View All' => '+ View All',
-  'Thelia V2' => 'Thelia V2',
-  'Skip to content' => 'Skip to content',
-  'Toggle navigation' => 'Toggle navigation',
-  'Main Navigation' => 'Main Navigation',
-  'Register!' => 'Register!',
-  'Log In!' => 'Log In!',
-  'Sign In' => 'Sign In',
-  'Register' => 'Register',
-  'Cart' => 'Cart',
-  'View Cart' => 'View Cart',
-  'Checkout' => 'Checkout',
-  'You have no items in your shopping cart.' => 'You have no items in your shopping cart.',
-  'Home' => 'Home',
-  'Search a product' => 'Search a product',
-  'Search...' => 'Search...',
-  'Minimum 2 characters.' => 'Minimum 2 characters.',
-  'Search' => 'Search',
-  'Language:' => 'Language:',
-  'Currency:' => 'Currency:',
-  'Latest' => 'Latest',
-  'Offers' => 'Offers',
-  'Special Price:' => 'Special Price:',
-  'Regular Price:' => 'Regular Price:',
-  'Free shipping' => 'Free shipping',
-  'Orders over $50' => 'Orders over $50',
-  'Secure payment' => 'Secure payment',
-  'Multi-payment platform' => 'Multi-payment platform',
-  'Need help ?' => 'Need help ?',
-  'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.',
-  'Latest articles' => 'Latest articles',
-  'No articles currently' => 'No articles currently',
-  'Useful links' => 'Useful links',
-  'Login' => 'Login',
-  'Follow us' => 'Follow us',
-  'Newsletter' => 'Newsletter',
-  'Sign up to receive our latest news.' => 'Sign up to receive our latest news.',
-  'Email address' => 'Email address',
-  'Your email address' => 'Your email address',
-  'Subscribe' => 'Subscribe',
-  'Contact Us' => 'Contact Us',
-  'Copyright' => 'Copyright',
-  'You are here:' => 'You are here:',
-  'Show' => 'Show',
-  'per page' => 'per page',
-  'Sort By' => 'Sort By',
-  'Name ascending' => 'Name ascending',
-  'Name descending' => 'Name descending',
-  'Price ascending' => 'Price ascending',
-  'Price descending' => 'Price descending',
-  'View as' => 'View as',
-  'View product' => 'View product',
-  'Pagination' => 'Pagination',
-  'No products available in this category' => 'No products available in this category',
-  'Categories' => 'Categories',
-  'Ref.' => 'Ref.',
-  'Availability' => 'Availability',
-  'In stock' => 'In stock',
-  'Out of stock' => 'Out of stock',
-  'Add to cart' => 'Add to cart',
-  'Description' => 'Description',
-  'Additional Info' => 'Additional Info',
-  'View cart' => 'View cart',
-  'Continue Shopping' => 'Continue Shopping',
-  'Upsell Products' => 'Upsell Products',
-  'Your Cart' => 'Your Cart',
-  'Billing and delivery' => 'Billing and delivery',
-  'Check my order' => 'Check my order',
-  'Product Name' => 'Product Name',
-  'Name' => 'Name',
-  'Unit Price' => 'Unit Price',
-  'Price' => 'Price',
-  'Quantity' => 'Quantity',
-  'Qty' => 'Qty',
-  'Total' => 'Total',
-  'Tax Inclusive' => 'Tax Inclusive',
-  'TTC' => 'TTC',
-  'Available' => 'Available',
-  'In Stock' => 'In Stock',
-  'No.' => 'No.',
-  'Remove' => 'Remove',
-  'Proceed checkout' => 'Proceed checkout',
-  'Warning' => 'Warning',
-  'missing or invalid data' => 'missing or invalid data',
-  'Do you have an account?' => 'Do you have an account?',
-  'Forgot your Password?' => 'Forgot your Password?',
-  'Next' => 'Next',
-  'Log out!' => 'Log out!',
-  'My Account' => 'My Account',
-  'Previous product' => 'Previous product',
-  'Next product' => 'Next product',
-  'instead of' => 'instead of',
-  'Add a new address' => 'Add a new address',
-  'Choose your delivery address' => 'Choose your delivery address',
-  'Address %nb' => 'Address %nb',
-  'Edit this address' => 'Edit this address',
-  'Edit' => 'Edit',
-  'Remove this address' => 'Remove this address',
-  'Cancel' => 'Cancel',
-  'Choose your delivery method' => 'Choose your delivery method',
-  'Back' => 'Back',
-  'Next Step' => 'Next Step',
-  'Delete address' => 'Delete address',
-  'Do you really want to delete this address ?' => 'Do you really want to delete this address ?',
-  'No' => 'No',
-  'Yes' => 'Yes',
-  'Shipping Tax' => 'Shipping Tax',
-  'You may have a coupon ?' => 'You may have a coupon ?',
-  'Code :' => 'Code :',
-  'Coupon code' => 'Coupon code',
-  'Ok' => 'Ok',
-  'Delivery address' => 'Delivery address',
-  'Billing address' => 'Billing address',
-  'Change address' => 'Change address',
-  'Choose your payment method' => 'Choose your payment method',
-  'Secure Payment' => 'Secure Payment',
-  'You choose to pay by' => 'You choose to pay by',
-  'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
-  'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
-  'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
-  'Order number' => 'Order number',
-  'Date' => 'Date',
-  'Go home' => 'Go home',
-  'Account' => 'Account',
-  'Personal Information' => 'Personal Information',
-  'Change my account information' => 'Change my account information',
-  'Change my password' => 'Change my password',
-  'My Address book' => 'My Address book',
-  'My Address Books' => 'My Address Books',
-  'My Orders' => 'My Orders',
-  'List of orders' => 'List of orders',
-  'Order Number' => 'Order Number',
-  'Amount' => 'Amount',
-  'Status' => 'Status',
-  'View' => 'View',
-  'View order %ref as pdf document' => 'View order %ref as pdf document',
-  'Order details' => 'Order details',
-  'You don\'t have orders yet.' => 'You don\'t have orders yet.',
-  'Update Profile' => 'Update Profile',
-  'Personal Informations' => 'Personal Informations',
-  'Select Title' => 'Select Title',
-  'Update' => 'Update',
-  'Change Password' => 'Change Password',
-  'Login Information' => 'Login Information',
-  'Create New Address' => 'Create New Address',
-  'Address' => 'Address',
-  'Home address' => 'Home address',
-  'Complementary address' => 'Complementary address',
-  'Select Country' => 'Select Country',
-  'Create' => 'Create',
-  'Related' => 'Related',
-  'Grid' => 'Grid',
-  'List' => 'List',
-  'Next' => 'Next',
-  'Previous' => 'Previous',
-  '%nb Items' => '%nb Items',
-  '%nb Item' => '%nb Item',
-  'Latest products' => 'Latest products',
-  'Product Offers' => 'Product Offers',
-/*
-  'The page cannot be found' => 'The page cannot be found',
-  'What\'s your name?' => 'What\'s your name?',
-  'So I can get back to you.' => 'So I can get back to you.',
-  'The subject of your message.' => 'The subject of your message.',
-  'And your message...' => 'And your message...',
-  'This email already exists.' => 'This email already exists.',
-  'Address label' => 'Address label',
-  'Title' => 'Title',
-  'First Name' => 'First Name',
-  'Last Name' => 'Last Name',
-  'Company Name' => 'Company Name',
-  'Street Address' => 'Street Address',
-  'Address Line 2' => 'Address Line 2',
-  'Address Line 3' => 'Address Line 3',
-  'City' => 'City',
-  'Zip code' => 'Zip code',
-  'Country' => 'Country',
-  'Phone' => 'Phone',
-  'Cellphone' => 'Cellphone',
-  'Make this address as my primary address' => 'Make this address as my primary address',
-  'Full Name' => 'Full Name',
-  'Your Email Address' => 'Your Email Address',
-  'Subject' => 'Subject',
-  'Your Message' => 'Your Message',
-  'Please enter your email address' => 'Please enter your email address',
-  'No, I am a new customer.' => 'No, I am a new customer.',
-  'Yes, I have a password :' => 'Yes, I have a password :',
-  'Please enter your password' => 'Please enter your password',
-  'This value should not be blank.' => 'This value should not be blank.',
-  'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.',
-  'This email does not exists' => 'This email does not exists',
-  'Current Password' => 'Current Password',
-  'New Password' => 'New Password',
-  'Password confirmation' => 'Password confirmation',
-  'Your current password does not match.' => 'Your current password does not match.',
-  'Password confirmation is not the same as password field.' => 'Password confirmation is not the same as password field.',
-  'I would like to receive the newsletter or the latest news.' => 'I would like to receive the newsletter or the latest news.',
-*/
-  'Placeholder firstname' => 'John',
-  'Placeholder lastname' => 'Doe',
-  'Placeholder email' => 'johndoe@domain.com',
-  'Placeholder phone' => '',
-  'Placeholder cellphone' => '',
-  'Placeholder company' => 'Google',
-  'Placeholder address1' => '76 Ninth Avenue',
-  'Placeholder address2' => '',
-  'Placeholder city' => 'New York',
-  'Placeholder zipcode' => 'NY 10011',
-  'Placeholder address label' => 'Home, Work office, other',
-  'Placeholder contact name' => 'What\'s your name?',
-  'Placeholder contact email' => 'So I can get back to you.',
-  'Placeholder contact subject' => 'The subject of your message.',
-  'Placeholder contact message' => 'And your message...',
+    '+ View All' => '+ View All',
+    'Thelia V2' => 'Thelia V2',
+    'Skip to content' => 'Skip to content',
+    'Toggle navigation' => 'Toggle navigation',
+    'Main Navigation' => 'Main Navigation',
+    'Register!' => 'Register!',
+    'Log In!' => 'Log In!',
+    'Sign In' => 'Sign In',
+    'Register' => 'Register',
+    'Cart' => 'Cart',
+    'View Cart' => 'View Cart',
+    'Checkout' => 'Checkout',
+    'You have no items in your shopping cart.' => 'You have no items in your shopping cart.',
+    'Home' => 'Home',
+    'Search a product' => 'Search a product',
+    'Search...' => 'Search...',
+    'Minimum 2 characters.' => 'Minimum 2 characters.',
+    'Search' => 'Search',
+    'Language:' => 'Language:',
+    'Currency:' => 'Currency:',
+    'Latest' => 'Latest',
+    'Offers' => 'Offers',
+    'Special Price:' => 'Special Price:',
+    'Regular Price:' => 'Regular Price:',
+    'Free shipping' => 'Free shipping',
+    'Orders over $50' => 'Orders over $50',
+    'Secure payment' => 'Secure payment',
+    'Multi-payment platform' => 'Multi-payment platform',
+    'Need help ?' => 'Need help ?',
+    'Questions ? See or F.A.Q.' => 'Questions ? See or F.A.Q.',
+    'Latest articles' => 'Latest articles',
+    'No articles currently' => 'No articles currently',
+    'Useful links' => 'Useful links',
+    'Login' => 'Login',
+    'Follow us' => 'Follow us',
+    'Newsletter' => 'Newsletter',
+    'Sign up to receive our latest news.' => 'Sign up to receive our latest news.',
+    'Email address' => 'Email address',
+    'Your email address' => 'Your email address',
+    'Subscribe' => 'Subscribe',
+    'Contact Us' => 'Contact Us',
+    'Copyright' => 'Copyright',
+    'You are here:' => 'You are here:',
+    'Show' => 'Show',
+    'per page' => 'per page',
+    'Sort By' => 'Sort By',
+    'Name ascending' => 'Name ascending',
+    'Name descending' => 'Name descending',
+    'Price ascending' => 'Price ascending',
+    'Price descending' => 'Price descending',
+    'View as' => 'View as',
+    'View product' => 'View product',
+    'Pagination' => 'Pagination',
+    'No products available in this category' => 'No products available in this category',
+    'Categories' => 'Categories',
+    'Ref.' => 'Ref.',
+    'Availability' => 'Availability',
+    'In stock' => 'In stock',
+    'Out of stock' => 'Out of stock',
+    'Add to cart' => 'Add to cart',
+    'Description' => 'Description',
+    'Additional Info' => 'Additional Info',
+    'View cart' => 'View cart',
+    'Continue Shopping' => 'Continue Shopping',
+    'Upsell Products' => 'Upsell Products',
+    'Your Cart' => 'Your Cart',
+    'Billing and delivery' => 'Billing and delivery',
+    'Check my order' => 'Check my order',
+    'Product Name' => 'Product Name',
+    'Name' => 'Name',
+    'Unit Price' => 'Unit Price',
+    'Price' => 'Price',
+    'Quantity' => 'Quantity',
+    'Qty' => 'Qty',
+    'Total' => 'Total',
+    'Tax Inclusive' => 'Tax Inclusive',
+    'TTC' => 'TTC',
+    'Available' => 'Available',
+    'In Stock' => 'In Stock',
+    'No.' => 'No.',
+    'Remove' => 'Remove',
+    'Proceed checkout' => 'Proceed checkout',
+    'Warning' => 'Warning',
+    'missing or invalid data' => 'missing or invalid data',
+    'Do you have an account?' => 'Do you have an account?',
+    'Forgot your Password?' => 'Forgot your Password?',
+    'Next' => 'Next',
+    'Log out!' => 'Log out!',
+    'My Account' => 'My Account',
+    'Previous product' => 'Previous product',
+    'Next product' => 'Next product',
+    'instead of' => 'instead of',
+    'Add a new address' => 'Add a new address',
+    'Choose your delivery address' => 'Choose your delivery address',
+    'Address %nb' => 'Address %nb',
+    'Edit this address' => 'Edit this address',
+    'Edit' => 'Edit',
+    'Remove this address' => 'Remove this address',
+    'Cancel' => 'Cancel',
+    'Choose your delivery method' => 'Choose your delivery method',
+    'Back' => 'Back',
+    'Next Step' => 'Next Step',
+    'Delete address' => 'Delete address',
+    'Do you really want to delete this address ?' => 'Do you really want to delete this address ?',
+    'No' => 'No',
+    'Yes' => 'Yes',
+    'Shipping Tax' => 'Shipping Tax',
+    'You may have a coupon ?' => 'You may have a coupon ?',
+    'Code :' => 'Code :',
+    'Coupon code' => 'Coupon code',
+    'Ok' => 'Ok',
+    'Delivery address' => 'Delivery address',
+    'Billing address' => 'Billing address',
+    'Change address' => 'Change address',
+    'Choose your payment method' => 'Choose your payment method',
+    'Secure Payment' => 'Secure Payment',
+    'You choose to pay by' => 'You choose to pay by',
+    'Thank you for the trust you place in us.' => 'Thank you for the trust you place in us.',
+    'A summary of your order email has been sent to the following address' => 'A summary of your order email has been sent to the following address',
+    'Your order will be confirmed by us upon receipt of your payment.' => 'Your order will be confirmed by us upon receipt of your payment.',
+    'Order number' => 'Order number',
+    'Date' => 'Date',
+    'Go home' => 'Go home',
+    'Account' => 'Account',
+    'Personal Information' => 'Personal Information',
+    'Change my account information' => 'Change my account information',
+    'Change my password' => 'Change my password',
+    'My Address book' => 'My Address book',
+    'My Address Books' => 'My Address Books',
+    'My Orders' => 'My Orders',
+    'List of orders' => 'List of orders',
+    'Order Number' => 'Order Number',
+    'Amount' => 'Amount',
+    'Status' => 'Status',
+    'View' => 'View',
+    'View order %ref as pdf document' => 'View order %ref as pdf document',
+    'Order details' => 'Order details',
+    'You don\'t have orders yet.' => 'You don\'t have orders yet.',
+    'Update Profile' => 'Update Profile',
+    'Personal Informations' => 'Personal Informations',
+    'Select Title' => 'Select Title',
+    'Update' => 'Update',
+    'Change Password' => 'Change Password',
+    'Login Information' => 'Login Information',
+    'Create New Address' => 'Create New Address',
+    'Address' => 'Address',
+    'Home address' => 'Home address',
+    'Complementary address' => 'Complementary address',
+    'Select Country' => 'Select Country',
+    'Create' => 'Create',
+    'Related' => 'Related',
+    'Grid' => 'Grid',
+    'List' => 'List',
+    'Next' => 'Next',
+    'Previous' => 'Previous',
+    '%nb Items' => '%nb Items',
+    '%nb Item' => '%nb Item',
+    'Latest products' => 'Latest products',
+    'Product Offers' => 'Product Offers',
+    /*
+    'The page cannot be found' => 'The page cannot be found',
+    'What\'s your name?' => 'What\'s your name?',
+    'So I can get back to you.' => 'So I can get back to you.',
+    'The subject of your message.' => 'The subject of your message.',
+    'And your message...' => 'And your message...',
+    'This email already exists.' => 'This email already exists.',
+    'Address label' => 'Address label',
+    'Title' => 'Title',
+    'First Name' => 'First Name',
+    'Last Name' => 'Last Name',
+    'Company Name' => 'Company Name',
+    'Street Address' => 'Street Address',
+    'Address Line 2' => 'Address Line 2',
+    'Address Line 3' => 'Address Line 3',
+    'City' => 'City',
+    'Zip code' => 'Zip code',
+    'Country' => 'Country',
+    'Phone' => 'Phone',
+    'Cellphone' => 'Cellphone',
+    'Make this address as my primary address' => 'Make this address as my primary address',
+    'Full Name' => 'Full Name',
+    'Your Email Address' => 'Your Email Address',
+    'Subject' => 'Subject',
+    'Your Message' => 'Your Message',
+    'Please enter your email address' => 'Please enter your email address',
+    'No, I am a new customer.' => 'No, I am a new customer.',
+    'Yes, I have a password :' => 'Yes, I have a password :',
+    'Please enter your password' => 'Please enter your password',
+    'This value should not be blank.' => 'This value should not be blank.',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => 'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.',
+    'This email does not exists' => 'This email does not exists',
+    'Current Password' => 'Current Password',
+    'New Password' => 'New Password',
+    'Password confirmation' => 'Password confirmation',
+    'Your current password does not match.' => 'Your current password does not match.',
+    'Password confirmation is not the same as password field.' => 'Password confirmation is not the same as password field.',
+    'I would like to receive the newsletter or the latest news.' => 'I would like to receive the newsletter or the latest news.',
+    */
+    // Product Empty
+    'Product Empty Title' => 'Welcome',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+        <ol>
+            <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+            <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+        </ol>',
+    'Product Empty Button' => 'Add my first product',
+    'Demo product title' => 'Demo product title',
+    'Demo product description' => 'Demo product description',
+    // Placeholder
+    'Placeholder firstname' => 'John',
+    'Placeholder lastname' => 'Doe',
+    'Placeholder email' => 'johndoe@domain.com',
+    'Placeholder phone' => '',
+    'Placeholder cellphone' => '',
+    'Placeholder company' => 'Google',
+    'Placeholder address1' => '76 Ninth Avenue',
+    'Placeholder address2' => '',
+    'Placeholder city' => 'New York',
+    'Placeholder zipcode' => 'NY 10011',
+    'Placeholder address label' => 'Home, Work office, other',
+    'Placeholder contact name' => 'What\'s your name?',
+    'Placeholder contact email' => 'So I can get back to you.',
+    'Placeholder contact subject' => 'The subject of your message.',
+    'Placeholder contact message' => 'And your message...',
 )
 ;
\ No newline at end of file
diff --git a/templates/default/I18n/es_ES.php b/templates/default/I18n/es_ES.php
index a5c5950ee..e4004de1e 100755
--- a/templates/default/I18n/es_ES.php
+++ b/templates/default/I18n/es_ES.php
@@ -1,218 +1,229 @@
 <?php
 
 return array (
-  '+ View All' => '',
-  'Thelia V2' => '',
-  'Skip to content' => '',
-  'Toggle navigation' => '',
-  'Main Navigation' => '',
-  'Register!' => '',
-  'Log In!' => '',
-  'Sign In' => '',
-  'Register' => '',
-  'Cart' => '',
-  'View Cart' => '',
-  'Checkout' => '',
-  'You have no items in your shopping cart.' => '',
-  'Home' => '',
-  'Search a product' => '',
-  'Search...' => '',
-  'Minimum 2 characters.' => '',
-  'Search' => '',
-  'Language:' => '',
-  'Currency:' => '',
-  'Latest' => '',
-  'Offers' => '',
-  'Special Price:' => '',
-  'Regular Price:' => '',
-  'Free shipping' => '',
-  'Orders over $50' => '',
-  'Secure payment' => '',
-  'Multi-payment platform' => '',
-  'Need help ?' => '',
-  'Questions ? See or F.A.Q.' => '',
-  'Latest articles' => '',
-  'No articles currently' => '',
-  'Useful links' => '',
-  'Login' => '',
-  'Follow us' => '',
-  'Newsletter' => '',
-  'Sign up to receive our latest news.' => '',
-  'Email address' => '',
-  'Your email address' => '',
-  'Subscribe' => '',
-  'Contact Us' => '',
-  'Copyright' => '',
-  'You are here:' => '',
-  'Show' => '',
-  'per page' => '',
-  'Sort By' => '',
-  'Name ascending' => '',
-  'Name descending' => '',
-  'Price ascending' => '',
-  'Price descending' => '',
-  'View as' => '',
-  'View product' => '',
-  'Pagination' => '',
-  'No products available in this category' => '',
-  'Categories' => '',
-  'Ref.' => '',
-  'Availability' => '',
-  'In stock' => '',
-  'Out of stock' => '',
-  'Add to cart' => '',
-  'Description' => '',
-  'Additional Info' => '',
-  'View cart' => '',
-  'Continue Shopping' => '',
-  'Upsell Products' => '',
-  'Your Cart' => '',
-  'Billing and delivery' => '',
-  'Check my order' => '',
-  'Product Name' => '',
-  'Name' => '',
-  'Unit Price' => '',
-  'Price' => '',
-  'Quantity' => '',
-  'Qty' => '',
-  'Total' => '',
-  'Tax Inclusive' => '',
-  'TTC' => '',
-  'Available' => '',
-  'In Stock' => '',
-  'No.' => '',
-  'Remove' => '',
-  'Proceed checkout' => '',
-  'Warning' => '',
-  'missing or invalid data' => '',
-  'Do you have an account?' => '',
-  'Forgot your Password?' => '',
-  'Next' => '',
-  'Log out!' => '',
-  'My Account' => '',
-  'Previous product' => '',
-  'Next product' => '',
-  'instead of' => '',
-  'Add a new address' => '',
-  'Choose your delivery address' => '',
-  'Address %nb' => '',
-  'Edit this address' => '',
-  'Edit' => '',
-  'Remove this address' => '',
-  'Cancel' => '',
-  'Choose your delivery method' => '',
-  'Back' => '',
-  'Next Step' => '',
-  'Delete address' => '',
-  'Do you really want to delete this address ?' => '',
-  'No' => '',
-  'Yes' => '',
-  'Shipping Tax' => '',
-  'You may have a coupon ?' => '',
-  'Code :' => '',
-  'Coupon code' => '',
-  'Ok' => '',
-  'Delivery address' => '',
-  'Billing address' => '',
-  'Change address' => '',
-  'Choose your payment method' => '',
-  'Secure Payment' => '',
-  'You choose to pay by' => '',
-  'Thank you for the trust you place in us.' => '',
-  'A summary of your order email has been sent to the following address' => '',
-  'Your order will be confirmed by us upon receipt of your payment.' => '',
-  'Order number' => '',
-  'Date' => '',
-  'Go home' => '',
-  'Account' => '',
-  'Personal Information' => '',
-  'Change my account information' => '',
-  'Change my password' => '',
-  'My Address book' => '',
-  'My Address Books' => '',
-  'My Orders' => '',
-  'List of orders' => '',
-  'Order Number' => '',
-  'Amount' => '',
-  'Status' => '',
-  'View' => '',
-  'View order %ref as pdf document' => '',
-  'Order details' => '',
-  'You don\'t have orders yet.' => '',
-  'Update Profile' => '',
-  'Personal Informations' => '',
-  'Select Title' => '',
-  'Update' => '',
-  'Change Password' => '',
-  'Login Information' => '',
-  'Create New Address' => '',
-  'Address' => '',
-  'Home address' => '',
-  'Complementary address' => '',
-  'Select Country' => '',
-  'Create' => '',
-  'Related' => '',
-  'Grid' => '',
-  'List' => '',
-  'Next' => '',
-  'Previous' => '',
-  '%nb Items' => '',
-  '%nb Item' => '',
-  'Latest products' => '',
-  'Product Offers' => '',
-/*
-  'The page cannot be found' => '',
-  'What\'s your name?' => '',
-  'So I can get back to you.' => '',
-  'The subject of your message.' => '',
-  'And your message...' => '',
-  'This email already exists.' => '',
-  'Address label' => '',
-  'Title' => '',
-  'First Name' => '',
-  'Last Name' => '',
-  'Company Name' => '',
-  'Street Address' => '',
-  'Address Line 2' => '',
-  'Address Line 3' => '',
-  'City' => '',
-  'Zip code' => '',
-  'Country' => '',
-  'Phone' => '',
-  'Cellphone' => '',
-  'Make this address as my primary address' => '',
-  'Full Name' => '',
-  'Your Email Address' => '',
-  'Subject' => '',
-  'Your Message' => '',
-  'Please enter your email address' => '',
-  'No, I am a new customer.' => '',
-  'Yes, I have a password :' => '',
-  'Please enter your password' => '',
-  'This value should not be blank.' => '',
-  'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-  'This email does not exists' => '',
-  'Current Password' => '',
-  'New Password' => '',
-  'Password confirmation' => '',
-  'Your current password does not match.' => '',
-  'Password confirmation is not the same as password field.' => '',
-  'I would like to receive the newsletter or the latest news.' => '',
-*/
-  'Placeholder firstname' => '',
-  'Placeholder lastname' => '',
-  'Placeholder email' => '',
-  'Placeholder phone' => '',
-  'Placeholder cellphone' => '',
-  'Placeholder company' => '',
-  'Placeholder address1' => '',
-  'Placeholder address2' => '',
-  'Placeholder city' => '',
-  'Placeholder zipcode' => '',
-  'Placeholder address label' => '',
-  'Placeholder contact name' => '',
-  'Placeholder contact email' => '',
-  'Placeholder contact subject' => '',
-  'Placeholder contact message' => '',
+    '+ View All' => '',
+    'Thelia V2' => '',
+    'Skip to content' => '',
+    'Toggle navigation' => '',
+    'Main Navigation' => '',
+    'Register!' => '',
+    'Log In!' => '',
+    'Sign In' => '',
+    'Register' => '',
+    'Cart' => '',
+    'View Cart' => '',
+    'Checkout' => '',
+    'You have no items in your shopping cart.' => '',
+    'Home' => '',
+    'Search a product' => '',
+    'Search...' => '',
+    'Minimum 2 characters.' => '',
+    'Search' => '',
+    'Language:' => '',
+    'Currency:' => '',
+    'Latest' => '',
+    'Offers' => '',
+    'Special Price:' => '',
+    'Regular Price:' => '',
+    'Free shipping' => '',
+    'Orders over $50' => '',
+    'Secure payment' => '',
+    'Multi-payment platform' => '',
+    'Need help ?' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Latest articles' => '',
+    'No articles currently' => '',
+    'Useful links' => '',
+    'Login' => '',
+    'Follow us' => '',
+    'Newsletter' => '',
+    'Sign up to receive our latest news.' => '',
+    'Email address' => '',
+    'Your email address' => '',
+    'Subscribe' => '',
+    'Contact Us' => '',
+    'Copyright' => '',
+    'You are here:' => '',
+    'Show' => '',
+    'per page' => '',
+    'Sort By' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'View as' => '',
+    'View product' => '',
+    'Pagination' => '',
+    'No products available in this category' => '',
+    'Categories' => '',
+    'Ref.' => '',
+    'Availability' => '',
+    'In stock' => '',
+    'Out of stock' => '',
+    'Add to cart' => '',
+    'Description' => '',
+    'Additional Info' => '',
+    'View cart' => '',
+    'Continue Shopping' => '',
+    'Upsell Products' => '',
+    'Your Cart' => '',
+    'Billing and delivery' => '',
+    'Check my order' => '',
+    'Product Name' => '',
+    'Name' => '',
+    'Unit Price' => '',
+    'Price' => '',
+    'Quantity' => '',
+    'Qty' => '',
+    'Total' => '',
+    'Tax Inclusive' => '',
+    'TTC' => '',
+    'Available' => '',
+    'In Stock' => '',
+    'No.' => '',
+    'Remove' => '',
+    'Proceed checkout' => '',
+    'Warning' => '',
+    'missing or invalid data' => '',
+    'Do you have an account?' => '',
+    'Forgot your Password?' => '',
+    'Next' => '',
+    'Log out!' => '',
+    'My Account' => '',
+    'Previous product' => '',
+    'Next product' => '',
+    'instead of' => '',
+    'Add a new address' => '',
+    'Choose your delivery address' => '',
+    'Address %nb' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Remove this address' => '',
+    'Cancel' => '',
+    'Choose your delivery method' => '',
+    'Back' => '',
+    'Next Step' => '',
+    'Delete address' => '',
+    'Do you really want to delete this address ?' => '',
+    'No' => '',
+    'Yes' => '',
+    'Shipping Tax' => '',
+    'You may have a coupon ?' => '',
+    'Code :' => '',
+    'Coupon code' => '',
+    'Ok' => '',
+    'Delivery address' => '',
+    'Billing address' => '',
+    'Change address' => '',
+    'Choose your payment method' => '',
+    'Secure Payment' => '',
+    'You choose to pay by' => '',
+    'Thank you for the trust you place in us.' => '',
+    'A summary of your order email has been sent to the following address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+    'Order number' => '',
+    'Date' => '',
+    'Go home' => '',
+    'Account' => '',
+    'Personal Information' => '',
+    'Change my account information' => '',
+    'Change my password' => '',
+    'My Address book' => '',
+    'My Address Books' => '',
+    'My Orders' => '',
+    'List of orders' => '',
+    'Order Number' => '',
+    'Amount' => '',
+    'Status' => '',
+    'View' => '',
+    'View order %ref as pdf document' => '',
+    'Order details' => '',
+    'You don\'t have orders yet.' => '',
+    'Update Profile' => '',
+    'Personal Informations' => '',
+    'Select Title' => '',
+    'Update' => '',
+    'Change Password' => '',
+    'Login Information' => '',
+    'Create New Address' => '',
+    'Address' => '',
+    'Home address' => '',
+    'Complementary address' => '',
+    'Select Country' => '',
+    'Create' => '',
+    'Related' => '',
+    'Grid' => '',
+    'List' => '',
+    'Next' => '',
+    'Previous' => '',
+    '%nb Items' => '',
+    '%nb Item' => '',
+    'Latest products' => '',
+    'Product Offers' => '',
+    /*
+    'The page cannot be found' => '',
+    'What\'s your name?' => '',
+    'So I can get back to you.' => '',
+    'The subject of your message.' => '',
+    'And your message...' => '',
+    'This email already exists.' => '',
+    'Address label' => '',
+    'Title' => '',
+    'First Name' => '',
+    'Last Name' => '',
+    'Company Name' => '',
+    'Street Address' => '',
+    'Address Line 2' => '',
+    'Address Line 3' => '',
+    'City' => '',
+    'Zip code' => '',
+    'Country' => '',
+    'Phone' => '',
+    'Cellphone' => '',
+    'Make this address as my primary address' => '',
+    'Full Name' => '',
+    'Your Email Address' => '',
+    'Subject' => '',
+    'Your Message' => '',
+    'Please enter your email address' => '',
+    'No, I am a new customer.' => '',
+    'Yes, I have a password :' => '',
+    'Please enter your password' => '',
+    'This value should not be blank.' => '',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
+    'This email does not exists' => '',
+    'Current Password' => '',
+    'New Password' => '',
+    'Password confirmation' => '',
+    'Your current password does not match.' => '',
+    'Password confirmation is not the same as password field.' => '',
+    'I would like to receive the newsletter or the latest news.' => '',
+    */
+    // Product Empty
+    'Product Empty Title' => 'Welcome',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+      <ol>
+          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+      </ol>',
+    'Product Empty Button' => 'Add my first product',
+    'Demo product title' => 'Demo product title',
+    'Demo product description' => 'Demo product description',
+    // Placeholder
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder email' => '',
+    'Placeholder phone' => '',
+    'Placeholder cellphone' => '',
+    'Placeholder company' => '',
+    'Placeholder address1' => '',
+    'Placeholder address2' => '',
+    'Placeholder city' => '',
+    'Placeholder zipcode' => '',
+    'Placeholder address label' => '',
+    'Placeholder contact name' => '',
+    'Placeholder contact email' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder contact message' => '',
 )
 ;
\ No newline at end of file
diff --git a/templates/default/I18n/fr_FR.php b/templates/default/I18n/fr_FR.php
index 3ed34e1f7..9e00957cb 100755
--- a/templates/default/I18n/fr_FR.php
+++ b/templates/default/I18n/fr_FR.php
@@ -200,6 +200,17 @@ return array (
       'Password confirmation is not the same as password field.' => '',
       'I would like to receive the newsletter or the latest news.' => '',
     */
+    // Product Empty
+    'Product Empty Title' => 'Bonjour',
+    'Product Empty Message' => 'C\'est très simple d\'ajouter un produit dans l\'adminsitration.
+        <ol>
+            <li>N\'oubliez pas de sélectionner <strong>NEW</strong> dans l\'onglet Details afin de voir votre produit dans la section des nouveautés.</li>
+            <li>N\'oubliez pas de sélectionner <strong>SALE</strong> dans l\'onglet Details afin de voir votre produit dans la section des promotions.</li>
+        </ol>',
+    'Product Empty Button' => 'Ajouter mon premier produit',
+    'Demo product title' => 'Example de titre',
+    'Demo product description' => 'Example de description de produit',
+    // Placeholder
     'Placeholder firstname' => 'Prénom',
     'Placeholder lastname' => 'Nom de famille',
     'Placeholder email' => 'Adresse e-mail',
diff --git a/templates/default/I18n/it_IT.php b/templates/default/I18n/it_IT.php
index a5c5950ee..e4004de1e 100755
--- a/templates/default/I18n/it_IT.php
+++ b/templates/default/I18n/it_IT.php
@@ -1,218 +1,229 @@
 <?php
 
 return array (
-  '+ View All' => '',
-  'Thelia V2' => '',
-  'Skip to content' => '',
-  'Toggle navigation' => '',
-  'Main Navigation' => '',
-  'Register!' => '',
-  'Log In!' => '',
-  'Sign In' => '',
-  'Register' => '',
-  'Cart' => '',
-  'View Cart' => '',
-  'Checkout' => '',
-  'You have no items in your shopping cart.' => '',
-  'Home' => '',
-  'Search a product' => '',
-  'Search...' => '',
-  'Minimum 2 characters.' => '',
-  'Search' => '',
-  'Language:' => '',
-  'Currency:' => '',
-  'Latest' => '',
-  'Offers' => '',
-  'Special Price:' => '',
-  'Regular Price:' => '',
-  'Free shipping' => '',
-  'Orders over $50' => '',
-  'Secure payment' => '',
-  'Multi-payment platform' => '',
-  'Need help ?' => '',
-  'Questions ? See or F.A.Q.' => '',
-  'Latest articles' => '',
-  'No articles currently' => '',
-  'Useful links' => '',
-  'Login' => '',
-  'Follow us' => '',
-  'Newsletter' => '',
-  'Sign up to receive our latest news.' => '',
-  'Email address' => '',
-  'Your email address' => '',
-  'Subscribe' => '',
-  'Contact Us' => '',
-  'Copyright' => '',
-  'You are here:' => '',
-  'Show' => '',
-  'per page' => '',
-  'Sort By' => '',
-  'Name ascending' => '',
-  'Name descending' => '',
-  'Price ascending' => '',
-  'Price descending' => '',
-  'View as' => '',
-  'View product' => '',
-  'Pagination' => '',
-  'No products available in this category' => '',
-  'Categories' => '',
-  'Ref.' => '',
-  'Availability' => '',
-  'In stock' => '',
-  'Out of stock' => '',
-  'Add to cart' => '',
-  'Description' => '',
-  'Additional Info' => '',
-  'View cart' => '',
-  'Continue Shopping' => '',
-  'Upsell Products' => '',
-  'Your Cart' => '',
-  'Billing and delivery' => '',
-  'Check my order' => '',
-  'Product Name' => '',
-  'Name' => '',
-  'Unit Price' => '',
-  'Price' => '',
-  'Quantity' => '',
-  'Qty' => '',
-  'Total' => '',
-  'Tax Inclusive' => '',
-  'TTC' => '',
-  'Available' => '',
-  'In Stock' => '',
-  'No.' => '',
-  'Remove' => '',
-  'Proceed checkout' => '',
-  'Warning' => '',
-  'missing or invalid data' => '',
-  'Do you have an account?' => '',
-  'Forgot your Password?' => '',
-  'Next' => '',
-  'Log out!' => '',
-  'My Account' => '',
-  'Previous product' => '',
-  'Next product' => '',
-  'instead of' => '',
-  'Add a new address' => '',
-  'Choose your delivery address' => '',
-  'Address %nb' => '',
-  'Edit this address' => '',
-  'Edit' => '',
-  'Remove this address' => '',
-  'Cancel' => '',
-  'Choose your delivery method' => '',
-  'Back' => '',
-  'Next Step' => '',
-  'Delete address' => '',
-  'Do you really want to delete this address ?' => '',
-  'No' => '',
-  'Yes' => '',
-  'Shipping Tax' => '',
-  'You may have a coupon ?' => '',
-  'Code :' => '',
-  'Coupon code' => '',
-  'Ok' => '',
-  'Delivery address' => '',
-  'Billing address' => '',
-  'Change address' => '',
-  'Choose your payment method' => '',
-  'Secure Payment' => '',
-  'You choose to pay by' => '',
-  'Thank you for the trust you place in us.' => '',
-  'A summary of your order email has been sent to the following address' => '',
-  'Your order will be confirmed by us upon receipt of your payment.' => '',
-  'Order number' => '',
-  'Date' => '',
-  'Go home' => '',
-  'Account' => '',
-  'Personal Information' => '',
-  'Change my account information' => '',
-  'Change my password' => '',
-  'My Address book' => '',
-  'My Address Books' => '',
-  'My Orders' => '',
-  'List of orders' => '',
-  'Order Number' => '',
-  'Amount' => '',
-  'Status' => '',
-  'View' => '',
-  'View order %ref as pdf document' => '',
-  'Order details' => '',
-  'You don\'t have orders yet.' => '',
-  'Update Profile' => '',
-  'Personal Informations' => '',
-  'Select Title' => '',
-  'Update' => '',
-  'Change Password' => '',
-  'Login Information' => '',
-  'Create New Address' => '',
-  'Address' => '',
-  'Home address' => '',
-  'Complementary address' => '',
-  'Select Country' => '',
-  'Create' => '',
-  'Related' => '',
-  'Grid' => '',
-  'List' => '',
-  'Next' => '',
-  'Previous' => '',
-  '%nb Items' => '',
-  '%nb Item' => '',
-  'Latest products' => '',
-  'Product Offers' => '',
-/*
-  'The page cannot be found' => '',
-  'What\'s your name?' => '',
-  'So I can get back to you.' => '',
-  'The subject of your message.' => '',
-  'And your message...' => '',
-  'This email already exists.' => '',
-  'Address label' => '',
-  'Title' => '',
-  'First Name' => '',
-  'Last Name' => '',
-  'Company Name' => '',
-  'Street Address' => '',
-  'Address Line 2' => '',
-  'Address Line 3' => '',
-  'City' => '',
-  'Zip code' => '',
-  'Country' => '',
-  'Phone' => '',
-  'Cellphone' => '',
-  'Make this address as my primary address' => '',
-  'Full Name' => '',
-  'Your Email Address' => '',
-  'Subject' => '',
-  'Your Message' => '',
-  'Please enter your email address' => '',
-  'No, I am a new customer.' => '',
-  'Yes, I have a password :' => '',
-  'Please enter your password' => '',
-  'This value should not be blank.' => '',
-  'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
-  'This email does not exists' => '',
-  'Current Password' => '',
-  'New Password' => '',
-  'Password confirmation' => '',
-  'Your current password does not match.' => '',
-  'Password confirmation is not the same as password field.' => '',
-  'I would like to receive the newsletter or the latest news.' => '',
-*/
-  'Placeholder firstname' => '',
-  'Placeholder lastname' => '',
-  'Placeholder email' => '',
-  'Placeholder phone' => '',
-  'Placeholder cellphone' => '',
-  'Placeholder company' => '',
-  'Placeholder address1' => '',
-  'Placeholder address2' => '',
-  'Placeholder city' => '',
-  'Placeholder zipcode' => '',
-  'Placeholder address label' => '',
-  'Placeholder contact name' => '',
-  'Placeholder contact email' => '',
-  'Placeholder contact subject' => '',
-  'Placeholder contact message' => '',
+    '+ View All' => '',
+    'Thelia V2' => '',
+    'Skip to content' => '',
+    'Toggle navigation' => '',
+    'Main Navigation' => '',
+    'Register!' => '',
+    'Log In!' => '',
+    'Sign In' => '',
+    'Register' => '',
+    'Cart' => '',
+    'View Cart' => '',
+    'Checkout' => '',
+    'You have no items in your shopping cart.' => '',
+    'Home' => '',
+    'Search a product' => '',
+    'Search...' => '',
+    'Minimum 2 characters.' => '',
+    'Search' => '',
+    'Language:' => '',
+    'Currency:' => '',
+    'Latest' => '',
+    'Offers' => '',
+    'Special Price:' => '',
+    'Regular Price:' => '',
+    'Free shipping' => '',
+    'Orders over $50' => '',
+    'Secure payment' => '',
+    'Multi-payment platform' => '',
+    'Need help ?' => '',
+    'Questions ? See or F.A.Q.' => '',
+    'Latest articles' => '',
+    'No articles currently' => '',
+    'Useful links' => '',
+    'Login' => '',
+    'Follow us' => '',
+    'Newsletter' => '',
+    'Sign up to receive our latest news.' => '',
+    'Email address' => '',
+    'Your email address' => '',
+    'Subscribe' => '',
+    'Contact Us' => '',
+    'Copyright' => '',
+    'You are here:' => '',
+    'Show' => '',
+    'per page' => '',
+    'Sort By' => '',
+    'Name ascending' => '',
+    'Name descending' => '',
+    'Price ascending' => '',
+    'Price descending' => '',
+    'View as' => '',
+    'View product' => '',
+    'Pagination' => '',
+    'No products available in this category' => '',
+    'Categories' => '',
+    'Ref.' => '',
+    'Availability' => '',
+    'In stock' => '',
+    'Out of stock' => '',
+    'Add to cart' => '',
+    'Description' => '',
+    'Additional Info' => '',
+    'View cart' => '',
+    'Continue Shopping' => '',
+    'Upsell Products' => '',
+    'Your Cart' => '',
+    'Billing and delivery' => '',
+    'Check my order' => '',
+    'Product Name' => '',
+    'Name' => '',
+    'Unit Price' => '',
+    'Price' => '',
+    'Quantity' => '',
+    'Qty' => '',
+    'Total' => '',
+    'Tax Inclusive' => '',
+    'TTC' => '',
+    'Available' => '',
+    'In Stock' => '',
+    'No.' => '',
+    'Remove' => '',
+    'Proceed checkout' => '',
+    'Warning' => '',
+    'missing or invalid data' => '',
+    'Do you have an account?' => '',
+    'Forgot your Password?' => '',
+    'Next' => '',
+    'Log out!' => '',
+    'My Account' => '',
+    'Previous product' => '',
+    'Next product' => '',
+    'instead of' => '',
+    'Add a new address' => '',
+    'Choose your delivery address' => '',
+    'Address %nb' => '',
+    'Edit this address' => '',
+    'Edit' => '',
+    'Remove this address' => '',
+    'Cancel' => '',
+    'Choose your delivery method' => '',
+    'Back' => '',
+    'Next Step' => '',
+    'Delete address' => '',
+    'Do you really want to delete this address ?' => '',
+    'No' => '',
+    'Yes' => '',
+    'Shipping Tax' => '',
+    'You may have a coupon ?' => '',
+    'Code :' => '',
+    'Coupon code' => '',
+    'Ok' => '',
+    'Delivery address' => '',
+    'Billing address' => '',
+    'Change address' => '',
+    'Choose your payment method' => '',
+    'Secure Payment' => '',
+    'You choose to pay by' => '',
+    'Thank you for the trust you place in us.' => '',
+    'A summary of your order email has been sent to the following address' => '',
+    'Your order will be confirmed by us upon receipt of your payment.' => '',
+    'Order number' => '',
+    'Date' => '',
+    'Go home' => '',
+    'Account' => '',
+    'Personal Information' => '',
+    'Change my account information' => '',
+    'Change my password' => '',
+    'My Address book' => '',
+    'My Address Books' => '',
+    'My Orders' => '',
+    'List of orders' => '',
+    'Order Number' => '',
+    'Amount' => '',
+    'Status' => '',
+    'View' => '',
+    'View order %ref as pdf document' => '',
+    'Order details' => '',
+    'You don\'t have orders yet.' => '',
+    'Update Profile' => '',
+    'Personal Informations' => '',
+    'Select Title' => '',
+    'Update' => '',
+    'Change Password' => '',
+    'Login Information' => '',
+    'Create New Address' => '',
+    'Address' => '',
+    'Home address' => '',
+    'Complementary address' => '',
+    'Select Country' => '',
+    'Create' => '',
+    'Related' => '',
+    'Grid' => '',
+    'List' => '',
+    'Next' => '',
+    'Previous' => '',
+    '%nb Items' => '',
+    '%nb Item' => '',
+    'Latest products' => '',
+    'Product Offers' => '',
+    /*
+    'The page cannot be found' => '',
+    'What\'s your name?' => '',
+    'So I can get back to you.' => '',
+    'The subject of your message.' => '',
+    'And your message...' => '',
+    'This email already exists.' => '',
+    'Address label' => '',
+    'Title' => '',
+    'First Name' => '',
+    'Last Name' => '',
+    'Company Name' => '',
+    'Street Address' => '',
+    'Address Line 2' => '',
+    'Address Line 3' => '',
+    'City' => '',
+    'Zip code' => '',
+    'Country' => '',
+    'Phone' => '',
+    'Cellphone' => '',
+    'Make this address as my primary address' => '',
+    'Full Name' => '',
+    'Your Email Address' => '',
+    'Subject' => '',
+    'Your Message' => '',
+    'Please enter your email address' => '',
+    'No, I am a new customer.' => '',
+    'Yes, I have a password :' => '',
+    'Please enter your password' => '',
+    'This value should not be blank.' => '',
+    'A user already exists with this email address. Please login or if you\'ve forgotten your password, go to Reset Your Password.' => '',
+    'This email does not exists' => '',
+    'Current Password' => '',
+    'New Password' => '',
+    'Password confirmation' => '',
+    'Your current password does not match.' => '',
+    'Password confirmation is not the same as password field.' => '',
+    'I would like to receive the newsletter or the latest news.' => '',
+    */
+    // Product Empty
+    'Product Empty Title' => 'Welcome',
+    'Product Empty Message' => 'It\'s really quick to add a product.
+      <ol>
+          <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
+          <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
+      </ol>',
+    'Product Empty Button' => 'Add my first product',
+    'Demo product title' => 'Demo product title',
+    'Demo product description' => 'Demo product description',
+    // Placeholder
+    'Placeholder firstname' => '',
+    'Placeholder lastname' => '',
+    'Placeholder email' => '',
+    'Placeholder phone' => '',
+    'Placeholder cellphone' => '',
+    'Placeholder company' => '',
+    'Placeholder address1' => '',
+    'Placeholder address2' => '',
+    'Placeholder city' => '',
+    'Placeholder zipcode' => '',
+    'Placeholder address label' => '',
+    'Placeholder contact name' => '',
+    'Placeholder contact email' => '',
+    'Placeholder contact subject' => '',
+    'Placeholder contact message' => '',
 )
 ;
\ No newline at end of file
diff --git a/templates/default/demo/product-new.html b/templates/default/demo/product-new.html
deleted file mode 100644
index bef08b4df..000000000
--- a/templates/default/demo/product-new.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{for $count=1 to 4}
-<li class="item">
-    <article>
-        <a href="{url path="/admin/catalog"}" tabindex="-1" class="product-image">
-            {images file='../assets/img/280x196.png'}<img src="{$asset_url}" alt="{intl l="Demo product title"}">{/images}
-            <span class="mask"></span>
-        </a>
-        <a href="{url path="/admin/catalog"}" class="product-info">
-            <h3 class="name">{intl l="Demo product title"}</h3>
-            <div class="short-description">{intl l="Demo product description"}</div>
-            <div class="product-price">
-                <div class="price-container">
-                   <span class="regular-price"><span class="price">99.99 {currency attr="symbol"}</span></span>
-                </div>
-            </div>
-        </a>
-    </article><!-- /product -->
-</li>
-{/for}
\ No newline at end of file
diff --git a/templates/default/includes/product-empty.html b/templates/default/includes/product-empty.html
new file mode 100644
index 000000000..029d3b6cd
--- /dev/null
+++ b/templates/default/includes/product-empty.html
@@ -0,0 +1,35 @@
+<div class="jumbotron">
+    <h1>{intl l="Product Empty Title"}</h1>
+    <p>{intl l="Product Empty Message"}</p>
+    <p><a href="{url path="/admin"}" class="btn btn-jumbotron btn-lg" role="button">{intl l="Product Empty Button"}</a></p>
+</div>
+
+<section id="products-new">
+    <div class="products-heading">
+        <h2>{intl l="Latest"}</h2>
+    </div>
+
+    <div class="products-content">
+        <ul class="products-grid product-col-4">
+            {for $count=1 to 4}
+            <li class="item">
+                <article>
+                    <a href="{url path="/admin"}" tabindex="-1" class="product-image">
+                        {images file='../assets/img/280x196.png'}<img src="{$asset_url}" alt="{intl l="Demo product title"}">{/images}
+                        <span class="mask"></span>
+                    </a>
+                    <a href="{url path="/admin"}" class="product-info">
+                        <h3 class="name">{intl l="Demo product title"}</h3>
+                        <div class="short-description">{intl l="Demo product description"}</div>
+                        <div class="product-price">
+                            <div class="price-container">
+                               <span class="regular-price"><span class="price">99.99 {currency attr="symbol"}</span></span>
+                            </div>
+                        </div>
+                    </a>
+                </article><!-- /product -->
+            </li>
+            {/for}
+        </ul>
+    </div>
+</section><!-- #products-new -->
\ No newline at end of file
diff --git a/templates/default/index.html b/templates/default/index.html
index fe38555a7..fabd8a3d9 100644
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -28,102 +28,94 @@
     </section><!-- #carousel -->
 
     {if {count type="product"} eq 0}
-    <div class="jumbotron">
-        <h1>Welcome</h1>
-        <p>
-            It's really quick to add a product.
-            <ol>
-                <li>Check <strong>NEW</strong> under the details tab if you want to see your product in the latest product section.</li>
-                <li>Check <strong>SALE</strong> under the details tab if you want to see your product in the offer product section.</li>
-            </ol>
-        </p>
-        <p><a href="{url path="/admin/catalog"}" class="btn btn-jumbotron btn-lg" role="button">Add my first product</a></p>
-    </div>
+        {include file="includes/product-empty.html"}
+    {else}
+        {ifloop rel="product_new"}
+        <section id="products-new">
+            <div class="products-heading">
+                <h2>{intl l="Latest"} <a href="{url path="/view_all"  type="new"}" class="btn-all">{intl l="+ View All"}</a></h2>
+            </div>
+
+            <div class="products-content">
+                <ul class="products-grid product-col-4">
+                    {loop name="product_new" type="product" limit="4" new="yes"}
+                    <li class="item">
+                        <article itemscope itemtype="http://schema.org/Product">
+                            <!-- Use the meta tag to specify content that is not visible on the page in any way -->
+                            {$product_id=$ID}
+                            {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
+                                {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
+                                    <meta itemprop="brand" content="{$TITLE}">
+                                {/loop}
+                            {/loop}
+                            {loop name="brand.feature" type="feature" product=$ID title="isbn"}
+                                {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
+                                    <meta itemprop="productID" content="isbn:{$TITLE}">
+                                {/loop}
+                            {/loop}
+
+                            <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
+                                {ifloop rel="image_product_new" }
+                                    <img itemprop="image"
+                                {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
+                                    src="{$IMAGE_URL}"
+                                {/loop}
+                                    alt="Product #{$LOOP_COUNT}" >
+                                {/ifloop}
+                                {elseloop rel="image_product_new"}
+                                    {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
+                                {/elseloop}
+                                <span class="mask"></span>
+                            </a>
+
+                            <a href="{$URL}" class="product-info">
+                                <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
+                                <div class="short-description" itemprop="description">{$CHAPO}</div>
+
+                                <div class="product-price">
+                                    <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
+                                        {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
+                                            <meta itemprop="category" content="{$TITLE}">
+                                        {/loop}
+                                        <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
+                                        <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
+                                        <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
+
+                                        <!-- List of availibility :
+                                                out_of_stock : http://schema.org/OutOfStock
+                                                in_stock : http://schema.org/InStock
+                                                instore_only : http://schema.org/InStoreOnly
+                                                preorder : http://schema.org/PreOrder
+                                                online_only : http://schema.org/OnlineOnly
+                                        -->
+                                        <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
+                                    </div>
+                                </div>
+                            </a>
+                        </article><!-- /product -->
+                    </li>
+                    {/loop}
+                </ul>
+            </div>
+        </section><!-- #products-new -->
+        {/ifloop}
+
+        {ifloop rel="product_promo"}
+        <section id="products-offer">
+            <div class="products-heading">
+                <h2>{intl l="Offers"} <a href="{url path="/view_all" type="offers"}" class="btn-all">{intl l="+ View All"}</a></h2>
+            </div>
+
+            <div class="products-content">
+                <ul class="products-grid product-col-5 hover-effect">
+                    {loop name="product_promo" type="product" limit="5" promo="yes"}
+                        {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
+                    {/loop}
+                </ul>
+            </div>
+        </section><!-- #products-offer -->
+        {/ifloop}
     {/if}
 
 
-    <section id="products-new">
-        <div class="products-heading">
-            <h2>{intl l="Latest"} <a href="{url path="/view_all"  type="new"}" class="btn-all">{intl l="+ View All"}</a></h2>
-        </div>
-
-        <div class="products-content">
-            <ul class="products-grid product-col-4">
-                {loop name="product_new" type="product" limit="4" new="yes"}
-                <li class="item">
-                    <article itemscope itemtype="http://schema.org/Product">
-                        <!-- Use the meta tag to specify content that is not visible on the page in any way -->
-                        {$product_id=$ID}
-                        {loop name="brand.feature" type="feature" product="{$ID}" title="brand"}
-                            {loop name="brand.value" type="feature_value" feature="{$ID}" product="$product_id"}
-                                <meta itemprop="brand" content="{$TITLE}">
-                            {/loop}
-                        {/loop}
-                        {loop name="brand.feature" type="feature" product=$ID title="isbn"}
-                            {loop name="brand.value" type="feature_value" feature=$ID product=$product_id}
-                                <meta itemprop="productID" content="isbn:{$TITLE}">
-                            {/loop}
-                        {/loop}
-
-                        <a href="{$URL}" itemprop="url" tabindex="-1" class="product-image">
-                            {ifloop rel="image_product_new" }
-                                <img itemprop="image"
-                            {loop name="image_product_new" type="image" limit="1" product="{$ID}" force_return="true" width="280" height="196" resize_mode="borders"}
-                                src="{$IMAGE_URL}"
-                            {/loop}
-                                alt="Product #{$LOOP_COUNT}" >
-                            {/ifloop}
-                            {elseloop rel="image_product_new"}
-                                {images file='assets/img/280x196.png'}<img itemprop="image" src="{$asset_url}" alt="Product #{$LOOP_COUNT}">{/images}
-                            {/elseloop}
-                            <span class="mask"></span>
-                        </a>
-
-                        <a href="{$URL}" class="product-info">
-                            <h3 class="name"><span itemprop="name">{$TITLE}</span></h3>
-                            <div class="short-description" itemprop="description">{$CHAPO}</div>
-
-                            <div class="product-price">
-                                <div class="price-container" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
-                                    {loop type="category" name="category_tag" id=$DEFAULT_CATEGORY}
-                                        <meta itemprop="category" content="{$TITLE}">
-                                    {/loop}
-                                    <meta itemprop="itemCondition" itemscope itemtype="http://schema.org/NewCondition"> <!-- List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition -->
-                                    <meta itemprop="priceCurrency" content="{currency attr="code"}"> <!-- List of currency : The currency used to describe the product price, in three-letter ISO format. -->
-                                    <link itemprop="availability" href="http://schema.org/InStock" content="in_stock" />
-
-                                    <!-- List of availibility :
-                                            out_of_stock : http://schema.org/OutOfStock
-                                            in_stock : http://schema.org/InStock
-                                            instore_only : http://schema.org/InStoreOnly
-                                            preorder : http://schema.org/PreOrder
-                                            online_only : http://schema.org/OnlineOnly
-                                    -->
-                                    <span class="regular-price"><span itemprop="price" class="price">{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}</span></span>
-                                </div>
-                            </div>
-                        </a>
-                    </article><!-- /product -->
-                </li>
-                {/loop}
-                {elseloop rel="product_new"}{include file="demo/product-new.html"}{/elseloop}
-            </ul>
-        </div>
-    </section><!-- #products-new -->
-
-    {ifloop rel="product_promo"}
-    <section id="products-offer">
-        <div class="products-heading">
-            <h2>{intl l="Offers"} <a href="{url path="/view_all" type="offers"}" class="btn-all">{intl l="+ View All"}</a></h2>
-        </div>
-
-        <div class="products-content">
-            <ul class="products-grid product-col-5 hover-effect">
-                {loop name="product_promo" type="product" limit="5" promo="yes"}
-                    {include file="includes/single-product.html" product_id=$ID hasBtn=false hasDescription=false width="218" height="146"}
-                {/loop}
-            </ul>
-        </div>
-    </section><!-- #products-offer -->
-    {/ifloop}
 {/block}
\ No newline at end of file