diff --git a/templates/default/address-update.html b/templates/default/address-update.html
index fe45a33be..3dc05d103 100644
--- a/templates/default/address-update.html
+++ b/templates/default/address-update.html
@@ -4,17 +4,15 @@
     {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
 {/block}
 
+{* Body Class *}
 {block name="body-class"}page-address{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><span itemprop="title">{intl l="Account"}</span></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Account"}, 'link'=>{url path="/account"}],
+        ['name' => {intl l="Address Update"}, 'link'=>{url path="/address"}]
+    ]}
 {/block}
 
 {block name="main-content"}
diff --git a/templates/default/address.html b/templates/default/address.html
index 0a0d09a40..033b5e749 100644
--- a/templates/default/address.html
+++ b/templates/default/address.html
@@ -4,17 +4,15 @@
     {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
 {/block}
 
+{* Body Class *}
 {block name="body-class"}page-address{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="index.php" itemprop="url"><span itemprop="title">Account</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Address"}</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Account"}, 'link'=>{url path="/account"}],
+        ['name' => {intl l="Address"}, 'link'=>{url path="/address"}]
+    ]}
 {/block}
 
 {block name="main-content"}
diff --git a/templates/default/cart.html b/templates/default/cart.html
index 2f3ae32ce..89859e756 100644
--- a/templates/default/cart.html
+++ b/templates/default/cart.html
@@ -1,17 +1,15 @@
 {extends file="layout.tpl"}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Cart</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
-{/block}
-
+{* Body Class *}
 {block name="body-class"}page-cart{/block}
 
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}]
+    ]}
+{/block}
+
 {block name="main-content"}
     <div class="main">
         <article id="cart" class="col-main" role="main" aria-labelledby="main-label">
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 8d7b6c885..96ad0dbbb 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -11,23 +11,28 @@
 Author: Christophe Laffont
 URL: http://www.thelia.net
 -->
-<!--[if lt IE 7 ]><html class="no-js {lang attr="code"} oldie ie6" lang="{lang attr="code"}"> <![endif]-->
-<!--[if IE 7 ]><html class="no-js {lang attr="code"} oldie ie7" lang="{lang attr="code"}"> <![endif]-->
-<!--[if IE 8 ]><html class="no-js {lang attr="code"} oldie ie8" lang="{lang attr="code"}"> <![endif]-->
-<!--[if (gte IE 9)|!(IE)]><!--><html lang="{lang attr="code"}" class="no-js {lang attr="code"}"> <!--<![endif]-->
+{* paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither *}
+<!--[if lt IE 7 ]><html class="no-js oldie ie6" lang="{lang attr="code"}"> <![endif]-->
+<!--[if IE 7 ]><html class="no-js oldie ie7" lang="{lang attr="code"}"> <![endif]-->
+<!--[if IE 8 ]><html class="no-js oldie ie8" lang="{lang attr="code"}"> <![endif]-->
+<!--[if (gte IE 9)|!(IE)]><!--><html lang="{lang attr="code"}" class="no-js"> <!--<![endif]-->
 <head>
+    {* Test if javascript is enabled *}
     <script>(function(H) { H.className=H.className.replace(/\bno-js\b/,'js') } )(document.documentElement);</script>
-    <meta charset="utf-8">
-    <title>{block name="page-title"}Thelia{/block}</title>
 
+    <meta charset="utf-8">
+
+    {* Page Title *}
+    <title>{block name="page-title"}{strip}{if $breadcrumbs}{foreach from=$breadcrumbs|array_reverse item=breadcrumb}{$breadcrumb.name} | {/foreach}{/if}Thelia{/strip}{/block}</title>
+
+    {* Meta Tags *}
     <meta name="description" content="">
-    <meta name="generator" content="THELIA V2">
+    <meta name="generator" content="{intl l='Thelia V%ver' ver="{$THELIA_VERSION}"}">
     <meta name="robots" content="index,follow">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-
     {block name="meta"}{/block}
 
-    <!-- StyleSheet -->
+    {* Stylesheets *}
     {stylesheets file='assets/less/styles.less' filters='less,cssembed'}
         <link rel="stylesheet" href="{$asset_url}">
     {/stylesheets}
@@ -61,41 +66,24 @@ URL: http://www.thelia.net
             <!-- Place everything within .nav-collapse to hide it until above 768px -->
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="Main Navigation">
                 <ul class="nav navbar-nav navbar-categories">
-                    <li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
-                    <li class="dropdown">
-                        <a href="" data-toggle="dropdown" class="dropdown-toggle">Pages</a>
-                        <ul class="dropdown-menu list-subnav" role="menu">
-                            <li class="active"><a href="index.html" tabindex="-1">Index</a></li>
-                            <li><a href="category.html">Category Grid</a></li>
-                            <li><a href="category-list.html">Category List</a></li>
-                            <li><a href="account.html">Account</a></li>
-                            <li><a href="login.html">Login</a></li>
-                            <li><a href="password.html">Forgot Password</a></li>
-                            <li><a href="register.html">Register</a></li>
-                            <li><a href="cart.html">Cart</a></li>
-                            <li><a href="cart-step2.html">Cart (Step 2)</a></li>
-                            <li><a href="cart-step3.html">Cart (Step 3)</a></li>
-                            <li><a href="cart-step4.html">Cart (Step 4)</a></li>
-                            <li><a href="product-details.html">Product details</a></li>
-                            <li><a href="address.html">New address</a></li>
-                        </ul>
-                    </li>
+                    <li><a href="{url path="/"}" class="home">{intl l="Home"}</a></li>
                     {loop type="category" name="category.navigation" parent="0" limit="3"}
                         <li><a href="{$URL}">{$TITLE}</a></li>
                     {/loop}
                 </ul>
                 <ul class="nav navbar-nav navbar-cart navbar-right">
                     {loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}
-                        <li><a href="{url path="/logout"}" class="register">{intl l="Log out!"}</a></li>
-                        <li><a href="{url path="/customer/account"}" class="login">{intl l="My Account"}</a></li>
+                        <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
+                        <li><a href="{url path="/customer/account"}" class="account">{intl l="My Account"}</a></li>
                     {/loop}
 
                     {elseloop rel="customer_info_block" rel="customer_info_block"}
-                    <li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li>
-                    <li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li>
+                        <li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li>
+                        <li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li>
                     {/elseloop}
+
                     <li class="dropdown">
-                        <a href="{url path="/cart"}" class="dropdown-toggle cart" data-toggle="dropdown">
+                        <a href="{url path="/cart"}" class="cart" data-toggle="dropdown">
                             Cart <span class="badge">{cart attr="count_item"}</span>
                         </a>
                     </li>
@@ -408,6 +396,7 @@ URL: http://www.thelia.net
 {debugbar_renderjs}
 {debugbar_renderresult}
 
+{* HTML5 shim, for IE6-8 support of HTML5 elements *}
 <!--[if lt IE 9]>
 <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
diff --git a/templates/default/login.html b/templates/default/login.html
index c0b28268c..7800db894 100644
--- a/templates/default/login.html
+++ b/templates/default/login.html
@@ -1,20 +1,17 @@
 {extends file="layout.tpl"}
 
+* Body Class *}
 {block name="body-class"}page-login{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">{intl l="You are here"}: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Login"}</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Login"}, 'link'=>{url path="/login"}]
+    ]}
 {/block}
 
+
 {block name="main-content"}
-
-
     <div class="main">
         <article class="col-main" role="main" aria-labelledby="main-label">
             <h1 id="main-label" class="page-header">{intl l="Login"}</h1>
diff --git a/templates/default/misc/breadcrumb.tpl b/templates/default/misc/breadcrumb.tpl
index 9248753ca..b6b67a346 100644
--- a/templates/default/misc/breadcrumb.tpl
+++ b/templates/default/misc/breadcrumb.tpl
@@ -1,7 +1,7 @@
 <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
     <strong id="breadcrumb-label">{intl l="You are here:"}</strong>
     <ul class="breadcrumb" itemprop="breadcrumb">
-        <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/login"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
+        <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
 
         {foreach $breadcrumbs as $breadcrumb}
         {if $breadcrumb.name}
diff --git a/templates/default/order_delivery.html b/templates/default/order_delivery.html
index b5f66609b..58064a18f 100644
--- a/templates/default/order_delivery.html
+++ b/templates/default/order_delivery.html
@@ -5,19 +5,18 @@
     {check_cart_not_empty}
 {/block}
 
+{* Body Class *}
 {block name="body-class"}page-order-delivery{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/cart"}" itemprop="url"><span itemprop="title">Cart</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Billing and delivery</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
+        ['name' => {intl l="Billing and delivery"}, 'link'=>{url path="/order/delivery"}]
+    ]}
 {/block}
 
+
 {block name="main-content"}
     <div class="main">
         <article id="cart" class="col-main" role="main" aria-labelledby="main-label">
diff --git a/templates/default/order_invoice.html b/templates/default/order_invoice.html
index 5abea16c3..8c133f65a 100644
--- a/templates/default/order_invoice.html
+++ b/templates/default/order_invoice.html
@@ -6,19 +6,18 @@
     {check_valid_delivery}
 {/block}
 
+{* Body Class *}
 {block name="body-class"}page-order-invoice{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/cart"}" itemprop="url"><span itemprop="title">Cart</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">My order</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
+        ['name' => {intl l="My order"}, 'link'=>{url path="/order/invoice"}]
+    ]}
 {/block}
 
+
 {block name="main-content"}
     <div class="main">
         <article class="col-main" role="main" aria-labelledby="main-label">
diff --git a/templates/default/order_payment.html b/templates/default/order_payment.html
index cd7e95252..ac7e8cad5 100644
--- a/templates/default/order_payment.html
+++ b/templates/default/order_payment.html
@@ -1,18 +1,17 @@
 {extends file="layout.tpl"}
 
+{* Body Class *}
 {block name="body-class"}page-order-payment{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">You are here: </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">Home</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/cart"}" itemprop="url"><span itemprop="title">Cart</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">Secure Payment</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Cart"}, 'link'=>{url path="/cart"}],
+        ['name' => {intl l="Secure Payment"}, 'link'=>{url path="/order/pay"}]
+    ]}
 {/block}
 
+
 {block name="main-content"}
     <div class="main">
         <article class="col-main clearfix" role="main" aria-labelledby="main-label">
diff --git a/templates/default/password.html b/templates/default/password.html
index 4d38b14d4..61b07b5e6 100644
--- a/templates/default/password.html
+++ b/templates/default/password.html
@@ -1,17 +1,16 @@
 {extends file="layout.tpl"}
 
+{* Body Class *}
 {block name="body-class"}page-password{/block}
 
-{block name="breadcrumb"}
-    <nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
-        <strong id="breadcrumb-label">{intl l="You are here"} </strong>
-        <ul class="breadcrumb" itemprop="breadcrumb">
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{url path="/"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
-            <li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Password"}</span></li>
-        </ul>
-    </nav><!-- /.nav-breadcrumb -->
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['name' => {intl l="Password"}, 'link'=>{url path="/password"}]
+    ]}
 {/block}
 
+
 {block name="main-content"}
     <div class="main">
         <article class="col-main" role="main" aria-labelledby="main-label">
diff --git a/templates/default/register.html b/templates/default/register.html
index bf5919cd3..4f8d15081 100644
--- a/templates/default/register.html
+++ b/templates/default/register.html
@@ -1,5 +1,6 @@
 {extends file="layout.tpl"}
 
+{* Body Class *}
 {block name="body-class"}page-register{/block}
 
 {* Breadcrumb *}