diff --git a/addons/website_event/data/res_partner_demo.xml b/addons/website_event/data/res_partner_demo.xml
index f82a64833fe..a6fec3a3f12 100644
--- a/addons/website_event/data/res_partner_demo.xml
+++ b/addons/website_event/data/res_partner_demo.xml
@@ -210,7 +210,7 @@
 </section></div></field>
     </record>
 
-    <!-- 15-16-18: children of 12 (Azure Interior) -->
+    <!-- 15-16-28: children of 12 (Azure Interior) -->
     <record id="base.res_partner_address_15" model="res.partner">
         <field name="is_published" eval="True"/>
         <field name="website">http://azure.example.com</field>
diff --git a/addons/website_event_track/data/event_track_demo.xml b/addons/website_event_track/data/event_track_demo.xml
index 71308eb0736..aec7c85d33e 100644
--- a/addons/website_event_track/data/event_track_demo.xml
+++ b/addons/website_event_track/data/event_track_demo.xml
@@ -354,7 +354,8 @@
         <field name="color">1</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
-        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 15:30:00')"></field>
+        <field name="wishlisted_by_default" eval="True"/>
+        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 16:00:00')"></field>
         <field name="tag_ids" eval="[
             (4, ref('website_event_track.event_track_tag1')),
             (4, ref('website_event_track.event_track_tag2')),
@@ -367,7 +368,7 @@
     </record>
     <!-- Location 1 -->
     <record id="event_7_track_3" model="event.track">
-        <field name="name">A House Made of Woods ?</field>
+        <field name="name">Easy Way To Build a Wooden House</field>
         <field name="color">2</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
@@ -385,10 +386,10 @@
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage4"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_1"/>
-        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 13:00:00')"></field>
+        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 12:00:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag11'))]"/>
         <field name="is_published" eval="False"/>
-        <field name="duration">2</field>
+        <field name="duration">1</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_15"/>
         <field name="website_cta" eval="True"/>
@@ -396,8 +397,21 @@
         <field name="website_cta_url">http://www.example.com</field>
         <field name="website_cta_delay">10</field>
     </record>
-    <!-- Location 2 -->
     <record id="event_7_track_5" model="event.track">
+        <field name="name">Top 10 Most Expensive Wood in the World</field>
+        <field name="color">3</field>
+        <field name="event_id" ref="event.event_7"/>
+        <field name="stage_id" ref="event_track_stage3"/>
+        <field name="location_id" ref="website_event_track.event_track_location_online_1"/>
+        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 14:00:00')"></field>
+        <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag3')), (4, ref('website_event_track.event_track_tag11'))]"/>
+        <field name="is_published" eval="True"/>
+        <field name="duration">1</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
+    <!-- Location 2 -->
+    <record id="event_7_track_6" model="event.track">
         <field name="name">Securing your Lumber during transport</field>
         <field name="color">3</field>
         <field name="event_id" ref="event.event_7"/>
@@ -410,8 +424,8 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_28"/>
     </record>
-    <record id="event_7_track_6" model="event.track">
-        <field name="name">Meet our woods producers</field>
+    <record id="event_7_track_7" model="event.track">
+        <field name="name">Woodworking: How I got started!</field>
         <field name="color">3</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
@@ -423,7 +437,7 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_15"/>
     </record>
-    <record id="event_7_track_7" model="event.track">
+    <record id="event_7_track_8" model="event.track">
         <field name="name">Dealing with OpenWood Furniture</field>
         <field name="color">6</field>
         <field name="event_id" ref="event.event_7"/>
@@ -436,7 +450,7 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_3"/>
     </record>
-    <record id="event_7_track_8" model="event.track">
+    <record id="event_7_track_9" model="event.track">
         <field name="name">Kitchens for the Future</field>
         <field name="color">7</field>
         <field name="event_id" ref="event.event_7"/>
@@ -456,10 +470,10 @@
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage2"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_3"/>
-        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 07:00:00')"></field>
+        <field name="date" eval="(DateTime.now() - timedelta(days=1)).strftime('%Y-%m-%d 08:30:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag12'))]"/>
         <field name="is_published" eval="False"/>
-        <field name="duration">3</field>
+        <field name="duration">2</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_31"/>
     </record>
@@ -500,14 +514,14 @@
         <field name="color">1</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
-        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 15:00:00')"></field>
+        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 16:00:00')"></field>
         <field name="tag_ids" eval="[
             (4, ref('website_event_track.event_track_tag1')),
             (4, ref('website_event_track.event_track_tag2')),
             (4, ref('website_event_track.event_track_tag3')),
             (4, ref('website_event_track.event_track_tag13'))]"/>
         <field name="is_published" eval="True"/>
-        <field name="duration">2</field>
+        <field name="duration">1</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_16"/>
     </record>
@@ -553,6 +567,19 @@
     </record>
     <!-- Location 2 -->
     <record id="event_7_track_15" model="event.track">
+        <field name="name">Logs to lumber</field>
+        <field name="color">3</field>
+        <field name="event_id" ref="event.event_7"/>
+        <field name="stage_id" ref="event_track_stage3"/>
+        <field name="location_id" ref="website_event_track.event_track_location_online_2"/>
+        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 08:00:00')"></field>
+        <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag3')), (4, ref('website_event_track.event_track_tag11'))]"/>
+        <field name="is_published" eval="True"/>
+        <field name="duration">1</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="partner_id" ref="base.res_partner_address_31"/>
+    </record>
+    <record id="event_7_track_16" model="event.track">
         <field name="name">Pretty. Ugly. Lovely.</field>
         <field name="color">4</field>
         <field name="event_id" ref="event.event_7"/>
@@ -565,11 +592,12 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_16"/>
     </record>
-    <record id="event_7_track_16" model="event.track">
+    <record id="event_7_track_17" model="event.track">
         <field name="name">10 DIY Furniture Ideas For Absolute Beginners</field>
         <field name="color">7</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
+        <field name="wishlisted_by_default" eval="True"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_2"/>
         <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 12:00:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag11'))]"/>
@@ -578,20 +606,32 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_31"/>
     </record>
-    <record id="event_7_track_17" model="event.track">
+    <record id="event_7_track_18" model="event.track">
         <field name="name">6 Woodworking tips and tricks for beginners</field>
         <field name="color">7</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
-        <field name="wishlisted_by_default" eval="True"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_2"/>
-        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 13:30:00')"></field>
+        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 13:00:00')"></field>
         <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag12'))]"/>
         <field name="is_published" eval="True"/>
-        <field name="duration">1.5</field>
+        <field name="duration">1</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_17"/>
     </record>
+    <record id="event_7_track_19" model="event.track">
+        <field name="name">DIY Timber Cladding Project</field>
+        <field name="color">7</field>
+        <field name="event_id" ref="event.event_7"/>
+        <field name="stage_id" ref="event_track_stage3"/>
+        <field name="location_id" ref="website_event_track.event_track_location_online_2"/>
+        <field name="date" eval="DateTime.now().strftime('%Y-%m-%d 14:00:00')"></field>
+        <field name="tag_ids" eval="[(4, ref('website_event_track.event_track_tag1')), (4, ref('website_event_track.event_track_tag11'))]"/>
+        <field name="is_published" eval="True"/>
+        <field name="duration">1</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="partner_id" ref="base.res_partner_address_3"/>
+    </record>
     <!-- Location 3 -->
     <record id="event_7_track_l3_10" model="event.track">
         <field name="name">Live Testimonial</field>
@@ -649,13 +689,13 @@
             (4, ref('website_event_track.event_track_tag3')),
             (4, ref('website_event_track.event_track_tag13'))]"/>
         <field name="is_published" eval="True"/>
-        <field name="duration">2</field>
+        <field name="duration">1.5</field>
         <field name="user_id" ref="base.user_admin"/>
         <field name="partner_id" ref="base.res_partner_address_3"/>
     </record>
     <!-- Location 1 -->
     <record id="event_7_track_22" model="event.track">
-        <field name="name">Tools for Wood</field>
+        <field name="name">Tools for the Woodworking Beginner</field>
         <field name="color">3</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
@@ -668,8 +708,8 @@
         <field name="partner_id" ref="base.res_partner_address_4"/>
     </record>
     <record id="event_7_track_23" model="event.track">
-        <field name="name">Repairing Tools</field>
-        <field name="color">3</field>
+        <field name="name">Restoring Old Woodworking Tools</field>
+        <field name="color">7</field>
         <field name="event_id" ref="event.event_7"/>
         <field name="stage_id" ref="event_track_stage3"/>
         <field name="location_id" ref="website_event_track.event_track_location_online_1"/>
diff --git a/addons/website_event_track/data/event_track_demo_description.xml b/addons/website_event_track/data/event_track_demo_description.xml
index 86e5528bed8..030e6293a07 100644
--- a/addons/website_event_track/data/event_track_demo_description.xml
+++ b/addons/website_event_track/data/event_track_demo_description.xml
@@ -1,15 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="event_7_track_4" model="event.track">
+    <record id="event_7_track_3" model="event.track">
         <field name="description" type="html">
-<p>A summary of know-how: how and what. All the basics for this course about gardening.</p>
+<p>Considering to build a wooden house? Watch this video to find out more information about a construction process and final result. Step by step simple explanation! Interested?</p>
         </field>
     </record>
     <record id="event_7_track_5" model="event.track">
         <field name="description" type="html">
-<p>A summary of know-how: how and what. All the basics for this course about gardening.</p>
+<p>Top most expensive wood in the world is quite interesting topic and several people may be surprised
+    that there are hundreds of wood types exist around the globe following different properties and use.</p>
+<p>There are several variants of wood is available in the world but we are talking about most expensive
+    ones in the world and keeping to the point we have arranged ten most expensive wood.</p>
+        </field>
+    </record>
+    <record id="event_7_track_6" model="event.track">
+        <field name="description" type="html">
+<p>Use these simple steps to easily haul LONG lumber in a short box pickup truck.  A dose of carpenter's
+    ingenuity along with a couple boards, a sturdy strap and a few screws are all I use to easily haul
+    long boards from the lumberyard to the Next Level Carpentry shop or jobsite.</p>
+<p>Using a unique wrapping method for a tie down strap (NOT Bungee cords!!!) allows lumber to be
+    cinched securely WITHOUT the need to tie and untie tricky or complicated knots.</p>
+        </field>
+    </record>
+    <record id="event_7_track_7" model="event.track">
+        <field name="description" type="html">
+<p>Probably one of the most asked questions I've gotten is how I got started woodworking! In this video I share with you how/why I started building furniture!</p>
+        </field>
+    </record>
+    <record id="event_7_track_13" model="event.track">
+        <field name="description" type="html">
+<p>Considering to build a wooden house? Watch this video to find out more information about a construction process and final result. Step by step simple explanation! Interested?</p>
+        </field>
+    </record>
+    <record id="event_7_track_15" model="event.track">
+        <field name="description" type="html">
+<p>In this video we will see how lumber is made in a sawmill factory.</p>
+        </field>
+    </record>
+    <record id="event_7_track_17" model="event.track">
+        <field name="description" type="html">
+<p> As you may have heard before, making your own furniture is actually not as difficult or as complicated as you think.
+    In fact, some projects are so easy anyone could successfully complete them. For example, making a cute stool out of
+    a old tire is a real piece of cake and if you’re in need of a coffee table you can easily put one together using
+    wood crates.</p>
+<p>There are a lot of ideas worth exploring so start with the 10 DIY furniture ideas for absolute beginners.</p>
+        </field>
+    </record>
+    <record id="event_7_track_18" model="event.track">
+        <field name="description" type="html">
+<p>In this video, I covered 6 tips and tricks to help out beginners:
+    <ul>
+        <li>Making a center marking gauge</li>
+        <li>Bandy clamp hack</li>
+        <li>Right angle clamp jig</li>
+        <li>Miter saw tip</li>
+        <li>Glue tip</li>
+        <li>Dowel Hack</li>
+    </ul>
+</p>
+        </field>
+    </record>
+    <record id="event_7_track_19" model="event.track">
+        <field name="description" type="html">
+<p>Link to Q&amp;A here! The time has come to hide those old block walls. Love simple and transformation type projects like this! :)-</p>
+        </field>
+    </record>
+    <record id="event_7_track_23" model="event.track">
+        <field name="description" type="html">
+<p> Restoring old woodworking tools</p>
         </field>
     </record>
-
 </odoo>
diff --git a/addons/website_event_track_live/data/event_track_demo.xml b/addons/website_event_track_live/data/event_track_demo.xml
index 79e01e8c5f0..656e8f8781b 100644
--- a/addons/website_event_track_live/data/event_track_demo.xml
+++ b/addons/website_event_track_live/data/event_track_demo.xml
@@ -1,46 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <!-- Tracks of: "OpenWood: Furniture Collection Online Reveal" -->
-    <record id="website_event_track.event_7_track_1" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=66AIsiezq5g</field>
-        <field name="is_youtube_replay" eval="True" />
-    </record>
-    <record id="website_event_track.event_7_track_2" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=IvUU8joBb1Q</field>
-        <field name="is_youtube_replay" eval="True" />
-    </record>
     <record id="website_event_track.event_7_track_3" model="event.track">
+        <!-- Easy Way To Build a Wooden House -->
         <field name="youtube_video_url">https://www.youtube.com/watch?v=qRrA8al77a0</field>
-        <field name="is_youtube_replay" eval="True" />
-    </record>
-    <record id="website_event_track.event_7_track_4" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=bZ-queeu-lk</field>
-        <field name="is_youtube_replay" eval="True" />
+        <field name="is_youtube_replay" eval="True"/>
     </record>
     <record id="website_event_track.event_7_track_5" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=gV3g5FzmQiM</field>
-        <field name="is_youtube_replay" eval="True" />
+        <!-- Top 10 Most Expensive Wood in the World -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=bZ-queeu-lk</field>
+        <field name="is_youtube_replay" eval="True"/>
     </record>
     <record id="website_event_track.event_7_track_6" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=g3IoL9hxABg</field>
-        <field name="is_youtube_replay" eval="True" />
+        <!-- Haul Long Lumber in a Shortbox Truck -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=gV3g5FzmQiM</field>
+        <field name="is_youtube_replay" eval="True"/>
     </record>
-
-    <record id="website_event_track.event_7_track_10" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=AVZtyXJB-rI</field>
-        <field name="is_youtube_replay" eval="True" />
-    </record>
-    <record id="website_event_track.event_7_track_11" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=LHztthKy4RE</field>
-        <field name="is_youtube_replay" eval="True" />
-    </record>
-    <record id="website_event_track.event_7_track_12" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=B-nEYsyRlYo</field>
-        <field name="is_youtube_replay" eval="True" />
+    <record id="website_event_track.event_7_track_7" model="event.track">
+        <!-- Woodworking: How I got started! -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=loP-Nd7M5s8</field>
+        <field name="is_youtube_replay" eval="True"/>
     </record>
     <record id="website_event_track.event_7_track_13" model="event.track">
-        <field name="youtube_video_url">https://www.youtube.com/watch?v=7X8xuipr4_A</field>
-        <field name="is_youtube_replay" eval="True" />
+        <!-- Easy Way To Build a Wooden House -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=qRrA8al77a0</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_15" model="event.track">
+        <!-- Logs to Lumber -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=66AIsiezq5g</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_17" model="event.track">
+        <!-- 10 DIY Furniture Ideas For Absolute Beginners -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=OE4BVOjJp88</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_18" model="event.track">
+        <!-- 6 Woodworking tips and tricks for beginners -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=3cME3vK1aaQ</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_19" model="event.track">
+        <!-- How I Transformed this Old Block Wall - DIY Timber Cladding Project -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=7X8xuipr4_A</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_22" model="event.track">
+        <!-- Basic Set of Tools for the Woodworking Beginner -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=3pc-nnAykTQ</field>
+        <field name="is_youtube_replay" eval="True"/>
+    </record>
+    <record id="website_event_track.event_7_track_23" model="event.track">
+        <!-- Restoring Old Woodworking Tools -->
+        <field name="youtube_video_url">https://www.youtube.com/watch?v=tI5zCo-zLkY</field>
+        <field name="is_youtube_replay" eval="True"/>
     </record>
-
 </odoo>