diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 52935fddc68..672f2f3d29d 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -9,122 +9,5 @@
             <field name="social_linkedin">http://www.linkedin.com/company/openerp</field>
         </record>
 
-
-        <template id="default_website_homepage" inherit_id="website.homepage" name="Homepage for Website">
-
-            <xpath expr="//div[@id='wrap']" position="attributes">
-                <attribute name="class">oe_structure</attribute>
-            </xpath>
-
-            <xpath expr="//div[@id='wrap']" position="after">
-                <section data-snippet-id="title" class="mt32 mb32">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12" data-snippet-id="colmd">
-                                <h1 class="text-center">Build Great Website</h1>
-                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section data-snippet-id="image-text" class="mt32 mb32 dark">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
-                            </div>
-                            <div class="col-md-6 mt32" data-snippet-id="colmd">
-                                <h3>A Section Subtitle</h3>
-                                <p>
-                                    Write one or two paragraphs describing your product,
-                                    services or a specific feature. To be successful
-                                    your content needs to be useful to your readers.
-                                </p>
-                                <p>
-                                    Start with the customer – find out what they want
-                                    and give it to them.
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax_full oe_structure mt32 mb32" data-snippet-id="parallax">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
-                                <h1 class="text-center">
-                                    <b>A Great Title</b>
-                                </h1>
-                                <h3 class="text-center">
-                                    And a motivating subtitle
-                                </h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section class="mt32 mb32" data-snippet-id="three-columns">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                                <h2>A Great Title</h2>
-                                <h3 class="text-muted">And a good subtitle</h3>
-                            </div>
-                            <div class="col-md-4" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
-                                <h4 class="mt16">Streamline Recruitments</h4>
-                                <p>
-                                    Post job offers and keep track of each application
-                                    received. Follow applicants in your recruitment process
-                                    with the smart kanban view.
-                                </p><p>
-                                    Save time by automating some communications with email
-                                    templates. Resumes are indexed automatically, allowing
-                                    you to easily find for specific profiles.
-                                </p>
-                            </div>
-                            <div class="col-md-4" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
-                                <h4 class="mt16">Enterprise Social Network</h4>
-                                <p>
-                                    Break down information silos. Share knowledge and best
-                                    practices amongst all employees. Follow specific people
-                                    or documents and join groups of interests to share
-                                    expertise and documents.
-                                </p><p>
-                                    Interact with your collegues in real time with live chat.
-                                </p>
-                            </div>
-                            <div class="col-md-4" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
-                                <h4 class="mt16">Leaves Management</h4>
-                                <p>
-                                    Keep track of the vacation days accrued by each
-                                    employee. Employees enter their requests (paid
-                                    holidays, sick leave, etc), for managers to approve and
-                                    validate. It's all done in just a few clicks. The
-                                    agenda of each employee is updated accordingly.
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section class="mt32 mb32" data-snippet-id="cta">
-                    <div class="container">
-                      <div class="row">
-                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                            <a href="/shop" class="btn btn-info btn-lg">View Products</a>
-                            <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
-                        </div>
-                      </div>
-                    </div>
-                </section>
-            </xpath>
-
-        </template>
-
     </data>
 </openerp>
diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
new file mode 100644
index 00000000000..044aa163380
--- /dev/null
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <template id="website_homepage_demo" inherit_id="website.homepage" name="Homepage for Website">
+
+            <xpath expr="//div[@id='wrap']" position="attributes">
+                <attribute name="class">oe_structure</attribute>
+            </xpath>
+
+            <xpath expr="//div[@id='wrap']" position="after">
+                <section data-snippet-id="title" class="mt32 mb32">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12" data-snippet-id="colmd">
+                                <h1 class="text-center">Build Great Website</h1>
+                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="image-text" class="mt32 mb32 dark">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
+                            </div>
+                            <div class="col-md-6 mt32" data-snippet-id="colmd">
+                                <h3>A Section Subtitle</h3>
+                                <p>
+                                    Write one or two paragraphs describing your product,
+                                    services or a specific feature. To be successful
+                                    your content needs to be useful to your readers.
+                                </p>
+                                <p>
+                                    Start with the customer – find out what they want
+                                    and give it to them.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32" data-snippet-id="parallax">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
+                                <h1 class="text-center">
+                                    <b>A Great Title</b>
+                                </h1>
+                                <h3 class="text-center">
+                                    And a motivating subtitle
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="mt32 mb32" data-snippet-id="three-columns">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                                <h2>A Great Title</h2>
+                                <h3 class="text-muted">And a good subtitle</h3>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
+                                <h4 class="mt16">Streamline Recruitments</h4>
+                                <p>
+                                    Post job offers and keep track of each application
+                                    received. Follow applicants in your recruitment process
+                                    with the smart kanban view.
+                                </p><p>
+                                    Save time by automating some communications with email
+                                    templates. Resumes are indexed automatically, allowing
+                                    you to easily find for specific profiles.
+                                </p>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
+                                <h4 class="mt16">Enterprise Social Network</h4>
+                                <p>
+                                    Break down information silos. Share knowledge and best
+                                    practices amongst all employees. Follow specific people
+                                    or documents and join groups of interests to share
+                                    expertise and documents.
+                                </p><p>
+                                    Interact with your collegues in real time with live chat.
+                                </p>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
+                                <h4 class="mt16">Leaves Management</h4>
+                                <p>
+                                    Keep track of the vacation days accrued by each
+                                    employee. Employees enter their requests (paid
+                                    holidays, sick leave, etc), for managers to approve and
+                                    validate. It's all done in just a few clicks. The
+                                    agenda of each employee is updated accordingly.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="mt32 mb32" data-snippet-id="cta">
+                    <div class="container">
+                      <div class="row">
+                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                            <a href="/shop" class="btn btn-info btn-lg">View Products</a>
+                            <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
+                        </div>
+                      </div>
+                    </div>
+                </section>
+            </xpath>
+
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index 26a1e084564..a836eafee15 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -20,7 +20,8 @@ Online Events
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [
-        'data/event_demo.xml'
+        'data/event_demo.xml',
+        'demo/website_event_homepage_page.xml',
     ],
     'installable': True,
 }
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 6d9c9adaf2d..d45aa6cc9e1 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,40 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Events banner for homepage -->
-
-        <template id="default_website_event_homepage" inherit_id="website_sale.default_website_sale_homepage" name="Event banner for Homepage">
-            <xpath expr="//*[@id='myCarousel1']/div" position="before">
-                <ol class="carousel-indicators">
-                    <li data-slide-to="0" data-target="#myCarousel1" class="active"></li>
-                    <li data-target="#myCarousel" data-slide-to="1" class=""></li>
-                </ol>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="inside">
-                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
-                    <div class="container">
-                        <div contenteditable="false" class="carousel-caption content">
-                            <h2>Promote Your Events</h2>
-
-                            <h3>Sell Tickets Online</h3>
-
-                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
-                        </div>
-
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="after">
-                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
-                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
-            </xpath>
-        </template>
-
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>
diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
new file mode 100644
index 00000000000..3d50db4eb75
--- /dev/null
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Events banner for homepage -->
+
+        <template id="website_event_homepage_page" inherit_id="website_sale.website_sale_homepage_page" name="Event banner for Homepage">
+
+            <xpath expr="//*[@id='shop_banner']/div" position="inside">
+                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                    <div class="container">
+                        <div contenteditable="false" class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
+
+                            <h3>Sell Tickets Online</h3>
+
+                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                        </div>
+
+                        <div class="carousel-image hidden-xs">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 634078fe149..0a022cbc78b 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -19,6 +19,7 @@ OpenERP E-Commerce
     ],
     'demo': [
         'website_sale_demo.xml',
+        'demo/website_sale_homepage_page.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
new file mode 100644
index 00000000000..5221ba320ce
--- /dev/null
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!--  Shop Banner for homepage -->
+
+        <template id="website_sale_homepage_demo" inherit_id="website.homepage" name="Shop banner for Homepage">
+            <xpath expr="//div[@id='wrap']" position="before">
+
+                <div id="shop_banner" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
+                    <div class="carousel-inner">
+                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
+                            <div class="container">
+                                <div contenteditable="false" class="carousel-caption content">
+                                    <h2>OpenERP e-Commerce</h2>
+
+                                    <h3>An Awesome Shopping Experience</h3>
+
+                                    <p>
+                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
+                                    </p>
+                                </div>
+
+                                <div class="carousel-image hidden-xs">
+                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
+            </xpath>
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index 8f8a5a79a1b..ef47ae7db59 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -2,37 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <!--  Shop Banner for homepage -->
-
-        <template id="default_website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
-            <xpath expr="//div" position="before">
-
-                <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
-                    <div class="carousel-inner">
-                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
-                            <div class="container">
-                                <div contenteditable="false" class="carousel-caption content">
-                                    <h2>OpenERP e-Commerce</h2>
-
-                                    <h3>An Awesome Shopping Experience</h3>
-
-                                    <p>
-                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
-                                    </p>
-                                </div>
-
-                                <div class="carousel-image hidden-xs">
-                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </xpath>
-        </template>
-
         <record id="product.product_product_consultant" model="product.product">
             <field name="image" type="base64" file="website/static/description/website_edit.png"/>
         </record>