diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 80231b2a105..884c638a3ef 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -336,17 +336,16 @@
         </p>
     </xpath>
 </template>
-<template id="blog_navigation_frontend" inherit_id="website.assets_frontend" name="Blog Navigation Frontend">
-    <xpath expr="." position="inside">
-        <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
-        <script type="text/javascript" src="/website_blog/static/src/js/website_blog.inline.discussion.js"></script>
-        <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
-        <script type="text/javascript" src="/website_blog/static/lib/contentshare.js"/>
-    </xpath>
-</template>
+
 <!-- Page -->
 <template id="index" name="Blog Navigation">
     <t t-call="website.layout">
+        <t t-set="head">
+            <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
+            <script type="text/javascript" src="/website_blog/static/src/js/website_blog.inline.discussion.js"></script>
+            <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"/>
+            <script type="text/javascript" src="/website_blog/static/lib/contentshare.js"/>
+        </t>
         <div id="wrap" class="js_blog">
             <t t-raw="0"/>
         </div>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index bc2b0ecc7cd..d38d49036e4 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -3,7 +3,7 @@
 <data>
 
 <template id="event_script" inherit_id="website.assets_frontend" name="Country Events Snippet Script">
-    <xpath expr="." position="inside">
+    <xpath expr="/t" position="inside">
         <script type="text/javascript" src="/website_event/static/src/js/website_geolocation.js"></script>
     </xpath>
 </template>
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 192bab312d9..45531ef73b0 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-<template id="even_track_frontend" inherit_id="website.assets_frontend" name="Event Track Frontend">
-    <xpath expr="." position="inside">
-        <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
-        <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
-    </xpath>
-</template>
+
 <template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
+    <xpath expr="//t[@t-call='website.layout']" position="inside">
+        <t t-set="head">
+            <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
+            <t t-raw="head or ''"/>
+        </t>
+    </xpath>
     <xpath expr="//div[@id='wrap']" position="inside">
         <div class="container mt32 mb16 hidden-print" t-if="event.sponsor_ids">
             <section data-snippet-id="title">
@@ -41,6 +42,10 @@
 
 <template id="agenda">
     <t t-call="website_event.layout">
+        <t t-set="head">
+          <script type="text/javascript" src="/website_event_track/static/src/js/website_event_track.js"></script>
+          <t t-raw="head or ''"/>
+        </t>
         <section class="container">
             <h1 class="text-center" t-field="event.name"/>
             <div class="form-inline pull-right">
diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js
index 5d3052c9084..bd6516bc955 100644
--- a/addons/website_mail/static/src/js/website_email_designer.js
+++ b/addons/website_mail/static/src/js/website_email_designer.js
@@ -1,4 +1,13 @@
 (function () {
+    'use strict';
+    var website = openerp.website;
+
+    website.snippet.BuildingBlock.include({
+        _get_snippet_url: function () {
+            return '/website_mail/snippets';
+        }
+    });
+
     // Copy the template to the body of the email
     $(document).ready(function () {
         $('.js_template_set').click(function(ev) {
diff --git a/addons/website_mail/static/src/js/website_mail.editor.js b/addons/website_mail/static/src/js/website_mail.editor.js
index 85685f8d375..7a26920682b 100644
--- a/addons/website_mail/static/src/js/website_mail.editor.js
+++ b/addons/website_mail/static/src/js/website_mail.editor.js
@@ -3,12 +3,6 @@
 
     var website = openerp.website;
     var _t = openerp._t;
-    
-    website.snippet.BuildingBlock.include({
-         _get_snippet_url: function () {
-             return '/website_mail/snippets';
-         }
-     });
 
     website.snippet.options.subscribe = website.snippet.Option.extend({
         on_prompt: function () {
diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index a89f4ac34a5..5dee573d735 100644
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -3,14 +3,11 @@
     <data>
 
 <!-- Template Choice page -->
-<template id="website_email_frontend" inherit_id="website.assets_frontend" name="Website Mail Frontend">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
-    </xpath>
-</template>
-
 <template id="email_designer" name="Email Designer">
     <t t-call="website.layout">
+        <t t-set="head">
+            <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
+        </t>
         <div id="wrap" class="container" t-ignore="True">
             <div id="email_template" class="mb32" t-att-style="mode != 'email_template' and 'display: none' or ''">
                 <a class="mt16 btn btn-default pull-right" 
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 86e022c96fd..5d384f5c0b0 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -20,13 +20,13 @@
 </template>
 
 <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
-    <xpath expr="." position="inside">
+    <xpath expr="/t" position="inside">
         <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
 <template id="editor" inherit_id="website.assets_editor" name="Mail snippet">
-    <xpath expr="." position="inside">
+    <xpath expr="/t" position="inside">
         <script type="text/javascript" src="/website_mail/static/src/js/website_mail.editor.js"></script>
     </xpath>
 </template>
diff --git a/addons/website_quote/views/website_quotation.xml b/addons/website_quote/views/website_quotation.xml
index 7688ec5e5a1..04d3eadb8c2 100644
--- a/addons/website_quote/views/website_quotation.xml
+++ b/addons/website_quote/views/website_quotation.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-  <template id="website_quote_frontend" inherit_id="website.assets_frontend" name="Website Quote Frontend">
-      <xpath expr="." position="inside">
-          <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
-          <script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
-          <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
-      </xpath>
-  </template>
   <template id="pricing" name="Price">
       <section data-snippet-id="title">
           <h1 class="page-header">Pricing</h1>
@@ -168,6 +161,12 @@
 
   <template id="so_quotation" name="Product Quotation">
       <t t-call="website.layout">
+        <t t-set="head">
+            <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
+            <script type="text/javascript" src="/website_quote/static/lib/jSignature/jSignature.min.js"></script>
+            <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
+            <t t-raw="head or ''"/>
+        </t>
         <body data-spy="scroll" data-target=".navspy">
             <div class="container">
               <div class="row mt16">
@@ -458,6 +457,11 @@
 
   <template id="so_template" name="SO Template">
     <t t-call="website.layout">
+        <t t-set="head">
+            <script type="text/javascript" src="/website_quote/static/src/js/website_quotation.js"></script>
+            <link rel='stylesheet' href='/website_quote/static/src/css/website_quotation.css'/>
+            <t t-raw="head or ''"/>
+        </t>
         <body data-spy="scroll" data-target=".navspy">
             <div class="container">
                 <div class="row mt16">
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index ae700b5aa64..495e540c57a 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -111,6 +111,8 @@
             <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
           </t>
           <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
           <t t-raw="head or ''"/>
       </t>
       <t t-set="additional_title">Shop</t>
@@ -302,18 +304,14 @@
 </template>
 
 <!-- /shop/product product page -->
-<template id="website_sale_frontend" inherit_id="website.assets_frontend" name="Website Sale Frontend">
-    <xpath expr="." position="inside">
-        <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-        <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-        <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
-        <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
-        <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
-    </xpath>
-</template>
 
 <template id="product" name="Product">
   <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_mail.css'/>
+      </t>
       <t t-set="additional_title" t-value="product.name"/>
       <div itemscope="itemscope" itemtype="http://schema.org/Product" id="wrap" class="js_sale">
 
@@ -486,6 +484,11 @@
 
 <template id="cart" name="Shopping Cart">
   <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
       <div id="wrap">
         <div class="container oe_website_sale">
 
@@ -668,6 +671,11 @@
 
 <template id="checkout">
   <t t-call="website.layout">
+    <t t-set="head">
+        <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+        <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+        <t t-raw="head or ''"/>
+    </t>
     <t t-set="additional_title">Shop - Checkout</t>
     <div id="wrap">
       <div class="container oe_website_sale">
@@ -824,6 +832,12 @@
 
 <template id="payment">
   <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
       <t t-set="additional_title">Shop - Select Payment Mode</t>
       <div id="wrap">
         <div class="container oe_website_sale">
@@ -942,6 +956,11 @@
 
 <template id="confirmation">
   <t t-call="website.layout">
+      <t t-set="head">
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+          <t t-raw="head or ''"/>
+      </t>
       <t t-set="additional_title">Shop - Confirmed</t>
       <div id="wrap">
         <div class="container oe_website_sale">
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml
index 8001d192234..50200a7344c 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery.xml
@@ -16,13 +16,11 @@
         </xpath>
     </template>
 
-    <template id="website_sale_delivery_frontend" inherit_id="website.assets_frontend" name="Website Sale Delivery Frontend">
-        <xpath expr="." position="inside">
+    <template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
+        <xpath expr="//t[@t-set='head']" position="inside">
             <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
         </xpath>
-    </template>    
 
-    <template id="payment_delivery" name="Delivery Costs" inherit_id="website_sale.payment">
         <xpath expr="//div[@id='payment_method']" position="before">
             <div t-if="deliveries" class="row" id="delivery_carrier">
                 <div class="col-lg-5 col-sm-6">
diff --git a/addons/website_twitter/views/twitter_snippet.xml b/addons/website_twitter/views/twitter_snippet.xml
index daeea778633..30be5068423 100644
--- a/addons/website_twitter/views/twitter_snippet.xml
+++ b/addons/website_twitter/views/twitter_snippet.xml
@@ -23,13 +23,13 @@
         </xpath>
     </template>
     <template id="twitter" inherit_id="website.assets_frontend" name="Twitter Snippet">
-        <xpath expr="." position="inside">
+        <xpath expr="/t" position="inside">
             <link rel="stylesheet" href="/website_twitter/static/src/css/website.twitter.css"  type="text/css"/>
             <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.animation.js"/>
         </xpath>
     </template>
     <template id="twitter_editor" inherit_id="website.assets_editor" name="Twitter options">
-        <xpath expr="." position="inside">
+        <xpath expr="/t" position="inside">
             <script type="text/javascript" src="/website_twitter/static/src/js/website.twitter.editor.js"/>
         </xpath>
     </template>